backort

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.6--patch-36
   fix letters

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-686

diff --git a/htdocs.net/groupe/annuaire.php b/htdocs.net/groupe/annuaire.php
index 7d8fb7d..acec832 100644 (file)
--- a/htdocs.net/groupe/annuaire.php
+++ b/htdocs.net/groupe/annuaire.php
@@ -12,21 +12,21 @@ $page->assign('admin', may_update());
 
 $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo');
 $res = $globals->xdb->iterRow(
-            'SELECT  UPPER(SUBSTRING(IF(m.origine="X",IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom), 1, 1)), COUNT(IF(m.origine="X",u.nom,m.nom))
+            'SELECT  UPPER(SUBSTRING(IF(m.origine="X",IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom), 1, 1)) as letter, COUNT(*)
                FROM  groupex.membres AS m
           LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
               WHERE  asso_id = {?}
-           GROUP BY  UPPER(SUBSTRING(IF(m.origine="X",u.nom,m.nom), 1, 1))', $globals->asso('id'));
+           GROUP BY  letter
+           ORDER BY  letter', $globals->asso('id'));
 $alphabet = array();
 $nb_tot = 0;
 while (list($char, $nb) = $res->next()) {
-    $alphabet[ord($char)] = $char;
+    $alphabet[] = $char;
     $nb_tot += $nb;
     if (Env::has('initiale') && $char == strtoupper(Env::get('initiale'))) {
         $tot = $nb;
     }
 }
-ksort($alphabet);
 $page->assign('alphabet', $alphabet);
 $page->assign('nb_tot',   $nb_tot);