X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=415b60765bc295e5ab9115e0379dc7fbd9f5fa8c;hb=1dc71da137a384e771723b8a893539a7f5cc9fab;hp=39240711dd4b9f0639a5a40498ca2249b9d9ead5;hpb=316b40d60daacd3aa3b480ccba0db6a3d97c093b;p=platal.git

diff --git a/modules/payment.php b/modules/payment.php
index 3924071..415b607 100644
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -88,14 +88,14 @@ class PaymentModule extends PLModule
     function handlers()
     {
         return array(
-            'payment'               => $this->make_hook('payment', AUTH_MDP),
-            'payment/cyber_return'  => $this->make_hook('cyber_return',  AUTH_PUBLIC),
-            'payment/paypal_return' => $this->make_hook('paypal_return',  AUTH_PUBLIC),
-            '%grp/paiement'              => $this->make_hook('xnet_payment', AUTH_MDP),
-            '%grp/payment'               => $this->make_hook('xnet_payment', AUTH_MDP),
-            '%grp/payment/cyber_return'  => $this->make_hook('cyber_return', AUTH_PUBLIC),
-            '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC),
-            'admin/payments'        => $this->make_hook('admin', AUTH_MDP, 'admin'),
+            'payment'                    => $this->make_hook('payment',       AUTH_MDP),
+            'payment/cyber_return'       => $this->make_hook('cyber_return',  AUTH_PUBLIC, 'user', NO_HTTPS),
+            'payment/paypal_return'      => $this->make_hook('paypal_return', AUTH_PUBLIC, 'user', NO_HTTPS),
+            '%grp/paiement'              => $this->make_hook('xnet_payment',  AUTH_MDP),
+            '%grp/payment'               => $this->make_hook('xnet_payment',  AUTH_MDP),
+            '%grp/payment/cyber_return'  => $this->make_hook('cyber_return',  AUTH_PUBLIC, 'user', NO_HTTPS),
+            '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC, 'user', NO_HTTPS),
+            'admin/payments'             => $this->make_hook('admin',         AUTH_MDP,    'admin'),
 
         );
     }
@@ -105,7 +105,7 @@ class PaymentModule extends PLModule
         global $globals;
 
         require_once 'profil.func.inc.php' ;
-        require_once dirname(__FILE__).'/payment/money.inc.php' ;
+        $this->load('money.inc.php');
 
         if (!empty($GLOBALS['IS_XNET_SITE'])) {
             if (!$globals->asso('id')) {
@@ -120,7 +120,7 @@ class PaymentModule extends PLModule
             }
         }
         $page->changeTpl('payment/index.tpl');
-        $page->setTitle('Polytechnique.org - Télépaiements');
+        $page->setTitle('Télépaiements');
 
         // initialisation
         $op   = Env::v('op', 'select');
@@ -208,7 +208,7 @@ class PaymentModule extends PLModule
             $res = XDB::query("SELECT  rcb.text,c.id,c.text
                                  FROM  paiement.codeRCB AS rcb
                             LEFT JOIN  paiement.codeC   AS c ON rcb.codeC=c.id
-                                WHERE  rcb.id='$champ906'");
+                                WHERE  rcb.id={?}", $champ906);
             if (list($rcb_text, $c_id, $c_text) = $res->fetchOneRow()) {
                 cb_erreur("erreur lors du paiement : $c_text ($c_id)");
             } else{
@@ -221,11 +221,22 @@ class PaymentModule extends PLModule
                            VALUES  ({?},{?},{?},{?},{?},{?},{?})",
                      $champ901, $uid, $ref, $champ200, $montant, $champ905,Env::v('comment'));
 
+        // We check if it is an Xnet payment and then update the related ML.
+        $res = XDB::query('SELECT  eid
+                             FROM  groupex.evenements
+                            WHERE  paiement_id = {?}', $ref);
+        if ($eid = $res->fetchOneCell()) {
+            $this->load('xnetevents.inc.php');
+            $evt = get_event_detail($eid);
+            subscribe_lists_event(0, $uid, $evt, $montant, true);
+        }
+
         /* on genere le mail de confirmation */
         $conf_text = str_replace("<prenom>",$prenom,$conf_text);
         $conf_text = str_replace("<nom>",$nom,$conf_text);
         $conf_text = str_replace("<promo>",$promo,$conf_text);
         $conf_text = str_replace("<montant>",$montant,$conf_text);
+        $conf_text = str_replace("<comment>", Env::v('comment'), $conf_text);
         $conf_text = str_replace("<salutation>",$femme ? "Chère" : "Cher",$conf_text);
         $conf_text = str_replace("<cher>",$femme ? "Chère" : "Cher",$conf_text);
 
@@ -311,6 +322,16 @@ class PaymentModule extends PLModule
                            VALUES  ({?},{?},{?},{?},{?},{?},{?})",
                     $no_transaction, $uid, $ref, $fullref, $montant, $clef, Env::v('comment'));
 
+        // We check if it is an Xnet payment and then update the related ML.
+        $res = XDB::query('SELECT  eid
+                             FROM  groupex.evenements
+                            WHERE  paiement_id = {?}', $ref);
+        if ($eid = $res->fetchOneCell()) {
+            $this->load('xnetevents.inc.php');
+            $evt = get_event_detail($eid);
+            subscribe_lists_event(0, $uid, $evt, $montant, true);
+        }
+
         /* on genere le mail de confirmation */
         $conf_text = str_replace("<prenom>",$prenom,$conf_text);
         $conf_text = str_replace("<nom>",$nom,$conf_text);
@@ -467,7 +488,7 @@ class PaymentModule extends PLModule
     }
 
     function handler_admin(&$page, $action = 'list', $id = null) {
-        $page->setTitle('Polytechnique.org - Administration - Paiements');
+        $page->setTitle('Administration - Paiements');
         $page->assign('title', 'Gestion des télépaiements');
         $table_editor = new PLTableEditor('admin/payments','paiement.paiements','id');
         $table_editor->add_join_table('paiement.transactions','ref',true);