alxarafe / alixar

dolibarr/htdocs/core/class/extrafields.class.php

Spacing +668 added lines, -668 removed lines

@@ -94,12 +94,12 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	var $errno;
 
 
-	public static $type2label=array(
+	public static $type2label = array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
 	'html'=>'HtmlText',
@@ -171,29 +171,29 @@ 
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
+			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
 		}
-		$err1=$this->errno;
+		$err1 = $this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
-			$err2=$this->errno;
+			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
+			$err2 = $this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
-				$this->error='';
-				$this->errno=0;
+				$this->error = '';
+				$this->errno = 0;
 				return 1;
 			}
 			else return -2;
@@ -221,69 +221,69 @@ 
 	 *  @param  string  $computed           Computed value
 	 *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
+	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif ($type=='html') {
-				$typedb='text';
-				$lengthdb=$length;
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='128';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+
+		$table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))
+		{
+			if ($type == 'boolean') {
+				$typedb = 'int';
+				$lengthdb = '1';
+			} elseif ($type == 'price') {
+				$typedb = 'double';
+				$lengthdb = '24,8';
+			} elseif ($type == 'phone') {
+				$typedb = 'varchar';
+				$lengthdb = '20';
+			} elseif ($type == 'mail') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
+			} elseif ($type == 'url') {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif ($type == 'link') {
+				$typedb = 'int';
+				$lengthdb = '11';
+			} elseif ($type == 'html') {
+				$typedb = 'text';
+				$lengthdb = $length;
+			} elseif ($type == 'password') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
 			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+				$typedb = $type;
+				$lengthdb = $length;
+				if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';
 			}
 			$field_desc = array(
 				'type'=>$typedb,
 				'value'=>$lengthdb,
-				'null'=>($required?'NOT NULL':'NULL'),
+				'null'=>($required ? 'NOT NULL' : 'NULL'),
 				'default' => $default_value
 			);
 
