alxarafe / alixar

dolibarr/htdocs/core/db/DoliDB.class.php

Indentation +250 added lines, -250 removed lines

@@ -29,273 +29,273 @@
  */
 abstract class DoliDB implements Database
 {
-	/** @var resource Database handler */
-	public $db;
-	/** @var string Database type */
-	public $type;
-	/** @var string Charset used to force charset when creating database */
-	public $forcecharset='utf8';
-	/** @var string Collate used to force collate when creating database */
-	public $forcecollate='utf8_unicode_ci';
-	/** @var resource Resultset of last query */
-	private $_results;
-	/** @var bool true if connected, else false */
-	public $connected;
-	/** @var bool true if database selected, else false */
-	public $database_selected;
-	/** @var string Selected database name */
-	public $database_name;
-	/** @var string Database username */
-	public $database_user;
-	/** @var string Database host */
-	public $database_host;
-	/** @var int Database port */
-	public $database_port;
-	/** @var int >=1 if a transaction is opened, 0 otherwise */
-	public $transaction_opened;
-	/** @var string Last successful query */
-	public $lastquery;
-	/** @var string Last failed query */
-	public $lastqueryerror;
-	/** @var string Last error message */
-	public $lasterror;
-	/** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
-	public $lasterrno;
+    /** @var resource Database handler */
+    public $db;
+    /** @var string Database type */
+    public $type;
+    /** @var string Charset used to force charset when creating database */
+    public $forcecharset='utf8';
+    /** @var string Collate used to force collate when creating database */
+    public $forcecollate='utf8_unicode_ci';
+    /** @var resource Resultset of last query */
+    private $_results;
+    /** @var bool true if connected, else false */
+    public $connected;
+    /** @var bool true if database selected, else false */
+    public $database_selected;
+    /** @var string Selected database name */
+    public $database_name;
+    /** @var string Database username */
+    public $database_user;
+    /** @var string Database host */
+    public $database_host;
+    /** @var int Database port */
+    public $database_port;
+    /** @var int >=1 if a transaction is opened, 0 otherwise */
+    public $transaction_opened;
+    /** @var string Last successful query */
+    public $lastquery;
+    /** @var string Last failed query */
+    public $lastqueryerror;
+    /** @var string Last error message */
+    public $lasterror;
+    /** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
+    public $lasterrno;
 
-	/** @var bool Status */
-	public $ok;
-	/** @var string */
-	public $error;
+    /** @var bool Status */
+    public $ok;
+    /** @var string */
+    public $error;
 
-	/**
-	 *	Format a SQL IF
-	 *
-	 *	@param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
-	 *	@param	string	$resok          resultat si test egal
-	 *	@param	string	$resko          resultat si test non egal
-	 *	@return	string          		SQL string
-	 */
-	function ifsql($test,$resok,$resko)
-	{
-		return 'IF('.$test.','.$resok.','.$resko.')';
-	}
+    /**
+     *	Format a SQL IF
+     *
+     *	@param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
+     *	@param	string	$resok          resultat si test egal
+     *	@param	string	$resko          resultat si test non egal
+     *	@return	string          		SQL string
+     */
+    function ifsql($test,$resok,$resko)
+    {
+        return 'IF('.$test.','.$resok.','.$resko.')';
+    }
 
-	/**
-	 *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
-	 *   Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 *   @param	    int		$param      	Date TMS to convert
-	 *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
-	 */
-	function idate($param)
-	{
-		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
-	}
+    /**
+     *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
+     *   Function to use to build INSERT, UPDATE or WHERE predica
+     *
+     *   @param	    int		$param      	Date TMS to convert
+     *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
+     */
+    function idate($param)
+    {
+        // TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
+        return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+    }
 
-	/**
-	 *	Return last error code
-	 *
-	 *	@return	    string	lasterrno
-	 */
-	function lasterrno()
-	{
-		return $this->lasterrno;
-	}
+    /**
+     *	Return last error code
+     *
+     *	@return	    string	lasterrno
+     */
+    function lasterrno()
+    {
+        return $this->lasterrno;
+    }
 
-	/**
-	 * Start transaction
-	 *
-	 * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
-	 */
-	function begin()
-	{
-		if (! $this->transaction_opened)
-		{
-			$ret=$this->query("BEGIN");
-			if ($ret)
-			{
-				$this->transaction_opened++;
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-				dol_syslog('',0,1);
-			}
-			return $ret;
-		}
-		else
-		{
-			$this->transaction_opened++;
-			dol_syslog('',0,1);
-			return 1;
-		}
-	}
+    /**
+     * Start transaction
+     *
+     * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
+     */
+    function begin()
+    {
+        if (! $this->transaction_opened)
+        {
+            $ret=$this->query("BEGIN");
+            if ($ret)
+            {
+                $this->transaction_opened++;
+                dol_syslog("BEGIN Transaction",LOG_DEBUG);
+                dol_syslog('',0,1);
+            }
+            return $ret;
+        }
+        else
+        {
+            $this->transaction_opened++;
+            dol_syslog('',0,1);
+            return 1;
+        }
+    }
 
-	/**
-	 * Validate a database transaction
-	 *
-	 * @param	string	$log		Add more log to default log line
-	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
-	 */
-	function commit($log='')
-	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
-		{
-			$ret=$this->query("COMMIT");
-			if ($ret)
-			{
-				$this->transaction_opened=0;
-				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
-				return 1;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			$this->transaction_opened--;
-			return 1;
-		}
-	}
+    /**
+     * Validate a database transaction
+     *
+     * @param	string	$log		Add more log to default log line
+     * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
+     */
+    function commit($log='')
+    {
+        dol_syslog('',0,-1);
+        if ($this->transaction_opened<=1)
+        {
+            $ret=$this->query("COMMIT");
+            if ($ret)
+            {
+                $this->transaction_opened=0;
+                dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            $this->transaction_opened--;
+            return 1;
+        }
+    }
 
-	/**
-	 *	Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * 	@param	string			$log		Add more log to default log line
-	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
-	 */
-	function rollback($log='')
-	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
-		{
-			$ret=$this->query("ROLLBACK");
-			$this->transaction_opened=0;
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
-			return $ret;
-		}
-		else
-		{
-			$this->transaction_opened--;
-			return 1;
-		}
-	}
+    /**
+     *	Annulation d'une transaction et retour aux anciennes valeurs
+     *
+     * 	@param	string			$log		Add more log to default log line
+     * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+     */
+    function rollback($log='')
+    {
+        dol_syslog('',0,-1);
+        if ($this->transaction_opened<=1)
+        {
+            $ret=$this->query("ROLLBACK");
+            $this->transaction_opened=0;
+            dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+            return $ret;
+        }
+        else
+        {
+            $this->transaction_opened--;
+            return 1;
+        }
+    }
 
-	/**
-	 *	Define limits and offset of request
-	 *
-	 *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
-	 *	@param	int		$offset     Numero of line from where starting fetch
-	 *	@return	string      		String with SQL syntax to add a limit and offset
-	 */
-	function plimit($limit=0,$offset=0)
-	{
-		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
-	}
+    /**
+     *	Define limits and offset of request
+     *
+     *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
+     *	@param	int		$offset     Numero of line from where starting fetch
+     *	@return	string      		String with SQL syntax to add a limit and offset
+     */
+    function plimit($limit=0,$offset=0)
+    {
+        global $conf;
+        if (empty($limit)) return "";
+        if ($limit < 0) $limit=$conf->liste_limit;
+        if ($offset > 0) return " LIMIT $offset,$limit ";
+        else return " LIMIT $limit ";
+    }
 
-	/**
-	 *	Return version of database server into an array
-	 *
-	 *	@return	        array  		Version array
-	 */
-	function getVersionArray()
-	{
-		return preg_split("/[\.,-]/",$this->getVersion());
-	}
+    /**
+     *	Return version of database server into an array
+     *
+     *	@return	        array  		Version array
+     */
+    function getVersionArray()
+    {
+        return preg_split("/[\.,-]/",$this->getVersion());
+    }
 
-	/**
-	 *	Return last request executed with query()
-	 *
-	 *	@return	string					Last query
-	 */
-	function lastquery()
-	{
-		return $this->lastquery;
-	}
+    /**
+     *	Return last request executed with query()
+     *
+     *	@return	string					Last query
+     */
+    function lastquery()
+    {
+        return $this->lastquery;
+    }
 
-	/**
-	 * Define sort criteria of request
-	 *
-	 * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
-	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
-	 * @return	string						String to provide syntax of a sort sql string
-	 */
-	function order($sortfield=null,$sortorder=null)
-	{
-		if (! empty($sortfield))
-		{
-			$return='';
-			$fields=explode(',',$sortfield);
-			$orders=explode(',',$sortorder);
-			$i=0;
-			foreach($fields as $val)
-			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+    /**
+     * Define sort criteria of request
+     *
+     * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
+     * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
+     * @return	string						String to provide syntax of a sort sql string
+     */
+    function order($sortfield=null,$sortorder=null)
+    {
+        if (! empty($sortfield))
+        {
+            $return='';
+            $fields=explode(',',$sortfield);
+            $orders=explode(',',$sortorder);
+            $i=0;
+            foreach($fields as $val)
+            {
+                if (! $return) $return.=' ORDER BY ';
+                else $return.=', ';
 
-				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+                $return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
-				$tmpsortorder = trim($orders[$i]);
+                $tmpsortorder = trim($orders[$i]);
 
-				// Only ASC and DESC values are valid SQL
-				if (strtoupper($tmpsortorder) === 'ASC') {
-					$return .= ' ASC';
-				} elseif (strtoupper($tmpsortorder) === 'DESC') {
-					$return .= ' DESC';
-				}
+                // Only ASC and DESC values are valid SQL
+                if (strtoupper($tmpsortorder) === 'ASC') {
+                    $return .= ' ASC';
+                } elseif (strtoupper($tmpsortorder) === 'DESC') {
+                    $return .= ' DESC';
+                }
 
-				$i++;
-			}
-			return $return;
-		}
-		else
-		{
-			return '';
-		}
-	}
+                $i++;
+            }
+            return $return;
+        }
+        else
+        {
+            return '';
+        }
+    }
 
-	/**
-	 *	Return last error label
-	 *
-	 *	@return	    string		Last error
-	 */
-	function lasterror()
-	{
-		return $this->lasterror;
-	}
+    /**
+     *	Return last error label
+     *
+     *	@return	    string		Last error
+     */
+    function lasterror()
+    {
+        return $this->lasterror;
+    }
 
