X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=16c5016e333d24ff744ffff535b53e8c094679d8;hb=155819d9ece12a06d37df46e22b76e3c71f65fba;hp=5d445e674c8e9983465a27edcfd6de8e4fbc72eb;hpb=bc4ad6aafdd8c14006a1256370d98dede1083aa3;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index 5d445e6..16c5016 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -1,6 +1,6 @@ $this->make_hook('lists', AUTH_MDP), + 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH), 'lists/create' => $this->make_hook('create', AUTH_MDP), 'lists/members' => $this->make_hook('members', AUTH_COOKIE), 'lists/trombi' => $this->make_hook('trombi', AUTH_COOKIE), 'lists/archives' => $this->make_hook('archives', AUTH_COOKIE), + 'lists/archives/rss' => $this->make_hook('rss', AUTH_PUBLIC), 'lists/moderate' => $this->make_hook('moderate', AUTH_MDP), 'lists/admin' => $this->make_hook('admin', AUTH_MDP), @@ -40,36 +42,55 @@ class ListsModule extends PLModule 'lists/soptions' => $this->make_hook('soptions', AUTH_MDP), 'lists/check' => $this->make_hook('check', AUTH_MDP), + 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'), ); } - function prepare_client() + function on_subscribe($forlife, $uid, $promo, $password) { - require_once 'lists.inc.php'; + $this->prepare_client(null); + $this->client->subscribe("promo$promo"); + } + + function prepare_client(&$page) + { + global $globals; - $this->client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password')); + require_once dirname(__FILE__).'/lists/lists.inc.php'; + + $this->client = new MMList(S::v('uid'), S::v('password')); + return $globals->mail->domain; } function handler_lists(&$page) { - global $globals; + function filter_owner($list) + { + return $list['own']; + } + + function filter_member($list) + { + return $list['sub']; + } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/index.tpl'); + $page->changeTpl('lists/index.tpl'); + $page->addJsLink('ajax.js'); $page->assign('xorg_title','Polytechnique.org - Listes de diffusion'); if (Get::has('del')) { - $this->client->unsubscribe(Get::get('del')); - redirect('lists'); + $this->client->unsubscribe(Get::v('del')); + pl_redirect('lists'); } if (Get::has('add')) { - $this->client->subscribe(Get::get('add')); - redirect('lists'); + $this->client->subscribe(Get::v('add')); + pl_redirect('lists'); } if (Post::has('promo_add')) { - $promo = Post::getInt('promo_add'); + $promo = Post::i('promo_add'); if ($promo >= 1900 and $promo < 2100) { $this->client->subscribe("promo$promo"); } else { @@ -77,45 +98,86 @@ class ListsModule extends PLModule } } $listes = $this->client->get_lists(); - $page->assign_by_ref('listes', $listes); + $owner = array_filter($listes, 'filter_owner'); + $listes = array_diff_key($listes, $owner); + $member = array_filter($listes, 'filter_member'); + $listes = array_diff_key($listes, $member); + foreach ($owner as $key=>$liste) { + list($subs,$mails) = $this->client->get_pending_ops($liste['list']); + $owner[$key]['subscriptions'] = $subs; + $owner[$key]['mails'] = $mails; + } + $page->register_modifier('hdc', 'list_header_decode'); + $page->assign_by_ref('owner', $owner); + $page->assign_by_ref('member', $member); + $page->assign_by_ref('public', $listes); + } + + function handler_ajax(&$page, $list = null) + { + header('Content-Type: text/html; charset="UTF-8"'); + $domain = $this->prepare_client($page); + $page->changeTpl('lists/liste.inc.tpl', NO_SKIN); + if (Get::has('unsubscribe')) { + $this->client->unsubscribe($list); + } + if (Get::has('subscribe')) { + $this->client->subscribe($list); + } + if (Get::has('sadd')) { /* 4 = SUBSCRIBE */ + $this->client->handle_request($list, Get::v('sadd'), 4, ''); + } + if (Get::has('mid')) { + $this->moderate_mail($domain, $list, Get::i('mid')); + } + + list($liste, $members, $owners) = $this->client->get_members($list); + if ($liste['own']) { + list($subs,$mails) = $this->client->get_pending_ops($list); + $liste['subscriptions'] = $subs; + $liste['mails'] = $mails; + } + $page->register_modifier('hdc', 'list_header_decode'); + $page->assign_by_ref('liste', $liste); } function handler_create(&$page) { - global $globals; - $page->changeTpl('listes/create.tpl'); + $page->changeTpl('lists/create.tpl'); - $owners = preg_split("/[\s]+/", Post::get('owners'), -1, PREG_SPLIT_NO_EMPTY); - $members = preg_split("/[\s]+/", Post::get('members'), -1, PREG_SPLIT_NO_EMPTY); + $owners = preg_split("/[\s]+/", Post::v('owners'), -1, PREG_SPLIT_NO_EMPTY); + $members = preg_split("/[\s]+/", Post::v('members'), -1, PREG_SPLIT_NO_EMPTY); // click on validate button 'add_owner_sub' or type if (Post::has('add_owner_sub') && Post::has('add_owner')) { require_once('user.func.inc.php'); // if we want to add an owner and then type , then both // add_owner_sub and add_owner are filled. - if (Post::get('add_owner') != "") { - if (($forlife = get_user_forlife(Post::get('add_owner'))) !== false) { - $owners [] = $forlife; - } - // if we want to add a member and then type , then - // add_owner_sub is filled, whereas add_owner is empty. - } else if (Post::has('add_member')) { - if (($forlife = get_user_forlife(Post::get('add_member'))) !== false) { - $members[] = $forlife; - } + $oforlifes = get_users_forlife_list(Post::v('add_owner'), true); + $mforlifes = get_users_forlife_list(Post::v('add_member'), true); + if (!is_null($oforlifes)) { + $owners = array_merge($owners, $oforlifes); + } + // if we want to add a member and then type , then + // add_owner_sub is filled, whereas add_owner is empty. + if (!is_null($mforlifes)) { + $members = array_merge($members, $mforlifes); } } // click on validate button 'add_member_sub' if (Post::has('add_member_sub') && Post::has('add_member')) { require_once('user.func.inc.php'); - if (($forlife = get_user_forlife(Post::get('add_member'))) !== false) { - $members[] = $forlife; + $forlifes = get_users_forlife_list(Post::v('add_member'), true); + if (!is_null($forlifes)) { + $members = array_merge($members, $forlifes); } } - ksort($owners); array_unique($owners); - ksort($members); array_unique($members); + ksort($owners); + $owners = array_unique($owners); + ksort($members); + $members = array_unique($members); $page->assign('owners', join(' ', $owners)); $page->assign('members', join(' ', $members)); @@ -124,23 +186,23 @@ class ListsModule extends PLModule return; } - $liste = Post::get('liste'); + $liste = Post::v('liste'); if (empty($liste)) { $page->trig('champs «addresse souhaitée» vide'); } if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) { - $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets'); + $page->trig('le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets'); } - $res = $globals->xdb->query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste); + $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste); $n = $res->fetchOneCell(); if ($n) { $page->trig('cet alias est déjà pris'); } - if (!Post::get(desc)) { + if (!Post::v(desc)) { $page->trig('le sujet est vide'); } @@ -155,39 +217,47 @@ class ListsModule extends PLModule if (!$page->nb_errs()) { $page->assign('created', true); require_once 'validations.inc.php'; - $req = new ListeReq(Session::getInt('uid'), $liste, - Post::get('desc'), Post::getInt('advertise'), - Post::getInt('modlevel'), Post::getInt('inslevel'), + $req = new ListeReq(S::v('uid'), $liste, + Post::v('desc'), Post::i('advertise'), + Post::i('modlevel'), Post::i('inslevel'), $owners, $members); $req->submit(); } } - function handler_members(&$page, $liste = null) + function changeTpl($tpl) { - global $globals; + if (!empty($GLOBALS['IS_XNET_SITE'])) { + new_group_open_page($tpl); + } else { + global $page; + $page->changeTpl($tpl); + } + } + function handler_members(&$page, $liste = null) + { if (is_null($liste)) { return PL_NOT_FOUND; } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/members.tpl'); + $this->changeTpl('lists/members.tpl'); if (Get::has('del')) { $this->client->unsubscribe($liste); - redirect($liste); + pl_redirect('lists/members/'.$liste); } if (Get::has('add')) { $this->client->subscribe($liste); - redirect($liste); + pl_redirect('lists/members/'.$liste); } $members = $this->client->get_members($liste); - $tri_promo = !Env::getBool('alpha'); + $tri_promo = !Env::b('alpha'); if (list($det,$mem,$own) = $members) { $membres = list_sort_members($mem, $tri_promo); @@ -202,53 +272,63 @@ class ListsModule extends PLModule } } + function compare($a, $b) + { + if ($a['promo'] == $b['promo']) { + if ($a['nom'] == $b['nom']) { + return strcmp($a['prenom'], $b['prenom']); + } + return strcmp($a['nom'], $b['nom']); + } + return $a['promo'] - $b['promo']; + } + function _get_list($offset, $limit) { - global $globals, $platal; + global $platal; list($total, $members) = $this->client->get_members_limit($platal->argv[1], $offset, $limit); $membres = Array(); foreach ($members as $member) { list($m) = explode('@',$member[1]); - $res = $globals->xdb->query("SELECT prenom,if (nom_usage='', nom, nom_usage) AS nom, + $res = XDB::query("SELECT prenom,if (nom_usage='', nom, nom_usage) AS nom, promo, a.alias AS forlife FROM auth_user_md5 AS u INNER JOIN aliases AS a ON u.user_id = a.id + INNER JOIN photo AS p ON p.uid = u.user_id WHERE a.alias = {?}", $m); if ($tmp = $res->fetchOneAssoc()) { $membres[$tmp['nom']] = $tmp; } else { - $membres[$member[0]] = array('addr' => $member[0]); + $total--; } } + uasort($membres, array($this, 'compare')); return array($total, $membres); } function handler_trombi(&$page, $liste = null) { - global $globals; - if (is_null($liste)) { return PL_NOT_FOUND; } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/trombi.tpl'); + $this->changeTpl('lists/trombi.tpl'); if (Get::has('del')) { $this->client->unsubscribe($liste); - redirect($liste); + pl_redirect('lists/trombi/'.$liste); } if (Get::has('add')) { $this->client->subscribe($liste); - redirect($liste); + pl_redirect('lists/trombi/'.$liste); } $owners = $this->client->get_owners($liste); if (is_array($owners)) { - require_once 'trombi.inc.php'; $moderos = list_sort_owners($owners[1]); $page->assign_by_ref('details', $owners[0]); @@ -261,7 +341,7 @@ class ListsModule extends PLModule } } - function handler_archives(&$page, $liste = null) + function handler_archives(&$page, $liste = null, $action = null, $artid = null) { global $globals; @@ -269,129 +349,151 @@ class ListsModule extends PLModule return PL_NOT_FOUND; } - $this->prepare_client(); + $domain = $this->prepare_client($page); - $page->changeTpl('listes/archives.tpl'); + $this->changeTpl('lists/archives.tpl'); - $page->addCssLink('css/lists.archives.css'); if (list($det) = $this->client->get_members($liste)) { if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv']) - && !$det['own'] && ($det['sub'] < 2)) - { + && !$det['own'] && ($det['sub'] < 2)) { $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter"); - } elseif (Get::has('file')) { - $file = Get::get('file'); - $rep = Get::get('rep'); - if (strstr('/', $file)!==false || !preg_match(',^\d+/\d+$,', $rep)) { - $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter"); - } else { - $page->assign('archives', $globals->lists->spool - ."/{$domain}{$globals->lists->vhost_sep}$liste/$rep/$file"); - } - } else { - $archs = Array(); - foreach (glob($globals->lists->spool - ."/{$domain}{$globals->lists->vhost_sep}$liste/*/*") as $rep) - { - if (preg_match(",/(\d*)/(\d*)$,", $rep, $matches)) { - $archs[intval($matches[1])][intval($matches[2])] = true; - } - } - $page->assign('archs', $archs); - $page->assign('range', range(1,12)); } + $get = Array('listname' => $liste, 'domain' => $domain); + if (Post::has('updateall')) { + $get['updateall'] = Post::v('updateall'); + } + require_once 'banana/ml.inc.php'; + get_banana_params($get, null, $action, $artid); + run_banana($page, 'MLBanana', $get); } else { $page->kill("La liste n'existe pas ou tu n'as pas le droit de la consulter"); } } - function handler_moderate(&$page, $liste = null) + function handler_rss(&$page, $liste = null, $alias = null, $hash = null) { - global $globals; - - if (is_null($liste)) { - return PL_NOT_FOUND; + require_once('rss.inc.php'); + $uid = init_rss(null, $alias, $hash); + if (!$uid || !$liste) { + exit; } - $this->prepare_client(); + $res = XDB::query("SELECT user_id AS uid, password, alias AS forlife + FROM auth_user_md5 AS u + INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') + WHERE u.user_id = {?}", $uid); + $row = $res->fetchOneAssoc(); + $_SESSION = array_merge($row, $_SESSION); - $page->changeTpl('listes/moderate.tpl'); - - $page->register_modifier('qpd', 'quoted_printable_decode'); - - if (Env::has('sadd')) { /* 4 = SUBSCRIBE */ - $this->client->handle_request($liste,Env::get('sadd'),4,''); - redirect($liste); + $domain = $this->prepare_client($page); + if (list($det) = $this->client->get_members($liste)) { + if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv']) + && !$det['own'] && ($det['sub'] < 2)) { + exit; + } + require_once('banana/ml.inc.php'); + $banana = new MLBanana(Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2')); + $banana->run(); } + exit; + } - if (Post::has('sdel')) { /* 2 = REJECT */ - $this->client->handle_request($liste,Post::get('sdel'),2,Post::get('reason')); - } - - if (Env::has('mid')) { - $mid = Env::get('mid'); - $mail = $this->client->get_pending_mail($liste, $mid); - $reason = ''; - - $prenom = Session::get('prenom'); - $nom = Session::get('nom'); - - if (Env::has('mok')) { - $action = 1; /** 2 = ACCEPT **/ - $subject = "Message accepté"; - $append .= "a été accepté par $prenom $nom.\n"; - } elseif (Env::has('mno')) { - $action = 2; /** 2 = REJECT **/ - $subject = "Message refusé"; - $reason = Post::get('reason'); - $append = "a été refusé par $prenom $nom avec la raison :\n\n" + function moderate_mail($domain, $liste, $mid) + { + $mail = $this->client->get_pending_mail($liste, $mid); + $reason = ''; + + $prenom = S::v('prenom'); + $nom = S::v('nom'); + + if (Env::has('mok')) { + $action = 1; /** 2 = ACCEPT **/ + $subject = "Message accepté"; + $append .= "a été accepté par $prenom $nom.\n"; + } elseif (Env::has('mno')) { + $action = 2; /** 2 = REJECT **/ + $subject = "Message refusé"; + $reason = Post::v('reason'); + $append = "a été refusé par $prenom $nom avec la raison :\n\n" . $reason; - } elseif (Env::has('mdel')) { - $action = 3; /** 3 = DISCARD **/ - $subject = "Message supprimé"; - $append = "a été supprimé par $prenom $nom.\n\n" + } elseif (Env::has('mdel')) { + $action = 3; /** 3 = DISCARD **/ + $subject = "Message supprimé"; + $append = "a été supprimé par $prenom $nom.\n\n" . "Rappel: il ne faut utiliser cette opération " . "que dans le cas de spams ou de virus !\n"; - } + } - if (isset($action) && $this->client->handle_request($liste, $mid, $action, $reason)) { - $texte = "le message suivant :\n\n" + if (isset($action) && $this->client->handle_request($liste, $mid, $action, $reason)) { + $texte = "le message suivant :\n\n" ." Auteur: {$mail['sender']}\n" ." Sujet : « {$mail['subj']} »\n" ." Date : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n" .$append; - require_once 'diogenes/diogenes.hermes.inc.php'; - $mailer = new HermesMailer(); - $mailer->addTo("$liste-owner@{$domain}"); - $mailer->setFrom("$liste-bounces@{$domain}"); - $mailer->addHeader('Reply-To', "$liste-owner@{$domain}"); - $mailer->setSubject($subject); - $mailer->setTxtBody(wordwrap($texte,72)); - $mailer->send(); - Get::kill('mid'); + $mailer = new PlMailer(); + $mailer->addTo("$liste-owner@{$domain}"); + $mailer->setFrom("$liste-bounces@{$domain}"); + $mailer->addHeader('Reply-To', "$liste-owner@{$domain}"); + $mailer->setSubject($subject); + $mailer->setTxtBody(wordwrap($texte,72)); + $mailer->send(); + Get::kill('mid'); + } + + return $mail; + } + + function handler_moderate(&$page, $liste = null) + { + if (is_null($liste)) { + return PL_NOT_FOUND; + } + + $domain = $this->prepare_client($page); + + $this->changeTpl('lists/moderate.tpl'); + + $page->register_modifier('hdc', 'list_header_decode'); + + if (Env::has('sadd')) { /* 4 = SUBSCRIBE */ + $this->client->handle_request($liste,Env::v('sadd'),4,''); + pl_redirect('lists/moderate/'.$liste); + } + if (Post::has('sdel')) { /* 2 = REJECT */ + $this->client->handle_request($liste,Post::v('sdel'),2,Post::v('reason')); + } + + if (Post::has('moderate_mails') && Post::has('select_mails')) { + $mails = array_keys(Post::v('select_mails')); + foreach($mails as $mail) { + $this->moderate_mail($domain, $liste, $mail); } + } elseif (Env::has('mid')) { + if (Get::has('mid') && !Env::has('mok') && !Env::has('mdel')) { + $page->changeTpl('lists/moderate_mail.tpl'); + require_once('banana/moderate.inc.php'); + $params = array('listname' => $liste, 'domain' => $domain, + 'artid' => Get::i('mid'), 'part' => Get::v('part'), 'action' => Get::v('action')); + $params['client'] = $this->client; + run_banana($page, 'ModerationBanana', $params); - if (Get::has('mid') && is_array($mail)) { $msg = file_get_contents('/etc/mailman/fr/refuse.txt'); $msg = str_replace("%(adminaddr)s", "$liste-owner@{$domain}", $msg); $msg = str_replace("%(request)s", "<< SUJET DU MAIL >>", $msg); $msg = str_replace("%(reason)s", "<< TON EXPLICATION >>", $msg); $msg = str_replace("%(listname)s", $liste, $msg); - $page->assign('msg', $msg); - - $page->changeTpl('listes/moderate_mail.tpl'); - $page->assign_by_ref('mail', $mail); - $page->run(); + $page->assign('msg', $msg); + return; } + $mail = $this->moderate_mail($domain, $liste, Env::i('mid')); } elseif (Env::has('sid')) { - if (list($subs,$mails) = $this->client->get_pending_ops($liste)) { foreach($subs as $user) { - if ($user['id'] == Env::get('sid')) { - $page->changeTpl('listes/moderate_sub.tpl'); - $page->assign('del_user',$user); - $page->run(); + if ($user['id'] == Env::v('sid')) { + $this->changeTpl('lists/moderate_sub.tpl'); + $page->assign('del_user', $user); + return; } } } @@ -399,6 +501,9 @@ class ListsModule extends PLModule } if (list($subs,$mails) = $this->client->get_pending_ops($liste)) { + foreach ($mails as $key=>$mail) { + $mails[$key]['stamp'] = strftime("%Y%m%d%H%M%S", $mail['stamp']); + } $page->assign_by_ref('subs', $subs); $page->assign_by_ref('mails', $mails); } else { @@ -414,20 +519,13 @@ class ListsModule extends PLModule return PL_NOT_FOUND; } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/admin.tpl'); + $this->changeTpl('lists/admin.tpl'); if (Env::has('add_member')) { - require_once('user.func.inc.php'); - $members = explode(' ', Env::get('add_member')); - if ($members) foreach ($members as $i => $alias) { - if (($login = get_user_forlife($alias)) !== false) {; - $members[$i] = $login; - } - } - + $members = get_users_forlife_list(Env::v('add_member')); $arr = $this->client->mass_subscribe($liste, $members); if (is_array($arr)) { foreach($arr as $addr) { @@ -437,44 +535,39 @@ class ListsModule extends PLModule } if (Env::has('del_member')) { - if (strpos(Env::get('del_member'), '@') === false) { + if (strpos(Env::v('del_member'), '@') === false) { $this->client->mass_unsubscribe( - $liste, array(Env::get('del_member').'@'.$globals->mail->domain)); + $liste, array(Env::v('del_member').'@'.$globals->mail->domain)); } else { - $this->client->mass_unsubscribe($liste, array(Env::get('del_member'))); + $this->client->mass_unsubscribe($liste, array(Env::v('del_member'))); } - redirect($liste); + pl_redirect('lists/admin/'.$liste); } if (Env::has('add_owner')) { require_once('user.func.inc.php'); - - $owners = explode(' ', Env::get('add_owner')); - - if ($owners) foreach ($owners as $alias) { - if (($login = get_user_forlife($alias)) === false) {; - $login = $alias; - } - - if ($this->client->add_owner($liste, $login)) { - $page->trig($alias." ajouté aux modérateurs."); + $owners = get_users_forlife_list(Env::v('add_owner')); + if ($owners) { + foreach ($owners as $login) { + if ($this->client->add_owner($liste, $login)) { + $page->trig($alias." ajouté aux modérateurs."); + } } } } if (Env::has('del_owner')) { - if (strpos(Env::get('del_owner'), '@') === false) { - $this->client->del_owner($liste, Env::get('del_owner').'@'.$globals->mail->domain); + if (strpos(Env::v('del_owner'), '@') === false) { + $this->client->del_owner($liste, Env::v('del_owner').'@'.$globals->mail->domain); } else { - $this->client->del_owner($liste, Env::get('del_owner')); + $this->client->del_owner($liste, Env::v('del_owner')); } - redirect($liste); + pl_redirect('lists/admin/'.$liste); } if (list($det,$mem,$own) = $this->client->get_members($liste)) { - - $membres = list_sort_members($mem, $tri_promo); - $moderos = list_sort_owners($own, $tri_promo); + $membres = list_sort_members($mem, @$tri_promo); + $moderos = list_sort_owners($own, @$tri_promo); $page->assign_by_ref('details', $det); $page->assign_by_ref('members', $membres); @@ -482,24 +575,25 @@ class ListsModule extends PLModule $page->assign('np_m', count($mem)); } else { - $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer"); + $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.
" + ." Si tu penses qu'il s'agit d'une erreur, " + ."contact le support"); } } function handler_options(&$page, $liste = null) { - global $globals; - if (is_null($liste)) { return PL_NOT_FOUND; } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/options.tpl'); + $this->changeTpl('lists/options.tpl'); if (Post::has('submit')) { $values = $_POST; + $values = array_map('utf8_decode', $values); $this->client->set_bogo_level($liste, intval($values['bogo_level'])); switch($values['moderate']) { case '0': @@ -523,11 +617,11 @@ class ListsModule extends PLModule $values['subject_prefix'] = trim($values['subject_prefix']).' '; } $this->client->set_owner_options($liste, $values); - } elseif (isvalid_email(Post::get('atn_add'))) { - $this->client->add_to_wl($liste, Post::get('atn_add')); + } elseif (isvalid_email(Post::v('atn_add'))) { + $this->client->add_to_wl($liste, Post::v('atn_add')); } elseif (Get::has('atn_del')) { - $this->client->del_from_wl($liste, Get::get('atn_del')); - redirect("{$_SERVER['PHP_SELF']}?liste=$liste"); + $this->client->del_from_wl($liste, Get::v('atn_del')); + pl_redirect('lists/options/'.$liste); } if (list($details,$options) = $this->client->get_owner_options($liste)) { @@ -542,24 +636,35 @@ class ListsModule extends PLModule function handler_delete(&$page, $liste = null) { global $globals; - if (is_null($liste)) { return PL_NOT_FOUND; } - $this->prepare_client(); - - $page->changeTpl('listes/delete.tpl'); - - if (Post::get('valid') == 'OUI' - && $this->client->delete_list($liste, Post::getBool('del_archive'))) - { - foreach (array('', '-owner', '-admin', '-bounces') as $app) { - $globals->xdb->execute("DELETE FROM aliases - WHERE type='liste' AND alias='{?}'", - $ml.$app); + $domain = $this->prepare_client($page); + if ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { + $domain = ''; + $table = 'aliases'; + $type = 'liste'; + } else { + $domain = '@' . $domain; + $table = 'virtual'; + $type = 'list'; + } + + $this->changeTpl('lists/delete.tpl'); + if (Post::v('valid') == 'OUI') { + if ($this->client->delete_list($liste, Post::b('del_archive'))) { + foreach (array('', '-owner', '-admin', '-bounces') as $app) { + XDB::execute("DELETE FROM $table + WHERE type={?} AND alias={?}", + $type, $liste.$app.$domain); + } + $page->assign('deleted', true); + } else { + $page->kill('Une erreur est survenue lors de la suppression de la liste.
' + . 'Contact les administrateurs du site pour régler le problème : ' + . 'support@polytechnique.org'); } - $page->assign('deleted', true); } elseif (list($details,$options) = $this->client->get_owner_options($liste)) { $page->assign_by_ref('details', $details); $page->assign_by_ref('options', $options); @@ -571,18 +676,17 @@ class ListsModule extends PLModule function handler_soptions(&$page, $liste = null) { - global $globals; - if (is_null($liste)) { return PL_NOT_FOUND; } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/soptions.tpl'); + $this->changeTpl('lists/soptions.tpl'); if (Post::has('submit')) { $values = $_POST; + $values = array_map('utf8_decode', $values); unset($values['submit']); $values['advertised'] = empty($values['advertised']) ? false : true; $values['archive'] = empty($values['archive']) ? false : true; @@ -599,15 +703,13 @@ class ListsModule extends PLModule function handler_check(&$page, $liste = null) { - global $globals; - if (is_null($liste)) { return PL_NOT_FOUND; } - $this->prepare_client(); + $this->prepare_client($page); - $page->changeTpl('listes/check.tpl'); + $this->changeTpl('lists/check.tpl'); if (Post::has('correct')) { $this->client->check_options($liste, true); @@ -620,6 +722,16 @@ class ListsModule extends PLModule $page->kill("La liste n'existe pas"); } } + + function handler_admin_all(&$page) { + $this->changeTpl('lists/admin_all.tpl'); + $page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists'); + + $client = new MMList(S::v('uid'), S::v('password')); + $listes = $client->get_all_lists(); + $page->assign_by_ref('listes', $listes); + } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>