projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wording.
[platal.git]
/
modules
/
payment.php
diff --git
a/modules/payment.php
b/modules/payment.php
index
9a878dd
..
4fa0641
100644
(file)
--- a/
modules/payment.php
+++ b/
modules/payment.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
3
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-251,7
+251,7
@@
class PaymentModule extends PLModule
}
/* on extrait la reference de la commande */
}
/* on extrait la reference de la commande */
- if (!
ereg('-([0-9]+)$
', Env::v('vads_order_id'), $matches)) {
+ if (!
preg_match('/-([0-9]+)$/
', Env::v('vads_order_id'), $matches)) {
cb_erreur("référence de commande invalide");
}
cb_erreur("référence de commande invalide");
}
@@
-362,7
+362,7
@@
class PaymentModule extends PLModule
}
/* on extrait la reference de la commande */
}
/* on extrait la reference de la commande */
- if (!
ereg('-xorg-([0-9]+)$
', $fullref, $matches)) {
+ if (!
preg_match('/-xorg-([0-9]+)$/
', $fullref, $matches)) {
paypal_erreur("référence de commande invalide");
}
paypal_erreur("référence de commande invalide");
}
@@
-934,7
+934,7
@@
class PaymentModule extends PLModule
FROM payment_transactions AS t
LEFT JOIN payments AS p ON (t.ref = p.id)
LEFT JOIN groups AS g ON (p.asso_id = g.id)
FROM payment_transactions AS t
LEFT JOIN payments AS p ON (t.ref = p.id)
LEFT JOIN groups AS g ON (p.asso_id = g.id)
- WHERE t.recon_id IN {?}
+ WHERE t.recon_id IN {?}
AND t.status = "confirmed"
GROUP BY t.ref',
$recongp_id, $recon_ids);
GROUP BY t.ref',
$recongp_id, $recon_ids);
@@
-1027,7
+1027,7
@@
class PaymentLogsImporter extends CSVImporter {
return null;
}
$reference = self::getValue($line, 'reference', $relation['reference']);
return null;
}
$reference = self::getValue($line, 'reference', $relation['reference']);
- if (
ereg('-([0-9]+)$
', $reference, $matches)) {
+ if (
preg_match('/-([0-9]+)$/
', $reference, $matches)) {
return $matches[1];
} else {
return null;
return $matches[1];
} else {
return null;
@@
-1035,5
+1035,5
@@
class PaymentLogsImporter extends CSVImporter {
}
}
}
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>