X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment%2Fmoney.inc.php;h=4fedaa3fb065c50253ca85e510b4ae293336ff20;hb=448c8cdc9ec81362d230534097a9788bc2b005c9;hp=83b21db207b06acae3f459d7326b35dda2f0a6a0;hpb=82af3fc3b6e003b0cbbcf4faf4ed4f0ea5c07570;p=platal.git diff --git a/modules/payment/money.inc.php b/modules/payment/money.inc.php index 83b21db..4fedaa3 100644 --- a/modules/payment/money.inc.php +++ b/modules/payment/money.inc.php @@ -1,6 +1,6 @@ money->mpay_def_id : $ref; - $res = XDB::query("SELECT id, text, url, flags, mail, amount_min, amount_max, amount_def, asso_id - FROM payments WHERE id={?}", $r); + + $r = ($ref == -1) ? $globals->money->mpay_def_id : $ref; + $res = XDB::query('SELECT id, text, url, flags, mail, amount_min, amount_max, amount_def, asso_id + FROM payments + WHERE id = {?}', $r); list($this->id, $this->text, $this->url, $flags, $this->mail, $this->amount_min, $this->amount_max, $this->amount_def, $this->asso_id) = $res->fetchOneRow(); $this->amount_min = (float)$this->amount_min; $this->amount_max = (float)$this->amount_max; - $this->flags = new PlFlagSet($flags); + $this->flags = new PlFlagSet($flags); } - // }}} - // {{{ function check() - function check($value) { $v = (float)strtr($value, ',', '.'); @@ -67,21 +61,15 @@ class Payment } } - // }}} - // {{{ function init() - function init($val, $meth) { - require_once dirname(__FILE__).'/money/'.$meth->inc; + require_once dirname(__FILE__) . '/money/' . $meth->inc; $this->api = new $api($val); } - // }}} - // {{{ function prepareform() - - function prepareform() + function prepareform(User $user) { - return $this->api->prepareform($this); + return $this->api->prepareform($this, $user); } function event() @@ -98,34 +86,25 @@ class Payment } return null; } - // }}} } -// {{{ class PayMethod - class PayMethod { - // {{{ properties - - var $id; - var $text; - var $inc; - - // }}} - // {{{ constructor + public $id; + public $text; + public $inc; - function PayMethod($id=-1) + function PayMethod($id = -1) { global $globals; - $i = $id==-1 ? $globals->money->mpay_def_meth : $id; - $res = XDB::query("SELECT id,text,include FROM payment_methods WHERE id={?}", $i); + + $i = ($id == -1) ? $globals->money->mpay_def_meth : $id; + $res = XDB::query('SELECT id, text, include + FROM payment_methods + WHERE id = {?}', $i); list($this->id, $this->text, $this->inc) = $res->fetchOneRow(); } - - // }}} } -// }}} - -// 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 fenc=utf-8: ?>