X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=fa3232baeee394ecca37c9bec53f6a53a8ddac0f;hb=0001ba7a34dc3b535407cb1b961781c3c69c0ccd;hp=e4c5d1733e830dcd25a700c761b7ef9014eff968;hpb=b8971a3ed64f3ba69becf1cd8f3b32ee2292026d;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index e4c5d17..fa3232b 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -1,6 +1,6 @@ $this->make_hook('create', AUTH_MDP), 'lists/members' => $this->make_hook('members', AUTH_COOKIE), + 'lists/csv' => $this->make_hook('csv', AUTH_COOKIE), 'lists/annu' => $this->make_hook('annu', AUTH_COOKIE), 'lists/archives' => $this->make_hook('archives', AUTH_COOKIE), 'lists/archives/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), @@ -46,19 +47,16 @@ class ListsModule extends PLModule ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - $this->prepare_client(null); - $this->client->subscribe("promo$promo"); - } - - function prepare_client(&$page) + function prepare_client(&$page, $user = null) { global $globals; - require_once dirname(__FILE__).'/lists/lists.inc.php'; + $this->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; } @@ -94,18 +92,22 @@ class ListsModule extends PLModule $page->changeTpl('lists/index.tpl'); $page->addJsLink('ajax.js'); - $page->setTitle('Polytechnique.org - Listes de diffusion'); + $page->setTitle('Listes de diffusion'); if (Get::has('del')) { + S::assert_xsrf_token(); $this->client->unsubscribe(Get::v('del')); pl_redirect('lists'); } if (Get::has('add')) { + S::assert_xsrf_token(); $this->client->subscribe(Get::v('add')); pl_redirect('lists'); } if (Post::has('promo_add')) { + S::assert_xsrf_token(); + $promo = Post::i('promo_add'); if ($promo >= 1900 and $promo < 2100) { $this->client->subscribe("promo$promo"); @@ -113,6 +115,7 @@ class ListsModule extends PLModule $page->trigSuccess("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); @@ -134,6 +137,8 @@ class ListsModule extends PLModule header('Content-Type: text/html; charset="UTF-8"'); $domain = $this->prepare_client($page); $page->changeTpl('lists/liste.inc.tpl', NO_SKIN); + S::assert_xsrf_token(); + if (Get::has('unsubscribe')) { $this->client->unsubscribe($list); } @@ -163,16 +168,28 @@ class ListsModule extends PLModule $page->changeTpl('lists/create.tpl'); + $user_promo = S::i('promo'); + $year = date('Y'); + $month = date('m'); + $young_promo = $very_young_promo = 0; + if ((($year > $user_promo) && ($month > 3)) && ($year < $user_promo + 5)) { + $young_promo = 1; + } + if ((($year > $user_promo) && ($month > 7)) && (($year < $user_promo + 1) && ($month < 8))) { + $very_young_promo = 1; + } + $page->assign('young_promo', $young_promo); + $page->assign('very_young_promo', $very_young_promo); + $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. - $oforlifes = get_users_forlife_list(Post::v('add_owner'), true); - $mforlifes = get_users_forlife_list(Post::v('add_member'), true); + $oforlifes = User::getBulkForlifeEmails(Post::v('add_owner'), true); + $mforlifes = User::getBulkForlifeEmails(Post::v('add_member'), true); if (!is_null($oforlifes)) { $owners = array_merge($owners, $oforlifes); } @@ -185,23 +202,35 @@ class ListsModule extends PLModule // click on validate button 'add_member_sub' if (Post::has('add_member_sub') && Post::has('add_member')) { - require_once('user.func.inc.php'); - $forlifes = get_users_forlife_list(Post::v('add_member'), true); + $forlifes = User::getBulkForlifeEmails(Post::v('add_member'), true); if (!is_null($forlifes)) { $members = array_merge($members, $forlifes); } } + if (Post::has('add_member_sub') && isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) { + $upload =& PlUpload::get($_FILES['add_member_file'], S::user()->login(), 'list.addmember', true); + if (!$upload) { + $page->trigError('Une erreur s\'est produite lors du téléchargement du fichier'); + } else { + $forlifes = User::getBulkForlifeEmails($upload->getContents(), true); + if (!is_null($forlifes)) { + $members = array_merge($members, $forlifes); + } + } + } ksort($owners); $owners = array_unique($owners); ksort($members); $members = array_unique($members); - $page->assign('owners', join(' ', $owners)); - $page->assign('members', join(' ', $members)); + $page->assign('owners', join("\n", $owners)); + $page->assign('members', join("\n", $members)); if (!Post::has('submit')) { return; + } else { + S::assert_xsrf_token(); } $asso = Post::v('asso'); @@ -265,7 +294,7 @@ class ListsModule extends PLModule if (!$page->nb_errs()) { $page->assign('created', true); require_once 'validations.inc.php'; - $req = new ListeReq(S::v('uid'), $asso, $liste, $domain, + $req = new ListeReq(S::user(), $asso, $liste, $domain, Post::v('desc'), Post::i('advertise'), Post::i('modlevel'), Post::i('inslevel'), $owners, $members); @@ -284,11 +313,13 @@ class ListsModule extends PLModule $page->changeTpl('lists/members.tpl'); if (Get::has('del')) { + S::assert_xsrf_token(); $this->client->unsubscribe($liste); pl_redirect('lists/members/'.$liste); } if (Get::has('add')) { + S::assert_xsrf_token(); $this->client->subscribe($liste); pl_redirect('lists/members/'.$liste); } @@ -310,6 +341,25 @@ class ListsModule extends PLModule } } + 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])); + header('Content-Type: text/x-csv; charset=utf-8;'); + header('Pragma: '); + header('Cache-Control: '); + + echo "email,nom,prenom,promo\n"; + foreach ($list as $member) { + echo @$member['email'] . ',' . @$member['nom'] . ',' . @$member['prenom'] . ',' . @$member['promo'] . "\n"; + } + exit; + } + function handler_annu(&$page, $liste = null, $action = null, $subaction = null) { if (is_null($liste)) { @@ -319,10 +369,12 @@ class ListsModule extends PLModule $this->prepare_client($page); if (Get::has('del')) { + S::assert_xsrf_token(); $this->client->unsubscribe($liste); pl_redirect('lists/annu/'.$liste); } if (Get::has('add')) { + S::assert_xsrf_token(); $this->client->subscribe($liste); pl_redirect('lists/annu/'.$liste); } @@ -342,7 +394,7 @@ class ListsModule extends PLModule $view = new ArraySet($users); $view->addMod('trombi', 'Trombinoscope', true, array('with_promo' => true)); if (empty($GLOBALS['IS_XNET_SITE'])) { - $view->addMod('minifiche', 'Minifiches', false); + $view->addMod('minifiche', 'Mini-fiches', false); } $view->addMod('geoloc', 'Planisphère'); $view->apply("lists/annu/$liste", $page, $action, $subaction); @@ -387,27 +439,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; @@ -443,6 +490,8 @@ class ListsModule extends PLModule $page->register_modifier('hdc', 'list_header_decode'); if (Env::has('sadd') || Env::has('sdel')) { + S::assert_xsrf_token(); + if (Env::has('sadd')) { /* 4 = SUBSCRIBE */ $sub = $this->client->get_pending_sub($liste, Env::v('sadd')); $this->client->handle_request($liste,Env::v('sadd'),4,''); @@ -473,6 +522,8 @@ class ListsModule extends PLModule } if (Post::has('moderate_mails') && Post::has('select_mails')) { + S::assert_xsrf_token(); + $mails = array_keys(Post::v('select_mails')); foreach($mails as $mail) { $this->moderate_mail($domain, $liste, $mail); @@ -539,7 +590,7 @@ class ListsModule extends PLModule } else { list($name, $dom) = @explode('@', $login); if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) { - _default_user_callback($login); + User::_default_user_callback($login); } } } @@ -557,6 +608,8 @@ class ListsModule extends PLModule $page->changeTpl('lists/admin.tpl'); if (Env::has('send_mark')) { + S::assert_xsrf_token(); + $actions = Env::v('mk_action'); $uids = Env::v('mk_uid'); $mails = Env::v('mk_email'); @@ -587,10 +640,11 @@ class ListsModule extends PLModule } if (Env::has('add_member')) { - require_once('user.func.inc.php'); - $members = get_users_forlife_list(Env::v('add_member'), - false, - array('ListsModule', 'no_login_callback')); + S::assert_xsrf_token(); + + $members = User::getBulkForlifeEmails(Env::v('add_member'), + false, + array('ListsModule', 'no_login_callback')); $arr = $this->client->mass_subscribe($liste, $members); if (is_array($arr)) { foreach($arr as $addr) { @@ -599,7 +653,28 @@ class ListsModule extends PLModule } } + if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) { + S::assert_xsrf_token(); + + $upload =& PlUpload::get($_FILES['add_member_file'], S::user()->login(), 'list.addmember', true); + if (!$upload) { + $page->trigError('Une erreur s\'est produite lors du téléchargement du fichier'); + } else { + $members = User::getBulkForlifeEmails($upload->getContents(), + false, + array('ListsModule', 'no_login_callback')); + $arr = $this->client->mass_subscribe($liste, $members); + if (is_array($arr)) { + foreach($arr as $addr) { + $page->trigSuccess("{$addr[0]} inscrit."); + } + } + } + } + if (Env::has('del_member')) { + S::assert_xsrf_token(); + if (strpos(Env::v('del_member'), '@') === false) { $this->client->mass_unsubscribe( $liste, array(Env::v('del_member').'@'.$globals->mail->domain)); @@ -610,18 +685,21 @@ class ListsModule extends PLModule } if (Env::has('add_owner')) { - require_once('user.func.inc.php'); - $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback')); + S::assert_xsrf_token(); + + $owners = User::getBulkForlifeEmails(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback')); if ($owners) { foreach ($owners as $login) { if ($this->client->add_owner($liste, $login)) { - $page->trigSuccess($alias." ajouté aux modérateurs."); + $page->trigSuccess($login ." ajouté aux modérateurs."); } } } } if (Env::has('del_owner')) { + S::assert_xsrf_token(); + if (strpos(Env::v('del_owner'), '@') === false) { $this->client->del_owner($liste, Env::v('del_owner').'@'.$globals->mail->domain); } else { @@ -661,6 +739,8 @@ class ListsModule extends PLModule $page->changeTpl('lists/options.tpl'); if (Post::has('submit')) { + S::assert_xsrf_token(); + $values = $_POST; $values = array_map('utf8_decode', $values); $spamlevel = intval($values['bogo_level']); @@ -696,8 +776,10 @@ class ListsModule extends PLModule } $this->client->set_owner_options($liste, $values); } elseif (isvalid_email(Post::v('atn_add'))) { + S::assert_xsrf_token(); $this->client->add_to_wl($liste, Post::v('atn_add')); } elseif (Get::has('atn_del')) { + S::assert_xsrf_token(); $this->client->del_from_wl($liste, Get::v('atn_del')); pl_redirect('lists/options/'.$liste); } @@ -733,6 +815,8 @@ class ListsModule extends PLModule $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 @@ -740,12 +824,16 @@ class ListsModule extends PLModule $type, $liste.$app.$domain); } $page->assign('deleted', true); + $page->trigSuccess('La liste a été détruite !'); } 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'); } } elseif (list($details,$options) = $this->client->get_owner_options($liste)) { + if (!$details['own']) { + $page->trigWarning('Tu n\'es pas administrateur de la liste, mais du site.'); + } $page->assign_by_ref('details', $details); $page->assign_by_ref('options', $options); $page->assign('bogo_level', $this->client->get_bogo_level($liste)); @@ -765,6 +853,8 @@ class ListsModule extends PLModule $page->changeTpl('lists/soptions.tpl'); if (Post::has('submit')) { + S::assert_xsrf_token(); + $values = $_POST; $values = array_map('utf8_decode', $values); unset($values['submit']); @@ -792,6 +882,7 @@ class ListsModule extends PLModule $page->changeTpl('lists/check.tpl'); if (Post::has('correct')) { + S::assert_xsrf_token(); $this->client->check_options($liste, true); } @@ -803,12 +894,13 @@ class ListsModule extends PLModule } } - function handler_admin_all(&$page) { + function handler_admin_all(&$page) + { $page->changeTpl('lists/admin_all.tpl'); - $page->setTitle('Polytechnique.org - Administration - Mailing lists'); + $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); } }