backport usage nam thing

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.6--patch-29
   use nom_usage instead of nom for X pple

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

diff --git a/htdocs.net/groupe/annuaire.php b/htdocs.net/groupe/annuaire.php
index 8bb46d7..adafedd 100644 (file)
--- a/htdocs.net/groupe/annuaire.php
+++ b/htdocs.net/groupe/annuaire.php
@@ -12,7 +12,7 @@ $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",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)), COUNT(IF(m.origine="X",u.nom,m.nom))
                FROM  groupex.membres AS m
           LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
               WHERE  asso_id = {?}
@@ -46,9 +46,9 @@ if (count($links)>1) {
     $page->assign('links', $links);
 }
 
-$ini = Env::has('initiale') ? 'AND IF(m.origine="X",u.nom,m.nom) LIKE "'.addslashes(Env::get('initiale')).'%"' : '';
+$ini = Env::has('initiale') ? 'AND IF(m.origine="X",IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom) LIKE "'.addslashes(Env::get('initiale')).'%"' : '';
 $ann = $globals->xdb->iterator(
-          "SELECT  IF(m.origine='X',IF(u.nom_usage, u.nom_usage, u.nom) ,m.nom) AS nom,
+          "SELECT  IF(m.origine='X',IF(u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom,
                    IF(m.origine='X',u.prenom,m.prenom) AS prenom,
                    IF(m.origine='X',u.promo,'extérieur') AS promo,
                    IF(m.origine='X',a.alias,m.email) AS email,

diff --git a/htdocs.net/groupe/membres-edit.php b/htdocs.net/groupe/membres-edit.php
index 37c728a..2dd6f1e 100644 (file)
--- a/htdocs.net/groupe/membres-edit.php
+++ b/htdocs.net/groupe/membres-edit.php
@@ -14,7 +14,7 @@
 
         if ($dom == 'polytechnique.org' || $dom == 'm4x.org') {
             $res = $globals->xdb->query(
-                    "SELECT  user_id AS uid, u.promo, u.nom, u.prenom, b.alias,
+                    "SELECT  user_id AS uid, u.promo, IF(u.nom_usage<>'', u.nom_usage, u.nom) as nom, u.prenom, b.alias,
                              CONCAT(b.alias, '@m4x.org') AS email,
                              CONCAT(b.alias, '@polytechnique.org') AS email2,
                              m.perms='admin' AS perms, m.origine

diff --git a/htdocs.net/groupe/telepaiement.php b/htdocs.net/groupe/telepaiement.php
index 5527c99..47cb834 100644 (file)
--- a/htdocs.net/groupe/telepaiement.php
+++ b/htdocs.net/groupe/telepaiement.php
@@ -13,7 +13,7 @@ if (may_update()) {
     foreach($tit as $foo) {
         $pid = $foo['id'];
         $res = $globals->xdb->query(
-                "SELECT  u.nom, u.prenom, u.promo, a.alias, timestamp, montant
+                "SELECT  IF(u.nom_usage<>'', u.nom_usage, u.nom) as nom, u.prenom, u.promo, a.alias, timestamp, montant
                    FROM  {$globals->money->mpay_tprefix}transactions AS t
              INNER JOIN  auth_user_md5                               AS u ON ( t.uid = u.user_id )
              INNER JOIN  aliases                                     AS a ON ( t.uid = a.id AND a.type='a_vie' )