decode utf8 before encoding in javascript, #654

[platal.git] / modules / payment.php

diff --git a/modules/payment.php b/modules/payment.php
index 0d07972..10587b6 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -31,7 +31,8 @@ function cb_erreur($text) {
 }
 
 /* sort en affichant une erreur */
-function paypal_erreur($text, $send=true) {
+function paypal_erreur($text, $send=true)
+{
     global $page, $erreur;
     if ($erreur) return;
     $erreur = $text;
@@ -79,8 +80,8 @@ class PaymentModule extends PLModule
             '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/paiement'              => $this->make_hook('xnet_payment', AUTH_MDP, 'groupmember'),
+            '%grp/payment'               => $this->make_hook('xnet_payment', AUTH_MDP, 'groupmember'),
             '%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'),
@@ -106,11 +107,9 @@ class PaymentModule extends PLModule
             if (!$res->numRows()) {
                 return PL_FORBIDDEN;
             }
-            new_group_page('payment/index.tpl');
-        } else {
-            $page->changeTpl('payment/index.tpl');
-            $page->assign('xorg_title','Polytechnique.org - Télépaiements');
         }
+        $page->changeTpl('payment/index.tpl');
+        $page->assign('xorg_title','Polytechnique.org - Télépaiements');
 
         // initialisation
         $op   = Env::v('op', 'select');
@@ -224,8 +223,8 @@ class PaymentModule extends PLModule
         $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>");
         $mymail->addCc($conf_mail);
         $mymail->setSubject($conf_title);
-        $mymail->setTxtBody($conf_text);
-        $mymail->send();
+        $mymail->setWikiBody($conf_text);
+        $mymail->send(S::v('mail_fmt') == 'html');
 
         /* on envoie les details de la transaction à telepaiement@ */
         $mymail = new PlMailer();
@@ -317,8 +316,8 @@ class PaymentModule extends PLModule
         $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>");
         $mymail->addCc($conf_mail);
         $mymail->setSubject($conf_title);
-        $mymail->setTxtBody($conf_text);
-        $mymail->send();
+        $mymail->setWikiBody($conf_text);
+        $mymail->send(S::v('mail_fmt') == 'html');
 
         /* on envoie les details de la transaction à telepaiement@ */
         $mymail = new PlMailer();
@@ -346,7 +345,7 @@ class PaymentModule extends PLModule
         if (!is_null($pid)) {
             return  $this->handler_payment($page, $pid);
         }
-        new_group_page('payment/xnet.tpl');
+        $page->changeTpl('payment/xnet.tpl');
         
         $res = XDB::query(
                 "SELECT  id, text, url