X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists.php;h=78fba968f254184dc01d56bd1f73221a65e9afc0;hb=2e5fbf5e95af6df07bf7b52f78a4bec325c1af41;hp=ba34cd7e429817f4bd9b9527ebb1b2717bd0553a;hpb=750f63db6924070b018145ba76a5b16bcf0a133c;p=platal.git

diff --git a/modules/lists.php b/modules/lists.php
index ba34cd7..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;
@@ -210,7 +204,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 +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);
@@ -644,7 +638,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 +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.<br />'
                          . 'Contact les administrateurs du site pour régler le problème : '
                          . '<a href="mailto:support@polytechnique.org">support@polytechnique.org</a>');
             }
         } 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));