X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=69ba4c2b3cfb2c479a9412764256f922c43cc492;hb=524d1205c09d3f8e14a5751b2cbbce7e2fd23008;hp=00c9c118bac25fdc809cf7c8bfea946d0d20985c;hpb=962ce33ec0f0b5b645d9fd294df17f279cc84ad3;p=platal.git diff --git a/modules/payment.php b/modules/payment.php index 00c9c11..69ba4c2 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(); exit; } -// schmurtz : hot bugfix -function clean_request($param) { - return $_REQUEST[$param]; -} - /* 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; $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); + Platal::page()->trigError($text); } /* http://fr.wikipedia.org/wiki/Formule_de_Luhn */ @@ -76,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 { @@ -83,14 +89,14 @@ 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), - '%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), + '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'), - + ); } @@ -99,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')) { @@ -114,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'); @@ -122,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') { @@ -158,19 +164,19 @@ 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 */ @@ -205,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"); } } @@ -223,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); @@ -233,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". @@ -250,26 +257,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 */ @@ -316,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); @@ -326,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". @@ -346,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 @@ -442,12 +461,13 @@ 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->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); @@ -462,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: