From febd224d14c4019a3abf16cdb66d3831b3c5cfcf Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Sat, 25 Dec 2004 11:55:20 +0000 Subject: [PATCH] give right to ML moderators to change the moderation level of their list that and some various bugfixes git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-130 --- bin/lists.rpc.py | 9 +++++---- htdocs/listes/admin.php | 2 +- htdocs/listes/archives.php | 2 +- htdocs/listes/check.php | 2 +- htdocs/listes/delete.php | 2 +- htdocs/listes/members.php | 2 +- htdocs/listes/moderate.php | 2 +- htdocs/listes/options.php | 33 +++++++++++++++++++++++---------- htdocs/listes/soptions.php | 17 +---------------- htdocs/listes/trombi.php | 2 +- include/xorg/page.inc.php | 2 +- templates/listes/options.tpl | 16 ++++++++++++++++ templates/listes/soptions.tpl | 18 +----------------- 13 files changed, 54 insertions(+), 55 deletions(-) diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py index 8b269d5..d4f24ef 100755 --- a/bin/lists.rpc.py +++ b/bin/lists.rpc.py @@ -569,8 +569,9 @@ def get_pending_mail(userdesc,perms,vhost,listname,id,raw=0): # owner_opts = ['accept_these_nonmembers', 'admin_notify_mchanges', 'description', \ - 'info', 'subject_prefix', 'goodbye_msg', 'send_goodbye_msg', \ - 'subscribe_policy', 'welcome_msg'] + 'default_member_moderation', 'generic_nonmember_action', 'info', \ + 'subject_prefix', 'goodbye_msg', 'send_goodbye_msg', 'subscribe_policy', \ + 'welcome_msg'] def get_owner_options(userdesc,perms,vhost,listname): return get_options(userdesc,perms,vhost,listname.lower(),owner_opts) @@ -657,8 +658,8 @@ def set_bogo_level(userdesc,perms,vhost,listname,level): # admin procedures [ soptions.php ] # -admin_opts = [ 'advertised', 'archive', 'default_member_moderation', \ - 'generic_nonmember_action', 'max_message_size', 'msg_footer', 'msg_header'] +admin_opts = [ 'advertised', 'archive', \ + 'max_message_size', 'msg_footer', 'msg_header'] def get_admin_options(userdesc,perms,vhost,listname): if perms != 'admin': diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php index 2510a39..10a4279 100644 --- a/htdocs/listes/admin.php +++ b/htdocs/listes/admin.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_skinned_page('listes/admin.tpl', AUTH_MDP); require_once('lists.inc.php'); diff --git a/htdocs/listes/archives.php b/htdocs/listes/archives.php index 1ddc0ff..955e9be 100644 --- a/htdocs/listes/archives.php +++ b/htdocs/listes/archives.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_skinned_page('listes/archives.tpl', AUTH_COOKIE, 'listes/archives.head.tpl'); require_once('lists.inc.php'); diff --git a/htdocs/listes/check.php b/htdocs/listes/check.php index 56fe901..e3b76a9 100644 --- a/htdocs/listes/check.php +++ b/htdocs/listes/check.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_admin_page('listes/check.tpl'); require_once('lists.inc.php'); diff --git a/htdocs/listes/delete.php b/htdocs/listes/delete.php index 1a7ef59..2d0cc21 100644 --- a/htdocs/listes/delete.php +++ b/htdocs/listes/delete.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_skinned_page('listes/delete.tpl', AUTH_MDP); require_once('lists.inc.php'); diff --git a/htdocs/listes/members.php b/htdocs/listes/members.php index a6eb911..cea7622 100644 --- a/htdocs/listes/members.php +++ b/htdocs/listes/members.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_skinned_page('listes/members.tpl', AUTH_COOKIE); require_once('lists.inc.php'); diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php index 98c8783..f300c0b 100644 --- a/htdocs/listes/moderate.php +++ b/htdocs/listes/moderate.php @@ -19,6 +19,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); @@ -26,7 +27,6 @@ if (preg_match("!(?:[a-z0-9]+\\.)?{$globals->mail->domain}-(.*)!", $liste, $matc header('Location: ?liste='.$matches[1]); } -require_once("xorg.inc.php"); new_skinned_page('listes/moderate.tpl', AUTH_MDP); require_once('lists.inc.php'); diff --git a/htdocs/listes/options.php b/htdocs/listes/options.php index 01c1000..9c94413 100644 --- a/htdocs/listes/options.php +++ b/htdocs/listes/options.php @@ -19,30 +19,43 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_skinned_page('listes/options.tpl', AUTH_MDP); require_once('lists.inc.php'); $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password')); -if(Post::has('submit')) { +if (Post::has('submit')) { $values = array_map('stripslashes',$_POST); $client->set_bogo_level($liste, intval($values['bogo_level'])); - unset($values['submit']); - unset($values['bogo_level']); - $values['send_goodbye_msg'] = empty($values['send_goodbye_msg']) ? false : true; - $values['admin_notify_mchanges'] = empty($values['admin_notify_mchanges']) ? false : true; - $values['subscribe_policy'] = empty($values['subscribe_policy']) ? 0 : 2; - if(isset($values['subject_prefix'])) { + switch($values['moderate']) { + case '0': + $values['generic_nonmember_action'] = 0; + $values['default_member_moderation'] = 0; + break; + case '1': + $values['generic_nonmember_action'] = 1; + $values['default_member_moderation'] = 0; + break; + case '2': + $values['generic_nonmember_action'] = 1; + $values['default_member_moderation'] = 1; + break; + } + unset($values['submit'], $values['bogo_level'], $values['moderate']); + $values['send_goodbye_msg'] = !empty($values['send_goodbye_msg']); + $values['admin_notify_mchanges'] = !empty($values['admin_notify_mchanges']); + $values['subscribe_policy'] = empty($values['subscribe_policy']) ? 0 : 2; + if (isset($values['subject_prefix'])) { $values['subject_prefix'] = trim($values['subject_prefix']).' '; } $client->set_owner_options($liste, $values); -} elseif(isvalid_email(Post::get('atn_add')) { +} elseif (isvalid_email(Post::get('atn_add'))) { $client->add_to_wl($liste, Post::get('atn_add')); -} elseif(Get::has('atn_del')) { +} elseif (Get::has('atn_del')) { $client->del_from_wl($liste, Get::get('atn_del')); header("Location: ?liste=$liste"); } diff --git a/htdocs/listes/soptions.php b/htdocs/listes/soptions.php index 5e76e64..0cedf03 100644 --- a/htdocs/listes/soptions.php +++ b/htdocs/listes/soptions.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_admin_page('listes/soptions.tpl'); require_once('lists.inc.php'); @@ -31,21 +31,6 @@ $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password')); if(Post::has('submit')) { $values = array_map('stripslashes', $_POST); unset($values['submit']); - switch($values['moderate']) { - case '0': - $values['generic_nonmember_action'] = 0; - $values['default_member_moderation'] = 0; - break; - case '1': - $values['generic_nonmember_action'] = 1; - $values['default_member_moderation'] = 0; - break; - case '2': - $values['generic_nonmember_action'] = 1; - $values['default_member_moderation'] = 1; - break; - } - unset($values['moderate']); $values['advertised'] = empty($values['advertised']) ? false : true; $values['archive'] = empty($values['archive']) ? false : true; $client->set_admin_options($liste, $values); diff --git a/htdocs/listes/trombi.php b/htdocs/listes/trombi.php index 57a8439..82e5db9 100644 --- a/htdocs/listes/trombi.php +++ b/htdocs/listes/trombi.php @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -require_once("xorg.inc.php"); new_skinned_page('listes/trombi.tpl', AUTH_COOKIE); require_once("trombi.inc.php"); require_once('lists.inc.php'); diff --git a/include/xorg/page.inc.php b/include/xorg/page.inc.php index e91716c..9c481fa 100644 --- a/include/xorg/page.inc.php +++ b/include/xorg/page.inc.php @@ -123,7 +123,7 @@ class XorgPage extends DiogenesCorePage fwrite($fd, $result); fclose($fd); - exec($globals->spoolroot."/bin/devel/validate.pl ".$this->cache_dir."valid.html", $val); + exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$this->cache_dir."valid.html", $val); foreach ($val as $h) { if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) { if ($m[1]) { diff --git a/templates/listes/options.tpl b/templates/listes/options.tpl index 23d17e3..8105946 100644 --- a/templates/listes/options.tpl +++ b/templates/listes/options.tpl @@ -99,6 +99,22 @@ Tu n'es pas administrateur de la liste, mais du site. + diffusion : + + + libre
+ modérée aux extérieurs
+ modérée + + + + inscription libre ou modérée :
détermine si les inscriptions à la liste sont modérées ou non. diff --git a/templates/listes/soptions.tpl b/templates/listes/soptions.tpl index 25474a9..cd82365 100644 --- a/templates/listes/soptions.tpl +++ b/templates/listes/soptions.tpl @@ -61,22 +61,6 @@ publique - - - diffusion : - - - libre
- modérée aux extérieurs
- modérée - - archive :
@@ -87,7 +71,7 @@ liste archivée - + max_message_size :
Taille maximale des posts en Ko: -- 2.1.4