-	/**
-	 *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1 and gmt=0
-	 * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
-	 *
-	 * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
-	 *	@return	int|string						Date TMS or ''
-	 */
-	function jdate($string, $gm=false)
-	{
-		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
-		$string=preg_replace('/([^0-9])/i','',$string);
-		$tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
-		return $date;
-	}
+    /**
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
+     *
+     * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+     *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
+     *	@return	int|string						Date TMS or ''
+     */
+    function jdate($string, $gm=false)
+    {
+        // TODO GMT must set param gm to true by default
+        if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+        $string=preg_replace('/([^0-9])/i','',$string);
+        $tmp=$string.'000000';
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
+        return $date;
+    }
 
-	/**
-	 *	Return last query in error
-	 *
-	 *	@return	    string	lastqueryerror
-	 */
-	function lastqueryerror()
-	{
-		return $this->lastqueryerror;
-	}
+    /**
+     *	Return last query in error
+     *
+     *	@return	    string	lastqueryerror
+     */
+    function lastqueryerror()
+    {
+        return $this->lastqueryerror;
+    }
 }
 

Braces +24 added lines, -17 removed lines

@@ -120,8 +120,7 @@ 
 				dol_syslog('',0,1);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened++;
 			dol_syslog('',0,1);
@@ -146,13 +145,11 @@ 
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -174,8 +171,7 @@ 
 			$this->transaction_opened=0;
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -192,10 +188,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+		    return "";
+		}
+		if ($limit < 0) {
+		    $limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+		    return " LIMIT $offset,$limit ";
+		} else {
+		    return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -235,8 +238,11 @@ 
 			$i=0;
 			foreach($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (! $return) {
+				    $return.=' ORDER BY ';
+				} else {
+				    $return.=', ';
+				}
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
@@ -252,8 +258,7 @@ 
 				$i++;
 			}
 			return $return;
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -281,7 +286,9 @@ 
 	function jdate($string, $gm=false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+		if ($string==0 || $string=="0000-00-00 00:00:00") {
+		    return '';
+		}
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

Spacing +40 added lines, -40 removed lines

@@ -26,7 +26,7 @@ 
  * \brief 		Class file to manage Dolibarr database access
  */
 
-require_once DOL_BASE_PATH . '/core/db/Database.interface.php';
+require_once DOL_BASE_PATH.'/core/db/Database.interface.php';
 
 /**
  * Class to manage Dolibarr database access
@@ -38,9 +38,9 @@ 
 	/** @var string Database type */
 	public $type;
 	/** @var string Charset used to force charset when creating database */
-	public $forcecharset='utf8';
+	public $forcecharset = 'utf8';
 	/** @var string Collate used to force collate when creating database */
-	public $forcecollate='utf8_unicode_ci';
+	public $forcecollate = 'utf8_unicode_ci';
 	/** @var resource Resultset of last query */
 	private $_results;
 	/** @var bool true if connected, else false */
@@ -79,7 +79,7 @@ 
 	 *	@param	string	$resko          resultat si test non egal
 	 *	@return	string          		SQL string
 	 */
-	function ifsql($test,$resok,$resko)
+	function ifsql($test, $resok, $resko)
 	{
 		return 'IF('.$test.','.$resok.','.$resko.')';
 	}
@@ -94,7 +94,7 @@ 
 	function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
@@ -114,21 +114,21 @@ 
 	 */
 	function begin()
 	{
-		if (! $this->transaction_opened)
+		if (!$this->transaction_opened)
 		{
-			$ret=$this->query("BEGIN");
+			$ret = $this->query("BEGIN");
 			if ($ret)
 			{
 				$this->transaction_opened++;
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-				dol_syslog('',0,1);
+				dol_syslog("BEGIN Transaction", LOG_DEBUG);
+				dol_syslog('', 0, 1);
 			}
 			return $ret;
 		}
 		else
 		{
 			$this->transaction_opened++;
-			dol_syslog('',0,1);
+			dol_syslog('', 0, 1);
 			return 1;
 		}
 	}
@@ -139,16 +139,16 @@ 
 	 * @param	string	$log		Add more log to default log line
 	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
 	 */
-	function commit($log='')
+	function commit($log = '')
 	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
+		dol_syslog('', 0, -1);
+		if ($this->transaction_opened <= 1)
 		{
-			$ret=$this->query("COMMIT");
+			$ret = $this->query("COMMIT");
 			if ($ret)
 			{
-				$this->transaction_opened=0;
-				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+				$this->transaction_opened = 0;
+				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
 			}
 			else
@@ -169,14 +169,14 @@ 
 	 * 	@param	string			$log		Add more log to default log line
 	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
 	 */
-	function rollback($log='')
+	function rollback($log = '')
 	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
+		dol_syslog('', 0, -1);
+		if ($this->transaction_opened <= 1)
 		{
-			$ret=$this->query("ROLLBACK");
-			$this->transaction_opened=0;
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+			$ret = $this->query("ROLLBACK");
+			$this->transaction_opened = 0;
+			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
 		}
 		else
@@ -193,11 +193,11 @@ 
 	 *	@param	int		$offset     Numero of line from where starting fetch
 	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-	function plimit($limit=0,$offset=0)
+	function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
 		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
+		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT $offset,$limit ";
 		else return " LIMIT $limit ";
 	}
@@ -209,7 +209,7 @@ 
 	 */
 	function getVersionArray()
 	{
-		return preg_split("/[\.,-]/",$this->getVersion());
+		return preg_split("/[\.,-]/", $this->getVersion());
 	}
 
 	/**
@@ -229,20 +229,20 @@ 
 	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
-	function order($sortfield=null,$sortorder=null)
+	function order($sortfield = null, $sortorder = null)
 	{
-		if (! empty($sortfield))
+		if (!empty($sortfield))
 		{
-			$return='';
-			$fields=explode(',',$sortfield);
-			$orders=explode(',',$sortorder);
-			$i=0;
-			foreach($fields as $val)
+			$return = '';
+			$fields = explode(',', $sortfield);
+			$orders = explode(',', $sortorder);
+			$i = 0;
+			foreach ($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (!$return) $return .= ' ORDER BY ';
+				else $return .= ', ';
 
-				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val);
 
 				$tmpsortorder = trim($orders[$i]);
 
@@ -282,13 +282,13 @@ 
 	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 *	@return	int|string						Date TMS or ''
 	 */
-	function jdate($string, $gm=false)
+	function jdate($string, $gm = false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
-		$string=preg_replace('/([^0-9])/i','',$string);
-		$tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
+		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
+		$string = preg_replace('/([^0-9])/i', '', $string);
+		$tmp = $string.'000000';
+		$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), $gm);
 		return $date;
 	}
 

dolibarr/htdocs/core/actions_builddoc.inc.php

Indentation +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
     }
     else
     {
-   		// Reload to get all modified line records and be ready for hooks
+            // Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
         /*if (empty($object->id) || ! $object->id > 0)
@@ -50,10 +50,10 @@ 
         }*/
 
         // Save last template used to generate document
-    	if (GETPOST('model','alpha'))
-    	{
-    	    $object->setDocModel($user, GETPOST('model','alpha'));
-    	}
+        if (GETPOST('model','alpha'))
+        {
+            $object->setDocModel($user, GETPOST('model','alpha'));
+        }
 
         // Special case to force bank account
         //if (property_exists($object, 'fk_bank'))
@@ -91,17 +91,17 @@ 
         }
         else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
-        	{
-	            setEventMessages($langs->trans("FileGenerated"), null);
+            if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+            {
+                setEventMessages($langs->trans("FileGenerated"), null);
 
-	            $urltoredirect = $_SERVER['REQUEST_URI'];
-	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
+                $urltoredirect = $_SERVER['REQUEST_URI'];
+                $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+                $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
 
-	            header('Location: '.$urltoredirect.'#builddoc');
-	            exit;
-        	}
+                header('Location: '.$urltoredirect.'#builddoc');
+                exit;
+            }
         }
     }
 }

Spacing +24 added lines, -24 removed lines

@@ -34,9 +34,9 @@ 
 if ($action == 'builddoc' && $permissioncreate)
 {
 
-    if (is_numeric(GETPOST('model','alpha')))
+    if (is_numeric(GETPOST('model', 'alpha')))
     {
-        $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
+        $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
     }
     else
     {
@@ -50,44 +50,44 @@ 
         }*/
 
         // Save last template used to generate document
-    	if (GETPOST('model','alpha'))
+    	if (GETPOST('model', 'alpha'))
     	{
-    	    $object->setDocModel($user, GETPOST('model','alpha'));
+    	    $object->setDocModel($user, GETPOST('model', 'alpha'));
     	}
 
         // Special case to force bank account
         //if (property_exists($object, 'fk_bank'))
         //{
-            if (GETPOST('fk_bank','int')) { // this field may come from an external module
-                $object->fk_bank = GETPOST('fk_bank','int');
-            } else if (! empty($object->fk_account)) {
+            if (GETPOST('fk_bank', 'int')) { // this field may come from an external module
+                $object->fk_bank = GETPOST('fk_bank', 'int');
+            } else if (!empty($object->fk_account)) {
                 $object->fk_bank = $object->fk_account;
             }
         //}
 
         $outputlangs = $langs;
-        $newlang='';
+        $newlang = '';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
-        if (! empty($newlang))
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
+        if (!empty($newlang))
         {
-            $outputlangs = new Translate("",$conf);
+            $outputlangs = new Translate("", $conf);
             $outputlangs->setDefaultLang($newlang);
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) $hidedetails = 0;
+        if (empty($hidedesc)) $hidedesc = 0;
+        if (empty($hideref)) $hideref = 0;
+        if (empty($moreparams)) $moreparams = null;
 
-        $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
-            $action='';
+            $action = '';
         }
         else
         {
@@ -97,7 +97,7 @@ 
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
+	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
 
 	            header('Location: '.$urltoredirect.'#builddoc');
 	            exit;
@@ -111,7 +111,7 @@ 
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    if (empty($object->id) || ! $object->id > 0)
+    if (empty($object->id) || !$object->id > 0)
     {
         // Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -119,9 +119,9 @@ 
     }
 
     $langs->load("other");
-    $filetodelete=GETPOST('file','alpha');
-    $file =	$upload_dir	. '/' .	$filetodelete;
-    $ret=dol_delete_file($file,0,0,0,$object);
+    $filetodelete = GETPOST('file', 'alpha');
+    $file = $upload_dir.'/'.$filetodelete;
+    $ret = dol_delete_file($file, 0, 0, 0, $object);
     if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
     else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
 

Braces +33 added lines, -14 removed lines

@@ -37,8 +37,7 @@ 
     if (is_numeric(GETPOST('model','alpha')))
     {
         $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
-    }
-    else
+    } else
     {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -68,9 +67,17 @@ 
         $outputlangs = $langs;
         $newlang='';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+            $newlang=GETPOST('lang_id','aZ09');
+        }
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) {
+            $newlang=$object->thirdparty->default_lang;
+        }
+        // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+            $newlang=$object->default_lang;
+        }
+        // for thirdparty
         if (! empty($newlang))
         {
             $outputlangs = new Translate("",$conf);
@@ -78,22 +85,31 @@ 
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) {
+            $hidedetails=0;
+        }
+        if (empty($hidedesc)) {
+            $hidedesc=0;
+        }
+        if (empty($hideref)) {
+            $hideref=0;
+        }
+        if (empty($moreparams)) {
+            $moreparams=null;
+        }
 
         $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action='';
-        }
-        else
+        } else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+        	if (empty($donotredirect)) {
+        	    // This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
+        	}
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
@@ -122,8 +138,11 @@ 
     $filetodelete=GETPOST('file','alpha');
     $file =	$upload_dir	. '/' .	$filetodelete;
     $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    if ($ret) {
+        setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+    } else {
+        setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    }
 
     // Make a redirect to avoid to keep the remove_file into the url that create side effects
     $urltoredirect = $_SERVER['REQUEST_URI'];

dolibarr/htdocs/core/search_page.php

Indentation +3 added lines, -3 removed lines

@@ -78,8 +78,8 @@ 
 else
 {
     $usedbyinclude = 1; // Used into next include
-	$showtitlebefore = GETPOST('showtitlebefore','int');
-	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
+    $showtitlebefore = GETPOST('showtitlebefore','int');
+    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
     $accesskeyalreadyassigned=array();
     foreach($arrayresult as $key => $val)
@@ -103,7 +103,7 @@ 
 $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
 if (empty($reshook))
 {
-	$searchform.=$hookmanager->resPrint;
+    $searchform.=$hookmanager->resPrint;
 }
 else $searchform=$hookmanager->resPrint;
 

Spacing +29 added lines, -29 removed lines

@@ -27,32 +27,32 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 
 /*
  * View
  */
 
-$title=$langs->trans("Search");
+$title = $langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head='<!-- Quick access -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = '<!-- Quick access -->'."\n";
+$arrayofjs = array();
+$arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 
@@ -61,7 +61,7 @@ 
 print '<div>';
 //print '<br>';
 
-$nbofsearch=0;
+$nbofsearch = 0;
 
 // Instantiate hooks of thirdparty module
 $hookmanager->initHooks(array('searchform'));
@@ -71,41 +71,41 @@ 
 
 if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 {
-    if (! is_object($form)) $form=new Form($db);
-    $selected=-1;
-    $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
+    if (!is_object($form)) $form = new Form($db);
+    $selected = -1;
+    $searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 }
 else
 {
     $usedbyinclude = 1; // Used into next include
-	$showtitlebefore = GETPOST('showtitlebefore','int');
+	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
-    $accesskeyalreadyassigned=array();
-    foreach($arrayresult as $key => $val)
+    $accesskeyalreadyassigned = array();
+    foreach ($arrayresult as $key => $val)
     {
-        $tmp=explode('?', $val['url']);
-        $urlaction=$tmp[0];
-        $keysearch='search_all';
+        $tmp = explode('?', $val['url']);
+        $urlaction = $tmp[0];
+        $keysearch = 'search_all';
 
-        $accesskey='';
-        if (! $accesskeyalreadyassigned[$val['label'][0]])
+        $accesskey = '';
+        if (!$accesskeyalreadyassigned[$val['label'][0]])
         {
-            $accesskey=$val['label'][0];
-            $accesskeyalreadyassigned[$accesskey]=$accesskey;
+            $accesskey = $val['label'][0];
+            $accesskeyalreadyassigned[$accesskey] = $accesskey;
         }
-        $searchform.=printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('',$val['img'],'', 0, 1), $showtitlebefore);
+        $searchform .= printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('', $val['img'], '', 0, 1), $showtitlebefore);
     }
 }
 
 // Execute hook printSearchForm
-$parameters=array('searchform'=>$searchform);
-$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('searchform'=>$searchform);
+$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 if (empty($reshook))
 {
-	$searchform.=$hookmanager->resPrint;
+	$searchform .= $hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
+else $searchform = $hookmanager->resPrint;
 
 
 print "\n";

Braces +19 added lines, -8 removed lines

@@ -27,15 +27,24 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+    $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
@@ -69,13 +78,14 @@ 
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
+if ($conf->use_javascript_ajax && 1 == 2) {
+    // select2 is ko with jmobile
 {
     if (! is_object($form)) $form=new Form($db);
+}
     $selected=-1;
     $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else
+} else
 {
     $usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore','int');
@@ -104,8 +114,9 @@ 
 if (empty($reshook))
 {
 	$searchform.=$hookmanager->resPrint;
+} else {
+    $searchform=$hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
 
 
 print "\n";

dolibarr/htdocs/core/actions_extrafields.inc.php

Indentation +262 added lines, -262 removed lines

@@ -40,23 +40,23 @@ 
 // Add attribute
 if ($action == 'add')
 {
-	if ($_POST["button"] != $langs->trans("Cancel"))
-	{
-	    // Check values
-		if (! $type)
-		{
-			$error++;
-			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
-			$action = 'create';
-		}
-		if ($type=='varchar' && $extrasize <= 0)
-		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
-		}
+    if ($_POST["button"] != $langs->trans("Cancel"))
+    {
+        // Check values
+        if (! $type)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+            $action = 'create';
+        }
+        if ($type=='varchar' && $extrasize <= 0)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+            $action = 'edit';
+        }
         if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
@@ -73,168 +73,168 @@ 
         }
         if ($type=='select' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectType");
+            $action = 'create';
         }
         if ($type=='sellist' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+            $action = 'create';
         }
         if ($type=='checkbox' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+            $action = 'create';
         }
         if ($type=='link' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForLinkType");
+            $action = 'create';
         }
         if ($type=='radio' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
-        	$action = 'create';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForRadioType");
+            $action = 'create';
         }
         if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
-        	// Construct array for parameter (value of select list)
-    		$parameters = $param;
-    		$parameters_array = explode("\r\n",$parameters);
-    		foreach($parameters_array as $param_ligne)
-    		{
-    			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/',$param_ligne,$matches))
-	    			{
-	    				if (count($matches[0])>1) {
-	    					$error++;
-	    					$langs->load("errors");
-	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	    					$action = 'create';
-	    				}
-	    			}
-	    			else
-	    			{
-	    				$error++;
-	    				$langs->load("errors");
-	    				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	    				$action = 'create';
-	    			}
-    			}
-    		}
+            // Construct array for parameter (value of select list)
+            $parameters = $param;
+            $parameters_array = explode("\r\n",$parameters);
+            foreach($parameters_array as $param_ligne)
+            {
+                if (!empty($param_ligne)) {
+                    if (preg_match_all('/,/',$param_ligne,$matches))
+                    {
+                        if (count($matches[0])>1) {
+                            $error++;
+                            $langs->load("errors");
+                            $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                            $action = 'create';
+                        }
+                    }
+                    else
+                    {
+                        $error++;
+                        $langs->load("errors");
+                        $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                        $action = 'create';
+                    }
+                }
+            }
         }
 
-	    if (! $error)
-	    {
-    		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
-    		{
-    			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value','alpha');
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			}
-    			else
-    			{
-    				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					list($key,$value) = explode(',',$param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+        if (! $error)
+        {
+            // attrname must be alphabetical and lower case only
+            if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
+            {
+                // Construct array for parameter (value of select list)
+                $default_value = GETPOST('default_value','alpha');
+                $parameters = $param;
+                $parameters_array = explode("\r\n",$parameters);
+                //In sellist we have only one line and it can have come to do SQL expression
+                if ($type=='sellist') {
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        $params['options'] = array($parameters=>null);
+                    }
+                }
+                else
+                {
+                    //Esle it's separated key/value and coma list
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        list($key,$value) = explode(',',$param_ligne);
+                        $params['options'][$key] = $value;
+                    }
+                }
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+                // Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+                $visibility = GETPOST('list', 'alpha');
+                if ($type == 'separate') $visibility=3;
 
                 $result=$extrafields->addExtraField(
-                	GETPOST('attrname', 'alpha'),
-                	GETPOST('label', 'alpha'),
-                	$type,
-                	GETPOST('pos', 'int'),
-                	$extrasize,
-                	$elementtype,
-                	(GETPOST('unique', 'alpha')?1:0),
-                	(GETPOST('required', 'alpha')?1:0),
-                	$default_value,
-                	$params,
-                	(GETPOST('alwayseditable', 'alpha')?1:0),
-                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	$visibility,
-					GETPOST('help','alpha'),
+                    GETPOST('attrname', 'alpha'),
+                    GETPOST('label', 'alpha'),
+                    $type,
+                    GETPOST('pos', 'int'),
+                    $extrasize,
+                    $elementtype,
+                    (GETPOST('unique', 'alpha')?1:0),
+                    (GETPOST('required', 'alpha')?1:0),
+                    $default_value,
+                    $params,
+                    (GETPOST('alwayseditable', 'alpha')?1:0),
+                    (GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                    $visibility,
+                    GETPOST('help','alpha'),
                     GETPOST('computed_value','alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha')?0:''),
+                    (GETPOST('entitycurrentorall', 'alpha')?0:''),
                     GETPOST('langfile', 'alpha'),
                     1,
                     (GETPOST('totalizable', 'alpha')?1:0)
                 );
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			}
-    			else
-    			{
+                if ($result > 0)
+                {
+                    setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+                    header("Location: ".$_SERVER["PHP_SELF"]);
+                    exit;
+                }
+                else
+                {
                     $error++;
-    			    $mesg=$extrafields->error;
+                    $mesg=$extrafields->error;
                     setEventMessages($mesg, null, 'errors');
-    			}
-    		}
-    		else
-    		{
+                }
+            }
+            else
+            {
                 $error++;
-    		    $langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    			$action = 'create';
-    		}
-	    }
-	    else
-	    {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
-	}
+                $langs->load("errors");
+                $mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
+                setEventMessages($mesg, null, 'errors');
+                $action = 'create';
+            }
+        }
+        else
+        {
+            setEventMessages($mesg, null, 'errors');
+        }
+    }
 }
 
 // Rename field
 if ($action == 'update')
 {
-	if ($_POST["button"] != $langs->trans("Cancel"))
-	{
+    if ($_POST["button"] != $langs->trans("Cancel"))
+    {
         // Check values
-		if (! $type)
-		{
-			$error++;
-			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
-			$action = 'edit';
-		}
-		if ($type=='varchar' && $extrasize <= 0)
-		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
-		}
-		if ($type=='varchar' && $extrasize > $maxsizestring)
+        if (! $type)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+            $action = 'edit';
+        }
+        if ($type=='varchar' && $extrasize <= 0)
+        {
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+            $action = 'edit';
+        }
+        if ($type=='varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
@@ -250,143 +250,143 @@ 
         }
         if ($type=='select' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectType");
+            $action = 'edit';
         }
         if ($type=='sellist' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+            $action = 'edit';
         }
         if ($type=='checkbox' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+            $action = 'edit';
         }
         if ($type=='radio' && !$param)
         {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
-        	$action = 'edit';
+            $error++;
+            $langs->load("errors");
+            $mesg[]=$langs->trans("ErrorNoValueForRadioType");
+            $action = 'edit';
         }
         if  ((($type=='radio') || ($type=='checkbox')) && $param)
         {
-        	// Construct array for parameter (value of select list)
-        	$parameters = $param;
-        	$parameters_array = explode("\r\n",$parameters);
-        	foreach($parameters_array as $param_ligne)
-        	{
-        		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/',$param_ligne,$matches))
-	        		{
-	        			if (count($matches[0])>1) {
-	        				$error++;
-	        				$langs->load("errors");
-	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	        				$action = 'edit';
-	        			}
-	        		}
-	        		else
-	        		{
-	        			$error++;
-	        			$langs->load("errors");
-	        			$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
-	        			$action = 'edit';
-	        		}
-        		}
-        	}
+            // Construct array for parameter (value of select list)
+            $parameters = $param;
+            $parameters_array = explode("\r\n",$parameters);
+            foreach($parameters_array as $param_ligne)
+            {
+                if (!empty($param_ligne)) {
+                    if (preg_match_all('/,/',$param_ligne,$matches))
+                    {
+                        if (count($matches[0])>1) {
+                            $error++;
+                            $langs->load("errors");
+                            $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                            $action = 'edit';
+                        }
+                    }
+                    else
+                    {
+                        $error++;
+                        $langs->load("errors");
+                        $mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+                        $action = 'edit';
+                    }
+                }
+            }
         }
 
