X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Flists.php;h=3e85e727600d4440860474db28bcdb702df2e084;hb=b270577e919c58455a3629a4d9d61bd38ea49e11;hp=3894aac7bb25e2579804df4959e8244245108b3d;hpb=e46cf8c46341b447cc3701c8afcc9baec3da11e5;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index 3894aac..3e85e72 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -1,6 +1,6 @@ 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(); @@ -116,25 +116,26 @@ class ListsModule extends PLModule } } - $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) { - header('Content-Type: text/html; charset="UTF-8"'); + pl_content_headers("text/html"); $domain = $this->prepare_client($page); $page->changeTpl('lists/liste.inc.tpl', NO_SKIN); S::assert_xsrf_token(); @@ -252,13 +253,13 @@ class ListsModule extends PLModule } $new = $liste . '@' . $domain; - $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $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); + $res_groupe = XDB::query('SELECT mail_domain FROM groups WHERE nom={?}', $groupex_name); $domain = $res_groupe->fetchOneCell(); if (!$domain) { @@ -266,7 +267,7 @@ class ListsModule extends PLModule } $new = $liste . '@' . $domain; - $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); + $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; @@ -292,6 +293,7 @@ class ListsModule extends PLModule } 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, @@ -349,9 +351,7 @@ class ListsModule extends PLModule $this->prepare_client($page); $members = $this->client->get_members($liste); $list = list_fetch_names(list_extract_members($members[1])); - header('Content-Type: text/x-csv; charset=utf-8;'); - header('Pragma: '); - header('Cache-Control: '); + pl_content_headers("text/x-csv"); echo "email,nom,prenom,promo\n"; foreach ($list as $member) { @@ -396,7 +396,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; @@ -472,7 +473,7 @@ 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')); } @@ -530,29 +531,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); @@ -561,7 +548,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) { @@ -593,10 +580,9 @@ class ListsModule extends PLModule static public function no_login_callback($login) { - require_once 'user.func.inc.php'; global $list_unregistered, $globals; - $users = get_not_registered_user($login, true); + $users = User::getPendingAccounts($login, true); if ($users && $users->total()) { if (!isset($list_unregistered)) { $list_unregistered = array(); @@ -658,7 +644,7 @@ class ListsModule extends PLModule S::assert_xsrf_token(); $members = User::getBulkForlifeEmails(Env::v('add_member'), - false, + true, array('ListsModule', 'no_login_callback')); $arr = $this->client->mass_subscribe($liste, $members); if (is_array($arr)) { @@ -676,7 +662,7 @@ class ListsModule extends PLModule $page->trigError('Une erreur s\'est produite lors du téléchargement du fichier'); } else { $members = User::getBulkForlifeEmails($upload->getContents(), - false, + true, array('ListsModule', 'no_login_callback')); $arr = $this->client->mass_subscribe($liste, $members); if (is_array($arr)) {