X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Flists.php;h=8a5ccb9abb1746bc3dc403e51e6c3f0579b41fb2;hb=08b5c28f7adf245d5a262add9c31209f5d188ec7;hp=ffa19738b12b458f55111227af2bfd01e547525a;hpb=6a686adb39d65e4472497f4ce69f0314085cead3;p=platal.git
diff --git a/modules/lists.php b/modules/lists.php
index ffa1973..8a5ccb9 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -1,6 +1,6 @@
$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/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/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' => $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_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_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')
);
}
- function prepare_client(&$page, $user = null)
+ function prepare_client($page, $user = null)
{
global $globals;
@@ -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);
@@ -76,7 +90,7 @@ class ListsModule extends PLModule
return array($subs, $mails);
}
- function handler_lists(&$page)
+ function handler_lists($page)
{
function filter_owner($list)
{
@@ -132,7 +146,7 @@ class ListsModule extends PLModule
}
}
- function handler_ajax(&$page, $list = null)
+ function handler_ajax($page, $list = null)
{
pl_content_headers("text/html");
$domain = $this->prepare_client($page);
@@ -162,7 +176,7 @@ class ListsModule extends PLModule
$page->assign_by_ref('liste', $liste);
}
- function handler_create(&$page)
+ function handler_create($page)
{
global $globals;
@@ -239,17 +253,17 @@ class ListsModule extends PLModule
S::assert_xsrf_token();
}
- $asso = Post::v('asso');
- $liste = Post::v('liste');
+ $asso = Post::t('asso');
+ $list = strtolower(Post::t('liste'));
- if (empty($liste)) {
+ if (empty($list)) {
$page->trigError('Le champ « adresse souhaitée » est vide.');
}
- if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
+ if (!preg_match("/^[a-zA-Z0-9\-]*$/", $list)) {
$page->trigError('Le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets.');
}
- if (($asso == "binet") || ($asso == "alias")) {
+ if (($asso == 'binet') || ($asso == 'alias')) {
$promo = Post::i('promo');
$domain = $promo . '.' . $globals->mail->domain;
@@ -257,35 +271,25 @@ class ListsModule extends PLModule
$page->trigError('La promotion est mal renseignée, elle doit être du type : 2004.');
}
- $new = $liste . '@' . $domain;
- $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $new);
-
- } else {
- if ($asso == "groupex") {
- $groupex_name = Post::v('groupex_name');
-
- $res_groupe = XDB::query('SELECT mail_domain FROM groups WHERE nom={?}', $groupex_name);
- $domain = $res_groupe->fetchOneCell();
+ } elseif ($asso == 'groupex') {
+ $domain = XDB::fetchOneCell('SELECT mail_domain
+ FROM groups
+ WHERE nom = {?}',
+ Post::t('groupex_name'));
if (!$domain) {
$page->trigError('Il n\'y a aucun groupe de ce nom sur Polytechnique.net.');
}
-
- $new = $liste . '@' . $domain;
- $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}', $new);
- } else {
- $res = XDB::query("SELECT COUNT(*) FROM aliases WHERE alias={?}", $liste);
- $domain = $globals->mail->domain;
- }
+ } else {
+ $domain = $globals->mail->domain;
}
- $n = $res->fetchOneCell();
-
- if ($n) {
+ require_once 'emails.inc.php';
+ if (list_exist($list, $domain)) {
$page->trigError("L'« adresse souhaitée » est déjà prise.");
}
- if (!Post::v('desc')) {
+ if (!Post::t('desc')) {
$page->trigError('Le sujet est vide.');
}
@@ -293,22 +297,22 @@ class ListsModule extends PLModule
$page->trigError('Il n\'y a pas de gestionnaire.');
}
- if (count($members)<4) {
+ if (count($members) < 4) {
$page->trigError('Il n\'y a pas assez de membres.');
}
if (!$page->nb_errs()) {
$page->trigSuccess('Demande de création envoyée !');
$page->assign('created', true);
- $req = new ListeReq(S::user(), $asso, $liste, $domain,
- Post::v('desc'), Post::i('advertise'),
+ $req = new ListeReq(S::user(), $asso, $list, $domain,
+ Post::t('desc'), Post::i('advertise'),
Post::i('modlevel'), Post::i('inslevel'),
$owners, $members);
$req->submit();
}
}
- function handler_members(&$page, $liste = null)
+ function handler_members($page, $liste = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
@@ -347,7 +351,7 @@ class ListsModule extends PLModule
}
}
- function handler_csv(PlPage &$page, $liste = null)
+ function handler_csv(PlPage $page, $liste = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
@@ -355,14 +359,14 @@ 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)
+ function handler_annu($page, $liste = null, $action = null, $subaction = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
@@ -386,32 +390,37 @@ 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)
+ function handler_archives($page, $liste = null, $action = null, $artid = null)
{
global $globals;
@@ -440,7 +449,7 @@ class ListsModule extends PLModule
}
}
- function handler_rss(&$page, $liste = null, $alias = null, $hash = null)
+ function handler_rss($page, $liste = null, $alias = null, $hash = null)
{
if (!$liste) {
return PL_NOT_FOUND;
@@ -480,13 +489,14 @@ class ListsModule extends PLModule
$liste, $domain, $mid, S::i('uid'), $action, Post::v('reason'));
}
- function handler_moderate(&$page, $liste = null)
+ function handler_moderate($page, $liste = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
}
$domain = $this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/moderate.tpl');
@@ -581,7 +591,7 @@ class ListsModule extends PLModule
static public function no_login_callback($login)
{
- global $list_unregistered, $globals;
+ global $list_unregistered;
$users = User::getPendingAccounts($login, true);
if ($users && $users->total()) {
@@ -590,14 +600,14 @@ class ListsModule extends PLModule
}
$list_unregistered[$login] = $users;
} else {
- list($name, $dom) = @explode('@', $login);
- if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
+ list($name, $domain) = @explode('@', $login);
+ if (User::isMainMailDomain($domain)) {
User::_default_user_callback($login);
}
}
}
- function handler_admin(&$page, $liste = null)
+ function handler_admin($page, $liste = null)
{
global $globals;
@@ -606,6 +616,17 @@ class ListsModule extends PLModule
}
$domain = $this->prepare_client($page);
+ $force_rights = false;
+ if ($GLOBALS['IS_XNET_SITE']) {
+ $perms = S::v('perms');
+ if (is_object($perms) && $perms->hasFlag('groupadmin')) {
+ $force_rights = true;
+ }
+ }
+ $page->assign('group_admin', $force_rights);
+ if (!$force_rights) {
+ $this->verify_list_owner($page, $liste);
+ }
$page->changeTpl('lists/admin.tpl');
@@ -622,8 +643,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) {
@@ -641,34 +663,52 @@ class ListsModule extends PLModule
}
}
- if (Env::has('add_member')) {
+ if (Env::has('add_member') ||
+ isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
S::assert_xsrf_token();
- $members = User::getBulkForlifeEmails(Env::v('add_member'),
+ if (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 {
+ $logins = $upload->getContents();
+ }
+ } else {
+ $logins = Env::v('add_member');
+ }
+
+ $logins = preg_split("/[; ,\r\n\|]+/", $logins);
+ $members = User::getBulkForlifeEmails($logins,
true,
array('ListsModule', 'no_login_callback'));
+ $unfound = array_diff_key($logins, $members);
+
+ // 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);
+
+ $successes = array();
if (is_array($arr)) {
foreach($arr as $addr) {
+ $successes[] = $addr[1];
$page->trigSuccess("{$addr[0]} inscrit.");
}
}
- }
- if (isset($_FILES['add_member_file']) && $_FILES['add_member_file']['tmp_name']) {
- S::assert_xsrf_token();
+ $already = array_diff($members, $successes);
+ if (is_array($already)) {
+ foreach ($already as $item) {
+ $page->trigWarning($item . ' est déjà inscrit.');
+ }
+ }
- $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(),
- true,
- 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 (is_array($unfound)) {
+ foreach ($unfound as $item) {
+ if (trim($item) != '') {
+ $page->trigError($item . " ne correspond pas à un compte existant et n'est pas une adresse email.");
}
}
}
@@ -678,8 +718,9 @@ class ListsModule extends PLModule
S::assert_xsrf_token();
if (strpos(Env::v('del_member'), '@') === false) {
- $this->client->mass_unsubscribe(
- $liste, array(Env::v('del_member').'@'.$globals->mail->domain));
+ if ($del_member = User::getSilent(Env::t('del_member'))) {
+ $this->client->mass_unsubscribe($liste, array($del_member->forlifeEmail()));
+ }
} else {
$this->client->mass_unsubscribe($liste, array(Env::v('del_member')));
}
@@ -703,7 +744,9 @@ class ListsModule extends PLModule
S::assert_xsrf_token();
if (strpos(Env::v('del_owner'), '@') === false) {
- $this->client->del_owner($liste, Env::v('del_owner').'@'.$globals->mail->domain);
+ if ($del_owner = User::getSilent(Env::t('del_owner'))) {
+ $this->client->mass_unsubscribe($liste, array($del_owner->forlifeEmail()));
+ }
} else {
$this->client->del_owner($liste, Env::v('del_owner'));
}
@@ -722,7 +765,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,13 +772,14 @@ class ListsModule extends PLModule
}
}
- function handler_options(&$page, $liste = null)
+ function handler_options($page, $liste = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
}
$this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/options.tpl');
@@ -797,7 +840,7 @@ class ListsModule extends PLModule
}
}
- function handler_delete(&$page, $liste = null)
+ function handler_delete($page, $liste = null)
{
global $globals;
if (is_null($liste)) {
@@ -805,26 +848,15 @@ class ListsModule extends PLModule
}
$domain = $this->prepare_client($page);
- if ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
- $domain = '';
- $table = 'aliases';
- $type = 'liste';
- } else {
- $domain = '@' . $domain;
- $table = 'virtual';
- $type = 'list';
- }
-
+ $this->verify_list_owner($page, $liste);
$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
- WHERE type={?} AND alias={?}",
- $type, $liste.$app.$domain);
- }
+ require_once 'emails.inc.php';
+
+ delete_list($liste, $domain);
$page->assign('deleted', true);
$page->trigSuccess('La liste a été détruite !');
} else {
@@ -844,13 +876,14 @@ class ListsModule extends PLModule
}
}
- function handler_soptions(&$page, $liste = null)
+ function handler_soptions($page, $liste = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
}
$this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/soptions.tpl');
@@ -873,13 +906,14 @@ class ListsModule extends PLModule
}
}
- function handler_check(&$page, $liste = null)
+ function handler_check($page, $liste = null)
{
if (is_null($liste)) {
return PL_NOT_FOUND;
}
$this->prepare_client($page);
+ $this->verify_list_owner($page, $liste);
$page->changeTpl('lists/check.tpl');
@@ -896,7 +930,7 @@ 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');
@@ -905,6 +939,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: