Merge remote branch 'origin/platal-1.0.1'

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index 5ce3c68..074c681 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -244,7 +244,7 @@ def list_call_dispatcher(method, userdesc, perms, vhost, *arg):
         if has_annotation(method, "root") and perms != "admin":
             return 0
         if has_annotation(method, "mlist"):
-            listname = arg[0]
+            listname = str(arg[0])
             arg = arg[1:]
             mlist = MailList.MailList(vhost + VHOST_SEP + listname.lower(), lock=0)
             if has_annotation(method, "admin") and not is_admin_on(userdesc, perms, mlist):

diff --git a/modules/register.php b/modules/register.php
index f2de6a3..5df8c93 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -449,12 +449,13 @@ class RegisterModule extends PLModule
                          SET  success = NOW()
                        WHERE  uid = {?}", $uid);
 
+        $market = array();
         while (list($senderid, $maketingEmails, $lastDate) = $res->next()) {
             $sender = User::getWithUID($senderid);
-            $market[] = " - par $sender->fullName() sur $maketingEmails (le plus récemment le $lastDate)";
+            $market[] = " - par {$sender->fullName()} sur $maketingEmails (le plus récemment le $lastDate)";
             $mymail = new PlMailer('register/marketer.mail.tpl');
             $mymail->setSubject("$firstname $lastname s'est inscrit à Polytechnique.org !");
-            $mymail->addTo("\"$sender->fullName()\" <$sender->bestEmail()@{$globals->mail->domain}>");
+            $mymail->addTo($sender);
             $mymail->assign('sender', $sender);
             $mymail->assign('firstname', $firstname);
             $mymail->assign('lastname', $lastname);

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 4bd8fa1..b99d73d 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -224,7 +224,7 @@ function cleanForm(f) {
     alert("Aucun critère n'a été spécifié");
     return false;
   }
-  document.location = f.action + '?' + query;
+  document.location = baseurl + 'adv?' + query;
   return false;
 }
 -->