From: x2000habouzit <x2000habouzit>
Date: Sat, 11 Sep 2004 15:11:13 +0000 (+0000)
Subject: bugfixes wrt mailman
X-Git-Tag: xorg/old~1530
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7e237aa79ca50af316b21a2be3c6c198ddc39afa;p=platal.git

bugfixes wrt mailman
---

diff --git a/htdocs/listes/liste.php b/htdocs/listes/liste.php
index 4433387..00edf56 100644
--- a/htdocs/listes/liste.php
+++ b/htdocs/listes/liste.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: liste.php,v 1.3 2004-09-10 22:45:43 x2000habouzit Exp $
+        $Id: liste.php,v 1.4 2004-09-11 15:11:13 x2000habouzit Exp $
  ***************************************************************************/
 
 if(empty($_REQUEST['liste'])) header('Location: index.php');
@@ -35,7 +35,7 @@ mysql_free_result($res);
 $client = new xmlrpc_client("http://{$_SESSION['uid']}:$pass@localhost:4949");
 
 
-if(isset($_REQUEST['info'])) $client->set_welcome($liste, $_REQUEST['info']);
+if(isset($_REQUEST['welc'])) $client->set_welcome($liste, $_REQUEST['welc']);
 
 if(isset($_REQUEST['add_member']) && isset($_REQUEST['member'])) {
     if(list($added) = $client->mass_subscribe($liste, Array($_REQUEST['member']))) {
@@ -44,7 +44,7 @@ if(isset($_REQUEST['add_member']) && isset($_REQUEST['member'])) {
 	$mailer = new DiogenesMailer("\"Mailing list $liste\" <$liste-owner@polytechnique.org>",
 				     "\"{$added[0]}\" <{$added[1]}>",
 				     "Bienvenue sur la liste de diffusion $liste@polytechnique.org");
-	$mailer->setBody($members[0]['info']);
+	$mailer->setBody($members[0]['welc']);
 	$mailer->send();
     }
 }
diff --git a/scripts/mailman/mailman-rpc.py b/scripts/mailman/mailman-rpc.py
index f8014f4..d62c6ae 100755
--- a/scripts/mailman/mailman-rpc.py
+++ b/scripts/mailman/mailman-rpc.py
@@ -18,7 +18,7 @@
 #*  Foundation, Inc.,                                                      *
 #*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
 #***************************************************************************
-#       $Id: mailman-rpc.py,v 1.16 2004-09-10 22:28:39 x2000habouzit Exp $
+#       $Id: mailman-rpc.py,v 1.17 2004-09-11 15:11:13 x2000habouzit Exp $
 #***************************************************************************
 
 import base64, MySQLdb
@@ -151,7 +151,7 @@ def get_members((userdesc,perms),listname):
                     'diff' : mlist.generic_nonmember_action,
                     'ins'  : mlist.subscribe_policy > 0,
                     'priv' : (1-mlist.advertised)+2*(mm_cfg.ADMIN_ML_OWNER in mlist.owner),
-                    'info' : mlist.info,
+                    'welc' : mlist.welcome_msg
                     'you'  : is_member + 2*is_owner
                   }
         members = map(lambda member: (mlist.getMemberName(member) or '', member), members)
@@ -166,7 +166,7 @@ def subscribe((userdesc,perms),listname):
     try:
         if ( mlist.subscribe_policy in (0,1) ) or is_admin_on(userdesc, perms, mlist):
             result = 2
-            mlist.ApprovedAddMember(userdesc, None, 0)
+            mlist.ApprovedAddMember(userdesc,0,0)
         else:
             result = 1
             try:
@@ -185,7 +185,7 @@ def unsubscribe((userdesc,perms),listname):
     except:
         return 0
     try:
-        mlist.ApprovedDeleteMember(userdesc.address, None, False, False)
+        mlist.ApprovedDeleteMember(userdesc.address, None, 0, 0)
         mlist.Save()
         mlist.Unlock()
         return 1
@@ -219,7 +219,7 @@ def mass_subscribe((userdesc,perms),listname,users):
                 if forlife+'@polytechnique.org' in members:
                     continue
                 userd = UserDesc(forlife+'@polytechnique.org', name, None, 0)
-                mlist.ApprovedAddMember(userd)
+                mlist.ApprovedAddMember(userd,0,0)
                 added.append( (userd.fullname, userd.address) )
         mlist.Save()
     finally:
@@ -279,7 +279,7 @@ def del_owner((userdesc,perms),listname,user):
         mlist.Unlock()
         return True
 
-def set_welcome((userdesc,perms),listname,info):
+def set_welcome((userdesc,perms),listname,welcome):
     try:
         mlist = MailList.MailList(listname)
     except:
@@ -287,7 +287,7 @@ def set_welcome((userdesc,perms),listname,info):
     try:
         if not is_admin_on(userdesc, perms, mlist):
             return 0
-        mlist.info = info
+        mlist.welcome_msg = welcome
         mlist.Save()
     finally:
         mlist.Unlock()
diff --git a/templates/listes/liste.tpl b/templates/listes/liste.tpl
index a60de61..23fb302 100644
--- a/templates/listes/liste.tpl
+++ b/templates/listes/liste.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: liste.tpl,v 1.5 2004-09-10 23:13:04 x2000habouzit Exp $
+        $Id: liste.tpl,v 1.6 2004-09-11 15:11:14 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -152,7 +152,7 @@ Et si la personne fait "r
 
 <form method='post' action='{$smarty.server.REQUEST_URI}'>
   <div class='center'>
-    <textarea cols='50' rows='8' name='info'>{$details.info}</textarea><br />
+    <textarea cols='50' rows='8' name='welc'>{$details.welc}</textarea><br />
     <input type='submit' name='update' value='mettre à jour' />
   </div>
 </form>