autocomplete improvements: can find pierre-yves when looking for yves

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index 981b7db..f40ce86 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -321,7 +321,7 @@ class EmailModule extends PLModule
             }
 
             foreach ($_FILES as &$file) {
-                if (!PlUpload::get($file, S::v('forlife'), 'emails.send', false)) {
+                if ($file['name'] && !PlUpload::get($file, S::v('forlife'), 'emails.send', false)) {
                     $page->trig("Impossible de télécharger '" . pl_entities($file['name']) . "'");
                 }
             }
@@ -332,10 +332,10 @@ class EmailModule extends PLModule
             $to   = Env::v('to');
             $subj = Env::v('sujet');
             $from = Env::v('from');
-            $cc   = Env::v('cc');
-            $bcc  = Env::v('bcc');
+            $cc   = trim(Env::v('cc'));
+            $bcc  = trim(Env::v('bcc'));
 
-            if (empty($to) && empty($cc) && empty($to2)) {
+            if (empty($to) && empty($cc) && empty($to2) && empty($bcc) && empty($cc2)) {
                 $page->trig("Indique au moins un destinataire.");
                 $page->assign('uploaded_f', PlUpload::listFilenames(S::v('forlife'), 'emails.send'));
             } else {
@@ -351,7 +351,11 @@ class EmailModule extends PLModule
                 foreach ($files as $name=>&$upload) {
                     $mymail->addUploadAttachment($upload, $name);
                 }
-                $mymail->setTxtBody(wordwrap($txt, 78, "\n"));
+                if (Env::v('nowiki')) {
+                    $mymail->setTxtBody(wordwrap($txt, 78, "\n"));
+                } else {
+                    $mymail->setWikiBody($txt);
+                }
                 if ($mymail->send()) {
                     $page->trig("Ton mail a bien été envoyé.");
                     $_REQUEST = array('bcc' => S::v('bestalias').'@'.$globals->mail->domain);
@@ -374,6 +378,7 @@ class EmailModule extends PLModule
                   WHERE  c.uid = {?}
                  ORDER BY u.nom, u.prenom", S::v('uid'));
         $page->assign('contacts', $res->fetchAllAssoc());
+        $page->assign('maxsize', ini_get('post_max_size') . 'o');
     }
 
     function handler_broken(&$page, $warn = null, $email = null)