-			$result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+			$result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			if ($result > 0)
 			{
 				if ($unique)
 				{
-					$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					$resql=$this->db->query($sql,1,'dml');
+					$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
@@ -317,22 +317,22 @@ 
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
+	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')
 	{
         // phpcs:enable
-		global $conf,$user;
+		global $conf, $user;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
 		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($pos)) $pos = 0;
+		if (empty($list)) $list = '0';
+		if (empty($required)) $required = 0;
+		if (empty($unique)) $unique = 0;
+		if (empty($alwayseditable)) $alwayseditable = 0;
 
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
 		{
 			if (is_array($param) && count($param) > 0)
 			{
@@ -344,54 +344,54 @@ 
 			}
 			else
 			{
-				$params='';
+				$params = '';
 			}
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " pos,";
-			$sql.= " size,";
-			$sql.= " entity,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " param,";
-			$sql.= " alwayseditable,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " list,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= " )";
-			$sql.= " VALUES('".$attrname."',";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " ".$alwayseditable.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " '".$this->db->escape($list)."',";
-			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.=')';
+			$sql .= " name,";
+			$sql .= " label,";
+			$sql .= " type,";
+			$sql .= " pos,";
+			$sql .= " size,";
+			$sql .= " entity,";
+			$sql .= " elementtype,";
+			$sql .= " fieldunique,";
+			$sql .= " fieldrequired,";
+			$sql .= " param,";
+			$sql .= " alwayseditable,";
+			$sql .= " perms,";
+			$sql .= " langs,";
+			$sql .= " list,";
+			$sql .= " fielddefault,";
+			$sql .= " fieldcomputed,";
+			$sql .= " fk_user_author,";
+			$sql .= " fk_user_modif,";
+			$sql .= " datec,";
+			$sql .= " enabled,";
+			$sql .= " help";
+			$sql .= " )";
+			$sql .= " VALUES('".$attrname."',";
+			$sql .= " '".$this->db->escape($label)."',";
+			$sql .= " '".$this->db->escape($type)."',";
+			$sql .= " ".$pos.",";
+			$sql .= " '".$this->db->escape($size)."',";
+			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+			$sql .= " '".$this->db->escape($elementtype)."',";
+			$sql .= " ".$unique.",";
+			$sql .= " ".$required.",";
+			$sql .= " '".$this->db->escape($params)."',";
+			$sql .= " ".$alwayseditable.",";
+			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+			$sql .= " '".$this->db->escape($list)."',";
+			$sql .= " ".($default ? "'".$this->db->escape($default)."'" : "null").",";
+			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+			$sql .= " ".(is_object($user) ? $user->id : 0).",";
+			$sql .= " ".(is_object($user) ? $user->id : 0).",";
+			$sql .= "'".$this->db->idate(dol_now())."',";
+			$sql .= " ".($enabled ? "'".$this->db->escape($enabled)."'" : "1").",";
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= ')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
 			if ($this->db->query($sql))
@@ -400,8 +400,8 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
@@ -414,31 +414,31 @@ 
 	 *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
 	 */
-	function delete($attrname, $elementtype='member')
+	function delete($attrname, $elementtype = 'member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		$table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
-			$result=$this->delete_label($attrname,$elementtype);
+			$result = $this->delete_label($attrname, $elementtype);
 			if ($result < 0)
 			{
-			    $this->error=$this->db->lasterror();
+			    $this->error = $this->db->lasterror();
 			    $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
         		$sql = "SELECT COUNT(rowid) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-        		$sql.= " WHERE elementtype = '".$elementtype."'";
-        		$sql.= " AND name = '".$attrname."'";
+        		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+        		$sql .= " WHERE elementtype = '".$elementtype."'";
+        		$sql .= " AND name = '".$attrname."'";
         		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
                 $resql = $this->db->query($sql);
                 if ($resql)
@@ -446,10 +446,10 @@ 
                     $obj = $this->db->fetch_object($resql);
                     if ($obj->nb <= 0)
                     {
-            			$result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
+            			$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
             			if ($result < 0)
             			{
-            				$this->error=$this->db->lasterror();
+            				$this->error = $this->db->lasterror();
             				$error++;
             			}
                     }
@@ -472,23 +472,23 @@ 
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
 	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
 	 */
-	private function delete_label($attrname, $elementtype='member')
+	private function delete_label($attrname, $elementtype = 'member')
 	{
         // phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-			$sql.= " WHERE name = '".$attrname."'";
-			$sql.= " AND entity IN  (0,".$conf->entity.')';
-			$sql.= " AND elementtype = '".$elementtype."'";
+			$sql .= " WHERE name = '".$attrname."'";
+			$sql .= " AND entity IN  (0,".$conf->entity.')';
+			$sql .= " AND elementtype = '".$elementtype."'";
 
 			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				return 1;
@@ -529,82 +529,82 @@ 
      *  @param  int     $totalizable        Is extrafield totalizable on list
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
+	function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-        $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
-				$typedb='varchar';
-				$lengthdb='255';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+
+        $table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
+		{
+			if ($type == 'boolean') {
+				$typedb = 'int';
+				$lengthdb = '1';
+			} elseif ($type == 'price') {
+				$typedb = 'double';
+				$lengthdb = '24,8';
+			} elseif ($type == 'phone') {
+				$typedb = 'varchar';
+				$lengthdb = '20';
+			} elseif ($type == 'mail') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
+			} elseif ($type == 'url') {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+				$typedb = 'varchar';
+				$lengthdb = '255';
 			} elseif ($type == 'html') {
-				$typedb='text';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='50';
+				$typedb = 'text';
+			} elseif ($type == 'link') {
+				$typedb = 'int';
+				$lengthdb = '11';
+			} elseif ($type == 'password') {
+				$typedb = 'varchar';
+				$lengthdb = '50';
 			} else {
-				$typedb=$type;
-				$lengthdb=$length;
+				$typedb = $type;
+				$lengthdb = $length;
 			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
+			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
 			if ($type != 'separate') // No table update when separate type
 			{
-				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
+					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable);
 				}
 				if ($result > 0)
 				{
-					$sql='';
+					$sql = '';
 					if ($unique)
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					}
 					else
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
-					$resql=$this->db->query($sql,1,'dml');
+					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -1;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -639,26 +639,26 @@ 
      *  @param  int     $totalizable        Is extrafield totalizable on list
      *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
+	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
 	{
         // phpcs:enable
 		global $conf, $user;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+		if (empty($pos)) $pos = 0;
+		if (empty($list)) $list = '0';
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($required)) $required = 0;
+		if (empty($unique)) $unique = 0;
+		if (empty($alwayseditable)) $alwayseditable = 0;
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$this->db->begin();
 
@@ -672,76 +672,76 @@ 
 			}
 			else
 			{
-				$params='';
+				$params = '';
 			}
 
 			if ($entity === '' || $entity != '0')
 			{
 				// We dont want on all entities, we delete all and current
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
+				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
 			else
 			{
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity = 0";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " AND entity = 0";
+				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
-			$resql1=$this->db->query($sql_del);
+			$resql1 = $this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";		// This is code
-			$sql.= " entity,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " size,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " pos,";
-			$sql.= " alwayseditable,";
-			$sql.= " param,";
-			$sql.= " list,";
-            $sql.= " totalizable,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= ") VALUES (";
-			$sql.= "'".$attrname."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($alwayseditable)."',";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " '".$this->db->escape($list)."', ";
-            $sql.= " ".$totalizable.",";
-			$sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . $user->id . ",";
-			$sql .= " " . $user->id . ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql .= "'" . $this->db->escape($enabled). "',";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.= ")";
-
-			$resql2=$this->db->query($sql);
+			$sql .= " name,"; // This is code
+			$sql .= " entity,";
+			$sql .= " label,";
+			$sql .= " type,";
+			$sql .= " size,";
+			$sql .= " elementtype,";
+			$sql .= " fieldunique,";
+			$sql .= " fieldrequired,";
+			$sql .= " perms,";
+			$sql .= " langs,";
+			$sql .= " pos,";
+			$sql .= " alwayseditable,";
+			$sql .= " param,";
+			$sql .= " list,";
+            $sql .= " totalizable,";
+			$sql .= " fielddefault,";
+			$sql .= " fieldcomputed,";
+			$sql .= " fk_user_author,";
+			$sql .= " fk_user_modif,";
+			$sql .= " datec,";
+			$sql .= " enabled,";
+			$sql .= " help";
+			$sql .= ") VALUES (";
+			$sql .= "'".$attrname."',";
+			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+			$sql .= " '".$this->db->escape($label)."',";
+			$sql .= " '".$this->db->escape($type)."',";
+			$sql .= " '".$this->db->escape($size)."',";
+			$sql .= " '".$this->db->escape($elementtype)."',";
+			$sql .= " ".$unique.",";
+			$sql .= " ".$required.",";
+			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+			$sql .= " ".$pos.",";
+			$sql .= " '".$this->db->escape($alwayseditable)."',";
+			$sql .= " '".$this->db->escape($params)."',";
+			$sql .= " '".$this->db->escape($list)."', ";
+            $sql .= " ".$totalizable.",";
+			$sql .= " ".(($default != '') ? "'".$this->db->escape($default)."'" : "null").",";
+			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+			$sql .= " ".$user->id.",";
+			$sql .= " ".$user->id.",";
+			$sql .= "'".$this->db->idate(dol_now())."',";
+			$sql .= "'".$this->db->escape($enabled)."',";
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= ")";
+
+			$resql2 = $this->db->query($sql);
 
 			if ($resql1 && $resql2)
 			{
@@ -770,34 +770,34 @@ 
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
 	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
+	function fetch_name_optionals_label($elementtype, $forceload = false)
 	{
         // phpcs:enable
 		global $conf;
 
 		if (empty($elementtype)) return array();
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
 
-		$array_name_label=array();
+		$array_name_label = array();
 
 		// To avoid conflicts with external modules. TODO Remove this.
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
 		// Set array of label of entity
 		// TODO Remove completely loading of label. This should be done by presentation.
-		$labelmulticompany=array();
+		$labelmulticompany = array();
 		if (!empty($conf->multicompany->enabled))
 		{
-			$sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
-			$resql_entity_name=$this->db->query($sql_entity_name);
+			$sql_entity_name = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
+			$resql_entity_name = $this->db->query($sql_entity_name);
 			if ($resql_entity_name)
 			{
 				while ($obj = $this->db->fetch_object($resql_entity_name))
 				{
-					$labelmulticompany[$obj->rowid]=$obj->label;
+					$labelmulticompany[$obj->rowid] = $obj->label;
 				}
 			}
 		}
@@ -806,12 +806,12 @@ 
 		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
-		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
-		$sql.= " ORDER BY pos";
+		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+		$sql .= " WHERE entity IN (0,".$conf->entity.")";
+		if ($elementtype) $sql .= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element
+		$sql .= " ORDER BY pos";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -821,57 +821,57 @@ 
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{
-						$array_name_label[$tab->name]=$tab->label;
+						$array_name_label[$tab->name] = $tab->label;
 					}
 
 					// Old usage
-					$this->attribute_type[$tab->name]=$tab->type;
-					$this->attribute_label[$tab->name]=$tab->label;
-					$this->attribute_size[$tab->name]=$tab->size;
-					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
-					$this->attribute_default[$tab->name]=$tab->fielddefault;
-					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
-					$this->attribute_unique[$tab->name]=$tab->fieldunique;
-					$this->attribute_required[$tab->name]=$tab->fieldrequired;
-					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attribute_pos[$tab->name]=$tab->pos;
-					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
-					$this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attribute_langfile[$tab->name]=$tab->langs;
-					$this->attribute_list[$tab->name]=$tab->list;
-					$this->attribute_totalizable[$tab->name]=$tab->totalizable;
-					$this->attribute_entityid[$tab->name]=$tab->entity;
-					$this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+					$this->attribute_type[$tab->name] = $tab->type;
+					$this->attribute_label[$tab->name] = $tab->label;
+					$this->attribute_size[$tab->name] = $tab->size;
+					$this->attribute_elementtype[$tab->name] = $tab->elementtype;
+					$this->attribute_default[$tab->name] = $tab->fielddefault;
+					$this->attribute_computed[$tab->name] = $tab->fieldcomputed;
+					$this->attribute_unique[$tab->name] = $tab->fieldunique;
+					$this->attribute_required[$tab->name] = $tab->fieldrequired;
+					$this->attribute_param[$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attribute_pos[$tab->name] = $tab->pos;
+					$this->attribute_alwayseditable[$tab->name] = $tab->alwayseditable;
+					$this->attribute_perms[$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attribute_langfile[$tab->name] = $tab->langs;
+					$this->attribute_list[$tab->name] = $tab->list;
+					$this->attribute_totalizable[$tab->name] = $tab->totalizable;
+					$this->attribute_entityid[$tab->name] = $tab->entity;
+					$this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
 
 					// New usage
-					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
-					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
-					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
-					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
-					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
-					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
-					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
-					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
-					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
-                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=$tab->totalizable;
-					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
-					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
-					$this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
-
-					$this->attributes[$tab->elementtype]['loaded']=1;
+					$this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;
+					$this->attributes[$tab->elementtype]['label'][$tab->name] = $tab->label;
+					$this->attributes[$tab->elementtype]['size'][$tab->name] = $tab->size;
+					$this->attributes[$tab->elementtype]['elementtype'][$tab->name] = $tab->elementtype;
+					$this->attributes[$tab->elementtype]['default'][$tab->name] = $tab->fielddefault;
+					$this->attributes[$tab->elementtype]['computed'][$tab->name] = $tab->fieldcomputed;
+					$this->attributes[$tab->elementtype]['unique'][$tab->name] = $tab->fieldunique;
+					$this->attributes[$tab->elementtype]['required'][$tab->name] = $tab->fieldrequired;
+					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['pos'][$tab->name] = $tab->pos;
+					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name] = $tab->alwayseditable;
+					$this->attributes[$tab->elementtype]['perms'][$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attributes[$tab->elementtype]['langfile'][$tab->name] = $tab->langs;
+					$this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;
+                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = $tab->totalizable;
+					$this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;
+					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
+					$this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;
+					$this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;
+
+					$this->attributes[$tab->elementtype]['loaded'] = 1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
+			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
 
@@ -893,57 +893,57 @@ 
 	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return string
 	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
+	function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
-		$out='';
+		$out = '';
 
-		$keyprefix = $keyprefix.'options_';		// Because we work on extrafields
+		$keyprefix = $keyprefix.'options_'; // Because we work on extrafields
 
-		if (! empty($extrafieldsobjectkey))
+		if (!empty($extrafieldsobjectkey))
 		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$label=$this->attribute_label[$key];
-			$type =$this->attribute_type[$key];
-			$size =$this->attribute_size[$key];
-			$elementtype=$this->attribute_elementtype[$key];	// Seems not used
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$langfile=$this->attribute_langfile[$key];
-			$list=$this->attribute_list[$key];
-			$totalizable=$this->attribute_totalizable[$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attribute_label[$key];
+			$type = $this->attribute_type[$key];
+			$size = $this->attribute_size[$key];
+			$elementtype = $this->attribute_elementtype[$key]; // Seems not used
+			$default = $this->attribute_default[$key];
+			$computed = $this->attribute_computed[$key];
+			$unique = $this->attribute_unique[$key];
+			$required = $this->attribute_required[$key];
+			$param = $this->attribute_param[$key];
+			$langfile = $this->attribute_langfile[$key];
+			$list = $this->attribute_list[$key];
+			$totalizable = $this->attribute_totalizable[$key];
+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
@@ -957,21 +957,21 @@ 
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type,array('int','integer','double','price')))
+			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
 			}
 			elseif ($type == 'password')
 			{
-				$morecss='maxwidth100';
+				$morecss = 'maxwidth100';
 			}
 			elseif ($type == 'url')
 			{
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -990,12 +990,12 @@ 
 			}
 		}
 
-		if (in_array($type,array('date','datetime')))
+		if (in_array($type, array('date', 'datetime')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
 
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
+			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
 			if (!$required && $value == '') $value = '-1';
@@ -1003,244 +1003,244 @@ 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
-		elseif (in_array($type,array('int','integer')))
+		elseif (in_array($type, array('int', 'integer')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked value="1" ';
+				$checked = ' checked value="1" ';
 			} else {
-				$checked=' value="1" ';
+				$checked = ' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		}
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out.='<option value="0">&nbsp;</option>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+			$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
-				$out.='</option>';
+				$out .= '<option value="'.$key.'"';
+				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+				$out .= '>';
+				if ($langfile && $val) $out .= $langs->trans($val);
+				else $out .= $val;
+				$out .= '</option>';
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			if (is_array($param['options']))
 			{
-				$param_list=array_keys($param['options']);
+				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
 				{
 					if (strpos($InfoFieldList[4], 'extra.') !== false)
 					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
 				{
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
+					$keyList .= ', '.$parentField;
 				}
 
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label))
 				{
-					$keyList .=', ';
+					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
 
-				$sqlwhere='';
+				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
 				    // can use curent entity filter
-				    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
-				        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
+				    if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+				        $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
 				    }
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
+					if (strpos($InfoFieldList[4], 'extra') !== false)
 					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				else
 				{
-					$sqlwhere.= ' WHERE 1=1';
+					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
-				$sql.=$sqlwhere;
+				$sql .= $sqlwhere;
 				//print $sql;
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+				$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$out.='<option value="0">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					while ($i < $num)
 					{
-						$labeltoshow='';
+						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
+						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label))
 						{
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
-								$labeltoshow.= $obj->$field_toshow.' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
 						else
 						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
+						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if ($value == $obj->rowid)
 						{
 							foreach ($fields_label as $field_toshow)
 							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+								$translabel = $langs->trans($obj->$field_toshow);
+								if ($translabel != $obj->$field_toshow) {
+									$labeltoshow = dol_trunc($translabel, 18).' ';
+								} else {
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							if (! $notrans)
+							if (!$notrans)
 							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$labeltoshow = dol_trunc($translabel, 18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid)
 							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
 							if (!empty($InfoFieldList[3]) && $parentField)
@@ -1248,10 +1248,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'"';
+							$out .= ($value == $obj->rowid ? ' selected' : '');
+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 
 						$i++;
@@ -1262,23 +1262,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$value_arr = explode(',', $value);
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')
 		{
-			$out='';
+			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+				$out .= ' value="'.$keyopt.'"';
+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+				$out .= ($value == $keyopt ? 'checked' : '');
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -1293,24 +1293,24 @@ 
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					$keyList .= ', '.$parentField;
 				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
 
@@ -1321,59 +1321,59 @@ 
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
+				$sql = 'SELECT '.$keyList;
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
 
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					} else if (preg_match("#^.*list.php$#", $_SERVER["DOCUMENT_URI"])) {
 						// Pattern for word=$ID$
 						$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 						
 						// Removing space arount =, ( and )
-						$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+						$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 						
 						$nbPreg = 1;
 						// While we have parenthesis
-						while ($nbPreg!=0) {
+						while ($nbPreg != 0) {
 							// Init des compteurs
 							$nbPregRepl = $nbPregSel = 0;
 							// On retire toutes les parenthèses sans = avant
-							$InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
+							$InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
 							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 							// On retire toutes les parenthèses avec = avant
-							$InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
+							$InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
 							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 							
 							// Calcul du compteur général pour la boucle
 							$nbPreg = $nbPregRepl + $nbPregSel;
 						}
 						
 						// Si l'on a un AND ou un OR, avant ou après
-						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						while(!empty($matchCondition[0])) {
+						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+						while (!empty($matchCondition[0])) {
 							// If the two sides differ but are not empty
-							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
+							if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
 								// Nobody sain would do that without parentheses
-								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+								$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 							}
 							else {
-								if (! empty($matchCondition[1])) {
-									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
+								if (!empty($matchCondition[1])) {
+									$boolCond = (($matchCondition[1] == "AND") ? ' AND 1 ' : ' OR 0 ');
+									$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
 								}
-								else if (! empty($matchCondition[3])) {
-									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
+								else if (!empty($matchCondition[3])) {
+									$boolCond = (($matchCondition[3] == "AND") ? ' 1 AND ' : ' 0 OR');
+									$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
 								}
 								else {
 									$InfoFieldList[4] = 1;
@@ -1381,41 +1381,41 @@ 
 							}
 							
 							// Si l'on a un AND ou un OR, avant ou après
-							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
 						}
 					}
 					else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
 
 				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
-					$data=array();
+					$data = array();
 
-					while ( $i < $num ) {
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
@@ -1424,8 +1424,8 @@ 
 						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label)) {
 							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
+							foreach ($fields_label as $field_toshow) {
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -1433,18 +1433,18 @@ 
 						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									$labeltoshow = dol_trunc($translabel, 18).' ';
 								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						} else {
-							if (! $notrans) {
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -1456,40 +1456,40 @@ 
 								$labeltoshow = '(not defined)';
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
+									$data[$obj->rowid] = $labeltoshow;
 								}
 
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName.':'.$obj->{$parentField};
 								}
 
-								$data[$obj->rowid]=$labeltoshow;
+								$data[$obj->rowid] = $labeltoshow;
 						}
 
-						$i ++;
+						$i++;
 					}
 					$this->db->free($resql);
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+			$showempty = (($required && $default != '') ? 0 : 1);
+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
 		}
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
+			$out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
 		}
 		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -1508,44 +1508,44 @@ 
 	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
-	function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
+	function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		global $conf, $langs;
+
+		if (!empty($extrafieldsobjectkey))
+		{
+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$label=$this->attribute_label[$key];
-			$type=$this->attribute_type[$key];
-			$size=$this->attribute_size[$key];
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$perms=dol_eval($this->attribute_perms[$key], 1);
-			$langfile=$this->attribute_langfile[$key];
-			$list=dol_eval($this->attribute_list[$key], 1);
-			$help='';	// Not supported with old syntax
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attribute_label[$key];
+			$type = $this->attribute_type[$key];
+			$size = $this->attribute_size[$key];
+			$default = $this->attribute_default[$key];
+			$computed = $this->attribute_computed[$key];
+			$unique = $this->attribute_unique[$key];
+			$required = $this->attribute_required[$key];
+			$param = $this->attribute_param[$key];
+			$perms = dol_eval($this->attribute_perms[$key], 1);
+			$langfile = $this->attribute_langfile[$key];
+			$list = dol_eval($this->attribute_list[$key], 1);
+			$help = ''; // Not supported with old syntax
+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -1555,88 +1555,88 @@ 
 		    $value = dol_eval($computed, 1, 0);
 		}
 
-		$showsize=0;
+		$showsize = 0;
 		if ($type == 'date')
 		{
-			$showsize=10;
-			$value=dol_print_date($value, 'day');
+			$showsize = 10;
+			$value = dol_print_date($value, 'day');
 		}
 		elseif ($type == 'datetime')
 		{
-			$showsize=19;
-			$value=dol_print_date($value, 'dayhour');
+			$showsize = 19;
+			$value = dol_print_date($value, 'dayhour');
 		}
 		elseif ($type == 'int')
 		{
-			$showsize=10;
+			$showsize = 10;
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {
-				$value=price($value);
+				$value = price($value);
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked ';
+				$checked = ' checked ';
 			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		}
 		elseif ($type == 'mail')
 		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		}
 		elseif ($type == 'url')
 		{
-			$value=dol_print_url($value,'_blank',32,1);
+			$value = dol_print_url($value, '_blank', 32, 1);
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		}
 		elseif ($type == 'price')
 		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 		}
 		elseif ($type == 'select')
 		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
+			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
+			else $value = $param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
-			$param_list=array_keys($param['options']);
+			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
-			$selectkey="rowid";
-			$keyList='rowid';
+			$selectkey = "rowid";
+			$keyList = 'rowid';
 
-			if (count($InfoFieldList)>=3)
+			if (count($InfoFieldList) >= 3)
 			{
 				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
+			$fields_label = explode('|', $InfoFieldList[1]);
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
 
 			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (strpos($InfoFieldList[4], 'extra') !== false)
 			{
-				$sql.= ' as main';
+				$sql .= ' as main';
 			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+			if ($selectkey == 'rowid' && empty($value)) {
+				$sql .= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey == 'rowid') {
+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+			} else {
+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
@@ -1645,38 +1645,38 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
 
 				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if(is_array($fields_label) && count($fields_label)>1)
+				if (is_array($fields_label) && count($fields_label) > 1)
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel='';
+						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
+							$translabel = $langs->trans($obj->$field_toshow);
 						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
+						if ($translabel != $field_toshow) {
+							$value .= dol_trunc($translabel, 18).' ';
+						} else {
+							$value .= $obj->$field_toshow.' ';
 						}
 					}
 				}
 				else
 				{
-					$translabel='';
+					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
+					if ($translabel != $obj->{$InfoFieldList[1]}) {
+						$value = dol_trunc($translabel, 18);
+					} else {
+						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -1684,20 +1684,20 @@ 
 		}
 		elseif ($type == 'radio')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$value='';
-			$toprint=array();
+			$value_arr = explode(',', $value);
+			$value = '';
+			$toprint = array();
 			if (is_array($value_arr))
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
 			}
-			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 		elseif ($type == 'chkbxlst')
 		{
@@ -1711,7 +1711,7 @@ 
 
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
@@ -1720,74 +1720,74 @@ 
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+			$sql = 'SELECT '.$keyList;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				$toprint = array();
+				while ($obj = $this->db->fetch_object($resql)) {
 
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
+								if (!empty($obj->$field_toshow)) {
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
+							if (!empty($obj->{$InfoFieldList[1]})) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$out='';
+			$out = '';
 
 			// Only if something to display (perf)
 			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				if (! empty($classpath))
+				$classname = $InfoFieldList[0];
+				$classpath = $InfoFieldList[1];
+				if (!empty($classpath))
 				{
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname))
 					{
 						$object = new $classname($this->db);
 						$object->fetch($value);
-						$value=$object->getNomUrl(3);
+						$value = $object->getNomUrl(3);
 					}
 				}
 				else
@@ -1799,24 +1799,24 @@ 
 		}
 		elseif ($type == 'text')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'html')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'password')
 		{
-			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
+			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		}
 		else
 		{
-			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
+			$showsize = round($size);
+			if ($showsize > 48) $showsize = 48;
 		}
 
 		//print $type.'-'.$size;
-		$out=$value;
+		$out = $value;
 
 		return $out;
 	}
@@ -1828,46 +1828,46 @@ 
 	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
-	function getAlignFlag($key, $extrafieldsobjectkey='')
+	function getAlignFlag($key, $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
+		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		else $type = $this->attribute_type[$key];
 
-		$align='';
+		$align = '';
 
         if ($type == 'date')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'datetime')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'int')
 		{
-			$align="right";
+			$align = "right";
 		}
 		elseif ($type == 'double')
 		{
-			$align="right";
+			$align = "right";
 		}
 		elseif ($type == 'boolean')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'radio')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'checkbox')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'price')
 		{
-			$align="right";
+			$align = "right";
 		}
 
 		return $align;
@@ -1885,8 +1885,8 @@ 
 		global $langs;
 
 		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
-		$out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out.= '</strong></td></tr>';
+		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
+		$out .= '</strong></td></tr>';
 		return $out;
 	}
 
@@ -1898,20 +1898,20 @@ 
 	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
 	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
 	 */
-	function setOptionalsFromPost($extralabels, &$object, $onlykey='')
+	function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
 	{
 		global $_POST, $langs;
-		$nofillrequired='';// For error when required field left blank
+		$nofillrequired = ''; // For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
+				if (!empty($onlykey) && $key != $onlykey) continue;
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
 				if ($key_type == 'separate') continue;
@@ -1932,7 +1932,7 @@ 
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
+					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
@@ -1941,43 +1941,43 @@ 
 					}
 				}
 
-				if (in_array($key_type,array('date')))
+				if (in_array($key_type, array('date')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 				}
-				elseif (in_array($key_type,array('datetime')))
+				elseif (in_array($key_type, array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
+				else if (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
+					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
-						$value_key=implode($value_arr,',');
-					}else {
-						$value_key='';
+						$value_key = implode($value_arr, ',');
+					} else {
+						$value_key = '';
 					}
 				}
-				else if (in_array($key_type,array('price','double')))
+				else if (in_array($key_type, array('price', 'double')))
 				{
-					$value_arr=GETPOST("options_".$key, 'alpha');
-					$value_key=price2num($value_arr);
+					$value_arr = GETPOST("options_".$key, 'alpha');
+					$value_key = price2num($value_arr);
 				}
 				else
 				{
-					$value_key=GETPOST("options_".$key);
+					$value_key = GETPOST("options_".$key);
 				}
 
-				$object->array_options["options_".$key]=$value_key;
+				$object->array_options["options_".$key] = $value_key;
 			}
 
 			if ($nofillrequired) {
 				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
+				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
 				return -1;
 			}
 			else {
@@ -1997,7 +1997,7 @@ 
 	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @return array|int								array_options set or 0 if no value
 	 */
-	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
+	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix = '', $keysuffix = '')
 	{
 		global $_POST;
 
@@ -2023,29 +2023,29 @@ 
 					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
 				}
 
-				if (in_array($key_type,array('date','datetime')))
+				if (in_array($key_type, array('date', 'datetime')))
 				{
 					// Clean parameters
-					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
+					$value_key = dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
 				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+				else if (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
-					$value_arr=(array) $value_arr;
-					$value_key=implode(',', $value_arr);
+					$value_arr = (array) $value_arr;
+					$value_key = implode(',', $value_arr);
 				}
-				else if (in_array($key_type,array('price','double')))
+				else if (in_array($key_type, array('price', 'double')))
 				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key=price2num($value_arr);
+					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_key = price2num($value_arr);
 				}
 				else
 				{
-					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
 
-				$array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
+				$array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.
 			}
 
 			return $array_options;

dolibarr/htdocs/core/class/events.class.php

Spacing +68 added lines, -68 removed lines

@@ -37,12 +37,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='events';
+	public $element = 'events';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='events';
+	public $table_element = 'events';
 
 	/**
 	 * @var int ID
@@ -57,7 +57,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $tms;
 	public $type;
@@ -75,20 +75,20 @@ 
 	public $description;
 
 	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
+	public $eventstolog = array(
+		array('id'=>'USER_LOGIN', 'test'=>1),
+		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
+	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_CREATE', 'test'=>1),
+		array('id'=>'USER_MODIFY', 'test'=>1),
+		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
+		array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
+		array('id'=>'USER_DELETE', 'test'=>1),
 	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
+		array('id'=>'GROUP_CREATE', 'test'=>1),
+		array('id'=>'GROUP_MODIFY', 'test'=>1),
+		array('id'=>'GROUP_DELETE', 'test'=>1),
 	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
@@ -136,33 +136,33 @@ 
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		$this->description = trim($this->description);
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];
 
 		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
+		$sql .= "type,";
+		$sql .= "entity,";
+		$sql .= "ip,";
+		$sql .= "user_agent,";
+		$sql .= "dateevent,";
+		$sql .= "fk_user,";
+		$sql .= "description";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->type)."',";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->escape(getUserRemoteIP())."',";
+		$sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
+		$sql .= " '".$this->db->idate($this->dateevent)."',";
+		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+		$sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
@@ -170,7 +170,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -183,30 +183,30 @@ 
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
+		$this->id = trim($this->id);
+		$this->type = trim($this->type);
+		$this->description = trim($this->description);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " type='".$this->db->escape($this->type)."',";
+		$sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
+		$sql .= " description='".$this->db->escape($this->description)."'";
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 		return 1;
@@ -220,31 +220,31 @@ 
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function fetch($id, $user=null)
+	function fetch($id, $user = null)
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.tms,";
+		$sql .= " t.type,";
+		$sql .= " t.entity,";
+		$sql .= " t.dateevent,";
+		$sql .= " t.description,";
+		$sql .= " t.ip,";
+		$sql .= " t.user_agent";
+		$sql .= " FROM ".MAIN_DB_PREFIX."events as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id    = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->type = $obj->type;
 				$this->entity = $obj->entity;
@@ -259,7 +259,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -276,13 +276,13 @@ 
 		global $conf, $langs;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -299,11 +299,11 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
+		$this->tms = time();
+		$this->type = '';
+		$this->dateevent = time();
+		$this->description = 'This is a specimen event';
 	}
 }

dolibarr/htdocs/core/class/ctyperesource.class.php

Spacing +47 added lines, -47 removed lines

@@ -99,18 +99,18 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+		$sql .= 'code,';
+		$sql .= 'label';
+		$sql .= 'active';
 
 
 		$sql .= ') VALUES (';
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
 
 
 		$sql .= ')';
@@ -119,13 +119,13 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -142,7 +142,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -159,7 +159,7 @@ 
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id,$code='',$label='')
+	public function fetch($id, $code = '', $label = '')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -171,10 +171,10 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";
 
 
 		$resql = $this->db->query($sql);
@@ -204,10 +204,10 @@ 
 				return 0;
 			}
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -223,7 +223,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -235,24 +235,24 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 			}
 		}
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		 $sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -272,10 +272,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -309,22 +309,22 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+		$sql .= ' active = '.(isset($this->active) ? $this->active : "null");
 
 
-		$sql .= ' WHERE rowid=' . $this->id;
+		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// Uncomment this and change MYOBJECT to your own tag if you
@@ -341,7 +341,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -378,14 +378,14 @@ 
 		// If you need to delete child tables to, you can insert them here
 
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE rowid='.$this->id;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -393,7 +393,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -431,9 +431,9 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// End
@@ -444,7 +444,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 

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

Spacing +50 added lines, -50 removed lines

@@ -22,7 +22,7 @@ 
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -45,7 +45,7 @@ 
     public $toname;
     public $tomail;
 
-    public $withsubstit;			// Show substitution array
+    public $withsubstit; // Show substitution array
     public $withfrom;
     public $withto;
     public $withtopic;
@@ -57,18 +57,18 @@ 
     public $withtopicreadonly;
     public $withcancel;
 
-    public $substit=array();
-    public $param=array();
+    public $substit = array();
+    public $param = array();
 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[]	Array of error strings
      */
-    public $errors=array();
+    public $errors = array();
 
 
     /**
@@ -80,16 +80,16 @@ 
     {
         $this->db = $db;
 
-        $this->withfrom=1;
-        $this->withto=1;
-        $this->withtopic=1;
-        $this->withbody=1;
+        $this->withfrom = 1;
+        $this->withto = 1;
+        $this->withtopic = 1;
+        $this->withbody = 1;
 
-        $this->withfromreadonly=1;
-        $this->withreplytoreadonly=1;
-        $this->withtoreadonly=0;
-        $this->withtopicreadonly=0;
-        $this->withbodyreadonly=0;
+        $this->withfromreadonly = 1;
+        $this->withreplytoreadonly = 1;
+        $this->withtoreadonly = 0;
+        $this->withtopicreadonly = 0;
+        $this->withbodyreadonly = 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -100,17 +100,17 @@ 
      *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
      *	@return	void
      */
-    function show_form($morecss='titlefield', $showform=1)
+    function show_form($morecss = 'titlefield', $showform = 1)
     {
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
 
-        $soc=new Societe($this->db);
+        $soc = new Societe($this->db);
         if (!empty($this->withtosocid) && $this->withtosocid > 0)
         {
             $soc->fetch($this->withtosocid);
@@ -141,15 +141,15 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
-            $help="";
-            foreach($this->substit as $key => $val)
+            $help = "";
+            foreach ($this->substit as $key => $val)
             {
-                $help.=$key.' -> '.$langs->trans($val).'<br>';
+                $help .= $key.' -> '.$langs->trans($val).'<br>';
             }
-            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"),$help);
+            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
             print "</td></tr>\n";
         }
 
@@ -164,7 +164,7 @@ 
                 if ($this->fromtype == 'user')
                 {
                     $langs->load("users");
-                    $fuser=new User($this->db);
+                    $fuser = new User($this->db);
                     $fuser->fetch($this->fromid);
                     print $fuser->getNomUrl(1);
                     print ' &nbsp; ';
@@ -203,19 +203,19 @@ 
                             $resultsender = $sms->SmsSenderList();
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                     }
                 }
                 else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
-                    $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
-                    $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
                     {
-                        $classname=ucfirst($classfile);
+                        $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
@@ -224,26 +224,26 @@ 
                         else
                         {
                         	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
                 }
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
-                    $resultsender[0]->number=$this->fromsms;
+	                $resultsender = array();
+                    $resultsender[0]->number = $this->fromsms;
                 }
 
                 if (is_array($resultsender) && count($resultsender) > 0)
                 {
                     print '<select name="fromsms" id="fromsms" class="flat">';
-                    foreach($resultsender as $obj)
+                    foreach ($resultsender as $obj)
                     {
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
@@ -252,7 +252,7 @@ 
                 else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
                 }
                 print '</td>';
@@ -265,22 +265,22 @@ 
         {
             print '<tr><td>';
             //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-            $moretext='';
-            print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
+            $moretext = '';
+            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
             print '</td><td>';
             if ($this->withtoreadonly)
             {
-                print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
             }
             else
             {
-                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
-                if (! empty($this->withtosocid) && $this->withtosocid > 0)
+                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
+                if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
-                    $liste=array();
+                    $liste = array();
                     foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
                     {
-                        $liste[$key]=$value;
+                        $liste[$key] = $value;
                     }
                     print " ".$langs->trans("or")." ";
                     //var_dump($_REQUEST);exit;
@@ -294,14 +294,14 @@ 
         // Message
         if ($this->withbody)
         {
-            $defaultmessage='';
-            if ($this->param["models"]=='body')
+            $defaultmessage = '';
+            if ($this->param["models"] == 'body')
             {
-                $defaultmessage=$this->withbody;
+                $defaultmessage = $this->withbody;
             }
-            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
+            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
+            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
+            $defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
             print "<tr>";
             print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
@@ -314,7 +314,7 @@ 
             else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';
+                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
             print "</td></tr>\n";
         }

dolibarr/htdocs/core/class/rssparser.class.php

Spacing +86 added lines, -86 removed lines

@@ -34,9 +34,9 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-    private $_format='';
+    private $_format = '';
     private $_urlRSS;
     private $_language;
     private $_generator;
@@ -46,8 +46,8 @@ 
     private $_link;
     private $_title;
     private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
+    private $_lastfetchdate; // Last successful fetch
+    private $_rssarray = array();
 
     // For parsing with xmlparser
     var $stack               = array(); // parser stack
@@ -184,40 +184,40 @@ 
      * 	@param	string	$cachedir	Directory where to save cache file
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+    public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
     {
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $rss='';
-        $str='';    // This will contain content of feed
+        $rss = '';
+        $str = ''; // This will contain content of feed
 
         // Check parameters
-        if (! dol_is_url($urlRSS))
+        if (!dol_is_url($urlRSS))
         {
-            $this->error="ErrorBadUrl";
+            $this->error = "ErrorBadUrl";
             return -1;
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
+        $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+        $newmask = '0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
         $nowgmt = dol_now();
 
         // Search into cache
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0 && $cachedir)
         {
-            $filedate=dol_filemtime($newpathofdestfile);
+            $filedate = dol_filemtime($newpathofdestfile);
             if ($filedate >= ($nowgmt - $cachedelay))
             {
                 //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
+                $foundintocache = 1;
 
-                $this->_lastfetchdate=$filedate;
+                $this->_lastfetchdate = $filedate;
             }
             else
             {
@@ -233,13 +233,13 @@ 
         else
         {
             try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+                ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
                 ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
@@ -253,7 +253,7 @@ 
         if ($str !== false)
         {
 	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+	        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 	        {
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
@@ -261,9 +261,9 @@ 
 	        }
 	        else
 	        {
-	            $xmlparser=xml_parser_create('');
+	            $xmlparser = xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
+	                $this->error = "ErrorFailedToCreateParser"; return -1;
 	            }
 
 	            xml_set_object($xmlparser, $this);
@@ -271,7 +271,7 @@ 
 	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
 	            $status = xml_parse($xmlparser, $str);
 	            xml_parser_free($xmlparser);
-	            $rss=$this;
+	            $rss = $this;
 	            //var_dump($rss->_format);exit;
 	        }
         }
@@ -283,16 +283,16 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
                 	@chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+	                $this->_lastfetchdate = $nowgmt;
                 }
                 else
                 {
@@ -300,21 +300,21 @@ 
                 }
             }
 
-            unset($str);    // Free memory
+            unset($str); // Free memory
 
             if (empty($rss->_format))    // If format not detected automatically
             {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+                $rss->_format = 'rss';
+                if (empty($rss->channel)) $rss->_format = 'atom';
             }
 
-            $items=array();
+            $items = array();
 
             // Save description entries
             if ($rss->_format == 'rss')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
                     if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
@@ -338,14 +338,14 @@ 
                     if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
             else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
                     if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
@@ -364,10 +364,10 @@ 
                     if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
-                    $tmprss=xml2php($rss); $items=$tmprss['entry'];
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $tmprss = xml2php($rss); $items = $tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -376,12 +376,12 @@ 
             // Loop on each record
             if (is_array($items))
             {
-                foreach($items as $item)
+                foreach ($items as $item)
                 {
                     //var_dump($item);exit;
                     if ($rss->_format == 'rss')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (string) $item->link;
                             $itemTitle = (string) $item->title;
@@ -401,7 +401,7 @@ 
                         }
 
                         // Loop on each category
-                        $itemCategory=array();
+                        $itemCategory = array();
                         if (is_array($item->category))
                         {
                             foreach ($item->category as $cat)
@@ -412,14 +412,14 @@ 
                     }
                     else if ($rss->_format == 'atom')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                         else
                         {
@@ -428,7 +428,7 @@ 
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                     }
                     else print 'ErrorBadFeedFormat';
@@ -446,7 +446,7 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb)    break; // We get all records we want
                 }
             }
 
@@ -454,7 +454,7 @@ 
         }
         else
         {
-            $this->error='ErrorFailedToLoadRSSFile';
+            $this->error = 'ErrorFailedToLoadRSSFile';
             return -1;
         }
     }
@@ -482,7 +482,7 @@ 
         {
             list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' )
+        if ($ns and $ns != 'rdf')
         {
             $this->current_namespace = $ns;
         }
@@ -490,15 +490,15 @@ 
         // if feed type isn't set, then this is first element of feed identify feed from root element
         if (empty($this->_format))
         {
-            if ( $el == 'rdf' ) {
+            if ($el == 'rdf') {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -506,14 +506,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        if ($el == 'channel')
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' )
+        elseif ($el == 'item' or $el == 'entry')
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -537,10 +537,10 @@ 
         }
 
         // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -548,7 +548,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
+        elseif ($this->_format == 'atom' and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
@@ -562,14 +562,14 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->_format == 'atom' and $el == 'link' )
+        elseif ($this->_format == 'atom' and $el == 'link')
         {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -622,26 +622,26 @@ 
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
         {
             $this->intextinput = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
         {
             $this->inimage = false;
         }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' )
+        elseif ($el == 'channel' or $el == 'feed')
         {
             $this->inchannel = false;
         }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        elseif ($this->_format == 'atom' and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -666,10 +666,10 @@ 
      *  @param	string	$str2		Str2
      *  @return	string				String cancatenated
      */
-    function concat(&$str1, $str2="")
+    function concat(&$str1, $str2 = "")
     {
-        if (!isset($str1) ) {
-            $str1="";
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -684,11 +684,11 @@ 
     function append_content($text)
     {
         // phpcs:enable
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -704,33 +704,33 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->channel[$this->current_namespace][$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->textinput[$this->current_namespace][$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+                $this->concat($this->image[$this->current_namespace][$el], $text);
             }
         }
         else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
+                $this->concat($this->textinput[$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
+                $this->concat($this->image[$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
+                $this->concat($this->channel[$el], $text);
             }
         }
     }
@@ -748,18 +748,18 @@ 
     $fils = 0;
     $tab = false;
     $array = array();
-    foreach($xml->children() as $key => $value)
+    foreach ($xml->children() as $key => $value)
     {
         $child = xml2php($value);
 
         //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
+        foreach ($value->attributes() as $ak=>$av)
         {
             $child[$ak] = (string) $av;
         }
 
         //Let see if the new child is not in the array
-        if ($tab === false && in_array($key,array_keys($array)))
+        if ($tab === false && in_array($key, array_keys($array)))
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
@@ -768,7 +768,7 @@ 
             $array[$key][] = $child;
             $tab = true;
         }
-        elseif($tab === true)
+        elseif ($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
@@ -783,7 +783,7 @@ 
     }
 
 
-    if ($fils==0)
+    if ($fils == 0)
     {
         return (string) $xml;
     }

dolibarr/htdocs/core/class/genericobject.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *	\ingroup    core
  *	\brief      File of class of generic business class
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -36,6 +36,6 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 }

dolibarr/htdocs/core/class/menu.class.php

Spacing +10 added lines, -10 removed lines

@@ -65,9 +65,9 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+    	$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**
@@ -88,12 +88,12 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-        $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
-        $array_end   = array_slice($this->liste,($idafter+1));
-        $this->liste=array_merge($array_start,$array_new,$array_end);
+        $array_start = array_slice($this->liste, 0, ($idafter + 1));
+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+        $array_end   = array_slice($this->liste, ($idafter + 1));
+        $this->liste = array_merge($array_start, $array_new, $array_end);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -117,10 +117,10 @@ 
      */
     function getNbOfVisibleMenuEntries()
     {
-        $nb=0;
-        foreach($this->liste as $val)
+        $nb = 0;
+        foreach ($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (!empty($val['enabled'])) $nb++;
         }
         return $nb;
     }

dolibarr/htdocs/core/class/CMailFile.class.php

Spacing +329 added lines, -329 removed lines

@@ -40,13 +40,13 @@ 
 	public $sendmode;
 	public $sendsetup;
 
-	var $subject;      	// Topic:       Subject of email
-	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
+	var $subject; // Topic:       Subject of email
+	var $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
 	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
 	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
 	// Return-Path: Email where to send bounds.
-	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
-	var $errors_to;		// Errors-To:	Email where to send errors.
+	var $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
+	var $errors_to; // Errors-To:	Email where to send errors.
 	var $addr_to;
 	var $addr_cc;
 	var $addr_bcc;
@@ -63,10 +63,10 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	var $smtps;			// Contains SMTPs object (if this method is used)
-	var $phpmailer;		// Contains PHPMailer object (if this method is used)
+	var $smtps; // Contains SMTPs object (if this method is used)
+	var $phpmailer; // Contains PHPMailer object (if this method is used)
 
 	/**
 	 * @var string CSS
@@ -83,9 +83,9 @@ 
 	// Image
 	var $html;
 	var $image_boundary;
-	var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
-	var $html_images=array();
-	var $images_encoded=array();
+	var $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
+	var $html_images = array();
+	var $images_encoded = array();
 	var $image_types = array(
         'gif'  => 'image/gif',
 		'jpg'  => 'image/jpeg',
@@ -119,13 +119,13 @@ 
 	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
 	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
 	 */
-	function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
+	function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '')
 	{
 		global $conf, $dolibarr_main_data_root;
 
 		$this->sendcontext = $sendcontext;
 
-		if (empty($replyto)) $replyto=$from;
+		if (empty($replyto)) $replyto = $from;
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -133,28 +133,28 @@ 
 		{
 			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
 		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
+		if (empty($this->sendmode)) $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
+		if (empty($this->sendmode)) $this->sendmode = 'mail';
 
 		// We define end of line (RFC 821).
-		$this->eol="\r\n";
+		$this->eol = "\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
-		$this->eol2="\r\n";
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		$this->eol2 = "\r\n";
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
 		{
-			$this->eol="\n";
-			$this->eol2="\n";
-			$moreinheader = str_replace("\r\n","\n",$moreinheader);
+			$this->eol = "\n";
+			$this->eol2 = "\n";
+			$moreinheader = str_replace("\r\n", "\n", $moreinheader);
 		}
 
 		// On defini mixed_boundary
-		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
+		$this->mixed_boundary = "multipart_x.".time().".x_boundary";
 
 		// On defini related_boundary
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
+		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contains special chars)
 
 		// On defini alternative_boundary
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
+		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
 
 		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
@@ -162,13 +162,13 @@ 
 		if (empty($subject))
 		{
 			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-			$this->error='ErrorSubjectIsRequired';
+			$this->error = 'ErrorSubjectIsRequired';
 			return;
 		}
 		if (empty($msg))
 		{
 		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+		    $msg = '.'; // Avoid empty message (with empty message conten show a multipart structure)
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -185,21 +185,21 @@ 
 		global $dolibarr_main_url_root;
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 		// Replace relative /viewimage to absolute path
-		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
+		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
 
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml = 1; // To force to send everything with content type html.
 
 		// Detect images
 		if ($this->msgishtml)
 		{
 			$this->html = $msg;
 
-			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
 			{
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
 			}
@@ -211,7 +211,7 @@ 
 				{
 					if ($this->html_images[$i])
 					{
-						$this->atleastoneimage=1;
+						$this->atleastoneimage = 1;
 						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
 					}
 				}
@@ -225,14 +225,14 @@ 
 			{
 				if ($filename_list[$i])
 				{
-					$this->atleastonefile=1;
+					$this->atleastonefile = 1;
 					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
 				}
 			}
 		}
 
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
 		// Action according to choosed sending method
 		if ($this->sendmode == 'mail')
@@ -257,17 +257,17 @@ 
 			$this->trackid = $trackid;
 
 			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (!empty($moreinheader)) $smtp_headers .= $moreinheader; // $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
 					$this->css = $css;
-					$this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+					$this->buildCSS(); // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
 				}
 
 				$msg = $this->html;
@@ -279,20 +279,20 @@ 
 			// Add attachments to text_encoded
 			if ($this->atleastonefile)
 			{
-				$files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
+				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list);
 			}
 
 			// We now define $this->headers and $this->message
-			$this->headers = $smtp_headers . $mime_headers;
+			$this->headers = $smtp_headers.$mime_headers;
 			// On nettoie le header pour qu'il ne se termine pas par un retour chariot.
 			// Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
 			// comme des injections mail par les serveurs de messagerie.
-			$this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
+			$this->headers = preg_replace("/([\r\n]+)$/i", "", $this->headers);
 
 			//$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message.= $text_body . $files_encoded;
-			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
+			$this->message .= $text_body.$files_encoded;
+			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
 		}
 		else if ($this->sendmode == 'smtps')
 		{
@@ -304,14 +304,14 @@ 
 			$smtps->setCharSet($conf->file->character_set_client);
 
 			$smtps->setSubject($this->encodetorfc2822($subject));
-			$smtps->setTO($this->getValidAddress($to,0,1));
-			$smtps->setFrom($this->getValidAddress($from,0,1));
+			$smtps->setTO($this->getValidAddress($to, 0, 1));
+			$smtps->setFrom($this->getValidAddress($from, 0, 1));
 			$smtps->setTrackId($trackid);
-			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
+			$smtps->setReplyTo($this->getValidAddress($replyto, 0, 1));
 
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (!empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
@@ -322,14 +322,14 @@ 
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
+			if ($this->msgishtml) $smtps->setBodyContent($msg, 'html');
+			else $smtps->setBodyContent($msg, 'plain');
 
 			if ($this->atleastoneimage)
 			{
 				foreach ($this->images_encoded as $img)
 				{
-					$smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
+					$smtps->setImageInline($img['image_encoded'], $img['name'], $img['content_type'], $img['cid']);
 				}
 			}
 
@@ -337,8 +337,8 @@ 
 			{
 				foreach ($filename_list as $i => $val)
 				{
-					$content=file_get_contents($filename_list[$i]);
-					$smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
+					$content = file_get_contents($filename_list[$i]);
+					$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i]);
 				}
 			}
 
@@ -347,7 +347,7 @@ 
 			$smtps->setErrorsTo($errors_to);
 			$smtps->setDeliveryReceipt($deliveryreceipt);
 
-			$this->smtps=$smtps;
+			$this->smtps = $smtps;
 		}
 		else if ($this->sendmode == 'swiftmailer')
 		{
@@ -383,8 +383,8 @@ 
             //$this->message = new Swift_SignedMessage();
             // Adding a trackid header to a message
 			$headers = $this->message->getHeaders();
-			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
-			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid.'@'.$host);
+			$headerID = time().'.swiftmailer-dolibarr-'.$trackid.'@'.$host;
 			$msgid = $headers->get('Message-ID');
 			$msgid->setId($headerID);
 			$headers->addIdHeader('References', $headerID);
@@ -394,12 +394,12 @@ 
 			try {
 				$result = $this->message->setSubject($subject);
 			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
+				$this->errors[] = $e->getMessage();
 			}
 
 			// Set the From address with an associative array
 			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-			if (! empty($from)) {
+			if (!empty($from)) {
                 try {
                 	$result = $this->message->setFrom($this->getArrayAddress($from));
                 } catch (Exception $e) {
@@ -408,7 +408,7 @@ 
             }
 
 			// Set the To addresses with an associative array
-			if (! empty($to)) {
+			if (!empty($to)) {
                 try {
                 	$result = $this->message->setTo($this->getArrayAddress($to));
                 } catch (Exception $e) {
@@ -416,7 +416,7 @@ 
                 }
             }
 
-			if (! empty($replyto)) {
+			if (!empty($replyto)) {
                 try {
                 	$result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
                 } catch (Exception $e) {
@@ -427,10 +427,10 @@ 
 			try {
 				$result = $this->message->setCharSet($conf->file->character_set_client);
 			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
+				$this->errors[] = $e->getMessage();
 			}
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
@@ -455,11 +455,11 @@ 
 			}
 
 			if ($this->msgishtml) {
-				$this->message->setBody($msg,'text/html');
+				$this->message->setBody($msg, 'text/html');
 				// And optionally an alternative body
 				$this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
 			} else {
-				$this->message->setBody($msg,'text/plain');
+				$this->message->setBody($msg, 'text/plain');
 				// And optionally an alternative body
 				$this->message->addPart($msg, 'text/html');
 			}
@@ -469,13 +469,13 @@ 
 				foreach ($filename_list as $i => $val)
 				{
 					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+					$attachment = Swift_Attachment::fromPath($filename_list[$i], $mimetype_list[$i]);
 					$this->message->attach($attachment);
 				}
 			}
 
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			if (!empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+			if (!empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
 			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
 		}
@@ -495,25 +495,25 @@ 
 	 */
 	function sendfile()
 	{
-		global $conf,$db,$langs;
+		global $conf, $db, $langs;
 
-		$errorlevel=error_reporting();
+		$errorlevel = error_reporting();
 		//error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
 
-		$res=false;
+		$res = false;
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
 		{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 			$hookmanager->initHooks(array('mail'));
 
-			$parameters=array(); $action='';
+			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao sendMail " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+				$this->error = "Error in hook maildao sendMail ".$reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
@@ -523,52 +523,52 @@ 
 			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;
 			$tmparray1 = explode(',', $this->addr_to);
 			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;
 			$tmparray2 = explode(',', $this->addr_cc);
 			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in cc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;
 			$tmparray3 = explode(',', $this->addr_bcc);
 			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;
+			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
 
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
+			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
+			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
+			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
 
 			if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
@@ -591,68 +591,68 @@ 
 				if (isset($_SERVER["WINDIR"]))
 				{
 					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
-					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
+					@ini_set('sendmail_from', $this->getValidAddress($this->addr_from, 2));
 				}
 
 				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				if (!empty($conf->global->$keyforsmtpserver)) ini_set('SMTP', $conf->global->$keyforsmtpserver);
+				if (!empty($conf->global->$keyforsmtpport))   ini_set('smtp_port', $conf->global->$keyforsmtpport);
 
-				$res=true;
-				if ($res && ! $this->subject)
+				$res = true;
+				if ($res && !$this->subject)
 				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
+					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
-				$dest=$this->getValidAddress($this->addr_to,2);
-				if ($res && ! $dest)
+				$dest = $this->getValidAddress($this->addr_to, 2);
+				if ($res && !$dest)
 				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 
 				if ($res)
 				{
-					$additionnalparam = '';	// By default
-					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
+					$additionnalparam = ''; // By default
+					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
 					{
 						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
 						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// Having this variable defined may create problems with some sendmail (option -f refused)
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
-						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
+						$additionnalparam .= ($additionnalparam ? ' ' : '').(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));
 					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 					{
-						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
+						$additionnalparam .= ($additionnalparam ? ' ' : '').'-ba';
 					}
 
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
 
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
-					$this->message=stripslashes($this->message);
+					$this->message = stripslashes($this->message);
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+					if (!empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
 					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
 
-					if (! $res)
+					if (!$res)
 					{
 						$langs->load("errors");
-						$this->error="Failed to send mail with php mail";
-						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-						if (! $linuxlike)
+						$this->error = "Failed to send mail with php mail";
+						$linuxlike = 1;
+						if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+						if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+						if (!$linuxlike)
 						{
-							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
+							$this->error .= " to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'); // This values are value used only for non linuxlike systems
 						}
-						$this->error.=".<br>";
-						$this->error.=$langs->trans("ErrorPhpMailDelivery");
+						$this->error .= ".<br>";
+						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					}
 					else
@@ -667,86 +667,86 @@ 
 				}
 
 				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
+				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
+				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
 			}
 			else if ($this->sendmode == 'smtps')
 			{
-				if (! is_object($this->smtps))
+				if (!is_object($this->smtps))
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					return false;
 				}
 
 				// Use SMTPS library
 				// ------------------------------------------
-				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
+				$this->smtps->setTransportType(0); // Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
 
 				// If we use SSL/TLS
-				$server=$conf->global->$keyforsmtpserver;
-				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-				$server=($secure?$secure.'://':'').$server;
+				$server = $conf->global->$keyforsmtpserver;
+				$secure = '';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
+				$server = ($secure ? $secure.'://' : '').$server;
 
-				$port=$conf->global->$keyforsmtpport;
+				$port = $conf->global->$keyforsmtpport;
 
 				$this->smtps->setHost($server);
 				$this->smtps->setPort($port); // 25, 465...;
 
-				$loginid=''; $loginpass='';
-				if (! empty($conf->global->$keyforsmtpid))
+				$loginid = ''; $loginpass = '';
+				if (!empty($conf->global->$keyforsmtpid))
 				{
 					$loginid = $conf->global->$keyforsmtpid;
 					$this->smtps->setID($loginid);
 				}
-				if (! empty($conf->global->$keyforsmtppw))
+				if (!empty($conf->global->$keyforsmtppw))
 				{
 					$loginpass = $conf->global->$keyforsmtppw;
 					$this->smtps->setPW($loginpass);
 				}
 
-				$res=true;
-				$from=$this->smtps->getFrom('org');
-				if ($res && ! $from)
+				$res = true;
+				$from = $this->smtps->getFrom('org');
+				if ($res && !$from)
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
-				$dest=$this->smtps->getTo();
-				if ($res && ! $dest)
+				$dest = $this->smtps->getTo();
+				if ($res && !$dest)
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 
 				if ($res)
 				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
 
-					$result=$this->smtps->sendMsg();
+					$result = $this->smtps->sendMsg();
 					//print $result;
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-					$result=$this->smtps->getErrors();
+					$result = $this->smtps->getErrors();
 					if (empty($this->error) && empty($result))
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-						$res=true;
+						$res = true;
 					}
 					else
 					{
-						if (empty($this->error)) $this->error=$result;
+						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-						$res=false;
+						$res = false;
 					}
 				}
 			}
@@ -757,19 +757,19 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
+				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Create the Mailer using your created Transport
@@ -784,7 +784,7 @@ 
                     $this->message->attachSigner($signer->ignoreHeader('Return-Path'));
                 }
 
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+                if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
 					// To use the ArrayLogger
 					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
 					// Or to use the Echo Logger
@@ -795,14 +795,14 @@ 
 				try {
 					$result = $this->mailer->send($this->message);
 				} catch (Exception $e) {
-					$this->error =  $e->getMessage();
+					$this->error = $e->getMessage();
 				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
 				$res = true;
-				if (! empty($this->error) || ! $result) {
+				if (!empty($this->error) || !$result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 				else
 				{
@@ -817,23 +817,23 @@ 
 				return 'Bad value for sendmode';
 			}
 
-			$parameters=array(); $action='';
+			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao sendMailAfter " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+				$this->error = "Error in hook maildao sendMailAfter ".$reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
 		}
 		else
 		{
-			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
 
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
+		error_reporting($errorlevel); // Reactive niveau erreur origine
 
 		return $res;
 	}
@@ -860,17 +860,17 @@ 
 	function _encode_file($sourcefile)
 	{
         // phpcs:enable
-		$newsourcefile=dol_osencode($sourcefile);
+		$newsourcefile = dol_osencode($sourcefile);
 
 		if (is_readable($newsourcefile))
 		{
-			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
-			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
+			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
 		}
 		else
 		{
-			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
+			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -888,30 +888,30 @@ 
 	function dump_mail()
 	{
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
+		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
 		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile,"w");
+			$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";
+			$fp = fopen($outputfile, "w");
 
 			if ($this->sendmode == 'mail')
 			{
 				fputs($fp, $this->headers);
-				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
+				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
 			}
 			elseif ($this->sendmode == 'smtps')
 			{
-				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
+				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 			elseif ($this->sendmode == 'swiftmailer')
 			{
-				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
@@ -925,15 +925,15 @@ 
 	 */
 	function checkIfHTML($msg)
 	{
-		if (!preg_match('/^[\s\t]*<html/i',$msg))
+		if (!preg_match('/^[\s\t]*<html/i', $msg))
 		{
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-			$out.= ">";
-			$out.= $msg;
-			$out.= "</body></html>";
+			if (!empty($this->styleCSS)) $out .= $this->styleCSS;
+			$out .= "</head><body";
+			if (!empty($this->bodyCSS)) $out .= $this->bodyCSS;
+			$out .= ">";
+			$out .= $msg;
+			$out .= "</body></html>";
 		}
 		else
 		{
@@ -950,24 +950,24 @@ 
 	 */
 	function buildCSS()
 	{
-		if (! empty($this->css))
+		if (!empty($this->css))
 		{
 			// Style CSS
 			$this->styleCSS = '<style type="text/css">';
-			$this->styleCSS.= 'body {';
+			$this->styleCSS .= 'body {';
 
 			if ($this->css['bgcolor'])
 			{
-				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+				$this->styleCSS .= '  background-color: '.$this->css['bgcolor'].';';
+				$this->bodyCSS .= ' bgcolor="'.$this->css['bgcolor'].'"';
 			}
 			if ($this->css['bgimage'])
 			{
 				// TODO recuperer cid
-				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+				$this->styleCSS .= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
 			}
-			$this->styleCSS.= '}';
-			$this->styleCSS.= '</style>';
+			$this->styleCSS .= '}';
+			$this->styleCSS .= '</style>';
 		}
 	}
 
@@ -988,48 +988,48 @@ 
 
 		// Sender
 		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
-		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
-		if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
+		$out .= "From: ".$this->getValidAddress($this->addr_from, 3, 1).$this->eol2;
+		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
 		{
-			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
+			$out .= "To: ".$this->getValidAddress($this->addr_to, 0, 1).$this->eol2;
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
-		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		$out .= "Return-Path: ".$this->getValidAddress($this->addr_from, 0, 1).$this->eol2;
+		if (isset($this->reply_to) && $this->reply_to)  $out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;
+		if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;
 
 		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc) && $this->addr_cc)   $out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;
+		if (isset($this->addr_bcc) && $this->addr_bcc)  $out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
-		$out.= 'Date: ' . date("r") . $this->eol2;
+		$out .= 'Date: '.date("r").$this->eol2;
 
 		$trackid = $this->trackid;
 		if ($trackid)
 		{
 			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
-			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
-			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
+			$out .= 'Message-ID: <'.time().'.phpmail-dolibarr-'.$trackid.'@'.$host.">".$this->eol2; // Uppercase seems replaced by phpmail
+			$out .= 'References: <'.time().'.phpmail-dolibarr-'.$trackid.'@'.$host.">".$this->eol2;
+			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
 		}
 		else
 		{
-			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
+			$out .= 'Message-ID: <'.time().'.phpmail@'.$host.">".$this->eol2;
 		}
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
-		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
-		$out.= "Mime-Version: 1.0".$this->eol2;
+		if (!empty($_SERVER['REMOTE_ADDR'])) $out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;
+		$out .= "X-Mailer: Dolibarr version ".DOL_VERSION." (using php mail)".$this->eol2;
+		$out .= "Mime-Version: 1.0".$this->eol2;
 
 		//$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
 
-		$out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
-		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
+		$out .= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
+		$out .= "Content-Transfer-Encoding: 8bit".$this->eol2; // TODO Seems to be ignored. Header is 7bit once received.
 
 		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
 		return $out;
@@ -1047,18 +1047,18 @@ 
 	function write_mimeheaders($filename_list, $mimefilename_list)
 	{
         // phpcs:enable
-		$mimedone=0;
+		$mimedone = 0;
 		$out = "";
 
 		if (is_array($filename_list))
 		{
-			$filename_list_size=count($filename_list);
-			for($i=0;$i < $filename_list_size;$i++)
+			$filename_list_size = count($filename_list);
+			for ($i = 0; $i < $filename_list_size; $i++)
 			{
 				if ($filename_list[$i])
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
+					$out .= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
 		}
@@ -1079,31 +1079,31 @@ 
         // phpcs:enable
 		global $conf;
 
-		$out='';
+		$out = '';
 
-		$out.= "--" . $this->mixed_boundary . $this->eol;
+		$out .= "--".$this->mixed_boundary.$this->eol;
 
 		if ($this->atleastoneimage)
 		{
-			$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-			$out.= $this->eol;
-			$out.= "--" . $this->alternative_boundary . $this->eol;
+			$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+			$out .= $this->eol;
+			$out .= "--".$this->alternative_boundary.$this->eol;
 		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext); // PCRE modifier /s means new lines are common chars
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
 		{
-			$strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
+			$strContent = preg_replace("/\r\n/si", "\n", $strContent); // PCRE modifier /s means new lines are common chars
 		}
 
 		$strContentAltText = '';
 		if ($this->msgishtml)
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
+			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n"));
 
 			// Check if html header already in message, if not complete the message
 			$strContent = $this->checkIfHTML($strContent);
@@ -1112,57 +1112,57 @@ 
 		// Make RFC2045 Compliant, split lines
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
 		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
-		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		if ($this->msgishtml)
 		{
 			if ($this->atleastoneimage)
 			{
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->related_boundary . $this->eol;
+				$out .= $this->eol.($strContentAltText ? $strContentAltText : strip_tags($strContent)).$this->eol; // Add plain text message
+				$out .= "--".$this->alternative_boundary.$this->eol;
+				$out .= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
+				$out .= $this->eol;
+				$out .= "--".$this->related_boundary.$this->eol;
 			}
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
 			{
-				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+				$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+				$out .= $this->eol;
+				$out .= "--".$this->alternative_boundary.$this->eol;
+				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.$strContentAltText.$this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
+				$out .= $this->eol.$strContentAltText.$this->eol;
+				$out .= "--".$this->alternative_boundary.$this->eol;
 			}
 
-			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
+			$out .= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
-			$out.= $this->eol.$strContent.$this->eol;
+			$out .= $this->eol.$strContent.$this->eol;
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
 			{
-				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
+				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
 		}
 		else
 		{
-			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-			$out.= $this->eol.$strContent.$this->eol;
+			$out .= $this->eol.$strContent.$this->eol;
 		}
 
-		$out.= $this->eol;
+		$out .= $this->eol;
 
 		// Encode images
 		if ($this->atleastoneimage)
 		{
 			$out .= $this->write_images($this->images_encoded);
 			// always end related and end alternative after inline images
-			$out .= "--" . $this->related_boundary . "--" . $this->eol;
-			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+			$out .= "--".$this->related_boundary."--".$this->eol;
+			$out .= $this->eol."--".$this->alternative_boundary."--".$this->eol;
 			$out .= $this->eol;
 		}
 
@@ -1178,13 +1178,13 @@ 
 	 * @param 	array	$mimefilename_list	Tableau
 	 * @return	string						Chaine fichiers encodes
 	 */
-	function write_files($filename_list,$mimetype_list,$mimefilename_list)
+	function write_files($filename_list, $mimetype_list, $mimefilename_list)
 	{
         // phpcs:enable
 		$out = '';
 
-		$filename_list_size=count($filename_list);
-		for($i=0;$i < $filename_list_size;$i++)
+		$filename_list_size = count($filename_list);
+		for ($i = 0; $i < $filename_list_size; $i++)
 		{
 			if ($filename_list[$i])
 			{
@@ -1193,18 +1193,18 @@ 
 				if ($encoded >= 0)
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) {
+					if (!$mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
 
-					$out.= "--" . $this->mixed_boundary . $this->eol;
-					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Transfer-Encoding: base64".$this->eol;
-					$out.= "Content-Description: ".$filename_list[$i].$this->eol;
-					$out.= $this->eol;
-					$out.= $encoded;
-					$out.= $this->eol;
+					$out .= "--".$this->mixed_boundary.$this->eol;
+					$out .= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+					$out .= "Content-Type: ".$mimetype_list[$i]."; name=\"".$filename_list[$i]."\"".$this->eol;
+					$out .= "Content-Transfer-Encoding: base64".$this->eol;
+					$out .= "Content-Description: ".$filename_list[$i].$this->eol;
+					$out .= $this->eol;
+					$out .= $encoded;
+					$out .= $this->eol;
 					//$out.= $this->eol;
 				}
 				else
@@ -1236,14 +1236,14 @@ 
 			{
 				dol_syslog("CMailFile::write_images: ".$img["name"]);
 
-				$out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
-				$out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-Transfer-Encoding: base64".$this->eol;
-				$out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-ID: <".$img["cid"].">".$this->eol;
-				$out.= $this->eol;
-				$out.= $img["image_encoded"];
-				$out.= $this->eol;
+				$out .= "--".$this->related_boundary.$this->eol; // always related for an inline image
+				$out .= "Content-Type: ".$img["content_type"]."; name=\"".$img["name"]."\"".$this->eol;
+				$out .= "Content-Transfer-Encoding: base64".$this->eol;
+				$out .= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
+				$out .= "Content-ID: <".$img["cid"].">".$this->eol;
+				$out .= $this->eol;
+				$out .= $img["image_encoded"];
+				$out .= $this->eol;
 			}
 		}
 
@@ -1259,44 +1259,44 @@ 
 	 * @param 	int			$port		Example: 25, 465
 	 * @return	int						Socket id if ok, 0 if KO
 	 */
-	function check_server_port($host,$port)
+	function check_server_port($host, $port)
 	{
         // phpcs:enable
 		global $conf;
 
-		$_retVal=0;
-		$timeout=5;	// Timeout in seconds
+		$_retVal = 0;
+		$timeout = 5; // Timeout in seconds
 
 		if (function_exists('fsockopen'))
 		{
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
+			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
+			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
+			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
 
 			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host = 'ssl://'.$host;
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ($socket = @fsockopen(
-					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-					$port,       // which Port number to use
-					$errno,      // actual system level error
-					$errstr,     // and any text that goes with the error
+					$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+					$port, // which Port number to use
+					$errno, // actual system level error
+					$errstr, // and any text that goes with the error
 					$timeout
 			))  // timeout for reading/writing data over the socket
 			{
@@ -1306,11 +1306,11 @@ 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
+				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
 			}
 			else
 			{
-				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
+				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
 		return $_retVal;
@@ -1328,21 +1328,21 @@ 
 	function server_parse($socket, $response)
 	{
         // phpcs:enable
-		$_retVal = true;	// Indicates if Object was created or not
+		$_retVal = true; // Indicates if Object was created or not
 		$server_response = '';
 
-		while (substr($server_response,3,1) != ' ')
+		while (substr($server_response, 3, 1) != ' ')
 		{
-			if (! ($server_response = fgets($socket, 256)) )
+			if (!($server_response = fgets($socket, 256)))
 			{
-				$this->error="Couldn't get mail server response codes";
+				$this->error = "Couldn't get mail server response codes";
 				return false;
 			}
 		}
 
-		if( !( substr($server_response, 0, 3) == $response ) )
+		if (!(substr($server_response, 0, 3) == $response))
 		{
-			$this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
+			$this->error = "Ran into problems sending Mail.\r\nResponse: $server_response";
 			$_retVal = false;
 		}
 
@@ -1361,22 +1361,22 @@ 
 		$extensions = array_keys($this->image_types);
 
 		$matches = array();
-		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
+		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found
 
-		if (! empty($matches))
+		if (!empty($matches))
 		{
-			$i=0;
+			$i = 0;
 			foreach ($matches[1] as $full)
 			{
 
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs))   // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
 
 					if (file_exists($images_dir.'/'.$img))
 					{
 						// Image path in src
-						$src = preg_quote($full,'/');
+						$src = preg_quote($full, '/');
 
 						// Image full path
 						$this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
@@ -1387,12 +1387,12 @@ 
 						// Content type
 						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
 						{
-							$ext=strtolower($reg[1]);
+							$ext = strtolower($reg[1]);
 							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
 						}
 
 						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
+						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3); // Force md5 hash (does not contains special chars)
 						$this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
 					}
 					$i++;
@@ -1403,20 +1403,20 @@ 
 			{
 				$inline = array();
 
-				$i=0;
+				$i = 0;
 
 				foreach ($this->html_images as $img)
 				{
 					$fullpath = $images_dir.'/'.$img["name"];
 
 					// If duplicate images are embedded, they may show up as attachments, so remove them.
-					if (!in_array($fullpath,$inline))
+					if (!in_array($fullpath, $inline))
 					{
 						// Read image file
 						if ($image = file_get_contents($fullpath))
 						{
 							// On garde que le nom de l'image
-							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
+							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i', $img["name"], $regs);
 							$imgName = $regs[1];
 
 							$this->images_encoded[$i]['name'] = $imgName;
@@ -1457,19 +1457,19 @@ 
 	 *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
 	 *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
 	 */
-	static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
+	static function getValidAddress($address, $format, $encode = 0, $maxnumberofemail = 0)
 	{
 		global $conf;
 
-		$ret='';
+		$ret = '';
 
-		$arrayaddress=explode(',',$address);
+		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		$i=0;
-		foreach($arrayaddress as $val)
+		$i = 0;
+		foreach ($arrayaddress as $val)
 		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
@@ -1484,32 +1484,32 @@ 
 			{
 				$i++;
 
-				$newemail='';
+				$newemail = '';
 				if ($format == 4)
 				{
-					$newemail = $name?$name:$email;
+					$newemail = $name ? $name : $email;
 				}
 				if ($format == 2)
 				{
-					$newemail=$email;
+					$newemail = $email;
 				}
 				if ($format == 1 || $format == 3)
 				{
-					$newemail='<'.$email.'>';
+					$newemail = '<'.$email.'>';
 				}
 				if ($format == 0 || $format == 3)
 				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail = '<'.$email.'>';
+					elseif (!$name) $newemail = '<'.$email.'>';
+					else $newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
 				}
 
-				$ret=($ret ? $ret.',' : '').$newemail;
+				$ret = ($ret ? $ret.',' : '').$newemail;
 
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					if (count($arrayaddress) > $maxnumberofemail) $ret .= '...';
 					break;
 				}
 			}
@@ -1528,14 +1528,14 @@ 
 	{
 		global $conf;
 
-		$ret=array();
+		$ret = array();
 
-		$arrayaddress=explode(',',$address);
+		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		foreach($arrayaddress as $val)
+		foreach ($arrayaddress as $val)
 		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
@@ -1546,7 +1546,7 @@ 
 				$email = trim($val);
 			}
 
-			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+			$ret[$email] = empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL) ? $name : null;
 		}
 
 		return $ret;

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

Spacing +31 added lines, -31 removed lines

@@ -37,7 +37,7 @@ 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
 
     /**
@@ -60,7 +60,7 @@ 
      *  @param  int		$idForm			Id du formulaire
      * 	@return	string					HTML select string
      */
-    function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode')
+    function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
     {
         global $conf, $langs;
 
@@ -81,8 +81,8 @@ 
         }
 
         // We check if barcode is already selected by default
-        if (((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-        (! empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+        if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+        (!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
         {
             $disable = 'disabled';
         }
@@ -90,24 +90,24 @@ 
         if (!empty($conf->use_javascript_ajax))
         {
             $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
-            $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            $select_encoder.= '<input type="hidden" name="action" value="update">';
-            $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+            $select_encoder .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $select_encoder .= '<input type="hidden" name="action" value="update">';
+            $select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
         }
         
-        $selectname=(!empty($conf->use_javascript_ajax)?'coder':'coder'.$code_id);
-        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
-        $select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-        $select_encoder.= '<option value="-1" disabled>--------------------</option>';
-        foreach($barcodelist as $key => $value)
+        $selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);
+        $select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
+        $select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+        $select_encoder .= '<option value="-1" disabled>--------------------</option>';
+        foreach ($barcodelist as $key => $value)
         {
-            $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
+            $select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
         }
-        $select_encoder.= '</select>';
+        $select_encoder .= '</select>';
         
         if (!empty($conf->use_javascript_ajax))
         {
-            $select_encoder.= '</form>';
+            $select_encoder .= '</form>';
         }
 
         return $select_encoder;
@@ -123,7 +123,7 @@ 
      *  @return void
      *  @deprecated
      */
-    function select_barcode_type($selected='', $htmlname='barcodetype_id', $useempty=0)
+    function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
     {
         // phpcs:enable
         print $this->selectBarcodeType($selected, $htmlname, $useempty);
@@ -137,17 +137,17 @@ 
      *  @param  int     $useempty          Display empty value in select
      *  @return string
      */
-    function selectBarcodeType($selected='', $htmlname='barcodetype_id', $useempty=0)
+    function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
     {
         global $langs, $conf;
 
         $out = '';
 
         $sql = "SELECT rowid, code, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql.= " WHERE coder <> '0'";
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY code";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+        $sql .= " WHERE coder <> '0'";
+        $sql .= " AND entity = ".$conf->entity;
+        $sql .= " ORDER BY code";
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -155,20 +155,20 @@ 
             $i = 0;
 
             if ($useempty && $num > 0) {
-                $out .= '<select class="flat minwidth75imp" name="' . $htmlname . '" id="select_' . $htmlname . '">';
+                $out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
                 $out .= '<option value="0">&nbsp;</option>';
             } else {
                 $langs->load("errors");
-                $out .= '<select disabled class="flat minwidth75imp" name="' . $htmlname . '" id="select_' . $htmlname . '">';
-                $out .= '<option value="0" selected>' . $langs->trans('ErrorNoActivatedBarcode') . '</option>';
+                $out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+                $out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
             }
 
             while ($i < $num) {
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid) {
-                    $out .= '<option value="' . $obj->rowid . '" selected>';
+                    $out .= '<option value="'.$obj->rowid.'" selected>';
                 } else {
-                    $out .= '<option value="' . $obj->rowid . '">';
+                    $out .= '<option value="'.$obj->rowid.'">';
                 }
                 $out .= $obj->libelle;
                 $out .= '</option>';
@@ -193,7 +193,7 @@ 
      *  @return	void
      *  @deprecated
      */
-    function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
+    function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
     {
         // phpcs:enable
         print $this->formBarcodeType($page, $selected, $htmlname);
@@ -207,19 +207,19 @@ 
      *  @param  string      $htmlname       Nom du formulaire select
      *  @return string
      */
-    function formBarcodeType($page, $selected='', $htmlname='barcodetype_id')
+    function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
     {
         global $langs, $conf;
         $out = '';
         if ($htmlname != "none") {
-            $out .= '<form method="post" action="' . $page . '">';
-            $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+            $out .= '<form method="post" action="'.$page.'">';
+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             $out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
             $out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
             $out .= '<tr><td>';
             $out .= $this->selectBarcodeType($selected, $htmlname, 1);
             $out .= '</td>';
-            $out .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+            $out .= '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
             $out .= '</td></tr></table></form>';
         }
         return $out;