From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 16 Dec 2010 20:09:39 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
X-Git-Tag: xorg/1.0.2~72
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cafb410fea6f257f45da08631c6cdb5c35f86b17;hp=551e00c175feb8f3511c603f8871b70900f461ef;p=platal.git

Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
---

diff --git a/bin/cron/cron_ml_moderate.php b/bin/cron/cron_ml_moderate.php
index c6d22a6..c4d16b5 100755
--- a/bin/cron/cron_ml_moderate.php
+++ b/bin/cron/cron_ml_moderate.php
@@ -26,6 +26,11 @@ ini_set('memory_limit', '128M');
 $sent_mails = 0;
 $handler    = time();
 
+/* Cleanup dead locks */
+XDB::execute('UPDATE  email_list_moderate
+                 SET  handler = NULL
+               WHERE  handler < NOW() - 300');
+
 while ($sent_mails < $globals->lists->max_mail_per_min
        && time() - $handler < 60) {
     // take a lock on a mail
diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index e9529ae..00b498c 100755
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -148,7 +148,7 @@ class BasicAuthXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             userdesc = UserDesc(forlife, name, None, 0)
             return (userdesc, perms, vhost)
         else:
-            print "no user found for uid: %s, passwd: %s" % (uid, md5)
+            print >> sys.stderr, "no user found for uid: %s, passwd: %s" % (uid, md5)
             return None
 
 ################################################################################
@@ -242,7 +242,7 @@ def list_call_dispatcher(method, userdesc, perms, vhost, *arg):
         @root:  the handler requires site admin rights
     """
     try:
-        print "calling method: %s" % method
+        print >> sys.stderr, "calling method: %s" % method
         if has_annotation(method, "root") and perms != "admin":
             return 0
         if has_annotation(method, "mlist"):
diff --git a/core b/core
index 7299bfc..798c1f4 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7299bfcef8ccaffa52ecd0ca3adf92c84f79c248
+Subproject commit 798c1f4b15f14569c1f37d848db93ec4f65518b6
diff --git a/include/reminder/ml.inc.php b/include/reminder/ml.inc.php
index 2bb8ba3..c5ee810 100644
--- a/include/reminder/ml.inc.php
+++ b/include/reminder/ml.inc.php
@@ -39,7 +39,7 @@ class ReminderMl extends Reminder
                     if ($domain != $current_domain) {
                         $current_domain = $domain;
                     }
-                    $client = new MMList(S::v('uid'), S::v('password'), $domain);
+                    $client = new MMList(S::user(), $domain);
                     $client->subscribe($sub);
                 }
             }
@@ -72,7 +72,7 @@ class ReminderMl extends Reminder
         while (list($sub, $domain) = $res->next()) {
             if ($current_domain != $domain) {
                 $current_domain = $domain;
-                $client = new MMList(S::v('uid'), S::v('password'), $domain);
+                $client = new MMList(S::user(), $domain);
             }
             list($details, ) = $client->get_members($sub);
             $lists["$sub@$domain"] = $details;
diff --git a/modules/payment.php b/modules/payment.php
index 06ddd9c..39f8193 100644
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -483,7 +483,7 @@ class PaymentModule extends PLModule
             }
             $res = XDB::query("SELECT  1
                                  FROM  group_events AS e
-                           INNER JOIN  group_event_participants AS ep ON (ep.eid = e.eid AND uid = {?})
+                           INNER JOIN  group_event_participants AS ep ON (ep.eid = e.eid AND e.uid = {?})
                                 WHERE  e.paiement_id = {?} AND e.asso_id = {?}",
                               S::i('uid'), $pid, $globals->asso('id'));
             if ($res->numRows() == 0) {
diff --git a/modules/register.php b/modules/register.php
index b2c4a3d..c70a365 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -372,7 +372,7 @@ class RegisterModule extends PLModule
                         XDB::execute('INSERT IGNORE INTO  group_members (uid, asso_id)
                                                   VALUES  ({?}, {?})',
                                      $uid, $asso_id);
-                        $mmlist = new MMList($uid, S::v('password'));
+                        $mmlist = new MMList($user);
                         $mmlist->subscribe("promo" . S::v('promo'));
                     }
                     break;
diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index e1fe8bf..bae5758 100644
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -416,7 +416,8 @@ class XnetEventsModule extends PLModule
               ON DUPLICATE KEY UPDATE  asso_id = VALUES(asso_id), uid = VALUES(uid), intitule = VALUES(intitule),
                                        paiement_id = VALUES(paiement_id), descriptif = VALUES(descriptif), debut = VALUES(debut),
                                        fin = VALUES(fin), show_participants = VALUES(show_participants), short_name = VALUES(short_name),
-                                       deadline_inscription = VALUES(deadline_inscription), noinvite = VALUES(noinvite)',
+                                       deadline_inscription = VALUES(deadline_inscription), noinvite = VALUES(noinvite),
+                                       accept_nonmembre = VALUES(accept_nonmembre)',
                          $evt['eid'], $evt['asso_id'], $evt['uid'],
                          $evt['intitule'], $evt['paiement_id'], $evt['descriptif'],
                          $evt['debut'], $evt['fin'], $evt['show_participants'],
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 5080fb5..a558cbf 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -249,8 +249,7 @@ class XnetGrpModule extends PLModule
         global $globals;
 
         $page->changeTpl('xnetgrp/mail.tpl');
-        $mmlist = new MMList(S::v('uid'), S::v('password'),
-                           $globals->asso('mail_domain'));
+        $mmlist = new MMList(S::user(), $globals->asso('mail_domain'));
         $page->assign('listes', $mmlist->get_lists());
         $page->assign('user', S::user());
         $page->addJsLink('ajax.js');