Merge commit 'origin/master' into account

[platal.git] / modules / payment.php

diff --git a/modules/payment.php b/modules/payment.php
index d15281d..edee6fe 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -219,10 +219,10 @@ class PaymentModule extends PLModule
 
         // We check if it is an Xnet payment and then update the related ML.
         $res = XDB::query('SELECT  eid
-                             FROM  #groupex#.evenements
+                             FROM  group_events
                             WHERE  paiement_id = {?}', $ref);
         if ($eid = $res->fetchOneCell()) {
-            $this->load('xnetevents.inc.php');
+            require_once dirname(__FILE__) . '/xnetevents/xnetevents.inc.php';
             $evt = get_event_detail($eid);
             subscribe_lists_event(0, $uid, $evt, $montant, true);
         }
@@ -313,10 +313,10 @@ class PaymentModule extends PLModule
 
         // We check if it is an Xnet payment and then update the related ML.
         $res = XDB::query('SELECT  eid
-                             FROM  #groupex#.evenements
+                             FROM  group_events
                             WHERE  paiement_id = {?}', $ref);
         if ($eid = $res->fetchOneCell()) {
-            $this->load('xnetevents.inc.php');
+            require_once dirname(__FILE__) . '/xnetevents/xnetevents.inc.php';
             $evt = get_event_detail($eid);
             subscribe_lists_event(0, $uid, $evt, $montant, true);
         }
@@ -364,8 +364,8 @@ class PaymentModule extends PLModule
                 return PL_FORBIDDEN;
             }
             $res = XDB::query("SELECT  1
-                                 FROM  #groupex#.evenements AS e
-                           INNER JOIN  #groupex#.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?})
+                                 FROM  group_events AS e
+                           INNER JOIN  group_event_participants AS ep ON (ep.eid = e.eid AND uid = {?})
                                 WHERE  e.paiement_id = {?} AND e.asso_id = {?}",
                               S::i('uid'), $pid, $globals->asso('id'));
             if ($res->numRows() == 0) {
@@ -406,9 +406,9 @@ class PaymentModule extends PLModule
                                        'montant' => strtr($sum, '.', ',').' €');
             }
             $res = XDB::iterRow("SELECT e.eid, e.short_name, e.intitule, ep.nb, ei.montant, ep.paid
-                                   FROM #groupex#.evenements AS e
-                              LEFT JOIN #groupex#.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?})
-                             INNER JOIN #groupex#.evenements_items AS ei ON (ep.eid = ei.eid AND ep.item_id = ei.item_id)
+                                   FROM group_events AS e
+                              LEFT JOIN group_event_participants AS ep ON (ep.eid = e.eid AND uid = {?})
+                             INNER JOIN group_event_items AS ei ON (ep.eid = ei.eid AND ep.item_id = ei.item_id)
                                   WHERE e.paiement_id = {?}",
                                  S::v('uid'), $pid);
             $event[$pid] = array();