X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=11926f9c840730bbc0368c77ca10411ab2195f7d;hb=b3454c7f74fd5fd547c6e36f3eecd7740d9bf61f;hp=f3f9d3e04dc8d469693b0deefa469ce96a4f01b9;hpb=88e3843c8c8632977c2c495547ce6b4703567e3f;p=platal.git diff --git a/modules/payment.php b/modules/payment.php index f3f9d3e..11926f9 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(); @@ -39,8 +39,8 @@ function paypal_erreur($text, $send=true) 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(); @@ -71,6 +71,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 { @@ -85,7 +95,7 @@ class PaymentModule extends PLModule '%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'), - + ); } @@ -107,11 +117,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'); @@ -155,24 +163,24 @@ class PaymentModule extends PLModule function handler_cyber_return(&$page, $uid = null) { /* reference banque (numero de transaction) */ - $champ901 = clean_request('CHAMP901'); + $champ901 = Env::s('CHAMP901'); /* cle d'acceptation */ - $champ905 = clean_request('CHAMP905'); + $champ905 = Env::s('CHAMP905'); /* code retour */ - $champ906 = clean_request('CHAMP906'); + $champ906 = Env::s('CHAMP906'); /* email renvoye par la banque */ - $champ104 = clean_request('CHAMP104'); + $champ104 = Env::s('CHAMP104'); /* reference complete de la commande */ - $champ200 = clean_request('CHAMP200'); + $champ200 = Env::s('CHAMP200'); /* montant de la transaction */ - $champ201 = clean_request('CHAMP201'); + $champ201 = Env::s('CHAMP201'); /* devise */ - $champ202 = clean_request('CHAMP202'); + $champ202 = Env::s('CHAMP202'); $montant = "$champ201 $champ202"; /* on extrait les informations sur l'utilisateur */ $res = XDB::query(" - SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET(a.flags,'femme') + SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET('femme', a.flags) FROM auth_user_md5 AS a INNER JOIN aliases AS l ON (a.user_id=l.id AND type!='homonyme') WHERE a.user_id={?}", $uid); @@ -202,7 +210,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"); } } @@ -220,9 +228,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); @@ -230,8 +239,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". @@ -247,26 +256,22 @@ class PaymentModule extends PLModule function handler_paypal_return(&$page, $uid = null) { - if (!empty($GLOBALS['IS_XNET_SITE'])) { - new_group_open_page('payment/retour_paypal.tpl'); - } else { - $page->changeTpl('payment/retour_paypal.tpl'); - } + $page->changeTpl('payment/retour_paypal.tpl'); /* reference banque (numero de transaction) */ - $no_transaction = clean_request('tx'); + $no_transaction = Env::s('tx'); /* token a renvoyer pour avoir plus d'information */ - $clef = clean_request('sig'); + $clef = Env::s('sig'); /* code retour */ - $status = clean_request('st'); + $status = Env::s('st'); /* raison */ - $reason = ($status == 'Pending')?clean_request('pending_reason'):clean_request('reason_code'); + $reason = ($status == 'Pending')? Env::s('pending_reason'): Env::s('reason_code'); /* reference complete de la commande */ - $fullref = clean_request('cm'); + $fullref = Env::s('cm'); /* montant de la transaction */ - $montant_nb = clean_request('amt'); + $montant_nb = Env::s('amt'); /* devise */ - $montant_dev = clean_request('cc'); + $montant_dev = Env::s('cc'); $montant = "$montant_nb $montant_dev"; /* on extrait le code de retour */ @@ -279,7 +284,7 @@ class PaymentModule extends PLModule /* on extrait les informations sur l'utilisateur */ $res = XDB::query(" - SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET(a.flags,'femme') + SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET('femme', a.flags) FROM auth_user_md5 AS a INNER JOIN aliases AS l ON (a.user_id=l.id AND type!='homonyme') WHERE a.user_id={?}", $uid); @@ -313,9 +318,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); @@ -323,8 +329,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". @@ -343,16 +349,31 @@ 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); } - new_group_page('payment/xnet.tpl'); - + $page->changeTpl('payment/xnet.tpl'); + $res = XDB::query( "SELECT id, text, url FROM {$globals->money->mpay_tprefix}paiements - WHERE asso_id = {?} AND NOT FIND_IN_SET(flags, 'old') + WHERE asso_id = {?} AND NOT FIND_IN_SET('old', flags) ORDER BY id DESC", $globals->asso('id')); $tit = $res->fetchAllAssoc(); $page->assign('titres', $tit); @@ -439,10 +460,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'); @@ -459,7 +481,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: