X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=7545ae9bffa41db67d18ee5c55dae0e936132225;hb=efe597c5795234724bc3df508bd628f9860a9c32;hp=11926f9c840730bbc0368c77ca10411ab2195f7d;hpb=d0327f6de73e81c4bcc656471ca4161e4f1e1e1b;p=platal.git

diff --git a/modules/payment.php b/modules/payment.php
index 11926f9..7545ae9 100644
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -21,6 +21,7 @@
 
 /* sort en affichant une erreur */
 function cb_erreur($text) {
+    global $globals;
     $mymail = new PlMailer();
     $mymail->addTo($globals->money->email);
     $mymail->setFrom("webmaster@" . $globals->mail->domain);
@@ -33,7 +34,7 @@ function cb_erreur($text) {
 /* sort en affichant une erreur */
 function paypal_erreur($text, $send=true)
 {
-    global $page, $erreur;
+    global $erreur, $globals;
     if ($erreur) return;
     $erreur = $text;
     if (!$send) return;
@@ -45,7 +46,7 @@ function paypal_erreur($text, $send=true)
     $mymail->setTxtBody("\n\n".var_export($_REQUEST,true));
     $mymail->send();
 
-    $page->trig($text);
+    Platal::page()->trigError($text);
 }
 
 /* http://fr.wikipedia.org/wiki/Formule_de_Luhn */
@@ -88,12 +89,12 @@ class PaymentModule extends PLModule
     {
         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),
+            '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),
-            '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC),
+            '%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'),
 
         );
@@ -104,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')) {
@@ -119,7 +120,7 @@ class PaymentModule extends PLModule
             }
         }
         $page->changeTpl('payment/index.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Télépaiements');
+        $page->setTitle('Télépaiements');
 
         // initialisation
         $op   = Env::v('op', 'select');
@@ -127,13 +128,13 @@ class PaymentModule extends PLModule
         $pay  = new Payment($ref);
 
         if($pay->flags->hasflag('old')){
-            $page->trig("La transaction selectionnée est périmée.");
+            $page->trigError("La transaction selectionnée est périmée.");
             $pay = new Payment();
         }
         $val = Env::v('montant') != 0 ? Env::v('montant') : $pay->montant_def;
 
         if (($e = $pay->check($val)) !== true) {
-            $page->trig($e);
+            $page->trigError($e);
         }
 
         if ($op=='submit') {
@@ -466,7 +467,7 @@ class PaymentModule extends PLModule
     }
 
     function handler_admin(&$page, $action = 'list', $id = null) {
-        $page->assign('xorg_title','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);