Various improvements

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

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 0ff05f4..47e011a 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -103,8 +103,8 @@ class XnetPage extends PlatalPage
                 $sub['créer un alias']      = "$dim/alias/create";
             }
             if (S::has_perms()) {
-                $sub['gérer les groupes'] = 'admin';
-                $sub['clear cache'] = 'purge_cache';
+                $sub['gérer les groupes'] = array('href' => 'admin', 'style' => 'color: gray;');
+                $sub['clear cache'] = array('href' => 'purge_cache', 'style' => 'color: gray;');
             }
             $menu['Administrer'] = $sub;
         } elseif (S::has_perms()) {

diff --git a/modules/payment.php b/modules/payment.php
index d3e144a..30313d0 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -357,9 +357,11 @@ class PaymentModule extends PLModule
         $page->assign('titres', $tit);
 
         $order = Env::v('order', 'timestamp');
-        $orders = array('timestamp', 'nom', 'promo', 'montant');
+        $orders = array('timestamp', 'nom', 'promo', 'montant', 'comment');
         if (!in_array($order, $orders)) {
             $order = 'timestamp';
+        } elseif ($order == 'comment') {
+            $order = 't.comment';
         }
         $inv_order = Env::v('order_inv', 0);
         $page->assign('order', $order);
@@ -393,7 +395,7 @@ class PaymentModule extends PLModule
             $pid = $foo['id'];
             if (may_update()) {
                 $res = XDB::query("SELECT  IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom,
-                                           u.prenom, u.promo, a.alias, timestamp AS `date`, montant
+                                           u.prenom, u.promo, a.alias, timestamp AS `date`, t.comment, 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' )

diff --git a/plugins/function.select_db_table.php b/plugins/function.select_db_table.php
index e8e921c..8bb048c 100644 (file)
--- a/plugins/function.select_db_table.php
+++ b/plugins/function.select_db_table.php
@@ -44,7 +44,7 @@ function select_options($table,$valeur,$champ="text",$pad=false,
             if (!is_null($optgrp)) {
                 $html .= '</optgroup>';
             }
-            $html .= '<optgroup label="' . addslashes(htmlentities($my_grp)) . '">';
+            $html .= '<optgroup label="' . htmlentities($my_grp, ENT_QUOTES) . '">';
             $optgrp = $my_grp;
         }
         $html .= sprintf("<option value=\"%s\" %s>%s</option>\n", 

diff --git a/templates/payment/xnet.tpl b/templates/payment/xnet.tpl
index be65102..4fe758d 100644 (file)
--- a/templates/payment/xnet.tpl
+++ b/templates/payment/xnet.tpl
@@ -65,9 +65,9 @@ Voici la liste des paiements en ligne possible pour le groupe {$asso.nom}
 
 {if $is_admin && $trans[$p.id]}
 <p>Liste des personnes ayant payé (pour les administrateurs uniquement)&nbsp;:</p>
-<table cellpadding="0" cellspacing="0" id="list_{$p.id}" class='tinybicol'>
+<table cellpadding="0" cellspacing="0" id="list_{$p.id}" class='bicol'>
   <tr>
-    <th class="center">
+    <th>
       {if $order eq 'timestamp'}
         <a href='{$platal->ns}payment?order={$order}&order_inv={$order_inv}'>
           <img src="{$platal->baseurl}images/{if !$order_inv}dn{else}up{/if}.png" alt="" title="Tri {if $order_inv}dé{/if}croissant" />
@@ -75,7 +75,7 @@ Voici la liste des paiements en ligne possible pour le groupe {$asso.nom}
         <a href='{$platal->ns}payment?order=timestamp'>
       {/if}Date</a>
     </th>
-    <th colspan="2" class="center">
+    <th colspan="2">
       {if $order eq 'nom'}
         <a href='{$platal->ns}payment?order={$order}&order_inv={$order_inv}'>
           <img src="{$platal->baseurl}images/{if $order_inv}dn{else}up{/if}.png" alt="" title="Tri {if !$order_inv}dé{/if}croissant" />
@@ -83,7 +83,7 @@ Voici la liste des paiements en ligne possible pour le groupe {$asso.nom}
         <a href='{$platal->ns}payment?order=nom'>{/if}
       NOM Prénom</a>
     </th>
-    <th class="center">
+    <th>
       {if $order eq 'promo'}
         <a href='{$platal->ns}payment?order={$order}&order_inv={$order_inv}'>
           <img src="{$platal->baseurl}images/{if $order_inv}dn{else}up{/if}.png" alt="" title="Tri {if !$order_inv}dé{/if}croissant" />
@@ -91,7 +91,15 @@ Voici la liste des paiements en ligne possible pour le groupe {$asso.nom}
         <a href='{$platal->ns}payment?order=promo'>
       {/if}Promo</a>
     </th>
-    <th class="center">
+    <th>
+      {if $order eq 't.comment'}
+        <a href='{$platal->ns}payment?order=comment&order_inv={$order_inv}'>
+          <img src="{$platal->baseurl}images/{if $order_inv}dn{else}up{/if}.png" alt="" title="Tri {if !$order_inv}dé{/if}   siant" />
+      {else}
+        <a href='{$platal->ns}payment?order=comment'>
+      {/if}Commentaire</a>
+    </th>
+    <th>
       {if $order eq 'montant'}
         <a href='{$platal->ns}payment?order={$order}&order_inv={$order_inv}'>
           <img src="{$platal->baseurl}images/{if $order_inv}dn{else}up{/if}.png" alt="" title="Tri {if !$order_inv}dé{/if}croissant" />
@@ -114,15 +122,16 @@ Voici la liste des paiements en ligne possible pour le groupe {$asso.nom}
       <a href="mailto:{$p.alias}@polytechnique.org">{icon name=email title="mail"}</a>
     </td>
     <td class="center">{$p.promo}</td>
+    <td>{$p.comment}</td>
     <td class="right">{$p.montant}</td>
   </tr>
   {elseif $smarty.foreach.people.first}
   <tr>
-    <td colspan="5" class="center">Personne n'a encore payé pour ce télépaiement</td>
+    <td colspan="6" class="center">Personne n'a encore payé pour ce télépaiement</td>
   </tr>
   {else}
   <tr class="pair">
-    <td class="right" colspan="4"><strong>Total </strong></td>
+    <td class="right" colspan="5"><strong>Total </strong></td>
     <th class="right">{$p.montant}</th>
   </tr>
   {/if}