Merge branch 'xorg/maint' into xorg/master

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index ff30e73..843f7c0 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -202,7 +202,7 @@ def to_forlife(email):
         mbox = email
         fqdn = PLATAL_DOMAIN
     if ( fqdn == PLATAL_DOMAIN ) or ( fqdn == PLATAL_DOMAIN2 ):
-        res = mysql_fetchone("""SELECT  CONCAT(f.alias, '@%s'), a.full_name
+        res = mysql_fetchone("""SELECT  CONCAT(s1.email, '@%s'), a.full_name
                                   FROM  accounts AS a
                             INNER JOIN  email_source_account AS s1 ON (a.uid = s1.uid AND s1.type = 'forlife')
                             INNER JOIN  email_source_account AS s2 ON (a.uid = s2.uid AND s2.email = '%s')

diff --git a/classes/userfilter/conditions.inc.php b/classes/userfilter/conditions.inc.php
index 859a125..e445d21 100644 (file)
--- a/classes/userfilter/conditions.inc.php
+++ b/classes/userfilter/conditions.inc.php
@@ -988,7 +988,7 @@ class UFC_Email extends UserFilterCondition
 
         if (count($foreign) > 0) {
             $sub = $uf->addEmailRedirectFilter($foreign);
-            $cond[] = XDB::format('ra' . $sub . '.redirect IS NOT NULL OR ra.redirect IN {?}', $foreign);
+            $cond[] = XDB::format('ra' . $sub . '.redirect IS NOT NULL OR ra' . $sub . '.redirect IN {?}', $foreign);
         }
         if (count($local) > 0) {
             $sub = $uf->addAliasFilter($local);

diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php
index 4656f32..83e2689 100644 (file)
--- a/include/validations/paiements.inc.php
+++ b/include/validations/paiements.inc.php
@@ -195,7 +195,7 @@ Si le télépaiement n'est pas lié à un groupe ou supérieur à 51 euros, lais
                 $topay = $u['montant'] - $u['paid'];
                 if ($topay > 0) {
                     $mailer = new PlMailer('xnetevents/newpayment.mail.tpl');
-                    $mail->addTo($u['user']);
+                    $mailer->addTo($u['user']);
                     $mailer->assign('asso', $nom);
                     $mailer->assign('diminutif', $diminutif);
                     $mailer->assign('evt', $evt);

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index cfda3c1..c18809f 100644 (file)
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -48,7 +48,7 @@ function list_sort_owners($members, $tri_promo = true)
 
     ksort($membres);
     foreach($membres as &$membre)  {
-        uksort($membre, strcasecmp);
+        uksort($membre, 'strcasecmp');
     }
     return $membres;
 }

diff --git a/templates/include/form.valid.edit-paiements.tpl b/templates/include/form.valid.edit-paiements.tpl
index b8de1e0..4d91d37 100644 (file)
--- a/templates/include/form.valid.edit-paiements.tpl
+++ b/templates/include/form.valid.edit-paiements.tpl
@@ -27,7 +27,7 @@
 <br />
 <input type="submit" name="preview" value="Aperçu" onclick="previewWiki('msg_{$valid->id()}', 'preview_{$valid->id()}', true, 'preview_{$valid->id()}'); return false;" /><br />
 <strong>Site&nbsp;:</strong> <input type="text" name="pay_site" size="45" value="{$valid->site}" />
-<br>
+<br />
 <strong>Montant&nbsp;:</strong> <input type="text" name="pay_montant" size="5" value="{$valid->montant}" />
 (min <input type="text" name="pay_montant_min" size="5" value="{$valid->montant_min}" />
 &nbsp;->&nbsp; max <input type="text" name="pay_montant_max" size="5" value="{$valid->montant_max}" />)