X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=9324e08495e2095b8f74a5288babdc2fd0ebec36;hb=c52d86d1d876e6def108e1d458604cc9714c252d;hp=10587b63cbc0660f09311f74b3d29e733d0fcdea;hpb=1490093c909c086ce8eba3c0f5c24b62ef20cfb3;p=platal.git diff --git a/modules/payment.php b/modules/payment.php index 10587b6..9324e08 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 $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 */ @@ -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 { @@ -78,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'), - + ); } @@ -94,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')) { @@ -109,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'); @@ -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') { @@ -153,86 +164,80 @@ 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') - 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); - if (!list($prenom,$nom,$promo,$forlife,$femme) = $res->fetchOneRow()) { + $user = User::get($uid); + if (!$user) { cb_erreur("uid invalide"); } /* on extrait la reference de la commande */ - if (!ereg('-xorg-([0-9]+)$',$champ200,$matches)) { + if (!ereg('-xorg-([0-9]+)$', $champ200, $matches)) { cb_erreur("référence de commande invalide"); } echo ($ref = $matches[1]); - $res = XDB::query("SELECT mail,text,confirmation + $res = XDB::query("SELECT mail, text, confirmation FROM paiement.paiements WHERE id={?}", $ref); - if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) { + if (!list($conf_mail, $conf_title, $conf_text) = $res->fetchOneRow()) { cb_erreur("référence de commande inconnue"); } /* on extrait le code de retour */ if ($champ906 != "0000") { - $res = XDB::query("SELECT rcb.text,c.id,c.text + $res = XDB::query('SELECT rcb.text, c.id, c.text FROM paiement.codeRCB AS rcb - LEFT JOIN paiement.codeC AS c ON rcb.codeC=c.id - WHERE rcb.id='$champ906'"); + LEFT JOIN paiement.codeC AS c ON (rcb.codeC = c.id) + 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"); } } /* on fait l'insertion en base de donnees */ - XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle,comment) - VALUES ({?},{?},{?},{?},{?},{?},{?})", - $champ901, $uid, $ref, $champ200, $montant, $champ905,Env::v('comment')); + XDB::execute("INSERT INTO paiement.transactions (id, uid, ref, fullref, montant, cle, comment) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})", + $champ901, $user->id(), $ref, $champ200, $montant, $champ905, Env::v('comment')); /* on genere le mail de confirmation */ - $conf_text = str_replace("",$prenom,$conf_text); - $conf_text = str_replace("",$nom,$conf_text); - $conf_text = str_replace("",$promo,$conf_text); - $conf_text = str_replace("",$montant,$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + $conf_text = str_replace(array('', '', '', '', '', ''), + array($user->firstName(), $user->lastName(), $user->promo(), $montant, + $user->isFemale() ? 'Chère' : 'Cher', + $user->isFemale() ? 'Chère' : 'Cher'), $conf_text); + global $globals; $mymail = new PlMailer(); $mymail->setFrom($conf_mail); - $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); $mymail->setWikiBody($conf_text); - $mymail->send(S::v('mail_fmt') == 'html'); + $mymail->sendTo($user); /* 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". + $msg = 'utilisateur : ' . $user->login() . ' (' . $user->id() . ')' . "\n" . + 'mail : ' . $user->forlifeEmail() . "\n\n" . "paiement : $conf_title ($conf_mail)\n". "reference : $champ200\n". "montant : $montant\n\n". @@ -245,26 +250,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 */ @@ -276,58 +277,52 @@ 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') - 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); - if (!list($prenom,$nom,$promo,$forlife,$femme) = $res->fetchOneRow()) { + $user = User::get($uid); + if (!$user) { paypal_erreur("uid invalide"); } /* on extrait la reference de la commande */ - if (!ereg('-xorg-([0-9]+)$',$fullref,$matches)) { + if (!ereg('-xorg-([0-9]+)$', $fullref, $matches)) { paypal_erreur("référence de commande invalide"); } $ref = $matches[1]; - $res = XDB::query("SELECT mail,text,confirmation + $res = XDB::query("SELECT mail, text, confirmation FROM paiement.paiements - WHERE id={?}", $ref); + WHERE id = {?}", $ref); if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) { paypal_erreur("référence de commande inconnue"); } /* on fait l'insertion en base de donnees */ - XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle,comment) - VALUES ({?},{?},{?},{?},{?},{?},{?})", - $no_transaction, $uid, $ref, $fullref, $montant, $clef, Env::v('comment')); + XDB::execute("INSERT INTO paiement.transactions (id, uid, ref, fullref, montant, cle, comment) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})", + $no_transaction, $user->id(), $ref, $fullref, $montant, $clef, Env::v('comment')); /* on genere le mail de confirmation */ - $conf_text = str_replace("",$prenom,$conf_text); - $conf_text = str_replace("",$nom,$conf_text); - $conf_text = str_replace("",$promo,$conf_text); - $conf_text = str_replace("",$montant,$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + $conf_text = str_replace(array('', '', '', '', '', ''), + array($user->firstName(), $user->lastName(), $user->promo(), $montant, + $user->isFemale() ? 'Chère' : 'Cher', + $user->isFemale() ? 'Chère' : 'Cher'), $conf_text); + global $globals; $mymail = new PlMailer(); $mymail->setFrom($conf_mail); - $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); $mymail->setWikiBody($conf_text); - $mymail->send(S::v('mail_fmt') == 'html'); + $mymail->sendTo($user); /* 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". + $msg = 'utilisateur : ' . $user->login() . ' (' . $user->id() . ')' . "\n" . + 'mail : ' . $user->forlifeEmail() . "\n\n" . "paiement : $conf_title ($conf_mail)\n". - "reference : $no_transaction\n". + "reference : $champ200\n". "montant : $montant\n\n". "dump de REQUEST:\n". var_export($_REQUEST,true); @@ -341,72 +336,53 @@ 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 - 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); - $order = Env::v('order', 'timestamp'); - $orders = array('timestamp', 'nom', 'promo', 'montant', 'comment'); - if (!in_array($order, $orders)) { - $order = 'timestamp'; - } elseif ($order == 'comment') { - $order = 't.comment'; - } - $inv_order = Env::v('order_inv', 0); - $page->assign('order', $order); - $page->assign('order_inv', !$inv_order); - - if ($order == 'timestamp') { - $inv_order = !$inv_order; - } - - if ($inv_order) { - $inv_order = ' DESC'; - } else { - $inv_order = ''; - } - if ($order == 'montant') { - $order = 'LENGTH(montant) '.$inv_order.', montant'; - } - - $orderby = 'ORDER BY '.$order.$inv_order; - if ($order != 'nom') { - $orderby .= ', nom'; $inv_order = ''; - } - $orderby .= ', prenom'.$inv_order; - if ($order != 'timestamp') { - $orderby .= ', timestamp DESC'; - } + // TODO: replug sort. $trans = array(); $event = array(); foreach($tit as $foo) { $pid = $foo['id']; if (may_update()) { - $res = XDB::query("SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, - u.prenom, u.promo, a.alias, timestamp AS `date`, t.comment, montant - FROM {$globals->money->mpay_tprefix}transactions AS t - INNER JOIN auth_user_md5 AS u ON ( t.uid = u.user_id ) - INNER JOIN aliases AS a ON ( t.uid = a.id AND a.type='a_vie' ) - WHERE ref = {?} ".$orderby, $pid); - $trans[$pid] = $res->fetchAllAssoc(); - $sum = 0; - foreach ($trans[$pid] as $i => $t) { - $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], 'EUR')), ',', '.'); - $trans[$pid][$i]['montant'] = str_replace('EUR', '€', $t['montant']); - } - $trans[$pid][] = array('nom' => 'somme totale', - 'montant' => strtr($sum, '.', ',').' €'); + $res = XDB::query('SELECT t.uid, timestamp AS `date`, t.comment, montant + FROM ' . $globals->money->mpay_tprefix . 'transactions AS t + WHERE t.ref = {?}', $pid); + $trans[$pid] = User::getBulkUsersWithUIDs($res->fetchAllAssoc(), 'uid', 'user'); + $sum = 0; + foreach ($trans[$pid] as $i => $t) { + $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], 'EUR')), ',', '.'); + $trans[$pid][$i]['montant'] = str_replace('EUR', '€', $t['montant']); + } + $trans[$pid][] = array('nom' => 'somme totale', + 'montant' => strtr($sum, '.', ',').' €'); } $res = XDB::iterRow("SELECT e.eid, e.short_name, e.intitule, ep.nb, ei.montant, ep.paid FROM groupex.evenements AS e @@ -437,12 +413,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); @@ -457,7 +434,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: