<?php
/***************************************************************************
- * Copyright (C) 2003-2006 Polytechnique.org *
+ * Copyright (C) 2003-2007 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
/* sort en affichant une erreur */
function cb_erreur($text) {
- $mymail = new HermesMailer();
+ $mymail = new PlMailer();
$mymail->addTo("telepaiement@polytechnique.org");
$mymail->setFrom("webmaster@polytechnique.org");
- $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)");
+ $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)");
$mymail->setTxtBody("\n\n".var_export($_REQUEST,true));
$mymail->send();
exit;
}
/* 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;
if (!$send) return;
- $mymail = new HermesMailer();
+ $mymail = new PlMailer();
$mymail->addTo("telepaiement@polytechnique.org");
$mymail->setFrom("webmaster@polytechnique.org");
- $mymail->setSubject("erreur lors d'un télépaiement (PayPal)");
+ $mymail->setSubject("erreur lors d'un télépaiement (PayPal)");
$mymail->setTxtBody("\n\n".var_export($_REQUEST,true));
$mymail->send();
return $sum % 10;
}
-/* calcule la clé d'acceptation a partir de 5 champs */
+/* calcule la clé d'acceptation a partir de 5 champs */
function cle_accept($d1,$d2,$d3,$d4,$d5)
{
$m1 = luhn($d1.$d5);
'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'),
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');
$pay = new Payment($ref);
if($pay->flags->hasflag('old')){
- $page->trig("La transaction selectionnée est périmée.");
+ $page->trig("La transaction selectionnée est périmée.");
$pay = new Payment();
}
$val = Env::v('montant') != 0 ? Env::v('montant') : $pay->montant_def;
function handler_cyber_return(&$page, $uid = null)
{
- require_once 'diogenes/diogenes.hermes.inc.php';
-
/* 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);
/* on extrait la reference de la commande */
if (!ereg('-xorg-([0-9]+)$',$champ200,$matches)) {
- cb_erreur("référence de commande invalide");
+ cb_erreur("référence de commande invalide");
}
echo ($ref = $matches[1]);
FROM paiement.paiements
WHERE id={?}", $ref);
if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) {
- cb_erreur("référence de commande inconnue");
+ cb_erreur("référence de commande inconnue");
}
/* on extrait le code de retour */
$conf_text = str_replace("<nom>",$nom,$conf_text);
$conf_text = str_replace("<promo>",$promo,$conf_text);
$conf_text = str_replace("<montant>",$montant,$conf_text);
- $conf_text = str_replace("<salutation>",$femme ? "Chère" : "Cher",$conf_text);
- $conf_text = str_replace("<cher>",$femme ? "Chère" : "Cher",$conf_text);
+ $conf_text = str_replace("<salutation>",$femme ? "Chère" : "Cher",$conf_text);
+ $conf_text = str_replace("<cher>",$femme ? "Chère" : "Cher",$conf_text);
- $mymail = new HermesMailer();
+ $mymail = new PlMailer();
$mymail->setFrom($conf_mail);
$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 HermesMailer();
+ /* on envoie les details de la transaction à telepaiement@ */
+ $mymail = new PlMailer();
$mymail->setFrom("webmaster@polytechnique.org");
$mymail->addTo("telepaiement@staff.polytechnique.org");
$mymail->setSubject($conf_title);
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');
- }
- require_once 'diogenes/diogenes.hermes.inc.php';
+ $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 */
if ($status)
paypal_erreur("erreur lors du paiement : $status - $reason");
else
- paypal_erreur("Paiement annulé", false);
+ paypal_erreur("Paiement annulé", false);
}
/* 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);
/* on extrait la reference de la commande */
if (!ereg('-xorg-([0-9]+)$',$fullref,$matches)) {
- paypal_erreur("référence de commande invalide");
+ paypal_erreur("référence de commande invalide");
}
$ref = $matches[1];
FROM paiement.paiements
WHERE id={?}", $ref);
if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) {
- paypal_erreur("référence de commande inconnue");
+ paypal_erreur("référence de commande inconnue");
}
/* on fait l'insertion en base de donnees */
$conf_text = str_replace("<nom>",$nom,$conf_text);
$conf_text = str_replace("<promo>",$promo,$conf_text);
$conf_text = str_replace("<montant>",$montant,$conf_text);
- $conf_text = str_replace("<salutation>",$femme ? "Chère" : "Cher",$conf_text);
- $conf_text = str_replace("<cher>",$femme ? "Chère" : "Cher",$conf_text);
+ $conf_text = str_replace("<salutation>",$femme ? "Chère" : "Cher",$conf_text);
+ $conf_text = str_replace("<cher>",$femme ? "Chère" : "Cher",$conf_text);
- $mymail = new HermesMailer();
+ $mymail = new PlMailer();
$mymail->setFrom($conf_mail);
$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 HermesMailer();
+ /* on envoie les details de la transaction à telepaiement@ */
+ $mymail = new PlMailer();
$mymail->setFrom("webmaster@polytechnique.org");
$mymail->addTo("telepaiement@polytechnique.org");
$mymail->setSubject($conf_title);
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);
$order = Env::v('order', 'timestamp');
- $orders = array('timestamp', 'nom', 'promo', 'montant');
+ $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);
$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`, montant
+ 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' )
$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][$i]['montant'] = str_replace('EUR', '€', $t['montant']);
}
$trans[$pid][] = array('nom' => 'somme totale',
- 'montant' => strtr($sum, '.', ',').' ¤');
+ '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
function handler_admin(&$page, $action = 'list', $id = null) {
$page->assign('xorg_title','Polytechnique.org - Administration - Paiements');
- $page->assign('title', 'Gestion des télé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);
$table_editor->add_sort_field('flags');
$table_editor->add_sort_field('id', true, true);
- $table_editor->on_delete("UPDATE paiement.paiements SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé");
- $table_editor->describe('text','intitulé',true);
+ $table_editor->on_delete("UPDATE paiement.paiements SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé");
+ $table_editor->describe('text','intitulé',true);
$table_editor->describe('url','site web',false);
- $table_editor->describe('montant_def','montant par défaut',false);
+ $table_editor->describe('montant_def','montant par défaut',false);
$table_editor->describe('montant_min','montant minimum',false);
$table_editor->describe('montant_max','montant maximum',false);
$table_editor->describe('mail','email contact',true);
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>