-	    if (! $error)
-	    {
+        if (! $error)
+        {
             if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
-    		{
-    			$pos = GETPOST('pos','int');
-    			// Construct array for parameter (value of select list)
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			}
-    			else
-    			{
-    				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
-    				{
-    					list($key,$value) = explode(',',$param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+            {
+                $pos = GETPOST('pos','int');
+                // Construct array for parameter (value of select list)
+                $parameters = $param;
+                $parameters_array = explode("\r\n",$parameters);
+                //In sellist we have only one line and it can have come to do SQL expression
+                if ($type=='sellist') {
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        $params['options'] = array($parameters=>null);
+                    }
+                }
+                else
+                {
+                    //Esle it's separated key/value and coma list
+                    foreach($parameters_array as $param_ligne)
+                    {
+                        list($key,$value) = explode(',',$param_ligne);
+                        $params['options'][$key] = $value;
+                    }
+                }
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+                // Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+                $visibility = GETPOST('list', 'alpha');
+                if ($type == 'separate') $visibility=3;
 
                 $result=$extrafields->update(
-    				GETPOST('attrname', 'alpha'),
-    				GETPOST('label', 'alpha'),
-    				$type,
-    				$extrasize,
-    				$elementtype,
-    				(GETPOST('unique', 'alpha')?1:0),
-    				(GETPOST('required', 'alpha')?1:0),
-    				$pos,
-    				$params,
-    				(GETPOST('alwayseditable', 'alpha')?1:0),
-    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	$visibility,
-					GETPOST('help','alpha'),
-    			    GETPOST('default_value','alpha'),
-    				GETPOST('computed_value','alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha')?0:''),
+                    GETPOST('attrname', 'alpha'),
+                    GETPOST('label', 'alpha'),
+                    $type,
+                    $extrasize,
+                    $elementtype,
+                    (GETPOST('unique', 'alpha')?1:0),
+                    (GETPOST('required', 'alpha')?1:0),
+                    $pos,
+                    $params,
+                    (GETPOST('alwayseditable', 'alpha')?1:0),
+                    (GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                    $visibility,
+                    GETPOST('help','alpha'),
+                    GETPOST('default_value','alpha'),
+                    GETPOST('computed_value','alpha'),
+                    (GETPOST('entitycurrentorall', 'alpha')?0:''),
                     GETPOST('langfile'),
                     1,
                     (GETPOST('totalizable', 'alpha')?1:0)
-    			);
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			}
-    			else
-    			{
+                );
+                if ($result > 0)
+                {
+                    setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+                    header("Location: ".$_SERVER["PHP_SELF"]);
+                    exit;
+                }
+                else
+                {
                     $error++;
-    			    $mesg=$extrafields->error;
-    			    setEventMessages($mesg, null, 'errors');
-    			}
-    		}
-    		else
-    		{
-    		    $error++;
-    			$langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    		}
-	    }
-	    else
-	    {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
-	}
+                    $mesg=$extrafields->error;
+                    setEventMessages($mesg, null, 'errors');
+                }
+            }
+            else
+            {
+                $error++;
+                $langs->load("errors");
+                $mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+                setEventMessages($mesg, null, 'errors');
+            }
+        }
+        else
+        {
+            setEventMessages($mesg, null, 'errors');
+        }
+    }
 }
 
 // Delete attribute
 if ($action == 'delete')
 {
-	if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
-	{
+    if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
+    {
         $result=$extrafields->delete($_GET["attrname"],$elementtype);
         if ($result >= 0)
         {
@@ -394,12 +394,12 @@ 
             exit;
         }
         else $mesg=$extrafields->error;
-	}
-	else
-	{
-	    $error++;
-		$langs->load("errors");
-		$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
-	}
+    }
+    else
+    {
+        $error++;
+        $langs->load("errors");
+        $mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+    }
 }
 

Spacing +103 added lines, -103 removed lines

@@ -23,18 +23,18 @@ 
  *  \brief			Code for actions on extrafields admin pages
  */
 
-$maxsizestring=255;
-$maxsizeint=10;
-$mesg=array();
+$maxsizestring = 255;
+$maxsizeint = 10;
+$mesg = array();
 
-$extrasize=GETPOST('size','int');
-$type=GETPOST('type','alpha');
-$param=GETPOST('param','alpha');
+$extrasize = GETPOST('size', 'int');
+$type = GETPOST('type', 'alpha');
+$param = GETPOST('param', 'alpha');
 
-if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if ($type=='date')     $extrasize='';
-if ($type=='datetime') $extrasize='';
-if ($type=='select')   $extrasize='';
+if ($type == 'double' && strpos($extrasize, ',') === false) $extrasize = '24,8';
+if ($type == 'date')     $extrasize = '';
+if ($type == 'datetime') $extrasize = '';
+if ($type == 'select')   $extrasize = '';
 
 
 // Add attribute
@@ -43,83 +43,83 @@ 
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
 	    // Check values
-		if (! $type)
+		if (!$type)
 		{
 			$error++;
 			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'create';
 		}
-		if ($type=='varchar' && $extrasize <= 0)
+		if ($type == 'varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-        if ($type=='varchar' && $extrasize > $maxsizestring)
+        if ($type == 'varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
             $action = 'create';
         }
-        if ($type=='int' && $extrasize > $maxsizeint)
+        if ($type == 'int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
             $action = 'create';
         }
-        if ($type=='select' && !$param)
+        if ($type == 'select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
         	$action = 'create';
         }
-        if ($type=='sellist' && !$param)
+        if ($type == 'sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
         	$action = 'create';
         }
-        if ($type=='checkbox' && !$param)
+        if ($type == 'checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'create';
         }
-        if ($type=='link' && !$param)
+        if ($type == 'link' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
+        	$mesg[] = $langs->trans("ErrorNoValueForLinkType");
         	$action = 'create';
         }
-        if ($type=='radio' && !$param)
+        if ($type == 'radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
+        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
         	$action = 'create';
         }
-        if  ((($type=='radio') || ($type=='checkbox')) && $param)
+        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
     		$parameters = $param;
-    		$parameters_array = explode("\r\n",$parameters);
-    		foreach($parameters_array as $param_ligne)
+    		$parameters_array = explode("\r\n", $parameters);
+    		foreach ($parameters_array as $param_ligne)
     		{
     			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/',$param_ligne,$matches))
+	    			if (preg_match_all('/,/', $param_ligne, $matches))
 	    			{
-	    				if (count($matches[0])>1) {
+	    				if (count($matches[0]) > 1) {
 	    					$error++;
 	    					$langs->load("errors");
-	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    					$action = 'create';
 	    				}
 	    			}
@@ -127,25 +127,25 @@ 
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
-	    				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    				$action = 'create';
 	    			}
     			}
     		}
         }
 
