Revert "Rewrites xnetevents subscription page."

[platal.git] / modules / xnetevents / xnetevents.inc.php

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index a41f7d8..7dd1ae1 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -203,7 +203,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null)
     $evt['paid'] += $montant;
     $evt['organizer'] = User::getSilent($evt['uid']);
 
-    $evt['date'] = make_event_date($evt);
+    $evt['date'] = make_event_date($evt['debut'], $evt['fin']);
 
     $evt['show_participants'] = ($evt['show_participants'] && $GLOBALS['IS_XNET_SITE'] && (is_member() || may_update()));
 
@@ -273,106 +273,6 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit =
 }
 // }}}
 
-//  {{{ function subscribe()
-/** set or update the user's subscription
- *
- * @param $uid: user's id
- * @param $eid: event's id
- * @param $subs: user's new subscription
- *
- */
-function subscribe($uid, $eid, $subs = array())
-{
-    global $globals;
-    // get items
-    $items = get_event_items($eid);
-    // get previous subscription
-    $old_subs = get_event_subscription($eid, $uid);
-    $participate = false;
-    $updated = false;
-    // for each item of the event
-    foreach ($items as $item_id => $details) {
-        // check if there is an old subscription
-        if (array_key_exists($item_id, $old_subs)) {
-            echo 'prev exists  ';
-            // compares new and old subscription
-            if ($old_subs[$item_id]['nb'] != $subs[$item_id]) {
-                echo 'different  ';
-                if ($subs[$item_id] != 0) {
-                    echo "je m'inscris  ";
-                    XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid)
-                                       VALUES ({?}, {?}, {?}, {?}, {?}, {?})
-                      ON DUPLICATE KEY UPDATE nb = VALUES(nb), flags = VALUES(flags), paid = VALUES(paid)',
-                                             $eid, $uid, $item_id, $subs[$item_id],(Env::has('notify_payment') ? 'notify_payment' : ''), 0);
-                   $participate = true;
-                } else { // we do not store non-subscription to event items
-                    echo "je me desinscris  ";
-                    XDB::execute('DELETE FROM group_event_participants
-                                        WHERE eid = {?} AND uid = {?} AND item_id = {?}',
-                                              $eid, $uid, $item_id);
-                }
-                $updated = true;
-            }
-        } else { // if no old subscription
-            echo 'no prev  ';
-            if ($subs[$item_id] != 0) {
-                echo 'subscribe  ';
-                XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid)
-                                   VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
-                                          $eid, $uid, $item_id, $subs[$item_id], '', 0);
-                $participate = true;
-                $updated = true;
-            }
-        }
-    }
-    // item 0 stores whether the user participates globally or not, if he has to be notified when payment is created and his manual payment
-    if (array_key_exists(0, $old_subs)) {
-        XDB::execute('UPDATE group_event_participants
-                         SET nb = {?}
-                       WHERE eid = {?}, uid = {?}, item_id = 0',
-                             ($participate ? 1 : 0), $eid, $uid);
-    } else {
-        XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid)
-                           VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
-                                  $eid, $uid, 0, ($participate ? 1 : 0), (Env::has('notify_payment') ? 'notify_payment' : ''), 0);
-    }
-    // if subscription is updated, we have to update the event aliases
-    if ($updated) {
-        echo "inscription mise a jour  ";
-        $short_name = get_event_detail($eid)['short_name'];
-        subscribe_lists_event($uid, $short_name, ($participate ? 1 : -1), 0);
-    }
-    return $updated;
-}
-//  }}}
-
-// {{{ function add_manual_payment()
-// deal with manual payments : add them on item_id = 0 (so that it's not dependant on what items the user registers)
-/*
- *
- */
-function add_manual_payment($newly_paid)
-{
-    $old_subs = get_event_subscription($eid, $uid);
-    if ($newly_paid != 0) {
-        if (array_key_exists(0, $old_subs)) {
-            echo "update paiement liquide  ";
-            XDB::execute('UPDATE group_event_participants
-                             SET paid = {?}
-                           WHERE eid = {?}, uid = {?}, item_id = 0',
-                                 $old_subs[0]['paid'] + $newly_paid, $eid, $uid);
-        } else {
-            echo "on ne devrait pas passer ici car on a deja un moment 0 des qu'on est ajoute comme participant ";
-            XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid)
-                VALUES ({?}, {?}, 0, 0, "", {?})',
-                $eid, $uid, $newly_paid);
-        }
-    }
-}
-// }}}
-// TODO : correct this function to be compatible with subscribe() (use $eid, remove useless argument)
-// TODO : correct other calls
-
 //  {{{ function subscribe_lists_event()
 /** Subscribes user to various event related mailing lists.
  *