Arrange templates by module

[platal.git] / modules / xnetevents.php

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 3328be3..bee8a2e 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -119,8 +119,6 @@ class XnetEventsModule extends PLModule
         }
         
         $page->assign('archive', $archive);
-        $page->assign('admin', may_update());
-
         $evenements = XDB::iterator(
                 "SELECT  e.*, LEFT(10, e.debut) AS debut_day, LEFT(10, e.fin) AS fin_day,
                          IF(e.deadline_inscription, e.deadline_inscription >= LEFT(NOW(), 10),
@@ -142,7 +140,7 @@ class XnetEventsModule extends PLModule
         while ($e = $evenements->next()) {
             $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update()));
             $res = XDB::query(
-                "SELECT titre, details, montant, ei.item_id, nb
+                "SELECT titre, details, montant, ei.item_id, nb, ep.paid
                    FROM groupex.evenements_items AS ei
               LEFT JOIN groupex.evenements_participants AS ep
                         ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND uid = {?})
@@ -151,6 +149,7 @@ class XnetEventsModule extends PLModule
             $e['moments'] = $res->fetchAllAssoc();
 
             $e['topay'] = 0;
+            $e['paid']  = $e['moments'][0]['paid'];
             foreach ($e['moments'] as $m) {
                 $e['topay'] += $m['nb'] * $m['montant'];
             }
@@ -173,7 +172,6 @@ class XnetEventsModule extends PLModule
         }
         
         $page->assign('evenements', $evts);
-        $page->assign('is_member', is_member());
     }
 
     function handler_sub(&$page, $eid = null)
@@ -220,7 +218,7 @@ class XnetEventsModule extends PLModule
         }
 
         // impossible to unsubscribe if you already paid sthing
-        if (array_sum($subs) && $evt['paid'] != 0) {
+        if (!array_sum($subs) && $evt['paid'] != 0) {
             $page->trig("Impossible de te désinscrire complètement ".
                         "parce que tu as fait un paiement par ".
                         "chèque ou par liquide. Contacte un ".
@@ -348,14 +346,17 @@ class XnetEventsModule extends PLModule
 
         new_groupadmin_page('xnetevents/edit.tpl');
 
-        $moments = range(1, 4);
+        $moments    = range(1, 4);
+        $error      = false;
         $page->assign('moments', $moments);
 
         if (Post::v('intitule')) {
             require_once dirname(__FILE__).'/xnetevents/xnetevents.inc.php';
             $short_name = event_change_shortname($page, $infos['short_name'],
                                                  Env::v('short_name', ''));
-
+            if ($short_name != Env::v('short_name')) {
+                $error = true;
+            }
             $evt = array(
                 'eid'              => $eid,
                 'asso_id'          => $globals->asso('id'),
@@ -401,7 +402,7 @@ class XnetEventsModule extends PLModule
 
             // if new event, get its id
             if (!$eid) {
-                $eid = mysql_insert_id();
+                $eid = XDB::insertId();
             }
 
             $nb_moments   = 0;
@@ -423,7 +424,6 @@ class XnetEventsModule extends PLModule
                                             WHERE eid = {?} AND item_id = {?}", $eid, $i);
                 }
             }
-
             // request for a new payment
             if (Post::v('paiement_id') == -1 && $money_defaut >= 0) {
                 require_once 'validations.inc.php';
@@ -441,7 +441,9 @@ class XnetEventsModule extends PLModule
                                         VALUES ({?}, {?}, '', '', 0)", $eid, 1);
             }
 
-            pl_redirect('events');
+            if (!$error) {
+                pl_redirect('events');
+            }
         }
 
         // get a list of all the payment for this asso
@@ -469,7 +471,7 @@ class XnetEventsModule extends PLModule
                                PayReq::same_event($eid, $globals->asso('id')));
             $stamp = $res->fetchOneCell();
             if ($stamp) {
-                $evt['paiement_id'] = -2;
+                $evt['paiement_id']  = -2;
                 $evt['paiement_req'] = $stamp;
             }
             $page->assign('evt', $evt);
@@ -534,12 +536,9 @@ class XnetEventsModule extends PLModule
 
                 foreach ($nbs as $id => $nb) {
                     $nb = max(intval($nb), 0);
-
-                    if ($nb) {
-                        XDB::execute("REPLACE INTO groupex.evenements_participants
-                                            VALUES ({?}, {?}, {?}, {?}, {?})",
-                                      $evt['eid'], $member['uid'], $id, $nb, $paid);
-                    }
+                    XDB::execute("REPLACE INTO groupex.evenements_participants
+                                        VALUES ({?}, {?}, {?}, {?}, {?})",
+                                  $evt['eid'], $member['uid'], $id, $nb, $paid);
                 }
 
                 $res = XDB::query("SELECT COUNT(uid) AS cnt, SUM(nb) AS nb
@@ -555,7 +554,6 @@ class XnetEventsModule extends PLModule
             $evt = get_event_detail($eid, $item_id);
         }
 
-        $page->assign('admin', may_update());
         $page->assign('evt', $evt);
         $page->assign('tout', is_null($item_id));