-	    if (! $error)
+	    if (!$error)
 	    {
     		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname']) && !is_numeric($_POST["attrname"]))
+    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
     		{
     			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value','alpha');
+        		$default_value = GETPOST('default_value', 'alpha');
     			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
+    			$parameters_array = explode("\r\n", $parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
+    			if ($type == 'sellist') {
+    				foreach ($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
     				}
@@ -153,37 +153,37 @@ 
     			else
     			{
     				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
+    				foreach ($parameters_array as $param_ligne)
     				{
-    					list($key,$value) = explode(',',$param_ligne);
+    					list($key, $value) = explode(',', $param_ligne);
     					$params['options'][$key] = $value;
     				}
     			}
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+				if ($type == 'separate') $visibility = 3;
 
-                $result=$extrafields->addExtraField(
+                $result = $extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
                 	GETPOST('label', 'alpha'),
                 	$type,
                 	GETPOST('pos', 'int'),
                 	$extrasize,
                 	$elementtype,
-                	(GETPOST('unique', 'alpha')?1:0),
-                	(GETPOST('required', 'alpha')?1:0),
+                	(GETPOST('unique', 'alpha') ? 1 : 0),
+                	(GETPOST('required', 'alpha') ? 1 : 0),
                 	$default_value,
                 	$params,
-                	(GETPOST('alwayseditable', 'alpha')?1:0),
-                	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+                	(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+                	(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
                 	$visibility,
-					GETPOST('help','alpha'),
-                    GETPOST('computed_value','alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha')?0:''),
+					GETPOST('help', 'alpha'),
+                    GETPOST('computed_value', 'alpha'),
+                	(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
                     GETPOST('langfile', 'alpha'),
                     1,
-                    (GETPOST('totalizable', 'alpha')?1:0)
+                    (GETPOST('totalizable', 'alpha') ? 1 : 0)
                 );
     			if ($result > 0)
     			{
@@ -194,7 +194,7 @@ 
     			else
     			{
                     $error++;
-    			    $mesg=$extrafields->error;
+    			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
     		}
@@ -202,7 +202,7 @@ 
     		{
                 $error++;
     		    $langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
+    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
@@ -220,76 +220,76 @@ 
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
         // Check values
-		if (! $type)
+		if (!$type)
 		{
 			$error++;
 			$langs->load("errors");
-			$mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"));
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'edit';
 		}
-		if ($type=='varchar' && $extrasize <= 0)
+		if ($type == 'varchar' && $extrasize <= 0)
 		{
 		    $error++;
 		    $langs->load("errors");
-		    $mesg[]=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Size"));
+		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 		    $action = 'edit';
 		}
-		if ($type=='varchar' && $extrasize > $maxsizestring)
+		if ($type == 'varchar' && $extrasize > $maxsizestring)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForVarcharType",$maxsizestring);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
             $action = 'edit';
         }
-        if ($type=='int' && $extrasize > $maxsizeint)
+        if ($type == 'int' && $extrasize > $maxsizeint)
         {
             $error++;
             $langs->load("errors");
-            $mesg[]=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
+            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
             $action = 'edit';
         }
-        if ($type=='select' && !$param)
+        if ($type == 'select' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
         	$action = 'edit';
         }
-        if ($type=='sellist' && !$param)
+        if ($type == 'sellist' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForSelectListType");
+        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
         	$action = 'edit';
         }
-        if ($type=='checkbox' && !$param)
+        if ($type == 'checkbox' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
+        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'edit';
         }
-        if ($type=='radio' && !$param)
+        if ($type == 'radio' && !$param)
         {
         	$error++;
         	$langs->load("errors");
-        	$mesg[]=$langs->trans("ErrorNoValueForRadioType");
+        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
         	$action = 'edit';
         }
-        if  ((($type=='radio') || ($type=='checkbox')) && $param)
+        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
         {
         	// Construct array for parameter (value of select list)
         	$parameters = $param;
-        	$parameters_array = explode("\r\n",$parameters);
-        	foreach($parameters_array as $param_ligne)
+        	$parameters_array = explode("\r\n", $parameters);
+        	foreach ($parameters_array as $param_ligne)
         	{
         		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/',$param_ligne,$matches))
+	        		if (preg_match_all('/,/', $param_ligne, $matches))
 	        		{
-	        			if (count($matches[0])>1) {
+	        			if (count($matches[0]) > 1) {
 	        				$error++;
 	        				$langs->load("errors");
-	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        				$action = 'edit';
 	        			}
 	        		}
@@ -297,24 +297,24 @@ 
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
-	        			$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
+	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        			$action = 'edit';
 	        		}
         		}
         	}
         }
 
-	    if (! $error)
+	    if (!$error)
 	    {
-            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
+            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
     		{
-    			$pos = GETPOST('pos','int');
+    			$pos = GETPOST('pos', 'int');
     			// Construct array for parameter (value of select list)
     			$parameters = $param;
-    			$parameters_array = explode("\r\n",$parameters);
+    			$parameters_array = explode("\r\n", $parameters);
     			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type=='sellist') {
-    				foreach($parameters_array as $param_ligne)
+    			if ($type == 'sellist') {
+    				foreach ($parameters_array as $param_ligne)
     				{
     					$params['options'] = array($parameters=>null);
     				}
@@ -322,37 +322,37 @@ 
     			else
     			{
     				//Esle it's separated key/value and coma list
-    				foreach($parameters_array as $param_ligne)
+    				foreach ($parameters_array as $param_ligne)
     				{
-    					list($key,$value) = explode(',',$param_ligne);
+    					list($key, $value) = explode(',', $param_ligne);
     					$params['options'][$key] = $value;
     				}
     			}
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+    			if ($type == 'separate') $visibility = 3;
 
-                $result=$extrafields->update(
+                $result = $extrafields->update(
     				GETPOST('attrname', 'alpha'),
     				GETPOST('label', 'alpha'),
     				$type,
     				$extrasize,
     				$elementtype,
-    				(GETPOST('unique', 'alpha')?1:0),
-    				(GETPOST('required', 'alpha')?1:0),
+    				(GETPOST('unique', 'alpha') ? 1 : 0),
+    				(GETPOST('required', 'alpha') ? 1 : 0),
     				$pos,
     				$params,
-    				(GETPOST('alwayseditable', 'alpha')?1:0),
-    				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
+    				(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+    				(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
                 	$visibility,
-					GETPOST('help','alpha'),
-    			    GETPOST('default_value','alpha'),
-    				GETPOST('computed_value','alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha')?0:''),
+					GETPOST('help', 'alpha'),
+    			    GETPOST('default_value', 'alpha'),
+    				GETPOST('computed_value', 'alpha'),
+    				(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
                     GETPOST('langfile'),
                     1,
-                    (GETPOST('totalizable', 'alpha')?1:0)
+                    (GETPOST('totalizable', 'alpha') ? 1 : 0)
     			);
     			if ($result > 0)
     			{
@@ -363,7 +363,7 @@ 
     			else
     			{
                     $error++;
-    			    $mesg=$extrafields->error;
+    			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
     		}
@@ -371,7 +371,7 @@ 
     		{
     		    $error++;
     			$langs->load("errors");
-    			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
 	    }
@@ -385,21 +385,21 @@ 
 // Delete attribute
 if ($action == 'delete')
 {
-	if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
+	if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"]))
 	{
-        $result=$extrafields->delete($_GET["attrname"],$elementtype);
+        $result = $extrafields->delete($_GET["attrname"], $elementtype);
         if ($result >= 0)
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
-        else $mesg=$extrafields->error;
+        else $mesg = $extrafields->error;
 	}
 	else
 	{
 	    $error++;
 		$langs->load("errors");
-		$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
+		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
 	}
 }
 

Braces +31 added lines, -29 removed lines

@@ -31,10 +31,18 @@ 
 $type=GETPOST('type','alpha');
 $param=GETPOST('param','alpha');
 
-if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if ($type=='date')     $extrasize='';
-if ($type=='datetime') $extrasize='';
-if ($type=='select')   $extrasize='';
+if ($type=='double' && strpos($extrasize,',')===false) {
+    $extrasize='24,8';
+}
+if ($type=='date') {
+    $extrasize='';
+}
+if ($type=='datetime') {
+    $extrasize='';
+}
+if ($type=='select') {
+    $extrasize='';
+}
 
 
 // Add attribute
@@ -122,8 +130,7 @@ 
 	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else
+	    			} else
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
@@ -149,8 +156,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -162,7 +168,9 @@ 
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+				if ($type == 'separate') {
+				    $visibility=3;
+				}
 
                 $result=$extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
@@ -190,15 +198,13 @@ 
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
+    			} else
     			{
                     $error++;
     			    $mesg=$extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
+    		} else
     		{
                 $error++;
     		    $langs->load("errors");
@@ -206,8 +212,7 @@ 
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -292,8 +297,7 @@ 
 	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else
+	        		} else
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
@@ -318,8 +322,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -331,7 +334,9 @@ 
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+    			if ($type == 'separate') {
+    			    $visibility=3;
+    			}
 
                 $result=$extrafields->update(
     				GETPOST('attrname', 'alpha'),
@@ -359,23 +364,20 @@ 
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
+    			} else
     			{
                     $error++;
     			    $mesg=$extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
+    		} else
     		{
     		    $error++;
     			$langs->load("errors");
     			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -392,10 +394,10 @@ 
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
+        } else {
+            $mesg=$extrafields->error;
         }
-        else $mesg=$extrafields->error;
-	}
-	else
+	} else
 	{
 	    $error++;
 		$langs->load("errors");

dolibarr/htdocs/core/login/functions_openid.php

Spacing +16 added lines, -16 removed lines

@@ -34,13 +34,13 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 {
-    global $_POST,$db,$conf,$langs;
+    global $_POST, $db, $conf, $langs;
 
     dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
 
-    $login='';
+    $login = '';
 
     // Get identity from user and redirect browser to OpenID Server
     if (isset($_POST['username']))
@@ -48,14 +48,14 @@ 
         $openid = new SimpleOpenID();
         $openid->SetIdentity($_POST['username']);
         $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
-        $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
-        $openid->SetRequiredFields(array('email','fullname'));
+        $openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
+        $openid->SetRequiredFields(array('email', 'fullname'));
         $_SESSION['dol_entity'] = $_POST["entity"];
         //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
         if ($openid->sendDiscoveryRequestToGetXRDS())
         {
-            $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
-            $openid->Redirect();     // This will redirect user to OpenID Server
+            $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
+            $openid->Redirect(); // This will redirect user to OpenID Server
         }
         else
         {
@@ -65,7 +65,7 @@ 
         return false;
     }
     // Perform HTTP Request to OpenID server to validate key
-    elseif($_GET['openid_mode'] == 'id_res')
+    elseif ($_GET['openid_mode'] == 'id_res')
     {
         $openid = new SimpleOpenID();
         $openid->SetIdentity($_GET['openid_identity']);
@@ -74,23 +74,23 @@ 
         {
             // OK HERE KEY IS VALID
 
-            $sql ="SELECT login";
-            $sql.=" FROM ".MAIN_DB_PREFIX."user";
-            $sql.=" WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
-            $sql.=" AND entity IN (0," . ($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1) . ")";
+            $sql = "SELECT login";
+            $sql .= " FROM ".MAIN_DB_PREFIX."user";
+            $sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
+            $sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
 
             dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
-            $resql=$db->query($sql);
+            $resql = $db->query($sql);
             if ($resql)
             {
-                $obj=$db->fetch_object($resql);
+                $obj = $db->fetch_object($resql);
                 if ($obj)
                 {
-                    $login=$obj->login;
+                    $login = $obj->login;
                 }
             }
         }
-        else if($openid->IsError() === true)
+        else if ($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();

Braces +4 added lines, -8 removed lines

@@ -56,8 +56,7 @@ 
         {
             $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
             $openid->Redirect();     // This will redirect user to OpenID Server
-        }
-        else
+        } else
         {
             $error = $openid->GetError();
             return false;
@@ -89,21 +88,18 @@ 
                     $login=$obj->login;
                 }
             }
-        }
-        else if($openid->IsError() === true)
+        } else if($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();
             return false;
-        }
-        else
+        } else
         {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    else if ($_GET['openid_mode'] == 'cancel')
+    } else if ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";

dolibarr/htdocs/core/login/functions_forceuser.php

Indentation +8 added lines, -8 removed lines

@@ -34,16 +34,16 @@
  */
 function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest)
 {
-	// Variable dolibarr_auto_user must be defined in conf.php file
-	global $dolibarr_auto_user;
+    // Variable dolibarr_auto_user must be defined in conf.php file
+    global $dolibarr_auto_user;
 
-	dol_syslog("functions_forceuser::check_user_password_forceuser");
+    dol_syslog("functions_forceuser::check_user_password_forceuser");
 
-	$login=$dolibarr_auto_user;
-	if (empty($login)) $login='auto';
+    $login=$dolibarr_auto_user;
+    if (empty($login)) $login='auto';
 
-	if ($_SESSION["dol_loginmesg"]) $login='';
+    if ($_SESSION["dol_loginmesg"]) $login='';
 
-	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
-	return $login;
+    dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
+    return $login;
 }

Spacing +4 added lines, -4 removed lines

@@ -32,17 +32,17 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_forceuser($usertotest, $passwordtotest, $entitytotest)
 {
 	// Variable dolibarr_auto_user must be defined in conf.php file
 	global $dolibarr_auto_user;
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser");
 
-	$login=$dolibarr_auto_user;
-	if (empty($login)) $login='auto';
+	$login = $dolibarr_auto_user;
+	if (empty($login)) $login = 'auto';
 
-	if ($_SESSION["dol_loginmesg"]) $login='';
+	if ($_SESSION["dol_loginmesg"]) $login = '';
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
 	return $login;

Braces +6 added lines, -2 removed lines

@@ -40,9 +40,13 @@
 	dol_syslog("functions_forceuser::check_user_password_forceuser");
 
 	$login=$dolibarr_auto_user;
-	if (empty($login)) $login='auto';
+	if (empty($login)) {
+	    $login='auto';
+	}
 
-	if ($_SESSION["dol_loginmesg"]) $login='';
+	if ($_SESSION["dol_loginmesg"]) {
+	    $login='';
+	}
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
 	return $login;

dolibarr/htdocs/core/login/functions_dolibarr.php

Indentation +116 added lines, -116 removed lines

@@ -35,124 +35,124 @@
  */
 function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=1)
 {
-	global $db,$conf,$langs;
-
-	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
-
-	$login='';
-
-	if (! empty($usertotest))
-	{
-		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
-
-		// If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
-		$table = MAIN_DB_PREFIX."user";
-		$usernamecol1 = 'login';
-		$usernamecol2 = 'email';
-		$entitycol = 'entity';
-
-		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
-		$sql.=' FROM '.$table;
-		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
-		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
-		$sql.=' AND statut = 1';
-		// Required to first found the user into entity, then the superadmin.
-		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
-		$sql.=' ORDER BY entity DESC';
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj=$db->fetch_object($resql);
-			if ($obj)
-			{
-				$passclear=$obj->pass;
-				$passcrypted=$obj->pass_crypted;
-				$passtyped=$passwordtotest;
-
-				$passok=false;
-
-				// Check crypted password
-				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
-
-				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
-				// Check crypted password according to crypt algorithm
-				if ($cryptType == 'md5')
-				{
-					if (dol_verifyHash($passtyped, $passcrypted))
-					{
-						$passok=true;
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
-					}
-				}
-
-				// For compatibility with old versions
-				if (! $passok)
-				{
-					if ((! $passcrypted || $passtyped)
-						&& ($passclear && ($passtyped == $passclear)))
-					{
-						$passok=true;
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
-					}
-				}
-
-				// Password ok ?
-				if ($passok)
-				{
-					$login=$obj->login;
-				}
-				else
-				{
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
-					sleep(2);      // Anti brut force protection
-
-					// Load translation files required by the page
+    global $db,$conf,$langs;
+
+    // Force master entity in transversal mode
+    $entity=$entitytotest;
+    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+
+    $login='';
+
+    if (! empty($usertotest))
+    {
+        dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+
+        // If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
+        $table = MAIN_DB_PREFIX."user";
+        $usernamecol1 = 'login';
+        $usernamecol2 = 'email';
+        $entitycol = 'entity';
+
+        $sql ='SELECT rowid, login, entity, pass, pass_crypted';
+        $sql.=' FROM '.$table;
+        $sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
+        if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+        $sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
+        $sql.=' AND statut = 1';
+        // Required to first found the user into entity, then the superadmin.
+        // For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
+        $sql.=' ORDER BY entity DESC';
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj=$db->fetch_object($resql);
+            if ($obj)
+            {
+                $passclear=$obj->pass;
+                $passcrypted=$obj->pass_crypted;
+                $passtyped=$passwordtotest;
+
+                $passok=false;
+
+                // Check crypted password
+                $cryptType='';
+                if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+
+                // By default, we used MD5
+                if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+                // Check crypted password according to crypt algorithm
+                if ($cryptType == 'md5')
+                {
+                    if (dol_verifyHash($passtyped, $passcrypted))
+                    {
+                        $passok=true;
+                        dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
+                    }
+                }
+
+                // For compatibility with old versions
+                if (! $passok)
+                {
+                    if ((! $passcrypted || $passtyped)
+                        && ($passclear && ($passtyped == $passclear)))
+                    {
+                        $passok=true;
+                        dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
+                    }
+                }
+
+                // Password ok ?
+                if ($passok)
+                {
+                    $login=$obj->login;
+                }
+                else
+                {
+                    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
+                    sleep(2);      // Anti brut force protection
+
+                    // Load translation files required by the page
                     $langs->loadLangs(array('main', 'errors'));
 
-					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-				}
-
-				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
-				{
-					global $mc;
-
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
-					else
-					{
-						$ret = $mc->checkRight($obj->rowid, $entitytotest);
-						if ($ret < 0)
-						{
-							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
-							$login = ''; // force authentication failure
-						}
-					}
-				}
-			}
-			else
-			{
-				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
-				sleep(1);
-
-				// Load translation files required by the page
+                    $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+                }
+
+                // We must check entity
+                if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+                {
+                    global $mc;
+
+                    if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+                    else
+                    {
+                        $ret = $mc->checkRight($obj->rowid, $entitytotest);
+                        if ($ret < 0)
+                        {
+                            dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
+                            $login = ''; // force authentication failure
+                        }
+                    }
+                }
+            }
+            else
+            {
+                dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
+                sleep(1);
+
+                // Load translation files required by the page
                 $langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-			}
-		}
-		else
-		{
-			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
-			sleep(1);
-			$_SESSION["dol_loginmesg"]=$db->lasterror();
-		}
-	}
-
-	return $login;
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+            }
+        }
+        else
+        {
+            dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
+            sleep(1);
+            $_SESSION["dol_loginmesg"]=$db->lasterror();
+        }
+    }
+
+    return $login;
 }

Spacing +35 added lines, -35 removed lines

@@ -33,19 +33,19 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=1)
+function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotest = 1)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 
 	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	$entity = $entitytotest;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
 
-	$login='';
+	$login = '';
 
-	if (! empty($usertotest))
+	if (!empty($usertotest))
 	{
-		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
 		// If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
 		$table = MAIN_DB_PREFIX."user";
@@ -53,51 +53,51 @@ 
 		$usernamecol2 = 'email';
 		$entitycol = 'entity';
 
-		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
-		$sql.=' FROM '.$table;
-		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
-		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
-		$sql.=' AND statut = 1';
+		$sql = 'SELECT rowid, login, entity, pass, pass_crypted';
+		$sql .= ' FROM '.$table;
+		$sql .= ' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
+		if (preg_match('/@/', $usertotest)) $sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		$sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";
+		$sql .= ' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
 		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
-		$sql.=' ORDER BY entity DESC';
+		$sql .= ' ORDER BY entity DESC';
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$obj=$db->fetch_object($resql);
+			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$passclear=$obj->pass;
-				$passcrypted=$obj->pass_crypted;
-				$passtyped=$passwordtotest;
+				$passclear = $obj->pass;
+				$passcrypted = $obj->pass_crypted;
+				$passtyped = $passwordtotest;
 
-				$passok=false;
+				$passok = false;
 
 				// Check crypted password
-				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				$cryptType = '';
+				if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
 
 				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+				if (!in_array($cryptType, array('md5'))) $cryptType = 'md5';
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
 					if (dol_verifyHash($passtyped, $passcrypted))
 					{
-						$passok=true;
+						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
 					}
 				}
 
 				// For compatibility with old versions
-				if (! $passok)
+				if (!$passok)
 				{
-					if ((! $passcrypted || $passtyped)
+					if ((!$passcrypted || $passtyped)
 						&& ($passclear && ($passtyped == $passclear)))
 					{
-						$passok=true;
+						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
 					}
 				}
@@ -105,31 +105,31 @@ 
 				// Password ok ?
 				if ($passok)
 				{
-					$login=$obj->login;
+					$login = $obj->login;
 				}
 				else
 				{
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
-					sleep(2);      // Anti brut force protection
+					sleep(2); // Anti brut force protection
 
 					// Load translation files required by the page
                     $langs->loadLangs(array('main', 'errors'));
 
-					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 				}
 
 				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+				if ($passok && !empty($conf->multicompany->enabled))	// We must check entity
 				{
 					global $mc;
 
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
 					else
 					{
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0)
 						{
-							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'");
+							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '".$entitytotest."' not allowed for user '".$obj->rowid."'");
 							$login = ''; // force authentication failure
 						}
 					}
@@ -143,14 +143,14 @@ 
 				// Load translation files required by the page
                 $langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
 		}
 		else
 		{
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
 			sleep(1);
-			$_SESSION["dol_loginmesg"]=$db->lasterror();
+			$_SESSION["dol_loginmesg"] = $db->lasterror();
 		}
 	}
 

Braces +22 added lines, -12 removed lines

@@ -39,7 +39,9 @@ 
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	    $entity=1;
+	}
 
 	$login='';
 
@@ -56,7 +58,9 @@ 
 		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
 		$sql.=' FROM '.$table;
 		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		if (preg_match('/@/',$usertotest)) {
+		    $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		}
 		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
 		$sql.=' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
@@ -77,10 +81,14 @@ 
 
 				// Check crypted password
 				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+				    $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				}
 
 				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+				if (! in_array($cryptType,array('md5'))) {
+				    $cryptType='md5';
+				}
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
@@ -106,8 +114,7 @@ 
 				if ($passok)
 				{
 					$login=$obj->login;
-				}
-				else
+				} else
 				{
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
 					sleep(2);      // Anti brut force protection
@@ -119,11 +126,16 @@ 
 				}
 
 				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+				if ($passok && ! empty($conf->multicompany->enabled)) {
+				    // We must check entity
 				{
 					global $mc;
+				}
 
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					if (! isset($mc)) {
+					    $conf->multicompany->enabled = false;
+					}
+					// Global not available, disable $conf->multicompany->enabled for safety
 					else
 					{
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
@@ -134,8 +146,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
 				sleep(1);
@@ -145,8 +156,7 @@ 
 
 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
 			sleep(1);

dolibarr/htdocs/core/login/functions_http.php

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
 */
 function check_user_password_http($usertotest,$passwordtotest,$entitytotest)
 {
-	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
+    dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
 
-	$login='';
-	if (! empty($_SERVER["REMOTE_USER"]))
-	{
-		$login=$_SERVER["REMOTE_USER"];
-	}
+    $login='';
+    if (! empty($_SERVER["REMOTE_USER"]))
+    {
+        $login=$_SERVER["REMOTE_USER"];
+    }
 
-	return $login;
+    return $login;
 }

Spacing +5 added lines, -5 removed lines

@@ -31,14 +31,14 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
 */
-function check_user_password_http($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
 {
-	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"])?'':$_SERVER["REMOTE_USER"]));
+	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));
 
-	$login='';
-	if (! empty($_SERVER["REMOTE_USER"]))
+	$login = '';
+	if (!empty($_SERVER["REMOTE_USER"]))
 	{
-		$login=$_SERVER["REMOTE_USER"];
+		$login = $_SERVER["REMOTE_USER"];
 	}
 
 	return $login;

dolibarr/htdocs/core/login/functions_ldap.php

Indentation +195 added lines, -195 removed lines

@@ -34,190 +34,190 @@ 
  */
 function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 {
-	global $db,$conf,$langs;
-	global $_POST;
-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
-	global $dolibarr_main_auth_ldap_filter;
-	global $dolibarr_main_auth_ldap_debug;
-
-	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
-
-	$login='';
-	$resultFetchUser='';
-
-	if (! function_exists("ldap_connect"))
-	{
-		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");
-		sleep(1);
-
-		// Load translation files required by the page
+    global $db,$conf,$langs;
+    global $_POST;
+    global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
+    global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
+    global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
+    global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
+    global $dolibarr_main_auth_ldap_filter;
+    global $dolibarr_main_auth_ldap_debug;
+
+    // Force master entity in transversal mode
+    $entity=$entitytotest;
+    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+
+    $login='';
+    $resultFetchUser='';
+
+    if (! function_exists("ldap_connect"))
+    {
+        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");
+        sleep(1);
+
+        // Load translation files required by the page
         $langs->loadLangs(array('main', 'other'));
 
-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
-		return;
-	}
-
-	if ($usertotest)
-	{
-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
-
-		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
-		$ldaphost=$dolibarr_main_auth_ldap_host;
-		$ldapport=$dolibarr_main_auth_ldap_port;
-		$ldapversion=$dolibarr_main_auth_ldap_version;
-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
-
-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
-		$ldapdn=$dolibarr_main_auth_ldap_dn;
-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
-
-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
-
-		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
-		$ldap=new Ldap();
-		$ldap->server=explode(',',$ldaphost);
-		$ldap->serverPort=$ldapport;
-		$ldap->ldapProtocolVersion=$ldapversion;
-		$ldap->serverType=$ldapservertype;
-		$ldap->searchUser=$ldapadminlogin;
-		$ldap->searchPassword=$ldapadminpass;
-
-		if ($ldapdebug)
-		{
-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
-			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
-			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";
-		}
-
-		$resultFetchLdapUser=0;
-
-		// Define $userSearchFilter
-		$userSearchFilter = "";
-		if (empty($dolibarr_main_auth_ldap_filter)) {
-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";
-		} else {
-			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
-		}
-
-		// If admin login provided
-		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)
-		if ($ldapadminlogin)
-		{
-			$result=$ldap->connect_bind();
-			if ($result > 0)
-			{
-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
-				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
-				{
-					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
-					$ldap->close();
-					sleep(1);
-					$langs->load('ldap');
-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
-					return '';
-				}
-			}
-			else
-			{
-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
-			}
-			$ldap->close();
-		}
-
-		// Forge LDAP user and password to test with them
-		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
-		// admin login no exectued.
-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
-		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
-		// dn detected into ldapUserDN.
-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
-		$ldap->searchPassword=$passwordtotest;
-
-		// Test with this->seachUser and this->searchPassword
-		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
-		$result=$ldap->connect_bind();
-		if ($result > 0)
-		{
-			if ($result == 2)	// Connection is ok for user/pass into LDAP
-			{
-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
-				$login=$usertotest;
-
-				// ldap2dolibarr synchronisation
-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
-				{
-						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
-
-						// On charge les attributs du user ldap
-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
-
-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
-
-						// On recherche le user dolibarr en fonction de son SID ldap
-						$sid = $ldap->getObjectSid($login);
-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
-
-						$usertmp=new User($db);
-						$resultFetchUser=$usertmp->fetch('',$login,$sid);
-						if ($resultFetchUser > 0)
-						{
-							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
-							// On verifie si le login a change et on met a jour les attributs dolibarr
-
-							if ($usertmp->login != $ldap->login && $ldap->login)
-							{
-								$usertmp->login = $ldap->login;
-								$usertmp->update($usertmp);
-								// TODO Que faire si update echoue car on update avec un login deja existant.
-							}
-
-							//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
-						}
-						unset($usertmp);
-				}
-
-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
-				{
-					global $mc;
-
-					$usertmp=new User($db);
-					$usertmp->fetch('',$login);
-					$ret=$mc->checkRight($usertmp->id, $entitytotest);
-					if ($ret < 0)
-					{
-						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");
-						$login=''; // force authentication failure
-					}
-					unset($usertmp);
-				}
-			}
-			if ($result == 1)
-			{
-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");
-				sleep(1);
-
-				// Load translation files required by the page
+        $_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
+        return;
+    }
+
+    if ($usertotest)
+    {
+        dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+
+        // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
+        $ldaphost=$dolibarr_main_auth_ldap_host;
+        $ldapport=$dolibarr_main_auth_ldap_port;
+        $ldapversion=$dolibarr_main_auth_ldap_version;
+        $ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
+
+        $ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
+        $ldapdn=$dolibarr_main_auth_ldap_dn;
+        $ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
+        $ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
+        $ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
+
+        if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
+
+        require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+        $ldap=new Ldap();
+        $ldap->server=explode(',',$ldaphost);
+        $ldap->serverPort=$ldapport;
+        $ldap->ldapProtocolVersion=$ldapversion;
+        $ldap->serverType=$ldapservertype;
+        $ldap->searchUser=$ldapadminlogin;
+        $ldap->searchPassword=$ldapadminpass;
+
+        if ($ldapdebug)
+        {
+            dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
+            dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
+            print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
+            print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";
+        }
+
+        $resultFetchLdapUser=0;
+
+        // Define $userSearchFilter
+        $userSearchFilter = "";
+        if (empty($dolibarr_main_auth_ldap_filter)) {
+            $userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";
+        } else {
+            $userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
+        }
+
+        // If admin login provided
+        // Code to get user in LDAP from an admin connection (may differ from user connection, done later)
+        if ($ldapadminlogin)
+        {
+            $result=$ldap->connect_bind();
+            if ($result > 0)
+            {
+                $resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
+                //dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
+                if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
+                {
+                    dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
+                    if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
+                    $ldap->close();
+                    sleep(1);
+                    $langs->load('ldap');
+                    $_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
+                    return '';
+                }
+            }
+            else
+            {
+                    if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
+            }
+            $ldap->close();
+        }
+
+        // Forge LDAP user and password to test with them
+        // If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
+        // admin login no exectued.
+        $ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
+        // But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
+        // dn detected into ldapUserDN.
+        if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+        $ldap->searchPassword=$passwordtotest;
+
+        // Test with this->seachUser and this->searchPassword
+        //print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
+        $result=$ldap->connect_bind();
+        if ($result > 0)
+        {
+            if ($result == 2)	// Connection is ok for user/pass into LDAP
+            {
+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
+                $login=$usertotest;
+
+                // ldap2dolibarr synchronisation
+                if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+                {
+                        dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+
+                        // On charge les attributs du user ldap
+                        if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
+                        $resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
+
+                        if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
+                        if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
+                        if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+
+                        // On recherche le user dolibarr en fonction de son SID ldap
+                        $sid = $ldap->getObjectSid($login);
+                        if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+
+                        $usertmp=new User($db);
+                        $resultFetchUser=$usertmp->fetch('',$login,$sid);
+                        if ($resultFetchUser > 0)
+                        {
+                            dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
+                            // On verifie si le login a change et on met a jour les attributs dolibarr
+
+                            if ($usertmp->login != $ldap->login && $ldap->login)
+                            {
+                                $usertmp->login = $ldap->login;
+                                $usertmp->update($usertmp);
+                                // TODO Que faire si update echoue car on update avec un login deja existant.
+                            }
+
+                            //$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
+                        }
+                        unset($usertmp);
+                }
+
+                if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+                {
+                    global $mc;
+
+                    $usertmp=new User($db);
+                    $usertmp->fetch('',$login);
+                    $ret=$mc->checkRight($usertmp->id, $entitytotest);
+                    if ($ret < 0)
+                    {
+                        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");
+                        $login=''; // force authentication failure
+                    }
+                    unset($usertmp);
+                }
+            }
+            if ($result == 1)
+            {
+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");
+                sleep(1);
+
+                // Load translation files required by the page
                 $langs->loadLangs(array('main', 'other'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-			}
-		}
-		else
-		{
-			/* Login failed. Return false, together with the error code and text from
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+            }
+        }
+        else
+        {
+            /* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
              ** (for iPlanet, other servers may differ)
              ** 19 - Account locked out (too many invalid login attempts)
@@ -225,24 +225,24 @@ 
              ** 49 - Wrong password
              ** 53 - Account inactive (manually locked out by administrator)
              */
-			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");
-			if (is_resource($ldap->connection))    // If connection ok but bind ko
-			{
-				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
-				$ldap->ldapErrorText = ldap_error($ldap->connection);
-				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
-			}
-			sleep(2);      // Anti brut force protection
-
-			// Load translation files required by the page
+            dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");
+            if (is_resource($ldap->connection))    // If connection ok but bind ko
+            {
+                $ldap->ldapErrorCode = ldap_errno($ldap->connection);
+                $ldap->ldapErrorText = ldap_error($ldap->connection);
+                dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
+            }
+            sleep(2);      // Anti brut force protection
+
+            // Load translation files required by the page
             $langs->loadLangs(array('main', 'other', 'errors'));
 ;
-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));
-		}
+            $_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));
+        }
 
-		$ldap->close();
-	}
+        $ldap->close();
+    }
 
-	return $login;
+    return $login;
 }
 

