X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=9de57d159a88bbfefa501b0ac06b5e8c60368830;hb=47fa97fed308292ab5e7bed6f870b39f55747aa8;hp=92c6cc4b46147a2de4aa945671c1b2859919391a;hpb=da1576601ca1b7c1dfab02d3f1891a01cee1ad95;p=platal.git diff --git a/modules/payment.php b/modules/payment.php index 92c6cc4..9de57d1 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -1,6 +1,6 @@ addTo("telepaiement@polytechnique.org"); - $mymail->setFrom("webmaster@polytechnique.org"); + $mymail->addTo($globals->money->email); + $mymail->setFrom("webmaster@" . $globals->mail->domain); $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)"); $mymail->setTxtBody("\n\n".var_export($_REQUEST,true)); $mymail->send(); @@ -33,19 +34,19 @@ function cb_erreur($text) { /* sort en affichant une erreur */ function paypal_erreur($text, $send=true) { - global $page, $erreur; + global $page, $erreur, $globals; if ($erreur) return; $erreur = $text; if (!$send) return; $mymail = new PlMailer(); - $mymail->addTo("telepaiement@polytechnique.org"); - $mymail->setFrom("webmaster@polytechnique.org"); + $mymail->addTo($globals->money->email); + $mymail->setFrom("webmaster@" . $globals->mail->domain); $mymail->setSubject("erreur lors d'un télépaiement (PayPal)"); $mymail->setTxtBody("\n\n".var_export($_REQUEST,true)); $mymail->send(); - $page->trig($text); + $page->trigError($text); } /* http://fr.wikipedia.org/wiki/Formule_de_Luhn */ @@ -71,6 +72,16 @@ function cle_accept($d1,$d2,$d3,$d4,$d5) return $alpha{$n-1}.$m1.$m2.$m3.$m4; } +/* decode the comment */ +function comment_decode($comment) { + $comment = urldecode($comment); + if (is_utf8($comment)) { + return $comment; + } else { + return utf8_encode($comment); + } +} + class PaymentModule extends PLModule { @@ -80,12 +91,12 @@ 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, 'groupmember'), - '%grp/payment' => $this->make_hook('xnet_payment', AUTH_MDP, 'groupmember'), + '%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'), - + ); } @@ -117,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') { @@ -200,7 +211,7 @@ class PaymentModule extends PLModule 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{ + } else{ cb_erreur("erreur inconnue lors du paiement"); } } @@ -218,9 +229,10 @@ class PaymentModule extends PLModule $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + global $globals; $mymail = new PlMailer(); $mymail->setFrom($conf_mail); - $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); + $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mail->domain . '>'); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); $mymail->setWikiBody($conf_text); @@ -228,8 +240,8 @@ class PaymentModule extends PLModule /* on envoie les details de la transaction à telepaiement@ */ $mymail = new PlMailer(); - $mymail->setFrom("webmaster@polytechnique.org"); - $mymail->addTo("telepaiement@staff.polytechnique.org"); + $mymail->setFrom("webmaster@" . $globals->mail->domain); + $mymail->addTo($globals->money->email); $mymail->setSubject($conf_title); $msg = "utilisateur : $prenom $nom ($uid)\n". "mail : $forlife@polytechnique.org\n\n". @@ -307,9 +319,10 @@ class PaymentModule extends PLModule $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + global $globals; $mymail = new PlMailer(); $mymail->setFrom($conf_mail); - $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); + $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mail->domain . '>'); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); $mymail->setWikiBody($conf_text); @@ -317,8 +330,8 @@ class PaymentModule extends PLModule /* on envoie les details de la transaction à telepaiement@ */ $mymail = new PlMailer(); - $mymail->setFrom("webmaster@polytechnique.org"); - $mymail->addTo("telepaiement@polytechnique.org"); + $mymail->setFrom("webmaster@" . $globals->mail->domain); + $mymail->addTo($globals->money->email); $mymail->setSubject($conf_title); $msg = "utilisateur : $prenom $nom ($uid)\n". "mail : $forlife@polytechnique.org\n\n". @@ -337,12 +350,27 @@ class PaymentModule extends PLModule function handler_xnet_payment(&$page, $pid = null) { global $globals; - + + $perms = S::v('perms'); + if (!$perms->hasFlag('groupmember')) { + if (is_null($pid)) { + 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 = {?}) + WHERE e.paiement_id = {?} AND e.asso_id = {?}", + S::i('uid'), $pid, $globals->asso('id')); + if ($res->numRows() == 0) { + return PL_FORBIDDEN; + } + } + if (!is_null($pid)) { return $this->handler_payment($page, $pid); } $page->changeTpl('payment/xnet.tpl'); - + $res = XDB::query( "SELECT id, text, url FROM {$globals->money->mpay_tprefix}paiements @@ -433,10 +461,11 @@ class PaymentModule extends PLModule $event[$pid]['paid'] += trim($p); } } + $page->register_modifier('decode_comment', 'decode_comment'); $page->assign('trans', $trans); $page->assign('event', $event); } - + function handler_admin(&$page, $action = 'list', $id = null) { $page->assign('xorg_title','Polytechnique.org - Administration - Paiements'); $page->assign('title', 'Gestion des télépaiements'); @@ -453,7 +482,7 @@ class PaymentModule extends PLModule $table_editor->describe('mail','email contact',true); $table_editor->describe('confirmation','message confirmation',false); $table_editor->apply($page, $action, $id); - } + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: