Less restrictive check on recipients list

Display attachment max size

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1595 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/email.php b/modules/email.php
index 981b7db..17c3692 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']) . "'");
                 }
             }
@@ -335,7 +335,7 @@ class EmailModule extends PLModule
             $cc   = Env::v('cc');
             $bcc  = 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 {
@@ -374,6 +374,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)

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 1b4f2d1..b51ab1b 100644 (file)
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -31,12 +31,25 @@
     }
   }
 
-  function check(form) {
+  function check(form)
+  {
+    var send = true;
     _selectAll('to_contacts');
     _selectAll('cc_contacts');
-    if(form.sujet.value == "") {
-      form.sujet.focus();
-      return confirm ("Le sujet du mail est vide, veux tu continuer ?");
+    if(form.sujet.value == "" && !confirm("Le sujet du mail est vide, veux-tu continuer ?")) {
+        form.sujet.focus();
+        return false;
+    }
+    if (form.to.value == "" && form.cc.value == ""
+        && document.getElementById('to_contacts').length == 0 && document.getElementById('cc_contacts').length == 0) {
+      if (form.bcc.value == "") {
+        alert("Il faut définir au moins un destinataire au mail");
+        return false;
+      }
+      if (!confirm("Tous les destinataires sont en copie cachée, veux-tu continuer ?")) {
+        form.to.focus();
+        return false;
+      }
     }
     return true;
   }
@@ -212,7 +225,7 @@
     </div>
     {/if}
     <div id="att_form" {if $uploaded_f|@count neq 0}style="display: none"{/if}>
-      <strong>{icon name=email_attach}&nbsp;Ajouter une pièce jointe&nbsp;:&nbsp;</strong>
+      <strong>{icon name=email_attach}&nbsp;Ajouter une pièce jointe (max. {$maxsize})&nbsp;:&nbsp;</strong>
       <input type="file" name="uploaded" />
     </div>
     <div class="center">