X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=954ecddb3bf20f359a9f611d81ae8ba23cf8be69;hb=f6e35ff3fefafe908e1675690340ab93265192a0;hp=02e119e0e500015402b3048e6d076958b658d725;hpb=ee71865181e96e7b0754ef9e7da4b3cb26f4c1d7;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index 02e119e..954ecdd 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -1,6 +1,6 @@ load('lists.inc.php'); + if (is_null($user)) { + $user = S::user(); + } - $this->client = new MMList(S::v('uid'), S::v('password')); + $this->client = new MMList($user); return $globals->mail->domain; } @@ -61,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(); @@ -113,20 +116,21 @@ 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) @@ -165,14 +169,20 @@ class ListsModule extends PLModule $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); @@ -255,7 +265,7 @@ class ListsModule extends PLModule 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) { @@ -392,7 +402,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; @@ -435,27 +446,22 @@ class ListsModule extends PLModule function handler_rss(&$page, $liste = null, $alias = null, $hash = null) { - require_once('rss.inc.php'); - $uid = init_rss(null, $alias, $hash); - if (!$uid || !$liste) { - exit; + if (!$liste) { + return PL_NOT_FOUND; + } + $user = Platal::session()->tokenAuth($alias, $hash); + if (is_null($user)) { + return PL_FORBIDDEN; } - $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); - - $domain = $this->prepare_client($page); + $domain = $this->prepare_client($page, $user); 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(S::user(), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2')); + $banana = new MLBanana($user, Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2')); $banana->run(); } exit; @@ -473,7 +479,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')); } @@ -531,29 +537,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); @@ -562,7 +554,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) { @@ -594,10 +586,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(); @@ -910,12 +901,13 @@ 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'); - $client = new MMList(S::v('uid'), S::v('password')); - $listes = $client->get_all_lists(); + $this->prepare_client($page); + $listes = $this->client->get_all_lists(); $page->assign_by_ref('listes', $listes); } }