X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=baed14f8e2db839c25ff7aa92b7b5f6c78852d93;hb=7380801f05494c7e0c7f2ca9854e5302401e9077;hp=e1bfb1161957b144342e15908db8400a8a76698d;hpb=5ae3e9a9b7e095956904a2bedbc0845af88434f0;p=platal.git
diff --git a/modules/lists.php b/modules/lists.php
index e1bfb11..baed14f 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -26,24 +26,25 @@ class ListsModule extends PLModule
function handlers()
{
return array(
- 'lists' => $this->make_hook('lists', AUTH_MDP),
- 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH),
- 'lists/create' => $this->make_hook('create', AUTH_MDP, 'lists'),
-
- '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' => $this->make_hook('lists', AUTH_PASSWD, 'user'),
+ 'lists/ajax' => $this->make_hook('ajax', AUTH_PASSWD, 'user', NO_AUTH),
+ 'lists/create' => $this->make_hook('create', AUTH_PASSWD, 'lists'),
+
+ 'lists/members' => $this->make_hook('members', AUTH_COOKIE, 'user'),
+ 'lists/csv' => $this->make_hook('csv', AUTH_COOKIE, 'user'),
+ 'lists/annu' => $this->make_hook('annu', AUTH_COOKIE, 'user'),
+ 'lists/archives' => $this->make_hook('archives', AUTH_COOKIE, 'user'),
'lists/archives/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS),
- 'lists/moderate' => $this->make_hook('moderate', AUTH_MDP),
- 'lists/admin' => $this->make_hook('admin', AUTH_MDP),
- 'lists/options' => $this->make_hook('options', AUTH_MDP),
- 'lists/delete' => $this->make_hook('delete', AUTH_MDP),
+ 'lists/moderate' => $this->make_hook('moderate', AUTH_PASSWD, 'user'),
+ 'lists/admin' => $this->make_hook('admin', AUTH_PASSWD, 'user'),
+ 'lists/options' => $this->make_hook('options', AUTH_PASSWD, 'user'),
+ 'lists/delete' => $this->make_hook('delete', AUTH_PASSWD, 'user'),
- 'lists/soptions' => $this->make_hook('soptions', AUTH_MDP),
- 'lists/check' => $this->make_hook('check', AUTH_MDP),
- 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'),
+ 'lists/soptions' => $this->make_hook('soptions', AUTH_PASSWD, 'user'),
+ 'lists/check' => $this->make_hook('check', AUTH_PASSWD, 'user'),
+ 'admin/lists' => $this->make_hook('admin_all', AUTH_PASSWD, 'admin'),
+ 'admin/aliases' => $this->make_hook('aaliases', AUTH_PASSWD, 'admin')
);
}
@@ -60,6 +61,19 @@ class ListsModule extends PLModule
return $globals->mail->domain;
}
+ function verify_list_owner($page, $liste)
+ {
+ if (list(, , $owners) = $this->client->get_members($liste)) {
+ if (!(in_array(S::user()->forlifeEmail(), $owners) || S::admin())) {
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.");
+ }
+ } else {
+ $page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.
"
+ . " Si tu penses qu'il s'agit d'une erreur, "
+ . "contact le support.");
+ }
+ }
+
function get_pending_ops($domain, $list)
{
list($subs,$mails) = $this->client->get_pending_ops($list);
@@ -345,11 +359,11 @@ class ListsModule extends PLModule
$this->prepare_client($page);
$members = $this->client->get_members($liste);
$list = list_fetch_basic_info(list_extract_members($members[1]));
- pl_cached_content_headers('text/x-csv', 1);
+ pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1);
- echo "email,nom,promo\n";
- echo implode("\n", $list);
- exit;
+ echo utf8_decode("Nom;Prénom;Promotion\n");
+ echo utf8_decode(implode("\n", $list));
+ exit();
}
function handler_annu($page, $liste = null, $action = null, $subaction = null)
@@ -376,29 +390,34 @@ class ListsModule extends PLModule
$page->kill("La liste n'existe pas ou tu n'as pas le droit d'en voir les détails.");
}
- global $platal;
list(,$members) = $this->client->get_members($liste);
- $users = array();
- foreach ($members as $m) {
- $users[] = $m[1];
+
+ if ($action == 'moderators') {
+ $users = $owners;
+ $show_moderators = true;
+ $action = $subaction;
+ $subaction = '';
+ } else {
+ $show_moderators = false;
+ $users = array();
+ foreach ($members as $m) {
+ $users[] = $m[1];
+ }
}
+
require_once 'userset.inc.php';
- $view = new ArraySet($users);
- $view->addMod('trombi', 'Trombinoscope', true, array('with_promo' => true));
+ $view = new UserArraySet($users);
+ $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
+ $view->addMod('listmember', 'Annuaire', true);
if (empty($GLOBALS['IS_XNET_SITE'])) {
$view->addMod('minifiche', 'Mini-fiches', false);
}
- // TODO: Reactivate when the new map is completed.
- // $view->addMod('geoloc', 'Planisphère');
+ $view->addMod('map', 'Planisphère');
$view->apply("lists/annu/$liste", $page, $action, $subaction);
- if ($action == 'geoloc' && $subaction) {
- return;
- }
$page->changeTpl('lists/annu.tpl');
- $moderos = list_sort_owners($owners[1]);
$page->assign_by_ref('details', $owners[0]);
- $page->assign_by_ref('owners', $moderos);
+ $page->assign('show_moderators', $show_moderators);
}
function handler_archives($page, $liste = null, $action = null, $artid = null)
@@ -477,6 +496,7 @@ class ListsModule extends PLModule
}
$domain = $this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/moderate.tpl');
@@ -596,6 +616,7 @@ class ListsModule extends PLModule
}
$domain = $this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/admin.tpl');
@@ -612,8 +633,9 @@ class ListsModule extends PLModule
case 'marketu': case 'markets':
require_once 'emails.inc.php';
+ $user = User::get($uids[$key]);
$mail = valide_email($mails[$key]);
- if (isvalid_email_redirection($mail)) {
+ if (isvalid_email_redirection($mail, $user)) {
$from = ($action == 'marketu') ? 'user' : 'staff';
$market = Marketing::get($uids[$key], $mail);
if (!$market) {
@@ -637,6 +659,10 @@ class ListsModule extends PLModule
$members = User::getBulkForlifeEmails(Env::v('add_member'),
true,
array('ListsModule', 'no_login_callback'));
+ // Make sure we send a list (array_values) of unique (array_unique)
+ // emails.
+ $members = array_values(array_unique($members));
+
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
@@ -655,6 +681,10 @@ class ListsModule extends PLModule
$members = User::getBulkForlifeEmails($upload->getContents(),
true,
array('ListsModule', 'no_login_callback'));
+ // Make sure we send a list (array_values) of unique (array_unique)
+ // emails.
+ $members = array_values(array_unique($members));
+
$arr = $this->client->mass_subscribe($liste, $members);
if (is_array($arr)) {
foreach($arr as $addr) {
@@ -715,7 +745,6 @@ class ListsModule extends PLModule
$page->assign_by_ref('members', $membres);
$page->assign_by_ref('owners', $moderos);
$page->assign('np_m', count($mem));
-
} else {
$page->kill("La liste n'existe pas ou tu n'as pas le droit de l'administrer.
"
. " Si tu penses qu'il s'agit d'une erreur, "
@@ -730,6 +759,7 @@ class ListsModule extends PLModule
}
$this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/options.tpl');
@@ -798,6 +828,7 @@ class ListsModule extends PLModule
}
$domain = $this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/delete.tpl');
if (Post::v('valid') == 'OUI') {
S::assert_xsrf_token();
@@ -832,6 +863,7 @@ class ListsModule extends PLModule
}
$this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/soptions.tpl');
@@ -861,6 +893,7 @@ class ListsModule extends PLModule
}
$this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/check.tpl');
@@ -886,6 +919,62 @@ class ListsModule extends PLModule
$listes = $this->client->get_all_lists();
$page->assign_by_ref('listes', $listes);
}
+
+ function handler_aaliases($page, $alias = null)
+ {
+ global $globals;
+ require_once 'emails.inc.php';
+ $page->setTitle('Administration - Aliases');
+
+ if (Post::has('new_alias')) {
+ pl_redirect('admin/aliases/' . Post::t('new_alias') . '@' . $globals->mail->domain);
+ }
+
+ // If no alias, list them all.
+ if (is_null($alias)) {
+ $page->changeTpl('lists/admin_aliases.tpl');
+ $page->assign('aliases', array_merge(iterate_list_alias($globals->mail->domain), iterate_list_alias($globals->mail->domain2)));
+ return;
+ }
+
+ list($local_part, $domain) = explode('@', $alias);
+ if (!($globals->mail->domain == $domain || $globals->mail->domain2 == $domain)
+ || !preg_match("/^[a-zA-Z0-9\-\.]*$/", $local_part)) {
+ $page->trigErrorRedirect('Le nom de l\'alias est erroné.', $globals->asso('diminutif') . 'admin/aliases');
+ }
+
+ // Now we can perform the action.
+ if (Post::has('del_alias')) {
+ S::assert_xsrf_token();
+
+ delete_list_alias($local_part, $domain);
+ $page->trigSuccessRedirect($alias . ' supprimé.', 'admin/aliases');
+ }
+
+ if (Post::has('add_member')) {
+ S::assert_xsrf_token();
+
+ if (add_to_list_alias(Post::t('add_member'), $local_part, $domain)) {
+ $page->trigSuccess('Ajout réussit.');
+ } else {
+ $page->trigError('Ajout infructueux.');
+ }
+ }
+
+ if (Get::has('del_member')) {
+ S::assert_xsrf_token();
+
+ if (delete_from_list_alias(Get::t('del_member'), $local_part, $domain)) {
+ $page->trigSuccess('Suppression réussie.');
+ } else {
+ $page->trigError('Suppression infructueuse.');
+ }
+ }
+
+ $page->changeTpl('lists/admin_edit_alias.tpl');
+ $page->assign('members', list_alias_members($local_part, $domain));
+ $page->assign('alias', $alias);
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: