X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=78fba968f254184dc01d56bd1f73221a65e9afc0;hb=904a82deab29093fa466256194db8527450efd27;hp=6a6576336d4849eae20b0651953d623f3df4a994;hpb=1db75748d39cb4ee8314ff234a55bb732e871eeb;p=platal.git diff --git a/modules/lists.php b/modules/lists.php index 6a65763..78fba96 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -46,17 +46,11 @@ class ListsModule extends PLModule ); } - function on_subscribe($forlife, $uid, $promo, $password) - { - $this->prepare_client(null); - $this->client->subscribe("promo$promo"); - } - function prepare_client(&$page) { global $globals; - require_once dirname(__FILE__).'/lists/lists.inc.php'; + $this->load('lists.inc.php'); $this->client = new MMList(S::v('uid'), S::v('password')); return $globals->mail->domain; @@ -94,7 +88,7 @@ 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')) { @@ -188,11 +182,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); } @@ -204,19 +197,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); } @@ -298,7 +290,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); @@ -444,7 +436,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; @@ -580,7 +572,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); } } } @@ -632,10 +624,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) { @@ -647,13 +638,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) { @@ -678,12 +669,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."); } } } @@ -816,12 +806,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)); @@ -884,7 +878,7 @@ class ListsModule extends PLModule 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();