X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=b7e35d6e45a7512c30b6bf424efa10321066df32;hb=60875964fcb18d42316c8dd5fcd2c068526608a6;hp=8cb87239e7949adafd8111e6ff7a1f362f753e6d;hpb=44b071c2ad111a7e41f00f614c04633601a93344;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index 8cb8723..b7e35d6 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), @@ -182,11 +183,10 @@ class ListsModule extends PLModule // 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); } @@ -198,19 +198,18 @@ class ListsModule extends PLModule } // click on validate button 'add_member_sub' - require_once('user.func.inc.php'); if (Post::has('add_member_sub') && Post::has('add_member')) { - $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::v('forlife'), 'list.addmember', true); + $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 = get_users_forlife_list($upload->getContents(), true); + $forlifes = User::getBulkForlifeEmails($upload->getContents(), true); if (!is_null($forlifes)) { $members = array_merge($members, $forlifes); } @@ -292,7 +291,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); @@ -339,6 +338,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)) { @@ -438,7 +456,7 @@ class ListsModule extends PLModule exit; } require_once('banana/ml.inc.php'); - $banana = new MLBanana(S::v('forlife'), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2')); + $banana = new MLBanana(S::user(), Array('listname' => $liste, 'domain' => $domain, 'action' => 'rss2')); $banana->run(); } exit; @@ -528,6 +546,21 @@ class ListsModule extends PLModule $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 = 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; } $mail = $this->moderate_mail($domain, $liste, Env::i('mid')); @@ -574,7 +607,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); } } } @@ -626,10 +659,9 @@ class ListsModule extends PLModule if (Env::has('add_member')) { S::assert_xsrf_token(); - require_once('user.func.inc.php'); - $members = get_users_forlife_list(Env::v('add_member'), - false, - array('ListsModule', 'no_login_callback')); + $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) { @@ -641,13 +673,13 @@ 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::v('forlife'), 'list.addmember', true); + $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 = get_users_forlife_list($upload->getContents(), - false, - array('ListsModule', 'no_login_callback')); + $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) { @@ -672,12 +704,11 @@ class ListsModule extends PLModule if (Env::has('add_owner')) { S::assert_xsrf_token(); - require_once('user.func.inc.php'); - $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback')); + $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."); } } }