Spacing +55 added lines, -55 removed lines

@@ -32,25 +32,25 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
  * @return	string					Login if OK, '' if KO
  */
-function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
+function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 {
-	global $db,$conf,$langs;
+	global $db, $conf, $langs;
 	global $_POST;
-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;
-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;
-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;
-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
+	global $dolibarr_main_auth_ldap_host, $dolibarr_main_auth_ldap_port;
+	global $dolibarr_main_auth_ldap_version, $dolibarr_main_auth_ldap_servertype;
+	global $dolibarr_main_auth_ldap_login_attribute, $dolibarr_main_auth_ldap_dn;
+	global $dolibarr_main_auth_ldap_admin_login, $dolibarr_main_auth_ldap_admin_pass;
 	global $dolibarr_main_auth_ldap_filter;
 	global $dolibarr_main_auth_ldap_debug;
 
 	// Force master entity in transversal mode
-	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	$entity = $entitytotest;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
 
-	$login='';
-	$resultFetchUser='';
+	$login = '';
+	$resultFetchUser = '';
 
-	if (! function_exists("ldap_connect"))
+	if (!function_exists("ldap_connect"))
 	{
 		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");
 		sleep(1);
@@ -58,51 +58,51 @@ 
 		// Load translation files required by the page
         $langs->loadLangs(array('main', 'other'));
 
-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
+		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
 		return;
 	}
 
 	if ($usertotest)
 	{
-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
+		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
 		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
-		$ldaphost=$dolibarr_main_auth_ldap_host;
-		$ldapport=$dolibarr_main_auth_ldap_port;
-		$ldapversion=$dolibarr_main_auth_ldap_version;
-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
+		$ldaphost = $dolibarr_main_auth_ldap_host;
+		$ldapport = $dolibarr_main_auth_ldap_port;
+		$ldapversion = $dolibarr_main_auth_ldap_version;
+		$ldapservertype = (empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);
 
-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;
-		$ldapdn=$dolibarr_main_auth_ldap_dn;
-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;
-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
+		$ldapuserattr = $dolibarr_main_auth_ldap_login_attribute;
+		$ldapdn = $dolibarr_main_auth_ldap_dn;
+		$ldapadminlogin = $dolibarr_main_auth_ldap_admin_login;
+		$ldapadminpass = $dolibarr_main_auth_ldap_admin_pass;
+		$ldapdebug = (empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false" ? false : true);
 
 		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
-		$ldap=new Ldap();
-		$ldap->server=explode(',',$ldaphost);
-		$ldap->serverPort=$ldapport;
-		$ldap->ldapProtocolVersion=$ldapversion;
-		$ldap->serverType=$ldapservertype;
-		$ldap->searchUser=$ldapadminlogin;
-		$ldap->searchPassword=$ldapadminpass;
+		$ldap = new Ldap();
+		$ldap->server = explode(',', $ldaphost);
+		$ldap->serverPort = $ldapport;
+		$ldap->ldapProtocolVersion = $ldapversion;
+		$ldap->serverType = $ldapservertype;
+		$ldap->searchUser = $ldapadminlogin;
+		$ldap->searchPassword = $ldapadminpass;
 
 		if ($ldapdebug)
 		{
-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
+			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
 			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
+			print "DEBUG: Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
 			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";
 		}
 
-		$resultFetchLdapUser=0;
+		$resultFetchLdapUser = 0;
 
 		// Define $userSearchFilter
 		$userSearchFilter = "";
 		if (empty($dolibarr_main_auth_ldap_filter)) {
-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";
+			$userSearchFilter = "(".$ldapuserattr."=".$usertotest.")";
 		} else {
 			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
 		}
@@ -111,10 +111,10 @@ 
 		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)
 		if ($ldapadminlogin)
 		{
-			$result=$ldap->connect_bind();
+			$result = $ldap->connect_bind();
 			if ($result > 0)
 			{
-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
+				$resultFetchLdapUser = $ldap->fetch($usertotest, $userSearchFilter);
 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
 				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
 				{
@@ -123,7 +123,7 @@ 
 					$ldap->close();
 					sleep(1);
 					$langs->load('ldap');
-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
+					$_SESSION["dol_loginmesg"] = $langs->trans("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);
 					return '';
 				}
 			}
@@ -137,41 +137,41 @@ 
 		// Forge LDAP user and password to test with them
 		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with
 		// admin login no exectued.
-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
+		$ldap->searchUser = $ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
 		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
-		$ldap->searchPassword=$passwordtotest;
+		$ldap->searchPassword = $passwordtotest;
 
 		// Test with this->seachUser and this->searchPassword
 		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
-		$result=$ldap->connect_bind();
+		$result = $ldap->connect_bind();
 		if ($result > 0)
 		{
 			if ($result == 2)	// Connection is ok for user/pass into LDAP
 			{
 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
-				$login=$usertotest;
+				$login = $usertotest;
 
 				// ldap2dolibarr synchronisation
-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
 				{
 						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
 
 						// On charge les attributs du user ldap
 						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
+						$resultFetchLdapUser = $ldap->fetch($login, $userSearchFilter);
 
-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						if ($ldapdebug) print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";
+						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
+						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
 
 						// On recherche le user dolibarr en fonction de son SID ldap
 						$sid = $ldap->getObjectSid($login);
 						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
 
-						$usertmp=new User($db);
-						$resultFetchUser=$usertmp->fetch('',$login,$sid);
+						$usertmp = new User($db);
+						$resultFetchUser = $usertmp->fetch('', $login, $sid);
 						if ($resultFetchUser > 0)
 						{
 							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
@@ -189,17 +189,17 @@ 
 						unset($usertmp);
 				}
 
-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+				if (!empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
 				{
 					global $mc;
 
-					$usertmp=new User($db);
-					$usertmp->fetch('',$login);
-					$ret=$mc->checkRight($usertmp->id, $entitytotest);
+					$usertmp = new User($db);
+					$usertmp->fetch('', $login);
+					$ret = $mc->checkRight($usertmp->id, $entitytotest);
 					if ($ret < 0)
 					{
 						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");
-						$login=''; // force authentication failure
+						$login = ''; // force authentication failure
 					}
 					unset($usertmp);
 				}
@@ -212,7 +212,7 @@ 
 				// Load translation files required by the page
                 $langs->loadLangs(array('main', 'other'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
 		}
 		else
@@ -232,12 +232,12 @@ 
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
 			}
-			sleep(2);      // Anti brut force protection
+			sleep(2); // Anti brut force protection
 
 			// Load translation files required by the page
             $langs->loadLangs(array('main', 'other', 'errors'));
 ;
-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));
+			$_SESSION["dol_loginmesg"] = ($ldap->error ? $ldap->error : $langs->trans("ErrorBadLoginPassword"));
 		}
 
 		$ldap->close();

Braces +47 added lines, -19 removed lines

@@ -45,7 +45,9 @@ 
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	    $entity=1;
+	}
 
 	$login='';
 	$resultFetchUser='';
@@ -78,7 +80,9 @@ 
 		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;
 		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);
 
-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
+		if ($ldapdebug) {
+		    print "DEBUG: Logging LDAP steps<br>\n";
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 		$ldap=new Ldap();
@@ -116,20 +120,25 @@ 
 			{
 				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);
 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
+				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) {
+				    // If ok but password need to be reset
 				{
 					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
+				}
+					if ($ldapdebug) {
+					    print "DEBUG: User ".$usertotest." must change password<br>\n";
+					}
 					$ldap->close();
 					sleep(1);
 					$langs->load('ldap');
 					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);
 					return '';
 				}
-			}
-			else
+			} else
 			{
-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
+				 if ($ldapdebug) {
+				     print "DEBUG: ".$ldap->error."<br>\n";
+				 }
 			}
 			$ldap->close();
 		}
