alxarafe / alixar

dolibarr/htdocs/core/class/dolreceiptprinter.class.php

Braces +1 added lines, -2 removed lines

@@ -545,8 +545,7 @@
         $ret = $this->InitPrinter($printerid);
         if ($ret>0) {
             setEventMessages($this->error, $this->errors, 'errors');
-        }
-        else
+        } else
         {
             $nboflines = count($vals);
             for ($line=0; $line < $nboflines; $line++)

Spacing +47 added lines, -47 removed lines

@@ -92,7 +92,7 @@ 
  *
  */
 
-require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/Escpos.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/Escpos.php';
 
 
 /**
@@ -118,7 +118,7 @@ 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[] Error codes (or messages)
@@ -134,7 +134,7 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
         $this->tags = array(
             'dol_align_left',
             'dol_align_center',
@@ -218,8 +218,8 @@ 
         $line = 0;
         $obj = array();
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -286,8 +286,8 @@ 
         $line = 0;
         $obj = array();
         $sql = 'SELECT rowid, name, template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -311,7 +311,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectTypePrinter($selected='', $htmlname='printertypeid')
+    function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
     {
         global $langs;
 
@@ -335,7 +335,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectProfilePrinter($selected='', $htmlname='printerprofileid')
+    function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
     {
         global $langs;
 
@@ -368,10 +368,10 @@ 
         global $conf;
         $error = 0;
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';
+        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -395,13 +395,13 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', fk_type='.$type;
-        $sql.= ', fk_profile='.$profile;
-        $sql.= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', fk_type='.$type;
+        $sql .= ', fk_profile='.$profile;
+        $sql .= ', parameter="'.$this->db->escape($parameter).'"';
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -421,9 +421,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -445,11 +445,11 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', template="'.$this->db->escape($template).'"';
-        $sql.= ' WHERE rowid='.$templateid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', template="'.$this->db->escape($template).'"';
+        $sql .= ' WHERE rowid='.$templateid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -469,9 +469,9 @@ 
         // phpcs:enable
         global $conf;
         $error = 0;
-        $img = new EscposImage(DOL_BASE_URI . '/theme/common/dolibarr_logo_bw.png');
+        $img = new EscposImage(DOL_BASE_URI.'/theme/common/dolibarr_logo_bw.png');
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         } else {
             try {
@@ -543,35 +543,35 @@ 
         $level = 0;
         $html = '<table border="1" style="width:210px"><pre>';
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         }
         else
         {
             $nboflines = count($vals);
-            for ($line=0; $line < $nboflines; $line++)
+            for ($line = 0; $line < $nboflines; $line++)
             {
                 switch ($vals[$line]['tag']) {
                     case 'DOL_ALIGN_CENTER':
                         $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
-                        $html.='<center>';
+                        $html .= '<center>';
                         $this->printer->text($vals[$line]['value']);
                         break;
                     case 'DOL_ALIGN_RIGHT':
                         $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
-                        $html.='<right>';
+                        $html .= '<right>';
                         break;
                     case 'DOL_ALIGN_LEFT':
                         $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
-                        $html.='<left>';
+                        $html .= '<left>';
                         break;
                     case 'DOL_OPEN_DRAWER':
                         $this->printer->pulse();
-                        $html.= ' &#991;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#991;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_ACTIVATE_BUZZER':
                         //$this->printer->buzzer();
-                        $html.= ' &#x266b;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#x266b;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_PRINT_BARCODE':
                         // $vals[$line]['value'] -> barcode($content, $type)
@@ -584,15 +584,15 @@ 
                     case 'DOL_PRINT_QRCODE':
                         // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
                         $this->printer->qrcode($vals[$line]['value']);
-                        $html.='QRCODE: '.$vals[$line]['value'];
+                        $html .= 'QRCODE: '.$vals[$line]['value'];
                         break;
                     case 'DOL_CUT_PAPER_FULL':
                         $this->printer->cut(Escpos::CUT_FULL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_CUT_PAPER_PARTIAL':
                         $this->printer->cut(Escpos::CUT_PARTIAL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_USE_FONT_A':
                         $this->printer->setFont(Escpos::FONT_A);
@@ -608,13 +608,13 @@ 
                         break;
                     default:
                         $this->printer->text($vals[$line]['value']);
-                        $html.= nl2br($vals[$line]['value']);
+                        $html .= nl2br($vals[$line]['value']);
                         $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
                         $error++;
                         break;
                 }
             }
-            $html.= '</pre></table>';
+            $html .= '</pre></table>';
             print $html;
             // Close and print
             // uncomment next line to see content sent to printer
@@ -635,9 +635,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'SELECT template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE rowid='.$templateid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE rowid='.$templateid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -667,11 +667,11 @@ 
     {
         // phpcs:enable
         global $conf;
-        $error=0;
+        $error = 0;
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid = '.$printerid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE rowid = '.$printerid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -683,12 +683,12 @@ 
             $error++;
             $this->errors[] = 'PrinterDontExist';
         }
-        if (! $error) {
+        if (!$error) {
             $parameter = $obj['parameter'];
             try {
                 switch ($obj['fk_type']) {
                     case 1:
-                        require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
+                        require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
                         $this->connector = new DummyPrintConnector();
                         break;
                     case 2:

dolibarr/htdocs/core/class/smtps.class.php

Indentation +1668 added lines, -1668 removed lines

@@ -45,188 +45,188 @@ 
  */
 class SMTPs
 {
-	/**
-	 * Host Name or IP of SMTP Server to use
-	 */
-	var $_smtpsHost = 'localhost';
-
-	/**
-	 * SMTP Server Port definition. 25 is default value
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_smtpsPort = '25';
-
-	/**
-	 * Secure SMTP Server access ID
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_smtpsID = null;
-
-	/**
-	 * Secure SMTP Server access Password
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_smtpsPW = null;
-
-	/**
-	 * Who sent the Message
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_msgFrom = null;
-
-	/**
-	 * Where are replies and errors to be sent to
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_msgReplyTo = null;
-
-	/**
-	 * Who will the Message be sent to; TO, CC, BCC
-	 * Multi-diminsional array containg addresses the message will
-	 * be sent TO, CC or BCC
-	 */
-	var $_msgRecipients = null;
-
-	/**
-	 * Message Subject
-	 */
-	var $_msgSubject = null;
-
-	/**
-	 * Message Content
-	 */
-	var $_msgContent = null;
-
-	/**
-	 * Custom X-Headers
-	 */
-	var $_msgXheader = null;
-
-	/**
-	 * Character set
-	 * Defaulted to 'iso-8859-1'
-	 */
-	var $_smtpsCharSet = 'iso-8859-1';
-
-	/**
-	 * Message Sensitivity
-	 * Defaults to ZERO - None
-	 */
-	var $_msgSensitivity = 0;
-
-	/**
-	 * Message Sensitivity
-	 */
-	var $_arySensitivity = array ( false,
-                                  'Personal',
-                                  'Private',
-                                  'Company Confidential' );
-
-	/**
-	 * Message Sensitivity
-	 * Defaults to 3 - Normal
-	 */
-	var $_msgPriority = 3;
-
-	/**
-	 * Message Priority
-	 */
-	var $_aryPriority = array ( 'Bulk',
+    /**
+     * Host Name or IP of SMTP Server to use
+     */
+    var $_smtpsHost = 'localhost';
+
+    /**
+     * SMTP Server Port definition. 25 is default value
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_smtpsPort = '25';
+
+    /**
+     * Secure SMTP Server access ID
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_smtpsID = null;
+
+    /**
+     * Secure SMTP Server access Password
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_smtpsPW = null;
+
+    /**
+     * Who sent the Message
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_msgFrom = null;
+
+    /**
+     * Where are replies and errors to be sent to
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_msgReplyTo = null;
+
+    /**
+     * Who will the Message be sent to; TO, CC, BCC
+     * Multi-diminsional array containg addresses the message will
+     * be sent TO, CC or BCC
+     */
+    var $_msgRecipients = null;
+
+    /**
+     * Message Subject
+     */
+    var $_msgSubject = null;
+
+    /**
+     * Message Content
+     */
+    var $_msgContent = null;
+
+    /**
+     * Custom X-Headers
+     */
+    var $_msgXheader = null;
+
+    /**
+     * Character set
+     * Defaulted to 'iso-8859-1'
+     */
+    var $_smtpsCharSet = 'iso-8859-1';
+
+    /**
+     * Message Sensitivity
+     * Defaults to ZERO - None
+     */
+    var $_msgSensitivity = 0;
+
+    /**
+     * Message Sensitivity
+     */
+    var $_arySensitivity = array ( false,
+                                    'Personal',
+                                    'Private',
+                                    'Company Confidential' );
+
+    /**
+     * Message Sensitivity
+     * Defaults to 3 - Normal
+     */
+    var $_msgPriority = 3;
+
+    /**
+     * Message Priority
+     */
+    var $_aryPriority = array ( 'Bulk',
                                 'Highest',
                                 'High',
                                 'Normal',
                                 'Low',
                                 'Lowest' );
 
-	/**
-	 * Content-Transfer-Encoding
-	 * Defaulted to 0 - 7bit
-	 */
-	var $_smtpsTransEncodeType = 0;
-
-	/**
-	 * Content-Transfer-Encoding
-	 */
-	var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
-                                         '8bit',               // 8-bit coding with line termination characters
-                                         'base64',             // 3 octets encoded into 4 sextets with offset
-                                         'binary',             // Arbitrary binary stream
-                                         'mac-binhex40',       // Macintosh binary to hex encoding
-                                         'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode' );         // UUENCODE encoding
-
-	/**
-	 * Content-Transfer-Encoding
-	 * Defaulted to '7bit'
-	 */
-	var $_smtpsTransEncode = '7bit';
-
-	/**
-	 * Boundary String for MIME seperation
-	 */
-	var $_smtpsBoundary = null;
-
-	/**
-	 * Related Boundary
-	 */
-	var $_smtpsRelatedBoundary = null;
-
-	/**
-	 * Alternative Boundary
-	 */
-	var $_smtpsAlternativeBoundary = null;
-
-	/**
-	 * Determines the method inwhich the message are to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server - default
-	 * - 'pipe     [1] - use UNIX path to EXE
-	 * - 'phpmail  [2] - use the PHP built-in mail function
-	 * NOTE: Only 'sockets' is implemented
-	 */
-	var $_transportType = 0;
-
-	/**
-	 * If '$_transportType' is set to '1', then this variable is used
-	 * to define the UNIX file system path to the sendmail execuable
-	 */
-	var $_mailPath = '/usr/lib/sendmail';
-
-	/**
-	 * Sets the SMTP server timeout in seconds.
-	 */
-	var $_smtpTimeout = 10;
-
-	/**
-	 * Determines whether to calculate message MD5 checksum.
-	 */
-	var $_smtpMD5 = false;
-
-	/**
-	 * Class error codes and messages
-	 */
-	var $_smtpsErrors = null;
-
-	/**
-	 * Defines log level
-	 *  0 - no logging
-	 *  1 - connectivity logging
-	 *  2 - message generation logging
-	 *  3 - detail logging
-	 */
-	var $_log_level = 0;
-
-	/**
-	 * Place Class in" debug" mode
-	 */
-	var $_debug = false;
-
-
-	// @CHANGE LDR
-	var $log = '';
-	var $_errorsTo = '';
-	var $_deliveryReceipt = 0;
-	var $_trackId = '';
-	var $_moreInHeader = '';
+    /**
+     * Content-Transfer-Encoding
+     * Defaulted to 0 - 7bit
+     */
+    var $_smtpsTransEncodeType = 0;
+
+    /**
+     * Content-Transfer-Encoding
+     */
+    var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
+                                            '8bit',               // 8-bit coding with line termination characters
+                                            'base64',             // 3 octets encoded into 4 sextets with offset
+                                            'binary',             // Arbitrary binary stream
+                                            'mac-binhex40',       // Macintosh binary to hex encoding
+                                            'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+                                            'uuencode' );         // UUENCODE encoding
+
+    /**
+     * Content-Transfer-Encoding
+     * Defaulted to '7bit'
+     */
+    var $_smtpsTransEncode = '7bit';
+
+    /**
+     * Boundary String for MIME seperation
+     */
+    var $_smtpsBoundary = null;
+
+    /**
+     * Related Boundary
+     */
+    var $_smtpsRelatedBoundary = null;
+
+    /**
+     * Alternative Boundary
+     */
+    var $_smtpsAlternativeBoundary = null;
+
+    /**
+     * Determines the method inwhich the message are to be sent.
+     * - 'sockets' [0] - conect via network to SMTP server - default
+     * - 'pipe     [1] - use UNIX path to EXE
+     * - 'phpmail  [2] - use the PHP built-in mail function
+     * NOTE: Only 'sockets' is implemented
+     */
+    var $_transportType = 0;
+
+    /**
+     * If '$_transportType' is set to '1', then this variable is used
+     * to define the UNIX file system path to the sendmail execuable
+     */
+    var $_mailPath = '/usr/lib/sendmail';
+
+    /**
+     * Sets the SMTP server timeout in seconds.
+     */
+    var $_smtpTimeout = 10;
+
+    /**
+     * Determines whether to calculate message MD5 checksum.
+     */
+    var $_smtpMD5 = false;
+
+    /**
+     * Class error codes and messages
+     */
+    var $_smtpsErrors = null;
+
+    /**
+     * Defines log level
+     *  0 - no logging
+     *  1 - connectivity logging
+     *  2 - message generation logging
+     *  3 - detail logging
+     */
+    var $_log_level = 0;
+
+    /**
+     * Place Class in" debug" mode
+     */
+    var $_debug = false;
+
+
+    // @CHANGE LDR
+    var $log = '';
+    var $_errorsTo = '';
+    var $_deliveryReceipt = 0;
+    var $_trackId = '';
+    var $_moreInHeader = '';
 
 
     /**
@@ -235,20 +235,20 @@ 
      * @param	int		$_val		Value
      * @return	void
      */
-	function setDeliveryReceipt($_val = 0)
-	{
-		$this->_deliveryReceipt = $_val;
-	}
+    function setDeliveryReceipt($_val = 0)
+    {
+        $this->_deliveryReceipt = $_val;
+    }
 
     /**
      * get delivery receipt
      *
      * @return	int		Delivery receipt
      */
-	function getDeliveryReceipt()
-	{
-		return $this->_deliveryReceipt;
-	}
+    function getDeliveryReceipt()
+    {
+        return $this->_deliveryReceipt;
+    }
 
     /**
      * Set trackid
@@ -256,10 +256,10 @@ 
      * @param	string		$_val		Value
      * @return	void
      */
-	function setTrackId($_val = '')
-	{
-		$this->_trackId = $_val;
-	}
+    function setTrackId($_val = '')
+    {
+        $this->_trackId = $_val;
+    }
 
     /**
      * Set moreInHeader
@@ -267,30 +267,30 @@ 
      * @param	string		$_val		Value
      * @return	void
      */
-	function setMoreInHeader($_val = '')
-	{
-		$this->_moreinheader = $_val;
-	}
+    function setMoreInHeader($_val = '')
+    {
+        $this->_moreinheader = $_val;
+    }
 
-	/**
+    /**
      * get trackid
      *
      * @return	string		Track id
      */
-	function getTrackId()
-	{
-		return $this->_trackId;
-	}
+    function getTrackId()
+    {
+        return $this->_trackId;
+    }
 
-	/**
-	 * get moreInHeader
-	 *
-	 * @return	string		moreInHeader
-	 */
-	function getMoreInHeader()
-	{
-	    return $this->_moreinheader;
-	}
+    /**
+     * get moreInHeader
+     *
+     * @return	string		moreInHeader
+     */
+    function getMoreInHeader()
+    {
+        return $this->_moreinheader;
+    }
 
     /**
      * Set errors to
@@ -298,11 +298,11 @@ 
      * @param	string		$_strErrorsTo		Errors to
      * @return	void
      */
-	function setErrorsTo($_strErrorsTo)
-	{
-		if ( $_strErrorsTo )
-		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
-	}
+    function setErrorsTo($_strErrorsTo)
+    {
+        if ( $_strErrorsTo )
+        $this->_errorsTo = $this->_strip_email($_strErrorsTo);
+    }
 
     /**
      * Get errors to
@@ -310,143 +310,143 @@ 
      * @param	boolean		$_part		Variant
      * @return	string					Errors to
      */
-	function getErrorsTo($_part = true )
-	{
-		$_retValue = '';
-
-		if ( $_part === true )
-		$_retValue = $this->_errorsTo;
-		else
-		$_retValue = $this->_errorsTo[$_part];
-
-		return $_retValue;
-	}
-
-	/**
-	 * Set debug
-	 *
-	 * @param	boolean		$_vDebug		Value for debug
-	 * @return 	void
-	 */
-	function setDebug($_vDebug = false )
-	{
-		$this->_debug = $_vDebug;
-	}
-
-	/**
-	 * build RECIPIENT List, all addresses who will recieve this message
-	 *
-	 * @return void
-	 */
-	function buildRCPTlist()
-	{
-		// Pull TO list
-		$_aryToList = $this->getTO();
-	}
+    function getErrorsTo($_part = true )
+    {
+        $_retValue = '';
+
+        if ( $_part === true )
+        $_retValue = $this->_errorsTo;
+        else
+        $_retValue = $this->_errorsTo[$_part];
+
+        return $_retValue;
+    }
+
+    /**
+     * Set debug
+     *
+     * @param	boolean		$_vDebug		Value for debug
+     * @return 	void
+     */
+    function setDebug($_vDebug = false )
+    {
+        $this->_debug = $_vDebug;
+    }
+
+    /**
+     * build RECIPIENT List, all addresses who will recieve this message
+     *
+     * @return void
+     */
+    function buildRCPTlist()
+    {
+        // Pull TO list
+        $_aryToList = $this->getTO();
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attempt a connection to mail server
-	 *
-	 * @return mixed  $_retVal   Boolean indicating success or failure on connection
-	 */
-	function _server_connect()
-	{
+    /**
+     * Attempt a connection to mail server
+     *
+     * @return mixed  $_retVal   Boolean indicating success or failure on connection
+     */
+    function _server_connect()
+    {
         // phpcs:enable
-		// Default return value
-		$_retVal = true;
-
-		// We have to make sure the HOST given is valid
-		// This is done here because '@fsockopen' will not give me this
-		// information if it failes to connect because it can't find the HOST
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
-
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-		// @CHANGE LDR
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-		if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
-		{
-			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
-			$_retVal = false;
-		}
-		else
-		{
-			//See if we can connect to the SMTP server
-			if ($this->socket = @fsockopen(
-    			preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
-    			$this->getPort(),       // which Port number to use
-    			$this->errno,           // actual system level error
-    			$this->errstr,          // and any text that goes with the error
-    			$this->_smtpTimeout
-			))  // timeout for reading/writing data over the socket
-			{
-				// Fix from PHP SMTP class by 'Chris Ryan'
-				// Sometimes the SMTP server takes a little longer to respond
-				// so we will give it a longer timeout for the first read
-				// Windows still does not have support for this timeout function
-				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
-
-				// Check response from Server
-				if ( $_retVal = $this->server_parse($this->socket, "220") )
-				$_retVal = $this->socket;
-			}
-			// This connection attempt failed.
-			else
-			{
-				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
-				$this->_setErr($this->errno, $this->errstr);
-				$_retVal = false;
-			}
-		}
-
-		return $_retVal;
-	}
+        // Default return value
+        $_retVal = true;
+
+        // We have to make sure the HOST given is valid
+        // This is done here because '@fsockopen' will not give me this
+        // information if it failes to connect because it can't find the HOST
+        $host=$this->getHost();
+        $usetls = preg_match('@tls://@i',$host);
+
+        $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+        $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+        $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+        // @CHANGE LDR
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+        if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
+        {
+            $this->_setErr(99, $host . ' is either offline or is an invalid host name.');
+            $_retVal = false;
+        }
+        else
+        {
+            //See if we can connect to the SMTP server
+            if ($this->socket = @fsockopen(
+                preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
+                $this->getPort(),       // which Port number to use
+                $this->errno,           // actual system level error
+                $this->errstr,          // and any text that goes with the error
+                $this->_smtpTimeout
+            ))  // timeout for reading/writing data over the socket
+            {
+                // Fix from PHP SMTP class by 'Chris Ryan'
+                // Sometimes the SMTP server takes a little longer to respond
+                // so we will give it a longer timeout for the first read
+                // Windows still does not have support for this timeout function
+                if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+
+                // Check response from Server
+                if ( $_retVal = $this->server_parse($this->socket, "220") )
+                $_retVal = $this->socket;
+            }
+            // This connection attempt failed.
+            else
+            {
+                // @CHANGE LDR
+                if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+                $this->_setErr($this->errno, $this->errstr);
+                $_retVal = false;
+            }
+        }
+
+        return $_retVal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attempt mail server authentication for a secure connection
-	 *
-	 * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
-	 */
-	function _server_authenticate()
-	{
+    /**
+     * Attempt mail server authentication for a secure connection
+     *
+     * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
+     */
+    function _server_authenticate()
+    {
         // phpcs:enable
-		global $conf;
-
-		// Send the RFC2554 specified EHLO.
-		// This improvment as provided by 'SirSir' to
-		// accomodate both SMTP AND ESMTP capable servers
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
-
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-		if ($usetls) $host='tls://'.$host;
-
-		$hosth = $host;
-
-		if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-		{
-			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-			$hosth = $this->getFrom('addr');
-			$hosth = preg_replace('/^.*</', '', $hosth);
-			$hosth = preg_replace('/>.*$/', '', $hosth);
-			$hosth = preg_replace('/.*@/', '', $hosth);
-		}
-
-		if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
-		{
-			if ($usetls)
-			{
-			    /*
+        global $conf;
+
+        // Send the RFC2554 specified EHLO.
+        // This improvment as provided by 'SirSir' to
+        // accomodate both SMTP AND ESMTP capable servers
+        $host=$this->getHost();
+        $usetls = preg_match('@tls://@i',$host);
+
+        $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+        $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+        $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+        if ($usetls) $host='tls://'.$host;
+
+        $hosth = $host;
+
+        if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+        {
+            // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+            $hosth = $this->getFrom('addr');
+            $hosth = preg_replace('/^.*</', '', $hosth);
+            $hosth = preg_replace('/>.*$/', '', $hosth);
+            $hosth = preg_replace('/.*@/', '', $hosth);
+        }
+
+        if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
+        {
+            if ($usetls)
+            {
+                /*
 			    The following dialog illustrates how a client and server can start a TLS STARTTLS session
 			    S: <waits for connection on TCP port 25>
 			    C: <opens connection>
@@ -465,130 +465,130 @@ 
                 S: 250 AUTH LOGIN
 			    C: <continues by sending an SMTP command
 			    */
-				if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
-				{
-					$this->_setErr(131, 'STARTTLS connection is not supported.');
-					return $_retVal;
-				}
-
-				// Before 5.6.7:
-				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
-				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-				// PHP >= 5.6.7:
-				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
-
-				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-				if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
-					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
-				}
-
-				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
-				{
-					$this->_setErr(132, 'STARTTLS connection failed.');
-					return $_retVal;
-				}
-				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
-				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-				if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
-				{
-					$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
-					return $_retVal;
-				}
-			}
-			// Send Authentication to Server
-			// Check for errors along the way
-			$this->socket_send_str('AUTH LOGIN', '334');
-
-			// User name will not return any error, server will take anything we give it.
-			$this->socket_send_str(base64_encode($this->_smtpsID), '334');
-
-			// The error here just means the ID/password combo doesn't work.
-			// There is not a method to determine which is the problem, ID or password
-			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
-			$this->_setErr(130, 'Invalid Authentication Credentials.');
-		}
-		else
-		{
-			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
-		}
-
-		return $_retVal;
-	}
-
-	/**
-	 * Now send the message
-	 *
-	 * @param  boolean $_bolTestMsg  whether to run this method in 'Test' mode.
-	 * @param  boolean $_bolDebug    whether to log all communication between this Class and the Mail Server.
-	 * @return boolean|null   void
-	 *                 $_strMsg      If this is run in 'Test' mode, the actual message structure will be returned
-	 */
-	function sendMsg($_bolTestMsg = false, $_bolDebug = false)
-	{
-		global $conf;
-
-		/**
-		 * Default return value
-		 */
-		$_retVal = false;
-
-		// Connect to Server
-		if ( $this->socket = $this->_server_connect() )
-		{
-			// If a User ID *and* a password is given, assume Authentication is desired
-			if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
-			{
-				// Send the RFC2554 specified EHLO.
-				$_retVal = $this->_server_authenticate();
-			}
-
-			// This is a "normal" SMTP Server "handshack"
-			else
-			{
-				// Send the RFC821 specified HELO.
-				$host=$this->getHost();
-				$usetls = preg_match('@tls://@i',$host);
-
-				$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-				$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-				$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-				$hosth = $host;
-
-				if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-				{
-					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-					$hosth = $this->getFrom('addr');
-					$hosth = preg_replace('/^.*</', '', $hosth);
-					$hosth = preg_replace('/>.*$/', '', $hosth);
-					$hosth = preg_replace('/.*@/', '', $hosth);
-				}
-
-				$_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
-			}
-
-			// Well, did we get to the server?
-			if ( $_retVal )
-			{
-				// From this point onward most server response codes should be 250
-				// Specify who the mail is from....
-				// This has to be the raw email address, strip the "name" off
-				$this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
-
-				// 'RCPT TO:' must be given a single address, so this has to loop
-				// through the list of addresses, regardless of TO, CC or BCC
-				// and send it out "single file"
-				foreach ( $this->get_RCPT_list() as $_address )
-				{
-				    /* Note:
+                if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
+                {
+                    $this->_setErr(131, 'STARTTLS connection is not supported.');
+                    return $_retVal;
+                }
+
+                // Before 5.6.7:
+                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
+                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+                // PHP >= 5.6.7:
+                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
+
+                $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+                if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+                }
+
+                if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
+                {
+                    $this->_setErr(132, 'STARTTLS connection failed.');
+                    return $_retVal;
+                }
+                // Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
+                // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
+                if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
+                {
+                    $this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+                    return $_retVal;
+                }
+            }
+            // Send Authentication to Server
+            // Check for errors along the way
+            $this->socket_send_str('AUTH LOGIN', '334');
+
+            // User name will not return any error, server will take anything we give it.
+            $this->socket_send_str(base64_encode($this->_smtpsID), '334');
+
+            // The error here just means the ID/password combo doesn't work.
+            // There is not a method to determine which is the problem, ID or password
+            if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
+            $this->_setErr(130, 'Invalid Authentication Credentials.');
+        }
+        else
+        {
+            $this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+        }
+
+        return $_retVal;
+    }
+
+    /**
+     * Now send the message
+     *
+     * @param  boolean $_bolTestMsg  whether to run this method in 'Test' mode.
+     * @param  boolean $_bolDebug    whether to log all communication between this Class and the Mail Server.
+     * @return boolean|null   void
+     *                 $_strMsg      If this is run in 'Test' mode, the actual message structure will be returned
+     */
+    function sendMsg($_bolTestMsg = false, $_bolDebug = false)
+    {
+        global $conf;
+
+        /**
+         * Default return value
+         */
+        $_retVal = false;
+
+        // Connect to Server
+        if ( $this->socket = $this->_server_connect() )
+        {
+            // If a User ID *and* a password is given, assume Authentication is desired
+            if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
+            {
+                // Send the RFC2554 specified EHLO.
+                $_retVal = $this->_server_authenticate();
+            }
+
+            // This is a "normal" SMTP Server "handshack"
+            else
+            {
+                // Send the RFC821 specified HELO.
+                $host=$this->getHost();
+                $usetls = preg_match('@tls://@i',$host);
+
+                $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+                $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+                $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+                $hosth = $host;
+
+                if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+                {
+                    // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+                    $hosth = $this->getFrom('addr');
+                    $hosth = preg_replace('/^.*</', '', $hosth);
+                    $hosth = preg_replace('/>.*$/', '', $hosth);
+                    $hosth = preg_replace('/.*@/', '', $hosth);
+                }
+
+                $_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
+            }
+
+            // Well, did we get to the server?
+            if ( $_retVal )
+            {
+                // From this point onward most server response codes should be 250
+                // Specify who the mail is from....
+                // This has to be the raw email address, strip the "name" off
+                $this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+
+                // 'RCPT TO:' must be given a single address, so this has to loop
+                // through the list of addresses, regardless of TO, CC or BCC
+                // and send it out "single file"
+                foreach ( $this->get_RCPT_list() as $_address )
+                {
+                    /* Note:
 				     * BCC email addresses must be listed in the RCPT TO command list,
                      * but the BCC header should not be printed under the DATA command.
 				     * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
 				     */
 
-    				/*
+                    /*
 					 * TODO
 					 * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
 					 * if not, the whole message will fail
@@ -596,1237 +596,1237 @@ 
 					 * mark the last address as "bad" and start the address loop over again.
 					 * If any address fails, the entire message fails.
 					 */
-					$this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
-				}
-
-				// Tell the server we are ready to start sending data
-				// with any custom headers...
-				// This is the last response code we look for until the end of the message.
-				$this->socket_send_str('DATA', '354');
-
-				// Now we are ready for the message...
-				// Ok, all the ingredients are mixed in let's cook this puppy...
-				$this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
-
-				// Now tell the server we are done and close the socket...
-				fputs($this->socket, 'QUIT');
-				fclose($this->socket);
-			}
-		}
-
-		return $_retVal;
-	}
-
-	// =============================================================
-	// ** Setter & Getter methods
-
-	// ** Basic System configuration
-
-	/**
-	 * setConfig() is used to populate select class properties from either
-	 * a user defined INI file or the systems 'php.ini' file
-	 *
-	 * If a user defined INI is to be used, the files complete path is passed
-	 * as the method single parameter. The INI can define any class and/or
-	 * user properties. Only properties defined within this file will be setter
-	 * and/or orverwritten
-	 *
-	 * If the systems 'php.ini' file is to be used, the method is called without
-	 * parameters. In this case, only HOST, PORT and FROM properties will be set
-	 * as they are the only properties that are defined within the 'php.ini'.
-	 *
-	 * If secure SMTP is to be used, the user ID and Password can be defined with
-	 * the user INI file, but the properties are not defined with the systems
-	 * 'php.ini'file, they must be defined via their setter methods
-	 *
-	 * This method can be called twice, if desired. Once without a parameter to
-	 * load the properties as defined within the systems 'php.ini' file, and a
-	 * second time, with a path to a user INI file for other properties to be
-	 * defined.
-	 *
-	 * @param mixed $_strConfigPath path to config file or VOID
-	 * @return boolean
-	 */
-	function setConfig($_strConfigPath = null)
-	{
-		/**
-		 * Returns constructed SELECT Object string or boolean upon failure
-		 * Default value is set at true
-		 */
-		$_retVal = true;
-
-		// if we have a path...
-		if ( ! empty ($_strConfigPath) )
-		{
-			// If the path is not valid, this will NOT generate an error,
-			// it will simply return false.
-			if ( ! @include $_strConfigPath)
-			{
-				$this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
-				$_retVal = false;
-			}
-		}
-
-		// Read the Systems php.ini file
-		else
-		{
-			// Set these properties ONLY if they are set in the php.ini file.
-			// Otherwise the default values will be used.
-			if ( $_host = ini_get('SMTPs') )
-			$this->setHost($_host);
-
-			if ( $_port = ini_get('smtp_port') )
-			$this->setPort($_port);
-
-			if ( $_from = ini_get('sendmail_from') )
-			$this->setFrom($_from);
-		}
-
-		// Send back what we have
-		return $_retVal;
-	}
-
-	/**
-	 * Determines the method inwhich the messages are to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server
-	 * - 'pipe     [1] - use UNIX path to EXE
-	 * - 'phpmail  [2] - use the PHP built-in mail function
-	 *
-	 * @param int $_type  Interger value representing Mail Transport Type
-	 * @return void
-	 */
-	function setTransportType($_type = 0)
-	{
-		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
-		$this->_transportType = $_type;
-	}
-
-	/**
-	 * Return the method inwhich the message is to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server
-	 * - 'pipe     [1] - use UNIX path to EXE
-	 * - 'phpmail  [2] - use the PHP built-in mail function
-	 *
-	 * @return int $_strHost Host Name or IP of the Mail Server to use
-	 */
-	function getTransportType()
-	{
-		return $this->_transportType;
-	}
-
-	/**
-	 * Path to the sendmail execuable
-	 *
-	 * @param string $_path Path to the sendmail execuable
-	 * @return boolean
-	 *
-	 */
-	function setMailPath($_path)
-	{
-		// This feature is not yet implemented
-		return true;
-
-		//if ( $_path ) $this->_mailPath = $_path;
-	}
-
-	/**
-	 * Defines the Host Name or IP of the Mail Server to use.
-	 * This is defaulted to 'localhost'
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-	 * @return 	void
-	 */
-	function setHost($_strHost)
-	{
-		if ( $_strHost )
-		$this->_smtpsHost = $_strHost;
-	}
-
-	/**
-	 * Retrieves the Host Name or IP of the Mail Server to use
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-	 */
-	function getHost()
-	{
-		return $this->_smtpsHost;
-	}
-
-	/**
-	 * Defines the Port Number of the Mail Server to use
-	 * This is defaulted to '25'
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @param 	int 	$_intPort 		Port Number of the Mail Server to use
-	 * @return 	void
-	 */
-	function setPort($_intPort)
-	{
-		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
-		$this->_smtpsPort = $_intPort;
-	}
-
-	/**
-	 * Retrieves the Port Number of the Mail Server to use
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @return 	string 		Port Number of the Mail Server to use
-	 */
-	function getPort()
-	{
-		return $this->_smtpsPort;
-	}
-
-	/**
-	 * User Name for authentication on Mail Server
-	 *
-	 * @param 	string 	$_strID 	User Name for authentication on Mail Server
-	 * @return 	void
-	 */
-	function setID($_strID)
-	{
-		$this->_smtpsID = $_strID;
-	}
-
-	/**
-	 * Retrieves the User Name for authentication on Mail Server
-	 *
-	 * @return string 	User Name for authentication on Mail Server
-	 */
-	function getID()
-	{
-		return $this->_smtpsID;
-	}
-
-	/**
-	 * User Password for authentication on Mail Server
-	 *
-	 * @param 	string 	$_strPW 	User Password for authentication on Mail Server
-	 * @return 	void
-	 */
-	function setPW($_strPW)
-	{
-		$this->_smtpsPW = $_strPW;
-	}
-
-	/**
-	 * Retrieves the User Password for authentication on Mail Server
-	 *
-	 * @return 	string 		User Password for authentication on Mail Server
-	 */
-	function getPW()
-	{
-		return $this->_smtpsPW;
-	}
-
-	/**
-	 * Character set used for current message
-	 * Character set is defaulted to 'iso-8859-1';
-	 *
-	 * @param string $_strCharSet Character set used for current message
-	 * @return void
-	 */
-	function setCharSet($_strCharSet)
-	{
-		if ( $_strCharSet )
-		$this->_smtpsCharSet = $_strCharSet;
-	}
-
-	/**
-	 * Retrieves the Character set used for current message
-	 *
-	 * @return string $_smtpsCharSet Character set used for current message
-	 */
-	function getCharSet()
-	{
-		return $this->_smtpsCharSet;
-	}
-
-	/**
-	 * Content-Transfer-Encoding, Defaulted to '7bit'
-	 * This can be changed for 2byte characers sets
-	 * Known Encode Types
-	 *  - 7bit               Simple 7-bit ASCII
-	 *  - 8bit               8-bit coding with line termination characters
-	 *  - base64             3 octets encoded into 4 sextets with offset
-	 *  - binary             Arbitrary binary stream
-	 *  - mac-binhex40       Macintosh binary to hex encoding
-	 *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-	 *  - uuencode           UUENCODE encoding
-	 *
-	 * @param string $_strTransEncode Content-Transfer-Encoding
-	 * @return void
-	 */
-	function setTransEncode($_strTransEncode)
-	{
-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncode = $_strTransEncode;
-	}
-
-	/**
-	 * Retrieves the Content-Transfer-Encoding
-	 *
-	 * @return string $_smtpsTransEncode Content-Transfer-Encoding
-	 */
-	function getTransEncode()
-	{
-		return $this->_smtpsTransEncode;
-	}
-
-	/**
-	 * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
-	 * This can be changed for 2byte characers sets
-	 * Known Encode Types
-	 *  - [0] 7bit               Simple 7-bit ASCII
-	 *  - [1] 8bit               8-bit coding with line termination characters
-	 *  - [2] base64             3 octets encoded into 4 sextets with offset
-	 *  - [3] binary             Arbitrary binary stream
-	 *  - [4] mac-binhex40       Macintosh binary to hex encoding
-	 *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-	 *  - [6] uuencode           UUENCODE encoding
-	 *
-	 * @param string $_strTransEncodeType Content-Transfer-Encoding
-	 * @return void
-	 *
-	 */
-	function setTransEncodeType($_strTransEncodeType)
-	{
-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncodeType = $_strTransEncodeType;
-	}
-
-	/**
-	 * Retrieves the Content-Transfer-Encoding
-	 *
-	 * @return 	string 		Content-Transfer-Encoding
-	 */
-	function getTransEncodeType()
-	{
-		return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
-	}
-
-
-	// ** Message Construction
-
-	/**
-	 * FROM Address from which mail will be sent
-	 *
-	 * @param 	string 	$_strFrom 	Address from which mail will be sent
-	 * @return 	void
-	 */
-	function setFrom($_strFrom)
-	{
-		if ( $_strFrom )
-		$this->_msgFrom = $this->_strip_email($_strFrom);
-	}
-
-	/**
-	 * Retrieves the Address from which mail will be sent
-	 *
-	 * @param  	boolean $_part		To "strip" 'Real name' from address
-	 * @return 	string 				Address from which mail will be sent
-	 */
-	function getFrom($_part = true)
-	{
-		$_retValue = '';
-
-		if ( $_part === true )
-		$_retValue = $this->_msgFrom;
-		else
-		$_retValue = $this->_msgFrom[$_part];
-
-		return $_retValue;
-	}
-
-	/**
-	 * Reply-To Address from which mail will be the reply-to
-	 *
-	 * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
-	 * @return 	void
-	 */
-	function setReplyTo($_strReplyTo)
-	{
-	    if ( $_strReplyTo )
-	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
-	}
-
-	/**
-	 * Retrieves the Address from which mail will be the reply-to
-	 *
-	 * @param  	boolean $_part		To "strip" 'Real name' from address
-	 * @return 	string 				Address from which mail will be the reply-to
-	 */
-	function getReplyTo($_part = true)
-	{
-	    $_retValue = '';
-
-	    if ( $_part === true )
-	        $_retValue = $this->_msgReplyTo;
-	    else
-	        $_retValue = $this->_msgReplyTo[$_part];
-
-	    return $_retValue;
-	}
-
-	/**
-	 * Inserts given addresses into structured format.
-	 * This method takes a list of given addresses, via an array
-	 * or a COMMA delimted string, and inserts them into a highly
-	 * structured array. This array is designed to remove duplicate
-	 * addresses and to sort them by Domain.
-	 *
-	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
-	 * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
-	 * @return void
-	 *
-	 */
-	function _buildAddrList($_type, $_addrList)
-	{
-		// Pull existing list
-		$aryHost = $this->_msgRecipients;
-
-		// Only run this if we have something
-		if ( !empty ($_addrList ))
-		{
-			// $_addrList can be a STRING or an array
-			if ( is_string($_addrList) )
-			{
-				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
-				// "explode "list" into an array
-				$_addrList = explode(',', $_addrList);
-
-				// Stick it in an array
-				else
-				$_addrList = array($_addrList);
-			}
-
-			// take the array of addresses and split them further
-			foreach ( $_addrList as $_strAddr )
-			{
-				// Strip off the end '>'
-				$_strAddr = str_replace('>', '', $_strAddr);
-
-				// Seperate "Real Name" from eMail address
-				$_tmpaddr = null;
-				$_tmpaddr = explode('<', $_strAddr);
-
-				// We have a "Real Name" and eMail address
-				if ( count($_tmpaddr) == 2 )
-				{
-					$_tmpHost = explode('@', $_tmpaddr[1]);
-					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
-					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
-				}
-				// We only have an eMail address
-				else
-				{
-					// Strip off the beggining '<'
-					$_strAddr = str_replace('<', '', $_strAddr);
-
-					$_tmpHost = explode('@', $_strAddr);
-					$_tmpHost[0] = trim($_tmpHost[0]);
-					$_tmpHost[1] = trim($_tmpHost[1]);
-
-					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
-				}
-			}
-		}
-		// replace list
-		$this->_msgRecipients = $aryHost;
-	}
+                    $this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
+                }
+
+                // Tell the server we are ready to start sending data
+                // with any custom headers...
+                // This is the last response code we look for until the end of the message.
+                $this->socket_send_str('DATA', '354');
+
+                // Now we are ready for the message...
+                // Ok, all the ingredients are mixed in let's cook this puppy...
+                $this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
+
+                // Now tell the server we are done and close the socket...
+                fputs($this->socket, 'QUIT');
+                fclose($this->socket);
+            }
+        }
+
+        return $_retVal;
+    }
+
+    // =============================================================
+    // ** Setter & Getter methods
+
+    // ** Basic System configuration
+
+    /**
+     * setConfig() is used to populate select class properties from either
+     * a user defined INI file or the systems 'php.ini' file
+     *
+     * If a user defined INI is to be used, the files complete path is passed
+     * as the method single parameter. The INI can define any class and/or
+     * user properties. Only properties defined within this file will be setter
+     * and/or orverwritten
+     *
+     * If the systems 'php.ini' file is to be used, the method is called without
+     * parameters. In this case, only HOST, PORT and FROM properties will be set
+     * as they are the only properties that are defined within the 'php.ini'.
+     *
+     * If secure SMTP is to be used, the user ID and Password can be defined with
+     * the user INI file, but the properties are not defined with the systems
+     * 'php.ini'file, they must be defined via their setter methods
+     *
+     * This method can be called twice, if desired. Once without a parameter to
+     * load the properties as defined within the systems 'php.ini' file, and a
+     * second time, with a path to a user INI file for other properties to be
+     * defined.
+     *
+     * @param mixed $_strConfigPath path to config file or VOID
+     * @return boolean
+     */
+    function setConfig($_strConfigPath = null)
+    {
+        /**
+         * Returns constructed SELECT Object string or boolean upon failure
+         * Default value is set at true
+         */
+        $_retVal = true;
+
+        // if we have a path...
+        if ( ! empty ($_strConfigPath) )
+        {
+            // If the path is not valid, this will NOT generate an error,
+            // it will simply return false.
+            if ( ! @include $_strConfigPath)
+            {
+                $this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
+                $_retVal = false;
+            }
+        }
+
+        // Read the Systems php.ini file
+        else
+        {
+            // Set these properties ONLY if they are set in the php.ini file.
+            // Otherwise the default values will be used.
+            if ( $_host = ini_get('SMTPs') )
+            $this->setHost($_host);
+
+            if ( $_port = ini_get('smtp_port') )
+            $this->setPort($_port);
+
+            if ( $_from = ini_get('sendmail_from') )
+            $this->setFrom($_from);
+        }
+
+        // Send back what we have
+        return $_retVal;
+    }
+
+    /**
+     * Determines the method inwhich the messages are to be sent.
+     * - 'sockets' [0] - conect via network to SMTP server
+     * - 'pipe     [1] - use UNIX path to EXE
+     * - 'phpmail  [2] - use the PHP built-in mail function
+     *
+     * @param int $_type  Interger value representing Mail Transport Type
+     * @return void
+     */
+    function setTransportType($_type = 0)
+    {
+        if ( ( is_numeric($_type) ) &&
+        ( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
+        $this->_transportType = $_type;
+    }
+
+    /**
+     * Return the method inwhich the message is to be sent.
+     * - 'sockets' [0] - conect via network to SMTP server
+     * - 'pipe     [1] - use UNIX path to EXE
+     * - 'phpmail  [2] - use the PHP built-in mail function
+     *
+     * @return int $_strHost Host Name or IP of the Mail Server to use
+     */
+    function getTransportType()
+    {
+        return $this->_transportType;
+    }
+
+    /**
+     * Path to the sendmail execuable
+     *
+     * @param string $_path Path to the sendmail execuable
+     * @return boolean
+     *
+     */
+    function setMailPath($_path)
+    {
+        // This feature is not yet implemented
+        return true;
+
+        //if ( $_path ) $this->_mailPath = $_path;
+    }
+
+    /**
+     * Defines the Host Name or IP of the Mail Server to use.
+     * This is defaulted to 'localhost'
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+     * @return 	void
+     */
+    function setHost($_strHost)
+    {
+        if ( $_strHost )
+        $this->_smtpsHost = $_strHost;
+    }
+
+    /**
+     * Retrieves the Host Name or IP of the Mail Server to use
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+     */
+    function getHost()
+    {
+        return $this->_smtpsHost;
+    }
+
+    /**
+     * Defines the Port Number of the Mail Server to use
+     * This is defaulted to '25'
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @param 	int 	$_intPort 		Port Number of the Mail Server to use
+     * @return 	void
+     */
+    function setPort($_intPort)
+    {
+        if ( ( is_numeric($_intPort) ) &&
+        ( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
+        $this->_smtpsPort = $_intPort;
+    }
+
+    /**
+     * Retrieves the Port Number of the Mail Server to use
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @return 	string 		Port Number of the Mail Server to use
+     */
+    function getPort()
+    {
+        return $this->_smtpsPort;
+    }
+
+    /**
+     * User Name for authentication on Mail Server
+     *
+     * @param 	string 	$_strID 	User Name for authentication on Mail Server
+     * @return 	void
+     */
+    function setID($_strID)
+    {
+        $this->_smtpsID = $_strID;
+    }
+
+    /**
+     * Retrieves the User Name for authentication on Mail Server
+     *
+     * @return string 	User Name for authentication on Mail Server
+     */
+    function getID()
+    {
+        return $this->_smtpsID;
+    }
+
+    /**
+     * User Password for authentication on Mail Server
+     *
+     * @param 	string 	$_strPW 	User Password for authentication on Mail Server
+     * @return 	void
+     */
+    function setPW($_strPW)
+    {
+        $this->_smtpsPW = $_strPW;
+    }
+
+    /**
+     * Retrieves the User Password for authentication on Mail Server
+     *
+     * @return 	string 		User Password for authentication on Mail Server
+     */
+    function getPW()
+    {
+        return $this->_smtpsPW;
+    }
+
+    /**
+     * Character set used for current message
+     * Character set is defaulted to 'iso-8859-1';
+     *
+     * @param string $_strCharSet Character set used for current message
+     * @return void
+     */
+    function setCharSet($_strCharSet)
+    {
+        if ( $_strCharSet )
+        $this->_smtpsCharSet = $_strCharSet;
+    }
+
+    /**
+     * Retrieves the Character set used for current message
+     *
+     * @return string $_smtpsCharSet Character set used for current message
+     */
+    function getCharSet()
+    {
+        return $this->_smtpsCharSet;
+    }
+
+    /**
+     * Content-Transfer-Encoding, Defaulted to '7bit'
+     * This can be changed for 2byte characers sets
+     * Known Encode Types
+     *  - 7bit               Simple 7-bit ASCII
+     *  - 8bit               8-bit coding with line termination characters
+     *  - base64             3 octets encoded into 4 sextets with offset
+     *  - binary             Arbitrary binary stream
+     *  - mac-binhex40       Macintosh binary to hex encoding
+     *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+     *  - uuencode           UUENCODE encoding
+     *
+     * @param string $_strTransEncode Content-Transfer-Encoding
+     * @return void
+     */
+    function setTransEncode($_strTransEncode)
+    {
+        if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
+        $this->_smtpsTransEncode = $_strTransEncode;
+    }
+
+    /**
+     * Retrieves the Content-Transfer-Encoding
+     *
+     * @return string $_smtpsTransEncode Content-Transfer-Encoding
+     */
+    function getTransEncode()
+    {
+        return $this->_smtpsTransEncode;
+    }
+
+    /**
+     * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
+     * This can be changed for 2byte characers sets
+     * Known Encode Types
+     *  - [0] 7bit               Simple 7-bit ASCII
+     *  - [1] 8bit               8-bit coding with line termination characters
+     *  - [2] base64             3 octets encoded into 4 sextets with offset
+     *  - [3] binary             Arbitrary binary stream
+     *  - [4] mac-binhex40       Macintosh binary to hex encoding
+     *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+     *  - [6] uuencode           UUENCODE encoding
+     *
+     * @param string $_strTransEncodeType Content-Transfer-Encoding
+     * @return void
+     *
+     */
+    function setTransEncodeType($_strTransEncodeType)
+    {
+        if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
+        $this->_smtpsTransEncodeType = $_strTransEncodeType;
+    }
+
+    /**
+     * Retrieves the Content-Transfer-Encoding
+     *
+     * @return 	string 		Content-Transfer-Encoding
+     */
+    function getTransEncodeType()
+    {
+        return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
+    }
+
+
+    // ** Message Construction
+
+    /**
+     * FROM Address from which mail will be sent
+     *
+     * @param 	string 	$_strFrom 	Address from which mail will be sent
+     * @return 	void
+     */
+    function setFrom($_strFrom)
+    {
+        if ( $_strFrom )
+        $this->_msgFrom = $this->_strip_email($_strFrom);
+    }
+
+    /**
+     * Retrieves the Address from which mail will be sent
+     *
+     * @param  	boolean $_part		To "strip" 'Real name' from address
+     * @return 	string 				Address from which mail will be sent
+     */
+    function getFrom($_part = true)
+    {
+        $_retValue = '';
+
+        if ( $_part === true )
+        $_retValue = $this->_msgFrom;
+        else
+        $_retValue = $this->_msgFrom[$_part];
+
+        return $_retValue;
+    }
+
+    /**
+     * Reply-To Address from which mail will be the reply-to
+     *
+     * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
+     * @return 	void
+     */
+    function setReplyTo($_strReplyTo)
+    {
+        if ( $_strReplyTo )
+            $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+    }
+
+    /**
+     * Retrieves the Address from which mail will be the reply-to
+     *
+     * @param  	boolean $_part		To "strip" 'Real name' from address
+     * @return 	string 				Address from which mail will be the reply-to
+     */
+    function getReplyTo($_part = true)
+    {
+        $_retValue = '';
+
+        if ( $_part === true )
+            $_retValue = $this->_msgReplyTo;
+        else
+            $_retValue = $this->_msgReplyTo[$_part];
+
+        return $_retValue;
+    }
+
+    /**
+     * Inserts given addresses into structured format.
+     * This method takes a list of given addresses, via an array
+     * or a COMMA delimted string, and inserts them into a highly
+     * structured array. This array is designed to remove duplicate
+     * addresses and to sort them by Domain.
+     *
+     * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
+     * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
+     * @return void
+     *
+     */
+    function _buildAddrList($_type, $_addrList)
+    {
+        // Pull existing list
+        $aryHost = $this->_msgRecipients;
+
+        // Only run this if we have something
+        if ( !empty ($_addrList ))
+        {
+            // $_addrList can be a STRING or an array
+            if ( is_string($_addrList) )
+            {
+                // This could be a COMMA delimited string
+                if ( strstr($_addrList, ',') )
+                // "explode "list" into an array
+                $_addrList = explode(',', $_addrList);
+
+                // Stick it in an array
+                else
+                $_addrList = array($_addrList);
+            }
+
+            // take the array of addresses and split them further
+            foreach ( $_addrList as $_strAddr )
+            {
+                // Strip off the end '>'
+                $_strAddr = str_replace('>', '', $_strAddr);
+
+                // Seperate "Real Name" from eMail address
+                $_tmpaddr = null;
+                $_tmpaddr = explode('<', $_strAddr);
+
+                // We have a "Real Name" and eMail address
+                if ( count($_tmpaddr) == 2 )
+                {
+                    $_tmpHost = explode('@', $_tmpaddr[1]);
+                    $_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
+                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
+                }
+                // We only have an eMail address
+                else
+                {
+                    // Strip off the beggining '<'
+                    $_strAddr = str_replace('<', '', $_strAddr);
+
+                    $_tmpHost = explode('@', $_strAddr);
+                    $_tmpHost[0] = trim($_tmpHost[0]);
+                    $_tmpHost[1] = trim($_tmpHost[1]);
+
+                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
+                }
+            }
+        }
+        // replace list
+        $this->_msgRecipients = $aryHost;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array of the various parts of an email address
-	 * This assumes a well formed address:
-	 * - "Real name" <username@domain.tld>
-	 * - "Real Name" is optional
-	 * - if "Real Name" does not exist, the angle brackets are optional
-	 * This will split an email address into 4 or 5 parts.
-	 * - $_aryEmail[org]  = orignal string
-	 * - $_aryEmail[real] = "real name" - if there is one
-	 * - $_aryEmail[addr] = address part "username@domain.tld"
-	 * - $_aryEmail[host] = "domain.tld"
-	 * - $_aryEmail[user] = "userName"
-	 *
-	 *	@param		string		$_strAddr		Email address
-	 * 	@return 	array	 					An array of the various parts of an email address
-	 */
-	function _strip_email($_strAddr)
-	{
+    /**
+     * Returns an array of the various parts of an email address
+     * This assumes a well formed address:
+     * - "Real name" <username@domain.tld>
+     * - "Real Name" is optional
+     * - if "Real Name" does not exist, the angle brackets are optional
+     * This will split an email address into 4 or 5 parts.
+     * - $_aryEmail[org]  = orignal string
+     * - $_aryEmail[real] = "real name" - if there is one
+     * - $_aryEmail[addr] = address part "username@domain.tld"
+     * - $_aryEmail[host] = "domain.tld"
+     * - $_aryEmail[user] = "userName"
+     *
+     *	@param		string		$_strAddr		Email address
+     * 	@return 	array	 					An array of the various parts of an email address
+     */
+    function _strip_email($_strAddr)
+    {
         // phpcs:enable
-		// Keep the orginal
-		$_aryEmail['org'] = $_strAddr;
+        // Keep the orginal
+        $_aryEmail['org'] = $_strAddr;
 
-		// Set entire string to Lower Case
-		$_strAddr = strtolower($_strAddr);
+        // Set entire string to Lower Case
+        $_strAddr = strtolower($_strAddr);
 
-		// Drop "stuff' off the end
-		$_strAddr = trim($_strAddr, ' ">');
+        // Drop "stuff' off the end
+        $_strAddr = trim($_strAddr, ' ">');
 
-		// Seperate "Real Name" from eMail address, if we have one
-		$_tmpAry = explode('<', $_strAddr);
+        // Seperate "Real Name" from eMail address, if we have one
+        $_tmpAry = explode('<', $_strAddr);
 
-		// Do we have a "Real name"
-		if ( count($_tmpAry) == 2 )
-		{
-			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
-			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+        // Do we have a "Real name"
+        if ( count($_tmpAry) == 2 )
+        {
+            // We may not really have a "Real Name"
+            if ( $_tmpAry[0])
+            $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
-			$_aryEmail['addr'] = $_tmpAry[1];
-		}
-		else
-		$_aryEmail['addr'] = $_tmpAry[0];
+            $_aryEmail['addr'] = $_tmpAry[1];
+        }
+        else
+        $_aryEmail['addr'] = $_tmpAry[0];
 
-		// Pull User Name and Host.tld apart
-		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
+        // Pull User Name and Host.tld apart
+        list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
 
-		// Put the brackets back around the address
-		$_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
+        // Put the brackets back around the address
+        $_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
 
-		return $_aryEmail;
-	}
+        return $_aryEmail;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array of bares addresses for use with 'RCPT TO:'
-	 * This is a "build as you go" method. Each time this method is called
-	 * the underlaying array is destroyed and reconstructed.
-	 *
-	 * @return 		array		Returns an array of bares addresses
-	 */
-	function get_RCPT_list()
-	{
+    /**
+     * Returns an array of bares addresses for use with 'RCPT TO:'
+     * This is a "build as you go" method. Each time this method is called
+     * the underlaying array is destroyed and reconstructed.
+     *
+     * @return 		array		Returns an array of bares addresses
+     */
+    function get_RCPT_list()
+    {
         // phpcs:enable
-		/**
-		 * An array of bares addresses for use with 'RCPT TO:'
-		 */
-		$_RCPT_list=array();
-
-		// walk down Recipients array and pull just email addresses
-		foreach ( $this->_msgRecipients as $_host => $_list )
-		{
-			foreach ( $_list as $_subList )
-			{
-				foreach ( $_subList as $_name => $_addr )
-				{
-					// build RCPT list
-					$_RCPT_list[] = $_name . '@' . $_host;
-				}
-			}
-		}
-
-		return $_RCPT_list;
-	}
+        /**
+         * An array of bares addresses for use with 'RCPT TO:'
+         */
+        $_RCPT_list=array();
+
+        // walk down Recipients array and pull just email addresses
+        foreach ( $this->_msgRecipients as $_host => $_list )
+        {
+            foreach ( $_list as $_subList )
+            {
+                foreach ( $_subList as $_name => $_addr )
+                {
+                    // build RCPT list
+                    $_RCPT_list[] = $_name . '@' . $_host;
+                }
+            }
+        }
+
+        return $_RCPT_list;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array of addresses for a specific type; TO, CC or BCC
-	 *
-	 * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
-	 * @return 		string|false 				Array of emaill address
-	 */
-	function get_email_list($_which = null)
-	{
+    /**
+     * Returns an array of addresses for a specific type; TO, CC or BCC
+     *
+     * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
+     * @return 		string|false 				Array of emaill address
+     */
+    function get_email_list($_which = null)
+    {
         // phpcs:enable
-		// We need to know which address segment to pull
-		if ( $_which )
-		{
-			// Make sure we have addresses to process
-			if ( $this->_msgRecipients )
-			{
-				$_RCPT_list=array();
-				// walk down Recipients array and pull just email addresses
-				foreach ( $this->_msgRecipients as $_host => $_list )
-				{
-					if ( $this->_msgRecipients[$_host][$_which] )
-					{
-						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
-						{
-							if ( $_realName )	// @CHANGE LDR
-							{
-								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
-							}
-							else
-							{
-								$_RCPT_list[] = $_addr . '@' . $_host;
-							}
-						}
-					}
-				}
-
-				return implode(', ', $_RCPT_list);
-			}
-			else
-			{
-				$this->_setErr(101, 'No eMail Address for message to be sent to.');
-				return false;
-			}
-		}
-		else
-		{
-			$this->_setErr(102, 'eMail type not defined.');
-			return false;
-		}
-	}
-
-	/**
-	 * TO Address[es] inwhich to send mail to
-	 *
-	 * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
-	 * @return 	void
-	 */
-	function setTO($_addrTo)
-	{
-		if ( $_addrTo )
-		$this->_buildAddrList('to', $_addrTo);
-	}
-
-	/**
-	 * Retrieves the TO Address[es] inwhich to send mail to
-	 *
-	 * @return 	string 	TO Address[es] inwhich to send mail to
-	 */
-	function getTo()
-	{
-		return $this->get_email_list('to');
-	}
-
-	/**
-	 * CC Address[es] inwhich to send mail to
-	 *
-	 * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
-	 * @return 	void
-	 */
-	function setCC($_strCC)
-	{
-		if ( $_strCC )
-		$this->_buildAddrList('cc', $_strCC);
-	}
-
-	/**
-	 * Retrieves the CC Address[es] inwhich to send mail to
-	 *
-	 * @return 	string 		CC Address[es] inwhich to send mail to
-	 */
-	function getCC()
-	{
-		return $this->get_email_list('cc');
-	}
-
-	/**
-	 * BCC Address[es] inwhich to send mail to
-	 *
-	 * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
-	 * @return 	void
-	 */
-	function setBCC($_strBCC)
-	{
-		if ( $_strBCC )
-		$this->_buildAddrList('bcc', $_strBCC);
-	}
-
-	/**
-	 * Retrieves the BCC Address[es] inwhich to send mail to
-	 *
-	 * @return 	string		BCC Address[es] inwhich to send mail to
-	 */
-	function getBCC()
-	{
-		return $this->get_email_list('bcc');
-	}
-
-	/**
-	 * Message Subject
-	 *
-	 * @param 	string 	$_strSubject	Message Subject
-	 * @return 	void
-	 */
-	function setSubject($_strSubject = '')
-	{
-		if ( $_strSubject )
-		$this->_msgSubject = $_strSubject;
-	}
-
-	/**
-	 * Retrieves the Message Subject
-	 *
-	 * @return 	string 		Message Subject
-	 */
-	function getSubject()
-	{
-		return $this->_msgSubject;
-	}
-
-	/**
-	 * Constructes and returns message header
-	 *
-	 * @return string Complete message header
-	 */
-	function getHeader()
-	{
-		global $conf;
-
-		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
-		. 'To: '         . $this->getTO()          . "\r\n";
-
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
-
-		/* Note:
+        // We need to know which address segment to pull
+        if ( $_which )
+        {
+            // Make sure we have addresses to process
+            if ( $this->_msgRecipients )
+            {
+                $_RCPT_list=array();
+                // walk down Recipients array and pull just email addresses
+                foreach ( $this->_msgRecipients as $_host => $_list )
+                {
+                    if ( $this->_msgRecipients[$_host][$_which] )
+                    {
+                        foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
+                        {
+                            if ( $_realName )	// @CHANGE LDR
+                            {
+                                $_realName = '"' . $_realName . '"';
+                                $_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+                            }
+                            else
+                            {
+                                $_RCPT_list[] = $_addr . '@' . $_host;
+                            }
+                        }
+                    }
+                }
+
+                return implode(', ', $_RCPT_list);
+            }
+            else
+            {
+                $this->_setErr(101, 'No eMail Address for message to be sent to.');
+                return false;
+            }
+        }
+        else
+        {
+            $this->_setErr(102, 'eMail type not defined.');
+            return false;
+        }
+    }
+
+    /**
+     * TO Address[es] inwhich to send mail to
+     *
+     * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
+     * @return 	void
+     */
+    function setTO($_addrTo)
+    {
+        if ( $_addrTo )
+        $this->_buildAddrList('to', $_addrTo);
+    }
+
+    /**
+     * Retrieves the TO Address[es] inwhich to send mail to
+     *
+     * @return 	string 	TO Address[es] inwhich to send mail to
+     */
+    function getTo()
+    {
+        return $this->get_email_list('to');
+    }
+
+    /**
+     * CC Address[es] inwhich to send mail to
+     *
+     * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
+     * @return 	void
+     */
+    function setCC($_strCC)
+    {
+        if ( $_strCC )
+        $this->_buildAddrList('cc', $_strCC);
+    }
+
+    /**
+     * Retrieves the CC Address[es] inwhich to send mail to
+     *
+     * @return 	string 		CC Address[es] inwhich to send mail to
+     */
+    function getCC()
+    {
+        return $this->get_email_list('cc');
+    }
+
+    /**
+     * BCC Address[es] inwhich to send mail to
+     *
+     * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
+     * @return 	void
+     */
+    function setBCC($_strBCC)
+    {
+        if ( $_strBCC )
+        $this->_buildAddrList('bcc', $_strBCC);
+    }
+
+    /**
+     * Retrieves the BCC Address[es] inwhich to send mail to
+     *
+     * @return 	string		BCC Address[es] inwhich to send mail to
+     */
+    function getBCC()
+    {
+        return $this->get_email_list('bcc');
+    }
+
+    /**
+     * Message Subject
+     *
+     * @param 	string 	$_strSubject	Message Subject
+     * @return 	void
+     */
+    function setSubject($_strSubject = '')
+    {
+        if ( $_strSubject )
+        $this->_msgSubject = $_strSubject;
+    }
+
+    /**
+     * Retrieves the Message Subject
+     *
+     * @return 	string 		Message Subject
+     */
+    function getSubject()
+    {
+        return $this->_msgSubject;
+    }
+
+    /**
+     * Constructes and returns message header
+     *
+     * @return string Complete message header
+     */
+    function getHeader()
+    {
+        global $conf;
+
+        $_header = 'From: '       . $this->getFrom('org') . "\r\n"
+        . 'To: '         . $this->getTO()          . "\r\n";
+
+        if ( $this->getCC() )
+        $_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+
+        /* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
 		 * but the BCC header should not be printed under the DATA command.
 		 * So it is included into the function sendMsg() but not here.
 		 * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
 		 */
-		/*
+        /*
 		if ( $this->getBCC() )
 		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
-
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-		$host=dol_getprefix('email');
-
-		//NOTE: Message-ID should probably contain the username of the user who sent the msg
-		$_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
-		$_header .= 'Date: '       . date("r")               . "\r\n";
-
-		$trackid = $this->getTrackId();
-		if ($trackid)
-		{
-			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
-			$_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
-			$_header .= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host . "\r\n";
-		}
-		else
-		{
-			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
-		}
-		if (! empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
-		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
-
-		//$_header .=
-		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
-		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
-
-		if ( $this->getSensitivity() )
-		$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
-
-		if ( $this->_msgPriority != 3 )
-		$_header .= $this->getPriority();
-
-
-		// @CHANGE LDR
-		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
-		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
-
-		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
-		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
-		$_header .= 'Mime-Version: 1.0' . "\r\n";
-
-
-		return $_header;
-	}
-
-	/**
-	 * Message Content
-	 *
-	 * @param 	string 	$strContent		Message Content
-	 * @param	string	$strType		Type
-	 * @return 	void
-	 */
-	function setBodyContent($strContent, $strType = 'plain')
-	{
-		//if ( $strContent )
-		//{
-		if ( $strType == 'html' )
-		$strMimeType = 'text/html';
-		else
-		$strMimeType = 'text/plain';
-
-		// Make RFC821 Compliant, replace bare linefeeds
-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
-
-		$strContentAltText = '';
-		if ($strType == 'html')
-		{
-			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
-			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
-		}
-
-		// Make RFC2045 Compliant
-		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		$strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
-
-		$this->_msgContent[$strType] = array();
-
-		$this->_msgContent[$strType]['mimeType'] = $strMimeType;
-		$this->_msgContent[$strType]['data']     = $strContent;
-		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
-
-		if ( $this->getMD5flag() )
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
-		//}
-	}
-
-	/**
-	 * Retrieves the Message Content
-	 *
-	 * @return 	string			Message Content
-	 */
-	function getBodyContent()
-	{
-	    global $conf;
-
-		// Generate a new Boundary string
-		$this->_setBoundary();
-
-		// What type[s] of content do we have
-		$_types = array_keys($this->_msgContent);
-
-		// How many content types do we have
-		$keyCount = count($_types);
-
-		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
-		die ("Sorry, no content");
-
-		// If we have ONE, we can use the simple format
-		else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-		{
-			$_msgData = $this->_msgContent;
-			$_msgData = $_msgData[$_types[0]];
-
-			$content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
-			. 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
-			. 'Content-Disposition: inline'  . "\r\n"
-			. 'Content-Description: Message' . "\r\n";
-
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
-
-			$content .= "\r\n"
-			.  $_msgData['data'] . "\r\n";
-		}
-
-		// If we have more than ONE, we use the multi-part format
-		else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-		{
-			// Since this is an actual multi-part message
-			// We need to define a content message Boundary
-			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
-
-			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-			$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
-
-			//                     . "\r\n"
-			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
-			$content .= "Content-Transfer-Encoding: 8bit\r\n";
-			$content .= "\r\n";
-
-			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
-
-			if (key_exists('image', $this->_msgContent))     // If inline image found
-			{
-				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
-				$content .= "\r\n";
-				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
-			}
-
-
-			// $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
-
-
-			// Loop through message content array
-			foreach ($this->_msgContent as $type => $_content )
-			{
-				if ( $type == 'attachment' )
-				{
-					// loop through all attachments
-					foreach ( $_content as $_file => $_data )
-					{
-						$content .= "--" . $this->_getBoundary('mixed') . "\r\n"
-						.  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
-
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
-
-						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
-					}
-				}
-				// @CHANGE LDR
-				else if ( $type == 'image' )
-				{
-					// loop through all images
-					foreach ( $_content as $_image => $_data )
-					{
-						$content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
-
-						$content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
-
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
-
-						$content .= "\r\n"
-						. $_data['data'] . "\r\n";
-					}
-
-					// always end related and end alternative after inline images
-					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
-					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
-					$content.= "\r\n";
-				}
-				else
-				{
-					if (key_exists('image', $this->_msgContent))
-					{
-						$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-						$content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
-						$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-						$content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
-						$content.= "\r\n";
-						$content.= "--" . $this->_getBoundary('related') . "\r\n";
-					}
-
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
-					{
-					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
-    					$content .= "\r\n";
-	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
-
-	       				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-	       				$content.= "\r\n". $_content['dataText'] . "\r\n";
-	       				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-					}
-
-					$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
-					//                             . 'charset="' . $this->getCharSet() . '"';
-					. 'charset=' . $this->getCharSet() . '';
-
-					//                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
-					$content .=  "\r\n";
-					//                    $content .= 'Content-Transfer-Encoding: ';
-					//                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
-					//                    $content .=  "\r\n"
-					//                             . 'Content-Disposition: inline'  . "\r\n"
-					//                             . 'Content-Description: ' . $type . ' message' . "\r\n";
-
-					if ( $this->getMD5flag() )
-					$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
-
-					$content .= "\r\n"	. $_content['data'] . "\r\n";
-
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
-					{
-					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
-					}
-
-					$content .= "\r\n";
-				}
-			}
-
-			// Close message boundries
-			//            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
-			$content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
-		}
-
-		return $content;
-	}
-
-	/**
-	 * File attachments are added to the content array as sub-arrays,
-	 * allowing for multiple attachments for each outbound email
-	 *
-	 * @param string $strContent  File data to attach to message
-	 * @param string $strFileName File Name to give to attachment
-	 * @param string $strMimeType File Mime Type of attachment
-	 * @return void
-	 */
-	function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
-	{
-		if ( $strContent )
-		{
-			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
-
-			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
-			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
-			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
-
-			if ( $this->getMD5flag() )
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
-		}
-	}
-
-
-	// @CHANGE LDR
-
-	/**
-	 * Image attachments are added to the content array as sub-arrays,
-	 * allowing for multiple images for each outbound email
-	 *
-	 * @param 	string $strContent  	Image data to attach to message
-	 * @param 	string $strImageName 	Image Name to give to attachment
-	 * @param 	string $strMimeType 	Image Mime Type of attachment
-	 * @param 	string $strImageCid		CID
-	 * @return 	void
-	 */
-	function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
-	{
-		if ($strContent)
-		{
-			$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
-			$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
-			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
-			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
-
-			if ( $this->getMD5flag() )
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
-		}
-	}
-	// END @CHANGE LDR
-
-
-	/**
-	 * Message Content Sensitivity
-	 * Message Sensitivity values:
-	 *   - [0] None - default
-	 *   - [1] Personal
-	 *   - [2] Private
-	 *   - [3] Company Confidential
-	 *
-	 * @param 	integer	$_value		Message Sensitivity
-	 * @return 	void
-	 */
-	function setSensitivity($_value = 0)
-	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
-		$this->_msgSensitivity = $_value;
-	}
-
-	/**
-	 * Returns Message Content Sensitivity string
-	 * Message Sensitivity values:
-	 *   - [0] None - default
-	 *   - [1] Personal
-	 *   - [2] Private
-	 *   - [3] Company Confidential
-	 *
-	 * @return 	void
-	 */
-	function getSensitivity()
-	{
-		return $this->_arySensitivity[$this->_msgSensitivity];
-	}
-
-	/**
-	 * Message Content Priority
-	 * Message Priority values:
-	 *  - [0] 'Bulk'
-	 *  - [1] 'Highest'
-	 *  - [2] 'High'
-	 *  - [3] 'Normal' - default
-	 *  - [4] 'Low'
-	 *  - [5] 'Lowest'
-	 *
-	 * @param 	integer 	$_value 	Message Priority
-	 * @return 	void
-	 */
-	function setPriority( $_value = 3 )
-	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
-		$this->_msgPriority = $_value;
-	}
-
-	/**
-	 * Message Content Priority
-	 * Message Priority values:
-	 *  - [0] 'Bulk'
-	 *  - [1] 'Highest'
-	 *  - [2] 'High'
-	 *  - [3] 'Normal' - default
-	 *  - [4] 'Low'
-	 *  - [5] 'Lowest'
-	 *
-	 * @return string
-	 */
-	function getPriority()
-	{
-		return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
-	}
-
-	/**
-	 * Set flag which determines whether to calculate message MD5 checksum.
-	 *
-	 * @param 	string 	$_flag		Message Priority
-	 * @return 	void
-	 */
-	function setMD5flag($_flag = false)
-	{
-		$this->_smtpMD5 = $_flag;
-	}
-
-	/**
-	 * Gets flag which determines whether to calculate message MD5 checksum.
-	 *
-	 * @return 	boolean 				Message Priority
-	 */
-	function getMD5flag()
-	{
-		return $this->_smtpMD5;
-	}
-
-	/**
-	 * Message X-Header Content
-	 * This is a simple "insert". Whatever is given will be placed
-	 * "as is" into the Xheader array.
-	 *
-	 * @param string $strXdata Message X-Header Content
-	 * @return void
-	 */
-	function setXheader($strXdata)
-	{
-		if ( $strXdata )
-		$this->_msgXheader[] = $strXdata;
-	}
-
-	/**
-	 * Retrieves the Message X-Header Content
-	 *
-	 * @return string[] $_msgContent Message X-Header Content
-	 */
-	function getXheader()
-	{
-		return $this->_msgXheader;
-	}
-
-	/**
-	 * Generates Random string for MIME message Boundary
-	 *
-	 * @return void
-	 */
-	function _setBoundary()
-	{
-		$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
-		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
-		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
-	}
-
-	/**
-	 * Retrieves the MIME message Boundary
-	 *
-	 * @param  string $type				Type of boundary
-	 * @return string $_smtpsBoundary 	MIME message Boundary
-	 */
-	function _getBoundary($type='mixed')
-	{
-		if ($type == 'mixed') return $this->_smtpsBoundary;
-		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
-		else if ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
-	}
+        $host=$this->getHost();
+        $usetls = preg_match('@tls://@i',$host);
+
+        $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+        $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+        $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+        $host=dol_getprefix('email');
+
+        //NOTE: Message-ID should probably contain the username of the user who sent the msg
+        $_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
+        $_header .= 'Date: '       . date("r")               . "\r\n";
+
+        $trackid = $this->getTrackId();
+        if ($trackid)
+        {
+            // References is kept in response and Message-ID is returned into In-Reply-To:
+            $_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
+            $_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
+            $_header .= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host . "\r\n";
+        }
+        else
+        {
+            $_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
+        }
+        if (! empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
+        if ( $this->getMoreInHeader() )
+            $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+
+        //$_header .=
+        //                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
+        //                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
+
+        if ( $this->getSensitivity() )
+        $_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+
+        if ( $this->_msgPriority != 3 )
+        $_header .= $this->getPriority();
+
+
+        // @CHANGE LDR
+        if ( $this->getDeliveryReceipt() )
+            $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
+        if ( $this->getErrorsTo() )
+            $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
+        if ( $this->getReplyTo() )
+            $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+
+        $_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
+        $_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
+        $_header .= 'Mime-Version: 1.0' . "\r\n";
+
+
+        return $_header;
+    }
+
+    /**
+     * Message Content
+     *
+     * @param 	string 	$strContent		Message Content
+     * @param	string	$strType		Type
+     * @return 	void
+     */
+    function setBodyContent($strContent, $strType = 'plain')
+    {
+        //if ( $strContent )
+        //{
+        if ( $strType == 'html' )
+        $strMimeType = 'text/html';
+        else
+        $strMimeType = 'text/plain';
+
+        // Make RFC821 Compliant, replace bare linefeeds
+        $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
+
+        $strContentAltText = '';
+        if ($strType == 'html')
+        {
+            // Similar code to forge a text from html is also in CMailFile.class.php
+            $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+            $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+            $strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
+        }
+
+        // Make RFC2045 Compliant
+        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+        $strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+
+        $this->_msgContent[$strType] = array();
+
+        $this->_msgContent[$strType]['mimeType'] = $strMimeType;
+        $this->_msgContent[$strType]['data']     = $strContent;
+        $this->_msgContent[$strType]['dataText'] = $strContentAltText;
+
+        if ( $this->getMD5flag() )
+        $this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+        //}
+    }
+
+    /**
+     * Retrieves the Message Content
+     *
+     * @return 	string			Message Content
+     */
+    function getBodyContent()
+    {
+        global $conf;
+
+        // Generate a new Boundary string
+        $this->_setBoundary();
+
+        // What type[s] of content do we have
+        $_types = array_keys($this->_msgContent);
+
+        // How many content types do we have
+        $keyCount = count($_types);
+
+        // If we have ZERO, we have a problem
+        if( $keyCount === 0 )
+        die ("Sorry, no content");
+
+        // If we have ONE, we can use the simple format
+        else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+        {
+            $_msgData = $this->_msgContent;
+            $_msgData = $_msgData[$_types[0]];
+
+            $content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
+            . 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
+            . 'Content-Disposition: inline'  . "\r\n"
+            . 'Content-Description: Message' . "\r\n";
+
+            if ( $this->getMD5flag() )
+            $content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+
+            $content .= "\r\n"
+            .  $_msgData['data'] . "\r\n";
+        }
+
+        // If we have more than ONE, we use the multi-part format
+        else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+        {
+            // Since this is an actual multi-part message
+            // We need to define a content message Boundary
+            // NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
+
+            //$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
+            $content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
+
+            //                     . "\r\n"
+            //                     . 'This is a multi-part message in MIME format.' . "\r\n";
+            $content .= "Content-Transfer-Encoding: 8bit\r\n";
+            $content .= "\r\n";
+
+            $content .= "--" . $this->_getBoundary('mixed') . "\r\n";
+
+            if (key_exists('image', $this->_msgContent))     // If inline image found
+            {
+                $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+                $content .= "\r\n";
+                $content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+            }
+
+
+            // $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
+
+
+            // Loop through message content array
+            foreach ($this->_msgContent as $type => $_content )
+            {
+                if ( $type == 'attachment' )
+                {
+                    // loop through all attachments
+                    foreach ( $_content as $_file => $_data )
+                    {
+                        $content .= "--" . $this->_getBoundary('mixed') . "\r\n"
+                        .  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
+                        .  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
+                        .  'Content-Transfer-Encoding: base64' . "\r\n"
+                        .  'Content-Description: ' . $_data['fileName'] ."\r\n";
+
+                        if ( $this->getMD5flag() )
+                        $content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+
+                        $content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
+                    }
+                }
+                // @CHANGE LDR
+                else if ( $type == 'image' )
+                {
+                    // loop through all images
+                    foreach ( $_content as $_image => $_data )
+                    {
+                        $content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
+
+                        $content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
+                        .  'Content-Transfer-Encoding: base64' . "\r\n"
+                        .  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
+                        .  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
+
+                        if ( $this->getMD5flag() )
+                        $content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+
+                        $content .= "\r\n"
+                        . $_data['data'] . "\r\n";
+                    }
+
+                    // always end related and end alternative after inline images
+                    $content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
+                    $content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
+                    $content.= "\r\n";
+                }
+                else
+                {
+                    if (key_exists('image', $this->_msgContent))
+                    {
+                        $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
+                        $content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
+                        $content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+                        $content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
+                        $content.= "\r\n";
+                        $content.= "--" . $this->_getBoundary('related') . "\r\n";
+                    }
+
+                    if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+                    {
+                        $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+                        $content .= "\r\n";
+                            $content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+
+                            $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
+                            $content.= "\r\n". $_content['dataText'] . "\r\n";
+                            $content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+                    }
+
+                    $content .= 'Content-Type: ' . $_content['mimeType'] . '; '
+                    //                             . 'charset="' . $this->getCharSet() . '"';
+                    . 'charset=' . $this->getCharSet() . '';
+
+                    //                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
+                    $content .=  "\r\n";
+                    //                    $content .= 'Content-Transfer-Encoding: ';
+                    //                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
+                    //                    $content .=  "\r\n"
+                    //                             . 'Content-Disposition: inline'  . "\r\n"
+                    //                             . 'Content-Description: ' . $type . ' message' . "\r\n";
+
+                    if ( $this->getMD5flag() )
+                    $content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+
+                    $content .= "\r\n"	. $_content['data'] . "\r\n";
+
+                    if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+                    {
+                        $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
+                    }
+
+                    $content .= "\r\n";
+                }
+            }
+
+            // Close message boundries
+            //            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
+            $content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
+        }
+
+        return $content;
+    }
+
+    /**
+     * File attachments are added to the content array as sub-arrays,
+     * allowing for multiple attachments for each outbound email
+     *
+     * @param string $strContent  File data to attach to message
+     * @param string $strFileName File Name to give to attachment
+     * @param string $strMimeType File Mime Type of attachment
+     * @return void
+     */
+    function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
+    {
+        if ( $strContent )
+        {
+            $strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+
+            $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
+            $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
+            $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
+
+            if ( $this->getMD5flag() )
+            $this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+        }
+    }
+
+
+    // @CHANGE LDR
+
+    /**
+     * Image attachments are added to the content array as sub-arrays,
+     * allowing for multiple images for each outbound email
+     *
+     * @param 	string $strContent  	Image data to attach to message
+     * @param 	string $strImageName 	Image Name to give to attachment
+     * @param 	string $strMimeType 	Image Mime Type of attachment
+     * @param 	string $strImageCid		CID
+     * @return 	void
+     */
+    function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
+    {
+        if ($strContent)
+        {
+            $this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
+            $this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
+            $this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
+            $this->_msgContent['image'][$strImageName]['data']     = $strContent;
+
+            if ( $this->getMD5flag() )
+            $this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+        }
+    }
+    // END @CHANGE LDR
+
+
+    /**
+     * Message Content Sensitivity
+     * Message Sensitivity values:
+     *   - [0] None - default
+     *   - [1] Personal
+     *   - [2] Private
+     *   - [3] Company Confidential
+     *
+     * @param 	integer	$_value		Message Sensitivity
+     * @return 	void
+     */
+    function setSensitivity($_value = 0)
+    {
+        if ( ( is_numeric($_value) ) &&
+        ( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
+        $this->_msgSensitivity = $_value;
+    }
+
+    /**
+     * Returns Message Content Sensitivity string
+     * Message Sensitivity values:
+     *   - [0] None - default
+     *   - [1] Personal
+     *   - [2] Private
+     *   - [3] Company Confidential
+     *
+     * @return 	void
+     */
+    function getSensitivity()
+    {
+        return $this->_arySensitivity[$this->_msgSensitivity];
+    }
+
+    /**
+     * Message Content Priority
+     * Message Priority values:
+     *  - [0] 'Bulk'
+     *  - [1] 'Highest'
+     *  - [2] 'High'
+     *  - [3] 'Normal' - default
+     *  - [4] 'Low'
+     *  - [5] 'Lowest'
+     *
+     * @param 	integer 	$_value 	Message Priority
+     * @return 	void
+     */
+    function setPriority( $_value = 3 )
+    {
+        if ( ( is_numeric($_value) ) &&
+        ( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
+        $this->_msgPriority = $_value;
+    }
+
+    /**
+     * Message Content Priority
+     * Message Priority values:
+     *  - [0] 'Bulk'
+     *  - [1] 'Highest'
+     *  - [2] 'High'
+     *  - [3] 'Normal' - default
+     *  - [4] 'Low'
+     *  - [5] 'Lowest'
+     *
+     * @return string
+     */
+    function getPriority()
+    {
+        return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
+        . 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
+        . 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
+    }
+
+    /**
+     * Set flag which determines whether to calculate message MD5 checksum.
+     *
+     * @param 	string 	$_flag		Message Priority
+     * @return 	void
+     */
+    function setMD5flag($_flag = false)
+    {
+        $this->_smtpMD5 = $_flag;
+    }
+
+    /**
+     * Gets flag which determines whether to calculate message MD5 checksum.
+     *
+     * @return 	boolean 				Message Priority
+     */
+    function getMD5flag()
+    {
+        return $this->_smtpMD5;
+    }
+
+    /**
+     * Message X-Header Content
+     * This is a simple "insert". Whatever is given will be placed
+     * "as is" into the Xheader array.
+     *
+     * @param string $strXdata Message X-Header Content
+     * @return void
+     */
+    function setXheader($strXdata)
+    {
+        if ( $strXdata )
+        $this->_msgXheader[] = $strXdata;
+    }
+
+    /**
+     * Retrieves the Message X-Header Content
+     *
+     * @return string[] $_msgContent Message X-Header Content
+     */
+    function getXheader()
+    {
+        return $this->_msgXheader;
+    }
+
+    /**
+     * Generates Random string for MIME message Boundary
+     *
+     * @return void
+     */
+    function _setBoundary()
+    {
+        $this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
+        $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
+        $this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
+    }
+
+    /**
+     * Retrieves the MIME message Boundary
+     *
+     * @param  string $type				Type of boundary
+     * @return string $_smtpsBoundary 	MIME message Boundary
+     */
+    function _getBoundary($type='mixed')
+    {
+        if ($type == 'mixed') return $this->_smtpsBoundary;
+        else if ($type == 'related') return $this->_smtpsRelatedBoundary;
+        else if ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * This function has been modified as provided by SirSir to allow multiline responses when
-	 * using SMTP Extensions
-	 *
-	 * @param	Handler		$socket			Socket handler
-	 * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
-	 * @return	boolean						True or false
-	 */
-	function server_parse($socket, $response)
-	{
+    /**
+     * This function has been modified as provided by SirSir to allow multiline responses when
+     * using SMTP Extensions
+     *
+     * @param	Handler		$socket			Socket handler
+     * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
+     * @return	boolean						True or false
+     */
+    function server_parse($socket, $response)
+    {
         // phpcs:enable
-		/**
-		 * Returns constructed SELECT Object string or boolean upon failure
-		 * Default value is set at true
-		 */
-		$_retVal = true;
+        /**
+         * Returns constructed SELECT Object string or boolean upon failure
+         * Default value is set at true
+         */
+        $_retVal = true;
 
-		$server_response = '';
+        $server_response = '';
 
         // avoid infinite loop
         $limit=0;
 
-		while (substr($server_response,3,1) != ' ' && $limit<100)
-		{
-			if (! ($server_response = fgets($socket, 256)))
-			{
-				$this->_setErr(121, "Couldn't get mail server response codes");
-				$_retVal = false;
-				break;
-			}
+        while (substr($server_response,3,1) != ' ' && $limit<100)
+        {
+            if (! ($server_response = fgets($socket, 256)))
+            {
+                $this->_setErr(121, "Couldn't get mail server response codes");
+                $_retVal = false;
+                break;
+            }
             $limit++;
-		}
+        }
 
-		if (! (substr($server_response, 0, 3) == $response))
-		{
-			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
-			$_retVal = false;
-		}
+        if (! (substr($server_response, 0, 3) == $response))
+        {
+            $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
+            $_retVal = false;
+        }
 
-		return $_retVal;
-	}
+        return $_retVal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Send str
-	 *
-	 * @param	string		$_strSend		String to send
-	 * @param 	string		$_returnCode	Return code
-	 * @param 	string		$CRLF			CRLF
-	 * @return 	boolean|null						True or false
-	 */
-	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
-	{
+    /**
+     * Send str
+     *
+     * @param	string		$_strSend		String to send
+     * @param 	string		$_returnCode	Return code
+     * @param 	string		$CRLF			CRLF
+     * @return 	boolean|null						True or false
+     */
+    function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
+    {
         // phpcs:enable
-		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
-		fputs($this->socket, $_strSend . $CRLF);
-		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
+        if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
+        fputs($this->socket, $_strSend . $CRLF);
+        if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
 
-		if ( $_returnCode )
-		return $this->server_parse($this->socket, $_returnCode);
-	}
+        if ( $_returnCode )
+        return $this->server_parse($this->socket, $_returnCode);
+    }
 
-	// =============================================================
-	// ** Error handling methods
+    // =============================================================
+    // ** Error handling methods
 
-	/**
-	 * Defines errors codes and messages for Class
-	 *
-	 * @param  int    $_errNum  Error Code Number
-	 * @param  string $_errMsg  Error Message
-	 * @return void
+    /**
+     * Defines errors codes and messages for Class
+     *
+     * @param  int    $_errNum  Error Code Number
+     * @param  string $_errMsg  Error Message
+     * @return void
      */
     function _setErr( $_errNum, $_errMsg )
     {
@@ -1836,25 +1836,25 @@ 
         );
     }
 
-	/**
-	 * Returns errors codes and messages for Class
-	 *
-	 * @return string $_errMsg  Error Message
-	 */
-	function getErrors()
-	{
-		$_errMsg = array();
-
-		if (is_array($this->_smtpsErrors))
-		{
-			foreach ( $this->_smtpsErrors as $_err => $_info )
-			{
-				$_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
-			}
-		}
-
-		return implode("\n", $_errMsg);
-	}
+    /**
+     * Returns errors codes and messages for Class
+     *
+     * @return string $_errMsg  Error Message
+     */
+    function getErrors()
+    {
+        $_errMsg = array();
+
+        if (is_array($this->_smtpsErrors))
+        {
+            foreach ( $this->_smtpsErrors as $_err => $_info )
+            {
+                $_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
+            }
+        }
+
+        return implode("\n", $_errMsg);
+    }
 }
 
 

Spacing +218 added lines, -218 removed lines

@@ -117,10 +117,10 @@ 
 	/**
 	 * Message Sensitivity
 	 */
-	var $_arySensitivity = array ( false,
+	var $_arySensitivity = array(false,
                                   'Personal',
                                   'Private',
-                                  'Company Confidential' );
+                                  'Company Confidential');
 
 	/**
 	 * Message Sensitivity
@@ -131,12 +131,12 @@ 
 	/**
 	 * Message Priority
 	 */
-	var $_aryPriority = array ( 'Bulk',
+	var $_aryPriority = array('Bulk',
                                 'Highest',
                                 'High',
                                 'Normal',
                                 'Low',
-                                'Lowest' );
+                                'Lowest');
 
 	/**
 	 * Content-Transfer-Encoding
@@ -147,13 +147,13 @@ 
 	/**
 	 * Content-Transfer-Encoding
 	 */
-	var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
-                                         '8bit',               // 8-bit coding with line termination characters
-                                         'base64',             // 3 octets encoded into 4 sextets with offset
-                                         'binary',             // Arbitrary binary stream
-                                         'mac-binhex40',       // Macintosh binary to hex encoding
-                                         'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode' );         // UUENCODE encoding
+	var $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
+                                         '8bit', // 8-bit coding with line termination characters
+                                         'base64', // 3 octets encoded into 4 sextets with offset
+                                         'binary', // Arbitrary binary stream
+                                         'mac-binhex40', // Macintosh binary to hex encoding
+                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+                                         'uuencode'); // UUENCODE encoding
 
 	/**
 	 * Content-Transfer-Encoding
@@ -300,7 +300,7 @@ 
      */
 	function setErrorsTo($_strErrorsTo)
 	{
-		if ( $_strErrorsTo )
+		if ($_strErrorsTo)
 		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
 	}
 
@@ -310,11 +310,11 @@ 
      * @param	boolean		$_part		Variant
      * @return	string					Errors to
      */
-	function getErrorsTo($_part = true )
+	function getErrorsTo($_part = true)
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
+		if ($_part === true)
 		$_retValue = $this->_errorsTo;
 		else
 		$_retValue = $this->_errorsTo[$_part];
@@ -328,7 +328,7 @@ 
 	 * @param	boolean		$_vDebug		Value for debug
 	 * @return 	void
 	 */
-	function setDebug($_vDebug = false )
+	function setDebug($_vDebug = false)
 	{
 		$this->_debug = $_vDebug;
 	}
@@ -359,29 +359,29 @@ 
 		// We have to make sure the HOST given is valid
 		// This is done here because '@fsockopen' will not give me this
 		// information if it failes to connect because it can't find the HOST
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
 		// @CHANGE LDR
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
+		if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
 		{
-			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
+			$this->_setErr(99, $host.' is either offline or is an invalid host name.');
 			$_retVal = false;
 		}
 		else
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
-    			preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
-    			$this->getPort(),       // which Port number to use
-    			$this->errno,           // actual system level error
-    			$this->errstr,          // and any text that goes with the error
+    			preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
+    			$this->getPort(), // which Port number to use
+    			$this->errno, // actual system level error
+    			$this->errstr, // and any text that goes with the error
     			$this->_smtpTimeout
 			))  // timeout for reading/writing data over the socket
 			{
@@ -392,14 +392,14 @@ 
 				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($this->socket, "220") )
+				if ($_retVal = $this->server_parse($this->socket, "220"))
 				$_retVal = $this->socket;
 			}
 			// This connection attempt failed.
 			else
 			{
 				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
 			}
@@ -422,18 +422,18 @@ 
 		// Send the RFC2554 specified EHLO.
 		// This improvment as provided by 'SirSir' to
 		// accomodate both SMTP AND ESMTP capable servers
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		if ($usetls) $host='tls://'.$host;
+		if ($usetls) $host = 'tls://'.$host;
 
 		$hosth = $host;
 
-		if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
 		{
 			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
 			$hosth = $this->getFrom('addr');
@@ -442,7 +442,7 @@ 
 			$hosth = preg_replace('/.*@/', '', $hosth);
 		}
 
-		if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
+		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
 		{
 			if ($usetls)
 			{
@@ -493,7 +493,7 @@ 
 				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
 				if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
 				{
-					$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+					$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
 					return $_retVal;
 				}
 			}
@@ -506,12 +506,12 @@ 
 
 			// The error here just means the ID/password combo doesn't work.
 			// There is not a method to determine which is the problem, ID or password
-			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
+			if (!$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235'))
 			$this->_setErr(130, 'Invalid Authentication Credentials.');
 		}
 		else
 		{
-			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+			$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
 		}
 
 		return $_retVal;
@@ -535,10 +535,10 @@ 
 		$_retVal = false;
 
 		// Connect to Server
-		if ( $this->socket = $this->_server_connect() )
+		if ($this->socket = $this->_server_connect())
 		{
 			// If a User ID *and* a password is given, assume Authentication is desired
-			if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
+			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
 			{
 				// Send the RFC2554 specified EHLO.
 				$_retVal = $this->_server_authenticate();
@@ -548,16 +548,16 @@ 
 			else
 			{
 				// Send the RFC821 specified HELO.
-				$host=$this->getHost();
-				$usetls = preg_match('@tls://@i',$host);
+				$host = $this->getHost();
+				$usetls = preg_match('@tls://@i', $host);
 
-				$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-				$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-				$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+				$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
 				$hosth = $host;
 
-				if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
 				{
 					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
 					$hosth = $this->getFrom('addr');
@@ -566,21 +566,21 @@ 
 					$hosth = preg_replace('/.*@/', '', $hosth);
 				}
 
-				$_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
+				$_retVal = $this->socket_send_str('HELO '.$hosth, '250');
 			}
 
 			// Well, did we get to the server?
-			if ( $_retVal )
+			if ($_retVal)
 			{
 				// From this point onward most server response codes should be 250
 				// Specify who the mail is from....
 				// This has to be the raw email address, strip the "name" off
-				$this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+				$this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
 
 				// 'RCPT TO:' must be given a single address, so this has to loop
 				// through the list of addresses, regardless of TO, CC or BCC
 				// and send it out "single file"
-				foreach ( $this->get_RCPT_list() as $_address )
+				foreach ($this->get_RCPT_list() as $_address)
 				{
 				    /* Note:
 				     * BCC email addresses must be listed in the RCPT TO command list,
@@ -596,7 +596,7 @@ 
 					 * mark the last address as "bad" and start the address loop over again.
 					 * If any address fails, the entire message fails.
 					 */
-					$this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
+					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
 				}
 
 				// Tell the server we are ready to start sending data
@@ -606,7 +606,7 @@ 
 
 				// Now we are ready for the message...
 				// Ok, all the ingredients are mixed in let's cook this puppy...
-				$this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
+				$this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
 
 				// Now tell the server we are done and close the socket...
 				fputs($this->socket, 'QUIT');
@@ -656,13 +656,13 @@ 
 		$_retVal = true;
 
 		// if we have a path...
-		if ( ! empty ($_strConfigPath) )
+		if (!empty ($_strConfigPath))
 		{
 			// If the path is not valid, this will NOT generate an error,
 			// it will simply return false.
-			if ( ! @include $_strConfigPath)
+			if (!@include $_strConfigPath)
 			{
-				$this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
+				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
 				$_retVal = false;
 			}
 		}
@@ -672,13 +672,13 @@ 
 		{
 			// Set these properties ONLY if they are set in the php.ini file.
 			// Otherwise the default values will be used.
-			if ( $_host = ini_get('SMTPs') )
+			if ($_host = ini_get('SMTPs'))
 			$this->setHost($_host);
 
-			if ( $_port = ini_get('smtp_port') )
+			if ($_port = ini_get('smtp_port'))
 			$this->setPort($_port);
 
-			if ( $_from = ini_get('sendmail_from') )
+			if ($_from = ini_get('sendmail_from'))
 			$this->setFrom($_from);
 		}
 
@@ -697,8 +697,8 @@ 
 	 */
 	function setTransportType($_type = 0)
 	{
-		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
+		if ((is_numeric($_type)) &&
+		(($_type >= 0) && ($_type <= 3)))
 		$this->_transportType = $_type;
 	}
 
@@ -740,7 +740,7 @@ 
 	 */
 	function setHost($_strHost)
 	{
-		if ( $_strHost )
+		if ($_strHost)
 		$this->_smtpsHost = $_strHost;
 	}
 
@@ -765,8 +765,8 @@ 
 	 */
 	function setPort($_intPort)
 	{
-		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
+		if ((is_numeric($_intPort)) &&
+		(($_intPort >= 1) && ($_intPort <= 65536)))
 		$this->_smtpsPort = $_intPort;
 	}
 
@@ -832,7 +832,7 @@ 
 	 */
 	function setCharSet($_strCharSet)
 	{
-		if ( $_strCharSet )
+		if ($_strCharSet)
 		$this->_smtpsCharSet = $_strCharSet;
 	}
 
@@ -920,7 +920,7 @@ 
 	 */
 	function setFrom($_strFrom)
 	{
-		if ( $_strFrom )
+		if ($_strFrom)
 		$this->_msgFrom = $this->_strip_email($_strFrom);
 	}
 
@@ -934,7 +934,7 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
+		if ($_part === true)
 		$_retValue = $this->_msgFrom;
 		else
 		$_retValue = $this->_msgFrom[$_part];
@@ -950,7 +950,7 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
+	    if ($_strReplyTo)
 	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
 	}
 
@@ -964,7 +964,7 @@ 
 	{
 	    $_retValue = '';
 
-	    if ( $_part === true )
+	    if ($_part === true)
 	        $_retValue = $this->_msgReplyTo;
 	    else
 	        $_retValue = $this->_msgReplyTo[$_part];
@@ -990,13 +990,13 @@ 
 		$aryHost = $this->_msgRecipients;
 
 		// Only run this if we have something
-		if ( !empty ($_addrList ))
+		if (!empty ($_addrList))
 		{
 			// $_addrList can be a STRING or an array
-			if ( is_string($_addrList) )
+			if (is_string($_addrList))
 			{
 				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
+				if (strstr($_addrList, ','))
 				// "explode "list" into an array
 				$_addrList = explode(',', $_addrList);
 
@@ -1006,7 +1006,7 @@ 
 			}
 
 			// take the array of addresses and split them further
-			foreach ( $_addrList as $_strAddr )
+			foreach ($_addrList as $_strAddr)
 			{
 				// Strip off the end '>'
 				$_strAddr = str_replace('>', '', $_strAddr);
@@ -1016,7 +1016,7 @@ 
 				$_tmpaddr = explode('<', $_strAddr);
 
 				// We have a "Real Name" and eMail address
-				if ( count($_tmpaddr) == 2 )
+				if (count($_tmpaddr) == 2)
 				{
 					$_tmpHost = explode('@', $_tmpaddr[1]);
 					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
@@ -1073,10 +1073,10 @@ 
 		$_tmpAry = explode('<', $_strAddr);
 
 		// Do we have a "Real name"
-		if ( count($_tmpAry) == 2 )
+		if (count($_tmpAry) == 2)
 		{
 			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
+			if ($_tmpAry[0])
 			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
 			$_aryEmail['addr'] = $_tmpAry[1];
@@ -1085,10 +1085,10 @@ 
 		$_aryEmail['addr'] = $_tmpAry[0];
 
 		// Pull User Name and Host.tld apart
-		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
+		list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
 
 		// Put the brackets back around the address
-		$_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
+		$_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
 
 		return $_aryEmail;
 	}
@@ -1107,17 +1107,17 @@ 
 		/**
 		 * An array of bares addresses for use with 'RCPT TO:'
 		 */
-		$_RCPT_list=array();
+		$_RCPT_list = array();
 
 		// walk down Recipients array and pull just email addresses
-		foreach ( $this->_msgRecipients as $_host => $_list )
+		foreach ($this->_msgRecipients as $_host => $_list)
 		{
-			foreach ( $_list as $_subList )
+			foreach ($_list as $_subList)
 			{
-				foreach ( $_subList as $_name => $_addr )
+				foreach ($_subList as $_name => $_addr)
 				{
 					// build RCPT list
-					$_RCPT_list[] = $_name . '@' . $_host;
+					$_RCPT_list[] = $_name.'@'.$_host;
 				}
 			}
 		}
@@ -1136,27 +1136,27 @@ 
 	{
         // phpcs:enable
 		// We need to know which address segment to pull
-		if ( $_which )
+		if ($_which)
 		{
 			// Make sure we have addresses to process
-			if ( $this->_msgRecipients )
+			if ($this->_msgRecipients)
 			{
-				$_RCPT_list=array();
+				$_RCPT_list = array();
 				// walk down Recipients array and pull just email addresses
-				foreach ( $this->_msgRecipients as $_host => $_list )
+				foreach ($this->_msgRecipients as $_host => $_list)
 				{
-					if ( $this->_msgRecipients[$_host][$_which] )
+					if ($this->_msgRecipients[$_host][$_which])
 					{
-						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
+						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
 						{
-							if ( $_realName )	// @CHANGE LDR
+							if ($_realName)	// @CHANGE LDR
 							{
-								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+								$_realName = '"'.$_realName.'"';
+								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
 							}
 							else
 							{
-								$_RCPT_list[] = $_addr . '@' . $_host;
+								$_RCPT_list[] = $_addr.'@'.$_host;
 							}
 						}
 					}
@@ -1185,7 +1185,7 @@ 
 	 */
 	function setTO($_addrTo)
 	{
-		if ( $_addrTo )
+		if ($_addrTo)
 		$this->_buildAddrList('to', $_addrTo);
 	}
 
@@ -1207,7 +1207,7 @@ 
 	 */
 	function setCC($_strCC)
 	{
-		if ( $_strCC )
+		if ($_strCC)
 		$this->_buildAddrList('cc', $_strCC);
 	}
 
@@ -1229,7 +1229,7 @@ 
 	 */
 	function setBCC($_strBCC)
 	{
-		if ( $_strBCC )
+		if ($_strBCC)
 		$this->_buildAddrList('bcc', $_strBCC);
 	}
 
@@ -1251,7 +1251,7 @@ 
 	 */
 	function setSubject($_strSubject = '')
 	{
-		if ( $_strSubject )
+		if ($_strSubject)
 		$this->_msgSubject = $_strSubject;
 	}
 
@@ -1274,11 +1274,11 @@ 
 	{
 		global $conf;
 
-		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
-		. 'To: '         . $this->getTO()          . "\r\n";
+		$_header = 'From: '.$this->getFrom('org')."\r\n"
+		. 'To: '.$this->getTO()."\r\n";
 
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		if ($this->getCC())
+		$_header .= 'Cc: '.$this->getCC()."\r\n";
 
 		/* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
@@ -1291,57 +1291,57 @@ 
 		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		$host=dol_getprefix('email');
+		$host = dol_getprefix('email');
 
 		//NOTE: Message-ID should probably contain the username of the user who sent the msg
-		$_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
-		$_header .= 'Date: '       . date("r")               . "\r\n";
+		$_header .= 'Subject: '.$this->getSubject()."\r\n";
+		$_header .= 'Date: '.date("r")."\r\n";
 
 		$trackid = $this->getTrackId();
 		if ($trackid)
 		{
 			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
-			$_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
-			$_header .= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host . "\r\n";
+			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
 		}
 		else
 		{
-			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
+			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
 		}
-		if (! empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
-		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+		if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
+		if ($this->getMoreInHeader())
+		    $_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
 		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
 
-		if ( $this->getSensitivity() )
-		$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		if ($this->getSensitivity())
+		$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
 
-		if ( $this->_msgPriority != 3 )
+		if ($this->_msgPriority != 3)
 		$_header .= $this->getPriority();
 
 
 		// @CHANGE LDR
-		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
-		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		if ($this->getDeliveryReceipt())
+		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
+		if ($this->getErrorsTo())
+		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
+		if ($this->getReplyTo())
+		    $_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
 
-		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
-		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
-		$_header .= 'Mime-Version: 1.0' . "\r\n";
+		$_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
+		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
+		$_header .= 'Mime-Version: 1.0'."\r\n";
 
 
 		return $_header;
@@ -1358,7 +1358,7 @@ 
 	{
 		//if ( $strContent )
 		//{
-		if ( $strType == 'html' )
+		if ($strType == 'html')
 		$strMimeType = 'text/html';
 		else
 		$strMimeType = 'text/plain';
@@ -1370,14 +1370,14 @@ 
 		if ($strType == 'html')
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
 		}
 
 		// Make RFC2045 Compliant
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		$strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		$this->_msgContent[$strType] = array();
 
@@ -1385,7 +1385,7 @@ 
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ( $this->getMD5flag() )
+		if ($this->getMD5flag())
 		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
 		//}
 	}
@@ -1409,49 +1409,49 @@ 
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
+		if ($keyCount === 0)
 		die ("Sorry, no content");
 
 		// If we have ONE, we can use the simple format
-		else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		else if ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
 		{
 			$_msgData = $this->_msgContent;
 			$_msgData = $_msgData[$_types[0]];
 
-			$content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
-			. 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
-			. 'Content-Disposition: inline'  . "\r\n"
-			. 'Content-Description: Message' . "\r\n";
+			$content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
+			. 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
+			. 'Content-Disposition: inline'."\r\n"
+			. 'Content-Description: Message'."\r\n";
 
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			if ($this->getMD5flag())
+			$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
 
 			$content .= "\r\n"
-			.  $_msgData['data'] . "\r\n";
+			.  $_msgData['data']."\r\n";
 		}
 
 		// If we have more than ONE, we use the multi-part format
-		else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		else if ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
 		{
 			// Since this is an actual multi-part message
 			// We need to define a content message Boundary
 			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
 
 			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-			$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
+			$content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
 
 			//                     . "\r\n"
 			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
 			$content .= "Content-Transfer-Encoding: 8bit\r\n";
 			$content .= "\r\n";
 
-			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
+			$content .= "--".$this->_getBoundary('mixed')."\r\n";
 
 			if (key_exists('image', $this->_msgContent))     // If inline image found
 			{
-				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
 				$content .= "\r\n";
-				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 			}
 
 
@@ -1459,93 +1459,93 @@ 
 
 
 			// Loop through message content array
-			foreach ($this->_msgContent as $type => $_content )
+			foreach ($this->_msgContent as $type => $_content)
 			{
-				if ( $type == 'attachment' )
+				if ($type == 'attachment')
 				{
 					// loop through all attachments
-					foreach ( $_content as $_file => $_data )
+					foreach ($_content as $_file => $_data)
 					{
-						$content .= "--" . $this->_getBoundary('mixed') . "\r\n"
-						.  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
+						$content .= "--".$this->_getBoundary('mixed')."\r\n"
+						.  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Description: '.$_data['fileName']."\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
 
-						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
+						$content .= "\r\n".$_data['data']."\r\n\r\n";
 					}
 				}
 				// @CHANGE LDR
-				else if ( $type == 'image' )
+				else if ($type == 'image')
 				{
 					// loop through all images
-					foreach ( $_content as $_image => $_data )
+					foreach ($_content as $_image => $_data)
 					{
-						$content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
+						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
 
-						$content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
+						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-ID: <'.$_data['cid'].'> '."\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
 
 						$content .= "\r\n"
-						. $_data['data'] . "\r\n";
+						. $_data['data']."\r\n";
 					}
 
 					// always end related and end alternative after inline images
-					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
-					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
-					$content.= "\r\n";
+					$content .= "--".$this->_getBoundary('related')."--"."\r\n";
+					$content .= "\r\n"."--".$this->_getBoundary('alternative')."--"."\r\n";
+					$content .= "\r\n";
 				}
 				else
 				{
 					if (key_exists('image', $this->_msgContent))
 					{
-						$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-						$content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
-						$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-						$content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
-						$content.= "\r\n";
-						$content.= "--" . $this->_getBoundary('related') . "\r\n";
+						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
+						$content .= "\r\n";
+						$content .= "--".$this->_getBoundary('related')."\r\n";
 					}
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
 					{
-					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+					    $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
     					$content .= "\r\n";
-	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+	       				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 
-	       				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-	       				$content.= "\r\n". $_content['dataText'] . "\r\n";
-	       				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+	       				$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+	       				$content .= "\r\n".$_content['dataText']."\r\n";
+	       				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 					}
 
-					$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
+					$content .= 'Content-Type: '.$_content['mimeType'].'; '
 					//                             . 'charset="' . $this->getCharSet() . '"';
-					. 'charset=' . $this->getCharSet() . '';
+					. 'charset='.$this->getCharSet().'';
 
 					//                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
-					$content .=  "\r\n";
+					$content .= "\r\n";
 					//                    $content .= 'Content-Transfer-Encoding: ';
 					//                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
 					//                    $content .=  "\r\n"
 					//                             . 'Content-Disposition: inline'  . "\r\n"
 					//                             . 'Content-Description: ' . $type . ' message' . "\r\n";
 
-					if ( $this->getMD5flag() )
-					$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					if ($this->getMD5flag())
+					$content .= 'Content-MD5: '.$_content['md5']."\r\n";
 
-					$content .= "\r\n"	. $_content['data'] . "\r\n";
+					$content .= "\r\n".$_content['data']."\r\n";
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
 					{
-					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
+					    $content .= "--".$this->_getBoundary('alternative')."--"."\r\n";
 					}
 
 					$content .= "\r\n";
@@ -1554,7 +1554,7 @@ 
 
 			// Close message boundries
 			//            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
-			$content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
+			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
 		}
 
 		return $content;
@@ -1571,15 +1571,15 @@ 
 	 */
 	function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
 	{
-		if ( $strContent )
+		if ($strContent)
 		{
-			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 
 			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
+			if ($this->getMD5flag())
 			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
@@ -1606,7 +1606,7 @@ 
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
+			if ($this->getMD5flag())
 			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
@@ -1626,8 +1626,8 @@ 
 	 */
 	function setSensitivity($_value = 0)
 	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 3)))
 		$this->_msgSensitivity = $_value;
 	}
 
@@ -1659,10 +1659,10 @@ 
 	 * @param 	integer 	$_value 	Message Priority
 	 * @return 	void
 	 */
-	function setPriority( $_value = 3 )
+	function setPriority($_value = 3)
 	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 5)))
 		$this->_msgPriority = $_value;
 	}
 
@@ -1680,9 +1680,9 @@ 
 	 */
 	function getPriority()
 	{
-		return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
+		return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
 	}
 
 	/**
@@ -1716,7 +1716,7 @@ 
 	 */
 	function setXheader($strXdata)
 	{
-		if ( $strXdata )
+		if ($strXdata)
 		$this->_msgXheader[] = $strXdata;
 	}
 
@@ -1737,7 +1737,7 @@ 
 	 */
 	function _setBoundary()
 	{
-		$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
+		$this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
 		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
 		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
 	}
@@ -1748,7 +1748,7 @@ 
 	 * @param  string $type				Type of boundary
 	 * @return string $_smtpsBoundary 	MIME message Boundary
 	 */
-	function _getBoundary($type='mixed')
+	function _getBoundary($type = 'mixed')
 	{
 		if ($type == 'mixed') return $this->_smtpsBoundary;
 		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
@@ -1776,11 +1776,11 @@ 
 		$server_response = '';
 
         // avoid infinite loop
-        $limit=0;
+        $limit = 0;
 
-		while (substr($server_response,3,1) != ' ' && $limit<100)
+		while (substr($server_response, 3, 1) != ' ' && $limit < 100)
 		{
-			if (! ($server_response = fgets($socket, 256)))
+			if (!($server_response = fgets($socket, 256)))
 			{
 				$this->_setErr(121, "Couldn't get mail server response codes");
 				$_retVal = false;
@@ -1789,7 +1789,7 @@ 
             $limit++;
 		}
 
-		if (! (substr($server_response, 0, 3) == $response))
+		if (!(substr($server_response, 0, 3) == $response))
 		{
 			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
 			$_retVal = false;
@@ -1807,14 +1807,14 @@ 
 	 * @param 	string		$CRLF			CRLF
 	 * @return 	boolean|null						True or false
 	 */
-	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
+	function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
 	{
         // phpcs:enable
-		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
-		fputs($this->socket, $_strSend . $CRLF);
-		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
+		if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
+		fputs($this->socket, $_strSend.$CRLF);
+		if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
 
-		if ( $_returnCode )
+		if ($_returnCode)
 		return $this->server_parse($this->socket, $_returnCode);
 	}
 
@@ -1828,7 +1828,7 @@ 
 	 * @param  string $_errMsg  Error Message
 	 * @return void
      */
-    function _setErr( $_errNum, $_errMsg )
+    function _setErr($_errNum, $_errMsg)
     {
         $this->_smtpsErrors[] = array(
             'num' => $_errNum,
@@ -1847,9 +1847,9 @@ 
 
 		if (is_array($this->_smtpsErrors))
 		{
-			foreach ( $this->_smtpsErrors as $_err => $_info )
+			foreach ($this->_smtpsErrors as $_err => $_info)
 			{
-				$_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
+				$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
 			}
 		}
 

Braces +188 added lines, -125 removed lines

@@ -300,8 +300,9 @@ 
      */
 	function setErrorsTo($_strErrorsTo)
 	{
-		if ( $_strErrorsTo )
-		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		if ( $_strErrorsTo ) {
+				$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		}
 	}
 
     /**
@@ -314,10 +315,11 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
-		$_retValue = $this->_errorsTo;
-		else
-		$_retValue = $this->_errorsTo[$_part];
+		if ( $_part === true ) {
+				$_retValue = $this->_errorsTo;
+		} else {
+				$_retValue = $this->_errorsTo[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -373,8 +375,7 @@ 
 		{
 			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
 			$_retVal = false;
-		}
-		else
+		} else
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
@@ -383,23 +384,28 @@ 
     			$this->errno,           // actual system level error
     			$this->errstr,          // and any text that goes with the error
     			$this->_smtpTimeout
-			))  // timeout for reading/writing data over the socket
+			)) {
+			    // timeout for reading/writing data over the socket
 			{
 				// Fix from PHP SMTP class by 'Chris Ryan'
 				// Sometimes the SMTP server takes a little longer to respond
 				// so we will give it a longer timeout for the first read
 				// Windows still does not have support for this timeout function
 				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+			}
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($this->socket, "220") )
-				$_retVal = $this->socket;
+				if ( $_retVal = $this->server_parse($this->socket, "220") ) {
+								$_retVal = $this->socket;
+				}
 			}
 			// This connection attempt failed.
 			else
 			{
 				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				if (empty($this->errstr)) {
+				    $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				}
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
 			}
@@ -429,7 +435,9 @@ 
 		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
 		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
 
-		if ($usetls) $host='tls://'.$host;
+		if ($usetls) {
+		    $host='tls://'.$host;
+		}
 
 		$hosth = $host;
 
@@ -506,10 +514,10 @@ 
 
 			// The error here just means the ID/password combo doesn't work.
 			// There is not a method to determine which is the problem, ID or password
-			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
-			$this->_setErr(130, 'Invalid Authentication Credentials.');
-		}
-		else
+			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') ) {
+						$this->_setErr(130, 'Invalid Authentication Credentials.');
+			}
+		} else
 		{
 			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
 		}
@@ -672,14 +680,17 @@ 
 		{
 			// Set these properties ONLY if they are set in the php.ini file.
 			// Otherwise the default values will be used.
-			if ( $_host = ini_get('SMTPs') )
-			$this->setHost($_host);
+			if ( $_host = ini_get('SMTPs') ) {
+						$this->setHost($_host);
+			}
 
-			if ( $_port = ini_get('smtp_port') )
-			$this->setPort($_port);
+			if ( $_port = ini_get('smtp_port') ) {
+						$this->setPort($_port);
+			}
 
-			if ( $_from = ini_get('sendmail_from') )
-			$this->setFrom($_from);
+			if ( $_from = ini_get('sendmail_from') ) {
+						$this->setFrom($_from);
+			}
 		}
 
 		// Send back what we have
@@ -698,8 +709,9 @@ 
 	function setTransportType($_type = 0)
 	{
 		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
-		$this->_transportType = $_type;
+		( ( $_type >= 0 ) && ( $_type <= 3 ) ) ) {
+				$this->_transportType = $_type;
+		}
 	}
 
 	/**
@@ -740,8 +752,9 @@ 
 	 */
 	function setHost($_strHost)
 	{
-		if ( $_strHost )
-		$this->_smtpsHost = $_strHost;
+		if ( $_strHost ) {
+				$this->_smtpsHost = $_strHost;
+		}
 	}
 
 	/**
@@ -766,8 +779,9 @@ 
 	function setPort($_intPort)
 	{
 		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
-		$this->_smtpsPort = $_intPort;
+		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) ) {
+				$this->_smtpsPort = $_intPort;
+		}
 	}
 
 	/**
@@ -832,8 +846,9 @@ 
 	 */
 	function setCharSet($_strCharSet)
 	{
-		if ( $_strCharSet )
-		$this->_smtpsCharSet = $_strCharSet;
+		if ( $_strCharSet ) {
+				$this->_smtpsCharSet = $_strCharSet;
+		}
 	}
 
 	/**
@@ -863,8 +878,9 @@ 
 	 */
 	function setTransEncode($_strTransEncode)
 	{
-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncode = $_strTransEncode;
+		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) {
+				$this->_smtpsTransEncode = $_strTransEncode;
+		}
 	}
 
 	/**
@@ -895,8 +911,9 @@ 
 	 */
 	function setTransEncodeType($_strTransEncodeType)
 	{
-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes)) {
+				$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		}
 	}
 
 	/**
@@ -920,8 +937,9 @@ 
 	 */
 	function setFrom($_strFrom)
 	{
-		if ( $_strFrom )
-		$this->_msgFrom = $this->_strip_email($_strFrom);
+		if ( $_strFrom ) {
+				$this->_msgFrom = $this->_strip_email($_strFrom);
+		}
 	}
 
 	/**
@@ -934,10 +952,11 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
-		$_retValue = $this->_msgFrom;
-		else
-		$_retValue = $this->_msgFrom[$_part];
+		if ( $_part === true ) {
+				$_retValue = $this->_msgFrom;
+		} else {
+				$_retValue = $this->_msgFrom[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -950,8 +969,9 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
-	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	    if ( $_strReplyTo ) {
+	    	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	    }
 	}
 
 	/**
@@ -964,10 +984,11 @@ 
 	{
 	    $_retValue = '';
 
-	    if ( $_part === true )
-	        $_retValue = $this->_msgReplyTo;
-	    else
-	        $_retValue = $this->_msgReplyTo[$_part];
+	    if ( $_part === true ) {
+	    	        $_retValue = $this->_msgReplyTo;
+	    } else {
+	    	        $_retValue = $this->_msgReplyTo[$_part];
+	    }
 
 	    return $_retValue;
 	}
@@ -996,13 +1017,15 @@ 
 			if ( is_string($_addrList) )
 			{
 				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
-				// "explode "list" into an array
+				if ( strstr($_addrList, ',') ) {
+								// "explode "list" into an array
 				$_addrList = explode(',', $_addrList);
+				}
 
 				// Stick it in an array
-				else
-				$_addrList = array($_addrList);
+				else {
+								$_addrList = array($_addrList);
+				}
 			}
 
 			// take the array of addresses and split them further
@@ -1076,13 +1099,14 @@ 
 		if ( count($_tmpAry) == 2 )
 		{
 			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
-			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			if ( $_tmpAry[0]) {
+						$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			}
 
 			$_aryEmail['addr'] = $_tmpAry[1];
+		} else {
+				$_aryEmail['addr'] = $_tmpAry[0];
 		}
-		else
-		$_aryEmail['addr'] = $_tmpAry[0];
 
 		// Pull User Name and Host.tld apart
 		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
@@ -1149,12 +1173,13 @@ 
 					{
 						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
 						{
-							if ( $_realName )	// @CHANGE LDR
+							if ( $_realName ) {
+							    // @CHANGE LDR
 							{
 								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
 							}
-							else
+								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+							} else
 							{
 								$_RCPT_list[] = $_addr . '@' . $_host;
 							}
@@ -1163,14 +1188,12 @@ 
 				}
 
 				return implode(', ', $_RCPT_list);
-			}
-			else
+			} else
 			{
 				$this->_setErr(101, 'No eMail Address for message to be sent to.');
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			$this->_setErr(102, 'eMail type not defined.');
 			return false;
@@ -1185,8 +1208,9 @@ 
 	 */
 	function setTO($_addrTo)
 	{
-		if ( $_addrTo )
-		$this->_buildAddrList('to', $_addrTo);
+		if ( $_addrTo ) {
+				$this->_buildAddrList('to', $_addrTo);
+		}
 	}
 
 	/**
@@ -1207,8 +1231,9 @@ 
 	 */
 	function setCC($_strCC)
 	{
-		if ( $_strCC )
-		$this->_buildAddrList('cc', $_strCC);
+		if ( $_strCC ) {
+				$this->_buildAddrList('cc', $_strCC);
+		}
 	}
 
 	/**
@@ -1229,8 +1254,9 @@ 
 	 */
 	function setBCC($_strBCC)
 	{
-		if ( $_strBCC )
-		$this->_buildAddrList('bcc', $_strBCC);
+		if ( $_strBCC ) {
+				$this->_buildAddrList('bcc', $_strBCC);
+		}
 	}
 
 	/**
@@ -1251,8 +1277,9 @@ 
 	 */
 	function setSubject($_strSubject = '')
 	{
-		if ( $_strSubject )
-		$this->_msgSubject = $_strSubject;
+		if ( $_strSubject ) {
+				$this->_msgSubject = $_strSubject;
+		}
 	}
 
 	/**
@@ -1277,8 +1304,9 @@ 
 		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
 		. 'To: '         . $this->getTO()          . "\r\n";
 
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		if ( $this->getCC() ) {
+				$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		}
 
 		/* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
@@ -1311,33 +1339,41 @@ 
 			$_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
 			$_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
 			$_header .= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host . "\r\n";
-		}
-		else
+		} else
 		{
 			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
 		}
-		if (! empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
-		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+		if (! empty($_SERVER['REMOTE_ADDR'])) {
+		    $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
+		}
+		if ( $this->getMoreInHeader() ) {
+				    $_header .= $this->getMoreInHeader();
+		}
+		// Value must include the "\r\n";
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
 		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
 
-		if ( $this->getSensitivity() )
-		$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		if ( $this->getSensitivity() ) {
+				$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		}
 
-		if ( $this->_msgPriority != 3 )
-		$_header .= $this->getPriority();
+		if ( $this->_msgPriority != 3 ) {
+				$_header .= $this->getPriority();
+		}
 
 
 		// @CHANGE LDR
-		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
-		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		if ( $this->getDeliveryReceipt() ) {
+				    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
+		}
+		if ( $this->getErrorsTo() ) {
+				    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
+		}
+		if ( $this->getReplyTo() ) {
+				    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		}
 
 		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
 		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
@@ -1358,10 +1394,11 @@ 
 	{
 		//if ( $strContent )
 		//{
-		if ( $strType == 'html' )
-		$strMimeType = 'text/html';
-		else
-		$strMimeType = 'text/plain';
+		if ( $strType == 'html' ) {
+				$strMimeType = 'text/html';
+		} else {
+				$strMimeType = 'text/plain';
+		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
@@ -1385,8 +1422,9 @@ 
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ( $this->getMD5flag() )
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		if ( $this->getMD5flag() ) {
+				$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		}
 		//}
 	}
 
@@ -1409,8 +1447,9 @@ 
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
-		die ("Sorry, no content");
+		if( $keyCount === 0 ) {
+				die ("Sorry, no content");
+		}
 
 		// If we have ONE, we can use the simple format
 		else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
@@ -1423,8 +1462,9 @@ 
 			. 'Content-Disposition: inline'  . "\r\n"
 			. 'Content-Description: Message' . "\r\n";
 
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			if ( $this->getMD5flag() ) {
+						$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			}
 
 			$content .= "\r\n"
 			.  $_msgData['data'] . "\r\n";
@@ -1447,9 +1487,11 @@ 
 
 			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
 
-			if (key_exists('image', $this->_msgContent))     // If inline image found
+			if (key_exists('image', $this->_msgContent)) {
+			    // If inline image found
 			{
 				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+			}
 				$content .= "\r\n";
 				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 			}
@@ -1472,8 +1514,9 @@ 
 						.  'Content-Transfer-Encoding: base64' . "\r\n"
 						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ( $this->getMD5flag() ) {
+												$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						}
 
 						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
 					}
@@ -1491,8 +1534,9 @@ 
 						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
 						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ( $this->getMD5flag() ) {
+												$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						}
 
 						$content .= "\r\n"
 						. $_data['data'] . "\r\n";
@@ -1502,8 +1546,7 @@ 
 					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
 					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
 					$content.= "\r\n";
-				}
-				else
+				} else
 				{
 					if (key_exists('image', $this->_msgContent))
 					{
@@ -1515,9 +1558,11 @@ 
 						$content.= "--" . $this->_getBoundary('related') . "\r\n";
 					}
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+					    // Add plain text message part before html part
 					{
 					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+					}
     					$content .= "\r\n";
 	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 
@@ -1538,15 +1583,18 @@ 
 					//                             . 'Content-Disposition: inline'  . "\r\n"
 					//                             . 'Content-Description: ' . $type . ' message' . "\r\n";
 
-					if ( $this->getMD5flag() )
-					$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					if ( $this->getMD5flag() ) {
+										$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					}
 
 					$content .= "\r\n"	. $_content['data'] . "\r\n";
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+					    // Add plain text message part after html part
 					{
 					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
 					}
+					}
 
 					$content .= "\r\n";
 				}
@@ -1579,8 +1627,9 @@ 
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			if ( $this->getMD5flag() ) {
+						$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 
@@ -1606,8 +1655,9 @@ 
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			if ( $this->getMD5flag() ) {
+						$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 	// END @CHANGE LDR
@@ -1627,8 +1677,9 @@ 
 	function setSensitivity($_value = 0)
 	{
 		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
-		$this->_msgSensitivity = $_value;
+		( ( $_value >= 0 ) && ( $_value <= 3 ) ) ) {
+				$this->_msgSensitivity = $_value;
+		}
 	}
 
 	/**
@@ -1662,8 +1713,9 @@ 
 	function setPriority( $_value = 3 )
 	{
 		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
-		$this->_msgPriority = $_value;
+		( ( $_value >= 0 ) && ( $_value <= 5 ) ) ) {
+				$this->_msgPriority = $_value;
+		}
 	}
 
 	/**
@@ -1716,8 +1768,9 @@ 
 	 */
 	function setXheader($strXdata)
 	{
-		if ( $strXdata )
-		$this->_msgXheader[] = $strXdata;
+		if ( $strXdata ) {
+				$this->_msgXheader[] = $strXdata;
+		}
 	}
 
 	/**
@@ -1750,9 +1803,13 @@ 
 	 */
 	function _getBoundary($type='mixed')
 	{
-		if ($type == 'mixed') return $this->_smtpsBoundary;
-		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
-		else if ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+		if ($type == 'mixed') {
+		    return $this->_smtpsBoundary;
+		} else if ($type == 'related') {
+		    return $this->_smtpsRelatedBoundary;
+		} else if ($type == 'alternative') {
+		    return $this->_smtpsAlternativeBoundary;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1810,12 +1867,18 @@ 
 	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
 	{
         // phpcs:enable
-		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
+		if ($this->_debug) {
+		    $this->log.=$_strSend;
+		}
+		// @CHANGE LDR for log
 		fputs($this->socket, $_strSend . $CRLF);
-		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
+		if ($this->_debug) {
+		    $this->log.=' ('.$_returnCode.')' . $CRLF;
+		}
 
-		if ( $_returnCode )
-		return $this->server_parse($this->socket, $_returnCode);
+		if ( $_returnCode ) {
+				return $this->server_parse($this->socket, $_returnCode);
+		}
 	}
 
 	// =============================================================

dolibarr/htdocs/core/class/commonobjectline.class.php

Indentation +47 added lines, -47 removed lines

@@ -29,25 +29,25 @@ 
  */
 abstract class CommonObjectLine extends CommonObject
 {
-	/**
-	 * Id of the line
-	 * @var int
-	 */
-	public $id;
+    /**
+     * Id of the line
+     * @var int
+     */
+    public $id;
 
-	/**
-	 * Id of the line
-	 * @var int
-	 * @deprecated Try to use id property as possible (even if field into database is still rowid)
-	 * @see id
-	 */
-	public $rowid;
+    /**
+     * Id of the line
+     * @var int
+     * @deprecated Try to use id property as possible (even if field into database is still rowid)
+     * @see id
+     */
+    public $rowid;
 
-	/**
-	 * Product/service unit code ('km', 'm', 'p', ...)
-	 * @var string
-	 */
-	public $fk_unit;
+    /**
+     * Product/service unit code ('km', 'm', 'p', ...)
+     * @var string
+     */
+    public $fk_unit;
 
 
     /**
@@ -57,40 +57,40 @@ 
      * 	@param	string $type Label type (long or short)
      *	@return	string|int <0 if ko, label if ok
      */
-	public function getLabelOfUnit($type='long')
-	{
-		global $langs;
+    public function getLabelOfUnit($type='long')
+    {
+        global $langs;
 
-		if (!$this->fk_unit) {
-			return '';
-		}
+        if (!$this->fk_unit) {
+            return '';
+        }
 
-		$langs->load('products');
+        $langs->load('products');
 
-		$label_type = 'label';
+        $label_type = 'label';
 
-		if ($type == 'short')
-		{
-			$label_type = 'short_label';
-		}
+        if ($type == 'short')
+        {
+            $label_type = 'short_label';
+        }
 
-		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
-		$resql = $this->db->query($sql);
-		if($resql && $this->db->num_rows($resql) > 0)
-		{
-			$res = $this->db->fetch_array($resql);
-			$label = $res[$label_type];
-			$this->db->free($resql);
-			return $label;
-		}
-		else
-		{
-			$this->error=$this->db->error().' sql='.$sql;
-			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-	// Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
+        $sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+        $resql = $this->db->query($sql);
+        if($resql && $this->db->num_rows($resql) > 0)
+        {
+            $res = $this->db->fetch_array($resql);
+            $label = $res[$label_type];
+            $this->db->free($resql);
+            return $label;
+        }
+        else
+        {
+            $this->error=$this->db->error().' sql='.$sql;
+            dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+    // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
 
-	// For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
+    // For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
 }

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
      * 	@param	string $type Label type (long or short)
      *	@return	string|int <0 if ko, label if ok
      */
-	public function getLabelOfUnit($type='long')
+	public function getLabelOfUnit($type = 'long')
 	{
 		global $langs;
 
@@ -76,7 +76,7 @@ 
 
 		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
 		$resql = $this->db->query($sql);
-		if($resql && $this->db->num_rows($resql) > 0)
+		if ($resql && $this->db->num_rows($resql) > 0)
 		{
 			$res = $this->db->fetch_array($resql);
 			$label = $res[$label_type];
@@ -85,7 +85,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
 		}

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
 			$label = $res[$label_type];
 			$this->db->free($resql);
 			return $label;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);

dolibarr/htdocs/core/class/fiscalyear.class.php

Indentation +380 added lines, -380 removed lines

@@ -28,384 +28,384 @@
  */
 class Fiscalyear extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='fiscalyear';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='accounting_fiscalyear';
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	public $table_element_line = '';
-
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element = '';
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var string fiscal year label
-	 */
-	public $label;
-
-	public $date_start;
-	public $date_end;
-	public $datec;
-	public $statut;		// 0=open, 1=closed
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $statuts=array();
-	public $statuts_short=array();
-
-	/**
-	 * Constructor
-	 *
-	 * @param	DoliDB		$db		Database handler
-	 */
-	function __construct(DoliDB $db)
-	{
-		global $langs;
-
-		$this->db = $db;
-
-		$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
-		$this->statuts = array(0 => 'Opened', 1 => 'Closed');
-	}
-
-	/**
-	 *	Create object in database
-	 *
-	 *	@param		User	$user   User making creation
-	 *	@return 	int				<0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf;
-
-		$error = 0;
-
-		$now=dol_now();
-
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
-		$sql.= "label";
-		$sql.= ", date_start";
-		$sql.= ", date_end";
-		$sql.= ", statut";
-		$sql.= ", entity";
-		$sql.= ", datec";
-		$sql.= ", fk_user_author";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->label)."'";
-		$sql.= ", '".$this->db->idate($this->date_start)."'";
-		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", 0";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ". $user->id;
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
-
-			$result=$this->update($user);
-			if ($result > 0)
-			{
-				$this->db->commit();
-				return $this->id;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->db->rollback();
-				return $result;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror()." sql=".$sql;
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Update record
-	 *
-	 *	@param	User	$user		User making update
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function update($user)
-	{
-		global $langs;
-
-		// Check parameters
-		if (empty($this->date_start) && empty($this->date_end))
-		{
-			$this->error='ErrorBadParameter';
-			return -1;
-		}
-
-		$this->db->begin();
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql .= " SET label = '".$this->db->escape($this->label)."'";
-		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
-		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", statut = '".$this->db->escape($this->statut?$this->statut:0)."'";
-		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
-		$sql .= ", fk_user_modif = " . $user->id;
-		$sql .= " WHERE rowid = ".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog($this->error, LOG_ERR);
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
-	function fetch($id)
-	{
-		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql.= " WHERE rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ( $result )
-		{
-			$obj = $this->db->fetch_object($result);
-
-			$this->id			= $obj->rowid;
-			$this->ref			= $obj->rowid;
-			$this->date_start	= $this->db->jdate($obj->date_start);
-			$this->date_end		= $this->db->jdate($obj->date_end);
-			$this->label		= $obj->label;
-			$this->statut	    = $obj->statut;
-
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-   /**
-	*	Delete record
-	*
-	*	@param	int		$id		Id of record to delete
-	*	@return	int				<0 if KO, >0 if OK
-	*/
-	function delete($id)
-	{
-		$this->db->begin();
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".$id;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Give a label from a status
-	 *
-	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 * @return  string   		   	Label
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->statut,$mode);
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Give a label from a status
-	 *
-	 *  @param	int		$statut     Id status
-	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *  @return string      		Label
-	 */
-	function LibStatut($statut,$mode=0)
-	{
-		// phpcs:enable
-		global $langs;
-
-		if ($mode == 0)
-		{
-			return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 1)
-		{
-			return $langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-		}
-	}
-
-	/**
-	 * Information on record
-	 *
-	 * @param	int		$id      Id of record
-	 * @return	void
-	 */
-	function info($id)
-	{
-		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
-		$sql.= ' fy.tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
-		$sql.= ' WHERE fy.rowid = '.$id;
-
-		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
-		$result = $this->db->query($sql);
-
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif)
-				{
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->tms);
-			}
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 *  Return the number of entries by fiscal year
-	 *
-	 *	@param	int		$datestart	Date start to scan
-	 *	@param	int		$dateend	Date end to scan
-	 *	@return	string				Number of entries
-	 */
-	function getAccountancyEntriesByFiscalYear($datestart, $dateend)
-	{
-		global $conf;
-
-		$sql = "SELECT count(DISTINCT piece_num) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
-
-		return $nb;
-	}
-
-	/**
-	 *  Return the number of movements by fiscal year
-	 *
-	 *	@param	int		$datestart	Date start to scan
-	 *	@param	int		$dateend	Date end to scan
-	 *	@return	string				Number of movements
-	 */
-	function getAccountancyMovementsByFiscalYear($datestart, $dateend)
-	{
-		global $conf;
-
-		$sql = "SELECT count(rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
-
-		return $nb;
-	}
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='fiscalyear';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='accounting_fiscalyear';
+
+    /**
+     * @var int    Name of subtable line
+     */
+    public $table_element_line = '';
+
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element = '';
+
+    /**
+     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     * @var int
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var string fiscal year label
+     */
+    public $label;
+
+    public $date_start;
+    public $date_end;
+    public $datec;
+    public $statut;		// 0=open, 1=closed
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $statuts=array();
+    public $statuts_short=array();
+
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+    function __construct(DoliDB $db)
+    {
+        global $langs;
+
+        $this->db = $db;
+
+        $this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
+        $this->statuts = array(0 => 'Opened', 1 => 'Closed');
+    }
+
+    /**
+     *	Create object in database
+     *
+     *	@param		User	$user   User making creation
+     *	@return 	int				<0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf;
+
+        $error = 0;
+
+        $now=dol_now();
+
+        $this->db->begin();
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
+        $sql.= "label";
+        $sql.= ", date_start";
+        $sql.= ", date_end";
+        $sql.= ", statut";
+        $sql.= ", entity";
+        $sql.= ", datec";
+        $sql.= ", fk_user_author";
+        $sql.= ") VALUES (";
+        $sql.= " '".$this->db->escape($this->label)."'";
+        $sql.= ", '".$this->db->idate($this->date_start)."'";
+        $sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
+        $sql.= ", 0";
+        $sql.= ", ".$conf->entity;
+        $sql.= ", '".$this->db->idate($now)."'";
+        $sql.= ", ". $user->id;
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
+
+            $result=$this->update($user);
+            if ($result > 0)
+            {
+                $this->db->commit();
+                return $this->id;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->db->rollback();
+                return $result;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror()." sql=".$sql;
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *	Update record
+     *
+     *	@param	User	$user		User making update
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function update($user)
+    {
+        global $langs;
+
+        // Check parameters
+        if (empty($this->date_start) && empty($this->date_end))
+        {
+            $this->error='ErrorBadParameter';
+            return -1;
+        }
+
+        $this->db->begin();
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
+        $sql .= " SET label = '".$this->db->escape($this->label)."'";
+        $sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
+        $sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= ", statut = '".$this->db->escape($this->statut?$this->statut:0)."'";
+        $sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+        $sql .= ", fk_user_modif = " . $user->id;
+        $sql .= " WHERE rowid = ".$this->id;
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog($this->error, LOG_ERR);
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Load an object from database
+     *
+     * @param	int		$id		Id of record to load
+     * @return	int				<0 if KO, >0 if OK
+     */
+    function fetch($id)
+    {
+        $sql = "SELECT rowid, label, date_start, date_end, statut";
+        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+        $sql.= " WHERE rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ( $result )
+        {
+            $obj = $this->db->fetch_object($result);
+
+            $this->id			= $obj->rowid;
+            $this->ref			= $obj->rowid;
+            $this->date_start	= $this->db->jdate($obj->date_start);
+            $this->date_end		= $this->db->jdate($obj->date_end);
+            $this->label		= $obj->label;
+            $this->statut	    = $obj->statut;
+
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *	Delete record
+     *
+     *	@param	int		$id		Id of record to delete
+     *	@return	int				<0 if KO, >0 if OK
+     */
+    function delete($id)
+    {
+        $this->db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".$id;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Give a label from a status
+     *
+     * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     * @return  string   		   	Label
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->statut,$mode);
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Give a label from a status
+     *
+     *  @param	int		$statut     Id status
+     *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *  @return string      		Label
+     */
+    function LibStatut($statut,$mode=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        if ($mode == 0)
+        {
+            return $langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 1)
+        {
+            return $langs->trans($this->statuts_short[$statut]);
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+            elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+            elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+            elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+            elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+        }
+    }
+
+    /**
+     * Information on record
+     *
+     * @param	int		$id      Id of record
+     * @return	void
+     */
+    function info($id)
+    {
+        $sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
+        $sql.= ' fy.tms';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
+        $sql.= ' WHERE fy.rowid = '.$id;
+
+        dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
+        $result = $this->db->query($sql);
+
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $this->id = $obj->rowid;
+                if ($obj->fk_user_author)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation = $cuser;
+                }
+                if ($obj->fk_user_modif)
+                {
+                    $muser = new User($this->db);
+                    $muser->fetch($obj->fk_user_modif);
+                    $this->user_modification = $muser;
+                }
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->tms);
+            }
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *  Return the number of entries by fiscal year
+     *
+     *	@param	int		$datestart	Date start to scan
+     *	@param	int		$dateend	Date end to scan
+     *	@return	string				Number of entries
+     */
+    function getAccountancyEntriesByFiscalYear($datestart, $dateend)
+    {
+        global $conf;
+
+        $sql = "SELECT count(DISTINCT piece_num) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+        $sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $nb = $obj->nb;
+        }
+        else dol_print_error($this->db);
+
+        return $nb;
+    }
+
+    /**
+     *  Return the number of movements by fiscal year
+     *
+     *	@param	int		$datestart	Date start to scan
+     *	@param	int		$dateend	Date end to scan
+     *	@return	string				Number of movements
+     */
+    function getAccountancyMovementsByFiscalYear($datestart, $dateend)
+    {
+        global $conf;
+
+        $sql = "SELECT count(rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+        $sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $nb = $obj->nb;
+        }
+        else dol_print_error($this->db);
+
+        return $nb;
+    }
 }

Spacing +60 added lines, -60 removed lines

@@ -21,7 +21,7 @@ 
  *		\brief      File of class to manage fiscal years
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * Class to manage fiscal year
@@ -31,12 +31,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='fiscalyear';
+	public $element = 'fiscalyear';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='accounting_fiscalyear';
+	public $table_element = 'accounting_fiscalyear';
 
 	/**
 	 * @var int    Name of subtable line
@@ -67,15 +67,15 @@ 
 	public $date_start;
 	public $date_end;
 	public $datec;
-	public $statut;		// 0=open, 1=closed
+	public $statut; // 0=open, 1=closed
 
 	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-	public $statuts=array();
-	public $statuts_short=array();
+	public $statuts = array();
+	public $statuts_short = array();
 
 	/**
 	 * Constructor
@@ -104,27 +104,27 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
-		$sql.= "label";
-		$sql.= ", date_start";
-		$sql.= ", date_end";
-		$sql.= ", statut";
-		$sql.= ", entity";
-		$sql.= ", datec";
-		$sql.= ", fk_user_author";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->label)."'";
-		$sql.= ", '".$this->db->idate($this->date_start)."'";
-		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", 0";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ". $user->id;
-		$sql.= ")";
+		$sql .= "label";
+		$sql .= ", date_start";
+		$sql .= ", date_end";
+		$sql .= ", statut";
+		$sql .= ", entity";
+		$sql .= ", datec";
+		$sql .= ", fk_user_author";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->idate($this->date_start)."'";
+		$sql .= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", 0";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -132,7 +132,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
 
-			$result=$this->update($user);
+			$result = $this->update($user);
 			if ($result > 0)
 			{
 				$this->db->commit();
@@ -140,14 +140,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror()." sql=".$sql;
+			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
 		}
@@ -166,7 +166,7 @@ 
 		// Check parameters
 		if (empty($this->date_start) && empty($this->date_end))
 		{
-			$this->error='ErrorBadParameter';
+			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
 
@@ -176,9 +176,9 @@ 
 		$sql .= " SET label = '".$this->db->escape($this->label)."'";
 		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
 		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", statut = '".$this->db->escape($this->statut?$this->statut:0)."'";
-		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
-		$sql .= ", fk_user_modif = " . $user->id;
+		$sql .= ", statut = '".$this->db->escape($this->statut ? $this->statut : 0)."'";
+		$sql .= ", datec = ".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", fk_user_modif = ".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -190,7 +190,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
@@ -206,27 +206,27 @@ 
 	function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql.= " WHERE rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql .= " WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
 			$obj = $this->db->fetch_object($result);
 
-			$this->id			= $obj->rowid;
-			$this->ref			= $obj->rowid;
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
 			$this->date_start	= $this->db->jdate($obj->date_start);
-			$this->date_end		= $this->db->jdate($obj->date_end);
-			$this->label		= $obj->label;
+			$this->date_end = $this->db->jdate($obj->date_end);
+			$this->label = $obj->label;
 			$this->statut	    = $obj->statut;
 
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -252,7 +252,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -264,9 +264,9 @@ 
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -277,7 +277,7 @@ 
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -292,23 +292,23 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			elseif ($statut == 1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts_short[$statut]);
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			elseif ($statut == 1 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			elseif ($statut == 1 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts[$statut]);
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			elseif ($statut == 1 && !empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
 		}
 	}
 
@@ -321,9 +321,9 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
-		$sql.= ' fy.tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
-		$sql.= ' WHERE fy.rowid = '.$id;
+		$sql .= ' fy.tms';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
+		$sql .= ' WHERE fy.rowid = '.$id;
 
 		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -369,10 +369,10 @@ 
 		global $conf;
 
 		$sql = "SELECT count(DISTINCT piece_num) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+		$sql .= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -395,10 +395,10 @@ 
 		global $conf;
 
 		$sql = "SELECT count(rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+		$sql .= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);

Braces +35 added lines, -32 removed lines

@@ -137,15 +137,13 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
@@ -187,8 +185,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
@@ -223,8 +220,7 @@ 
 			$this->statut	    = $obj->statut;
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -249,8 +245,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -285,30 +280,37 @@ 
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 3)
+			if ($statut==0) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+		} elseif ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
-		}
-		elseif ($mode == 4)
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			} elseif ($statut==1 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			} elseif ($statut==1 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			}
+		} elseif ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+			    return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			} elseif ($statut==1 && ! empty($this->statuts_short[$statut])) {
+			    return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			}
 		}
 	}
 
@@ -350,8 +352,7 @@ 
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -377,8 +378,9 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		return $nb;
 	}
@@ -403,8 +405,9 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		return $nb;
 	}

dolibarr/htdocs/core/class/ctypent.class.php

Indentation +181 added lines, -181 removed lines

@@ -27,33 +27,33 @@ 
  */
 class Ctypent // extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	//var $element='ctypent';			//!< Id that identify managed objects
-	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
+    //var $element='ctypent';			//!< Id that identify managed objects
+    //var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	public $code;
-	public $libelle;
-	public $active;
-	public $module;
+    public $code;
+    public $libelle;
+    public $active;
+    public $module;
 
 
 
@@ -78,83 +78,83 @@ 
      */
     function create($user, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
+        // Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+        if (isset($this->id)) $this->id=trim($this->id);
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
+        if (isset($this->active)) $this->active=trim($this->active);
+        if (isset($this->module)) $this->module=trim($this->module);
 
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
-		$sql.= "id,";
-		$sql.= "code,";
-		$sql.= "libelle,";
-		$sql.= "active,";
-		$sql.= "module";
+        $sql.= "id,";
+        $sql.= "code,";
+        $sql.= "libelle,";
+        $sql.= "active,";
+        $sql.= "module";
 
 
         $sql.= ") VALUES (";
 
-		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
-		$sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
+        $sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
+        $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
+        $sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
+        $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
+        $sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
 
 
-		$sql.= ")";
+        $sql.= ")";
 
-		$this->db->begin();
+        $this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-		if (! $error)
+        if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-			}
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
         }
 
         // Commit or rollback
         if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
             return $this->id;
-		}
+        }
     }
 
 
@@ -168,14 +168,14 @@ 
      */
     function fetch($id,$code='',$label='')
     {
-    	global $langs;
+        global $langs;
         $sql = "SELECT";
-		$sql.= " t.id,";
-		$sql.= " t.code,";
-		$sql.= " t.libelle as label,";
-		$sql.= " t.fk_country as country_id,";
-		$sql.= " t.active,";
-		$sql.= " t.module";
+        $sql.= " t.id,";
+        $sql.= " t.code,";
+        $sql.= " t.libelle as label,";
+        $sql.= " t.fk_country as country_id,";
+        $sql.= " t.active,";
+        $sql.= " t.module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
         if ($id)   $sql.= " WHERE t.id = ".$id;
         elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
@@ -189,11 +189,11 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->id;
-				$this->code = $obj->code;
-				$this->libelle = $obj->label;
-				$this->country_id = $obj->country_id;
-				$this->active = $obj->active;
-				$this->module = $obj->module;
+                $this->code = $obj->code;
+                $this->libelle = $obj->label;
+                $this->country_id = $obj->country_id;
+                $this->active = $obj->active;
+                $this->module = $obj->module;
             }
             $this->db->free($resql);
 
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+                $this->error="Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -216,120 +216,120 @@ 
      */
     function update($user=null, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+        // Clean parameters
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
+        if (isset($this->active)) $this->active=trim($this->active);
+        if (isset($this->module)) $this->module=trim($this->module);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
-		$sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
+        $sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
+        $sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
+        $sql.= " active=".(isset($this->active)?$this->active:"null").",";
+        $sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
         $sql.= " WHERE id=".$this->id;
 
-		$this->db->begin();
+        $this->db->begin();
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
-		}
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
     }
 
 
- 	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE id=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
-			}
-		}
+        /**
+         *  Delete object in database
+         *
+         *	@param  User	$user        User that delete
+         *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+         *  @return	int					 <0 if KO, >0 if OK
+         */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
+        $sql.= " WHERE id=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 }

Spacing +68 added lines, -68 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -76,18 +76,18 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->id)) $this->id = trim($this->id);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->module)) $this->module = trim($this->module);
 
 
 
@@ -97,35 +97,35 @@ 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
-		$sql.= "id,";
-		$sql.= "code,";
-		$sql.= "libelle,";
-		$sql.= "active,";
-		$sql.= "module";
+		$sql .= "id,";
+		$sql .= "code,";
+		$sql .= "libelle,";
+		$sql .= "active,";
+		$sql .= "module";
 
 
-        $sql.= ") VALUES (";
+        $sql .= ") VALUES (";
 
-		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
-		$sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->active($this->active)."'").",";
+		$sql .= " ".(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'")."";
 
 
-		$sql.= ")";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -142,13 +142,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -166,29 +166,29 @@ 
      *  @param		string	$label	Label
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='',$label='')
+    function fetch($id, $code = '', $label = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.id,";
-		$sql.= " t.code,";
-		$sql.= " t.libelle as label,";
-		$sql.= " t.fk_country as country_id,";
-		$sql.= " t.active,";
-		$sql.= " t.module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
-
-        $resql=$this->db->query($sql);
+		$sql .= " t.id,";
+		$sql .= " t.code,";
+		$sql .= " t.libelle as label,";
+		$sql .= " t.fk_country as country_id,";
+		$sql .= " t.active,";
+		$sql .= " t.module";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+        if ($id)   $sql .= " WHERE t.id = ".$id;
+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->id;
+                $this->id = $obj->id;
 				$this->code = $obj->code;
 				$this->libelle = $obj->label;
 				$this->country_id = $obj->country_id;
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -214,16 +214,16 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->module)) $this->module = trim($this->module);
 
 
 		// Check parameters
@@ -231,21 +231,21 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
-		$sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
-        $sql.= " WHERE id=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";
+		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null")."";
+        $sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -262,13 +262,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -285,23 +285,23 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE id=".$this->id;
+		$sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -318,13 +318,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

Braces +38 added lines, -20 removed lines

@@ -83,11 +83,21 @@ 
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->id)) {
+		    $this->id=trim($this->id);
+		}
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->libelle)) {
+		    $this->libelle=trim($this->libelle);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
+		if (isset($this->module)) {
+		    $this->module=trim($this->module);
+		}
 
 
 
@@ -149,8 +159,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -177,9 +186,13 @@ 
 		$sql.= " t.active,";
 		$sql.= " t.module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+        if ($id) {
+            $sql.= " WHERE t.id = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        } elseif ($label) {
+            $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -198,8 +211,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -220,10 +232,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->libelle)) {
+		    $this->libelle=trim($this->libelle);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
+		if (isset($this->module)) {
+		    $this->module=trim($this->module);
+		}
 
 
 		// Check parameters
@@ -269,8 +289,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -325,8 +344,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

dolibarr/htdocs/core/class/html.formbank.class.php

Indentation +16 added lines, -16 removed lines

@@ -35,9 +35,9 @@ 
     public $db;
     
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -64,19 +64,19 @@ 
         print Form::selectarray($htmlname, $account->type_lib, $selected);
     }
 
-	/**
-	 * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.
-	 *
-	 * @param Account $account Account object
-	 * @return string
-	 */
-	public static function getIBANLabel(Account $account)
-	{
-		if ($account->getCountryCode() == 'IN') {
-			return 'IFSC';
-		}
+    /**
+     * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.
+     *
+     * @param Account $account Account object
+     * @return string
+     */
+    public static function getIBANLabel(Account $account)
+    {
+        if ($account->getCountryCode() == 'IN') {
+            return 'IFSC';
+        }
 
-		return 'IBANNumber';
-	}
+        return 'IBANNumber';
+    }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**

dolibarr/htdocs/core/class/ldap.class.php

Indentation +1474 added lines, -1474 removed lines

@@ -29,1491 +29,1491 @@
  */
 class Ldap
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 * @var string[]	Array of error strings
-	 */
-	public $errors = array();
-
-	/**
-	 * Tableau des serveurs (IP addresses ou nom d'hotes)
-	 */
-	var $server=array();
-
-	/**
-	 * Base DN (e.g. "dc=foo,dc=com")
-	 */
-	var $dn;
-	/**
-	 * type de serveur, actuellement OpenLdap et Active Directory
-	 */
-	var $serverType;
-	/**
-	 * Version du protocole ldap
-	 */
-	var $domain;
-	/**
-	 * User administrateur Ldap
-	 * Active Directory ne supporte pas les connexions anonymes
-	 */
-	var $searchUser;
-	/**
-	 * Mot de passe de l'administrateur
-	 * Active Directory ne supporte pas les connexions anonymes
-	 */
-	var $searchPassword;
-	/**
-	 *  DN des utilisateurs
-	 */
-	var $people;
-	/**
-	 * DN des groupes
-	 */
-	var $groups;
-	/**
-	 * Code erreur retourne par le serveur Ldap
-	 */
-	var $ldapErrorCode;
-	/**
-	 * Message texte de l'erreur
-	 */
-	var $ldapErrorText;
-
-
-	//Fetch user
-	var $name;
-	var $firstname;
-	var $login;
-	var $phone;
-	var $skype;
-	var $fax;
-	var $mail;
-	var $mobile;
-
-	var $uacf;
-	var $pwdlastset;
-
-	var $ldapcharset='UTF-8';	// LDAP should be UTF-8 encoded
-
-
-	/**
-	 * The internal LDAP connection handle
-	 */
-	var $connection;
-	/**
-	 * Result of any connections etc.
-	 */
-	var $result;
-
-
-	/**
-	 *  Constructor
-	 */
-	function __construct()
-	{
-		global $conf;
-
-		// Server
-		if (! empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
-		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
-		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
-		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
-		$this->dn                  = $conf->global->LDAP_SERVER_DN;
-		$this->serverType          = $conf->global->LDAP_SERVER_TYPE;
-		$this->domain              = $conf->global->LDAP_SERVER_DN;
-		$this->searchUser          = $conf->global->LDAP_ADMIN_DN;
-		$this->searchPassword      = $conf->global->LDAP_ADMIN_PASS;
-		$this->people              = $conf->global->LDAP_USER_DN;
-		$this->groups              = $conf->global->LDAP_GROUP_DN;
-
-		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION;	// Filter on user
-		$this->filtermember        = $conf->global->LDAP_MEMBER_FILTER;		// Filter on member
-
-		// Users
-		$this->attr_login      = $conf->global->LDAP_FIELD_LOGIN; //unix
-		$this->attr_sambalogin = $conf->global->LDAP_FIELD_LOGIN_SAMBA; //samba, activedirectory
-		$this->attr_name       = $conf->global->LDAP_FIELD_NAME;
-		$this->attr_firstname  = $conf->global->LDAP_FIELD_FIRSTNAME;
-		$this->attr_mail       = $conf->global->LDAP_FIELD_MAIL;
-		$this->attr_phone      = $conf->global->LDAP_FIELD_PHONE;
-		$this->attr_skype      = $conf->global->LDAP_FIELD_SKYPE;
-		$this->attr_fax        = $conf->global->LDAP_FIELD_FAX;
-		$this->attr_mobile     = $conf->global->LDAP_FIELD_MOBILE;
-	}
-
-
-
-	// Connection handling methods -------------------------------------------
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     * @var string[]	Array of error strings
+     */
+    public $errors = array();
+
+    /**
+     * Tableau des serveurs (IP addresses ou nom d'hotes)
+     */
+    var $server=array();
+
+    /**
+     * Base DN (e.g. "dc=foo,dc=com")
+     */
+    var $dn;
+    /**
+     * type de serveur, actuellement OpenLdap et Active Directory
+     */
+    var $serverType;
+    /**
+     * Version du protocole ldap
+     */
+    var $domain;
+    /**
+     * User administrateur Ldap
+     * Active Directory ne supporte pas les connexions anonymes
+     */
+    var $searchUser;
+    /**
+     * Mot de passe de l'administrateur
+     * Active Directory ne supporte pas les connexions anonymes
+     */
+    var $searchPassword;
+    /**
+     *  DN des utilisateurs
+     */
+    var $people;
+    /**
+     * DN des groupes
+     */
+    var $groups;
+    /**
+     * Code erreur retourne par le serveur Ldap
+     */
+    var $ldapErrorCode;
+    /**
+     * Message texte de l'erreur
+     */
+    var $ldapErrorText;
+
+
+    //Fetch user
+    var $name;
+    var $firstname;
+    var $login;
+    var $phone;
+    var $skype;
+    var $fax;
+    var $mail;
+    var $mobile;
+
+    var $uacf;
+    var $pwdlastset;
+
+    var $ldapcharset='UTF-8';	// LDAP should be UTF-8 encoded
+
+
+    /**
+     * The internal LDAP connection handle
+     */
+    var $connection;
+    /**
+     * Result of any connections etc.
+     */
+    var $result;
+
+
+    /**
+     *  Constructor
+     */
+    function __construct()
+    {
+        global $conf;
+
+        // Server
+        if (! empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
+        if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+        $this->serverPort          = $conf->global->LDAP_SERVER_PORT;
+        $this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
+        $this->dn                  = $conf->global->LDAP_SERVER_DN;
+        $this->serverType          = $conf->global->LDAP_SERVER_TYPE;
+        $this->domain              = $conf->global->LDAP_SERVER_DN;
+        $this->searchUser          = $conf->global->LDAP_ADMIN_DN;
+        $this->searchPassword      = $conf->global->LDAP_ADMIN_PASS;
+        $this->people              = $conf->global->LDAP_USER_DN;
+        $this->groups              = $conf->global->LDAP_GROUP_DN;
+
+        $this->filter              = $conf->global->LDAP_FILTER_CONNECTION;	// Filter on user
+        $this->filtermember        = $conf->global->LDAP_MEMBER_FILTER;		// Filter on member
+
+        // Users
+        $this->attr_login      = $conf->global->LDAP_FIELD_LOGIN; //unix
+        $this->attr_sambalogin = $conf->global->LDAP_FIELD_LOGIN_SAMBA; //samba, activedirectory
+        $this->attr_name       = $conf->global->LDAP_FIELD_NAME;
+        $this->attr_firstname  = $conf->global->LDAP_FIELD_FIRSTNAME;
+        $this->attr_mail       = $conf->global->LDAP_FIELD_MAIL;
+        $this->attr_phone      = $conf->global->LDAP_FIELD_PHONE;
+        $this->attr_skype      = $conf->global->LDAP_FIELD_SKYPE;
+        $this->attr_fax        = $conf->global->LDAP_FIELD_FAX;
+        $this->attr_mobile     = $conf->global->LDAP_FIELD_MOBILE;
+    }
+
+
+
+    // Connection handling methods -------------------------------------------
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Connect and bind
-	 * 	Use this->server, this->serverPort, this->ldapProtocolVersion, this->serverType, this->searchUser, this->searchPassword
-	 * 	After return, this->connection and $this->bind are defined
-	 *
-	 *	@return		int		<0 if KO, 1 if bind anonymous, 2 if bind auth
-	 */
-	function connect_bind()
-	{
+    /**
+     *	Connect and bind
+     * 	Use this->server, this->serverPort, this->ldapProtocolVersion, this->serverType, this->searchUser, this->searchPassword
+     * 	After return, this->connection and $this->bind are defined
+     *
+     *	@return		int		<0 if KO, 1 if bind anonymous, 2 if bind auth
+     */
+    function connect_bind()
+    {
         // phpcs:enable
-		global $langs, $conf;
-
-		$connected=0;
-		$this->bind=0;
-
-		// Check parameters
-		if (count($this->server) == 0 || empty($this->server[0]))
-		{
-			$this->error='LDAP setup (file conf.php) is not complete';
-			dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
-			return -1;
-		}
-
-		if (! function_exists("ldap_connect"))
-		{
-			$this->error='LDAPFunctionsNotAvailableOnPHP';
-			dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
-			$return=-1;
-		}
-
-		if (empty($this->error))
-		{
-			// Loop on each ldap server
-			foreach ($this->server as $key => $host)
-			{
-				if ($connected) break;
-				if (empty($host)) continue;
-
-				if ($this->serverPing($host, $this->serverPort) === true) {
-					$this->connection = ldap_connect($host, $this->serverPort);
-				}
-				else continue;
-
-				if (is_resource($this->connection))
-				{
-					// Begin TLS if requested by the configuration
-					if (! empty($conf->global->LDAP_SERVER_USE_TLS))
-					{
-						if (! ldap_start_tls($this->connection))
-						{
-							dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
-							$connected = 0;
-							$this->close();
-						}
-					}
-
-					// Execute the ldap_set_option here (after connect and before bind)
-					$this->setVersion();
-					ldap_set_option($this->connection, LDAP_OPT_SIZELIMIT, 0); // no limit here. should return true.
-
-
-					if ($this->serverType == "activedirectory")
-					{
-						$result=$this->setReferrals();
-						dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser." password=".preg_replace('/./','*',$this->searchPassword),LOG_DEBUG);
-						$this->result=$this->bindauth($this->searchUser,$this->searchPassword);
-						if ($this->result)
-						{
-							$this->bind=$this->result;
-							$connected=2;
-							break;
-						}
-						else
-						{
-							$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
-						}
-					}
-					else
-					{
-						// Try in auth mode
-						if ($this->searchUser && $this->searchPassword)
-						{
-							dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser." password=".preg_replace('/./','*',$this->searchPassword),LOG_DEBUG);
-							$this->result=$this->bindauth($this->searchUser,$this->searchPassword);
-							if ($this->result)
-							{
-								$this->bind=$this->result;
-								$connected=2;
-								break;
-							}
-							else
-							{
-								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
-							}
-						}
-						// Try in anonymous
-						if (! $this->bind)
-						{
-							dol_syslog(get_class($this)."::connect_bind try bind on ".$host,LOG_DEBUG);
-							$result=$this->bind();
-							if ($result)
-							{
-								$this->bind=$this->result;
-								$connected=1;
-								break;
-							}
-							else
-							{
-								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
-							}
-						}
-					}
-				}
-
-				if (! $connected) $this->close();
-			}
-		}
-
-		if ($connected)
-		{
-			$return=$connected;
-			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
-		}
-		else
-		{
-			$this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
-			$return=-1;
-			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
-		}
-		return $return;
-	}
-
-
-
-	/**
-	 * Simply closes the connection set up earlier.
-	 * Returns true if OK, false if there was an error.
-	 *
-	 * @return	boolean			true or false
-	 */
-	function close()
-	{
-		if ($this->connection && ! @ldap_close($this->connection))
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	/**
-	 * Anonymously binds to the connection. After this is done,
-	 * queries and searches can be done - but read-only.
-	 *
-	 * @return	boolean			true or false
-	 */
-	function bind()
-	{
-		if (! $this->result=@ldap_bind($this->connection))
-		{
-			$this->ldapErrorCode = ldap_errno($this->connection);
-			$this->ldapErrorText = ldap_error($this->connection);
-			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	/**
-	 * Binds as an authenticated user, which usually allows for write
-	 * access. The FULL dn must be passed. For a directory manager, this is
-	 * "cn=Directory Manager" under iPlanet. For a user, it will be something
-	 * like "uid=jbloggs,ou=People,dc=foo,dc=com".
-	 *
-	 * @param	string	$bindDn			DN
-	 * @param	string	$pass			Password
-	 * @return	boolean					true or false
-	 */
-	function bindauth($bindDn,$pass)
-	{
-		if (! $this->result = @ldap_bind($this->connection, $bindDn, $pass))
-		{
-			$this->ldapErrorCode = ldap_errno($this->connection);
-			$this->ldapErrorText = ldap_error($this->connection);
-			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	/**
-	 * Unbind du serveur ldap.
-	 *
-	 * @return	boolean					true or false
-	 */
-	function unbind()
-	{
-		if (!$this->result=@ldap_unbind($this->connection))
-		{
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-
-	/**
-	 * Verification de la version du serveur ldap.
-	 *
-	 * @return	string					version
-	 */
-	function getVersion()
-	{
-		$version = 0;
-		$version = @ldap_get_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $version);
-		return $version;
-	}
-
-	/**
-	 * Change ldap protocol version to use.
-	 *
-	 * @return	boolean					version
-	 */
+        global $langs, $conf;
+
+        $connected=0;
+        $this->bind=0;
+
+        // Check parameters
+        if (count($this->server) == 0 || empty($this->server[0]))
+        {
+            $this->error='LDAP setup (file conf.php) is not complete';
+            dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
+            return -1;
+        }
+
+        if (! function_exists("ldap_connect"))
+        {
+            $this->error='LDAPFunctionsNotAvailableOnPHP';
+            dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
+            $return=-1;
+        }
+
+        if (empty($this->error))
+        {
+            // Loop on each ldap server
+            foreach ($this->server as $key => $host)
+            {
+                if ($connected) break;
+                if (empty($host)) continue;
+
+                if ($this->serverPing($host, $this->serverPort) === true) {
+                    $this->connection = ldap_connect($host, $this->serverPort);
+                }
+                else continue;
+
+                if (is_resource($this->connection))
+                {
+                    // Begin TLS if requested by the configuration
+                    if (! empty($conf->global->LDAP_SERVER_USE_TLS))
+                    {
+                        if (! ldap_start_tls($this->connection))
+                        {
+                            dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
+                            $connected = 0;
+                            $this->close();
+                        }
+                    }
+
+                    // Execute the ldap_set_option here (after connect and before bind)
+                    $this->setVersion();
+                    ldap_set_option($this->connection, LDAP_OPT_SIZELIMIT, 0); // no limit here. should return true.
+
+
+                    if ($this->serverType == "activedirectory")
+                    {
+                        $result=$this->setReferrals();
+                        dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser." password=".preg_replace('/./','*',$this->searchPassword),LOG_DEBUG);
+                        $this->result=$this->bindauth($this->searchUser,$this->searchPassword);
+                        if ($this->result)
+                        {
+                            $this->bind=$this->result;
+                            $connected=2;
+                            break;
+                        }
+                        else
+                        {
+                            $this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+                        }
+                    }
+                    else
+                    {
+                        // Try in auth mode
+                        if ($this->searchUser && $this->searchPassword)
+                        {
+                            dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser." password=".preg_replace('/./','*',$this->searchPassword),LOG_DEBUG);
+                            $this->result=$this->bindauth($this->searchUser,$this->searchPassword);
+                            if ($this->result)
+                            {
+                                $this->bind=$this->result;
+                                $connected=2;
+                                break;
+                            }
+                            else
+                            {
+                                $this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+                            }
+                        }
+                        // Try in anonymous
+                        if (! $this->bind)
+                        {
+                            dol_syslog(get_class($this)."::connect_bind try bind on ".$host,LOG_DEBUG);
+                            $result=$this->bind();
+                            if ($result)
+                            {
+                                $this->bind=$this->result;
+                                $connected=1;
+                                break;
+                            }
+                            else
+                            {
+                                $this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+                            }
+                        }
+                    }
+                }
+
+                if (! $connected) $this->close();
+            }
+        }
+
+        if ($connected)
+        {
+            $return=$connected;
+            dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
+        }
+        else
+        {
+            $this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
+            $return=-1;
+            dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
+        }
+        return $return;
+    }
+
+
+
+    /**
+     * Simply closes the connection set up earlier.
+     * Returns true if OK, false if there was an error.
+     *
+     * @return	boolean			true or false
+     */
+    function close()
+    {
+        if ($this->connection && ! @ldap_close($this->connection))
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Anonymously binds to the connection. After this is done,
+     * queries and searches can be done - but read-only.
+     *
+     * @return	boolean			true or false
+     */
+    function bind()
+    {
+        if (! $this->result=@ldap_bind($this->connection))
+        {
+            $this->ldapErrorCode = ldap_errno($this->connection);
+            $this->ldapErrorText = ldap_error($this->connection);
+            $this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Binds as an authenticated user, which usually allows for write
+     * access. The FULL dn must be passed. For a directory manager, this is
+     * "cn=Directory Manager" under iPlanet. For a user, it will be something
+     * like "uid=jbloggs,ou=People,dc=foo,dc=com".
+     *
+     * @param	string	$bindDn			DN
+     * @param	string	$pass			Password
+     * @return	boolean					true or false
+     */
+    function bindauth($bindDn,$pass)
+    {
+        if (! $this->result = @ldap_bind($this->connection, $bindDn, $pass))
+        {
+            $this->ldapErrorCode = ldap_errno($this->connection);
+            $this->ldapErrorText = ldap_error($this->connection);
+            $this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Unbind du serveur ldap.
+     *
+     * @return	boolean					true or false
+     */
+    function unbind()
+    {
+        if (!$this->result=@ldap_unbind($this->connection))
+        {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+    /**
+     * Verification de la version du serveur ldap.
+     *
+     * @return	string					version
+     */
+    function getVersion()
+    {
+        $version = 0;
+        $version = @ldap_get_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $version);
+        return $version;
+    }
+
+    /**
+     * Change ldap protocol version to use.
+     *
+     * @return	boolean					version
+     */
     function setVersion()
     {
-		// LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17
-		$ldapsetversion = ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->ldapProtocolVersion);
-		return $ldapsetversion;
-	}
-
-	/**
-	 * changement du referrals.
-	 *
-	 * @return	boolean					referrals
-	 */
+        // LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17
+        $ldapsetversion = ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->ldapProtocolVersion);
+        return $ldapsetversion;
+    }
+
+    /**
+     * changement du referrals.
+     *
+     * @return	boolean					referrals
+     */
     function setReferrals()
     {
-		// LDAP_OPT_REFERRALS est une constante qui vaut ?
-		$ldapreferrals = ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);
-		return $ldapreferrals;
-	}
-
-
-	/**
-	 * 	Add a LDAP entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string	$dn			DN entry key
-	 *	@param	array	$info		Attributes array
-	 *	@param	User		$user		Objet user that create
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function add($dn, $info, $user)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',',$info));
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
-		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
-		}
-
-		$this->dump($dn,$info);
-
-		//print_r($info);
-		$result=@ldap_add($this->connection, $dn, $info);
-
-		if ($result)
-		{
-			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
-			return 1;
-		}
-		else
-		{
-			$this->ldapErrorCode = @ldap_errno($this->connection);
-			$this->ldapErrorText = @ldap_error($this->connection);
-			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
-			dol_syslog(get_class($this)."::add failed: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 * 	Modify a LDAP entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string		$dn			DN entry key
-	 *	@param	array		$info		Attributes array
-	 *	@param	User			$user		Objet user that modify
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function modify($dn, $info, $user)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',',$info));
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
-		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
-		}
-
-		$this->dump($dn,$info);
-
-		//print_r($info);
-		$result=@ldap_modify($this->connection, $dn, $info);
-
-		if ($result)
-		{
-			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
-			return 1;
-		}
-		else
-		{
-			$this->error=@ldap_error($this->connection);
-			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 * 	Rename a LDAP entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string		$dn				Old DN entry key (uid=qqq,ou=xxx,dc=aaa,dc=bbb) (before update)
-	 *	@param	string		$newrdn			New RDN entry key (uid=qqq)
-	 *	@param	string		$newparent		New parent (ou=xxx,dc=aaa,dc=bbb)
-	 *	@param	User			$user			Objet user that modify
-	 *	@param	bool			$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
-	 *	@return	int							<0 if KO, >0 if OK
-	 */
-	function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn?1:0));
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		$newrdn=$this->convFromOutputCharset($newrdn,$this->ldapcharset);
-		$newparent=$this->convFromOutputCharset($newparent,$this->ldapcharset);
-
-		//print_r($info);
-		$result=@ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
-
-		if ($result)
-		{
-			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
-			return 1;
-		}
-		else
-		{
-			$this->error=@ldap_error($this->connection);
-			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Modify a LDAP entry (to use if dn != olddn)
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *  @param	string	$dn			DN entry key
-	 *  @param	array	$info		Attributes array
-	 *  @param	User		$user		Objet user that update
-	 * 	@param	string	$olddn		Old DN entry key (before update)
-	 * 	@param	string	$newrdn		New RDN entry key (uid=qqq) (for ldap_rename)
-	 *	@param	string	$newparent	New parent (ou=xxx,dc=aaa,dc=bbb) (for ldap_rename)
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function update($dn, $info, $user, $olddn, $newrdn=false, $newparent=false)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		if (! $olddn || $olddn != $dn)
-		{
-			if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')
-			{
-				// This function currently only works with LDAPv3
-				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-			}
-			else
-			{
-				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
-				$result = $this->add($dn, $info, $user);
-				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn);	// If add fails, we do not try to delete old one
-			}
-		}
-		else
-		{
-			//$result = $this->delete($olddn);
-			$result = $this->add($dn, $info, $user);	// If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
-			$result = $this->modify($dn, $info, $user);	// We use add/modify instead of delete/add when olddn is received
-		}
-		if ($result <= 0)
-		{
-			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error;
-			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
-			//print_r($info);
-			return -1;
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::update done successfully");
-			return 1;
-		}
-	}
-
-
-	/**
-	 * 	Delete a LDAP entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string	$dn			DN entry key
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function delete($dn)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-
-		$result=@ldap_delete($this->connection, $dn);
-
-		if ($result) return 1;
-		return -1;
-	}
+        // LDAP_OPT_REFERRALS est une constante qui vaut ?
+        $ldapreferrals = ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);
+        return $ldapreferrals;
+    }
+
+
+    /**
+     * 	Add a LDAP entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string	$dn			DN entry key
+     *	@param	array	$info		Attributes array
+     *	@param	User		$user		Objet user that create
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function add($dn, $info, $user)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',',$info));
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+        foreach($info as $key => $val)
+        {
+            if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+        }
+
+        $this->dump($dn,$info);
+
+        //print_r($info);
+        $result=@ldap_add($this->connection, $dn, $info);
+
+        if ($result)
+        {
+            dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
+            return 1;
+        }
+        else
+        {
+            $this->ldapErrorCode = @ldap_errno($this->connection);
+            $this->ldapErrorText = @ldap_error($this->connection);
+            $this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+            dol_syslog(get_class($this)."::add failed: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     * 	Modify a LDAP entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string		$dn			DN entry key
+     *	@param	array		$info		Attributes array
+     *	@param	User			$user		Objet user that modify
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function modify($dn, $info, $user)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',',$info));
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+        foreach($info as $key => $val)
+        {
+            if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+        }
+
+        $this->dump($dn,$info);
+
+        //print_r($info);
+        $result=@ldap_modify($this->connection, $dn, $info);
+
+        if ($result)
+        {
+            dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
+            return 1;
+        }
+        else
+        {
+            $this->error=@ldap_error($this->connection);
+            dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     * 	Rename a LDAP entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string		$dn				Old DN entry key (uid=qqq,ou=xxx,dc=aaa,dc=bbb) (before update)
+     *	@param	string		$newrdn			New RDN entry key (uid=qqq)
+     *	@param	string		$newparent		New parent (ou=xxx,dc=aaa,dc=bbb)
+     *	@param	User			$user			Objet user that modify
+     *	@param	bool			$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
+     *	@return	int							<0 if KO, >0 if OK
+     */
+    function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn?1:0));
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+        $newrdn=$this->convFromOutputCharset($newrdn,$this->ldapcharset);
+        $newparent=$this->convFromOutputCharset($newparent,$this->ldapcharset);
+
+        //print_r($info);
+        $result=@ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
+
+        if ($result)
+        {
+            dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
+            return 1;
+        }
+        else
+        {
+            $this->error=@ldap_error($this->connection);
+            dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     *  Modify a LDAP entry (to use if dn != olddn)
+     *	Ldap object connect and bind must have been done
+     *
+     *  @param	string	$dn			DN entry key
+     *  @param	array	$info		Attributes array
+     *  @param	User		$user		Objet user that update
+     * 	@param	string	$olddn		Old DN entry key (before update)
+     * 	@param	string	$newrdn		New RDN entry key (uid=qqq) (for ldap_rename)
+     *	@param	string	$newparent	New parent (ou=xxx,dc=aaa,dc=bbb) (for ldap_rename)
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function update($dn, $info, $user, $olddn, $newrdn=false, $newparent=false)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        if (! $olddn || $olddn != $dn)
+        {
+            if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')
+            {
+                // This function currently only works with LDAPv3
+                $result = $this->rename($olddn, $newrdn, $newparent, $user, true);
+            }
+            else
+            {
+                // If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
+                $result = $this->add($dn, $info, $user);
+                if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn);	// If add fails, we do not try to delete old one
+            }
+        }
+        else
+        {
+            //$result = $this->delete($olddn);
+            $result = $this->add($dn, $info, $user);	// If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
+            $result = $this->modify($dn, $info, $user);	// We use add/modify instead of delete/add when olddn is received
+        }
+        if ($result <= 0)
+        {
+            $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error;
+            dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+            //print_r($info);
+            return -1;
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::update done successfully");
+            return 1;
+        }
+    }
+
+
+    /**
+     * 	Delete a LDAP entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string	$dn			DN entry key
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function delete($dn)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+
+        $result=@ldap_delete($this->connection, $dn);
+
+        if ($result) return 1;
+        return -1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Build a LDAP message
-	 *
-	 *	@param	string		$dn			DN entry key
-	 *	@param	array		$info		Attributes array
-	 *	@return	string					Content of file
-	 */
-	function dump_content($dn, $info)
-	{
+    /**
+     * 	Build a LDAP message
+     *
+     *	@param	string		$dn			DN entry key
+     *	@param	array		$info		Attributes array
+     *	@return	string					Content of file
+     */
+    function dump_content($dn, $info)
+    {
         // phpcs:enable
-		$content='';
-
-		// Create file content
-		if (preg_match('/^ldap/',$this->server[0]))
-		{
-			$target="-H ".join(',',$this->server);
-		}
-		else
-		{
-			$target="-h ".join(',',$this->server)." -p ".$this->serverPort;
-		}
-		$content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		$content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		$content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		if (in_array('localhost',$this->server)) $content.="# If commands fails to connect, try without -h and -p\n";
-		$content.="dn: ".$dn."\n";
-		foreach($info as $key => $value)
-		{
-			if (! is_array($value))
-			{
-				$content.="$key: $value\n";
-			}
-			else
-			{
-				foreach($value as $valuekey => $valuevalue)
-				{
-					$content.="$key: $valuevalue\n";
-				}
-			}
-		}
-		return $content;
-	}
-
-	/**
-	 * 	Dump a LDAP message to ldapinput.in file
-	 *
-	 *	@param	string		$dn			DN entry key
-	 *	@param	array		$info		Attributes array
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function dump($dn, $info)
-	{
-		global $conf;
-
-		// Create content
-		$content=$this->dump_content($dn, $info);
-
-		//Create file
-		$result=dol_mkdir($conf->ldap->dir_temp);
-
-		$outputfile=$conf->ldap->dir_temp.'/ldapinput.in';
-		$fp=fopen($outputfile,"w");
-		if ($fp)
-		{
-			fputs($fp, $content);
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			return 1;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-	 * Ping a server before ldap_connect for avoid waiting
-	 *
-	 * @param string		$host		Server host or address
-	 * @param int		$port		Server port (default 389)
-	 * @param int		$timeout		Timeout in second (default 1s)
-	 * @return boolean				true or false
-	 */
-	function serverPing($host, $port=389, $timeout=1)
-	{
-		// Replace ldaps:// by ssl://
-		if (preg_match('/^ldaps:\/\/([^\/]+)\/?$/',$host, $regs)) {
-			$host = 'ssl://'.$regs[1];
-		}
-		// Remove ldap://
-		if (preg_match('/^ldap:\/\/([^\/]+)\/?$/',$host, $regs)) {
-			$host = $regs[1];
-		}
-		$op = @fsockopen($host, $port, $errno, $errstr, $timeout);
-		if (!$op) return false; //DC is N/A
-		else {
-			fclose($op); //explicitly close open socket connection
-			return true; //DC is up & running, we can safely connect with ldap_connect
-		}
-	}
-
-
-	// Attribute methods -----------------------------------------------------
-
-	/**
-	 * 	Add a LDAP attribute in entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string		$dn			DN entry key
-	 *	@param	array		$info		Attributes array
-	 *	@param	User		$user		Objet user that create
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function addAttribute($dn, $info, $user)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',',$info));
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
-		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
-		}
-
-		$this->dump($dn,$info);
-
-		//print_r($info);
-		$result=@ldap_mod_add($this->connection, $dn, $info);
-
-		if ($result)
-		{
-			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
-			return 1;
-		}
-		else
-		{
-			$this->error=@ldap_error($this->connection);
-			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 * 	Update a LDAP attribute in entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string		$dn			DN entry key
-	 *	@param	array		$info		Attributes array
-	 *	@param	User		$user		Objet user that create
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function updateAttribute($dn, $info, $user)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',',$info));
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
-		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
-		}
-
-		$this->dump($dn,$info);
-
-		//print_r($info);
-		$result=@ldap_mod_replace($this->connection, $dn, $info);
-
-		if ($result)
-		{
-			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
-			return 1;
-		}
-		else
-		{
-			$this->error=@ldap_error($this->connection);
-			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 * 	Delete a LDAP attribute in entry
-	 *	Ldap object connect and bind must have been done
-	 *
-	 *	@param	string		$dn			DN entry key
-	 *	@param	array		$info		Attributes array
-	 *	@param	User		$user		Objet user that create
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function deleteAttribute($dn, $info, $user)
-	{
-		global $conf;
-
-		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',',$info));
-
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
-		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
-		}
-
-		$this->dump($dn,$info);
-
-		//print_r($info);
-		$result=@ldap_mod_del($this->connection, $dn, $info);
-
-		if ($result)
-		{
-			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
-			return 1;
-		}
-		else
-		{
-			$this->error=@ldap_error($this->connection);
-			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-	/**
-	 *  Returns an array containing attributes and values for first record
-	 *
-	 *	@param	string	$dn			DN entry key
-	 *	@param	string	$filter		Filter
-	 *	@return	int|array			<0 or false if KO, array if OK
-	 */
-	function getAttribute($dn,$filter)
-	{
-		// Check parameters
-		if (! $this->connection)
-		{
-			$this->error="NotConnected";
-			return -2;
-		}
-		if (! $this->bind)
-		{
-			$this->error="NotConnected";
-			return -3;
-		}
-
-		$search = ldap_search($this->connection,$dn,$filter);
-
-		// Only one entry should ever be returned
-		$entry = ldap_first_entry($this->connection, $search);
-
-		if (!$entry)
-		{
-			$this->ldapErrorCode = -1;
-			$this->ldapErrorText = "Couldn't find entry";
-			return 0;  // Couldn't find entry...
-		}
-
-		// Get values
-		if (! $values = ldap_get_attributes($this->connection, $entry))
-		{
-			$this->ldapErrorCode = ldap_errno($this->connection);
-			$this->ldapErrorText = ldap_error($this->connection);
-			return 0; // No matching attributes
-		}
-
-		// Return an array containing the attributes.
-		return $values;
-	}
-
-	/**
-	 *  Returns an array containing values for an attribute and for first record matching filterrecord
-	 *
-	 * 	@param	string	$filterrecord		Record
-	 * 	@param	string	$attribute			Attributes
-	 * 	@return void
-	 */
-	function getAttributeValues($filterrecord,$attribute)
-	{
-		$attributes=array();
-		$attributes[0] = $attribute;
-
-		// We need to search for this user in order to get their entry.
-		$this->result = @ldap_search($this->connection,$this->people,$filterrecord,$attributes);
-
-		// Pourquoi cette ligne ?
-		//$info = ldap_get_entries($this->connection, $this->result);
-
-		// Only one entry should ever be returned (no user will have the same uid)
-		$entry = ldap_first_entry($this->connection, $this->result);
-
-		if (!$entry)
-		{
-			$this->ldapErrorCode = -1;
-			$this->ldapErrorText = "Couldn't find user";
-			return false;  // Couldn't find the user...
-		}
-
-		// Get values
-		if (! $values = @ldap_get_values($this->connection, $entry, $attribute))
-		{
-			$this->ldapErrorCode = ldap_errno($this->connection);
-			$this->ldapErrorText = ldap_error($this->connection);
-			return false; // No matching attributes
-		}
-
-		// Return an array containing the attributes.
-		return $values;
-	}
-
-	/**
-	 * 	Returns an array containing a details or list of LDAP record(s)
-	 * 	ldapsearch -LLLx -hlocalhost -Dcn=admin,dc=parinux,dc=org -w password -b "ou=adherents,ou=people,dc=parinux,dc=org" userPassword
-	 *
-	 *	@param	string	$search			 	Value of fiel to search, '*' for all. Not used if $activefilter is set.
-	 *	@param	string	$userDn			 	DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
-	 *	@param	string	$useridentifier 	Name of key field (Ex: uid)
-	 *	@param	array	$attributeArray 	Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword)
-	 *	@param	int		$activefilter		'1' or 'user'=use field this->filter as filter instead of parameter $search, 'member'=use field this->filtermember as filter
-	 *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
-	 *	@return	array						Array of [id_record][ldap_field]=value
-	 */
-	function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0, $attributeAsArray=array())
-	{
-		$fulllist=array();
-
-		dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).") activefilter=".$activefilter);
-
-		// if the directory is AD, then bind first with the search user first
-		if ($this->serverType == "activedirectory")
-		{
-			$this->bindauth($this->searchUser, $this->searchPassword);
-			dol_syslog(get_class($this)."::bindauth serverType=activedirectory searchUser=".$this->searchUser);
-		}
-
-		// Define filter
-		if (! empty($activefilter))
-		{
-			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
-			{
-				$filter = '('.$this->filter.')';
-			}
-			elseif (((string) $activefilter == 'member') && $this->filter)
-			{
-				$filter = '('.$this->filtermember.')';
-			}
-			else	// If this->filter is empty, make fiter on * (all)
-			{
-				$filter = '('.$useridentifier.'=*)';
-			}
-		}
-		else
-		{
-			$filter = '('.$useridentifier.'='.$search.')';
-		}
-
-		if (is_array($attributeArray))
-		{
-			// Return list with required fields
-			$attributeArray=array_values($attributeArray);	// This is to force to have index reordered from 0 (not make ldap_search fails)
-			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
-			//var_dump($attributeArray);
-			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
-		}
-		else
-		{
-			// Return list with fields selected by default
-			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
-			$this->result = @ldap_search($this->connection, $userDn, $filter);
-		}
-		if (!$this->result)
-		{
-			$this->error = 'LDAP search failed: '.ldap_errno($this->connection)." ".ldap_error($this->connection);
-			return -1;
-		}
-
-		$info = @ldap_get_entries($this->connection, $this->result);
-
-		// Warning: Dans info, les noms d'attributs sont en minuscule meme si passe
-		// a ldap_search en majuscule !!!
-		//print_r($info);
-
-		for ($i = 0; $i < $info["count"]; $i++)
-		{
-			$recordid=$this->convToOutputCharset($info[$i][$useridentifier][0],$this->ldapcharset);
-			if ($recordid)
-			{
-				//print "Found record with key $useridentifier=".$recordid."<br>\n";
-				$fulllist[$recordid][$useridentifier]=$recordid;
-
-				// Add to the array for each attribute in my list
-				$num = count($attributeArray);
-				for ($j = 0; $j < $num; $j++)
-				{
-					$keyattributelower=strtolower($attributeArray[$j]);
-					//print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."<br>\n";
-
-					//permet de recuperer le SID avec Active Directory
-					if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
-					{
-						$objectsid = $this->getObjectSid($recordid);
-						$fulllist[$recordid][$attributeArray[$j]]    = $objectsid;
-					}
-					else
-					{
-						if(in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
-							$valueTab = array();
-							foreach($info[$i][$keyattributelower] as $key => $value) {
-								$valueTab[$key] = $this->convToOutputCharset($value,$this->ldapcharset);
-							}
-							$fulllist[$recordid][$attributeArray[$j]] = $valueTab;
-						} else {
-							$fulllist[$recordid][$attributeArray[$j]] = $this->convToOutputCharset($info[$i][$keyattributelower][0],$this->ldapcharset);
-						}
-					}
-				}
-			}
-		}
-
-		asort($fulllist);
-		return $fulllist;
-	}
-
-	/**
-	 *  Converts a little-endian hex-number to one, that 'hexdec' can convert
-	 *	Required by Active Directory
-	 *
-	 *	@param	string		$hex			Hex value
-	 *	@return	string						Little endian
-	 */
-	function littleEndian($hex)
-	{
-		for ($x=dol_strlen($hex)-2; $x >= 0; $x=$x-2) {
-			$result .= substr($hex,$x,2);
-		}
-		return $result;
-	}
-
-
-	/**
-	 *  Recupere le SID de l'utilisateur
-	 *	Required by Active Directory
-	 *
-	 * 	@param	string		$ldapUser		Login de l'utilisateur
-	 * 	@return	string						Sid
-	 */
-	function getObjectSid($ldapUser)
-	{
-		$criteria =  '('.$this->getUserIdentifier().'='.$ldapUser.')';
-		$justthese = array("objectsid");
-
-		// if the directory is AD, then bind first with the search user first
-		if ($this->serverType == "activedirectory")
-		{
-			$this->bindauth($this->searchUser, $this->searchPassword);
-		}
-
-		$i = 0;
-		$searchDN = $this->people;
-
-		while ($i <= 2)
-		{
-			$ldapSearchResult = @ldap_search($this->connection, $searchDN, $criteria, $justthese);
-
-			if (!$ldapSearchResult)
-			{
-				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
-				return -1;
-			}
-
-			$entry = ldap_first_entry($this->connection, $ldapSearchResult);
-
-			if (!$entry)
-			{
-				// Si pas de resultat on cherche dans le domaine
-				$searchDN = $this->domain;
-				$i++;
-			}
-			else
-			{
-				$i++;
-				$i++;
-			}
-		}
-
-		if ($entry)
-		{
-			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
-			$SIDText = $this->binSIDtoText($ldapBinary[0]);
-			return $SIDText;
-		}
-		else
-		{
-			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
-			return '?';
-		}
-	}
-
-	/**
-	 * Returns the textual SID
-	 * Indispensable pour Active Directory
-	 *
-	 * @param	string	$binsid		Binary SID
-	 * @return	string				Textual SID
-	 */
-	function binSIDtoText($binsid)
-	{
-		$hex_sid=bin2hex($binsid);
-		$rev = hexdec(substr($hex_sid,0,2));          // Get revision-part of SID
-		$subcount = hexdec(substr($hex_sid,2,2));    // Get count of sub-auth entries
-		$auth = hexdec(substr($hex_sid,4,12));      // SECURITY_NT_AUTHORITY
-		$result = "$rev-$auth";
-		for ($x=0;$x < $subcount; $x++)
-		{
-			$result .= "-".hexdec($this->littleEndian(substr($hex_sid,16+($x*8),8)));  // get all SECURITY_NT_AUTHORITY
-		}
-		return $result;
-	}
-
-
-	/**
-	 * 	Fonction de recherche avec filtre
-	 *	this->connection doit etre defini donc la methode bind ou bindauth doit avoir deja ete appelee
-	 *	Ne pas utiliser pour recherche d'une liste donnee de proprietes
-	 *	car conflit majuscule-minuscule. A n'utiliser que pour les pages
-	 *	'Fiche LDAP' qui affiche champ lisibles par defaut.
-	 *
-	 * 	@param	string		$checkDn		DN de recherche (Ex: ou=users,cn=my-domain,cn=com)
-	 * 	@param 	string		$filter			Search filter (ex: (sn=nom_personne) )
-	 *	@return	array|int					Array with answers (key lowercased - value)
-	 */
-	function search($checkDn, $filter)
-	{
-		dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
-
-		$checkDn=$this->convFromOutputCharset($checkDn,$this->ldapcharset);
-		$filter=$this->convFromOutputCharset($filter,$this->ldapcharset);
-
-		// if the directory is AD, then bind first with the search user first
-		if ($this->serverType == "activedirectory") {
-			$this->bindauth($this->searchUser, $this->searchPassword);
-		}
-
-		$this->result = @ldap_search($this->connection, $checkDn, $filter);
-
-		$result = @ldap_get_entries($this->connection, $this->result);
-		if (! $result)
-		{
-			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
-			return -1;
-		}
-		else
-		{
-			ldap_free_result($this->result);
-			return $result;
-		}
-	}
-
-
-	/**
-	 * 		Load all attribute of a LDAP user
-	 *
-	 * 		@param	User	$user		User to search for. Not used if a filter is provided.
-	 *      @param  string	$filter		Filter for search. Must start with &.
-	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
-	 *		@return	int					>0 if OK, <0 if KO
-	 */
-	function fetch($user,$filter)
-	{
-		// Perform the search and get the entry handles
-
-		// if the directory is AD, then bind first with the search user first
-		if ($this->serverType == "activedirectory") {
-			$this->bindauth($this->searchUser, $this->searchPassword);
-		}
-
-		$searchDN = $this->people;    // TODO Why searching in people then domain ?
-
-		$result = '';
-		$i=0;
-		while ($i <= 2)
-		{
-			dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter);
-			$this->result = @ldap_search($this->connection, $searchDN, $filter);
-			if ($this->result)
-			{
-				$result = @ldap_get_entries($this->connection, $this->result);
-				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
-				else dol_syslog('Ldap::fetch search returns but found no records');
-				//var_dump($result);exit;
-			}
-			else
-			{
-				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
-				dol_syslog(get_class($this)."::fetch search fails");
-				return -1;
-			}
-
-			if (! $result)
-			{
-				// Si pas de resultat on cherche dans le domaine
-				$searchDN = $this->domain;
-				$i++;
-			}
-			else
-			{
-				break;
-			}
-		}
-
-		if (! $result)
-		{
-			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
-			return -1;
-		}
-		else
-		{
-			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0],$this->ldapcharset);
-			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0],$this->ldapcharset);
-			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0],$this->ldapcharset);
-			$this->phone      = $this->convToOutputCharset($result[0][$this->attr_phone][0],$this->ldapcharset);
-			$this->skype      = $this->convToOutputCharset($result[0][$this->attr_skype][0],$this->ldapcharset);
-			$this->fax        = $this->convToOutputCharset($result[0][$this->attr_fax][0],$this->ldapcharset);
-			$this->mail       = $this->convToOutputCharset($result[0][$this->attr_mail][0],$this->ldapcharset);
-			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0],$this->ldapcharset);
-
-			$this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0],$this->ldapcharset));
-			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
-			{
-				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0)?$this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0],$this->ldapcharset)):0;
-			}
-			else
-			{
-				$this->pwdlastset = -1;
-			}
-			if (!$this->name && !$this->login) $this->pwdlastset = -1;
-			$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0],$this->ldapcharset));
-
-			// FQDN domain
-			$domain = str_replace('dc=','',$this->domain);
-			$domain = str_replace(',','.',$domain);
-			$this->domainFQDN = $domain;
-
-			// Set ldapUserDn (each user can have a different dn)
-			//var_dump($result[0]);exit;
-			$this->ldapUserDN=$result[0]['dn'];
-
-			ldap_free_result($this->result);
-			return 1;
-		}
-	}
-
-
-	// helper methods
-
-	/**
-	 * 	Returns the correct user identifier to use, based on the ldap server type
-	 *
-	 *	@return	string 				Login
-	 */
-	function getUserIdentifier()
-	{
-		if ($this->serverType == "activedirectory") {
-			return $this->attr_sambalogin;
-		} else {
-			return $this->attr_login;
-		}
-	}
-
-   /**
-    * 	UserAccountControl Flgs to more human understandable form...
-    *
-    *	@param	string		$uacf		UACF
-    *	@return	void
-    */
-	function parseUACF($uacf)
-	{
-		//All flags array
-		$flags = array(
-			"TRUSTED_TO_AUTH_FOR_DELEGATION"  =>    16777216,
-			"PASSWORD_EXPIRED"                =>    8388608,
-			"DONT_REQ_PREAUTH"                =>    4194304,
-			"USE_DES_KEY_ONLY"                =>    2097152,
-			"NOT_DELEGATED"                   =>    1048576,
-			"TRUSTED_FOR_DELEGATION"          =>    524288,
-			"SMARTCARD_REQUIRED"              =>    262144,
-			"MNS_LOGON_ACCOUNT"               =>    131072,
-			"DONT_EXPIRE_PASSWORD"            =>    65536,
-			"SERVER_TRUST_ACCOUNT"            =>    8192,
-			"WORKSTATION_TRUST_ACCOUNT"       =>    4096,
-			"INTERDOMAIN_TRUST_ACCOUNT"       =>    2048,
-			"NORMAL_ACCOUNT"                  =>    512,
-			"TEMP_DUPLICATE_ACCOUNT"          =>    256,
-			"ENCRYPTED_TEXT_PWD_ALLOWED"      =>    128,
-			"PASSWD_CANT_CHANGE"              =>    64,
-			"PASSWD_NOTREQD"                  =>    32,
-			"LOCKOUT"                         =>    16,
-			"HOMEDIR_REQUIRED"                =>    8,
-			"ACCOUNTDISABLE"                  =>    2,
-			"SCRIPT"                          =>    1
-		);
-
-		//Parse flags to text
-		$retval = array();
-		while (list($flag, $val) = each($flags)) {
-			if ($uacf >= $val) {
-				$uacf -= $val;
-				$retval[$val] = $flag;
-			}
-		}
-
-		//Return human friendly flags
-		return($retval);
-	}
-
-   /**
-    * 	SamAccountType value to text
-    *
-    *	@param	string	$samtype	SamType
-    *	@return	string				Sam string
-    */
-	function parseSAT($samtype)
-	{
-		$stypes = array(
-			805306368    =>    "NORMAL_ACCOUNT",
-			805306369    =>    "WORKSTATION_TRUST",
-			805306370    =>    "INTERDOMAIN_TRUST",
-			268435456    =>    "SECURITY_GLOBAL_GROUP",
-			268435457    =>    "DISTRIBUTION_GROUP",
-			536870912    =>    "SECURITY_LOCAL_GROUP",
-			536870913    =>    "DISTRIBUTION_LOCAL_GROUP"
-		);
-
-		$retval = "";
-		while (list($sat, $val) = each($stypes)) {
-			if ($samtype == $sat) {
-				$retval = $val;
-				break;
-			}
-		}
-		if (empty($retval)) $retval = "UNKNOWN_TYPE_" . $samtype;
-
-		return($retval);
-	}
+        $content='';
+
+        // Create file content
+        if (preg_match('/^ldap/',$this->server[0]))
+        {
+            $target="-H ".join(',',$this->server);
+        }
+        else
+        {
+            $target="-h ".join(',',$this->server)." -p ".$this->serverPort;
+        }
+        $content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+        $content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+        $content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+        if (in_array('localhost',$this->server)) $content.="# If commands fails to connect, try without -h and -p\n";
+        $content.="dn: ".$dn."\n";
+        foreach($info as $key => $value)
+        {
+            if (! is_array($value))
+            {
+                $content.="$key: $value\n";
+            }
+            else
+            {
+                foreach($value as $valuekey => $valuevalue)
+                {
+                    $content.="$key: $valuevalue\n";
+                }
+            }
+        }
+        return $content;
+    }
+
+    /**
+     * 	Dump a LDAP message to ldapinput.in file
+     *
+     *	@param	string		$dn			DN entry key
+     *	@param	array		$info		Attributes array
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function dump($dn, $info)
+    {
+        global $conf;
+
+        // Create content
+        $content=$this->dump_content($dn, $info);
+
+        //Create file
+        $result=dol_mkdir($conf->ldap->dir_temp);
+
+        $outputfile=$conf->ldap->dir_temp.'/ldapinput.in';
+        $fp=fopen($outputfile,"w");
+        if ($fp)
+        {
+            fputs($fp, $content);
+            fclose($fp);
+            if (! empty($conf->global->MAIN_UMASK))
+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+            return 1;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     * Ping a server before ldap_connect for avoid waiting
+     *
+     * @param string		$host		Server host or address
+     * @param int		$port		Server port (default 389)
+     * @param int		$timeout		Timeout in second (default 1s)
+     * @return boolean				true or false
+     */
+    function serverPing($host, $port=389, $timeout=1)
+    {
+        // Replace ldaps:// by ssl://
+        if (preg_match('/^ldaps:\/\/([^\/]+)\/?$/',$host, $regs)) {
+            $host = 'ssl://'.$regs[1];
+        }
+        // Remove ldap://
+        if (preg_match('/^ldap:\/\/([^\/]+)\/?$/',$host, $regs)) {
+            $host = $regs[1];
+        }
+        $op = @fsockopen($host, $port, $errno, $errstr, $timeout);
+        if (!$op) return false; //DC is N/A
+        else {
+            fclose($op); //explicitly close open socket connection
+            return true; //DC is up & running, we can safely connect with ldap_connect
+        }
+    }
+
+
+    // Attribute methods -----------------------------------------------------
+
+    /**
+     * 	Add a LDAP attribute in entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string		$dn			DN entry key
+     *	@param	array		$info		Attributes array
+     *	@param	User		$user		Objet user that create
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function addAttribute($dn, $info, $user)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',',$info));
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+        foreach($info as $key => $val)
+        {
+            if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+        }
+
+        $this->dump($dn,$info);
+
+        //print_r($info);
+        $result=@ldap_mod_add($this->connection, $dn, $info);
+
+        if ($result)
+        {
+            dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
+            return 1;
+        }
+        else
+        {
+            $this->error=@ldap_error($this->connection);
+            dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     * 	Update a LDAP attribute in entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string		$dn			DN entry key
+     *	@param	array		$info		Attributes array
+     *	@param	User		$user		Objet user that create
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function updateAttribute($dn, $info, $user)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',',$info));
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+        foreach($info as $key => $val)
+        {
+            if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+        }
+
+        $this->dump($dn,$info);
+
+        //print_r($info);
+        $result=@ldap_mod_replace($this->connection, $dn, $info);
+
+        if ($result)
+        {
+            dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
+            return 1;
+        }
+        else
+        {
+            $this->error=@ldap_error($this->connection);
+            dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     * 	Delete a LDAP attribute in entry
+     *	Ldap object connect and bind must have been done
+     *
+     *	@param	string		$dn			DN entry key
+     *	@param	array		$info		Attributes array
+     *	@param	User		$user		Objet user that create
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function deleteAttribute($dn, $info, $user)
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',',$info));
+
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        // Encode to LDAP page code
+        $dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+        foreach($info as $key => $val)
+        {
+            if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+        }
+
+        $this->dump($dn,$info);
+
+        //print_r($info);
+        $result=@ldap_mod_del($this->connection, $dn, $info);
+
+        if ($result)
+        {
+            dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
+            return 1;
+        }
+        else
+        {
+            $this->error=@ldap_error($this->connection);
+            dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+    /**
+     *  Returns an array containing attributes and values for first record
+     *
+     *	@param	string	$dn			DN entry key
+     *	@param	string	$filter		Filter
+     *	@return	int|array			<0 or false if KO, array if OK
+     */
+    function getAttribute($dn,$filter)
+    {
+        // Check parameters
+        if (! $this->connection)
+        {
+            $this->error="NotConnected";
+            return -2;
+        }
+        if (! $this->bind)
+        {
+            $this->error="NotConnected";
+            return -3;
+        }
+
+        $search = ldap_search($this->connection,$dn,$filter);
+
+        // Only one entry should ever be returned
+        $entry = ldap_first_entry($this->connection, $search);
+
+        if (!$entry)
+        {
+            $this->ldapErrorCode = -1;
+            $this->ldapErrorText = "Couldn't find entry";
+            return 0;  // Couldn't find entry...
+        }
+
+        // Get values
+        if (! $values = ldap_get_attributes($this->connection, $entry))
+        {
+            $this->ldapErrorCode = ldap_errno($this->connection);
+            $this->ldapErrorText = ldap_error($this->connection);
+            return 0; // No matching attributes
+        }
+
+        // Return an array containing the attributes.
+        return $values;
+    }
+
+    /**
+     *  Returns an array containing values for an attribute and for first record matching filterrecord
+     *
+     * 	@param	string	$filterrecord		Record
+     * 	@param	string	$attribute			Attributes
+     * 	@return void
+     */
+    function getAttributeValues($filterrecord,$attribute)
+    {
+        $attributes=array();
+        $attributes[0] = $attribute;
+
+        // We need to search for this user in order to get their entry.
+        $this->result = @ldap_search($this->connection,$this->people,$filterrecord,$attributes);
+
+        // Pourquoi cette ligne ?
+        //$info = ldap_get_entries($this->connection, $this->result);
+
+        // Only one entry should ever be returned (no user will have the same uid)
+        $entry = ldap_first_entry($this->connection, $this->result);
+
+        if (!$entry)
+        {
+            $this->ldapErrorCode = -1;
+            $this->ldapErrorText = "Couldn't find user";
+            return false;  // Couldn't find the user...
+        }
+
+        // Get values
+        if (! $values = @ldap_get_values($this->connection, $entry, $attribute))
+        {
+            $this->ldapErrorCode = ldap_errno($this->connection);
+            $this->ldapErrorText = ldap_error($this->connection);
+            return false; // No matching attributes
+        }
+
+        // Return an array containing the attributes.
+        return $values;
+    }
+
+    /**
+     * 	Returns an array containing a details or list of LDAP record(s)
+     * 	ldapsearch -LLLx -hlocalhost -Dcn=admin,dc=parinux,dc=org -w password -b "ou=adherents,ou=people,dc=parinux,dc=org" userPassword
+     *
+     *	@param	string	$search			 	Value of fiel to search, '*' for all. Not used if $activefilter is set.
+     *	@param	string	$userDn			 	DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
+     *	@param	string	$useridentifier 	Name of key field (Ex: uid)
+     *	@param	array	$attributeArray 	Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword)
+     *	@param	int		$activefilter		'1' or 'user'=use field this->filter as filter instead of parameter $search, 'member'=use field this->filtermember as filter
+     *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
+     *	@return	array						Array of [id_record][ldap_field]=value
+     */
+    function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0, $attributeAsArray=array())
+    {
+        $fulllist=array();
+
+        dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).") activefilter=".$activefilter);
+
+        // if the directory is AD, then bind first with the search user first
+        if ($this->serverType == "activedirectory")
+        {
+            $this->bindauth($this->searchUser, $this->searchPassword);
+            dol_syslog(get_class($this)."::bindauth serverType=activedirectory searchUser=".$this->searchUser);
+        }
+
+        // Define filter
+        if (! empty($activefilter))
+        {
+            if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
+            {
+                $filter = '('.$this->filter.')';
+            }
+            elseif (((string) $activefilter == 'member') && $this->filter)
+            {
+                $filter = '('.$this->filtermember.')';
+            }
+            else	// If this->filter is empty, make fiter on * (all)
+            {
+                $filter = '('.$useridentifier.'=*)';
+            }
+        }
+        else
+        {
+            $filter = '('.$useridentifier.'='.$search.')';
+        }
+
+        if (is_array($attributeArray))
+        {
+            // Return list with required fields
+            $attributeArray=array_values($attributeArray);	// This is to force to have index reordered from 0 (not make ldap_search fails)
+            dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
+            //var_dump($attributeArray);
+            $this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
+        }
+        else
+        {
+            // Return list with fields selected by default
+            dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
+            $this->result = @ldap_search($this->connection, $userDn, $filter);
+        }
+        if (!$this->result)
+        {
+            $this->error = 'LDAP search failed: '.ldap_errno($this->connection)." ".ldap_error($this->connection);
+            return -1;
+        }
+
+        $info = @ldap_get_entries($this->connection, $this->result);
+
+        // Warning: Dans info, les noms d'attributs sont en minuscule meme si passe
+        // a ldap_search en majuscule !!!
+        //print_r($info);
+
+        for ($i = 0; $i < $info["count"]; $i++)
+        {
+            $recordid=$this->convToOutputCharset($info[$i][$useridentifier][0],$this->ldapcharset);
+            if ($recordid)
+            {
+                //print "Found record with key $useridentifier=".$recordid."<br>\n";
+                $fulllist[$recordid][$useridentifier]=$recordid;
+
+                // Add to the array for each attribute in my list
+                $num = count($attributeArray);
+                for ($j = 0; $j < $num; $j++)
+                {
+                    $keyattributelower=strtolower($attributeArray[$j]);
+                    //print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."<br>\n";
+
+                    //permet de recuperer le SID avec Active Directory
+                    if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
+                    {
+                        $objectsid = $this->getObjectSid($recordid);
+                        $fulllist[$recordid][$attributeArray[$j]]    = $objectsid;
+                    }
+                    else
+                    {
+                        if(in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
+                            $valueTab = array();
+                            foreach($info[$i][$keyattributelower] as $key => $value) {
+                                $valueTab[$key] = $this->convToOutputCharset($value,$this->ldapcharset);
+                            }
+                            $fulllist[$recordid][$attributeArray[$j]] = $valueTab;
+                        } else {
+                            $fulllist[$recordid][$attributeArray[$j]] = $this->convToOutputCharset($info[$i][$keyattributelower][0],$this->ldapcharset);
+                        }
+                    }
+                }
+            }
+        }
+
+        asort($fulllist);
+        return $fulllist;
+    }
+
+    /**
+     *  Converts a little-endian hex-number to one, that 'hexdec' can convert
+     *	Required by Active Directory
+     *
+     *	@param	string		$hex			Hex value
+     *	@return	string						Little endian
+     */
+    function littleEndian($hex)
+    {
+        for ($x=dol_strlen($hex)-2; $x >= 0; $x=$x-2) {
+            $result .= substr($hex,$x,2);
+        }
+        return $result;
+    }
+
+
+    /**
+     *  Recupere le SID de l'utilisateur
+     *	Required by Active Directory
+     *
+     * 	@param	string		$ldapUser		Login de l'utilisateur
+     * 	@return	string						Sid
+     */
+    function getObjectSid($ldapUser)
+    {
+        $criteria =  '('.$this->getUserIdentifier().'='.$ldapUser.')';
+        $justthese = array("objectsid");
+
+        // if the directory is AD, then bind first with the search user first
+        if ($this->serverType == "activedirectory")
+        {
+            $this->bindauth($this->searchUser, $this->searchPassword);
+        }
+
+        $i = 0;
+        $searchDN = $this->people;
+
+        while ($i <= 2)
+        {
+            $ldapSearchResult = @ldap_search($this->connection, $searchDN, $criteria, $justthese);
+
+            if (!$ldapSearchResult)
+            {
+                $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
+                return -1;
+            }
+
+            $entry = ldap_first_entry($this->connection, $ldapSearchResult);
+
+            if (!$entry)
+            {
+                // Si pas de resultat on cherche dans le domaine
+                $searchDN = $this->domain;
+                $i++;
+            }
+            else
+            {
+                $i++;
+                $i++;
+            }
+        }
+
+        if ($entry)
+        {
+            $ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
+            $SIDText = $this->binSIDtoText($ldapBinary[0]);
+            return $SIDText;
+        }
+        else
+        {
+            $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
+            return '?';
+        }
+    }
+
+    /**
+     * Returns the textual SID
+     * Indispensable pour Active Directory
+     *
+     * @param	string	$binsid		Binary SID
+     * @return	string				Textual SID
+     */
+    function binSIDtoText($binsid)
+    {
+        $hex_sid=bin2hex($binsid);
+        $rev = hexdec(substr($hex_sid,0,2));          // Get revision-part of SID
+        $subcount = hexdec(substr($hex_sid,2,2));    // Get count of sub-auth entries
+        $auth = hexdec(substr($hex_sid,4,12));      // SECURITY_NT_AUTHORITY
+        $result = "$rev-$auth";
+        for ($x=0;$x < $subcount; $x++)
+        {
+            $result .= "-".hexdec($this->littleEndian(substr($hex_sid,16+($x*8),8)));  // get all SECURITY_NT_AUTHORITY
+        }
+        return $result;
+    }
+
+
+    /**
+     * 	Fonction de recherche avec filtre
+     *	this->connection doit etre defini donc la methode bind ou bindauth doit avoir deja ete appelee
+     *	Ne pas utiliser pour recherche d'une liste donnee de proprietes
+     *	car conflit majuscule-minuscule. A n'utiliser que pour les pages
+     *	'Fiche LDAP' qui affiche champ lisibles par defaut.
+     *
+     * 	@param	string		$checkDn		DN de recherche (Ex: ou=users,cn=my-domain,cn=com)
+     * 	@param 	string		$filter			Search filter (ex: (sn=nom_personne) )
+     *	@return	array|int					Array with answers (key lowercased - value)
+     */
+    function search($checkDn, $filter)
+    {
+        dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
+
+        $checkDn=$this->convFromOutputCharset($checkDn,$this->ldapcharset);
+        $filter=$this->convFromOutputCharset($filter,$this->ldapcharset);
+
+        // if the directory is AD, then bind first with the search user first
+        if ($this->serverType == "activedirectory") {
+            $this->bindauth($this->searchUser, $this->searchPassword);
+        }
+
+        $this->result = @ldap_search($this->connection, $checkDn, $filter);
+
+        $result = @ldap_get_entries($this->connection, $this->result);
+        if (! $result)
+        {
+            $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
+            return -1;
+        }
+        else
+        {
+            ldap_free_result($this->result);
+            return $result;
+        }
+    }
+
+
+    /**
+     * 		Load all attribute of a LDAP user
+     *
+     * 		@param	User	$user		User to search for. Not used if a filter is provided.
+     *      @param  string	$filter		Filter for search. Must start with &.
+     *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
+     *		@return	int					>0 if OK, <0 if KO
+     */
+    function fetch($user,$filter)
+    {
+        // Perform the search and get the entry handles
+
+        // if the directory is AD, then bind first with the search user first
+        if ($this->serverType == "activedirectory") {
+            $this->bindauth($this->searchUser, $this->searchPassword);
+        }
+
+        $searchDN = $this->people;    // TODO Why searching in people then domain ?
+
+        $result = '';
+        $i=0;
+        while ($i <= 2)
+        {
+            dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter);
+            $this->result = @ldap_search($this->connection, $searchDN, $filter);
+            if ($this->result)
+            {
+                $result = @ldap_get_entries($this->connection, $this->result);
+                if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
+                else dol_syslog('Ldap::fetch search returns but found no records');
+                //var_dump($result);exit;
+            }
+            else
+            {
+                $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
+                dol_syslog(get_class($this)."::fetch search fails");
+                return -1;
+            }
+
+            if (! $result)
+            {
+                // Si pas de resultat on cherche dans le domaine
+                $searchDN = $this->domain;
+                $i++;
+            }
+            else
+            {
+                break;
+            }
+        }
+
+        if (! $result)
+        {
+            $this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
+            return -1;
+        }
+        else
+        {
+            $this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0],$this->ldapcharset);
+            $this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0],$this->ldapcharset);
+            $this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0],$this->ldapcharset);
+            $this->phone      = $this->convToOutputCharset($result[0][$this->attr_phone][0],$this->ldapcharset);
+            $this->skype      = $this->convToOutputCharset($result[0][$this->attr_skype][0],$this->ldapcharset);
+            $this->fax        = $this->convToOutputCharset($result[0][$this->attr_fax][0],$this->ldapcharset);
+            $this->mail       = $this->convToOutputCharset($result[0][$this->attr_mail][0],$this->ldapcharset);
+            $this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0],$this->ldapcharset);
+
+            $this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0],$this->ldapcharset));
+            if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
+            {
+                $this->pwdlastset = ($result[0]["pwdlastset"][0] != 0)?$this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0],$this->ldapcharset)):0;
+            }
+            else
+            {
+                $this->pwdlastset = -1;
+            }
+            if (!$this->name && !$this->login) $this->pwdlastset = -1;
+            $this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0],$this->ldapcharset));
+
+            // FQDN domain
+            $domain = str_replace('dc=','',$this->domain);
+            $domain = str_replace(',','.',$domain);
+            $this->domainFQDN = $domain;
+
+            // Set ldapUserDn (each user can have a different dn)
+            //var_dump($result[0]);exit;
+            $this->ldapUserDN=$result[0]['dn'];
+
+            ldap_free_result($this->result);
+            return 1;
+        }
+    }
+
+
+    // helper methods
+
+    /**
+     * 	Returns the correct user identifier to use, based on the ldap server type
+     *
+     *	@return	string 				Login
+     */
+    function getUserIdentifier()
+    {
+        if ($this->serverType == "activedirectory") {
+            return $this->attr_sambalogin;
+        } else {
+            return $this->attr_login;
+        }
+    }
+
+    /**
+     * 	UserAccountControl Flgs to more human understandable form...
+     *
+     *	@param	string		$uacf		UACF
+     *	@return	void
+     */
+    function parseUACF($uacf)
+    {
+        //All flags array
+        $flags = array(
+            "TRUSTED_TO_AUTH_FOR_DELEGATION"  =>    16777216,
+            "PASSWORD_EXPIRED"                =>    8388608,
+            "DONT_REQ_PREAUTH"                =>    4194304,
+            "USE_DES_KEY_ONLY"                =>    2097152,
+            "NOT_DELEGATED"                   =>    1048576,
+            "TRUSTED_FOR_DELEGATION"          =>    524288,
+            "SMARTCARD_REQUIRED"              =>    262144,
+            "MNS_LOGON_ACCOUNT"               =>    131072,
+            "DONT_EXPIRE_PASSWORD"            =>    65536,
+            "SERVER_TRUST_ACCOUNT"            =>    8192,
+            "WORKSTATION_TRUST_ACCOUNT"       =>    4096,
+            "INTERDOMAIN_TRUST_ACCOUNT"       =>    2048,
+            "NORMAL_ACCOUNT"                  =>    512,
+            "TEMP_DUPLICATE_ACCOUNT"          =>    256,
+            "ENCRYPTED_TEXT_PWD_ALLOWED"      =>    128,
+            "PASSWD_CANT_CHANGE"              =>    64,
+            "PASSWD_NOTREQD"                  =>    32,
+            "LOCKOUT"                         =>    16,
+            "HOMEDIR_REQUIRED"                =>    8,
+            "ACCOUNTDISABLE"                  =>    2,
+            "SCRIPT"                          =>    1
+        );
+
+        //Parse flags to text
+        $retval = array();
+        while (list($flag, $val) = each($flags)) {
+            if ($uacf >= $val) {
+                $uacf -= $val;
+                $retval[$val] = $flag;
+            }
+        }
+
+        //Return human friendly flags
+        return($retval);
+    }
+
+    /**
+     * 	SamAccountType value to text
+     *
+     *	@param	string	$samtype	SamType
+     *	@return	string				Sam string
+     */
+    function parseSAT($samtype)
+    {
+        $stypes = array(
+            805306368    =>    "NORMAL_ACCOUNT",
+            805306369    =>    "WORKSTATION_TRUST",
+            805306370    =>    "INTERDOMAIN_TRUST",
+            268435456    =>    "SECURITY_GLOBAL_GROUP",
+            268435457    =>    "DISTRIBUTION_GROUP",
+            536870912    =>    "SECURITY_LOCAL_GROUP",
+            536870913    =>    "DISTRIBUTION_LOCAL_GROUP"
+        );
+
+        $retval = "";
+        while (list($sat, $val) = each($stypes)) {
+            if ($samtype == $sat) {
+                $retval = $val;
+                break;
+            }
+        }
+        if (empty($retval)) $retval = "UNKNOWN_TYPE_" . $samtype;
+
+        return($retval);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Convertit le temps ActiveDirectory en Unix timestamp
-	 *
-	 *	@param	string	$value		AD time to convert
-	 *	@return	integer				Unix timestamp
-	 */
-	function convert_time($value)
-	{
+    /**
+     *	Convertit le temps ActiveDirectory en Unix timestamp
+     *
+     *	@param	string	$value		AD time to convert
+     *	@return	integer				Unix timestamp
+     */
+    function convert_time($value)
+    {
         // phpcs:enable
-		$dateLargeInt=$value; // nano secondes depuis 1601 !!!!
-		$secsAfterADEpoch = $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
-		$ADToUnixConvertor=((1970-1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
-		$unixTimeStamp=intval($secsAfterADEpoch-$ADToUnixConvertor); // Unix time stamp
-		return $unixTimeStamp;
-	}
-
-
-	/**
-	 *  Convert a string into output/memory charset
-	 *
-	 *  @param	string	$str            String to convert
-	 *  @param	string	$pagecodefrom	Page code of src string
-	 *  @return string         			Converted string
-	 */
-	private function convToOutputCharset($str,$pagecodefrom='UTF-8')
-	{
-		global $conf;
-		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str=utf8_encode($str);
-		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str=utf8_decode($str);
-		return $str;
-	}
-
-	/**
-	 *  Convert a string from output/memory charset
-	 *
-	 *  @param	string	$str            String to convert
-	 *  @param	string	$pagecodeto		Page code for result string
-	 *  @return string         			Converted string
-	 */
-	function convFromOutputCharset($str,$pagecodeto='UTF-8')
-	{
-		global $conf;
-		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
-		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
-		return $str;
-	}
-
-
-	/**
-	 *	Return available value of group GID
-	 *
-	 *	@param	string	$keygroup	Key of group
-	 *	@return	int					gid number
-	 */
-	function getNextGroupGid($keygroup='LDAP_KEY_GROUPS')
-	{
-		global $conf;
-
-		if (empty($keygroup)) $keygroup='LDAP_KEY_GROUPS';
-
-		$search='('.$conf->global->$keygroup.'=*)';
-		$result = $this->search($this->groups,$search);
-		if ($result)
-		{
-			$c = $result['count'];
-			$gids = array();
-			for($i=0;$i<$c;$i++)
-			{
-				$gids[] = $result[$i]['gidnumber'][0];
-			}
-			rsort($gids);
-
-			return $gids[0]+1;
-		}
-
-		return 0;
-	}
+        $dateLargeInt=$value; // nano secondes depuis 1601 !!!!
+        $secsAfterADEpoch = $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
+        $ADToUnixConvertor=((1970-1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
+        $unixTimeStamp=intval($secsAfterADEpoch-$ADToUnixConvertor); // Unix time stamp
+        return $unixTimeStamp;
+    }
+
+
+    /**
+     *  Convert a string into output/memory charset
+     *
+     *  @param	string	$str            String to convert
+     *  @param	string	$pagecodefrom	Page code of src string
+     *  @return string         			Converted string
+     */
+    private function convToOutputCharset($str,$pagecodefrom='UTF-8')
+    {
+        global $conf;
+        if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str=utf8_encode($str);
+        if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str=utf8_decode($str);
+        return $str;
+    }
+
+    /**
+     *  Convert a string from output/memory charset
+     *
+     *  @param	string	$str            String to convert
+     *  @param	string	$pagecodeto		Page code for result string
+     *  @return string         			Converted string
+     */
+    function convFromOutputCharset($str,$pagecodeto='UTF-8')
+    {
+        global $conf;
+        if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
+        if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
+        return $str;
+    }
+
+
+    /**
+     *	Return available value of group GID
+     *
+     *	@param	string	$keygroup	Key of group
+     *	@return	int					gid number
+     */
+    function getNextGroupGid($keygroup='LDAP_KEY_GROUPS')
+    {
+        global $conf;
+
+        if (empty($keygroup)) $keygroup='LDAP_KEY_GROUPS';
+
+        $search='('.$conf->global->$keygroup.'=*)';
+        $result = $this->search($this->groups,$search);
+        if ($result)
+        {
+            $c = $result['count'];
+            $gids = array();
+            for($i=0;$i<$c;$i++)
+            {
+                $gids[] = $result[$i]['gidnumber'][0];
+            }
+            rsort($gids);
+
+            return $gids[0]+1;
+        }
+
+        return 0;
+    }
 }

Spacing +221 added lines, -221 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[]	Array of error strings
@@ -42,7 +42,7 @@ 
 	/**
 	 * Tableau des serveurs (IP addresses ou nom d'hotes)
 	 */
-	var $server=array();
+	var $server = array();
 
 	/**
 	 * Base DN (e.g. "dc=foo,dc=com")
@@ -97,7 +97,7 @@ 
 	var $uacf;
 	var $pwdlastset;
 
-	var $ldapcharset='UTF-8';	// LDAP should be UTF-8 encoded
+	var $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded
 
 
 	/**
@@ -118,8 +118,8 @@ 
 		global $conf;
 
 		// Server
-		if (! empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
-		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		if (!empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
+		if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
 		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
 		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
 		$this->dn                  = $conf->global->LDAP_SERVER_DN;
@@ -130,8 +130,8 @@ 
 		$this->people              = $conf->global->LDAP_USER_DN;
 		$this->groups              = $conf->global->LDAP_GROUP_DN;
 
-		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION;	// Filter on user
-		$this->filtermember        = $conf->global->LDAP_MEMBER_FILTER;		// Filter on member
+		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION; // Filter on user
+		$this->filtermember        = $conf->global->LDAP_MEMBER_FILTER; // Filter on member
 
 		// Users
 		$this->attr_login      = $conf->global->LDAP_FIELD_LOGIN; //unix
@@ -162,22 +162,22 @@ 
         // phpcs:enable
 		global $langs, $conf;
 
-		$connected=0;
-		$this->bind=0;
+		$connected = 0;
+		$this->bind = 0;
 
 		// Check parameters
 		if (count($this->server) == 0 || empty($this->server[0]))
 		{
-			$this->error='LDAP setup (file conf.php) is not complete';
+			$this->error = 'LDAP setup (file conf.php) is not complete';
 			dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
 			return -1;
 		}
 
-		if (! function_exists("ldap_connect"))
+		if (!function_exists("ldap_connect"))
 		{
-			$this->error='LDAPFunctionsNotAvailableOnPHP';
+			$this->error = 'LDAPFunctionsNotAvailableOnPHP';
 			dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
-			$return=-1;
+			$return = -1;
 		}
 
 		if (empty($this->error))
@@ -196,9 +196,9 @@ 
 				if (is_resource($this->connection))
 				{
 					// Begin TLS if requested by the configuration
-					if (! empty($conf->global->LDAP_SERVER_USE_TLS))
+					if (!empty($conf->global->LDAP_SERVER_USE_TLS))
 					{
-						if (! ldap_start_tls($this->connection))
+						if (!ldap_start_tls($this->connection))
 						{
 							dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
 							$connected = 0;
@@ -213,18 +213,18 @@ 
 
 					if ($this->serverType == "activedirectory")
 					{
-						$result=$this->setReferrals();
-						dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser." password=".preg_replace('/./','*',$this->searchPassword),LOG_DEBUG);
-						$this->result=$this->bindauth($this->searchUser,$this->searchPassword);
+						$result = $this->setReferrals();
+						dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser." password=".preg_replace('/./', '*', $this->searchPassword), LOG_DEBUG);
+						$this->result = $this->bindauth($this->searchUser, $this->searchPassword);
 						if ($this->result)
 						{
-							$this->bind=$this->result;
-							$connected=2;
+							$this->bind = $this->result;
+							$connected = 2;
 							break;
 						}
 						else
 						{
-							$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+							$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
 					}
 					else
@@ -232,51 +232,51 @@ 
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
 						{
-							dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser." password=".preg_replace('/./','*',$this->searchPassword),LOG_DEBUG);
-							$this->result=$this->bindauth($this->searchUser,$this->searchPassword);
+							dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser." password=".preg_replace('/./', '*', $this->searchPassword), LOG_DEBUG);
+							$this->result = $this->bindauth($this->searchUser, $this->searchPassword);
 							if ($this->result)
 							{
-								$this->bind=$this->result;
-								$connected=2;
+								$this->bind = $this->result;
+								$connected = 2;
 								break;
 							}
 							else
 							{
-								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
 						// Try in anonymous
-						if (! $this->bind)
+						if (!$this->bind)
 						{
-							dol_syslog(get_class($this)."::connect_bind try bind on ".$host,LOG_DEBUG);
-							$result=$this->bind();
+							dol_syslog(get_class($this)."::connect_bind try bind on ".$host, LOG_DEBUG);
+							$result = $this->bind();
 							if ($result)
 							{
-								$this->bind=$this->result;
-								$connected=1;
+								$this->bind = $this->result;
+								$connected = 1;
 								break;
 							}
 							else
 							{
-								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
+								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
 					}
 				}
 
-				if (! $connected) $this->close();
+				if (!$connected) $this->close();
 			}
 		}
 
 		if ($connected)
 		{
-			$return=$connected;
+			$return = $connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
 		}
 		else
 		{
-			$this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
-			$return=-1;
+			$this->error = 'Failed to connect to LDAP'.($this->error ? ': '.$this->error : '');
+			$return = -1;
 			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
 		}
 		return $return;
@@ -292,7 +292,7 @@ 
 	 */
 	function close()
 	{
-		if ($this->connection && ! @ldap_close($this->connection))
+		if ($this->connection && !@ldap_close($this->connection))
 		{
 			return false;
 		}
@@ -310,11 +310,11 @@ 
 	 */
 	function bind()
 	{
-		if (! $this->result=@ldap_bind($this->connection))
+		if (!$this->result = @ldap_bind($this->connection))
 		{
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
-			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
 		}
 		else
@@ -333,13 +333,13 @@ 
 	 * @param	string	$pass			Password
 	 * @return	boolean					true or false
 	 */
-	function bindauth($bindDn,$pass)
+	function bindauth($bindDn, $pass)
 	{
-		if (! $this->result = @ldap_bind($this->connection, $bindDn, $pass))
+		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass))
 		{
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
-			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
 		}
 		else
@@ -355,7 +355,7 @@ 
 	 */
 	function unbind()
 	{
-		if (!$this->result=@ldap_unbind($this->connection))
+		if (!$this->result = @ldap_unbind($this->connection))
 		{
 			return false;
 		} else {
@@ -414,31 +414,31 @@ 
 	{
 		global $conf;
 
-		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',',$info));
+		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+		foreach ($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
 		}
 
-		$this->dump($dn,$info);
+		$this->dump($dn, $info);
 
 		//print_r($info);
-		$result=@ldap_add($this->connection, $dn, $info);
+		$result = @ldap_add($this->connection, $dn, $info);
 
 		if ($result)
 		{
@@ -449,7 +449,7 @@ 
 		{
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
-			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
+			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			dol_syslog(get_class($this)."::add failed: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -468,31 +468,31 @@ 
 	{
 		global $conf;
 
-		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',',$info));
+		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+		foreach ($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
 		}
 
-		$this->dump($dn,$info);
+		$this->dump($dn, $info);
 
 		//print_r($info);
-		$result=@ldap_modify($this->connection, $dn, $info);
+		$result = @ldap_modify($this->connection, $dn, $info);
 
 		if ($result)
 		{
@@ -501,7 +501,7 @@ 
 		}
 		else
 		{
-			$this->error=@ldap_error($this->connection);
+			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -522,27 +522,27 @@ 
 	{
 		global $conf;
 
-		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn?1:0));
+		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn ? 1 : 0));
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		$newrdn=$this->convFromOutputCharset($newrdn,$this->ldapcharset);
-		$newparent=$this->convFromOutputCharset($newparent,$this->ldapcharset);
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+		$newrdn = $this->convFromOutputCharset($newrdn, $this->ldapcharset);
+		$newparent = $this->convFromOutputCharset($newparent, $this->ldapcharset);
 
 		//print_r($info);
-		$result=@ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
+		$result = @ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
 
 		if ($result)
 		{
@@ -551,7 +551,7 @@ 
 		}
 		else
 		{
-			$this->error=@ldap_error($this->connection);
+			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -569,27 +569,27 @@ 
 	 *	@param	string	$newparent	New parent (ou=xxx,dc=aaa,dc=bbb) (for ldap_rename)
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-	function update($dn, $info, $user, $olddn, $newrdn=false, $newparent=false)
+	function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
 	{
 		global $conf;
 
 		dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
-		if (! $olddn || $olddn != $dn)
+		if (!$olddn || $olddn != $dn)
 		{
-			if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')
+			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
@@ -598,19 +598,19 @@ 
 			{
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
-				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn);	// If add fails, we do not try to delete old one
+				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
 			}
 		}
 		else
 		{
 			//$result = $this->delete($olddn);
-			$result = $this->add($dn, $info, $user);	// If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
-			$result = $this->modify($dn, $info, $user);	// We use add/modify instead of delete/add when olddn is received
+			$result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
+			$result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
 		}
 		if ($result <= 0)
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection)." ".$this->error;
-			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			//print_r($info);
 			return -1;
 		}
@@ -636,21 +636,21 @@ 
 		dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
 
-		$result=@ldap_delete($this->connection, $dn);
+		$result = @ldap_delete($this->connection, $dn);
 
 		if ($result) return 1;
 		return -1;
@@ -667,33 +667,33 @@ 
 	function dump_content($dn, $info)
 	{
         // phpcs:enable
-		$content='';
+		$content = '';
 
 		// Create file content
-		if (preg_match('/^ldap/',$this->server[0]))
+		if (preg_match('/^ldap/', $this->server[0]))
 		{
-			$target="-H ".join(',',$this->server);
+			$target = "-H ".join(',', $this->server);
 		}
 		else
 		{
-			$target="-h ".join(',',$this->server)." -p ".$this->serverPort;
+			$target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
 		}
-		$content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		$content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		$content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		if (in_array('localhost',$this->server)) $content.="# If commands fails to connect, try without -h and -p\n";
-		$content.="dn: ".$dn."\n";
-		foreach($info as $key => $value)
+		$content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+		$content .= "# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+		$content .= "# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
+		if (in_array('localhost', $this->server)) $content .= "# If commands fails to connect, try without -h and -p\n";
+		$content .= "dn: ".$dn."\n";
+		foreach ($info as $key => $value)
 		{
-			if (! is_array($value))
+			if (!is_array($value))
 			{
-				$content.="$key: $value\n";
+				$content .= "$key: $value\n";
 			}
 			else
 			{
-				foreach($value as $valuekey => $valuevalue)
+				foreach ($value as $valuekey => $valuevalue)
 				{
-					$content.="$key: $valuevalue\n";
+					$content .= "$key: $valuevalue\n";
 				}
 			}
 		}
@@ -712,18 +712,18 @@ 
 		global $conf;
 
 		// Create content
-		$content=$this->dump_content($dn, $info);
+		$content = $this->dump_content($dn, $info);
 
 		//Create file
-		$result=dol_mkdir($conf->ldap->dir_temp);
+		$result = dol_mkdir($conf->ldap->dir_temp);
 
-		$outputfile=$conf->ldap->dir_temp.'/ldapinput.in';
-		$fp=fopen($outputfile,"w");
+		$outputfile = $conf->ldap->dir_temp.'/ldapinput.in';
+		$fp = fopen($outputfile, "w");
 		if ($fp)
 		{
 			fputs($fp, $content);
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			return 1;
 		}
@@ -741,14 +741,14 @@ 
 	 * @param int		$timeout		Timeout in second (default 1s)
 	 * @return boolean				true or false
 	 */
-	function serverPing($host, $port=389, $timeout=1)
+	function serverPing($host, $port = 389, $timeout = 1)
 	{
 		// Replace ldaps:// by ssl://
-		if (preg_match('/^ldaps:\/\/([^\/]+)\/?$/',$host, $regs)) {
+		if (preg_match('/^ldaps:\/\/([^\/]+)\/?$/', $host, $regs)) {
 			$host = 'ssl://'.$regs[1];
 		}
 		// Remove ldap://
-		if (preg_match('/^ldap:\/\/([^\/]+)\/?$/',$host, $regs)) {
+		if (preg_match('/^ldap:\/\/([^\/]+)\/?$/', $host, $regs)) {
 			$host = $regs[1];
 		}
 		$op = @fsockopen($host, $port, $errno, $errstr, $timeout);
@@ -775,31 +775,31 @@ 
 	{
 		global $conf;
 
-		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',',$info));
+		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+		foreach ($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
 		}
 
-		$this->dump($dn,$info);
+		$this->dump($dn, $info);
 
 		//print_r($info);
-		$result=@ldap_mod_add($this->connection, $dn, $info);
+		$result = @ldap_mod_add($this->connection, $dn, $info);
 
 		if ($result)
 		{
@@ -808,7 +808,7 @@ 
 		}
 		else
 		{
-			$this->error=@ldap_error($this->connection);
+			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -827,31 +827,31 @@ 
 	{
 		global $conf;
 
-		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',',$info));
+		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+		foreach ($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
 		}
 
-		$this->dump($dn,$info);
+		$this->dump($dn, $info);
 
 		//print_r($info);
-		$result=@ldap_mod_replace($this->connection, $dn, $info);
+		$result = @ldap_mod_replace($this->connection, $dn, $info);
 
 		if ($result)
 		{
@@ -860,7 +860,7 @@ 
 		}
 		else
 		{
-			$this->error=@ldap_error($this->connection);
+			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -879,31 +879,31 @@ 
 	{
 		global $conf;
 
-		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',',$info));
+		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
-		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
-		foreach($info as $key => $val)
+		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
+		foreach ($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
 		}
 
-		$this->dump($dn,$info);
+		$this->dump($dn, $info);
 
 		//print_r($info);
-		$result=@ldap_mod_del($this->connection, $dn, $info);
+		$result = @ldap_mod_del($this->connection, $dn, $info);
 
 		if ($result)
 		{
@@ -912,7 +912,7 @@ 
 		}
 		else
 		{
-			$this->error=@ldap_error($this->connection);
+			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -925,21 +925,21 @@ 
 	 *	@param	string	$filter		Filter
 	 *	@return	int|array			<0 or false if KO, array if OK
 	 */
-	function getAttribute($dn,$filter)
+	function getAttribute($dn, $filter)
 	{
 		// Check parameters
-		if (! $this->connection)
+		if (!$this->connection)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -2;
 		}
-		if (! $this->bind)
+		if (!$this->bind)
 		{
-			$this->error="NotConnected";
+			$this->error = "NotConnected";
 			return -3;
 		}
 
-		$search = ldap_search($this->connection,$dn,$filter);
+		$search = ldap_search($this->connection, $dn, $filter);
 
 		// Only one entry should ever be returned
 		$entry = ldap_first_entry($this->connection, $search);
@@ -948,11 +948,11 @@ 
 		{
 			$this->ldapErrorCode = -1;
 			$this->ldapErrorText = "Couldn't find entry";
-			return 0;  // Couldn't find entry...
+			return 0; // Couldn't find entry...
 		}
 
 		// Get values
-		if (! $values = ldap_get_attributes($this->connection, $entry))
+		if (!$values = ldap_get_attributes($this->connection, $entry))
 		{
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
@@ -970,13 +970,13 @@ 
 	 * 	@param	string	$attribute			Attributes
 	 * 	@return void
 	 */
-	function getAttributeValues($filterrecord,$attribute)
+	function getAttributeValues($filterrecord, $attribute)
 	{
-		$attributes=array();
+		$attributes = array();
 		$attributes[0] = $attribute;
 
 		// We need to search for this user in order to get their entry.
-		$this->result = @ldap_search($this->connection,$this->people,$filterrecord,$attributes);
+		$this->result = @ldap_search($this->connection, $this->people, $filterrecord, $attributes);
 
 		// Pourquoi cette ligne ?
 		//$info = ldap_get_entries($this->connection, $this->result);
@@ -988,11 +988,11 @@ 
 		{
 			$this->ldapErrorCode = -1;
 			$this->ldapErrorText = "Couldn't find user";
-			return false;  // Couldn't find the user...
+			return false; // Couldn't find the user...
 		}
 
 		// Get values
-		if (! $values = @ldap_get_values($this->connection, $entry, $attribute))
+		if (!$values = @ldap_get_values($this->connection, $entry, $attribute))
 		{
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
@@ -1015,11 +1015,11 @@ 
 	 *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
 	 *	@return	array						Array of [id_record][ldap_field]=value
 	 */
-	function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0, $attributeAsArray=array())
+	function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
 	{
-		$fulllist=array();
+		$fulllist = array();
 
-		dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).") activefilter=".$activefilter);
+		dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',', $attributeArray).") activefilter=".$activefilter);
 
 		// if the directory is AD, then bind first with the search user first
 		if ($this->serverType == "activedirectory")
@@ -1029,7 +1029,7 @@ 
 		}
 
 		// Define filter
-		if (! empty($activefilter))
+		if (!empty($activefilter))
 		{
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
@@ -1052,8 +1052,8 @@ 
 		if (is_array($attributeArray))
 		{
 			// Return list with required fields
-			$attributeArray=array_values($attributeArray);	// This is to force to have index reordered from 0 (not make ldap_search fails)
-			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
+			$attributeArray = array_values($attributeArray); // This is to force to have index reordered from 0 (not make ldap_search fails)
+			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
 		}
@@ -1077,35 +1077,35 @@ 
 
 		for ($i = 0; $i < $info["count"]; $i++)
 		{
-			$recordid=$this->convToOutputCharset($info[$i][$useridentifier][0],$this->ldapcharset);
+			$recordid = $this->convToOutputCharset($info[$i][$useridentifier][0], $this->ldapcharset);
 			if ($recordid)
 			{
 				//print "Found record with key $useridentifier=".$recordid."<br>\n";
-				$fulllist[$recordid][$useridentifier]=$recordid;
+				$fulllist[$recordid][$useridentifier] = $recordid;
 
 				// Add to the array for each attribute in my list
 				$num = count($attributeArray);
 				for ($j = 0; $j < $num; $j++)
 				{
-					$keyattributelower=strtolower($attributeArray[$j]);
+					$keyattributelower = strtolower($attributeArray[$j]);
 					//print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."<br>\n";
 
 					//permet de recuperer le SID avec Active Directory
 					if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
 					{
 						$objectsid = $this->getObjectSid($recordid);
-						$fulllist[$recordid][$attributeArray[$j]]    = $objectsid;
+						$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
 					}
 					else
 					{
-						if(in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
+						if (in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
-							foreach($info[$i][$keyattributelower] as $key => $value) {
-								$valueTab[$key] = $this->convToOutputCharset($value,$this->ldapcharset);
+							foreach ($info[$i][$keyattributelower] as $key => $value) {
+								$valueTab[$key] = $this->convToOutputCharset($value, $this->ldapcharset);
 							}
 							$fulllist[$recordid][$attributeArray[$j]] = $valueTab;
 						} else {
-							$fulllist[$recordid][$attributeArray[$j]] = $this->convToOutputCharset($info[$i][$keyattributelower][0],$this->ldapcharset);
+							$fulllist[$recordid][$attributeArray[$j]] = $this->convToOutputCharset($info[$i][$keyattributelower][0], $this->ldapcharset);
 						}
 					}
 				}
@@ -1125,8 +1125,8 @@ 
 	 */
 	function littleEndian($hex)
 	{
-		for ($x=dol_strlen($hex)-2; $x >= 0; $x=$x-2) {
-			$result .= substr($hex,$x,2);
+		for ($x = dol_strlen($hex) - 2; $x >= 0; $x = $x - 2) {
+			$result .= substr($hex, $x, 2);
 		}
 		return $result;
 	}
@@ -1141,7 +1141,7 @@ 
 	 */
 	function getObjectSid($ldapUser)
 	{
-		$criteria =  '('.$this->getUserIdentifier().'='.$ldapUser.')';
+		$criteria = '('.$this->getUserIdentifier().'='.$ldapUser.')';
 		$justthese = array("objectsid");
 
 		// if the directory is AD, then bind first with the search user first
@@ -1200,14 +1200,14 @@ 
 	 */
 	function binSIDtoText($binsid)
 	{
-		$hex_sid=bin2hex($binsid);
-		$rev = hexdec(substr($hex_sid,0,2));          // Get revision-part of SID
-		$subcount = hexdec(substr($hex_sid,2,2));    // Get count of sub-auth entries
-		$auth = hexdec(substr($hex_sid,4,12));      // SECURITY_NT_AUTHORITY
+		$hex_sid = bin2hex($binsid);
+		$rev = hexdec(substr($hex_sid, 0, 2)); // Get revision-part of SID
+		$subcount = hexdec(substr($hex_sid, 2, 2)); // Get count of sub-auth entries
+		$auth = hexdec(substr($hex_sid, 4, 12)); // SECURITY_NT_AUTHORITY
 		$result = "$rev-$auth";
-		for ($x=0;$x < $subcount; $x++)
+		for ($x = 0; $x < $subcount; $x++)
 		{
-			$result .= "-".hexdec($this->littleEndian(substr($hex_sid,16+($x*8),8)));  // get all SECURITY_NT_AUTHORITY
+			$result .= "-".hexdec($this->littleEndian(substr($hex_sid, 16 + ($x * 8), 8))); // get all SECURITY_NT_AUTHORITY
 		}
 		return $result;
 	}
@@ -1228,8 +1228,8 @@ 
 	{
 		dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
 
-		$checkDn=$this->convFromOutputCharset($checkDn,$this->ldapcharset);
-		$filter=$this->convFromOutputCharset($filter,$this->ldapcharset);
+		$checkDn = $this->convFromOutputCharset($checkDn, $this->ldapcharset);
+		$filter = $this->convFromOutputCharset($filter, $this->ldapcharset);
 
 		// if the directory is AD, then bind first with the search user first
 		if ($this->serverType == "activedirectory") {
@@ -1239,7 +1239,7 @@ 
 		$this->result = @ldap_search($this->connection, $checkDn, $filter);
 
 		$result = @ldap_get_entries($this->connection, $this->result);
-		if (! $result)
+		if (!$result)
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
@@ -1260,7 +1260,7 @@ 
 	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
 	 *		@return	int					>0 if OK, <0 if KO
 	 */
-	function fetch($user,$filter)
+	function fetch($user, $filter)
 	{
 		// Perform the search and get the entry handles
 
@@ -1269,10 +1269,10 @@ 
 			$this->bindauth($this->searchUser, $this->searchPassword);
 		}
 
-		$searchDN = $this->people;    // TODO Why searching in people then domain ?
+		$searchDN = $this->people; // TODO Why searching in people then domain ?
 
 		$result = '';
-		$i=0;
+		$i = 0;
 		while ($i <= 2)
 		{
 			dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter);
@@ -1291,7 +1291,7 @@ 
 				return -1;
 			}
 
-			if (! $result)
+			if (!$result)
 			{
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
@@ -1303,42 +1303,42 @@ 
 			}
 		}
 
-		if (! $result)
+		if (!$result)
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
 		}
 		else
 		{
-			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0],$this->ldapcharset);
-			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0],$this->ldapcharset);
-			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0],$this->ldapcharset);
-			$this->phone      = $this->convToOutputCharset($result[0][$this->attr_phone][0],$this->ldapcharset);
-			$this->skype      = $this->convToOutputCharset($result[0][$this->attr_skype][0],$this->ldapcharset);
-			$this->fax        = $this->convToOutputCharset($result[0][$this->attr_fax][0],$this->ldapcharset);
-			$this->mail       = $this->convToOutputCharset($result[0][$this->attr_mail][0],$this->ldapcharset);
-			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0],$this->ldapcharset);
+			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0], $this->ldapcharset);
+			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0], $this->ldapcharset);
+			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0], $this->ldapcharset);
+			$this->phone      = $this->convToOutputCharset($result[0][$this->attr_phone][0], $this->ldapcharset);
+			$this->skype      = $this->convToOutputCharset($result[0][$this->attr_skype][0], $this->ldapcharset);
+			$this->fax        = $this->convToOutputCharset($result[0][$this->attr_fax][0], $this->ldapcharset);
+			$this->mail       = $this->convToOutputCharset($result[0][$this->attr_mail][0], $this->ldapcharset);
+			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0], $this->ldapcharset);
 
