X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=e7d5674f007f0d6aa2e1123d7ea36721dbd5554a;hb=3e53a496dd11e5082bfefc22fc9322d80152edd6;hp=9465f028e2bd016973585ccf6ed2a9dbdea4843e;hpb=dbbfabe9138005367547465c13e50b98f121bc36;p=platal.git
diff --git a/modules/lists.php b/modules/lists.php
index 9465f02..e7d5674 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -31,6 +31,7 @@ class ListsModule extends PLModule
'lists/create' => $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;
$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->id(), $user->password);
return $globals->mail->domain;
}
@@ -210,7 +208,7 @@ class ListsModule extends PLModule
}
}
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 {
@@ -296,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);
@@ -343,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)) {
@@ -422,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;
@@ -644,7 +656,7 @@ 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 {
@@ -812,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));