@@ -140,7 +149,9 @@ 
 		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) {
+		    $ldap->searchUser = $ldap->ldapUserDN;
+		}
 		$ldap->searchPassword=$passwordtotest;
 
 		// Test with this->seachUser and this->searchPassword
@@ -148,27 +159,41 @@ 
 		$result=$ldap->connect_bind();
 		if ($result > 0)
 		{
-			if ($result == 2)	// Connection is ok for user/pass into LDAP
+			if ($result == 2) {
+			    // Connection is ok for user/pass into LDAP
 			{
 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
+			}
 				$login=$usertotest;
 
 				// ldap2dolibarr synchronisation
-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+				    // ldap2dolibarr synchronisation
 				{
 						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+				}
 
 						// On charge les attributs du user ldap
-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
+						if ($ldapdebug) {
+						    print "DEBUG: login ldap = ".$login."<br>\n";
+						}
 						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
 
-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						if ($ldapdebug) {
+						    print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
+						}
+						if ($ldapdebug) {
+						    print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
+						}
+						if ($ldapdebug) {
+						    print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						}
 
 						// On recherche le user dolibarr en fonction de son SID ldap
 						$sid = $ldap->getObjectSid($login);
-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+						if ($ldapdebug) {
+						    print "DEBUG: sid = ".$sid."<br>\n";
+						}
 
 						$usertmp=new User($db);
 						$resultFetchUser=$usertmp->fetch('',$login,$sid);
@@ -189,9 +214,11 @@ 
 						unset($usertmp);
 				}
 
-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+				if (! empty($conf->multicompany->enabled)) {
+				    // We must check entity (even if sync is not active)
 				{
 					global $mc;
+				}
 
 					$usertmp=new User($db);
 					$usertmp->fetch('',$login);
@@ -214,8 +241,7 @@ 
 
 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
+		} else
 		{
 			/* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
@@ -226,9 +252,11 @@ 
              ** 53 - Account inactive (manually locked out by administrator)
              */
 			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");
-			if (is_resource($ldap->connection))    // If connection ok but bind ko
+			if (is_resource($ldap->connection)) {
+			    // If connection ok but bind ko
 			{
 				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
+			}
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
 			}