-			$this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0],$this->ldapcharset));
+			$this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0], $this->ldapcharset));
 			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
 			{
-				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0)?$this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0],$this->ldapcharset)):0;
+				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
 			}
 			else
 			{
 				$this->pwdlastset = -1;
 			}
 			if (!$this->name && !$this->login) $this->pwdlastset = -1;
-			$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0],$this->ldapcharset));
+			$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0], $this->ldapcharset));
 
 			// FQDN domain
-			$domain = str_replace('dc=','',$this->domain);
-			$domain = str_replace(',','.',$domain);
+			$domain = str_replace('dc=', '', $this->domain);
+			$domain = str_replace(',', '.', $domain);
 			$this->domainFQDN = $domain;
 
 			// Set ldapUserDn (each user can have a different dn)
 			//var_dump($result[0]);exit;
-			$this->ldapUserDN=$result[0]['dn'];
+			$this->ldapUserDN = $result[0]['dn'];
 
 			ldap_free_result($this->result);
 			return 1;
@@ -1433,7 +1433,7 @@ 
 				break;
 			}
 		}
-		if (empty($retval)) $retval = "UNKNOWN_TYPE_" . $samtype;
+		if (empty($retval)) $retval = "UNKNOWN_TYPE_".$samtype;
 
 		return($retval);
 	}
