Backport [1175] and [1176]

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1177 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/classes/platalpage.php b/classes/platalpage.php
index 2667cd0..68a001d 100644 (file)
--- a/classes/platalpage.php
+++ b/classes/platalpage.php
@@ -266,6 +266,7 @@ function trimwhitespace($source, &$smarty)
 
 function _hide_email($source)
 {
+    $source = str_replace("\n", '', $source);
     return '<script type="text/javascript">Nix.decode("' . addslashes(str_rot13($source)) . '");</script>'; 
 }
 

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index fbdde4e..299d4cd 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -223,7 +223,8 @@ class XnetListsModule extends ListsModule
                      FROM  groupex.membres AS m
                 LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                 LEFT JOIN  aliases         AS a ON ( a.id = m.uid AND a.type='a_vie' )
-                    WHERE  m.asso_id = {?}", $globals->asso('id'));
+                    WHERE  m.asso_id = {?}
+                 ORDER BY  promo, nom, prenom", $globals->asso('id'));
 
         $not_in_list = array();
 

diff --git a/templates/xnetlists/sync.tpl b/templates/xnetlists/sync.tpl
index 03e0049..7d3c717 100644 (file)
--- a/templates/xnetlists/sync.tpl
+++ b/templates/xnetlists/sync.tpl
@@ -27,17 +27,18 @@
 
   <table cellspacing="2" cellpadding="0" class="tiny">
     <tr>
-      <th>Membre</th>
+      <th colspan="2">Membre</th>
       <th></th>
     </tr>
     {foreach from=$not_in_list item=u}
     <tr>
-      <td>{$u.prenom} {$u.nom}</td>
+      <td>{$u.nom|strtoupper} {$u.prenom}</td>
+      <td>{$u.promo}</td>
       <td><input type="checkbox" name="add[{$u.email}]" /></td>
     </tr>
     {/foreach}
     <tr>
-      <td colspan='2' class="center">
+      <td colspan='3' class="center">
         <input type='submit' value='forcer inscription' />
       </td>
     </tr>