Add: ajout de la classe simplemail, test�e et fonctionnelle avec le webmail orange,

roundcube et outlook
2025-12-07 18:18:18 +01:00 · 2009-05-17 15:36:19 +00:00
parent 6d66415a43
commit dbbe0ff656
5 changed files with 735 additions and 31 deletions
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -225,6 +225,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$listofmethods=array();
 	$listofmethods['mail']='PHP mail function';
+	$listofmethods['simplemail']='Simplemail class';
 	$listofmethods['smtps']='SMTP/SMTPS socket library';
 	// SuperAdministrator access only
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
@@ -234,6 +235,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 	else
 	{
 		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') $text = 'PHP mail function';
+		elseif ($conf->global->MAIN_MAIL_SENDMODE == 'simplemail') $text = 'Simplemail class';
 		elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $text = 'SMTPS library';
 		else { $text = $langs->trans("Undefined"); }
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -245,7 +247,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
 	// Server
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>';
-	if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
+	if ($linuxlike && ($conf->global->MAIN_MAIL_SENDMODE == 'mail' || $conf->global->MAIN_MAIL_SENDMODE == 'simplemail'))
 	{
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
@@ -366,13 +368,14 @@ else
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') print 'PHP mail function';
+	elseif ($conf->global->MAIN_MAIL_SENDMODE == 'simplemail') print 'Simplemail class';
 	elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') print 'SMTPS library';
 	else { print $langs->trans("Undefined"); }
 	print '</td></tr>';

 	// Server
 	$var=!$var;
-	if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
+	if ($linuxlike && ($conf->global->MAIN_MAIL_SENDMODE == 'mail' || $conf->global->MAIN_MAIL_SENDMODE == 'simplemail'))
 	{
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
 	}
@@ -383,7 +386,7 @@ else

 	// Port
 	$var=!$var;
-	if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
+	if ($linuxlike && ($conf->global->MAIN_MAIL_SENDMODE == 'mail' || $conf->global->MAIN_MAIL_SENDMODE == 'simplemail'))
 	{
 		print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
 	}
--- a/htdocs/includes/simplemail/class.mail.php
+++ b/htdocs/includes/simplemail/class.mail.php
@@ -0,0 +1,410 @@
+<?php
+
+class simplemail {
+	
+	var $recipientlist;
+	var $subject;
+	var $hfrom;
+	var $hbcc;
+	var $hcc;
+	
+	var $Xsender;
+	var $ErrorsTo;
+	var $XMailer = 'PHP';
+	var $XPriority = 3;
+	
+	var $set_mode='php';
+	
+	var $text;
+	var $html;
+	var $attachement;
+	var $htmlattachement;
+
+	var $recipient;	
+
+	var $body;
+	var $headers;
+	var $error_log;
+        var $connect;
+	
+	var $default_charset = 'iso-8859-1';
+	
+	var $B1B = "----=_001";
+	var $B2B = "----=_002";
+	var $B3B = "----=_003";
+
+	
+	function simplemail() {
+		$this -> attachement = array();
+		$this -> htmlattachement = array();
+	}
+	
+	function checkaddress($address) {
+		if ( preg_match('`([[:alnum:]]([-_.]?[[:alnum:]])*@[[:alnum:]]([-_.]?[[:alnum:]])*\.([a-z]{2,4}))`', $address) ) {
+			return TRUE;
+		} else {
+			$this->error_log("l'adresse $address est invalide"); return FALSE;
+		}
+	}
+	
+	function checkname($name) {
+		if ( preg_match("`[0-9a-zA-Z\.\-_ ]*`" , $name ) ) {
+			return TRUE;
+		} else {
+			$this->error_log(" le pseudo $name est invalide\n"); return FALSE;
+		}
+	}
+	
+	function makenameplusaddress($address,$name) {
+		if ( !$this->checkaddress($address) ) return FALSE;
+		if ( !$this->checkname($name) ) return FALSE;
+		if ( empty($name) ) { return $address; }
+		else { $tmp=$name." <".$address.">"; return $tmp; }
+	}
+	
+	function addrecipient($newrecipient,$name='') {
+		$tmp=$this->makenameplusaddress($newrecipient,$name);
+		if ( !$tmp ) { $this->error_log(" To: error"); return FALSE; }
+		$this->recipientlist[] = array( 'mail'=>$newrecipient, 'nameplusmail' => $tmp );
+		return TRUE;
+	}
+	
+	function addbcc($bcc,$name='') {
+		$tmp=$this->makenameplusaddress($bcc,$name);
+		if ( !$tmp ) { $this->error_log(" Bcc: error"); return FALSE; }
+		if ( !empty($this->hbcc)) $this->hbcc.= ",";
+		$this->hbcc.= $tmp;
+		return TRUE;
+	}
+	
+	function addcc($cc,$name='') {
+		$tmp=$this->makenameplusaddress($cc,$name);
+		if ( !$tmp ) { $this->error_log(" Cc: error\n"); return FALSE; }
+		if (!empty($this->hcc)) $this->hcc.= ",";
+		$this->hcc.= $tmp;
+		return TRUE;
+	}
+	
+	function addsubject($subject) {
+		if (!empty($subject)) $this->subject = $subject;
+	}
+	
+	function addfrom($from,$name='') {
+		$tmp=$this->makenameplusaddress($from,$name);
+		if ( !$tmp ) { $this->error_log(" From: error"); return FALSE; }
+		$this->hfrom = $tmp;
+		return TRUE;
+	}
+	
+	function addreturnpath($return) {
+		$tmp=$this->makenameplusaddress($return,'');
+		if ( !$tmp ) { $this->error_log("Return-Path: error"); return FALSE; }
+		$this->returnpath = $return;
+		return TRUE;
+	}
+	
+	function addreplyto($replyto) {
+		$tmp=$this->makenameplusaddress($replyto,'');
+		if ( !$tmp ) { $this->error_log(" Reply-To: error"); return FALSE; }
+		$this->returnpath = $tmp;
+		return TRUE;
+	}
+
+	
+	// les attachements
+	function addattachement($filename) {
+		array_push ( $this -> attachement , array ( 'filename'=> $filename ) );
+	}
+	
+	// les attachements html
+	function addhtmlattachement($filename,$cid='',$contenttype='') {
+		array_push ( $this -> htmlattachement ,
+                  array ( 'filename'=>$filename ,
+                    'cid'=>$cid ,
+                    'contenttype'=>$contenttype )
+		);
+	}
+	
+	function writeattachement(&$attachement,$B) {
+		$message = '';
+		if ( !empty($attachement) ) {
+			foreach($attachement as $AttmFile){
+				$patharray = explode ("/", $AttmFile['filename']);
+				$FileName = $patharray[count($patharray)-1];
+				
+				$message .= "\n--".$B."\n";
+				
+				if (!empty($AttmFile['cid'])) {
+					$message .= "Content-Type: {$AttmFile['contenttype']};\n name=\"".$FileName."\"\n";
+					$message .= "Content-Transfer-Encoding: base64\n";
+					$message .= "Content-ID: <{$AttmFile['cid']}>\n";
+					$message .= "Content-Disposition: inline;\n filename=\"".$FileName."\"\n\n";
+				} else {
+					$message .= "Content-Type: application/octetstream;\n name=\"".$FileName."\"\n";
+					$message .= "Content-Transfer-Encoding: base64\n";
+					$message .= "Content-Disposition: attachment;\n filename=\"".$FileName."\"\n\n";
+				}
+				
+				$fd=fopen ($AttmFile['filename'], "rb");
+				$FileContent=fread($fd,filesize($AttmFile['filename']));
+				fclose ($fd);
+				
+				$FileContent = chunk_split(base64_encode($FileContent));
+				$message .= $FileContent;
+				$message .= "\n\n";
+			}
+			$message .= "\n--".$B."--\n";
+		}
+		return $message;
+	}
+	
+	function BodyLineWrap($Value) {
+		return wordwrap($Value, 78, "\n ");
+	}
+	
+	function makebody() {
+		$message='';
+		if ( !$this->html && $this->text && !empty($this->attachement) ) {
+			
+			//Messages start with text/html alternatives in OB
+			$message ="This is a multi-part message in MIME format.\n";
+			$message.="\n--".$this->B1B."\n";
+			
+			$message.="Content-Type: text/plain; charset=\"iso-8859-1\"\n";
+			$message.="Content-Transfer-Encoding: quoted-printable\n\n";
+			// plaintext goes here
+			$message.=$this->BodyLineWrap($this->text)."\n\n";
+			
+			$message.=$this->writeattachement($this->attachement,$this->B1B);
+			
+		}
+		elseif ( !$this->html && $this->text && empty($this->attachement) ) {
+			
+			// plaintext goes here
+			$message.=$this->BodyLineWrap($this->text)."\n\n";
+		}
+		elseif ( $this->html ) {
+			
+			//Messages start with text/html alternatives in OB
+			$message ="This is a multi-part message in MIME format.\n";
+			$message.="\n--".$this->B1B."\n";
+			
+			$message.="Content-Type: multipart/related;\n\t boundary=\"".$this->B2B."\"\n\n";
+			//plaintext section
+			$message.="\n--".$this->B2B."\n";
+			
+			$message.="Content-Type: multipart/alternative;\n\t boundary=\"".$this->B3B."\"\n\n";
+			//plaintext section
+			$message.="\n--".$this->B3B."\n";
+			
+			$message.="Content-Type: text/plain; charset=\"iso-8859-1\"\n";
+			$message.="Content-Transfer-Encoding: quoted-printable\n\n";
+			// plaintext goes here
+			$message.=$this->BodyLineWrap($this->text)."\n\n";
+			
+			// html section
+			$message.="\n--".$this->B3B."\n";
+			$message.="Content-Type: text/html; charset=\"iso-8859-1\"\n";
+			$message.="Content-Transfer-Encoding: base64\n\n";
+			// html goes here
+			$message.=chunk_split(base64_encode($this->html))."\n\n";
+			
+			// end of text
+			$message.="\n--".$this->B3B."--\n";
+			
+			// attachments html
+			if (empty($this->htmlattachement)) {
+				$message.="\n--".$this->B2B."--\n";
+			} else {
+				$message.=$this->writeattachement( $this->htmlattachement,$this->B2B);
+			}
+			
+			// attachments
+			if (empty($this->attachement)) {
+				$message.="\n--".$this->B1B."--\n";
+			} else {
+				$message.=$this->writeattachement($this->attachement,$this->B1B);
+			}
+						
+		}
+		
+		$this->body = $message;
+				
+		return $message;
+
+	}
+	
+	// Mail Headers Methods
+        
+	function MakeHeaderField($Field,$Value) {
+        return wordwrap($Field.": ".$Value, 78, "\n ")."\r\n";
+	}
+	
+	function AddField2Header($Field,$Value) {
+		$this->headers .= $this->MakeHeaderField($Field,$Value);
+	}
+	
+	function makeheader() {
+	
+		$this->headers = '';
+	
+		if ( empty($this->recipientlist) ) { $this->error_log("destinataire manquant"); return FALSE; }
+//		else { $this->AddField2Header("To",$this->recipient); }
+		
+		if ( empty($this->subject) ) {
+			$this->error_log("sujet manquant");
+			return FALSE; 
+		} else {
+			if ($this->set_mode!='php' ) {
+				$this->AddField2Header("Subject", $this->subject);
+			}
+		}
+		
+		
+		# Date: Mon, 03 Nov 2003 20:48:06 +0100
+		$this->AddField2Header("Date", date ('r'));
+
+		if ( !empty($this->Xsender) ) { $this->AddField2Header("X-Sender",$this->Xsender); }
+		else { $this->AddField2Header("X-Sender",$this->hfrom); }
+		
+		if ( !empty($this->ErrorsTo) ) { $this->AddField2Header("Errors-To",$this->ErrorsTo); }
+		else { $this->AddField2Header("Errors-To",$this->hfrom); }
+		
+		if ( !empty($this->XMailer) ) $this->AddField2Header("X-Mailer",$this->XMailer);
+		
+		if ( !empty($this->XPriority) ) $this->AddField2Header("X-Priority",$this->XPriority);
+		
+		if ( !empty($this->hfrom) ) $this->AddField2Header("From",$this->hfrom);
+		
+		if ( !empty($this->returnpath) ) $this->AddField2Header("Return-Path",$this->returnpath);
+		
+		if ( !empty($this->replyto) ) $this->AddField2Header("Reply-To",$this->replyto);
+		
+		$this->headers .="MIME-Version: 1.0\r\n";
+		
+		if ( !$this->html && $this->text && !empty($this->attachement) ) {		
+			$this->headers .= "Content-Type: multipart/mixed;\r\n\t boundary=\"".$this->B1B."\"\r\n";
+		} elseif ( !$this->html && $this->text && empty($this->attachement) ) {	
+			$this->headers .="Content-Type: text/plain; charset=utf8; format=flowed\r\n";
+			$this->headers .="Content-Transfer-Encoding: 8bit\r\n";
+		} elseif ( $this->html ) {			
+			if ( !$this->text ) { $this->text="HTML only!"; }
+			$this->headers .="Content-Type: multipart/mixed;\r\n\t boundary=\"".$this->B1B."\"\r\n";
+		}
+		
+		if ( !empty($this->hcc) ) $this->AddField2Header("Cc",$this->hcc);
+		if ( !empty($this->hbcc) ) $this->AddField2Header("Bcc",$this->hbcc);
+		
+		return $this->headers;
+	}
+	
+	function sendmail() {
+		$this->makebody();
+		$this->makeheader();
+		switch($this->set_mode)	{
+			case 'php' : $this->phpmail(); break;
+			case 'socket': $this->socketmailloop(); break;
+		}
+                return TRUE;
+	}
+	
+	// Mail send by PHPmail
+	
+	function phpmail() {
+		while ( list($key, $to) = each($this->recipientlist) ) {
+			$this->recipient = $to['mail'];
+			if ( mail($to['mail'], $this->subject, $this->body, $this->makeheader() ) ) { 
+				$this->error_log("envoie vers {$to['nameplusmail']} r<>ussi");
+			} else { 
+				$this->error_log("envoie vers {$to['nameplusmail']} echou<6F>");
+			}
+		}
+		return TRUE; 
+	}
+	
+	// Socket Function
+		
+	function SocketStart() {
+		if (!$this->connect = fsockopen (ini_get("SMTP"), ini_get("smtp_port"), $errno, $errstr, 30))  { 
+            $this->error_log("Could not talk to the sendmail server!"); return FALSE; 
+        };
+	    return fgets($this->connect, 1024);
+	}
+	
+	function SocketStop() {
+	  	fclose($this->connect);
+		return TRUE;
+	}
+		
+	function SocketSend($in,$wait='') {
+		fputs($this->connect, $in, strlen($in));
+		echo "-"; flush();
+		if(empty($wait)) {
+			$rcv = fgets($this->connect, 1024);
+			return $rcv;
+		}
+		return TRUE;
+	}
+	
+	// Mail Socket	
+	
+	function socketmailstart() {
+					
+		$this->SocketStart();     		
+		if (!isset($_SERVER['SERVER_NAME'])  || empty($_SERVER['SERVER_NAME'])) { $serv = 'unknown'; }
+		else { $serv = $_SERVER['SERVER_NAME']; }
+		$this->SocketSend("HELO $serv\r\n");
+        }
+        
+	function socketmailsend($to) {
+        
+		$this->recipient = $to;
+		$this->error_log("Socket vers $to");
+			
+		$this->SocketSend( "MAIL FROM:{$this->hfrom}\r\n" );
+		$this->SocketSend( "RCPT TO:$to\r\n" );
+		$this->SocketSend( "DATA\r\n" );	
+		$this->SocketSend( $this->CleanMailDataString($this->headers)."\r\n", 'NOWAIT' );	
+		$this->SocketSend( $this->CleanMailDataString($this->body)."\r\n", 'NOWAIT' );	
+		$this->SocketSend( ".\r\n" );
+		$this->SocketSend( "RSET\r\n" );
+			
+		$this->error_log("Fin de l'envoi vers $to");
+
+		return TRUE;        
+    }
+		
+    function socketmailstop() {      
+		$this->SocketSend("QUIT\r\n");
+	  	$this->SocketStop();
+		return TRUE;
+	}
+        
+    function socketmailloop() {
+        $this->socketmailstart();
+        while ( list($key, $to) = each($this->recipientlist)) {
+			$this->recipient = $to['mail'];
+			$this->makeheader();
+            $this->socketmailsend($to['mail']);
+		}
+        $this->socketmailstop();
+    }
+
+	// Misc.
+
+	function error_log($msg='') {
+		if(!empty($msg)) { 
+				$this->error_log .= $msg . "\r\n--\r\n";
+				return TRUE; 
+		}
+		return " --- Error Log --- \r\n\r\n".$this->error_log;
+	}
+	
+	function CleanMailDataString($data) {
+		$data = preg_replace("/([^\r]{1})\n/", "\\1\r\n", $data);
+        $data = preg_replace("/\n\n/", "\n\r\n", $data);
+        $data = preg_replace("/\n\./", "\n..", $data);
+		return $data;
+	}
+}
+?>
--- a/htdocs/includes/simplemail/gpl.txt
+++ b/htdocs/includes/simplemail/gpl.txt
@@ -0,0 +1,281 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+         END OF TERMS AND CONDITIONS
+
--- a/htdocs/includes/simplemail/readme.txt
+++ b/htdocs/includes/simplemail/readme.txt
@@ -0,0 +1,3 @@
+Cette archive est issue du site
+http://classes.scriptsphp.org et
+distribu<EFBFBD>e sous license GPL ci-jointe
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -54,9 +54,8 @@ class CMailFile

 	var $smtps;				// Contains SMTPs object (if this method is used)
 	
-	var $simplemail;  // Contains simplemail object (if this method is used)
-	
 	// simplemail
+	var $simplemail;  // Contains simplemail object (if this method is used)
 	var $sName;
 	var $sEmail;

@@ -235,6 +234,7 @@ class CMailFile
 			$mail->XMailer = "Dolibarr version " . DOL_VERSION ." (using simplemail)";
 			
 			// Ajout de l'expediteur
+			$this->addr_from = $from;
 			$this->splitAddress($from);
 			$mail->addfrom($this->sEmail,$this->sName);
 			
@@ -245,11 +245,11 @@ class CMailFile
 				$this->splitAddress($val);
 				$mail->addrecipient($this->sEmail,$this->sName);
 			}
-			
+
 			// Ajout carbon copy
-			if (!empty($sentoccc))
+			if (!empty($addr_cc))
 			{
-				$arrayTocc=split(',',$sentocc);
+				$arrayTocc=split(',',$addr_cc);
 				foreach($arrayTocc as $val)
 				{
 					$this->splitAddress($val);
@@ -258,10 +258,10 @@ class CMailFile
 			}
 			
 			// Ajout carbon copy cache
-			if (!empty($sentoccc))
+			if (!empty($addr_bcc))
 			{
-				$arrayToccc=split(',',$sentoccc);
-				foreach($arrayToccc as $val)
+				$arrayTobcc=split(',',$addr_bcc);
+				foreach($arrayTobcc as $val)
 				{
 					$this->splitAddress($val);
 					$mail->addbcc($this->sEmail,$this->sName);
@@ -269,7 +269,7 @@ class CMailFile
 			}
 			
 			//ajout du sujet
-			$mail->addsubject($subject);
+			$mail->addsubject($this->encodetorfc2822($subject));
 			
 			// Ajout du message
 			if ($this->msgishtml)
@@ -282,9 +282,9 @@ class CMailFile
 					// un attachement html ( image jointe afficher ds le html ).
 					if ($this->atleastoneimage)
 					{
-						foreach ($this->images_encoded as $img)
+						foreach ($this->html_images as $i => $val)
 						{
-							$mail->addhtmlattachement($img['fullpath'],$img['cid'],$img['content_type']);
+							$mail->addhtmlattachement($this->html_images[$i]['fullpath'],$this->html_images[$i]['cid'],$this->html_images[$i]['content_type']);
 						}
 					}
 				}
@@ -305,7 +305,7 @@ class CMailFile
 					$mail->addattachement($filename_list[$i]);
 				}
 			}
