Merge branch 'xorg/maint' into xorg/master

diff --combined modules/payment.php
index 91771e6,6bf554a..ef0ed1a
--- 1/modules/payment.php
--- 2/modules/payment.php
+++ b/modules/payment.php
@@@ -108,8 -108,8 +108,8 @@@ class PaymentModule extends PLModul
              'payment'                      => $this->make_hook('payment',          AUTH_MDP,    'payment'),
              'payment/cyber2_return'        => $this->make_hook('cyber2_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/paiement'                => $this->make_hook('xnet_payment',     AUTH_MDP,    'user'),
 +            '%grp/payment'                 => $this->make_hook('xnet_payment',     AUTH_MDP,    'user'),
              '%grp/payment/csv'             => $this->make_hook('payment_csv',      AUTH_MDP,    'groupadmin'),
              '%grp/payment/cyber2_return'   => $this->make_hook('cyber2_return',    AUTH_PUBLIC, 'user', NO_HTTPS),
              '%grp/payment/paypal_return'   => $this->make_hook('paypal_return',    AUTH_PUBLIC, 'user', NO_HTTPS),
@@@ -410,7 -410,7 +410,7 @@@
              }
              $res = XDB::query("SELECT  1
                                   FROM  group_events AS e
-                            INNER JOIN  group_event_participants AS ep ON (ep.eid = e.eid AND e.uid = {?})
+                            INNER JOIN  group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?})
                                  WHERE  e.paiement_id = {?} AND e.asso_id = {?}",
                                S::i('uid'), $pid, $globals->asso('id'));
              if ($res->numRows() == 0) {