Uses S::user()->login() instead of S::v('forlife') in all calls to PlUpload.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php
index f409530..a75fab3 100644 (file)
--- a/include/validations/evts.inc.php
+++ b/include/validations/evts.inc.php
@@ -94,7 +94,7 @@ class EvtReq extends Validate
         $this->pmax       = Env::i('promo_max');
         $this->peremption = Env::v('peremption');
         if (@$_FILES['image']['tmp_name']) {
-            $upload = PlUpload::get($_FILES['image'], S::v('forlife'), 'event');
+            $upload = PlUpload::get($_FILES['image'], S::user()->login(), 'event');
             if (!$upload) {
                 $this->trigError("Impossible de télécharger le fichier");
             } elseif (!$upload->isType('image')) {

diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php
index b2fc0a1..7ed7d1e 100644 (file)
--- a/include/validations/photos.inc.php
+++ b/include/validations/photos.inc.php
@@ -101,7 +101,7 @@ class PhotoReq extends Validate
     protected function handle_editor()
     {
         if (isset($_FILES['userfile'])) {
-            $upload =& PlUpload::get($_FILES['userfile'], S::v('forlife'), 'photo');
+            $upload =& PlUpload::get($_FILES['userfile'], S::user()->login(), 'photo');
             if (!$upload) {
                 $this->trigError('Une erreur est survenue lors du téléchargement du fichier');
                 return false;

diff --git a/modules/email.php b/modules/email.php
index e085ee1..893ca33 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -298,7 +298,7 @@ class EmailModule extends PLModule
         if (Post::has('send_email')) {
             S::assert_xsrf_token();
 
-            $upload = PlUpload::get($_FILES['mail'], S::v('forlife'), 'spam.submit', true);
+            $upload = PlUpload::get($_FILES['mail'], S::user()->login(), 'spam.submit', true);
             if (!$upload) {
                 $page->trigError('Une erreur a été rencontrée lors du transfert du fichier');
                 return;
@@ -363,7 +363,7 @@ class EmailModule extends PLModule
 
             $error = false;
             foreach ($_FILES as &$file) {
-                if ($file['name'] && !PlUpload::get($file, S::v('forlife'), 'emails.send', false)) {
+                if ($file['name'] && !PlUpload::get($file, S::user()->login(), 'emails.send', false)) {
                     $page->trigError(PlUpload::$lastError);
                     $error = true;
                     break;
@@ -385,7 +385,7 @@ class EmailModule extends PLModule
 
                 if (empty($to) && empty($cc) && empty($to2) && empty($bcc) && empty($cc2)) {
                     $page->trigError("Indique au moins un destinataire.");
-                    $page->assign('uploaded_f', PlUpload::listFilenames(S::v('forlife'), 'emails.send'));
+                    $page->assign('uploaded_f', PlUpload::listFilenames(S::user()->login(), 'emails.send'));
                 } else {
                     $mymail = new PlMailer();
                     $mymail->setFrom($from);
@@ -395,7 +395,7 @@ class EmailModule extends PLModule
                     if (!empty($bcc)) { $mymail->addBcc($bcc); }
                     if (!empty($to2)) { $mymail->addTo($to2); }
                     if (!empty($cc2)) { $mymail->addCc($cc2); }
-                    $files =& PlUpload::listFiles(S::v('forlife'), 'emails.send');
+                    $files =& PlUpload::listFiles(S::user()->login(), 'emails.send');
                     foreach ($files as $name=>&$upload) {
                         $mymail->addUploadAttachment($upload, $name);
                     }
@@ -407,10 +407,10 @@ class EmailModule extends PLModule
                     if ($mymail->send()) {
                         $page->trigSuccess("Ton email a bien été envoyé.");
                         $_REQUEST = array('bcc' => S::v('bestalias').'@'.$globals->mail->domain);
-                        PlUpload::clear(S::v('forlife'), 'emails.send');
+                        PlUpload::clear(S::user()->login(), 'emails.send');
                     } else {
                         $page->trigError("Erreur lors de l'envoi du courriel, réessaye.");
-                        $page->assign('uploaded_f', PlUpload::listFilenames(S::v('forlife'), 'emails.send'));
+                        $page->assign('uploaded_f', PlUpload::listFilenames(S::user()->login(), 'emails.send'));
                     }
                 }
             }
@@ -419,7 +419,7 @@ class EmailModule extends PLModule
                                  FROM  email_send_save
                                 WHERE  uid = {?}", S::i('uid'));
             if ($res->numRows() == 0) {
-                PlUpload::clear(S::v('forlife'), 'emails.send');
+                PlUpload::clear(S::user()->login(), 'emails.send');
                 $_REQUEST['bcc'] = S::v('bestalias').'@'.$globals->mail->domain;
             } else {
                 $data = unserialize($res->fetchOneCell());

diff --git a/modules/events.php b/modules/events.php
index 36c501e..b8e135e 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -218,7 +218,7 @@ class EventsModule extends PLModule
                 exit;
             }
         } else {
-            $upload = new PlUpload(S::v('forlife'), 'event');
+            $upload = new PlUpload(S::user()->login(), 'event');
             if ($upload->exists() && $upload->isType('image')) {
                 header('Content-Type: ' . $upload->contentType());
                 echo $upload->getContents();
@@ -269,7 +269,7 @@ class EventsModule extends PLModule
         $peremption = Post::i('peremption');
         $valid_mesg = Post::v('valid_mesg');
         $action     = Post::v('action');
-        $upload     = new PlUpload(S::v('forlife'), 'event');
+        $upload     = new PlUpload(S::user()->login(), 'event');
         $this->upload_image($page, $upload);
 
         if (($promo_min > $promo_max && $promo_max != 0)||
@@ -343,7 +343,7 @@ class EventsModule extends PLModule
         $arch = $action == 'archives';
         $page->assign('action', $action);
 
-        $upload = new PlUpload(S::v('forlife'), 'event');
+        $upload = new PlUpload(S::user()->login(), 'event');
         if ((Env::has('preview') || Post::v('action') == "Proposer") && $eid) {
             $action = 'edit';
             $this->upload_image($page, $upload);

diff --git a/modules/lists.php b/modules/lists.php
index 9465f02..6c52d4b 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -210,7 +210,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 {
@@ -644,7 +644,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 {

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 888f27d..0f3c2b7 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -323,7 +323,7 @@ class XnetGrpModule extends PLModule
             $this->load('mail.inc.php');
             set_time_limit(120);
             $tos = get_all_redirects($mbr,  $mls, $mmlist);
-            $upload = PlUpload::get($_FILES['uploaded'], S::v('forlife'), 'xnet.emails', true);
+            $upload = PlUpload::get($_FILES['uploaded'], S::user()->login(), 'xnet.emails', true);
             send_xnet_mails($from, $sujet, $body, Env::v('wiki'), $tos, Post::v('replyto'), $upload, @$_FILES['uploaded']['name']);
             if ($upload) {
                 $upload->rm();
@@ -1206,7 +1206,7 @@ class XnetGrpModule extends PLModule
                 exit;
             }
         } else {
-            $upload = new PlUpload(S::v('forlife'), 'xnetannounce');
+            $upload = new PlUpload(S::user()->login(), 'xnetannounce');
             if ($upload->exists() && $upload->isType('image')) {
                 header('Content-Type: ' . $upload->contentType());
                 echo $upload->getContents();
@@ -1247,7 +1247,7 @@ class XnetGrpModule extends PLModule
             $art['xorg']       = Post::has('xorg');
             $art['nl']         = Post::has('nl');
             $art['event']      = Post::v('event');
-            $upload     = new PlUpload(S::v('forlife'), 'xnetannounce');
+            $upload     = new PlUpload(S::user()->login(), 'xnetannounce');
             $this->upload_image($page, $upload);
 
             $art['contact_html'] = $art['contacts'];