@@ -1448,10 +1448,10 @@ 
 	function convert_time($value)
 	{
         // phpcs:enable
-		$dateLargeInt=$value; // nano secondes depuis 1601 !!!!
+		$dateLargeInt = $value; // nano secondes depuis 1601 !!!!
 		$secsAfterADEpoch = $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
-		$ADToUnixConvertor=((1970-1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
-		$unixTimeStamp=intval($secsAfterADEpoch-$ADToUnixConvertor); // Unix time stamp
+		$ADToUnixConvertor = ((1970 - 1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
+		$unixTimeStamp = intval($secsAfterADEpoch - $ADToUnixConvertor); // Unix time stamp
 		return $unixTimeStamp;
 	}
 
@@ -1463,11 +1463,11 @@ 
 	 *  @param	string	$pagecodefrom	Page code of src string
 	 *  @return string         			Converted string
 	 */
-	private function convToOutputCharset($str,$pagecodefrom='UTF-8')
+	private function convToOutputCharset($str, $pagecodefrom = 'UTF-8')
 	{
 		global $conf;
-		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str=utf8_encode($str);
-		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str=utf8_decode($str);
+		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str = utf8_encode($str);
+		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str = utf8_decode($str);
 		return $str;
 	}
 
@@ -1478,11 +1478,11 @@ 
 	 *  @param	string	$pagecodeto		Page code for result string
 	 *  @return string         			Converted string
 	 */
-	function convFromOutputCharset($str,$pagecodeto='UTF-8')
+	function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
 	{
 		global $conf;
-		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
-		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
+		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_decode($str);
+		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str = utf8_encode($str);
 		return $str;
 	}
 
@@ -1493,25 +1493,25 @@ 
 	 *	@param	string	$keygroup	Key of group
 	 *	@return	int					gid number
 	 */
-	function getNextGroupGid($keygroup='LDAP_KEY_GROUPS')
+	function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')
 	{
 		global $conf;
 
-		if (empty($keygroup)) $keygroup='LDAP_KEY_GROUPS';
+		if (empty($keygroup)) $keygroup = 'LDAP_KEY_GROUPS';
 
-		$search='('.$conf->global->$keygroup.'=*)';
-		$result = $this->search($this->groups,$search);
+		$search = '('.$conf->global->$keygroup.'=*)';
+		$result = $this->search($this->groups, $search);
 		if ($result)
 		{
 			$c = $result['count'];
 			$gids = array();
-			for($i=0;$i<$c;$i++)
+			for ($i = 0; $i < $c; $i++)
 			{
 				$gids[] = $result[$i]['gidnumber'][0];
 			}
 			rsort($gids);
 
-			return $gids[0]+1;
+			return $gids[0] + 1;
 		}
 
 		return 0;

Braces +109 added lines, -90 removed lines

@@ -118,8 +118,12 @@ 
 		global $conf;
 
 		// Server
-		if (! empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
-		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		if (! empty($conf->global->LDAP_SERVER_HOST)) {
+		    $this->server[] = $conf->global->LDAP_SERVER_HOST;
+		}
+		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) {
+		    $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		}
 		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
 		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
 		$this->dn                  = $conf->global->LDAP_SERVER_DN;
@@ -185,13 +189,18 @@ 
 			// Loop on each ldap server
 			foreach ($this->server as $key => $host)
 			{
-				if ($connected) break;
-				if (empty($host)) continue;
+				if ($connected) {
+				    break;
+				}
+				if (empty($host)) {
+				    continue;
+				}
 
 				if ($this->serverPing($host, $this->serverPort) === true) {
 					$this->connection = ldap_connect($host, $this->serverPort);
+				} else {
+				    continue;
 				}
-				else continue;
 
 				if (is_resource($this->connection))
 				{
@@ -221,13 +230,11 @@ 
 							$this->bind=$this->result;
 							$connected=2;
 							break;
-						}
-						else
+						} else
 						{
 							$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
-					}
-					else
+					} else
 					{
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
@@ -239,8 +246,7 @@ 
 								$this->bind=$this->result;
 								$connected=2;
 								break;
-							}
-							else
+							} else
 							{
 								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
@@ -255,8 +261,7 @@ 
 								$this->bind=$this->result;
 								$connected=1;
 								break;
-							}
-							else
+							} else
 							{
 								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
@@ -264,7 +269,9 @@ 
 					}
 				}
 
-				if (! $connected) $this->close();
+				if (! $connected) {
+				    $this->close();
+				}
 			}
 		}
 
