migrate telepaiements.php

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

diff --git a/htdocs.net/groupe/telepaiement.php b/htdocs.net/groupe/telepaiement.php
deleted file mode 100644 (file)
index 149ead2..0000000
--- a/htdocs.net/groupe/telepaiement.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-require 'xnet.inc.php';
-
-new_group_page('xnet/groupe/telepaiement.tpl');
-
-$res = $globals->xdb->query("SELECT id, text FROM {$globals->money->mpay_tprefix}paiements
-    WHERE asso_id = {?} AND NOT FIND_IN_SET(flags, 'old')
-    ORDER BY id DESC",
-    $globals->asso('id'));
-$tit = $res->fetchAllAssoc();
-$page->assign('titres', $tit);
-
-$order = Env::get('order', 'timestamp');
-$orders = array('timestamp', 'nom', 'promo', 'montant');
-if (!in_array($order, $orders)) $order = 'timestamp';
-$inv_order = Env::get('order_inv', 0);
-$page->assign('order', $order);
-$page->assign('order_inv', !$inv_order);
-if ($order == 'timestamp') $inv_order = !$inv_order;
-
-if ($inv_order) $inv_order = ' DESC'; else $inv_order = '';
-if ($order == 'montant') $order = 'LENGTH(montant) '.$inv_order.', montant';
-
-$orderby = 'ORDER BY '.$order.$inv_order;
-if ($order != 'nom') { $orderby .= ', nom'; $inv_order = ''; }
-$orderby .= ', prenom'.$inv_order;
-if ($order != 'timestamp') $orderby .= ', timestamp DESC';
-
-if (may_update()) {
-    $trans = array();
-    foreach($tit as $foo) {
-        $pid = $foo['id'];
-        $res = $globals->xdb->query(
-                "SELECT  IF(u.nom_usage<>'', u.nom_usage, u.nom) as nom, u.prenom, u.promo, a.alias, timestamp AS `date`, 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' )
-                  WHERE  ref = {?} ".$orderby, $pid);
-        $trans[$pid] = $res->fetchAllAssoc();
-        $sum = 0;
-        foreach ($trans[$pid] as $i => $t)
-            $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], "EUR")), ",", ".");
-        $trans[$pid][] = array("nom" => "somme totale", "montant" => strtr($sum, ".", ",")." EUR");
-    }
-    $page->assign('trans', $trans);
-}
-
-$page->run();
-?>

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index b9a3f6d..ffcf56e 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -85,7 +85,7 @@ class XnetPage extends PlatalPage
             if (false) {
                 $sub['carnet'] = "$dim/carnet.php";
             }
-            $sub['télépaiement'] = "$dim/telepaiement.php";
+            $sub['télépaiement'] = "$dim/paiement";
 
             $menu[$globals->asso('nom')] = $sub;
         }

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 3e3507b..e94ad1f 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -31,6 +31,7 @@ class XnetGrpModule extends PLModule
             'grp/mail'       => $this->make_hook('mail',      AUTH_MDP),
             'grp/annuaire'   => $this->make_hook('annuaire',  AUTH_MDP),
             'grp/subscribe'  => $this->make_hook('subscribe', AUTH_MDP),
+            'grp/paiement'   => $this->make_hook('paiement',  AUTH_MDP),
 
             'grp/admin/annuaire'
                  => $this->make_hook('admin_annuaire', AUTH_MDP),
@@ -402,6 +403,74 @@ class XnetGrpModule extends PLModule
         }
     }
 
+    function handler_paiement(&$page)
+    {
+        global $globals;
+
+        new_group_page('xnet/groupe/telepaiement.tpl');
+
+        $res = $globals->xdb->query(
+                "SELECT id, text
+                  FROM {$globals->money->mpay_tprefix}paiements
+                 WHERE asso_id = {?} AND NOT FIND_IN_SET(flags, 'old')
+              ORDER BY id DESC", $globals->asso('id'));
+        $tit = $res->fetchAllAssoc();
+        $page->assign('titres', $tit);
+
+        $order = Env::get('order', 'timestamp');
+        $orders = array('timestamp', 'nom', 'promo', 'montant');
+        if (!in_array($order, $orders)) {
+            $order = 'timestamp';
+        }
+        $inv_order = Env::get('order_inv', 0);
+        $page->assign('order', $order);
+        $page->assign('order_inv', !$inv_order);
+
+        if ($order == 'timestamp') {
+            $inv_order = !$inv_order;
+        }
+
+        if ($inv_order) {
+            $inv_order = ' DESC';
+        } else {
+            $inv_order = '';
+        }
+        if ($order == 'montant') {
+            $order = 'LENGTH(montant) '.$inv_order.', montant';
+        }
+
+        $orderby = 'ORDER BY '.$order.$inv_order;
+        if ($order != 'nom') {
+            $orderby .= ', nom'; $inv_order = '';
+        }
+        $orderby .= ', prenom'.$inv_order;
+        if ($order != 'timestamp') {
+            $orderby .= ', timestamp DESC';
+        }
+
+        if (may_update()) {
+            $trans = array();
+            foreach($tit as $foo) {
+                $pid = $foo['id'];
+                $res = $globals->xdb->query(
+                        "SELECT  IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom,
+                                 u.prenom, u.promo, a.alias, timestamp AS `date`, 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' )
+                          WHERE  ref = {?} ".$orderby, $pid);
+                $trans[$pid] = $res->fetchAllAssoc();
+                $sum = 0;
+                foreach ($trans[$pid] as $i => $t) {
+                    $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], 'EUR')), ',', '.');
+                }
+                $trans[$pid][] = array('nom' => 'somme totale',
+                                       'montant' => strtr($sum, '.', ',').' EUR');
+            }
+            $page->assign('trans', $trans);
+        }
+    }
+
     function handler_admin_annuaire(&$page)
     {
         global $globals;