From: x2000habouzit Date: Sun, 31 Oct 2004 14:42:36 +0000 (+0000) Subject: backport ML X-Git-Tag: xorg/old~1130 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1add66af5d8fe3dce31bc443532efa7c3c153d90;p=platal.git backport ML --- diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php index 34ee884..05f8c38 100644 --- a/htdocs/listes/admin.php +++ b/htdocs/listes/admin.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: admin.php,v 1.8 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: admin.php,v 1.9 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); new_skinned_page('listes/admin.tpl', AUTH_MDP, true); diff --git a/htdocs/listes/check.php b/htdocs/listes/check.php index 3357bbc..1e4c455 100644 --- a/htdocs/listes/check.php +++ b/htdocs/listes/check.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: check.php,v 1.3 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: check.php,v 1.4 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); new_admin_page('listes/check.tpl', true); diff --git a/htdocs/listes/members.php b/htdocs/listes/members.php index 368f5ef..4fb4880 100644 --- a/htdocs/listes/members.php +++ b/htdocs/listes/members.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: members.php,v 1.7 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: members.php,v 1.8 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); new_skinned_page('listes/members.tpl', AUTH_COOKIE, true); diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php index 81dd6e1..71ee5be 100644 --- a/htdocs/listes/moderate.php +++ b/htdocs/listes/moderate.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: moderate.php,v 1.15 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: moderate.php,v 1.16 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); if(preg_match('!(?:[a-z0-9]+\.)?polytechnique\.org-(.*)!', $liste,$matches)) { header('Location: ?liste='.$matches[1]); diff --git a/htdocs/listes/options.php b/htdocs/listes/options.php index 2b97bec..36e6014 100644 --- a/htdocs/listes/options.php +++ b/htdocs/listes/options.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: options.php,v 1.5 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: options.php,v 1.6 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); new_skinned_page('listes/options.tpl', AUTH_MDP, true); diff --git a/htdocs/listes/soptions.php b/htdocs/listes/soptions.php index 3319850..7af2efd 100644 --- a/htdocs/listes/soptions.php +++ b/htdocs/listes/soptions.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: soptions.php,v 1.4 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: soptions.php,v 1.5 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); new_admin_page('listes/soptions.tpl', true); diff --git a/htdocs/listes/trombi.php b/htdocs/listes/trombi.php index abfff4d..5aaa120 100644 --- a/htdocs/listes/trombi.php +++ b/htdocs/listes/trombi.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: trombi.php,v 1.9 2004-10-30 15:45:40 x2000habouzit Exp $ + $Id: trombi.php,v 1.10 2004-10-31 14:42:36 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); -$liste = $_REQUEST['liste']; +$liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); new_skinned_page('listes/trombi.tpl', AUTH_COOKIE, true); diff --git a/include/valid_listes.inc.php b/include/valid_listes.inc.php index 98b94a9..fab8d2c 100644 --- a/include/valid_listes.inc.php +++ b/include/valid_listes.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: valid_listes.inc.php,v 1.2 2004-10-08 15:03:14 x2000habouzit Exp $ + $Id: valid_listes.inc.php,v 1.3 2004-10-31 14:42:37 x2000habouzit Exp $ ***************************************************************************/ class ListeReq extends Validate { @@ -95,11 +95,12 @@ class ListeReq extends Validate { $ret = $client->create_list('polytechnique.org', $this->liste, $this->desc, $this->advertise, $this->modlevel, $this->inslevel, $this->owners, $this->members); + $liste = strtolower($this->liste); if($ret) { - $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$this->liste}', 'liste')"); - $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$this->liste}-owner', 'liste')"); - $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$this->liste}-admin', 'liste')"); - $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$this->liste}-bounces', 'liste')"); + $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$liste}', 'liste')"); + $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$liste}-owner', 'liste')"); + $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$liste}-admin', 'liste')"); + $globals->db->query("INSERT INTO aliases (alias,type) VALUES('{$liste}-bounces', 'liste')"); } return $ret; } diff --git a/scripts/mailman/mailman-rpc.py b/scripts/mailman/mailman-rpc.py index 0cc625e..7642beb 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.67 2004-10-28 20:28:42 x2000habouzit Exp $ +# $Id: mailman-rpc.py,v 1.68 2004-10-31 14:42:37 x2000habouzit Exp $ #*************************************************************************** import base64, MySQLdb, os, getopt, sys, MySQLdb.converters, sha, signal @@ -700,7 +700,7 @@ def get_all_lists((userdesc,perms),vhost): def create_list((userdesc,perms),vhost,listname,desc,advertise,modlevel,inslevel,owners,members): if perms != 'admin': return 0 - name = vhost+'-'+listname; + name = vhost.lower()+'-'+listname.lower(); if Utils.list_exists(name): return 0