@@ -272,8 +279,7 @@ 
 		{
 			$return=$connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
 			$return=-1;
@@ -295,8 +301,7 @@ 
 		if ($this->connection && ! @ldap_close($this->connection))
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -316,8 +321,7 @@ 
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -341,8 +345,7 @@ 
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -432,7 +435,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -444,8 +449,7 @@ 
 		{
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
@@ -486,7 +490,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -498,8 +504,7 @@ 
 		{
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
@@ -548,8 +553,7 @@ 
 		{
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
@@ -593,15 +597,16 @@ 
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-			}
-			else
+			} else
 			{
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
-				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn);	// If add fails, we do not try to delete old one
+				if ($result > 0 && $olddn && $olddn != $dn) {
+				    $result = $this->delete($olddn);
+				}
+				// If add fails, we do not try to delete old one
 			}
-		}
-		else
+		} else
 		{
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user);	// If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
@@ -613,8 +618,7 @@ 
 			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 			//print_r($info);
 			return -1;
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::update done successfully");
 			return 1;
@@ -652,7 +656,9 @@ 
 
 		$result=@ldap_delete($this->connection, $dn);
 
-		if ($result) return 1;
+		if ($result) {
+		    return 1;
+		}
 		return -1;
 	}
 
@@ -673,23 +679,23 @@ 
 		if (preg_match('/^ldap/',$this->server[0]))
 		{
 			$target="-H ".join(',',$this->server);
-		}
-		else
+		} else
 		{
 			$target="-h ".join(',',$this->server)." -p ".$this->serverPort;
 		}
 		$content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
 		$content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
 		$content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		if (in_array('localhost',$this->server)) $content.="# If commands fails to connect, try without -h and -p\n";
