Fix: Corrige pb envoi propal par mail.

htdocs/actioncomm.class.php

@@ -38,6 +38,7 @@ class ActionComm
   var $id;
   var $db;
 
+  var $label;
   var $date;
   var $type_code;
   var $type;
@@ -69,32 +70,24 @@ class ActionComm
    *    \brief      Ajout d'une action en base (et eventuellement dans webcalendar)
    *    \param      author      auteur de la creation de l'action
    *    \param      webcal      ressource webcalendar: 0=on oublie webcal, 1=on ajoute une entrée générique dans webcal, objet=ajout de l'objet dans webcal
-   *    \return     int         id de l'action créée
+   *    \return     int         id de l'action créée, < 0 si erreur
    */
     function add($author, $webcal=0)
     {
         global $conf;
     
-      if (! $this->contact)
+        if (! $this->percent)  $this->percent = 0;
-	{
+        if (! $this->priority) $this->priority = 0;
-	  $this->contact = 0;
-	}
-      if (! $this->propalrowid)
-	{
-	  $this->propalrowid = 0;
-	}
-      if (! $this->percent)
-	{
-	  $this->percent = 0;
-	}
-      if (! $this->priority)
-	{
-	  $this->priority = 0;
-	}
     
-      $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm (datea, label, fk_action, fk_soc, fk_user_author, fk_user_action, fk_contact, percent, note,priority,propalrowid) ";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
-      $sql .= " VALUES ('$this->date', '$this->libelle', $this->type, $this->societe, $author->id,";
+        $sql.= "(datea,fk_action,fk_soc,note,fk_contact,fk_user_author,fk_user_action,label,percent,priority,";
-      $sql .= $this->user->id . ", $this->contact, '$this->percent', '$this->note', $this->priority, $this->propalrowid);";
+        $sql.= "fk_facture,propalrowid)";
+        $sql.= " VALUES (now(), '".$this->type_code."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
+        $sql.= ($this->contact->id?$this->contact->id:"null").",";
+        $sql.= "'$author->id', '".$this->user->id ."', '".$this->label."',100,'".$this->priority."',";
+        $sql.= ($this->facid?$this->facid:"null").",";
+        $sql.= ($this->propalrowid?$this->propalrowid:"null");
+        $sql.= ");";
     
         if ($this->db->query($sql) )
         {
@@ -111,7 +104,7 @@ class ActionComm
                 }
                 else if ($webcal == 1)
                 {
-                // \todo On ajoute une entrée générique, pour l'instant pas utilisé
+                    // \todo On ajoute une entrée générique, pour l'instant pas utilis
     
                 }
             }

htdocs/comm/propal.php

@@ -205,7 +205,7 @@ if ($_POST["action"] == 'send')
                 // Envoi de la facture
                 $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc);
 
