X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=ba625948b65382b5afb31e636103d760faffcce6;hb=45ea6160465aeba0aa780e49c12272819dedffd1;hp=8479060760926f029c08259ae1c5b9e0d7128812;hpb=5660032ac785d410f90e3f5b0d6948dc90b0cfea;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index 8479060..ba62594 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/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH), + 'lists/create' => $this->make_hook('create', AUTH_MDP, 'lists'), 'lists/members' => $this->make_hook('members', AUTH_COOKIE), 'lists/csv' => $this->make_hook('csv', AUTH_COOKIE), @@ -43,11 +43,11 @@ 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'), + 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'), ); } - function prepare_client(&$page, $user = null) + function prepare_client($page, $user = null) { global $globals; @@ -64,7 +64,7 @@ class ListsModule extends PLModule { list($subs,$mails) = $this->client->get_pending_ops($list); $res = XDB::query("SELECT mid - FROM ml_moderate + FROM email_list_moderate WHERE ml = {?} AND domain = {?}", $list, $domain); $mids = $res->fetchColumn(); @@ -76,7 +76,7 @@ class ListsModule extends PLModule return array($subs, $mails); } - function handler_lists(&$page) + function handler_lists($page) { function filter_owner($list) { @@ -91,7 +91,6 @@ class ListsModule extends PLModule $domain = $this->prepare_client($page); $page->changeTpl('lists/index.tpl'); - $page->addJsLink('ajax.js'); $page->setTitle('Listes de diffusion'); @@ -112,27 +111,28 @@ class ListsModule extends PLModule if ($promo >= 1900 and $promo < 2100) { $this->client->subscribe("promo$promo"); } else { - $page->trigSuccess("promo incorrecte, il faut une promo sur 4 chiffres."); + $page->trigError("promo incorrecte, il faut une promo sur 4 chiffres."); } } - $listes = $this->client->get_lists(); - $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->get_pending_ops($domain, $liste['list']); - $owner[$key]['subscriptions'] = $subs; - $owner[$key]['mails'] = $mails; + if (!is_null($listes = $this->client->get_lists())) { + $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->get_pending_ops($domain, $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); } - $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) + function handler_ajax($page, $list = null) { pl_content_headers("text/html"); $domain = $this->prepare_client($page); @@ -162,20 +162,26 @@ class ListsModule extends PLModule $page->assign_by_ref('liste', $liste); } - function handler_create(&$page) + function handler_create($page) { global $globals; $page->changeTpl('lists/create.tpl'); - $user_promo = S::i('promo'); + $user_promo = S::user()->profile()->yearPromo(); $year = date('Y'); $month = date('m'); + // scolar year starts in september + $scolarmonth = ($year - $user_promo) * 12 + ($month - 8); $young_promo = $very_young_promo = 0; - if ((($year > $user_promo) && ($month > 3)) && ($year < $user_promo + 5)) { + // binet are accessible only in april in the first year and until + // march of the 5th year + if ($scolarmonth >= 8 && $scolarmonth < 56) { $young_promo = 1; } - if ((($year > $user_promo) && ($month > 7)) && (($year < $user_promo + 1) && ($month < 8))) { + // PSC aliases are accesible only between september and june of the second + // year of scolarity + if ($scolarmonth >= 12 && $scolarmonth < 22) { $very_young_promo = 1; } $page->assign('young_promo', $young_promo); @@ -233,17 +239,17 @@ class ListsModule extends PLModule S::assert_xsrf_token(); } - $asso = Post::v('asso'); - $liste = Post::v('liste'); + $asso = Post::t('asso'); + $list = strtolower(Post::t('liste')); - if (empty($liste)) { + if (empty($list)) { $page->trigError('Le champ « adresse souhaitée Â» est vide.'); } - if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) { + if (!preg_match("/^[a-zA-Z0-9\-]*$/", $list)) { $page->trigError('Le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets.'); } - if (($asso == "binet") || ($asso == "alias")) { + if (($asso == 'binet') || ($asso == 'alias')) { $promo = Post::i('promo'); $domain = $promo . '.' . $globals->mail->domain; @@ -251,35 +257,25 @@ class ListsModule extends PLModule $page->trigError('La promotion est mal renseignée, elle doit être du type : 2004.'); } - $new = $liste . '@' . $domain; - $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $new); - - } else { - if ($asso == "groupex") { - $groupex_name = Post::v('groupex_name'); - - $res_groupe = XDB::query('SELECT mail_domain FROM #groupex#.asso WHERE nom={?}', $groupex_name); - $domain = $res_groupe->fetchOneCell(); + } elseif ($asso == 'groupex') { + $domain = XDB::fetchOneCell('SELECT mail_domain + FROM groups + WHERE nom = {?}', + Post::t('groupex_name')); if (!$domain) { $page->trigError('Il n\'y a aucun groupe de ce nom sur Polytechnique.net.'); } - - $new = $liste . '@' . $domain; - $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $new); - } else { - $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste); - $domain = $globals->mail->domain; - } + } else { + $domain = $globals->mail->domain; } - $n = $res->fetchOneCell(); - - if ($n) { + require_once 'emails.inc.php'; + if (list_exist($list, $domain)) { $page->trigError("L'« adresse souhaitée Â» est déjà prise."); } - if (!Post::v('desc')) { + if (!Post::t('desc')) { $page->trigError('Le sujet est vide.'); } @@ -287,23 +283,22 @@ class ListsModule extends PLModule $page->trigError('Il n\'y a pas de gestionnaire.'); } - if (count($members)<4) { + if (count($members) < 4) { $page->trigError('Il n\'y a pas assez de membres.'); } if (!$page->nb_errs()) { $page->trigSuccess('Demande de création envoyée !'); $page->assign('created', true); - require_once 'validations.inc.php'; - $req = new ListeReq(S::user(), $asso, $liste, $domain, - Post::v('desc'), Post::i('advertise'), + $req = new ListeReq(S::user(), $asso, $list, $domain, + Post::t('desc'), Post::i('advertise'), Post::i('modlevel'), Post::i('inslevel'), $owners, $members); $req->submit(); } } - function handler_members(&$page, $liste = null) + function handler_members($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -342,24 +337,22 @@ class ListsModule extends PLModule } } - function handler_csv(PlPage &$page, $liste = null) + function handler_csv(PlPage $page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; } $this->prepare_client($page); $members = $this->client->get_members($liste); - $list = list_fetch_names(list_extract_members($members[1])); - pl_content_headers("text/x-csv"); + $list = list_fetch_basic_info(list_extract_members($members[1])); + pl_cached_content_headers('text/x-csv', 1); - echo "email,nom,prenom,promo\n"; - foreach ($list as $member) { - echo @$member['email'] . ',' . @$member['nom'] . ',' . @$member['prenom'] . ',' . @$member['promo'] . "\n"; - } + echo "email,nom,promo\n"; + echo implode("\n", $list); exit; } - function handler_annu(&$page, $liste = null, $action = null, $subaction = null) + function handler_annu($page, $liste = null, $action = null, $subaction = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -395,7 +388,8 @@ class ListsModule extends PLModule if (empty($GLOBALS['IS_XNET_SITE'])) { $view->addMod('minifiche', 'Mini-fiches', false); } - $view->addMod('geoloc', 'Planisphère'); + // TODO: Reactivate when the new map is completed. + // $view->addMod('geoloc', 'Planisphère'); $view->apply("lists/annu/$liste", $page, $action, $subaction); if ($action == 'geoloc' && $subaction) { return; @@ -407,7 +401,7 @@ class ListsModule extends PLModule $page->assign_by_ref('owners', $moderos); } - function handler_archives(&$page, $liste = null, $action = null, $artid = null) + function handler_archives($page, $liste = null, $action = null, $artid = null) { global $globals; @@ -436,7 +430,7 @@ class ListsModule extends PLModule } } - function handler_rss(&$page, $liste = null, $alias = null, $hash = null) + function handler_rss($page, $liste = null, $alias = null, $hash = null) { if (!$liste) { return PL_NOT_FOUND; @@ -471,12 +465,12 @@ class ListsModule extends PLModule return false; } Get::kill('mid'); - return XDB::execute("INSERT IGNORE INTO ml_moderate + return XDB::execute("INSERT IGNORE INTO email_list_moderate VALUES ({?}, {?}, {?}, {?}, {?}, NOW(), {?}, NULL)", $liste, $domain, $mid, S::i('uid'), $action, Post::v('reason')); } - function handler_moderate(&$page, $liste = null) + function handler_moderate($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -507,8 +501,7 @@ class ListsModule extends PLModule $mailer->addTo("$liste-owner@{$domain}"); $mailer->addHeader('Reply-To', "$liste-owner@{$domain}"); $mailer->setSubject("L'inscription de {$sub['name']} a été $info"); - $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::v('prenom') . ' ' - . S::v('nom') . '(' . S::v('promo') . ")\n"; + $text = "L'inscription de {$sub['name']} à la liste $liste@{$domain} a été $info par " . S::user()->fullName(true) . ".\n"; if (trim(Post::v('reason'))) { $text .= "\nLa raison invoquée est :\n" . Post::v('reason'); } @@ -529,29 +522,15 @@ class ListsModule extends PLModule } } 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); + require_once 'banana/moderate.inc.php'; - $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); - return; - } elseif (Get::has('mid') && Env::has('mok')) { $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); - $msg = file_get_contents('/etc/mailman/fr/accept.txt'); + $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); @@ -560,7 +539,7 @@ class ListsModule extends PLModule return; } - $mail = $this->moderate_mail($domain, $liste, Env::i('mid')); + $this->moderate_mail($domain, $liste, Env::i('mid')); } elseif (Env::has('sid')) { if (list($subs,$mails) = $this->get_pending_ops($domain, $liste)) { foreach($subs as $user) { @@ -592,24 +571,23 @@ class ListsModule extends PLModule static public function no_login_callback($login) { - require_once 'user.func.inc.php'; - global $list_unregistered, $globals; + global $list_unregistered; - $users = get_not_registered_user($login, true); + $users = User::getPendingAccounts($login, true); if ($users && $users->total()) { if (!isset($list_unregistered)) { $list_unregistered = array(); } $list_unregistered[$login] = $users; } else { - list($name, $dom) = @explode('@', $login); - if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) { + list($name, $domain) = @explode('@', $login); + if (User::isMainMailDomain($domain)) { User::_default_user_callback($login); } } } - function handler_admin(&$page, $liste = null) + function handler_admin($page, $liste = null) { global $globals; @@ -690,8 +668,9 @@ class ListsModule extends PLModule S::assert_xsrf_token(); if (strpos(Env::v('del_member'), '@') === false) { - $this->client->mass_unsubscribe( - $liste, array(Env::v('del_member').'@'.$globals->mail->domain)); + if ($del_member = User::getSilent(Env::t('del_member'))) { + $this->client->mass_unsubscribe($liste, array($del_member->forlifeEmail())); + } } else { $this->client->mass_unsubscribe($liste, array(Env::v('del_member'))); } @@ -715,7 +694,9 @@ class ListsModule extends PLModule S::assert_xsrf_token(); if (strpos(Env::v('del_owner'), '@') === false) { - $this->client->del_owner($liste, Env::v('del_owner').'@'.$globals->mail->domain); + if ($del_owner = User::getSilent(Env::t('del_owner'))) { + $this->client->mass_unsubscribe($liste, array($del_owner->forlifeEmail())); + } } else { $this->client->del_owner($liste, Env::v('del_owner')); } @@ -742,7 +723,7 @@ class ListsModule extends PLModule } } - function handler_options(&$page, $liste = null) + function handler_options($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -809,7 +790,7 @@ class ListsModule extends PLModule } } - function handler_delete(&$page, $liste = null) + function handler_delete($page, $liste = null) { global $globals; if (is_null($liste)) { @@ -817,26 +798,14 @@ class ListsModule extends PLModule } $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'; - } - $page->changeTpl('lists/delete.tpl'); if (Post::v('valid') == 'OUI') { S::assert_xsrf_token(); if ($this->client->delete_list($liste, Post::b('del_archive'))) { - foreach (array('', '-owner', '-admin', '-bounces', '-unsubscribe') as $app) { - XDB::execute("DELETE FROM $table - WHERE type={?} AND alias={?}", - $type, $liste.$app.$domain); - } + require_once 'emails.inc.php'; + + delete_list($liste, $domain); $page->assign('deleted', true); $page->trigSuccess('La liste a été détruite !'); } else { @@ -856,7 +825,7 @@ class ListsModule extends PLModule } } - function handler_soptions(&$page, $liste = null) + function handler_soptions($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -885,7 +854,7 @@ class ListsModule extends PLModule } } - function handler_check(&$page, $liste = null) + function handler_check($page, $liste = null) { if (is_null($liste)) { return PL_NOT_FOUND; @@ -908,7 +877,7 @@ class ListsModule extends PLModule } } - function handler_admin_all(&$page) + function handler_admin_all($page) { $page->changeTpl('lists/admin_all.tpl'); $page->setTitle('Administration - Mailing lists');