+		if (in_array('localhost',$this->server)) {
+		    $content.="# If commands fails to connect, try without -h and -p\n";
+		}
 		$content.="dn: ".$dn."\n";
 		foreach($info as $key => $value)
 		{
 			if (! is_array($value))
 			{
 				$content.="$key: $value\n";
-			}
-			else
+			} else
 			{
 				foreach($value as $valuekey => $valuevalue)
 				{
@@ -723,11 +729,11 @@ 
 		{
 			fputs($fp, $content);
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+						@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 			return 1;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -752,7 +758,10 @@ 
 			$host = $regs[1];
 		}
 		$op = @fsockopen($host, $port, $errno, $errstr, $timeout);
-		if (!$op) return false; //DC is N/A
+		if (!$op) {
+		    return false;
+		}
+		//DC is N/A
 		else {
 			fclose($op); //explicitly close open socket connection
 			return true; //DC is up & running, we can safely connect with ldap_connect
@@ -793,7 +802,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -805,8 +816,7 @@ 
 		{
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
@@ -845,7 +855,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -857,8 +869,7 @@ 
 		{
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
@@ -897,7 +908,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -909,8 +922,7 @@ 
 		{
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
@@ -1034,17 +1046,14 @@ 
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
 				$filter = '('.$this->filter.')';
-			}
-			elseif (((string) $activefilter == 'member') && $this->filter)
+			} elseif (((string) $activefilter == 'member') && $this->filter)
 			{
 				$filter = '('.$this->filtermember.')';
-			}
-			else	// If this->filter is empty, make fiter on * (all)
+			} else	// If this->filter is empty, make fiter on * (all)
 			{
 				$filter = '('.$useridentifier.'=*)';
 			}
-		}
-		else
+		} else
 		{
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
@@ -1056,8 +1065,7 @@ 
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
-		}
-		else
+		} else
 		{
 			// Return list with fields selected by default
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
@@ -1095,8 +1103,7 @@ 
 					{
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]]    = $objectsid;
-					}
-					else
+					} else
 					{
 						if(in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
@@ -1170,8 +1177,7 @@ 
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
+			} else
 			{
 				$i++;
 				$i++;
@@ -1183,8 +1189,7 @@ 
 			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
-		}
-		else
+		} else
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return '?';
@@ -1243,8 +1248,7 @@ 
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
+		} else
 		{
 			ldap_free_result($this->result);
 			return $result;
@@ -1280,11 +1284,13 @@ 
 			if ($this->result)
 			{
 				$result = @ldap_get_entries($this->connection, $this->result);
-				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
-				else dol_syslog('Ldap::fetch search returns but found no records');
+				if ($result['count'] > 0) {
+				    dol_syslog('Ldap::fetch search found '.$result['count'].' records');
+				} else {
+				    dol_syslog('Ldap::fetch search returns but found no records');
+				}
 				//var_dump($result);exit;
-			}
-			else
+			} else
 			{
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				dol_syslog(get_class($this)."::fetch search fails");
@@ -1296,8 +1302,7 @@ 
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
+			} else
 			{
 				break;
 			}