-			
+			$this->simplemail = $mail;
 		}
 		else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
 		{
@@ -381,7 +381,7 @@ class CMailFile
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
 		{
 			// Action according to choosed sending method
-			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
+			if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' || $conf->global->MAIN_MAIL_SENDMODE == 'simplemail')
 			{

 				// Use mail php function (default PHP method)
@@ -402,8 +402,8 @@ class CMailFile
 				if (! empty($conf->global->MAIN_MAIL_SMTP_SERVER)) ini_set('SMTP',$conf->global->MAIN_MAIL_SMTP_SERVER);
 				if (! empty($conf->global->MAIN_MAIL_SMTP_PORT))   ini_set('smtp_port',$conf->global->MAIN_MAIL_SMTP_PORT);

-				$dest=getValidAddress($this->addr_to,2);
-				if (! $dest)
+				if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') $dest=getValidAddress($this->addr_to,2);
+				if (! $dest && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
 				{
 					$this->error="Failed to send mail to SMTP=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_DEBUG);
@@ -426,7 +426,14 @@ class CMailFile

 					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();

-					$res = mail($dest,$this->encodetorfc2822($this->subject),$this->message,$this->headers, $bounce);
+					if ($conf->global->MAIN_MAIL_SENDMODE == 'simplemail')
+					{
+						$res =  $this->simplemail->sendmail();
+					}
+					else
+					{
+						$res = mail($dest,$this->encodetorfc2822($this->subject),$this->message,$this->headers, $bounce);
+					}					

 					if (! $res)
 					{
@@ -960,19 +967,19 @@ class CMailFile
 	}
 	
 	
-function splitAddress($address)
-{
-	if (eregi('^(.*)<(.*)>$',trim($address),$regs))
+	function splitAddress($address)
 	{
-		$this->sName  = trim($regs[1]);
-		$this->sEmail = trim($regs[2]);
+		if (eregi('^(.*)<(.*)>$',trim($address),$regs))
+		{
+			$this->sName  = trim(utf8_decode($regs[1]));
+			$this->sEmail = trim($regs[2]);
+		}
+		else
+		{
+			$this->sName  = '';
+			$this->sEmail = $address;
+		}
 	}
-	else
-	{
-		$this->sName  = '';
-		$this->sEmail = $address;
-	}
-}

 }

@@ -1031,4 +1038,4 @@ function getValidAddress($adresses,$format)
 	return $ret;
 }

-?>
+?>