-                if (! $mailfile->sendfile())
+                if ($mailfile->sendfile())
                 {
                     $msg='<div class="ok">'.$langs->trans("MailSuccessfulySent",$from,$sendto).'.</div>';
 

htdocs/lib/CMailFile.class.php

@@ -1,32 +1,43 @@
 <?php
-/* notes from Dan Potter:
+/* Copyright (C) 2000-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-Sure. I changed a few other things in here too though. One is that I let
+ * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
-you specify what the destination filename is (i.e., what is shows up as in
+ * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
-the attachment). This is useful since in a web submission you often can't
+ *
-tell what the filename was supposed to be from the submission itself. I
+ * This program is free software; you can redistribute it and/or modify
-also added my own version of chunk_split because our production version of
+ * it under the terms of the GNU General Public License as published by
-PHP doesn't have it. You can change that back or whatever though =).
+ * the Free Software Foundation; either version 2 of the License, or
-Finally, I added an extra "\n" before the message text gets added into the
+ * (at your option) any later version.
-MIME output because otherwise the message text wasn't showing up.
+ *
-/*
+ * This program is distributed in the hope that it will be useful,
-note: someone mentioned a command-line utility called 'mutt' that 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-can mail attachments.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * or see http://www.gnu.org/
+ *
+ * $Id$
+ * $Source$
+ *
+ * Lots of code inspired from Dan Potter's CMailFile class
+ *
+ * If chunk_split does not works on your system, change the call to chunk_split
+ * to my_chunk_split 
  */
-/* 
-If chunk_split works on your system, change the call to my_chunk_split
-to chunk_split 
-*/
-/* Note: if you don't have base64_encode on your sytem it will not work */
 
-/**	    \file       htdocs/lib/CMailFile.class.php
+/**
-		\brief      fichier de la classe d'envoi de mails
+        \file       htdocs/lib/CMailFile.class.php
+        \brief      Classe permettant d'envoyer des mail avec attachements
         \author     Dan Potter.
         \author	    Eric Seigne
         \author	    Laurent Destailleur.
         \version    $Revision$
 */
 
-/**     \class      CMailFile
+/**
+        \class      CMailFile
         \brief      Classe d'envoi de mails et pièces jointes. Encapsule mail() avec d'éventuel attachements.
         \remarks    Usage:
         \remarks    $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filename,$mimetype);
@@ -43,7 +54,7 @@ class CMailFile
     var $text_body;
     var $text_encoded;
     var $mime_headers;
-  var $mime_boundary = "--==================_846811060==_";
+    var $mime_boundary;
     var $smtp_headers;
 
     /**
@@ -60,6 +71,8 @@ class CMailFile
     */
     function CMailFile($subject,$to,$from,$msg,$filename_list,$mimetype_list,$mimefilename_list,$addr_cc="",$addr_bcc="")
     {
+        $this->mime_boundary = md5( uniqid("dolibarr") );
+
         $this->subject = $subject;
         $this->addr_from = $from;
         $this->addr_to = $to;
@@ -67,7 +80,8 @@ class CMailFile
         $this->addr_bcc = $addr_bcc;
         $this->smtp_headers = $this->write_smtpheaders();
         $this->text_body = $this->write_body($msg, $filename_list);
-      if (count($filename_list)) {
+        if (count($filename_list))
+        {
             $this->mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
             $this->text_encoded = $this->attach_file($filename_list,$mimetype_list,$mimefilename_list);
         }
@@ -82,15 +96,16 @@ class CMailFile
     */
     function attach_file($filename_list,$mimetype_list,$mimefilename_list)
     {
-      for ($i = 0; $i < count($filename_list); $i++) {
+        for ($i = 0; $i < count($filename_list); $i++)
+        {
             $encoded = $this->encode_file($filename_list[$i]);
             if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
             $out = $out . "--" . $this->mime_boundary . "\n";
             if (! $mimetype_list[$i]) { $mimetype_list[$i] = "application/octet-stream"; }
-		$out = $out . "Content-type: " . $mimetype_list[$i] . "; name=\"$filename_list[$i]\";\n";         
+            $out .= "Content-type: " . $mimetype_list[$i] . "; name=\"$filename_list[$i]\";\n";
-		$out = $out . "Content-Transfer-Encoding: base64\n";
+            $out .= "Content-Transfer-Encoding: base64\n";
-		$out = $out . "Content-disposition: attachment; filename=\"$filename_list[$i]\"\n\n";
+            $out .= "Content-disposition: attachment; filename=\"$filename_list[$i]\"\n\n";
-		$out = $out . $encoded . "\n";
+            $out .= $encoded . "\n";
         }
         $out = $out . "--" . $this->mime_boundary . "--" . "\n";
         return $out;
@@ -99,34 +114,72 @@ class CMailFile
 
 
     /**
-    		\brief permet d'encoder un fichier
+            \brief      Permet d'encoder un fichier
             \param      sourcefile
+            \return     < 0 si erreur, fichier encodé si ok
     */
     function encode_file($sourcefile)
     {
-      //      print "<pre> on encode $sourcefile </pre>\n";
         if (is_readable($sourcefile))
         {
             $fd = fopen($sourcefile, "r");
             $contents = fread($fd, filesize($sourcefile));
-	  $encoded = my_chunk_split(base64_encode($contents));
+            $encoded = chunk_split(base64_encode($contents));
+            //$encoded = my_chunk_split(base64_encode($contents));
             fclose($fd);
         }
+        else
+        {
+            dolibarr_syslog("CMailFile::encode_file: Can't read file $sourcefile");
+        }
         return $encoded;
     }
 
     /**
-    		\brief permet d'envoyer un fichier
+            \brief     Envoi le mail
+            \return    boolean     vrai si mail envoyé, faux sinon
     */
     function sendfile()
     {
-      $headers .= $this->smtp_headers . $this->mime_headers;
+        $headers = $this->smtp_headers . $this->mime_headers;
         $message = $this->text_body . $this->text_encoded;
-      return mail($this->addr_to,$this->subject,stripslashes($message),$headers);
+
+        $errorlevel=error_reporting();
+        error_reporting($errorlevel ^ E_WARNING);   // Désactive warnings
+        if ($this->errors_to)
+        {
+            dolibarr_syslog("CMailFile::sendfile with errorsto : ".$this->errors_to);
+            $res = mail($this->addr_to,$this->subject,stripslashes($message),$headers,"-f".$this->errors_to);
+        }
+        else
+        {
+            dolibarr_syslog("CMailFile::sendfile");
+            $res = mail($this->addr_to,$this->subject,stripslashes($message),$headers);
+        }
+        error_reporting($errorlevel);              // Réactive niveau erreur origine
+
+        //$this->write_to_file();
+
+        return $res;
     }
 
     /**
-    		\brief permet d'ecrire le body d'un message
+     *    \brief  Ecrit le mail dans un fichier.
+     *            Utilisation pour le debuggage
+     */
+    function write_to_file()
+    {
+        $headers = $this->smtp_headers . $this->mime_headers;
+        $message = $this->text_body . $this->text_encoded;
+
+        $fp = fopen("/tmp/mail","w");
+        fputs($fp, $headers);
+        fputs($fp, $message);
+        fclose($fp);
+    }
+
+    /**
+            \brief 	Permet d'ecrire le corps du message
             \param 	msgtext
             \param 	filename_list
     */
@@ -167,11 +220,14 @@ class CMailFile
         $out = "From: ".$this->addr_from."\n";
         if ($this->addr_cc) $out = $out . "Cc: ".$this->addr_cc."\n";
         if ($this->addr_bcc) $out = $out . "Bcc: ".$this->addr_bcc."\n";
+        if ($this->reply_to) $out = $out . "Reply-To: ".$this->reply_to."\n";
+
+        //    if($this->errors_to != "")
+        //$out = $out . "Errors-to: ".$this->errors_to."\n";
 
-      $out = $out . "Reply-To: $addr_from\n";
         $out = $out . "X-Mailer: Dolibarr version " . DOL_VERSION ."\n";
-      $out = $out . "X-Sender: $addr_from\n";
+        $out = $out . "X-Sender: $this->addr_from\n";
-      $out = $out . "Return-path: $addr_from\n";
+        $out = $out . "Return-path: $this->addr_from\n";
         return $out;
     }
 
@@ -179,7 +235,7 @@ class CMailFile
 
 
 /**
-		\brief permet de diviser une chaine (RFC2045)
+        \brief      Permet de diviser une chaine (RFC2045)
         \param      str
         \remarks    function chunk_split qui remplace celle de php si nécéssaire
         \remarks    76 caractères par ligne, terminé par "\r\n"