@@ -1307,8 +1312,7 @@ 
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0],$this->ldapcharset);
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0],$this->ldapcharset);
@@ -1320,15 +1324,18 @@ 
 			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0],$this->ldapcharset);
 
 			$this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0],$this->ldapcharset));
-			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
+			if (isset($result[0]["pwdlastset"][0])) {
+			    // If expiration on password exists
 			{
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0)?$this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0],$this->ldapcharset)):0;
 			}
-			else
+			} else
 			{
 				$this->pwdlastset = -1;
 			}
-			if (!$this->name && !$this->login) $this->pwdlastset = -1;
+			if (!$this->name && !$this->login) {
+			    $this->pwdlastset = -1;
+			}
 			$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0],$this->ldapcharset));
 
 			// FQDN domain
@@ -1433,7 +1440,9 @@ 
 				break;
 			}
 		}
-		if (empty($retval)) $retval = "UNKNOWN_TYPE_" . $samtype;
+		if (empty($retval)) {
+		    $retval = "UNKNOWN_TYPE_" . $samtype;
+		}
 
 		return($retval);
 	}
@@ -1466,8 +1475,12 @@ 
 	private function convToOutputCharset($str,$pagecodefrom='UTF-8')
 	{
 		global $conf;
-		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str=utf8_encode($str);
-		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str=utf8_decode($str);
+		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
+		    $str=utf8_encode($str);
+		}
+		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
+		    $str=utf8_decode($str);
+		}
 		return $str;
 	}
 
@@ -1481,8 +1494,12 @@ 
 	function convFromOutputCharset($str,$pagecodeto='UTF-8')
 	{
 		global $conf;
-		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
-		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
+		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
+		    $str=utf8_decode($str);
+		}
+		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
+		    $str=utf8_encode($str);
+		}
 		return $str;
 	}
 
@@ -1497,7 +1514,9 @@ 
 	{
 		global $conf;
 
-		if (empty($keygroup)) $keygroup='LDAP_KEY_GROUPS';
+		if (empty($keygroup)) {
+		    $keygroup='LDAP_KEY_GROUPS';
+		}
 
 		$search='('.$conf->global->$keygroup.'=*)';
 		$result = $this->search($this->groups,$search);

dolibarr/htdocs/core/class/antivir.class.php

Indentation +95 added lines, -95 removed lines

@@ -30,73 +30,73 @@ 
  */
 class AntiVir
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
-
-	/**
-	 * @var string Used to return message
-	 */
-	public $output;
-
-	/**
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
+
+    /**
+     * @var string Used to return message
+     */
+    public $output;
+
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Scan a file with antivirus.
-	 *  This function runs the command defined in setup. This antivirus command must return 0 if OK.
-	 *  Return also true (virus found) if file end with '.virus' (so we can make test safely).
-	 *
-	 *	@param	string	$file		File to scan
-	 *	@return	int					<0 if KO (-98 if error, -99 if virus), 0 if OK
-	 */
-	function dol_avscan_file($file)
-	{
+    /**
+     *	Scan a file with antivirus.
+     *  This function runs the command defined in setup. This antivirus command must return 0 if OK.
+     *  Return also true (virus found) if file end with '.virus' (so we can make test safely).
+     *
+     *	@param	string	$file		File to scan
+     *	@return	int					<0 if KO (-98 if error, -99 if virus), 0 if OK
+     */
+    function dol_avscan_file($file)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$return = 0;
+        $return = 0;
 
-		if (preg_match('/\.virus$/i', $file))
-		{
-		    $this->errors[] = 'File has an extension saying file is a virus';
-		    return -97;
-		}
+        if (preg_match('/\.virus$/i', $file))
+        {
+            $this->errors[] = 'File has an extension saying file is a virus';
+            return -97;
+        }
 
-		$fullcommand=$this->getCliCommand($file);
-		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
+        $fullcommand=$this->getCliCommand($file);
+        //$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
         $fullcommand.=' 2>&1';      // This is to get error output
 
-		$output=array();
-		$return_var=0;
+        $output=array();
+        $return_var=0;
         $safemode=ini_get("safe_mode");
-		// Create a clean fullcommand
-		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode?"on":"off"));
-		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
-		$lastline=exec($fullcommand, $output, $return_var);
+        // Create a clean fullcommand
+        dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode?"on":"off"));
+        // Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
+        $lastline=exec($fullcommand, $output, $return_var);
 
         //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
-		/*
+        /*
         $outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();
 		$handle = fopen($outputfile, 'w');
 		if ($handle)
@@ -126,62 +126,62 @@ 
 		}
 		*/
 
-		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
+        dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
 
-		$returncodevirus=1;
-		if ($return_var == $returncodevirus)	// Virus found
-		{
-			$this->errors=$output;
-			return -99;
-		}
+        $returncodevirus=1;
+        if ($return_var == $returncodevirus)	// Virus found
+        {
+            $this->errors=$output;
+            return -99;
+        }
 
-		if ($return_var > 0)					// If other error
-		{
-			$this->errors=$output;
-			return -98;
-		}
+        if ($return_var > 0)					// If other error
+        {
+            $this->errors=$output;
+            return -98;
+        }
 
-		// If return code = 0
-		return 1;
-	}
+        // If return code = 0
+        return 1;
+    }
 
 
 
-	/**
-	 *	Get full Command Line to run
-	 *
-	 *	@param	string	$file		File to scan
-	 *	@return	string				Full command line to run
-	 */
-	function getCliCommand($file)
-	{
-		global $conf;
+    /**
+     *	Get full Command Line to run
+     *
+     *	@param	string	$file		File to scan
+     *	@return	string				Full command line to run
+     */
+    function getCliCommand($file)
+    {
+        global $conf;
 
-		$maxreclevel = 5 ; 			// maximal recursion level
-		$maxfiles = 1000; 			// maximal number of files to be scanned within archive
-		$maxratio = 200; 			// maximal compression ratio
-		$bz2archivememlim = 0; 		// limit memory usage for bzip2 (0/1)
-		$maxfilesize = 10485760; 	// archived files larger than this value (in bytes) will not be scanned
+        $maxreclevel = 5 ; 			// maximal recursion level
+        $maxfiles = 1000; 			// maximal number of files to be scanned within archive
+        $maxratio = 200; 			// maximal compression ratio
+        $bz2archivememlim = 0; 		// limit memory usage for bzip2 (0/1)
+        $maxfilesize = 10485760; 	// archived files larger than this value (in bytes) will not be scanned
 
-		$command=$conf->global->MAIN_ANTIVIRUS_COMMAND;
-		$param=$conf->global->MAIN_ANTIVIRUS_PARAM;
+        $command=$conf->global->MAIN_ANTIVIRUS_COMMAND;
+        $param=$conf->global->MAIN_ANTIVIRUS_PARAM;
 
-		$param=preg_replace('/%maxreclevel/',$maxreclevel,$param);
-		$param=preg_replace('/%maxfiles/',$maxfiles,$param);
-		$param=preg_replace('/%maxratio/',$maxratio,$param);
-		$param=preg_replace('/%bz2archivememlim/',$bz2archivememlim,$param);
-		$param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
-		$param=preg_replace('/%file/',trim($file),$param);
+        $param=preg_replace('/%maxreclevel/',$maxreclevel,$param);
+        $param=preg_replace('/%maxfiles/',$maxfiles,$param);
+        $param=preg_replace('/%maxratio/',$maxratio,$param);
+        $param=preg_replace('/%bz2archivememlim/',$bz2archivememlim,$param);
+        $param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
+        $param=preg_replace('/%file/',trim($file),$param);
 
-		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
-			$param=$param." ".escapeshellarg(trim($file));
+        if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
+            $param=$param." ".escapeshellarg(trim($file));
 
-		if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
+        if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
 
-		$ret=$command.' '.$param;
-		//$ret=$command.' '.$param.' 2>&1';
+        $ret=$command.' '.$param;
+        //$ret=$command.' '.$param.' 2>&1';
         //print "xx".$ret."xx";exit;
 
-		return $ret;
-	}
+        return $ret;
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -57,7 +57,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -82,17 +82,17 @@ 
 		    return -97;
 		}
 
-		$fullcommand=$this->getCliCommand($file);
+		$fullcommand = $this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
-        $fullcommand.=' 2>&1';      // This is to get error output
+        $fullcommand .= ' 2>&1'; // This is to get error output
 
-		$output=array();
-		$return_var=0;
-        $safemode=ini_get("safe_mode");
+		$output = array();
+		$return_var = 0;
+        $safemode = ini_get("safe_mode");
 		// Create a clean fullcommand
-		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode?"on":"off"));
+		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode ? "on" : "off"));
 		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
-		$lastline=exec($fullcommand, $output, $return_var);
+		$lastline = exec($fullcommand, $output, $return_var);
 
         //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
@@ -126,18 +126,18 @@ 
 		}
 		*/
 
-		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
+		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',', $output));
 
-		$returncodevirus=1;
+		$returncodevirus = 1;
 		if ($return_var == $returncodevirus)	// Virus found
 		{
-			$this->errors=$output;
+			$this->errors = $output;
 			return -99;
 		}
 
 		if ($return_var > 0)					// If other error
 		{
-			$this->errors=$output;
+			$this->errors = $output;
 			return -98;
 		}
 
@@ -157,28 +157,28 @@ 
 	{
 		global $conf;
 
-		$maxreclevel = 5 ; 			// maximal recursion level
-		$maxfiles = 1000; 			// maximal number of files to be scanned within archive
-		$maxratio = 200; 			// maximal compression ratio
-		$bz2archivememlim = 0; 		// limit memory usage for bzip2 (0/1)
-		$maxfilesize = 10485760; 	// archived files larger than this value (in bytes) will not be scanned
+		$maxreclevel = 5; // maximal recursion level
+		$maxfiles = 1000; // maximal number of files to be scanned within archive
+		$maxratio = 200; // maximal compression ratio
+		$bz2archivememlim = 0; // limit memory usage for bzip2 (0/1)
+		$maxfilesize = 10485760; // archived files larger than this value (in bytes) will not be scanned
 
-		$command=$conf->global->MAIN_ANTIVIRUS_COMMAND;
-		$param=$conf->global->MAIN_ANTIVIRUS_PARAM;
+		$command = $conf->global->MAIN_ANTIVIRUS_COMMAND;
+		$param = $conf->global->MAIN_ANTIVIRUS_PARAM;
 
-		$param=preg_replace('/%maxreclevel/',$maxreclevel,$param);
-		$param=preg_replace('/%maxfiles/',$maxfiles,$param);
-		$param=preg_replace('/%maxratio/',$maxratio,$param);
-		$param=preg_replace('/%bz2archivememlim/',$bz2archivememlim,$param);
-		$param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
-		$param=preg_replace('/%file/',trim($file),$param);
+		$param = preg_replace('/%maxreclevel/', $maxreclevel, $param);
+		$param = preg_replace('/%maxfiles/', $maxfiles, $param);
+		$param = preg_replace('/%maxratio/', $maxratio, $param);
+		$param = preg_replace('/%bz2archivememlim/', $bz2archivememlim, $param);
+		$param = preg_replace('/%maxfilesize/', $maxfilesize, $param);
+		$param = preg_replace('/%file/', trim($file), $param);
 
-		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
-			$param=$param." ".escapeshellarg(trim($file));
+		if (!preg_match('/%file/', $conf->global->MAIN_ANTIVIRUS_PARAM))
+			$param = $param." ".escapeshellarg(trim($file));
 
-		if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
+		if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails.
 
-		$ret=$command.' '.$param;
+		$ret = $command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';
         //print "xx".$ret."xx";exit;
 

Braces +13 added lines, -5 removed lines

@@ -129,15 +129,19 @@ 
 		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
 
 		$returncodevirus=1;
-		if ($return_var == $returncodevirus)	// Virus found
+		if ($return_var == $returncodevirus) {
+		    // Virus found
 		{
 			$this->errors=$output;
+		}
 			return -99;
 		}
 
-		if ($return_var > 0)					// If other error
+		if ($return_var > 0) {
+		    // If other error
 		{
 			$this->errors=$output;
+		}
 			return -98;
 		}
 
@@ -173,10 +177,14 @@ 
 		$param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
 		$param=preg_replace('/%file/',trim($file),$param);
 
-		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
-			$param=$param." ".escapeshellarg(trim($file));
+		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM)) {
+					$param=$param." ".escapeshellarg(trim($file));
+		}
 
-		if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
+		if (preg_match("/\s/",$command)) {
+		    $command=escapeshellarg($command);
+		}
+		// Use quotes on command. Using escapeshellcmd fails.
 
 		$ret=$command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';

dolibarr/htdocs/core/class/workboardresponse.class.php

Indentation +40 added lines, -40 removed lines

@@ -25,51 +25,51 @@
 class WorkboardResponse
 {
 
-	/**
-	 * Image URL to represent the board item
-	 * @var string
-	 */
-	public $img;
+    /**
+     * Image URL to represent the board item
+     * @var string
+     */
+    public $img;
 
-	/**
-	 * Label of the warning
-	 * @var string
-	 */
-	public $label;
+    /**
+     * Label of the warning
+     * @var string
+     */
+    public $label;
 
-	/**
-	 * URL to list to do items
-	 * @var string
-	 */
-	public $url;
+    /**
+     * URL to list to do items
+     * @var string
+     */
+    public $url;
 
-	/**
-	 * (optional) If set, to do late items will link to this url
-	 * @var string
-	 */
-	public $url_late;
+    /**
+     * (optional) If set, to do late items will link to this url
+     * @var string
+     */
+    public $url_late;
 
-	/**
-	 * Delay time to mark an item as late. In number of days.
-	 * @var double
-	 */
-	public $warning_delay;
+    /**
+     * Delay time to mark an item as late. In number of days.
+     * @var double
+     */
+    public $warning_delay;
 
-	/**
-	 * Number of items to do
-	 * @var int
-	 */
-	public $nbtodo = 0;
+    /**
+     * Number of items to do
+     * @var int
+     */
+    public $nbtodo = 0;
 
-	/**
-	 * Number of to do items which are late
-	 * @var int
-	 */
-	public $nbtodolate = 0;
+    /**
+     * Number of to do items which are late
+     * @var int
+     */
+    public $nbtodolate = 0;
 
-	/**
-	 * total price of items
-	 * @var int
-	 */
-	public $total = 0;
+    /**
+     * total price of items
+     * @var int
+     */
+    public $total = 0;
 }