alxarafe / alixar

Base/AlExtraFields.php

Braces +176 added lines, -126 removed lines

@@ -172,15 +172,19 @@ 
      */

     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 (empty($attrname)) {
+                    return -1;
+        }
+        if (empty($label)) {
+                    return -1;
+        }
+

+        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') {

@@ -195,10 +199,10 @@ 
                 $this->error = '';

                 $this->errno = 0;

                 return 1;

-            } else

-                return -2;

-        }

-        else {

+            } else {
+                            return -2;
+            }
+        } else {

             return -1;

         }

     }

@@ -222,14 +226,17 @@ 
      */

     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';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         $table = $elementtype . '_extrafields';

-        if ($elementtype == 'categorie')

-            $table = 'categories_extrafields';

+        if ($elementtype == 'categorie') {
+                    $table = 'categories_extrafields';
+        }
 

         if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname)) {

             if ($type == 'boolean') {

@@ -262,8 +269,9 @@ 
             } else {

                 $typedb = $type;

                 $lengthdb = $length;

-                if ($type == 'varchar' && empty($lengthdb))

-                    $lengthdb = '255';

+                if ($type == 'varchar' && empty($lengthdb)) {
+                                    $lengthdb = '255';
+                }
             }

             $field_desc = array(

                 'type' => $typedb,

@@ -318,22 +326,29 @@ 
         // phpcs:enable

         // 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 (is_array($param) && count($param) > 0) {

@@ -410,14 +425,17 @@ 
      */

     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';

+        if ($elementtype == 'categorie') {
+                    $table = 'categories_extrafields';
+        }
 

         $error = 0;

 

@@ -466,10 +484,12 @@ 
         // 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)) {

             $sql = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";

@@ -516,14 +536,17 @@ 
      */

     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';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
 

         $table = $elementtype . '_extrafields';

-        if ($elementtype == 'categorie')

-            $table = 'categories_extrafields';

+        if ($elementtype == 'categorie') {
+                    $table = 'categories_extrafields';
+        }
 

         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

             if ($type == 'boolean') {

@@ -620,24 +643,31 @@ 
         AlDolUtils::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 (empty($pos))

-            $pos = 0;

-        if (empty($list))

-            $list = '0';

+        if ($elementtype == 'thirdparty') {
+                    $elementtype = 'societe';
+        }
+        if ($elementtype == 'contact') {
+                    $elementtype = 'socpeople';
+        }
+

+        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)) {

             Config::$dbEngine->begin();

@@ -741,21 +771,26 @@ 
         // phpcs:enable

         // global $conf;

 

-        if (empty($elementtype))

-            return array();

+        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();

 

         // To avoid conflicts with external modules. TODO Remove this.

-        if (!$forceload &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-        return $array_name_label;

+        if (!$forceload &&!empty(Globals::$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.

@@ -776,8 +811,10 @@ 
         $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," . Globals::$conf->entity . ")";

-        if ($elementtype)

-            $sql .= " AND elementtype = '" . $elementtype . "'"; // Filed with object->table_element

+        if ($elementtype) {
+                    $sql .= " AND elementtype = '" . $elementtype . "'";
+        }
+        // Filed with object->table_element

         $sql .= " ORDER BY pos";

 

         $resql = Config::$dbEngine->select($sql);

@@ -901,10 +938,11 @@ 
         }

 

         if ($computed) {

-            if (!preg_match('/^search_/', $keyprefix))

-                return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';

-            else

-                return '';

+            if (!preg_match('/^search_/', $keyprefix)) {
+                            return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';
+            } else {
+                            return '';
+            }
         }

 

         if (empty($morecss)) {

@@ -938,13 +976,13 @@ 
             $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';

+            if (!$required && $value == '') {
+                            $value = '-1';
+            }
 

             // 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 : '') . '>';

@@ -996,22 +1034,23 @@ 
             $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;

+                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 .= Globals::$langs->trans($val);

-                else

-                    $out .= $val;

+                if ($langfile && $val) {
+                                    $out .= Globals::$langs->trans($val);
+                } else {
+                                    $out .= $val;
+                }
                 $out .= '</option>';

             }

             $out .= '</select>';

-        }

-        elseif ($type == 'sellist') {

+        } elseif ($type == 'sellist') {

             $out = '';

             if (!empty(Globals::$conf->use_javascript_ajax) &&!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

                 include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

@@ -1130,8 +1169,9 @@ 
                                     $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

                                 }

                             }

-                            if (empty($labeltoshow))

-                                $labeltoshow = '(not defined)';

+                            if (empty($labeltoshow)) {
+                                                            $labeltoshow = '(not defined)';
+                            }
                             if ($value == $obj->rowid) {

                                 $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

                             }

@@ -1330,8 +1370,9 @@ 
                                     $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

                                 }

                             }

-                            if (empty($labeltoshow))

-                                $labeltoshow = '(not defined)';

+                            if (empty($labeltoshow)) {
+                                                            $labeltoshow = '(not defined)';
+                            }
 

                             if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

                                 $data[$obj->rowid] = $labeltoshow;

@@ -1415,8 +1456,10 @@ 
             $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.

 

 

 

@@ -1457,12 +1500,12 @@ 
         } elseif ($type == 'price') {

             $value = price($value, 0, Globals::$langs, 0, 0, -1, Globals::$conf->currency);

         } elseif ($type == 'select') {

-            if ($langfile && $param['options'][$value])

-                $value = Globals::$langs->trans($param['options'][$value]);

-            else

-                $value = $param['options'][$value];

-        }

-        elseif ($type == 'sellist') {

+            if ($langfile && $param['options'][$value]) {
+                            $value = Globals::$langs->trans($param['options'][$value]);
+            } else {
+                            $value = $param['options'][$value];
+            }
+        } elseif ($type == 'sellist') {

             $param_list = array_keys($param['options']);

             $InfoFieldList = explode(":", $param_list[0]);

 

@@ -1528,10 +1571,10 @@ 
                         $value = $obj->{$InfoFieldList[1]};

                     }

                 }

-            } else

-                AlDolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);

-        }

-        elseif ($type == 'radio') {

+            } else {
+                            AlDolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);
+            }
+        } elseif ($type == 'radio') {

             $value = $param['options'][$value];

         } elseif ($type == 'checkbox') {

             $value_arr = explode(',', $value);

@@ -1640,8 +1683,9 @@ 
             $value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);

         } else {

             $showsize = round($size);

-            if ($showsize > 48)

-                $showsize = 48;

+            if ($showsize > 48) {
+                            $showsize = 48;
+            }
         }

 

         //print $type.'-'.$size;

@@ -1661,10 +1705,11 @@ 
     {

         // 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 = '';

 

@@ -1720,18 +1765,21 @@ 
         $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;

+                if ($key_type == 'separate') {
+                                    continue;
+                }
 

                 $enabled = 1;

                 if (isset($this->attributes[$object->table_element]['list'][$key])) {

@@ -1741,10 +1789,12 @@ 
                 if (isset($this->attributes[$object->table_element]['perms'][$key])) {

                     $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);

                 }

-                if (empty($enabled))

-                    continue;

-                if (empty($perms))

-                    continue;

+                if (empty($enabled)) {
+                                    continue;
+                }
+                if (empty($perms)) {
+                                    continue;
+                }
 

                 if ($this->attributes[$object->table_element]['required'][$key]) { // Value is required

                     // Check if empty without using GETPOST, value can be alpha, int, array, etc...

Base/AlCommonObject.php

Braces +1373 added lines, -865 removed lines

@@ -401,24 +401,31 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;

 		$sql.= " WHERE entity IN (".getEntity($element).")" ;

 

-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);

-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";

-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";

-		else {

+		if ($id > 0) {
+		    $sql.= " AND rowid = ".$db->escape($id);
+		} else if ($ref) {
+		    $sql.= " AND ref = '".$db->escape($ref)."'";
+		} else if ($ref_ext) {
+		    $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {

 			$error='ErrorWrongParameters';

 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);

 			return -1;

 		}

-		if ($ref || $ref_ext)

-            $sql .= " AND entity = " . Globals::$conf->entity;

+		if ($ref || $ref_ext) {
+		            $sql .= " AND entity = " . Globals::$conf->entity;
+		}
 

         dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);

 		$resql = $db->query($sql);

 		if ($resql)

 		{

 			$num=$db->num_rows($resql);

-			if ($num > 0) return 1;

-			else return 0;

+			if ($num > 0) {
+			    return 1;
+			} else {
+			    return 0;
+			}
 		}

 		return -1;

 	}

@@ -447,13 +454,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

 		$lastname=$this->lastname;

 		$firstname=$this->firstname;

-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));

+		if (empty($lastname)) {
+		    $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		}
 

 		$ret='';

 		if ($option && $this->civility_id)

 		{

-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';

-			else $ret.=$this->civility_id.' ';

+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) {
+			    $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			} else {
+			    $ret.=$this->civility_id.' ';
+			}
 		}

 

 		$ret .= AlDolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

@@ -544,14 +556,15 @@ 
             && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) {

             if (!empty(Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

                 $out.=($outdone?' - ':'').$this->region.' - '.$this->state;

-            }

-            else {

+            } else {

                 $out.=($outdone?' - ':'').$this->state;

             }

 			$outdone++;

 		}

 

-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');

+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) {
+		    $out.=($outdone?'<br>':'');
+		}
 		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

 			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;

 		}

@@ -591,13 +604,21 @@ 
 		}

 		$out.='<div style="clear: both;">';

 		if (!empty(Globals::$conf->socialnetworks->enabled)) {

-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');

+			if ($this->skype) {
+			    $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			}
 			$outdone++;

-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');

+			if ($this->jabberid) {
+			    $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			}
 			$outdone++;

-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');

+			if ($this->twitter) {
+			    $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			}
 			$outdone++;

-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');

+			if ($this->facebook) {
+			    $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			}
 			$outdone++;

 		}

 		$out.='</div>';

@@ -657,10 +678,10 @@ 
 					$this->errors = $ecmfile->errors;

 				}

 				*/

-			}

-			else return '';

-		}

-		elseif (empty($ecmfile->share))

+			} else {
+			    return '';
+			}
+		} elseif (empty($ecmfile->share))

 		{

 			// Add entry into index

 			if ($initsharekey)

@@ -668,8 +689,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

 				$ecmfile->share = getRandomPassword(true);

 				$ecmfile->update($user);

-			}

-			else return '';

+			} else {
+			    return '';
+			}
 		}

 

 		// Define $urlwithroot

@@ -683,14 +705,18 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash

-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share

-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';

+		if (! empty($ecmfile->share)) {
+		    $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share

+		if ($forcedownload) {
+		    $paramlink.=($paramlink?'&':'').'attachment=1';
+		}
 

 		if ($relativelink)

 		{

 			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');

-		}

-		else

+		} else

 		{

 			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');

 		}

@@ -738,8 +764,7 @@ 
 		if (is_numeric($type_contact))

 		{

 			$id_type_contact=$type_contact;

-		}

-		else

+		} else

 		{

 			// We look for id type_contact

 			$sql = "SELECT tc.rowid";

@@ -752,7 +777,9 @@ 
 			if ($resql)

 			{

 				$obj = $this->db->fetch_object($resql);

-				if ($obj) $id_type_contact=$obj->rowid;

+				if ($obj) {
+				    $id_type_contact=$obj->rowid;
+				}
 			}

 		}

 

@@ -804,8 +831,7 @@ 
 

 				$this->db->commit();

 				return 1;

-			}

-			else

+			} else

 			{

 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 				{

@@ -813,15 +839,16 @@ 
 					$this->db->rollback();

 					echo 'err rollback';

 					return -2;

-				}

-				else

+				} else

 				{

 					$this->error=$this->db->error();

 					$this->db->rollback();

 					return -1;

 				}

 			}

-		} else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -863,15 +890,18 @@ 
 		// Insert into database

 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";

 		$sql.= " statut = ".$statut;

-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";

-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";

+		if ($type_contact_id) {
+		    $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+		}
+		if ($fk_socpeople) {
+		    $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		}
 		$sql.= " where rowid = ".$rowid;

 		$resql=$this->db->query($sql);

 		if ($resql)

 		{

 			return 0;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -908,8 +938,7 @@ 
 

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -939,15 +968,15 @@ 
 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";

 		$sql.= " WHERE element_id = ".$this->id;

-		if ($listId)

-			$sql.= " AND fk_c_type_contact IN (".$listId.")";

+		if ($listId) {
+					$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		}
 

 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -972,22 +1001,38 @@ 
 		$tab=array();

 

 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user

-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";

+		if ($source == 'internal') {
+		    $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

 		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";

 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

 		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";

-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

+		if ($source == 'internal') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external'|| $source == 'thirdparty') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql.= " WHERE ec.element_id =".$this->id;

 		$sql.= " AND ec.fk_c_type_contact=tc.rowid";

 		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";

-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";

-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";

-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";

+		if ($code) {
+		    $sql.= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+		    $sql.= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.= " AND tc.source = 'external'";
+		}
 		$sql.= " AND tc.active=1";

-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";

+		if ($statut >= 0) {
+		    $sql.= " AND ec.statut = '".$statut."'";
+		}
 		$sql.=" ORDER BY t.lastname ASC";

 

 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);

@@ -1008,8 +1053,7 @@ 
 								   'nom'=>$obj->lastname,      // For backward compatibility

 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,

 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);

-				}

-				else

+				} else

 				{

 					$tab[$i]=$obj->id;

 				}

@@ -1018,8 +1062,7 @@ 
 			}

 

 			return $tab;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			dol_print_error($this->db);

@@ -1054,8 +1097,7 @@ 
 			$result = $this->update_contact($rowid, $newstatut);

 			$this->db->free($resql);

 			return $result;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			dol_print_error($this->db);

@@ -1079,16 +1121,27 @@ 
         // phpcs:enable

 		global $langs;

 

-		if (empty($order)) $order='position';

-		if ($order == 'position') $order.=',code';

+		if (empty($order)) {
+		    $order='position';
+		}
+		if ($order == 'position') {
+		    $order.=',code';
+		}
 

 		$tab = array();

 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";

 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

 		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";

-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types

-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";

-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";

+		if ($activeonly == 1) {
+		    $sql.= " AND tc.active=1";
+		}
+		// only the active types

+		if (! empty($source) && $source != 'all') {
+		    $sql.= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (! empty($code)) {
+		    $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql.= $this->db->order($order,'ASC');

 

 		//print "sql=".$sql;

@@ -1103,13 +1156,15 @@ 
 

 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;

 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);

-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;

-				else $tab[$obj->code]=$libelle_type;

+				if (empty($option)) {
+				    $tab[$obj->rowid]=$libelle_type;
+				} else {
+				    $tab[$obj->code]=$libelle_type;
+				}
 				$i++;

 			}

 			return $tab;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			//dol_print_error($this->db);

@@ -1148,19 +1203,29 @@ 
 

 		$sql = "SELECT ec.fk_socpeople";

 		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";

-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";

+		if ($source == 'internal') {
+		    $sql.= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+		    $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";

 		$sql.= " WHERE ec.element_id = ".$id;

 		$sql.= " AND ec.fk_socpeople = c.rowid";

-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";

-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";

+		if ($source == 'internal') {
+		    $sql.= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+		    $sql.= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";

 		$sql.= " AND tc.element = '".$element."'";

 		$sql.= " AND tc.source = '".$source."'";

 		$sql.= " AND tc.code = '".$code."'";

 		$sql.= " AND tc.active = 1";

-		if ($status) $sql.= " AND ec.statut = ".$status;

+		if ($status) {
+		    $sql.= " AND ec.statut = ".$status;
+		}
 

 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);

 		$resql=$this->db->query($sql);

@@ -1171,8 +1236,7 @@ 
 				$result[$i]=$obj->fk_socpeople;

 				$i++;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			return null;

@@ -1191,9 +1255,13 @@ 
 	function fetch_contact($contactid=null)

 	{

         // phpcs:enable

-		if (empty($contactid)) $contactid=$this->contactid;

+		if (empty($contactid)) {
+		    $contactid=$this->contactid;
+		}
 

-		if (empty($contactid)) return 0;

+		if (empty($contactid)) {
+		    return 0;
+		}
 

 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

 		$contact = new Contact($this->db);

@@ -1214,14 +1282,16 @@ 
         // phpcs:enable

 		global $conf;

 

-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

-			return 0;

+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 

 		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

 

 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);

-		if ($force_thirdparty_id)

-			$idtofetch = $force_thirdparty_id;

+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 

 		if ($idtofetch) {

 			$thirdparty = new Societe($this->db);

@@ -1234,8 +1304,9 @@ 
 			}

 

 			return $result;

-		} else

-			return -1;

+		} else {
+					return -1;
+		}
 	}

 

 

@@ -1281,20 +1352,25 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

 

 		$idtype=$this->barcode_type;

-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

+		if (empty($idtype) && $idtype != '0') {
+		    // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

 		{

 			if ($this->element == 'product')

-                $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-            else if ($this->element == 'societe')

-                $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

-            else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

+                $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		} else if ($this->element == 'societe') {
+                            $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+            } else {
+                dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+            }
 		}

 

 		if ($idtype > 0)

 		{

-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded

+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+			    // If data not already loaded

 			{

-				$sql = "SELECT rowid, code, libelle as label, coder";

+				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

 				$sql.= " WHERE rowid = ".$idtype;

 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);

@@ -1307,8 +1383,7 @@ 
 					$this->barcode_type_label = $obj->label;

 					$this->barcode_type_coder = $obj->coder;

 					return 1;

-				}

-				else

+				} else

 				{

 					dol_print_error($this->db);

 					return -1;

@@ -1329,8 +1404,13 @@ 
         // phpcs:enable

 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

 

-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility

-		if (empty($this->fk_project)) return 0;

+		if (empty($this->fk_project) && ! empty($this->fk_projet)) {
+		    $this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility

+		if (empty($this->fk_project)) {
+		    return 0;
+		}
 

 		$project = new Project($this->db);

 		$result = $project->fetch($this->fk_project);

@@ -1351,7 +1431,9 @@ 
         // phpcs:enable

 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

 

-		if (empty($this->fk_product)) return 0;

+		if (empty($this->fk_product)) {
+		    return 0;
+		}
 

 		$product = new Product($this->db);

 		$result = $product->fetch($this->fk_product);

@@ -1385,9 +1467,15 @@ 
 	function fetch_origin()

 	{

         // phpcs:enable

-		if ($this->origin == 'shipping') $this->origin = 'expedition';

-		if ($this->origin == 'delivery') $this->origin = 'livraison';

-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';

+		if ($this->origin == 'shipping') {
+		    $this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+		    $this->origin = 'livraison';
+		}
+        if ($this->origin == 'order_supplier') {
+            $this->origin = 'commandeFournisseur';
+        }
 

 		$origin = $this->origin;

 

@@ -1479,29 +1567,48 @@ 
 	{

 		global $user,$langs,$conf;

 

-		if (empty($table)) 	  $table=$this->table_element;

-		if (empty($id))    	  $id=$this->id;

-		if (empty($format))   $format='text';

-		if (empty($id_field)) $id_field='rowid';

+		if (empty($table)) {
+		    $table=$this->table_element;
+		}
+		if (empty($id)) {
+		    $id=$this->id;
+		}
+		if (empty($format)) {
+		    $format='text';
+		}
+		if (empty($id_field)) {
+		    $id_field='rowid';
+		}
 

 		$error=0;

 

 		$this->db->begin();

 

 		// Special case

-		if ($table == 'product' && $field == 'note_private') $field='note';

-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';

+		if ($table == 'product' && $field == 'note_private') {
+		    $field='note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+		    $fk_user_field = 'fk_user_mod';
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

 

-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";

-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);

-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

+		if ($format == 'text') {
+		    $sql.= $field." = '".$this->db->escape($value)."'";
+		} else if ($format == 'int') {
+		    $sql.= $field." = ".$this->db->escape($value);
+		} else if ($format == 'date') {
+		    $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 

 		if ($fk_user_field)

 		{

-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;

-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;

+			if (! empty($fuser) && is_object($fuser)) {
+			    $sql.=", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+			    $sql.=", ".$fk_user_field." = ".$user->id;
+			}
 		}

 

 		$sql.= " WHERE ".$id_field." = ".$id;

@@ -1516,28 +1623,32 @@ 
 				if (empty($this->fields) && method_exists($this, 'fetch'))

 				{

 					$result = $this->fetch($id);

-				}

-				else

+				} else

 				{

 					$result = $this->fetchCommon($id);

 				}

-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors

-				if ($result < 0) $error++;

+				if ($result >= 0) {
+				    $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors

+				if ($result < 0) {
+				    $error++;
+				}
 			}

 

 			if (! $error)

 			{

-				if (property_exists($this, $field)) $this->$field = $value;

+				if (property_exists($this, $field)) {
+				    $this->$field = $value;
+				}
 				$this->db->commit();

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->db->rollback();

 				return -2;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -1564,36 +1675,66 @@ 
 			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

 			return -1;

 		}

-		if ($fieldid == 'none') return 1;

+		if ($fieldid == 'none') {
+		    return 1;
+		}
 

 		// Security on socid

 		$socid = 0;

-		if ($user->societe_id > 0) $socid = $user->societe_id;

+		if ($user->societe_id > 0) {
+		    $socid = $user->societe_id;
+		}
 

 		// this->ismultientitymanaged contains

 		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

 		$alias = 's';

-		if ($this->element == 'societe') $alias = 'te';

+		if ($this->element == 'societe') {
+		    $alias = 'te';
+		}
 

 		$sql = "SELECT MAX(te.".$fieldid.")";

 		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";

 		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

             $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid

+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))

 		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility

 			$sql.=$filter;

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid

 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

 			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

@@ -1606,9 +1747,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 

 		$result = $this->db->query($sql);

@@ -1626,20 +1773,44 @@ 
 		if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

             $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid

-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid

-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid

+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;

-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))

 		{

-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility

+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility

 			$sql.=$filter;

 		}

-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity

-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity

+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid

 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

 			if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) {

@@ -1652,9 +1823,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;

-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';

-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null

 

@@ -1686,8 +1863,11 @@ 
 		$i = 0;

 		while ($i < $num)

 		{

-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];

-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];

+			if ($source == 'thirdparty') {
+			    $contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+			    $contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;

 		}

 		return $contactAlreadySelected;

@@ -1711,14 +1891,19 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 		if ($this->table_element == 'actioncomm')

 		{

-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;

-			else $sql.= ' SET fk_project = NULL';

+			if ($projectid) {
+			    $sql.= ' SET fk_project = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_project = NULL';
+			}
 			$sql.= ' WHERE id = '.$this->id;

-		}

-		else

+		} else

 		{

-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;

-			else $sql.= ' SET fk_projet = NULL';

+			if ($projectid) {
+			    $sql.= ' SET fk_projet = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_projet = NULL';
+			}
 			$sql.= ' WHERE rowid = '.$this->id;

 		}

 

@@ -1727,8 +1912,7 @@ 
 		{

 			$this->fk_project = $projectid;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -1748,8 +1932,12 @@ 
 		{

 			// TODO uniformize field name

 			$fieldname = 'fk_mode_reglement';

-			if ($this->element == 'societe') $fieldname = 'mode_reglement';

-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';

+			if ($this->element == 'societe') {
+			    $fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'mode_reglement_supplier';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 			$sql .= ' SET '.$fieldname.' = '.$id;

@@ -1759,17 +1947,17 @@ 
 			{

 				$this->mode_reglement_id = $id;

 				// for supplier

-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;

+				if (get_class($this) == 'Fournisseur') {
+				    $this->mode_reglement_supplier_id = $id;
+				}
 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1799,18 +1987,18 @@ 
 				$this->multicurrency_code = $code;

 

 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);

-				if ($rate) $this->setMulticurrencyRate($rate,2);

+				if ($rate) {
+				    $this->setMulticurrencyRate($rate,2);
+				}
 

 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1904,15 +2092,13 @@ 
 				}

 

 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1933,8 +2119,12 @@ 
 		{

 			// TODO uniformize field name

 			$fieldname = 'fk_cond_reglement';

-			if ($this->element == 'societe') $fieldname = 'cond_reglement';

-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';

+			if ($this->element == 'societe') {
+			    $fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'cond_reglement_supplier';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 			$sql .= ' SET '.$fieldname.' = '.$id;

@@ -1944,18 +2134,18 @@ 
 			{

 				$this->cond_reglement_id = $id;

 				// for supplier

-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;

+				if (get_class($this) == 'Fournisseur') {
+				    $this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id;	// for compatibility

 				return 1;

-			}

-			else

+			} else

 			{

 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());

 				$this->error=$this->db->error();

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');

 			$this->error='Status of the object is incompatible '.$this->statut;

@@ -1973,7 +2163,9 @@ 
 	function setDeliveryAddress($id)

 	{

 		$fieldname = 'fk_delivery_address';

-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+		    $fieldname = 'fk_address';
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;

 		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";

@@ -1982,8 +2174,7 @@ 
 		{

 			$this->fk_delivery_address = $id;

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);

@@ -2005,7 +2196,9 @@ 
 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) {
+            $userused=$user;
+        }
 

         $error = 0;

 

@@ -2016,7 +2209,9 @@ 
 

         $this->db->begin();

 

-		if ($shipping_method_id<0) $shipping_method_id='NULL';

+		if ($shipping_method_id<0) {
+		    $shipping_method_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -2033,7 +2228,9 @@ 
                 // Call trigger

                 $this->context=array('shippingmethodupdate'=>1);

                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger

             }

         }

@@ -2061,7 +2258,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);

 			return -1;

 		}

-		if ($warehouse_id<0) $warehouse_id='NULL';

+		if ($warehouse_id<0) {
+		    $warehouse_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -2108,8 +2307,7 @@ 
 		{

 			$this->modelpdf=$modelpdf;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return 0;

@@ -2129,7 +2327,9 @@ 
 	{

         global $user;

 

-        if (empty($userused)) $userused=$user;

+        if (empty($userused)) {
+            $userused=$user;
+        }
 

         $error = 0;

 

@@ -2139,7 +2339,9 @@ 
 		}

         $this->db->begin();

 

-		if ($fk_account<0) $fk_account='NULL';

+		if ($fk_account<0) {
+		    $fk_account='NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -2152,15 +2354,16 @@ 
             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

             $this->error = $this->db->lasterror();

             $error++;

-        }

-        else

+        } else

         {

             if (!$notrigger)

             {

                 // Call trigger

                 $this->context=array('bankaccountupdate'=>1);

                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);

-                if ($result < 0) $error++;

+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger

             }

         }

@@ -2168,8 +2371,7 @@ 
         {

             $this->db->rollback();

             return -1;

-        }

-        else

+        } else

         {

             $this->fk_account = ($fk_account=='NULL')?null:$fk_account;

             $this->db->commit();

@@ -2208,8 +2410,12 @@ 
 		$nl=0;

 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

 		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;

-		if (! $renum) $sql.= ' AND rang = 0';

-		if ($renum) $sql.= ' AND rang <> 0';

+		if (! $renum) {
+		    $sql.= ' AND rang = 0';
+		}
+		if ($renum) {
+		    $sql.= ' AND rang <> 0';
+		}
 

 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -2217,8 +2423,9 @@ 
 		{

 			$row = $this->db->fetch_row($resql);

 			$nl = $row[0];

-		}

-		else dol_print_error($this->db);

+		} else {
+		    dol_print_error($this->db);
+		}
 		if ($nl > 0)

 		{

 			// The goal of this part is to reorder all lines, with all children lines sharing the same

@@ -2228,7 +2435,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)

 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';

+			if ($fk_parent_line) {
+			    $sql.= ' AND fk_parent_line IS NULL';
+			}
 			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;

 

 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);

@@ -2260,8 +2469,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));

 					}

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2354,7 +2562,9 @@ 
 	function updateRangOfLine($rowid,$rang)

 	{

 		$fieldposition = 'rang';

-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+		    $fieldposition = 'position';
+		}
 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

 		$sql.= ' WHERE rowid = '.$rowid;

@@ -2395,7 +2605,9 @@ 
 		if ($rang > 1)

 		{

 			$fieldposition = 'rang';

-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;

 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

@@ -2408,8 +2620,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2429,7 +2640,9 @@ 
 		if ($rang < $max)

 		{

 			$fieldposition = 'rang';

-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

@@ -2442,8 +2655,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2514,8 +2726,7 @@ 
 				if (! empty($row[0]))

 				{

 					return $row[0];

-				}

-				else

+				} else

 				{

 					return $this->getRangOfLine($fk_parent_line);

 				}

@@ -2562,8 +2773,7 @@ 
 		{

 			$this->ref_ext = $ref_ext;

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->error();

 			return -1;

@@ -2597,7 +2807,9 @@ 
 		}

 		// Special cas

 		//var_dump($this->table_element);exit;

-		if ($this->table_element == 'product') $suffix='';

+		if ($this->table_element == 'product') {
+		    $suffix='';
+		}
 

 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

 		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");

@@ -2607,16 +2819,17 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

-			if ($suffix == '_public') $this->note_public = $note;

-			else if ($suffix == '_private') $this->note_private = $note;

-			else

+			if ($suffix == '_public') {
+			    $this->note_public = $note;
+			} else if ($suffix == '_private') {
+			    $this->note_private = $note;
+			} else

 			{

 				$this->note = $note;      // deprecated

 				$this->note_private = $note;

 			}

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -2656,37 +2869,45 @@ 
 

 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)

 		$MODULE = "";

-		if ($this->element == 'propal')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";

-		elseif ($this->element == 'order')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";

-		elseif ($this->element == 'facture')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";

-		elseif ($this->element == 'facture_fourn')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";

-		elseif ($this->element == 'order_supplier')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";

-		elseif ($this->element == 'supplier_proposal')

-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 

 		if (! empty($MODULE)) {

 			if (!empty(Globals::$conf->global->$MODULE)) {

                 $modsactivated = explode(',', Globals::$conf->global->$MODULE);

                 foreach ($modsactivated as $mod) {

-					if (Globals::$conf->$mod->enabled)

-                        return 1; // update was disabled by specific setup

+					if (Globals::$conf->$mod->enabled) {
+					                        return 1;
+					}
+					// update was disabled by specific setup

 				}

 			}

 		}

 

 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

 

-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility

+		if ($roundingadjust == '-1') {
+		    $roundingadjust='auto';
+		}
+		// For backward compatibility

 

 		$forcedroundingmode=$roundingadjust;

-		if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND))

-            $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

-        elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';

+		if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+		            $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+            $forcedroundingmode='0';
+        }
 

 		$error=0;

 

@@ -2709,15 +2930,22 @@ 
 

 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';

 		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';

-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';

+			if ($this->table_element_line == 'facturedet') {
+			    $sql.= ', situation_percent';
+			}
 			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

 		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;

 		if ($exclspec)

 		{

 			$product_field='product_type';

-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field

-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';

+			if ($this->table_element_line == 'contratdet') {
+			    $product_field='';
+			}
+			// contratdet table has no product_type field

+			if ($product_field) {
+			    $sql.= ' AND '.$product_field.' <> 9';
+			}
 		}

 		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used

 

@@ -2747,9 +2975,11 @@ 
 				$parameters=array('fk_element' => $obj->rowid);

 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 

-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

+				if (empty($reshook) && $forcedroundingmode == '0') {
+				    // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

 				{

-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);

+					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
+				}
 					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);

 					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);

 					if ($diff)

@@ -2757,7 +2987,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

 								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$obj->total_tva = $tmpcal[1];

 								$obj->total_ttc = $tmpcal[2];

 						//

@@ -2773,16 +3005,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;

 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;

 

-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;

-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;

-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;

+				if (! isset($total_ht_by_vats[$obj->vatrate])) {
+				    $total_ht_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_tva_by_vats[$obj->vatrate])) {
+				    $total_tva_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_ttc_by_vats[$obj->vatrate])) {
+				    $total_ttc_by_vats[$obj->vatrate]=0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;

 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;

 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;

 

-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

+				if ($forcedroundingmode == '1') {
+				    // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

 				{

-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);

+					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);

 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";

 					if ($diff)

@@ -2791,7 +3031,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

 								$resqlfix=$this->db->query($sqlfix);

-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');

+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$this->total_tva -= $diff;

 								$this->total_ttc -= $diff;

 								$total_tva_by_vats[$obj->vatrate] -= $diff;

@@ -2832,11 +3074,21 @@ 
 			$fieldlocaltax2='localtax2';

 			$fieldttc='total_ttc';

 			// Specific code for backward compatibility with old field names

-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';

-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';

-			if ($this->element == 'propal')                                                $fieldttc='total';

-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';

-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';

+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+			    $fieldht='total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'propal') {
+			    $fieldttc='total';
+			}
+			if ($this->element == 'expensereport') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+			    $fieldttc='total';
+			}
 

 			if (empty($nodatabaseupdate))

 			{

@@ -2865,13 +3117,11 @@ 
 			if (! $error)

 			{

 				return 1;

-			}

-			else

+			} else

 			{

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db,'Bad request in update_price');

 			return -1;

@@ -2894,10 +3144,18 @@ 
 		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);

 

 		// Special case

-		if ($origin == 'order') $origin='commande';

-		if ($origin == 'invoice') $origin='facture';

-		if ($origin == 'invoice_template') $origin='facturerec';

-    	if ($origin == 'supplierorder') $origin='order_supplier';

+		if ($origin == 'order') {
+		    $origin='commande';
+		}
+		if ($origin == 'invoice') {
+		    $origin='facture';
+		}
+		if ($origin == 'invoice_template') {
+		    $origin='facturerec';
+		}
+    	if ($origin == 'supplierorder') {
+    	    $origin='order_supplier';
+    	}
 		$this->db->begin();

 

 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";

@@ -2917,8 +3175,7 @@ 
 	  	{

 	  		$this->db->commit();

 	  		return 1;

-	  	}

-	  	else

+	  	} else

 	  	{

 	  		$this->error=$this->db->lasterror();

 	  		$this->db->rollback();

@@ -2963,12 +3220,16 @@ 
 		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))

 		{

 			$justsource=true;  // the source (id and type) is a search criteria

-			if (! empty($targettype)) $withtargettype=true;

+			if (! empty($targettype)) {
+			    $withtargettype=true;
+			}
 		}

 		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))

 		{

 			$justtarget=true;  // the target (id and type) is a search criteria

-			if (! empty($sourcetype)) $withsourcetype=true;

+			if (! empty($sourcetype)) {
+			    $withsourcetype=true;
+			}
 		}

 

 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

@@ -2991,15 +3252,17 @@ 
 			if ($justsource)

 			{

 				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";

-			}

-			else if ($justtarget)

+				if ($withtargettype) {
+				    $sql.= " AND targettype = '".$targettype."'";
+				}
+			} else if ($justtarget)

 			{

 				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";

+				if ($withsourcetype) {
+				    $sql.= " AND sourcetype = '".$sourcetype."'";
+				}
 			}

-		}

-		else

+		} else

 		{

 			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

 			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

@@ -3020,13 +3283,11 @@ 
 					if ($justsource)

 					{

 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;

-					}

-					else if ($justtarget)

+					} else if ($justtarget)

 					{

 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;

 					}

-				}

-				else

+				} else

 				{

 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)

 					{

@@ -3043,10 +3304,12 @@ 
 			if (! empty($this->linkedObjectsIds))

 			{

 				$tmparray = $this->linkedObjectsIds;

-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

+				foreach($tmparray as $objecttype => $objectids) {
+				    // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

 				{

 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)

-					$module = $element = $subelement = $objecttype;

+					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'

 						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))

 					{

@@ -3058,29 +3321,21 @@ 
 					// To work with non standard classpath or module name

 					if ($objecttype == 'facture')			{

 						$classpath = 'compta/facture/class';

-					}

-					else if ($objecttype == 'facturerec')			{

+					} else if ($objecttype == 'facturerec')			{

 						$classpath = 'compta/facture/class'; $module = 'facture';

-					}

-					else if ($objecttype == 'propal')			{

+					} else if ($objecttype == 'propal')			{

 						$classpath = 'comm/propal/class';

-					}

-					else if ($objecttype == 'supplier_proposal')			{

+					} else if ($objecttype == 'supplier_proposal')			{

 						$classpath = 'supplier_proposal/class';

-					}

-					else if ($objecttype == 'shipping')			{

+					} else if ($objecttype == 'shipping')			{

 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';

-					}

-					else if ($objecttype == 'delivery')			{

+					} else if ($objecttype == 'delivery')			{

 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';

-					}

-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

+					} else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{

 						$classpath = 'fourn/class'; $module = 'fournisseur';

-					}

-					else if ($objecttype == 'fichinter')			{

+					} else if ($objecttype == 'fichinter')			{

 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';

-					}

-					else if ($objecttype == 'subscription')			{

+					} else if ($objecttype == 'subscription')			{

 						$classpath = 'adherents/class'; $module = 'adherent';

 					}

 

@@ -3089,20 +3344,15 @@ 
 

 					if ($objecttype == 'order') {

 						$classfile = 'commande'; $classname = 'Commande';

-					}

-					else if ($objecttype == 'invoice_supplier') {

+					} else if ($objecttype == 'invoice_supplier') {

 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';

-					}

-					else if ($objecttype == 'order_supplier')   {

+					} else if ($objecttype == 'order_supplier')   {

 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';

-					}

-					else if ($objecttype == 'supplier_proposal')   {

+					} else if ($objecttype == 'supplier_proposal')   {

 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';

-					}

-					else if ($objecttype == 'facturerec')   {

+					} else if ($objecttype == 'facturerec')   {

 						$classfile = 'facture-rec'; $classname = 'FactureRec';

-					}

-					else if ($objecttype == 'subscription')   {

+					} else if ($objecttype == 'subscription')   {

 						$classfile = 'subscription'; $classname = 'Subscription';

 					}

 

@@ -3114,9 +3364,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);

 							if (class_exists($classname))

 							{

-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element

+								foreach($objectids as $i => $objectid) {
+								    // $i is rowid into llx_element_element

 								{

-									$object = new $classname($this->db);

+									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);

 									if ($ret >= 0)

 									{

@@ -3125,16 +3377,14 @@ 
 								}

 							}

 						}

-					}

-					else

+					} else

 					{

 						unset($this->linkedObjectsIds[$objecttype]);

 					}

 				}

 			}

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3156,8 +3406,11 @@ 
 		$updatesource=false;

 		$updatetarget=false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;

+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $updatesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $updatetarget=true;
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";

 		if ($updatesource)

@@ -3166,8 +3419,7 @@ 
 			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";

 			$sql.= " WHERE fk_target = ".$this->id;

 			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";

-		}

-		else if ($updatetarget)

+		} else if ($updatetarget)

 		{

 			$sql.= "fk_target = ".$targetid;

 			$sql.= ", targettype = '".$this->db->escape($targettype)."'";

@@ -3179,8 +3431,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			return -1;

@@ -3203,8 +3454,11 @@ 
 		$deletesource=false;

 		$deletetarget=false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;

-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;

+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $deletesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $deletetarget=true;
+		}
 

 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);

 		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);

@@ -3216,20 +3470,17 @@ 
 		if ($rowid > 0)

 		{

 			$sql.=" rowid = ".$rowid;

-		}

-		else

+		} else

 		{

 			if ($deletesource)

 			{

 				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

 				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

-			}

-			else if ($deletetarget)

+			} else if ($deletetarget)

 			{

 				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

 				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

-			}

-			else

+			} else

 			{

 				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

 				$sql.= " OR";

@@ -3241,8 +3492,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->errors[]=$this->error;

@@ -3271,17 +3521,31 @@ 
 		$this->db->begin();

 

 		$fieldstatus="fk_statut";

-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";

-		if ($elementTable == 'mailing') $fieldstatus="statut";

-		if ($elementTable == 'cronjob') $fieldstatus="status";

-		if ($elementTable == 'user') $fieldstatus="statut";

-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";

-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";

+		if ($elementTable == 'facture_rec') {
+		    $fieldstatus="suspended";
+		}
+		if ($elementTable == 'mailing') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'cronjob') {
+		    $fieldstatus="status";
+		}
+		if ($elementTable == 'user') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'expensereport') {
+		    $fieldstatus="fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+		    $fieldstatus="status";
+		}
 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

 		$sql.= " SET ".$fieldstatus." = ".$status;

 		// If status = 1 = validated, update also fk_user_valid

-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;

+		if ($status == 1 && $elementTable == 'expensereport') {
+		    $sql.=", fk_user_valid = ".$user->id;
+		}
 		$sql.= " WHERE rowid=".$elementId;

 

 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);

@@ -3292,12 +3556,27 @@ 
 			// Try autoset of trigkey

 			if (empty($trigkey))

 			{

-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';

-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';

-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';

+				if ($this->element == 'supplier_proposal' && $status == 2) {
+				    $trigkey='SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 3) {
+				    $trigkey='SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 4) {
+				    $trigkey='SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

+				if ($this->element == 'fichinter' && $status == 3) {
+				    $trigkey='FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+				    $trigkey='FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+				    $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}

 

 			if ($trigkey)

@@ -3316,22 +3595,22 @@ 
 			{

 				$this->db->commit();

 

-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)

+				if (empty($savElementId)) {
+				    // If the element we update was $this (so $elementId is null)

 				{

-					$this->statut = $status;

+					$this->statut = $status;
+				}
 					$this->status = $status;

 				}

 

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->db->rollback();

 				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -3351,9 +3630,13 @@ 
 	{

 		global $conf;

 

-		if (empty($id) && empty($ref)) return 0;

-		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS))

-            return 0;    // To increase speed. Not enabled by default.

+		if (empty($id) && empty($ref)) {
+		    return 0;
+		}
+		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS)) {
+		            return 0;
+		}
+		// To increase speed. Not enabled by default.

 

             // Clean parameters

 		$ref = trim($ref);

@@ -3361,8 +3644,12 @@ 
 		$sql = "SELECT rowid, canvas";

 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;

 		$sql.= " WHERE entity IN (".getEntity($this->element).")";

-		if (! empty($id))  $sql.= " AND rowid = ".$id;

-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";

+		if (! empty($id)) {
+		    $sql.= " AND rowid = ".$id;
+		}
+		if (! empty($ref)) {
+		    $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		}
 

 		$resql = $this->db->query($sql);

 		if ($resql)

@@ -3372,10 +3659,10 @@ 
 			{

 				$this->canvas   = $obj->canvas;

 				return 1;

-			}

-			else return 0;

-		}

-		else

+			} else {
+			    return 0;
+			}
+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3412,7 +3699,9 @@ 
 	{

 		global $langs;

 

-		if (empty($id)) $id=$this->id;

+		if (empty($id)) {
+		    $id=$this->id;
+		}
 

 		// Check parameters

 		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)

@@ -3446,18 +3735,18 @@ 
 					$langs->load("errors");

 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;

 					$haschild += $obj->nb;

-					if (is_numeric($elementname))	// old usage

+					if (is_numeric($elementname)) {
+					    // old usage

 					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

-					}

-					else	// new usage: $elementname=Translation key

+						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+					}
+					} else	// new usage: $elementname=Translation key

 					{

 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

 					}

 					break;    // We found at least one, we stop here

 				}

-			}

-			else

+			} else

 			{

 				$this->errors[]=$this->db->lasterror();

 				return -1;

@@ -3467,8 +3756,9 @@ 
 		{

 			$this->errors[]="ErrorRecordHasChildren";

 			return $haschild;

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -3484,12 +3774,24 @@ 
 		foreach($this->lines as $key => $val)

 		{

 			$qualified=0;

-			if ($predefined == -1) $qualified=1;

-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;

-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;

-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;

-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;

-			if ($qualified) $nb++;

+			if ($predefined == -1) {
+			    $qualified=1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) {
+			    $qualified=1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) {
+			    $qualified=1;
+			}
+			if ($qualified) {
+			    $nb++;
+			}
 		}

 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

 		return $nb;

@@ -3553,16 +3855,24 @@ 
 		{

 			if (isset($line->qty_asked))

 			{

-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''

+				if (empty($totalOrdered)) {
+				    $totalOrdered=0;
+				}
+				// Avoid warning because $totalOrdered is ''

 				$totalOrdered+=$line->qty_asked;    // defined for shipment only

 			}

 			if (isset($line->qty_shipped))

 			{

-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''

+				if (empty($totalToShip)) {
+				    $totalToShip=0;
+				}
+				// Avoid warning because $totalToShip is ''

 				$totalToShip+=$line->qty_shipped;   // defined for shipment only

-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

             {

-                if (empty($totalToShip)) $totalToShip=0;

+                if (empty($totalToShip)) {
+                    $totalToShip=0;
+                }
                 $totalToShip+=$line->qty;   // defined for reception only

 			}

 

@@ -3570,8 +3880,7 @@ 
 			if ($this->element == 'shipping') {

 				// for shipments

 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;

-			}

-			else {

+			} else {

 				$qty = $line->qty ? $line->qty : 0;

 			}

 

@@ -3587,19 +3896,30 @@ 
 

 			$weightUnit=0;

 			$volumeUnit=0;

-			if (! empty($weight_units)) $weightUnit = $weight_units;

-			if (! empty($volume_units)) $volumeUnit = $volume_units;

-

-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+			if (! empty($weight_units)) {
+			    $weightUnit = $weight_units;
+			}
+			if (! empty($volume_units)) {
+			    $volumeUnit = $volume_units;
+			}
+

+			if (empty($totalWeight)) {
+			    $totalWeight=0;
+			}
+			// Avoid warning because $totalWeight is ''

+			if (empty($totalVolume)) {
+			    $totalVolume=0;
+			}
+			// Avoid warning because $totalVolume is ''

 

 			//var_dump($line->volume_units);

-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			if ($weight_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

-				$trueWeightUnit=pow(10, $weightUnit);

+				$trueWeightUnit=pow(10, $weightUnit);
+			}
 				$totalWeight += $weight * $qty * $trueWeightUnit;

-			}

-			else {

+			} else {

 		if ($weight_units == 99) {

 			// conversion 1 Pound = 0.45359237 KG

 			$trueWeightUnit = 0.45359237;

@@ -3608,18 +3928,20 @@ 
 			// conversion 1 Ounce = 0.0283495 KG

 			$trueWeightUnit = 0.0283495;

 			$totalWeight += $weight * $qty * $trueWeightUnit;

-		}

-		else

-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units

+		} else {
+							$totalWeight += $weight * $qty;
+		}
+		// This may be wrong if we mix different units

 			}

-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			if ($volume_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;

-				$trueVolumeUnit=pow(10, $volumeUnit);

+				$trueVolumeUnit=pow(10, $volumeUnit);
+			}
 				//print $line->volume;

 				$totalVolume += $volume * $qty * $trueVolumeUnit;

-			}

-			else

+			} else

 			{

 				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units

 			}

@@ -3651,8 +3973,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -3704,13 +4025,11 @@ 
 			{

 				$res = $this->db->fetch_object($resql);

 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;

-			}

-			else

+			} else

 			{

 				return '';

 			}

-		}

-		else

+		} else

 		{

 			$this->errors[] = $this->db->lasterror();

 			return false;

@@ -3747,14 +4066,14 @@ 
 					$this->libelle_incoterms = $obj->libelle;

 				}

 				return 1;

-			}

-			else

+			} else

 			{

 				$this->errors[] = $this->db->lasterror();

 				return -1;

 			}

-		}

-		else return -1;

+		} else {
+		    return -1;
+		}
 	}

 

 

@@ -3793,7 +4112,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -3823,8 +4144,9 @@ 
 

 		// Define usemargins

 		$usemargins=0;

-		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande')))

-            $usemargins = 1;

+		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) {
+		            $usemargins = 1;
+		}
 

         $num = count($this->lines);

 

@@ -3843,8 +4165,9 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';

 

 			// Adds a line numbering column

-			if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER))

-                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+			if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			                print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+			}
 

             // Description

 			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';

@@ -3861,10 +4184,13 @@ 
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';

 

 			// Multicurrency

-			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';

+			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) {
+			                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';
+			}
 

-            if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

+            if ($inputalsopricewithtax) {
+                print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+            }
 

 			// Qty

 			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';

@@ -3883,26 +4209,32 @@ 
 			if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) {

 				if (!empty($user->rights->margins->creer))

 				{

-					if (Globals::$conf->global->MARGIN_TYPE == "1")

-                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';

-					else

-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';

+					if (Globals::$conf->global->MARGIN_TYPE == "1") {
+					                        print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+					} else {
+											print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+					}
 				}

 

-				if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

-                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

+				if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+				                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				}
+				if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {
+				                    print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				}
 			}

 

 			// Total HT

 			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';

 

 			// Multicurrency

-			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';

+			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) {
+			                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';
+			}
 

-            if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

+            if ($outputalsopricetotalwithtax) {
+                print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+            }
 

 			print '<td class="linecoledit"></td>';  // No width to allow autodim

 

@@ -3932,14 +4264,15 @@ 
 			$line->fetch_optionals();

 

 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

-			if (is_object($hookmanager))   // Old code is commented on preceding line.

+			if (is_object($hookmanager)) {
+			    // Old code is commented on preceding line.

 			{

 				if (empty($line->fk_parent_line))

 				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

-				}

-				else

+				} else

 				{

 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

@@ -3986,8 +4319,14 @@ 
 		// Show product and description

 		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);

 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.

-		if (! empty($line->date_start)) $type=1; // deprecated

-		if (! empty($line->date_end)) $type=1; // deprecated

+		if (! empty($line->date_start)) {
+		    $type=1;
+		}
+		// deprecated

+		if (! empty($line->date_end)) {
+		    $type=1;
+		}
+		// deprecated

 

 		// Ligne en mode visu

 		if ($action != 'editline' || $selected != $line->id)

@@ -4015,9 +4354,13 @@ 
 

 					$outputlangs = $langs;

 					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

-					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang))

-                        $newlang = $this->thirdparty->default_lang;  // For language to language of customer

+					if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+					    $newlang=GETPOST('lang_id','aZ09');
+					}
+					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) {
+					                        $newlang = $this->thirdparty->default_lang;
+					}
+					// For language to language of customer

                     if (! empty($newlang))

 					{

 						$outputlangs = new Translate("",$conf);

@@ -4025,8 +4368,7 @@ 
 					}

 

 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

-				}

-				else

+				} else

 				{

 					$label = $line->product_label;

 				}

@@ -4048,7 +4390,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 

@@ -4071,7 +4415,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 	}

@@ -4098,8 +4444,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';

 		print '<td align="right">'.$langs->trans('VATRate').'</td>';

 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

-		if (!empty(Globals::$conf->multicurrency->enabled))

-            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';

+		if (!empty(Globals::$conf->multicurrency->enabled)) {
+		            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';
+		}
         print '<td align="right">'.$langs->trans('Qty').'</td>';

 		if (Globals::$conf->global->PRODUCT_USE_UNITS) {

 			print '<td align="left">'.$langs->trans('Unit').'</td>';

@@ -4121,8 +4468,7 @@ 
 						$action='';

 						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks

 					}

-				}

-				else

+				} else

 				{

 					$this->printOriginLine($line, $var, $restrictlist);

 				}

@@ -4151,32 +4497,37 @@ 
 		if (!empty($line->date_start))

 		{

 			$date_start=$line->date_start;

-		}

-		else

+		} else

 		{

 			$date_start=$line->date_debut_prevue;

-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;

+			if ($line->date_debut_reel) {
+			    $date_start=$line->date_debut_reel;
+			}
 		}

 		if (!empty($line->date_end))

 		{

 			$date_end=$line->date_end;

-		}

-		else

+		} else

 		{

 			$date_end=$line->date_fin_prevue;

-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;

+			if ($line->date_fin_reel) {
+			    $date_end=$line->date_fin_reel;
+			}
 		}

 

 		$this->tpl['label'] = '';

-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

+		if (! empty($line->fk_parent_line)) {
+		    $this->tpl['label'].= img_picto('', 'rightarrow');
+		}
 

-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

+		if (($line->info_bits & 2) == 2) {
+		    // TODO Not sure this is used for source object

 		{

-			$discount=new DiscountAbsolute($this->db);

+			$discount=new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;

 			$this->tpl['label'].= $discount->getNomUrl(0,'discount');

-		}

-		else if (! empty($line->fk_product))

+		} else if (! empty($line->fk_product))

 		{

 			$productstatic = new Product($this->db);

 			$productstatic->id = $line->fk_product;

@@ -4194,13 +4545,12 @@ 
 			{

 				$this->tpl['label'].= get_date_range($date_start,$date_end);

 			}

-		}

-		else

+		} else

 		{

 			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));

 			if (!empty($line->desc)) {

 				$this->tpl['label'].=$line->desc;

-			}else {

+			} else {

 				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');

 			}

 			

@@ -4213,36 +4563,35 @@ 
 

 		if (! empty($line->desc))

 		{

-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

+			if ($line->desc == '(CREDIT_NOTE)') {
+			    // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

+			} elseif ($line->desc == '(DEPOSIT)') {
+			    // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(EXCESS RECEIVED)')

+			} elseif ($line->desc == '(EXCESS RECEIVED)')

 			{

 				$discount=new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));

-			}

-			elseif ($line->desc == '(EXCESS PAID)')

+			} elseif ($line->desc == '(EXCESS PAID)')

 			{

 				$discount=new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));

-			}

-			else

+			} else

 			{

 				$this->tpl['description'] = dol_trunc($line->desc,60);

 			}

-		}

-		else

+		} else

 		{

 			$this->tpl['description'] = '&nbsp;';

 		}

@@ -4250,18 +4599,23 @@ 
         // VAT Rate

         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';

+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) {
+            $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        }
 

 		$this->tpl['price'] = price($line->subprice);

 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);

 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';

-		if (Globals::$conf->global->PRODUCT_USE_UNITS)

-            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

+		if (Globals::$conf->global->PRODUCT_USE_UNITS) {
+		            $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
         $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

 

 		// Is the line strike or not

 		$this->tpl['strike']=0;

-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;

+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+		    $this->tpl['strike']=1;
+		}
 

 		// Output template part (modules that overwrite templates must declare this into descriptor)

 		// Use global variables + $dateSelector + $seller and $buyer

@@ -4274,7 +4628,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -4316,8 +4672,7 @@ 
 		{

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

@@ -4352,8 +4707,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			if (! $notrigger)

 			{

@@ -4420,14 +4774,20 @@ 
 		// Search template files

 		$file=''; $classname=''; $filefound=0;

 		$dirmodels=array('/');

-		if (is_array(Globals::$conf->modules_parts['models']))

-            $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);

+		if (is_array(Globals::$conf->modules_parts['models'])) {
+		            $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);
+		}
         foreach($dirmodels as $reldir)

 		{

 			foreach(array('doc','pdf') as $prefix)

 			{

-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php

-				else $file = $prefix."_".$modele.".modules.php";

+				if (in_array(get_class($this), array('Adherent'))) {
+				    $file = $prefix."_".$modele.".class.php";
+				}
+				// Member module use prefix_module.class.php

+				else {
+				    $file = $prefix."_".$modele.".modules.php";
+				}
 

 				// On verifie l'emplacement du modele

 				$file=dol_buildpath($reldir.$modelspath.$file,0);

@@ -4438,7 +4798,9 @@ 
 					break;

 				}

 			}

-			if ($filefound) break;

+			if ($filefound) {
+			    break;
+			}
 		}

 

 		// If generator was found

@@ -4469,7 +4831,9 @@ 
 						if (is_dir($tmpdir))

 						{

 							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);

-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+							if (count($tmpfiles)) {
+							    $listoffiles=array_merge($listoffiles,$tmpfiles);
+							}
 						}

 					}

 

@@ -4507,8 +4871,7 @@ 
 			{

 				$arrayofrecords = array();   // The write_file of templates of adherent class need this var

 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

-			}

-			else

+			} else

 			{

 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);

 			}

@@ -4530,9 +4893,11 @@ 
 					$destfile = basename($destfull);

 					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);

 

-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    // If not a tmp dir

 					{

-						$filename = basename($destfile);

+						$filename = basename($destfile);
+					}
 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

 

@@ -4545,22 +4910,30 @@ 
 						if ($this->element == 'propal')

 						{

 							$useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

-                            if ($useonlinesignature) $setsharekey=true;

-							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))

-                                $setsharekey = true;

+                            if ($useonlinesignature) {
+                                $setsharekey=true;
+                            }
+							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							                                $setsharekey = true;
+							}
                         }

-						if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

-                        if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

-                        if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))

-                            $setsharekey = true;

+						if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+						                            $setsharekey = true;
+						}
+                        if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+                                                    $setsharekey = true;
+                        }
+                        if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+                                                    $setsharekey = true;
+                        }
 

                         if ($setsharekey)

 						{

-							if (empty($ecmfile->share))	// Because object not found or share not set yet

+							if (empty($ecmfile->share)) {
+							    // Because object not found or share not set yet

 							{

-								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+							}
 								$ecmfile->share = getRandomPassword(true);

 							}

 						}

@@ -4577,8 +4950,7 @@ 
 							{

 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

 							}

-						}

-						else

+						} else

 						{

 							$ecmfile->entity = Globals::$conf->entity;

                             $ecmfile->filepath = $rel_dir;

@@ -4605,17 +4977,20 @@ 
 

 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

 						$update_main_doc_field=0;

-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;

+						if (! empty($obj->update_main_doc_field)) {
+						    $update_main_doc_field=1;
+						}
 						if ($update_main_doc_field && ! empty($this->table_element))

 						{

 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";

 							$sql.= ' WHERE rowid = '.$this->id;

 							$resql = $this->db->query($sql);

-							if (! $resql) dol_print_error($this->db);

+							if (! $resql) {
+							    dol_print_error($this->db);
+							}
 						}

 					}

-				}

-				else

+				} else

 				{

 					dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);

 				}

@@ -4624,15 +4999,13 @@ 
 				dol_meta_create($this);

 

 				return 1;

-			}

-			else

+			} else

 			{

 				$outputlangs->charset_output=$sav_charset_output;

 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

 				return -1;

 			}

-		}

-		else

+		} else

 		{

 			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);

 			dol_print_error('',$this->error);

@@ -4688,13 +5061,21 @@ 
 		global $conf, $_POST;

 

 		// If param here has been posted, we use this value first.

-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);

+		if (isset($_POST[$fieldname])) {
+		    return GETPOST($fieldname, 2);
+		}
 

-		if (isset($alternatevalue)) return $alternatevalue;

+		if (isset($alternatevalue)) {
+		    return $alternatevalue;
+		}
 

 		$newelement=$this->element;

-		if ($newelement == 'facture') $newelement='invoice';

-		if ($newelement == 'commande') $newelement='order';

+		if ($newelement == 'facture') {
+		    $newelement='invoice';
+		}
+		if ($newelement == 'commande') {
+		    $newelement='order';
+		}
 		if (empty($newelement))

 		{

 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);

@@ -4703,8 +5084,9 @@ 
 

 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

 		//var_dump($keyforfieldname);

-		if (isset(Globals::$conf->global->$keyforfieldname))

-            return Globals::$conf->global->$keyforfieldname;

+		if (isset(Globals::$conf->global->$keyforfieldname)) {
+		            return Globals::$conf->global->$keyforfieldname;
+		}
 

         // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

 	}

@@ -4738,8 +5120,7 @@ 
 			if (!empty($this->errors))

 			{

 				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

-			}

-			else

+			} else

 			{

 				$this->errors=$interface->errors;

 			}

@@ -4791,15 +5172,17 @@ 
 				$extrafields->fetch_name_optionals_label($this->table_element);

 			}

 			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);

-		}

-		else

+		} else

 		{

 			// global $extrafields;

             dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);

 		}

 

 		$table_element = $this->table_element;

-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility

 

 		// Request to get complementary values

 		if (is_array($optionsArray) && count($optionsArray) > 0)

@@ -4835,8 +5218,7 @@ 
 							{

 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);

 								$this->array_options["options_".$key]=$this->db->jdate($value);

-							}

-							else

+							} else

 							{

 								$this->array_options["options_".$key]=$value;

 							}

@@ -4848,10 +5230,12 @@ 
 

 				$this->db->free($resql);

 

-				if ($numrows) return $numrows;

-				else return 0;

-			}

-			else

+				if ($numrows) {
+				    return $numrows;
+				} else {
+				    return 0;
+				}
+			} else

 			{

 				dol_print_error($this->db);

 				return -1;

@@ -4870,7 +5254,10 @@ 
 		$this->db->begin();

 

 		$table_element = $this->table_element;

-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility

 

 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);

@@ -4880,8 +5267,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -4902,12 +5288,16 @@ 
 	{

 		global $conf,$langs,$user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) {
+		    $userused=$user;
+		}
 

 		$error=0;

 

-		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-            return 0; // For avoid conflicts if trigger used

+		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		            return 0;
+		}
+		// For avoid conflicts if trigger used

 

         if (! empty($this->array_options))

 		{

@@ -4920,10 +5310,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object

 			$new_array_options=array();

 			foreach ($this->array_options as $key => $value) {

-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

-					$new_array_options[$key] = $value;

-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

-					$new_array_options['options_'.$key] = $value;

+				if (in_array(substr($key,8), array_keys($target_extrafields))) {
+				    // We remove the 'options_' from $key for test

+					$new_array_options[$key] = $value;
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+				    // We test on $key that does not contains the 'options_' prefix

+					$new_array_options['options_'.$key] = $value;
+				}
 			}

 

 			foreach($new_array_options as $key => $value)

@@ -4937,8 +5330,12 @@ 
 			   	if ($attributeRequired)

 			   	{

 			   		$mandatorypb=false;

-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;

-			   		if ($this->array_options[$key] === '') $mandatorypb=true;

+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   		    $mandatorypb=true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   		    $mandatorypb=true;
+			   		}
 			   		if ($mandatorypb)

 			   		{

 			   			dol_syslog($this->error);

@@ -4957,8 +5354,7 @@ 
 			   			{

 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 			   				return -1;

-			  			}

-			   			elseif ($value=='')

+			  			} elseif ($value=='')

 			   			{

 			   				$new_array_options[$key] = null;

 			   			}

@@ -4970,8 +5366,7 @@ 
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

 							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 							return -1;

-						}

-						elseif ($value=='')

+						} elseif ($value=='')

 						{

 							$new_array_options[$key] = null;

 						}

@@ -4996,27 +5391,27 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...

 			   					//var_dump($action);

 			   					//var_dump($this->oldcopy);exit;

-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

+			   					if (is_object($this->oldcopy)) {
+			   					    // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

 			   					{

 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

 				   					{

-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

-				   					}

-									else

+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept

+				   					} else

 									{

 										// var_dump($algo);

 										$newvalue = dol_hash($this->array_options[$key], $algo);

 										$new_array_options[$key] = $newvalue;

 									}

-			   					}

-			   					else

+			   					} else

 			   					{

 			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

 			   					}

 			   				}

-			   			}

-			   			else	// Common usage

+			   			} else	// Common usage

 			   			{

 			   				$new_array_options[$key] = $this->array_options[$key];

 			   			}

@@ -5042,26 +5437,30 @@ 
 						dol_include_once($InfoFieldList[1]);

 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))

 						{

-							if ($value == '-1')	// -1 is key for no defined in combo list of objects

+							if ($value == '-1') {
+							    // -1 is key for no defined in combo list of objects

 							{

-								$new_array_options[$key]='';

-							}

-							elseif ($value)

+								$new_array_options[$key]='';
+							}
+							} elseif ($value)

 							{

 								$object = new $InfoFieldList[0]($this->db);

-								if (is_numeric($value)) $res=$object->fetch($value);

-								else $res=$object->fetch('',$value);

-

-								if ($res > 0) $new_array_options[$key]=$object->id;

-								else

+								if (is_numeric($value)) {
+								    $res=$object->fetch($value);
+								} else {
+								    $res=$object->fetch('',$value);
+								}
+

+								if ($res > 0) {
+								    $new_array_options[$key]=$object->id;
+								} else

 								{

 									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";

 									$this->db->rollback();

 									return -1;

 								}

 							}

-						}

-						else

+						} else

 						{

 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);

 						}

@@ -5072,7 +5471,10 @@ 
 			$this->db->begin();

 

 			$table_element = $this->table_element;

-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+			if ($table_element == 'categorie') {
+			    $table_element = 'categories';
+			}
+			// For compatibility

 

 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

 			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);

@@ -5083,8 +5485,10 @@ 
 			{

 				$attributeKey = substr($key,8);   // Remove 'options_' prefix

 				// Add field of attribut

-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

-					$sql.=",".$attributeKey;

+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator

+					$sql.=",".$attributeKey;
+				}
 			}

 			$sql .= ") VALUES (".$this->id;

 

@@ -5092,13 +5496,14 @@ 
 			{

 				$attributeKey = substr($key,8);   // Remove 'options_' prefix

 				// Add field of attribute

-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator)

 				{

 					if ($new_array_options[$key] != '')

 					{

-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";

-					}

-					else

+						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
+				}
+					} else

 					{

 						$sql.=",null";

 					}

@@ -5119,7 +5524,9 @@ 
 				// Call trigger

 				$this->context=array('extrafieldaddupdate'=>1);

 				$result=$this->call_trigger($trigger, $userused);

-				if ($result < 0) $error++;

+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger

 			}

 

@@ -5127,14 +5534,14 @@ 
 			{

 				$this->db->rollback();

 				return -1;

-			}

-			else

+			} else

 			{

 				$this->db->commit();

 				return 1;

 			}

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -5151,12 +5558,16 @@ 
 	{

 		global $conf,$langs,$user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) {
+		    $userused=$user;
+		}
 

 		$error=0;

 

-		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

-            return 0; // For avoid conflicts if trigger used

+		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		            return 0;
+		}
+		// For avoid conflicts if trigger used

 

         if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

 		{

@@ -5183,8 +5594,7 @@ 
 					{

 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

 						return -1;

-					}

-					elseif ($value=='')

+					} elseif ($value=='')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5196,8 +5606,7 @@ 
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 						return -1;

-					}

-					elseif ($value=='')

+					} elseif ($value=='')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5249,7 +5658,9 @@ 
 				// Call trigger

 				$this->context=array('extrafieldupdate'=>1);

 				$result=$this->call_trigger($trigger, $userused);

-				if ($result < 0) $error++;

+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger

 			}

 

@@ -5258,14 +5669,14 @@ 
 				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);

 				$this->db->rollback();

 				return -1;

-			}

-			else

+			} else

 			{

 				$this->db->commit();

 				return 1;

 			}

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 

@@ -5340,8 +5751,11 @@ 
 

 		if ($computed)

 		{

-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

-			else return '';

+			if (! preg_match('/^search_/', $keyprefix)) {
+			    return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+			    return '';
+			}
 		}

 

 

@@ -5355,33 +5769,27 @@ 
 			if ($type == 'date')

 			{

 				$morecss = 'minwidth100imp';

-			}

-			elseif ($type == 'datetime')

+			} elseif ($type == 'datetime')

 			{

 				$morecss = 'minwidth200imp';

-			}

-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+			} elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

 			{

 				$morecss = 'maxwidth75';

-                        }elseif ($type == 'url')

+                        } elseif ($type == 'url')

 			{

 				$morecss='minwidth400';

-			}

-			elseif ($type == 'boolean')

+			} elseif ($type == 'boolean')

 			{

 				$morecss='';

-			}

-			else

+			} else

 			{

 				if (round($size) < 12)

 				{

 					$morecss = 'minwidth100';

-				}

-				else if (round($size) <= 48)

+				} else if (round($size) <= 48)

 				{

 					$morecss = 'minwidth200';

-				}

-				else

+				} else

 				{

 					$morecss = 'minwidth400';

 				}

@@ -5396,52 +5804,50 @@ 
 			$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';

+			if (!$required && $value == '') {
+			    $value = '-1';
+			}
 

 			// 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:'').'>';

-		}

-		elseif (preg_match('/varchar/', $type))

+		} 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:'').'>';

-		}

-		elseif (in_array($type, array('mail', 'phone', 'url')))

+		} 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:'').'>';

-		}

-		elseif ($type == 'text')

+		} 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';

+				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);

-			}

-			else

+			} else

 			{

 				$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')

+		} 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';

+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

                 $out=$doleditor->Create(1);

-			}

-			else

+			} else

 			{

 				$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')

+		} elseif ($type == 'boolean')

 		{

 			$checked='';

 			if (!empty($value)) {

@@ -5450,22 +5856,19 @@ 
 				$checked=' value="1" ';

 			}

 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'price')

+		} elseif ($type == 'price')

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

 				$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(Globals::$conf->currency);

-        }

-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+        } elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

 				$value=price($value);

 			}

 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';

-		}

-		elseif ($type == 'select')

+		} elseif ($type == 'select')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

@@ -5474,10 +5877,14 @@ 
 			}

 

 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';

+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1)) {
+                    $out.='<option value="0">&nbsp;</option>';
+                }
 			foreach ($param['options'] as $key => $val)

 			{

-				if ((string) $key == '') continue;

+				if ((string) $key == '') {
+				    continue;
+				}
 				list($val, $parent) = explode('|', $val);

 				$out.='<option value="'.$key.'"';

 				$out.= (((string) $value == (string) $key)?' selected':'');

@@ -5485,8 +5892,7 @@ 
 				$out.='>'.$val.'</option>';

 			}

 			$out.='</select>';

-		}

-		elseif ($type == 'sellist')

+		} elseif ($type == 'sellist')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

@@ -5552,13 +5958,11 @@ 
 					{

 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';

 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];

-					}

-					else

+					} else

 					{

 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];

 					}

-				}

-				else

+				} else

 				{

 					$sqlwhere.= ' WHERE 1=1';

 				}

@@ -5594,8 +5998,7 @@ 
 							{

 								$labeltoshow.= $obj->$field_toshow.' ';

 							}

-						}

-						else

+						} else

 						{

 							$labeltoshow=$obj->{$InfoFieldList[1]};

 						}

@@ -5608,25 +6011,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);

 								if ($translabel!=$obj->$field_toshow) {

 									$labeltoshow=dol_trunc($translabel,18).' ';

-								}else {

+								} else {

 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';

 								}

 							}

 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

-						}

-						else

+						} else

 						{

 							if (! $notrans)

 							{

 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});

 								if ($translabel!=$obj->{$InfoFieldList[1]}) {

 									$labeltoshow=dol_trunc($translabel,18);

-								}

-								else {

+								} else {

 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);

 								}

 							}

-							if (empty($labeltoshow)) $labeltoshow='(not defined)';

+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)

 							{

 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

@@ -5646,19 +6049,16 @@ 
 						$i++;

 					}

 					$this->db->free($resql);

-				}

-				else {

+				} else {

 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

 				}

 			}

 			$out.='</select>';

-		}

-		elseif ($type == 'checkbox')

+		} elseif ($type == 'checkbox')

 		{

 			$value_arr=explode(',',$value);

 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

-		}

-		elseif ($type == 'radio')

+		} elseif ($type == 'radio')

 		{

 			$out='';

 			foreach ($param['options'] as $keyopt => $val)

@@ -5669,13 +6069,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');

 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

 			}

-		}

-		elseif ($type == 'chkbxlst')

+		} elseif ($type == 'chkbxlst')

 		{

 			if (is_array($value)) {

 				$value_arr = $value;

-			}

-			else {

+			} else {

 				$value_arr = explode(',', $value);

 			}

 

@@ -5790,8 +6188,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

 								}

 							}

-							if (empty($labeltoshow))

-								$labeltoshow = '(not defined)';

+							if (empty($labeltoshow)) {
+															$labeltoshow = '(not defined)';
+							}
 

 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

 									$data[$obj->rowid]=$labeltoshow;

@@ -5813,26 +6212,26 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

 				}

 			}

-		}

-		elseif ($type == 'link')

+		} 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);

 			if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) {

             			list($class,$classfile)=explode(':',$param_list[0]);

-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);

-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);

+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
+            			} else {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+            			}
             			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

             			// TODO Add Javascript code to add input fields contents to new elements urls

 			}

-		}

-		elseif ($type == 'password')

+		} elseif ($type == 'password')

 		{

 			// If prefix is 'search_', field is used as a filter, we use a common text field.

 			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';

-		}

-		elseif ($type == 'array')

+		} elseif ($type == 'array')

 		{

 			$newval = $val;

 			$newval['type'] = 'varchar(256)';

@@ -5910,17 +6309,25 @@ 
 		{

 			$type = 'varchar';		// convert varchar(xx) int varchar

 			$size = $reg[1];

-		}

-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar

-		if (is_array($val['arrayofkeyval'])) $type='select';

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';

+		} elseif (preg_match('/varchar/', $type)) {
+		    $type = 'varchar';
+		}
+		// convert varchar(xx) int varchar

+		if (is_array($val['arrayofkeyval'])) {
+		    $type='select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+		    $type='link';
+		}
 

 		$default=$val['default'];

 		$computed=$val['computed'];

 		$unique=$val['unique'];

 		$required=$val['required'];

 		$param=$val['param'];

-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

+		if (is_array($val['arrayofkeyval'])) {
+		    $param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

 		{

 			$type='link';

@@ -5931,7 +6338,9 @@ 
 		$help=$val['help'];

 		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, 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 '';

+		if ($hidden) {
+		    return '';
+		}
 

 		// If field is a computed field, value must become result of compute

 		if ($computed)

@@ -5947,36 +6356,29 @@ 
 			{

 				//$showsize=10;

 				$showsize = 'minwidth100imp';

-			}

-			elseif ($type == 'datetime')

+			} elseif ($type == 'datetime')

 			{

 				//$showsize=19;

 				$showsize = 'minwidth200imp';

-			}

-			elseif (in_array($type,array('int','double','price')))

+			} elseif (in_array($type,array('int','double','price')))

 			{

 				//$showsize=10;

 				$showsize = 'maxwidth75';

-			}

-			elseif ($type == 'url')

+			} elseif ($type == 'url')

 			{

 				$showsize='minwidth400';

-			}

-			elseif ($type == 'boolean')

+			} elseif ($type == 'boolean')

 			{

 				$showsize='';

-			}

-			else

+			} else

 			{

 				if (round($size) < 12)

 				{

 					$showsize = 'minwidth100';

-				}

-				else if (round($size) <= 48)

+				} else if (round($size) <= 48)

 				{

 					$showsize = 'minwidth200';

-				}

-				else

+				} else

 				{

 					//$showsize=48;

 					$showsize = 'minwidth400';

@@ -5985,59 +6387,52 @@ 
 		}

 

 		// Format output value differently according to properties of field

-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);

-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);

-		elseif ($type == 'date')

+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+		    $value=$this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+		    $value=$this->getLibStatut(3);
+		} elseif ($type == 'date')

 		{

 			if(! empty($value)) {

 				$value=dol_print_date($value,'day');

 			} else {

 				$value='';

 			}

-		}

-		elseif ($type == 'datetime')

+		} elseif ($type == 'datetime')

 		{

 			if(! empty($value)) {

 				$value=dol_print_date($value,'dayhour');

 			} else {

 				$value='';

 			}

-		}

-		elseif ($type == 'double')

+		} elseif ($type == 'double')

 		{

 			if (!empty($value)) {

 				$value=price($value);

 			}

-		}

-		elseif ($type == 'boolean')

+		} elseif ($type == 'boolean')

 		{

 			$checked='';

 			if (!empty($value)) {

 				$checked=' checked ';

 			}

 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';

-		}

-		elseif ($type == 'mail')

+		} elseif ($type == 'mail')

 		{

 			$value=dol_print_email($value,0,0,0,64,1,1);

-		}

-		elseif ($type == 'url')

+		} elseif ($type == 'url')

 		{

 			$value=dol_print_url($value,'_blank',32,1);

-		}

-		elseif ($type == 'phone')

+		} elseif ($type == 'phone')

 		{

 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

-		}

-		elseif ($type == 'price')

+		} elseif ($type == 'price')

 		{

 			$value = price($value, 0, $langs, 0, 0, -1, Globals::$conf->currency);

-        }

-		elseif ($type == 'select')

+        } elseif ($type == 'select')

 		{

 			$value=$param['options'][$value];

-		}

-		elseif ($type == 'sellist')

+		} elseif ($type == 'sellist')

 		{

 			$param_list=array_keys($param['options']);

 			$InfoFieldList = explode(":", $param_list[0]);

@@ -6067,7 +6462,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";

 			} elseif ($selectkey=='rowid') {

 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

+			} else {

 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			}

 

@@ -6094,12 +6489,11 @@ 
 						}

 						if ($translabel!=$field_toshow) {

 							$value.=dol_trunc($translabel,18).' ';

-						}else {

+						} else {

 							$value.=$obj->$field_toshow.' ';

 						}

 					}

-				}

-				else

+				} else

 				{

 					$translabel='';

 					if (!empty($obj->{$InfoFieldList[1]})) {

@@ -6107,18 +6501,17 @@ 
 					}

 					if ($translabel!=$obj->{$InfoFieldList[1]}) {

 						$value=dol_trunc($translabel,18);

-					}else {

+					} else {

 						$value=$obj->{$InfoFieldList[1]};

 					}

 				}

-			}

-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

-		}

-		elseif ($type == 'radio')

+			} else {
+			    dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
+		} elseif ($type == 'radio')

 		{

 			$value=$param['options'][$value];

-		}

-		elseif ($type == 'checkbox')

+		} elseif ($type == 'checkbox')

 		{

 			$value_arr=explode(',',$value);

 			$value='';

@@ -6129,8 +6522,7 @@ 
 				}

 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

 			}

-		}

-		elseif ($type == 'chkbxlst')

+		} elseif ($type == 'chkbxlst')

 		{

 			$value_arr = explode(',', $value);

 

@@ -6198,8 +6590,7 @@ 
 			} else {

 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);

 			}

-		}

-		elseif ($type == 'link')

+		} elseif ($type == 'link')

 		{

 			$out='';

 

@@ -6221,24 +6612,21 @@ 
 						$object->fetch($value);

 						$value=$object->getNomUrl($getnomurlparam);

 					}

-				}

-				else

+				} else

 				{

 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);

 					return 'Error bad setup of extrafield';

 				}

-			}

-			else $value='';

-		}

-		elseif ($type == 'text' || $type == 'html')

+			} else {
+			    $value='';
+			}
+		} elseif ($type == 'text' || $type == 'html')

 		{

 			$value=dol_htmlentitiesbr($value);

-		}

-		elseif ($type == 'password')

+		} elseif ($type == 'password')

 		{

 			$value=preg_replace('/./i','*',$value);

-		}

-		elseif ($type == 'array')

+		} elseif ($type == 'array')

 		{

 			$value = implode('<br>', $value);

 		}

@@ -6265,7 +6653,9 @@ 
 	{

 		global $db, $conf, $langs, $action, $form;

 

-		if (! is_object($form)) $form=new Form($db);

+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 

 		$out = '';

 

@@ -6279,7 +6669,9 @@ 
 			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

 			{

 				// Show only the key field in params

-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;

+				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) {
+				    continue;
+				}
 

 				$enabled = 1;

 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

@@ -6293,11 +6685,18 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

 				}

 

-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

-				if (empty($perms)) continue;

+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) {
+				    continue;
+				}
+				// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

+				if (empty($perms)) {
+				    continue;
+				}
 

 				// Load language if required

-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+				    $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				}
 

 				$colspan='3';

 				if (is_array($params) && count($params)>0) {

@@ -6331,8 +6730,7 @@ 
 				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')

 				{

 					$out .= $extrafields->showSeparator($key, $this);

-				}

-				else

+				} else

 				{

 					$csstyle='';

 					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

@@ -6363,9 +6761,11 @@ 
 					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))

 					{

 						$datenotinstring = $this->array_options['options_' . $key];

-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility

+						if (! is_numeric($this->array_options['options_' . $key])) {
+						    // For backward compatibility

 						{

-							$datenotinstring = $this->db->jdate($datenotinstring);

+							$datenotinstring = $this->db->jdate($datenotinstring);
+						}
 						}

 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;

 					}

@@ -6378,11 +6778,18 @@ 
 					$labeltoshow = $langs->trans($label);

 

 					$out .= '<td class="titlefield';

-					if (GETPOST('action','none') == 'create') $out.='create';

-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

+					if (GETPOST('action','none') == 'create') {
+					    $out.='create';
+					}
+					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+					    $out .= ' fieldrequired';
+					}
 					$out .= '">';

-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

-					else $out .= $labeltoshow;

+					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) {
+					    $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+					} else {
+					    $out .= $labeltoshow;
+					}
 					$out .= '</td>';

 

 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

@@ -6399,9 +6806,11 @@ 
 

 					$out .= '</td>';

 

-					if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1))

-                        $out .= '</tr>';

-                    else $out .= '</tr>';

+					if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+					                        $out .= '</tr>';
+					} else {
+                        $out .= '</tr>';
+                    }
 					$e++;

 				}

 			}

@@ -6453,7 +6862,9 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') {
+		    $element='facture';
+		}
 

 		return $user->rights->{$element};

 	}

@@ -6478,7 +6889,10 @@ 
 

 			if (! $db->query($sql))

 			{

-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

+				if ($ignoreerrors) {
+				    return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

 				//$this->errors = $db->lasterror();

 				return false;

 			}

@@ -6507,8 +6921,7 @@ 
 

 		if (($unitPrice > 0) && (isset(Globals::$conf->global->ForceBuyingPriceIfNull) && Globals::$conf->global->ForceBuyingPriceIfNull == 1)) { // In most cases, test here is false{

 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);

-		}

-		else

+		} else

 		{

 			// Get cost price for margin calculation

 			if (! empty($fk_product))

@@ -6525,13 +6938,11 @@ 
 					if ($product->cost_price > 0)

 					{

 						$buyPrice = $product->cost_price;

-					}

-					else if ($product->pmp > 0)

+					} else if ($product->pmp > 0)

 					{

 						$buyPrice = $product->pmp;

 					}

-				}

-				else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') {

+				} else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') {

 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

 					$product = new Product($this->db);

 					$result = $product->fetch($fk_product);

@@ -6552,8 +6963,7 @@ 
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)

 					{

 						$buyPrice = $productFournisseur->fourn_unitprice;

-					}

-					else if ($result < 0)

+					} else if ($result < 0)

 					{

 						$this->errors[] = $productFournisseur->error;

 						return -2;

@@ -6599,8 +7009,7 @@ 
 		{

 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';

-		}

-		else

+		} else

 		{

 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

@@ -6662,19 +7071,26 @@ 
 

 						// Find name of thumb file

 						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+						if (! dol_is_file($dirthumb.$photo_vignette)) {
+						    $photo_vignette='';
+						}
 

 						// Get filesize of original file

 						$imgarray=dol_getImageSize($dir.$photo);

 

 						if ($nbbyrow > 0)

 						{

-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+							if ($nbphoto == 1) {
+							    $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							}
 

-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';

+							if ($nbphoto % $nbbyrow == 1) {
+							    $return.= '<tr align=center valign=middle border=1>';
+							}
 							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';

-						}

-						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';

+						} else if ($nbbyrow < 0) {
+						    $return .= '<div class="inline-block">';
+						}
 

 						$return.= "\n";

 

@@ -6682,15 +7098,20 @@ 
 						if (empty($nolink))

 						{

 							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';

-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

+							if ($urladvanced) {
+							    $return.='<a href="'.$urladvanced.'">';
+							} else {
+							    $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}

 

 						// Show image (width height=$maxHeight)

 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine

 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;

 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

-						if ($notitle) $alt='';

+						if ($notitle) {
+						    $alt='';
+						}
 

 						if ($usesharelink)

 						{

@@ -6700,35 +7121,35 @@ 
 								{

 									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';

 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

-								}

-								else {

+								} else {

 									$return.= '<!-- Show original file -->';

 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

 								}

-							}

-							else

+							} else

 							{

 								$return.= '<!-- Show nophoto file (because file is not shared) -->';

 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

 							}

-						}

-						else

+						} else

 						{

 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

 							{

 								$return.= '<!-- Show thumb -->';

 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

-							}

-							else {

+							} else {

 								$return.= '<!-- Show original file -->';

 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

 							}

 						}

 

-						if (empty($nolink)) $return.= '</a>';

+						if (empty($nolink)) {
+						    $return.= '</a>';
+						}
 						$return.="\n";

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)

 						{

 							$return.= '<br>';

@@ -6753,15 +7174,20 @@ 
 						if ($nbbyrow > 0)

 						{

 							$return.= '</td>';

-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';

-						}

-						else if ($nbbyrow < 0) $return.='</div>';

+							if (($nbphoto % $nbbyrow) == 0) {
+							    $return.= '</tr>';
+							}
+						} else if ($nbbyrow < 0) {
+						    $return.='</div>';
+						}
 					}

 

 					if (empty($size)) {     // Format origine

 						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)

 						{

 							// Special case for product

@@ -6778,7 +7204,9 @@ 
 					}

 

 					// On continue ou on arrete de boucler ?

-					if ($nbmax && $nbphoto >= $nbmax) break;

+					if ($nbmax && $nbphoto >= $nbmax) {
+					    break;
+					}
 				}

 			}

 

@@ -6793,7 +7221,9 @@ 
 						$nbphoto++;

 					}

 

-					if ($nbphoto) $return.= '</table>';

+					if ($nbphoto) {
+					    $return.= '</table>';
+					}
 				}

 			}

 		}

@@ -6814,10 +7244,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='array') return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && $info['type']=='array') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6830,10 +7264,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='null') return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && $info['type']=='null') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6844,8 +7282,11 @@ 
 	 */

 	public function isDate($info)

 	{

-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;

-		else return false;

+		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) {
+		    return true;
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6858,10 +7299,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6874,10 +7319,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;

-			else return false;

-		}

-		else return false;

+			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6890,10 +7339,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='text') return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['type']) && $info['type']=='text') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6906,10 +7359,14 @@ 
 	{

 		if(is_array($info))

 		{

-			if(isset($info['index']) && $info['index']==true) return true;

-			else return false;

-		}

-		else return false;

+			if(isset($info['index']) && $info['index']==true) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
+		}
 	}

 

 	/**

@@ -6923,21 +7380,21 @@ 
 		global $conf;

 

 		$queryarray=array();

-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields

+		foreach ($this->fields as $field=>$info) {
+		    // Loop on definition of fields

 		{

 			// Depending on field type ('datetime', ...)

 			if($this->isDate($info))

 			{

 				if(empty($this->{$field}))

 				{

-					$queryarray[$field] = null;

-				}

-				else

+					$queryarray[$field] = null;
+		}
+				} else

 				{

 					$queryarray[$field] = $this->db->idate($this->{$field});

 				}

-			}

-			else if($this->isArray($info))

+			} else if($this->isArray($info))

 			{

 				if(! empty($this->{$field})) {

 					if(! is_array($this->{$field})) {

@@ -6947,29 +7404,35 @@ 
 				} else {

 					$queryarray[$field] = null;

 				}

-			}

-			else if($this->isInt($info))

+			} else if($this->isInt($info))

 			{

-				if ($field == 'entity' && is_null($this->{$field}))

-                    $queryarray[$field] = Globals::$conf->entity;

-                else

+				if ($field == 'entity' && is_null($this->{$field})) {
+				                    $queryarray[$field] = Globals::$conf->entity;
+				} else

 				{

 					$queryarray[$field] = (int) price2num($this->{$field});

-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.

+					if (empty($queryarray[$field])) {
+					    $queryarray[$field]=0;
+					}
+					// May be reset to null later if property 'notnull' is -1 for this field.

 				}

-			}

-			else if($this->isFloat($info))

+			} else if($this->isFloat($info))

 			{

 				$queryarray[$field] = (double) price2num($this->{$field});

-				if (empty($queryarray[$field])) $queryarray[$field]=0;

-			}

-			else

+				if (empty($queryarray[$field])) {
+				    $queryarray[$field]=0;
+				}
+			} else

 			{

 				$queryarray[$field] = $this->{$field};

 			}

 

-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+			    unset($queryarray[$field]);
+			}
+			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+			    $queryarray[$field] = null;
+			}
 		}

 

 		return $queryarray;

@@ -6987,42 +7450,47 @@ 
 		{

 			if($this->isDate($info))

 			{

-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

-				else $this->{$field} = strtotime($obj->{$field});

-			}

-			elseif($this->isArray($info))

+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+				    $this->{$field} = 0;
+				} else {
+				    $this->{$field} = strtotime($obj->{$field});
+				}
+			} elseif($this->isArray($info))

 			{

 				if(! empty($obj->{$field})) {

 					$this->{$field} = @unserialize($obj->{$field});

 					// Hack for data not in UTF8

-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

+					if($this->{$field } === false) {
+					    @unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {

 					$this->{$field} = array();

 				}

-			}

-			elseif($this->isInt($info))

+			} elseif($this->isInt($info))

 			{

-				if ($field == 'rowid') $this->id = (int) $obj->{$field};

-				else $this->{$field} = (int) $obj->{$field};

-			}

-			elseif($this->isFloat($info))

+				if ($field == 'rowid') {
+				    $this->id = (int) $obj->{$field};
+				} else {
+				    $this->{$field} = (int) $obj->{$field};
+				}
+			} elseif($this->isFloat($info))

 			{

 				$this->{$field} = (double) $obj->{$field};

-			}

-			elseif($this->isNull($info))

+			} elseif($this->isNull($info))

 			{

 				$val = $obj->{$field};

 				// zero is not null

 				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);

-			}

-			else

+			} else

 			{

 				$this->{$field} = $obj->{$field};

 			}

 		}

 

 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.

-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

+		if (! isset($this->fields['ref']) && isset($this->id)) {
+		    $this->ref = $this->id;
+		}
 	}

 

 	/**

@@ -7045,9 +7513,13 @@ 
 	 */

     protected function quote($value, $fieldsentry)

     {

-		if (is_null($value)) return 'NULL';

-		else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");

-		else return "'".$this->db->escape($value)."'";

+		if (is_null($value)) {
+		    return 'NULL';
+		} else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) {
+		    return $this->db->escape("$value");
+		} else {
+		    return "'".$this->db->escape($value)."'";
+		}
 	}

 

 

@@ -7067,8 +7539,12 @@ 
 		$now=dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);

-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;

+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+		    $fieldvalues['date_creation']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) {
+		    $fieldvalues['fk_user_creat']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

 

 		$keys=array();

@@ -7083,8 +7559,12 @@ 
 		foreach($keys as $key)

 		{

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))

@@ -7094,11 +7574,17 @@ 
 			}

 

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';

-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
 		}

 

-		if ($error) return -1;

+		if ($error) {
+		    return -1;
+		}
 

 		$this->db->begin();

 

@@ -7124,7 +7610,9 @@ 
 		if (! $error)

 		{

 			$result=$this->insertExtraFields();

-			if ($result < 0) $error++;

+			if ($result < 0) {
+			    $error++;
+			}
 		}

 

 		// Triggers

@@ -7157,15 +7645,24 @@ 
 	 */

 	public function fetchCommon($id, $ref = null, $morewhere = '')

 	{

-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;

+		if (empty($id) && empty($ref) && empty($morewhere)) {
+		    return -1;
+		}
 

 		$sql = 'SELECT '.$this->getFieldList();

 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

 

-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;

-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare

-		if ($morewhere)   $sql.= $morewhere;

+		if (!empty($id)) {
+		    $sql.= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+		    $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+		    $sql.=' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare

+		if ($morewhere) {
+		    $sql.= $morewhere;
+		}
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record

 

 		$res = $this->db->query($sql);

@@ -7176,13 +7673,11 @@ 
 			{

 				$this->setVarsFromFetchObj($obj);

 				return $this->id;

-			}

-			else

+			} else

 			{

 				return 0;

 			}

-		}

-		else

+		} else

 		{

 			$this->error = $this->db->lasterror();

 			$this->errors[] = $this->error;

@@ -7206,8 +7701,12 @@ 
 		$now=dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);

-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;

+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+		    $fieldvalues['date_modification']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) {
+		    $fieldvalues['fk_user_modif']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

 

 		$keys=array();

@@ -7222,8 +7721,14 @@ 
 		// Clean and check mandatory

 		foreach($keys as $key)

 		{

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an implicit foreign key field

+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an explicit foreign key field

 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

 			/*

@@ -7303,10 +7808,11 @@ 
 					return -1;

 				}

 			}

-		}

-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

+		} elseif (! empty($this->fk_element) && ! empty($this->childtables)) {
+		    // If object has childs linked with a foreign key field, we check all child tables.

 		{

-			$objectisused = $this->isObjectUsed($this->id);

+			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (! empty($objectisused))

 			{

 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);

@@ -7413,7 +7919,9 @@ 
      */

     public function trimParameters($parameters)

     {

-        if (!is_array($parameters)) return;

+        if (!is_array($parameters)) {
+            return;
+        }
         foreach ($parameters as $parameter) {

             if (isset($this->$parameter)) {

                 $this->$parameter = trim($this->$parameter);

Base/AlLangs.php

Braces +176 added lines, -117 removed lines

@@ -37,12 +37,15 @@ 
     function __construct()

     {

         $dir = DOL_BASE_PATH;

-        if (!empty(Globals::$conf->file->character_set_client))

-            $this->charset_output = Globals::$conf->file->character_set_client; // If charset output is forced

-        if ($dir)

-            $this->dir = array($dir);

-        else

-            $this->dir = Globals::$conf->file->dol_document_root;

+        if (!empty(Globals::$conf->file->character_set_client)) {
+                    $this->charset_output = Globals::$conf->file->character_set_client;
+        }
+        // If charset output is forced

+        if ($dir) {
+                    $this->dir = array($dir);
+        } else {
+                    $this->dir = Globals::$conf->file->dol_document_root;
+        }
     }

 

     /**

@@ -78,8 +81,9 @@ 
             $langpref = str_replace("-", "_", $langpref);

             $langlist = preg_split("/[;,]/", $langpref);

             $codetouse = $langlist[0];

-        } else

-            $codetouse = $srclang;

+        } else {
+                    $codetouse = $srclang;
+        }
 

         // We redefine $srclang

         $langpart = explode("_", $codetouse);

@@ -88,25 +92,27 @@ 
             // Array force long code from first part, even if long code is defined

             $longforshort = array('ar' => 'ar_SA');

             $longforshortexcep = array('ar_EG');

-            if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep))

-                $srclang = $longforshort[strtolower($langpart[0])];

-            else if (!is_numeric($langpart[1])) {  // Second part YY may be a numeric with some Chrome browser

+            if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep)) {
+                            $srclang = $longforshort[strtolower($langpart[0])];
+            } else if (!is_numeric($langpart[1])) {  // Second part YY may be a numeric with some Chrome browser

                 $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[1]);

                 $longforlong = array('no_nb' => 'nb_NO');

-                if (isset($longforlong[strtolower($srclang)]))

-                    $srclang = $longforlong[strtolower($srclang)];

-            } else

-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);

-        }

-        else {      // If it's for a codetouse that is a short code xx

+                if (isset($longforlong[strtolower($srclang)])) {
+                                    $srclang = $longforlong[strtolower($srclang)];
+                }
+            } else {
+                            $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+            }
+        } else {      // If it's for a codetouse that is a short code xx

             // Array to convert short lang code into long code.

             $longforshort = array('ar' => 'ar_SA', 'el' => 'el_GR', 'ca' => 'ca_ES', 'en' => 'en_US', 'nb' => 'nb_NO', 'no' => 'nb_NO');

-            if (isset($longforshort[strtolower($langpart[0])]))

-                $srclang = $longforshort[strtolower($langpart[0])];

-            else if (!empty($langpart[0]))

-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);

-            else

-                $srclang = 'en_US';

+            if (isset($longforshort[strtolower($langpart[0])])) {
+                            $srclang = $longforshort[strtolower($langpart[0])];
+            } else if (!empty($langpart[0])) {
+                            $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+            } else {
+                            $srclang = 'en_US';
+            }
         }

 

         $this->defaultlang = $srclang;

@@ -122,10 +128,11 @@ 
      */

     function getDefaultLang($mode = 0)

     {

-        if (empty($mode))

-            return $this->defaultlang;

-        else

-            return substr($this->defaultlang, 0, 2);

+        if (empty($mode)) {
+                    return $this->defaultlang;
+        } else {
+                    return substr($this->defaultlang, 0, 2);
+        }
     }

 

     /**

@@ -171,8 +178,10 @@ 
             dol_print_error('', get_class($this) . "::Load ErrorWrongParameters");

             return -1;

         }

-        if ($this->defaultlang == 'none_NONE')

-            return 0;    // Special language code to not translate keys

+        if ($this->defaultlang == 'none_NONE') {
+                    return 0;
+        }
+        // Special language code to not translate keys

 

 

 

@@ -180,8 +189,10 @@ 
 

             

 // Load $this->tab_translate[] from database

-        if (empty($loadfromfileonly) && count($this->tab_translate) == 0)

-            $this->loadFromDatabase($db);      // No translation was never loaded yet, so we load database.

+        if (empty($loadfromfileonly) && count($this->tab_translate) == 0) {
+                    $this->loadFromDatabase($db);
+        }
+        // No translation was never loaded yet, so we load database.

 

 

         $newdomain = $domain;

@@ -204,10 +215,12 @@ 
 

         // Redefine alt

         $langarray = explode('_', $langofdir);

-        if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr'))))

-            $alt = 1;

-        if ($alt < 2 && strtolower($langofdir) == 'en_us')

-            $alt = 2;

+        if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr')))) {
+                    $alt = 1;
+        }
+        if ($alt < 2 && strtolower($langofdir) == 'en_us') {
+                    $alt = 2;
+        }
 

         if (empty($langofdir)) { // This may occurs when load is called without setting the language and without providing a value for forcelangdir

             AlDolUtils::dol_syslog("Error: " . get_class($this) . "::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

@@ -249,16 +262,19 @@ 
                         $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.

                         //print $newdomain."\n";

                         //var_dump($this->tab_translate);

-                        if ($alt == 2)

-                            $fileread = 1;

+                        if ($alt == 2) {
+                                                    $fileread = 1;
+                        }
                         $found = true;      // Found in dolibarr PHP cache

                     }

                 }

 

                 if (!$found) {

                     if ($fp = @fopen($file_lang, "rt")) {

-                        if ($usecachekey)

-                            $tabtranslatedomain = array(); // To save lang content in cache

+                        if ($usecachekey) {
+                                                    $tabtranslatedomain = array();
+                        }
+                        // To save lang content in cache

 

                         /**

                          * Read each lines until a '=' (with any combination of spaces around it)

@@ -306,8 +322,10 @@ 
                             }

                         }

 

-                        if (empty(Globals::$conf->global->MAIN_FORCELANGDIR))

-                            break;  // Break loop on each root dir. If a module has forced dir, we do not stop loop.

+                        if (empty(Globals::$conf->global->MAIN_FORCELANGDIR)) {
+                                                    break;
+                        }
+                        // Break loop on each root dir. If a module has forced dir, we do not stop loop.

                     }

                 }

             }

@@ -318,10 +336,14 @@ 
             // This function MUST NOT contains call to syslog

             //DolUtils::dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);

             $langofdir = strtolower($langarray[0]) . '_' . strtoupper($langarray[0]);

-            if ($langofdir == 'el_EL')

-                $langofdir = 'el_GR';                     // main parent for el_CY is not 'el_EL' but 'el_GR'

-            if ($langofdir == 'ar_AR')

-                $langofdir = 'ar_SA';                     // main parent for ar_EG is not 'ar_AR' but 'ar_SA'

+            if ($langofdir == 'el_EL') {
+                            $langofdir = 'el_GR';
+            }
+            // main parent for el_CY is not 'el_EL' but 'el_GR'

+            if ($langofdir == 'ar_AR') {
+                            $langofdir = 'ar_SA';
+            }
+            // main parent for ar_EG is not 'ar_AR' but 'ar_SA'

             $this->load($domain, $alt + 1, $stopafterdirection, $langofdir);

         }

 

@@ -335,11 +357,15 @@ 
 

         // We are in the pass of the reference file. No more files to scan to complete.

         if ($alt == 2) {

-            if ($fileread)

-                $this->_tab_loaded[$newdomain] = 1;        // Set domain file as found so loaded

-

-            if (empty($this->_tab_loaded[$newdomain]))

-                $this->_tab_loaded[$newdomain] = 2; // Set this file as not found

+            if ($fileread) {
+                            $this->_tab_loaded[$newdomain] = 1;
+            }
+            // Set domain file as found so loaded

+

+            if (empty($this->_tab_loaded[$newdomain])) {
+                            $this->_tab_loaded[$newdomain] = 2;
+            }
+            // Set this file as not found

         }

 

         // This part is deprecated and replaced with table llx_overwrite_trans

@@ -351,15 +377,17 @@ 
                 $tmparray = explode(',', Globals::$conf->global->$overwritekey);

                 foreach ($tmparray as $tmp) {

                     $tmparray2 = explode(':', $tmp);

-                    if (!empty($tmparray2[1]))

-                        $this->tab_translate[$tmparray2[0]] = $tmparray2[1];

+                    if (!empty($tmparray2[1])) {
+                                            $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+                    }
                 }

             }

         }

 

         // Check to be sure that SeparatorDecimal differs from SeparatorThousand

-        if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"]) && $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"])

-            $this->tab_translate["SeparatorThousand"] = '';

+        if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"]) && $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) {
+                    $this->tab_translate["SeparatorThousand"] = '';
+        }
 

         return 1;

     }

@@ -383,8 +411,10 @@ 
         $domain = 'database';

 

         // Check parameters

-        if (empty($db))

-            return 0;    // Database handler can't be used

+        if (empty($db)) {
+                    return 0;
+        }
+        // Database handler can't be used

 

 

 

@@ -448,8 +478,10 @@ 
             if ($resql) {

                 $num = $db->num_rows($resql);

                 if ($num) {

-                    if ($usecachekey)

-                        $tabtranslatedomain = array(); // To save lang content in cache

+                    if ($usecachekey) {
+                                            $tabtranslatedomain = array();
+                    }
+                    // To save lang content in cache

 

                     $i = 0;

                     while ($i < $num) { // Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents

@@ -463,8 +495,10 @@ 
                             $value = trim(preg_replace('/\\n/', "\n", $value));

 

                             $this->tab_translate[$key] = $value;

-                            if ($usecachekey)

-                                $tabtranslatedomain[$key] = $value; // To save lang content in cache

+                            if ($usecachekey) {
+                                                            $tabtranslatedomain[$key] = $value;
+                            }
+                            // To save lang content in cache

                         }

 

                         $i++;

@@ -487,11 +521,15 @@ 
             }

         }

 

-        if ($fileread)

-            $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded

+        if ($fileread) {
+                    $this->_tab_loaded[$newdomain] = 1;
+        }
+        // Set domain file as loaded

 

-        if (empty($this->_tab_loaded[$newdomain]))

-            $this->_tab_loaded[$newdomain] = 2;           // Marque ce cas comme non trouve (no lines found for language)

+        if (empty($this->_tab_loaded[$newdomain])) {
+                    $this->_tab_loaded[$newdomain] = 2;
+        }
+        // Marque ce cas comme non trouve (no lines found for language)

 

         return 1;

     }

@@ -511,8 +549,10 @@ 
     {

         global $conf, $db;

 

-        if (!is_string($key))

-            return 'ErrorBadValueForParamNotAString'; // Avoid multiple errors with code not using function correctly.

+        if (!is_string($key)) {
+                    return 'ErrorBadValueForParamNotAString';
+        }
+        // Avoid multiple errors with code not using function correctly.

 

         $newstr = $key;

         if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg)) {

@@ -575,8 +615,9 @@ 
                 $str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.

             }

 

-            if ($maxsize)

-                $str = dol_trunc($str, $maxsize);

+            if ($maxsize) {
+                            $str = dol_trunc($str, $maxsize);
+            }
 

             // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities

             $str = str_replace(array('<', '>', '"',), array('__lt__', '__gt__', '__quot__'), $str);

@@ -587,8 +628,7 @@ 
             $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);

 

             return $str;

-        }

-        else {        // Translation is not available

+        } else {        // Translation is not available

             //if ($key[0] == '$') { return dol_eval($key,1); }

             return $this->getTradFromKey($key);

         }

@@ -668,10 +708,11 @@ 
      */

     function transcountry($str, $countrycode)

     {

-        if ($this->tab_translate["$str$countrycode"])

-            return $this->trans("$str$countrycode");

-        else

-            return $this->trans($str);

+        if ($this->tab_translate["$str$countrycode"]) {
+                    return $this->trans("$str$countrycode");
+        } else {
+                    return $this->trans($str);
+        }
     }

 

     /**

@@ -683,10 +724,11 @@ 
      */

     function transcountrynoentities($str, $countrycode)

     {

-        if ($this->tab_translate["$str$countrycode"])

-            return $this->transnoentities("$str$countrycode");

-        else

-            return $this->transnoentities($str);

+        if ($this->tab_translate["$str$countrycode"]) {
+                    return $this->transnoentities("$str$countrycode");
+        } else {
+                    return $this->transnoentities($str);
+        }
     }

 

     /**

@@ -698,10 +740,12 @@ 
      */

     function convToOutputCharset($str, $pagecodefrom = 'UTF-8')

     {

-        if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8')

-            $str = utf8_encode($str);

-        if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1')

-            $str = utf8_decode(str_replace('€', chr(128), $str));

+        if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8') {
+                    $str = utf8_encode($str);
+        }
+        if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1') {
+                    $str = utf8_decode(str_replace('€', chr(128), $str));
+        }
         return $str;

     }

 

@@ -756,16 +800,19 @@ 
         // phpcs:enable

         // Test si fichier dans repertoire de la langue

         foreach ($this->dir as $searchdir) {

-            if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename)))

-                return true;

+            if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename))) {
+                            return true;
+            }
 

             if ($searchalt) {

                 // Test si fichier dans repertoire de la langue alternative

-                if ($this->defaultlang != "en_US")

-                    $filenamealt = $searchdir . "/langs/en_US/" . $filename;

+                if ($this->defaultlang != "en_US") {
+                                    $filenamealt = $searchdir . "/langs/en_US/" . $filename;
+                }
                 //else $filenamealt = $searchdir."/langs/fr_FR/".$filename;

-                if (is_readable(dol_osencode($filenamealt)))

-                    return true;

+                if (is_readable(dol_osencode($filenamealt))) {
+                                    return true;
+                }
             }

         }

 

@@ -795,8 +842,10 @@ 
             $newdir = dol_osencode($dir);

 

             // Check if directory exists

-            if (!is_dir($newdir))

-                continue; // We must not use dol_is_dir here, function may not be loaded

+            if (!is_dir($newdir)) {
+                            continue;
+            }
+            // We must not use dol_is_dir here, function may not be loaded

 

             $fonc = 'numberwords';

             if (file_exists($newdir . '/functions_' . $fonc . '.lib.php')) {

@@ -827,8 +876,9 @@ 
     function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)

     {

         // If key empty

-        if ($key == '')

-            return '';

+        if ($key == '') {
+                    return '';
+        }
 

         //print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;

         // Check if a translation is available (this can call getTradFromKey)

@@ -845,21 +895,22 @@ 
         $sql = "SELECT " . $fieldlabel . " as label";

         $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

         $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($keyforselect ? $keyforselect : $key) . "'";

-        if ($filteronentity)

-            $sql .= " AND entity IN (" . getEntity($tablename) . ')';

+        if ($filteronentity) {
+                    $sql .= " AND entity IN (" . getEntity($tablename) . ')';
+        }
         AlDolUtils::dol_syslog(get_class($this) . '::getLabelFromKey', LOG_DEBUG);

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                $this->cache_labels[$tablename][$key] = $obj->label;

-            else

-                $this->cache_labels[$tablename][$key] = $key;

+            if ($obj) {
+                            $this->cache_labels[$tablename][$key] = $obj->label;
+            } else {
+                            $this->cache_labels[$tablename][$key] = $key;
+            }
 

             $db->free($resql);

             return $this->cache_labels[$tablename][$key];

-        }

-        else {

+        } else {

             $this->error = $db->lasterror();

             return -1;

         }

@@ -878,10 +929,11 @@ 
     {

         $symbol = $this->getCurrencySymbol($currency_code);

 

-        if (in_array($currency_code, array('USD')))

-            return $symbol . $amount;

-        else

-            return $amount . $symbol;

+        if (in_array($currency_code, array('USD'))) {
+                    return $symbol . $amount;
+        } else {
+                    return $amount . $symbol;
+        }
     }

 

     /**

@@ -919,16 +971,21 @@ 
     {

         global $db;

 

-        if ($this->cache_currencies_all_loaded)

-            return 0;                                           // Cache already loaded for all

-        if (!empty($currency_code) && isset($this->cache_currencies[$currency_code]))

-            return 0;    // Cache already loaded for the currency

+        if ($this->cache_currencies_all_loaded) {
+                    return 0;
+        }
+        // Cache already loaded for all

+        if (!empty($currency_code) && isset($this->cache_currencies[$currency_code])) {
+                    return 0;
+        }
+        // Cache already loaded for the currency

 

         $sql = "SELECT code_iso, label, unicode";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_currencies";

         $sql .= " WHERE active = 1";

-        if (!empty($currency_code))

-            $sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";

+        if (!empty($currency_code)) {
+                    $sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";
+        }
         //$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later

 

         AlDolUtils::dol_syslog(get_class($this) . '::loadCacheCurrencies', LOG_DEBUG);

@@ -936,9 +993,11 @@ 
         if ($resql) {

             $this->load("dict");

             $label = array();

-            if (!empty($currency_code))

-                foreach ($this->cache_currencies as $key => $val)

-                    $label[$key] = $val['label']; // Label in already loaded cache

+            if (!empty($currency_code)) {
+                            foreach ($this->cache_currencies as $key => $val)

+                    $label[$key] = $val['label'];
+            }
+            // Label in already loaded cache

 

                 $num = $db->num_rows($resql);

             $i = 0;

@@ -951,15 +1010,15 @@ 
                 $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];

                 $i++;

             }

-            if (empty($currency_code))

-                $this->cache_currencies_all_loaded = true;

+            if (empty($currency_code)) {
+                            $this->cache_currencies_all_loaded = true;
+            }
             //print count($label).' '.count($this->cache_currencies);

             // Resort cache

             array_multisort($label, SORT_ASC, $this->cache_currencies);

             //var_dump($this->cache_currencies);	$this->cache_currencies is now sorted onto label

             return $num;

-        }

-        else {

+        } else {

             dol_print_error($db);

             return -1;

         }

Base/AlixarView.php

Braces +60 added lines, -38 removed lines

@@ -199,15 +199,20 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
 
-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            }
 
             $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -247,12 +252,15 @@ 
             $parameters = array();
             $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
-                if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
-                else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
-            }
-            else {
+                if ($result == 0) {
+                                    $toprightmenu .= Globals::$hookManager->resPrint;
+                }
+                // add
+                else {
+                                    $toprightmenu = Globals::$hookManager->resPrint;
+                }
+                // replace
+            } else {
                 $toprightmenu .= $result; // For backward compatibility
             }
 
@@ -412,8 +420,9 @@ 
             $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
-            } else
-                $searchform = Globals::$hookManager->resPrint;
+            } else {
+                            $searchform = Globals::$hookManager->resPrint;
+            }
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
@@ -595,18 +604,21 @@ 
 // If WIKI URL
             if (preg_match('/^es/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (preg_match('/^fr/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (empty($helppage)) { // If help page not already found
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             $mode = 'wiki';
         }
@@ -697,8 +709,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -706,12 +719,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != Globals::$conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -738,20 +754,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         AlDolUtils::printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";

Base/AlForm.php

Braces +1224 added lines, -911 removed lines

@@ -113,22 +113,24 @@ 
             if (!empty($perm)) {

                 $tmp = explode(':', $typeofdata);

                 $ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';

-                if ($fieldrequired)

-                    $ret .= '<span class="fieldrequired">';

+                if ($fieldrequired) {
+                                    $ret .= '<span class="fieldrequired">';
+                }
                 $ret .= $langs->trans($text);

-                if ($fieldrequired)

-                    $ret .= '</span>';

+                if ($fieldrequired) {
+                                    $ret .= '</span>';
+                }
                 $ret .= '</div>' . "\n";

-            }

-            else {

-                if ($fieldrequired)

-                    $ret .= '<span class="fieldrequired">';

+            } else {

+                if ($fieldrequired) {
+                                    $ret .= '<span class="fieldrequired">';
+                }
                 $ret .= $langs->trans($text);

-                if ($fieldrequired)

-                    $ret .= '</span>';

+                if ($fieldrequired) {
+                                    $ret .= '</span>';
+                }
             }

-        }

-        else {

+        } else {

             if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

                 $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';

             }

@@ -193,8 +195,9 @@ 
         $ret = '';

 

         // Check parameters

-        if (empty($typeofdata))

-            return 'ErrorBadParameter';

+        if (empty($typeofdata)) {
+                    return 'ErrorBadParameter';
+        }
 

         // When option to edit inline is activated

         if (!empty(Globals::$conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker

@@ -206,10 +209,12 @@ 
                 $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

                 $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

                 $ret .= '<input type="hidden" name="' . $paramid . '" value="' . $object->id . '">';

-                if (empty($notabletag))

-                    $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';

-                if (empty($notabletag))

-                    $ret .= '<tr><td>';

+                if (empty($notabletag)) {
+                                    $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+                }
+                if (empty($notabletag)) {
+                                    $ret .= '<tr><td>';
+                }
                 if (preg_match('/^(string|email)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($editvalue ? $editvalue : $value) . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

@@ -248,35 +253,39 @@ 
                     $doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), true, true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));

                     $ret .= $doleditor->Create(1);

                 }

-                if (empty($notabletag))

-                    $ret .= '</td>';

+                if (empty($notabletag)) {
+                                    $ret .= '</td>';
+                }
 

-                if (empty($notabletag))

-                    $ret .= '<td align="left">';

+                if (empty($notabletag)) {
+                                    $ret .= '<td align="left">';
+                }
                 //else $ret.='<div class="clearboth"></div>';

                 $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';

-                if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag))

-                    $ret .= '<br>' . "\n";

+                if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {
+                                    $ret .= '<br>' . "\n";
+                }
                 $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="cancel" value="' . $langs->trans("Cancel") . '">';

-                if (empty($notabletag))

-                    $ret .= '</td>';

+                if (empty($notabletag)) {
+                                    $ret .= '</td>';
+                }
 

-                if (empty($notabletag))

-                    $ret .= '</tr></table>' . "\n";

+                if (empty($notabletag)) {
+                                    $ret .= '</tr></table>' . "\n";
+                }
                 $ret .= '</form>' . "\n";

-            }

-            else {

-                if (preg_match('/^(email)/', $typeofdata))

-                    $ret .= dol_print_email($value, 0, 0, 0, 0, 1);

-                elseif (preg_match('/^(amount|numeric)/', $typeofdata))

-                    $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, Globals::$conf->currency) : '');

-                elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))

-                    $ret .= dol_htmlentitiesbr($value);

-                elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')

-                    $ret .= AlDolUtils::dol_print_date($value, 'day');

-                elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')

-                    $ret .= AlDolUtils::dol_print_date($value, 'dayhour');

-                else if (preg_match('/^select;/', $typeofdata)) {

+            } else {

+                if (preg_match('/^(email)/', $typeofdata)) {
+                                    $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+                } elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
+                                    $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, Globals::$conf->currency) : '');
+                } elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+                                    $ret .= dol_htmlentitiesbr($value);
+                } elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
+                                    $ret .= AlDolUtils::dol_print_date($value, 'day');
+                } elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
+                                    $ret .= AlDolUtils::dol_print_date($value, 'dayhour');
+                } else if (preg_match('/^select;/', $typeofdata)) {

                     $arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));

                     foreach ($arraydata as $val) {

                         $tmp = explode(':', $val);

@@ -291,8 +300,9 @@ 
                         $tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

                     }

                     $ret .= $tmpcontent;

-                } else

-                    $ret .= $value;

+                } else {
+                                    $ret .= $value;
+                }
 

                 if ($formatfunc && method_exists($object, $formatfunc)) {

                     $ret = $object->$formatfunc($ret);

@@ -322,12 +332,13 @@ 
         $out = '';

 

         // Check parameters

-        if (preg_match('/^text/', $inputType))

-            $value = dol_nl2br($value);

-        else if (preg_match('/^numeric/', $inputType))

-            $value = price($value);

-        else if ($inputType == 'day' || $inputType == 'datepicker')

-            $value = AlDolUtils::dol_print_date($value, 'day');

+        if (preg_match('/^text/', $inputType)) {
+                    $value = dol_nl2br($value);
+        } else if (preg_match('/^numeric/', $inputType)) {
+                    $value = price($value);
+        } else if ($inputType == 'day' || $inputType == 'datepicker') {
+                    $value = AlDolUtils::dol_print_date($value, 'day');
+        }
 

         if ($condition) {

             $element = false;

@@ -352,32 +363,35 @@ 
             if (preg_match('/^(string|email|numeric)/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

-                if (!empty($tmp[1]))

-                    $inputOption = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

+                if (!empty($tmp[1])) {
+                                    $inputOption = $tmp[1];
+                }
+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
                 $out .= '<input id="width_' . $htmlname . '" value="' . $inputOption . '" type="hidden"/>' . "\n";

-            }

-            else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

+            } else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

-                if (!empty($tmp[1]))

-                    $inputOption = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

+                if (!empty($tmp[1])) {
+                                    $inputOption = $tmp[1];
+                }
+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
 

                 $out .= '<input id="timestamp" type="hidden"/>' . "\n"; // Use for timestamp format

-            }

-            else if (preg_match('/^(select|autocomplete)/', $inputType)) {

+            } else if (preg_match('/^(select|autocomplete)/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $loadmethod = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

-                if (!empty($tmp[3]))

-                    $button_only = true;

-            }

-            else if (preg_match('/^textarea/', $inputType)) {

+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
+                if (!empty($tmp[3])) {
+                                    $button_only = true;
+                }
+            } else if (preg_match('/^textarea/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $rows = (empty($tmp[1]) ? '8' : $tmp[1]);

@@ -386,12 +400,15 @@ 
                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $toolbar = $tmp[1];

-                if (!empty($tmp[2]))

-                    $width = $tmp[2];

-                if (!empty($tmp[3]))

-                    $heigth = $tmp[3];

-                if (!empty($tmp[4]))

-                    $savemethod = $tmp[4];

+                if (!empty($tmp[2])) {
+                                    $width = $tmp[2];
+                }
+                if (!empty($tmp[3])) {
+                                    $heigth = $tmp[3];
+                }
+                if (!empty($tmp[4])) {
+                                    $savemethod = $tmp[4];
+                }
 

                 if (!empty(Globals::$conf->fckeditor->enabled)) {

                     $out .= '<input id="ckeditor_toolbar" value="' . $toolbar . '" type="hidden"/>' . "\n";

@@ -404,18 +421,23 @@ 
             $out .= '<input id="table_element_' . $htmlname . '" value="' . $table_element . '" type="hidden"/>' . "\n";

             $out .= '<input id="fk_element_' . $htmlname . '" value="' . $fk_element . '" type="hidden"/>' . "\n";

             $out .= '<input id="loadmethod_' . $htmlname . '" value="' . $loadmethod . '" type="hidden"/>' . "\n";

-            if (!empty($savemethod))

-                $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";

-            if (!empty($ext_element))

-                $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";

+            if (!empty($savemethod)) {
+                            $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";
+            }
+            if (!empty($ext_element)) {
+                            $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";
+            }
             if (!empty($custommsg)) {

                 if (is_array($custommsg)) {

-                    if (!empty($custommsg['success']))

-                        $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";

-                    if (!empty($custommsg['error']))

-                        $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";

-                } else

-                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";

+                    if (!empty($custommsg['success'])) {
+                                            $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";
+                    }
+                    if (!empty($custommsg['error'])) {
+                                            $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";
+                    }
+                } else {
+                                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";
+                }
             }

             if ($inputType == 'textarea') {

                 $out .= '<input id="textarea_' . $htmlname . '_rows" value="' . $rows . '" type="hidden"/>' . "\n";

@@ -567,20 +589,22 @@ 
         global $conf, $langs;

 

         $alt = '';

-        if ($tooltiptrigger)

-            $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");

+        if ($tooltiptrigger) {
+                    $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+        }
 

         //For backwards compatibility

-        if ($type == '0')

-            $type = 'info';

-        elseif ($type == '1')

-            $type = 'help';

+        if ($type == '0') {
+                    $type = 'info';
+        } elseif ($type == '1') {
+                    $type = 'help';
+        }
 

         // If info or help with no javascript, show only text

         if (empty(Globals::$conf->use_javascript_ajax)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

-            else {

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            } else {

                 $alt = $htmltext;

                 $htmltext = '';

             }

@@ -588,27 +612,30 @@ 
 

         // If info or help with smartphone, show only text (tooltip hover can't works)

         if (!empty(Globals::$conf->dol_no_mouse_hover) && empty($tooltiptrigger)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            }
         }

         // If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone)

         if (!empty(Globals::$conf->dol_no_mouse_hover) && !empty($tooltiptrigger)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

-        }

-

-        if ($type == 'info')

-            $img = img_help(0, $alt);

-        elseif ($type == 'help')

-            $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

-        elseif ($type == 'superadmin')

-            $img = img_picto($alt, 'redstar');

-        elseif ($type == 'admin')

-            $img = img_picto($alt, 'star');

-        elseif ($type == 'warning')

-            $img = img_warning($alt);

-        else

-            $img = img_picto($alt, $type);

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            }
+        }

+

+        if ($type == 'info') {
+                    $img = img_help(0, $alt);
+        } elseif ($type == 'help') {
+                    $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+        } elseif ($type == 'superadmin') {
+                    $img = img_picto($alt, 'redstar');
+        } elseif ($type == 'admin') {
+                    $img = img_picto($alt, 'star');
+        } elseif ($type == 'warning') {
+                    $img = img_warning($alt);
+        } else {
+                    $img = img_picto($alt, $type);
+        }
 

         return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && !$img) ? 3 : 2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);

     }

@@ -625,8 +652,9 @@ 
     {

         global $conf, $langs, $hookmanager;

 

-        if (count($arrayofaction) == 0)

-            return;

+        if (count($arrayofaction) == 0) {
+                    return;
+        }
 

         $disabled = 0;

         $ret = '<div class="centpercent center">';

@@ -758,10 +786,11 @@ 
                     $i++;

                 }

 

-                if (empty($disablefavorites))

-                    array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);

-                else

-                    $countryArray = dol_sort_array($countryArray, 'label');

+                if (empty($disablefavorites)) {
+                                    array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+                } else {
+                                    $countryArray = dol_sort_array($countryArray, 'label');
+                }
 

                 if ($showempty) {

                     $out .= '<option value="">&nbsp;</option>' . "\n";

@@ -771,8 +800,9 @@ 
                     //if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                     $out .= '<option value="special_allnotme"' . ($selected == 'special_allnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

                     $out .= '<option value="special_eec"' . ($selected == 'special_eec' ? ' selected' : '') . '>' . $langs->trans("CountriesInEEC") . '</option>';

-                    if ($mysoc->isInEEC())

-                        $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

+                    if ($mysoc->isInEEC()) {
+                                            $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';
+                    }
                     $out .= '<option value="special_noteec"' . ($selected == 'special_noteec' ? ' selected' : '') . '>' . $langs->trans("CountriesNotInEEC") . '</option>';

                     $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                 }

@@ -783,8 +813,9 @@ 
                         continue;

                     }

 

-                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso'])

-                        $atleastonefavorite++;

+                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {
+                                            $atleastonefavorite++;
+                    }
                     if (empty($row['favorite']) && $atleastonefavorite) {

                         $atleastonefavorite = 0;

                         $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

@@ -795,18 +826,19 @@ 
                     } else {

                         $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '">';

                     }

-                    if ($row['label'])

-                        $out .= dol_trunc($row['label'], $maxlength, 'middle');

-                    else

-                        $out .= '&nbsp;';

-                    if ($row['code_iso'])

-                        $out .= ' (' . $row['code_iso'] . ')';

+                    if ($row['label']) {
+                                            $out .= dol_trunc($row['label'], $maxlength, 'middle');
+                    } else {
+                                            $out .= '&nbsp;';
+                    }
+                    if ($row['code_iso']) {
+                                            $out .= ' (' . $row['code_iso'] . ')';
+                    }
                     $out .= '</option>';

                 }

             }

             $out .= '</select>';

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

 

@@ -880,8 +912,9 @@ 
                         $out .= '<option value="' . $row['rowid'] . '">';

                     }

 

-                    if ($row['code'])

-                        $out .= $row['code'];

+                    if ($row['code']) {
+                                            $out .= $row['code'];
+                    }
 

                     $out .= '</option>';

                 }

@@ -919,24 +952,28 @@ 
 

         // If product & services are enabled or both disabled.

         if ($forceall == 1 || (empty($forceall) && !empty(Globals::$conf->product->enabled) && !empty(Globals::$conf->service->enabled)) || (empty($forceall) && empty(Globals::$conf->product->enabled) && empty(Globals::$conf->service->enabled))) {

-            if (empty($hidetext))

-                print $langs->trans("Type") . ': ';

+            if (empty($hidetext)) {
+                            print $langs->trans("Type") . ': ';
+            }
             print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

             if ($showempty) {

                 print '<option value="-1"';

-                if ($selected == -1)

-                    print ' selected';

+                if ($selected == -1) {
+                                    print ' selected';
+                }
                 print '>&nbsp;</option>';

             }

 

             print '<option value="0"';

-            if (0 == $selected)

-                print ' selected';

+            if (0 == $selected) {
+                            print ' selected';
+            }
             print '>' . $langs->trans("Product");

 

             print '<option value="1"';

-            if (1 == $selected)

-                print ' selected';

+            if (1 == $selected) {
+                            print ' selected';
+            }
             print '>' . $langs->trans("Service");

 

             print '</select>';

@@ -967,8 +1004,10 @@ 
         global $langs;

 

         $num = count($this->cache_types_fees);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -1022,23 +1061,26 @@ 
         print '<select id="select_' . $htmlname . '" class="flat" name="' . $htmlname . '">';

         if ($showempty) {

             print '<option value="-1"';

-            if ($selected == -1)

-                print ' selected';

+            if ($selected == -1) {
+                            print ' selected';
+            }
             print '>&nbsp;</option>';

         }

 

         foreach ($this->cache_types_fees as $key => $value) {

             print '<option value="' . $key . '"';

-            if ($key == $selected)

-                print ' selected';

+            if ($key == $selected) {
+                            print ' selected';
+            }
             print '>';

             print $value;

             print '</option>';

         }

 

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1101,9 +1143,9 @@ 
             $urloption = 'htmlname=' . $htmlname . '&outjson=1&filter=' . $filter . ($showtype ? '&showtype=' . $showtype : '');

             $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/societe/ajax/company.php', $urloption, Globals::$conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

-            if (empty($hidelabel))

-                print $langs->trans("RefOrLabel") . ' : ';

-            else if ($hidelabel > 1) {

+            if (empty($hidelabel)) {
+                            print $langs->trans("RefOrLabel") . ' : ';
+            } else if ($hidelabel > 1) {

                 $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

                 if ($hidelabel == 2) {

                     $out .= img_picto($langs->trans("Search"), 'search');

@@ -1150,10 +1192,11 @@ 
         $num = 0;

         $outarray = array();

 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         // Clean $filter that may contains sql conditions so sql code

         if (function_exists('testSqlAndScriptInject')) {

@@ -1171,21 +1214,26 @@ 
         }

 

         $sql .= " FROM (" . MAIN_DB_PREFIX . "societe as s";

-        if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+        if (!$user->rights->societe->client->voir && !$user->socid) {
+                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " )";

         if (Globals::$conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

             $sql .= " LEFT OUTER JOIN " . MAIN_DB_PREFIX . "c_country as dictp ON dictp.rowid=s.fk_pays";

         }

         $sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

-        if (!empty($user->socid))

-            $sql .= " AND s.rowid = " . $user->socid;

-        if ($filter)

-            $sql .= " AND (" . $filter . ")";

-        if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

-        if (!empty(Globals::$conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX))

-            $sql .= " AND s.status <> 0";

+        if (!empty($user->socid)) {
+                    $sql .= " AND s.rowid = " . $user->socid;
+        }
+        if ($filter) {
+                    $sql .= " AND (" . $filter . ")";
+        }
+        if (!$user->rights->societe->client->voir && !$user->socid) {
+                    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        }
+        if (!empty(Globals::$conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
+                    $sql .= " AND s.status <> 0";
+        }
         // Add criteria

         if ($filterkey && $filterkey != '') {

             $sql .= " AND (";

@@ -1193,16 +1241,19 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(s.nom LIKE '" . $this->db->escape($prefix . $crit) . "%')";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
             if (!empty(Globals::$conf->barcode->enabled)) {

                 $sql .= " OR s.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

             }

@@ -1228,13 +1279,15 @@ 
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

             //if (! empty(Globals::$conf->use_javascript_ajax) || $forcecombo) $textifempty='';

             if (!empty(Globals::$conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+            if ($showempty) {
+                            $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";
+            }
 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -1259,16 +1312,21 @@ 
                     }

 

                     if ($showtype) {

-                        if ($obj->client || $obj->fournisseur)

-                            $label .= ' (';

-                        if ($obj->client == 1 || $obj->client == 3)

-                            $label .= $langs->trans("Customer");

-                        if ($obj->client == 2 || $obj->client == 3)

-                            $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");

-                        if ($obj->fournisseur)

-                            $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");

-                        if ($obj->client || $obj->fournisseur)

-                            $label .= ')';

+                        if ($obj->client || $obj->fournisseur) {
+                                                    $label .= ' (';
+                        }
+                        if ($obj->client == 1 || $obj->client == 3) {
+                                                    $label .= $langs->trans("Customer");
+                        }
+                        if ($obj->client == 2 || $obj->client == 3) {
+                                                    $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");
+                        }
+                        if ($obj->fournisseur) {
+                                                    $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");
+                        }
+                        if ($obj->client || $obj->fournisseur) {
+                                                    $label .= ')';
+                        }
                     }

 

                     if (Globals::$conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

@@ -1289,20 +1347,21 @@ 
                     }

 

                     $i++;

-                    if (($i % 10) == 0)

-                        $out .= "\n";

+                    if (($i % 10) == 0) {
+                                            $out .= "\n";
+                    }
                 }

             }

             $out .= '</select>' . "\n";

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

 

         $this->result = array('nbofthirdparties' => $num);

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -1328,8 +1387,9 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";

         $sql .= " WHERE re.fk_soc = " . (int) $socid;

         $sql .= " AND re.entity = " . Globals::$conf->entity;

-        if ($filter)

-            $sql .= " AND " . $filter;

+        if ($filter) {
+                    $sql .= " AND " . $filter;
+        }
         $sql .= " ORDER BY re.description ASC";

 

         dol_syslog(get_class($this) . "::select_remises", LOG_DEBUG);

@@ -1346,18 +1406,23 @@ 
                 while ($i < $num) {

                     $obj = $this->db->fetch_object($resql);

                     $desc = dol_trunc($obj->description, 40);

-                    if (preg_match('/\(CREDIT_NOTE\)/', $desc))

-                        $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);

-                    if (preg_match('/\(DEPOSIT\)/', $desc))

-                        $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);

-                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc))

-                        $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);

-                    if (preg_match('/\(EXCESS PAID\)/', $desc))

-                        $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);

+                    if (preg_match('/\(CREDIT_NOTE\)/', $desc)) {
+                                            $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
+                    }
+                    if (preg_match('/\(DEPOSIT\)/', $desc)) {
+                                            $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+                    }
+                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) {
+                                            $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+                    }
+                    if (preg_match('/\(EXCESS PAID\)/', $desc)) {
+                                            $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+                    }
 

                     $selectstring = '';

-                    if ($selected > 0 && $selected == $obj->rowid)

-                        $selectstring = ' selected';

+                    if ($selected > 0 && $selected == $obj->rowid) {
+                                            $selectstring = ' selected';
+                    }
 

                     $disabled = '';

                     if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue) {

@@ -1367,8 +1432,9 @@ 
 

                     if (!empty(Globals::$conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source)) {

                         $tmpfac = new Facture($this->db);

-                        if ($tmpfac->fetch($obj->fk_facture_source) > 0)

-                            $desc = $desc . ' - ' . $tmpfac->ref;

+                        if ($tmpfac->fetch($obj->fk_facture_source) > 0) {
+                                                    $desc = $desc . ' - ' . $tmpfac->ref;
+                        }
                     }

 

                     print '<option value="' . $obj->rowid . '"' . $selectstring . $disabled . '>' . $desc . ' (' . price($obj->amount_ht) . ' ' . $langs->trans("HT") . ' - ' . price($obj->amount_ttc) . ' ' . $langs->trans("TTC") . ')</option>';

@@ -1377,8 +1443,7 @@ 
             }

             print '</select>';

             return $qualifiedlines;

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

             return -1;

         }

@@ -1441,13 +1506,15 @@ 
 

         $langs->load('companies');

 

-        if (empty($htmlid))

-            $htmlid = $htmlname;

+        if (empty($htmlid)) {
+                    $htmlid = $htmlname;
+        }
 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
         $out = '';

 

         if (!is_object($hookmanager)) {

@@ -1457,16 +1524,20 @@ 
 

         // We search third parties

         $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";

-        if ($showsoc > 0)

-            $sql .= " , s.nom as company";

+        if ($showsoc > 0) {
+                    $sql .= " , s.nom as company";
+        }
         $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp";

-        if ($showsoc > 0)

-            $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";

+        if ($showsoc > 0) {
+                    $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";
+        }
         $sql .= " WHERE sp.entity IN (" . getEntity('socpeople') . ")";

-        if ($socid > 0 || $socid == -1)

-            $sql .= " AND sp.fk_soc=" . $socid;

-        if (!empty(Globals::$conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX))

-            $sql .= " AND sp.statut <> 0";

+        if ($socid > 0 || $socid == -1) {
+                    $sql .= " AND sp.fk_soc=" . $socid;
+        }
+        if (!empty(Globals::$conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) {
+                    $sql .= " AND sp.statut <> 0";
+        }
         $sql .= " ORDER BY sp.lastname ASC";

 

         dol_syslog(get_class($this) . "::select_contacts", LOG_DEBUG);

@@ -1479,12 +1550,15 @@ 
                 $out .= ajax_combobox($htmlid, $events, Globals::$conf->global->CONTACT_USE_SEARCH_TO_SELECT);

             }

 

-            if ($htmlname != 'none' || $options_only)

-                $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';

-            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';

-            if ($showempty == 2)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';

+            if ($htmlname != 'none' || $options_only) {
+                            $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';
+            }
+            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
+                            $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';
+            }
+            if ($showempty == 2) {
+                            $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';
+            }
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -1500,49 +1574,56 @@ 
                     if ($obj->statut == 1) {

                         if ($htmlname != 'none') {

                             $disabled = 0;

-                            if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude))

-                                $disabled = 1;

-                            if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto))

-                                $disabled = 1;

+                            if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) {
+                                                            $disabled = 1;
+                            }
+                            if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {
+                                                            $disabled = 1;
+                            }
                             if (!empty($selected) && in_array($obj->rowid, $selected)) {

                                 $out .= '<option value="' . $obj->rowid . '"';

-                                if ($disabled)

-                                    $out .= ' disabled';

+                                if ($disabled) {
+                                                                    $out .= ' disabled';
+                                }
                                 $out .= ' selected>';

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                                 $out .= '</option>';

-                            }

-                            else {

+                            } else {

                                 $out .= '<option value="' . $obj->rowid . '"';

-                                if ($disabled)

-                                    $out .= ' disabled';

+                                if ($disabled) {
+                                                                    $out .= ' disabled';
+                                }
                                 $out .= '>';

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                                 $out .= '</option>';

                             }

-                        }

-                        else {

+                        } else {

                             if (in_array($obj->rowid, $selected)) {

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                             }

                         }

                     }

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $out .= '<option value="-1"' . (($showempty == 2 || $multiple) ? '' : ' selected') . ' disabled>';

                 $out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

                 $out .= '</option>';

@@ -1623,24 +1704,27 @@ 
         global $conf, $user, $langs;

 

         // If no preselected user defined, we take current user

-        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty(Globals::$conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE))

-            $selected = $user->id;

+        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty(Globals::$conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) {
+                    $selected = $user->id;
+        }
 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         $excludeUsers = null;

         $includeUsers = null;

 

         // Permettre l'exclusion d'utilisateurs

-        if (is_array($exclude))

-            $excludeUsers = implode(",", $exclude);

+        if (is_array($exclude)) {
+                    $excludeUsers = implode(",", $exclude);
+        }
         // Permettre l'inclusion d'utilisateurs

-        if (is_array($include))

-            $includeUsers = implode(",", $include);

-        else if ($include == 'hierarchy') {

+        if (is_array($include)) {
+                    $includeUsers = implode(",", $include);
+        } else if ($include == 'hierarchy') {

             // Build list includeUsers to have only hierarchy

             $includeUsers = implode(",", $user->getAllChildIds(0));

         } else if ($include == 'hierarchyme') {

@@ -1659,12 +1743,12 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

         if (!empty(Globals::$conf->multicompany->enabled) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=u.entity";

-            if ($force_entity)

-                $sql .= " WHERE u.entity IN (0," . $force_entity . ")";

-            else

-                $sql .= " WHERE u.entity IS NOT NULL";

-        }

-        else {

+            if ($force_entity) {
+                            $sql .= " WHERE u.entity IN (0," . $force_entity . ")";
+            } else {
+                            $sql .= " WHERE u.entity IS NOT NULL";
+            }
+        } else {

             if (!empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ug";

                 $sql .= " ON ug.fk_user = u.rowid";

@@ -1673,16 +1757,21 @@ 
                 $sql .= " WHERE u.entity IN (0," . Globals::$conf->entity . ")";

             }

         }

-        if (!empty($user->societe_id))

-            $sql .= " AND u.fk_soc = " . $user->societe_id;

-        if (is_array($exclude) && $excludeUsers)

-            $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";

-        if ($includeUsers)

-            $sql .= " AND u.rowid IN (" . $includeUsers . ")";

-        if (!empty(Globals::$conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive)

-            $sql .= " AND u.statut <> 0";

-        if (!empty($morefilter))

-            $sql .= " " . $morefilter;

+        if (!empty($user->societe_id)) {
+                    $sql .= " AND u.fk_soc = " . $user->societe_id;
+        }
+        if (is_array($exclude) && $excludeUsers) {
+                    $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";
+        }
+        if ($includeUsers) {
+                    $sql .= " AND u.rowid IN (" . $includeUsers . ")";
+        }
+        if (!empty(Globals::$conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) {
+                    $sql .= " AND u.statut <> 0";
+        }
+        if (!empty($morefilter)) {
+                    $sql .= " " . $morefilter;
+        }
 

         if (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

             $sql .= " ORDER BY u.firstname ASC";

@@ -1702,10 +1791,12 @@ 
 

                 // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined

                 $out .= '<select class="flat' . ($morecss ? ' minwidth100 ' . $morecss : ' minwidth200') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

-                if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

-                if ($show_every)

-                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";

+                if ($show_empty && !$multiple) {
+                                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+                }
+                if ($show_every) {
+                                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";
+                }
 

                 $userstatic = new User($this->db);

 

@@ -1717,19 +1808,21 @@ 
                     $userstatic->firstname = $obj->firstname;

 

                     $disableline = '';

-                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

-                        $disableline = ($enableonlytext ? $enableonlytext : '1');

+                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+                                            $disableline = ($enableonlytext ? $enableonlytext : '1');
+                    }
 

                     if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected) )) {

                         $out .= '<option value="' . $obj->rowid . '"';

-                        if ($disableline)

-                            $out .= ' disabled';

+                        if ($disableline) {
+                                                    $out .= ' disabled';
+                        }
                         $out .= ' selected>';

-                    }

-                    else {

+                    } else {

                         $out .= '<option value="' . $obj->rowid . '"';

-                        if ($disableline)

-                            $out .= ' disabled';

+                        if ($disableline) {
+                                                    $out .= ' disabled';
+                        }
                         $out .= '>';

                     }

 

@@ -1783,8 +1876,9 @@ 
             AlDolUtils::dol_print_error($this->db);

         }

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -1836,15 +1930,18 @@ 
         }

         $nbassignetouser = count($assignedtouser);

 

-        if ($nbassignetouser && $action != 'view')

-            $out .= '<br>';

-        if ($nbassignetouser)

-            $out .= '<ul class="attendees">';

+        if ($nbassignetouser && $action != 'view') {
+                    $out .= '<br>';
+        }
+        if ($nbassignetouser) {
+                    $out .= '<ul class="attendees">';
+        }
         $i = 0;

         $ownerid = 0;

         foreach ($assignedtouser as $key => $value) {

-            if ($value['id'] == $ownerid)

-                continue;

+            if ($value['id'] == $ownerid) {
+                            continue;
+            }
 

             $out .= '<li>';

             $userstatic->fetch($value['id']);

@@ -1870,8 +1967,9 @@ 
             $out .= '</li>';

             $i++;

         }

-        if ($nbassignetouser)

-            $out .= '</ul>';

+        if ($nbassignetouser) {
+                    $out .= '</ul>';
+        }
 

         //$out.='</form>';

         return $out;

@@ -2002,9 +2100,9 @@ 
                                 </script>

                                 <?php

                             }

-                            if (empty($hidelabel))

-                                print $langs->trans("RefOrLabel") . ' : ';

-                            else if ($hidelabel > 1) {

+                            if (empty($hidelabel)) {
+                                                            print $langs->trans("RefOrLabel") . ' : ';
+                            } else if ($hidelabel > 1) {

                                 $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

                                 if ($hidelabel == 2) {

                                     print img_picto($langs->trans("Search"), 'search');

@@ -2095,13 +2193,15 @@ 
         // Price by quantity

         if (!empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {

             $sql .= ", (SELECT pp.rowid FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid";

-            if ($price_level >= 1 && !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+            if ($price_level >= 1 && !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+                            $sql .= " AND price_level=" . $price_level;
+            }
             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_rowid";

             $sql .= ", (SELECT pp.price_by_qty FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

-            if ($price_level >= 1 && !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+            if ($price_level >= 1 && !empty(Globals::$conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+                            $sql .= " AND price_level=" . $price_level;
+            }
             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_by_qty";

             $selectFields .= ", price_rowid, price_by_qty";

@@ -2143,14 +2243,15 @@ 
             $sql .= " AND p.finished = " . $finished;

         } elseif ($finished == 1) {

             $sql .= " AND p.finished = " . $finished;

-            if ($status >= 0)

-                $sql .= " AND p.tosell = " . $status;

-        }

-        elseif ($status >= 0) {

+            if ($status >= 0) {
+                            $sql .= " AND p.tosell = " . $status;
+            }
+        } elseif ($status >= 0) {

             $sql .= " AND p.tosell = " . $status;

         }

-        if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $filtertype;

+        if (strval($filtertype) != '') {
+                    $sql .= " AND p.fk_product_type=" . $filtertype;
+        }
         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2158,28 +2259,35 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(p.ref LIKE '" . $db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $db->escape($prefix . $crit) . "%'";

-                if (!empty(Globals::$conf->global->MAIN_MULTILANGS))

-                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {
+                                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";
+                }
                 if (!empty(Globals::$conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {

                     $sql .= " OR p.description LIKE '" . $db->escape($prefix . $crit) . "%'";

-                    if (!empty(Globals::$conf->global->MAIN_MULTILANGS))

-                        $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {
+                                            $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";
+                    }
                 }

-                if (!empty(Globals::$conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))

-                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";

+                if (!empty(Globals::$conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+                                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";
+                }
                 $sql .= ")";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

-            if (!empty(Globals::$conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
+            if (!empty(Globals::$conf->barcode->enabled)) {
+                            $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";
+            }
             $sql .= ')';

         }

         if (count($warehouseStatusArray)) {

@@ -2218,13 +2326,15 @@ 
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

             //if (! empty(Globals::$conf->use_javascript_ajax) || $forcecombo) $textifempty='';

             if (!empty(Globals::$conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="0" selected>' . $textifempty . '</option>';

+            if ($showempty) {
+                            $out .= '<option value="0" selected>' . $textifempty . '</option>';
+            }
 

             $i = 0;

             while ($num && $i < $num) {

@@ -2298,11 +2408,11 @@ 
 

             $this->db->free($result);

 

-            if (empty($outputmode))

-                return $out;

+            if (empty($outputmode)) {
+                            return $out;
+            }
             return $outarray;

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($db);

         }

     }

@@ -2339,10 +2449,12 @@ 
         $maxlengtharticle = (empty(Globals::$conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : Globals::$conf->global->PRODUCT_MAX_LENGTH_COMBO);

 

         $label = $objp->label;

-        if (!empty($objp->label_translated))

-            $label = $objp->label_translated;

-        if (!empty($filterkey) && $filterkey != '')

-            $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+        if (!empty($objp->label_translated)) {
+                    $label = $objp->label_translated;
+        }
+        if (!empty($filterkey) && $filterkey != '') {
+                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);
+        }
 

         $outkey = $objp->rowid;

         $outref = $objp->ref;

@@ -2360,23 +2472,27 @@ 
             $opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';

         }

         if (!empty(Globals::$conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock)) {

-            if ($objp->stock > 0)

-                $opt .= ' class="product_line_stock_ok"';

-            else if ($objp->stock <= 0)

-                $opt .= ' class="product_line_stock_too_low"';

+            if ($objp->stock > 0) {
+                            $opt .= ' class="product_line_stock_ok"';
+            } else if ($objp->stock <= 0) {
+                            $opt .= ' class="product_line_stock_too_low"';
+            }
         }

         $opt .= '>';

         $opt .= $objp->ref;

-        if ($outbarcode)

-            $opt .= ' (' . $outbarcode . ')';

+        if ($outbarcode) {
+                    $opt .= ' (' . $outbarcode . ')';
+        }
         $opt .= ' - ' . dol_trunc($label, $maxlengtharticle);

 

         $objRef = $objp->ref;

-        if (!empty($filterkey) && $filterkey != '')

-            $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+        if (!empty($filterkey) && $filterkey != '') {
+                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);
+        }
         $outval .= $objRef;

-        if ($outbarcode)

-            $outval .= ' (' . $outbarcode . ')';

+        if ($outbarcode) {
+                    $outval .= ' (' . $outbarcode . ')';
+        }
         $outval .= ' - ' . dol_trunc($label, $maxlengtharticle);

 

         $found = 0;

@@ -2575,15 +2691,18 @@ 
         $sql .= " pfp.supplier_reputation";

         $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

-        if ($socid)

-            $sql .= " AND pfp.fk_soc = " . $socid;

+        if ($socid) {
+                    $sql .= " AND pfp.fk_soc = " . $socid;
+        }
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

         $sql .= " WHERE p.entity IN (" . getEntity('product') . ")";

         $sql .= " AND p.tobuy = 1";

-        if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);

-        if (!empty($filtre))

-            $sql .= " " . $filtre;

+        if (strval($filtertype) != '') {
+                    $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);
+        }
+        if (!empty($filtre)) {
+                    $sql .= " " . $filtre;
+        }
         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2591,18 +2710,22 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%')";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

-            if (!empty(Globals::$conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
+            if (!empty(Globals::$conf->barcode->enabled)) {
+                            $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";
+            }
             $sql .= ')';

         }

         $sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";

@@ -2619,18 +2742,21 @@ 
 

             //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax

             $out .= '<select class="flat maxwidthonsmartphone" id="' . $htmlname . '" name="' . $htmlname . '">';

-            if (!$selected)

-                $out .= '<option value="0" selected>&nbsp;</option>';

-            else

-                $out .= '<option value="0">&nbsp;</option>';

+            if (!$selected) {
+                            $out .= '<option value="0" selected>&nbsp;</option>';
+            } else {
+                            $out .= '<option value="0">&nbsp;</option>';
+            }
 

             $i = 0;

             while ($i < $num) {

                 $objp = $this->db->fetch_object($result);

 

                 $outkey = $objp->idprodfournprice;                                                    // id in table of price

-                if (!$outkey && $alsoproductwithnosupplierprice)

-                    $outkey = 'idprod_' . $objp->rowid;   // id of product

+                if (!$outkey && $alsoproductwithnosupplierprice) {
+                                    $outkey = 'idprod_' . $objp->rowid;
+                }
+                // id of product

 

                 $outref = $objp->ref;

                 $outval = '';

@@ -2641,32 +2767,39 @@ 
                 $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

                 $opt = '<option value="' . $outkey . '"';

-                if ($selected && $selected == $objp->idprodfournprice)

-                    $opt .= ' selected';

-                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice))

-                    $opt .= ' disabled';

+                if ($selected && $selected == $objp->idprodfournprice) {
+                                    $opt .= ' selected';
+                }
+                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
+                                    $opt .= ' disabled';
+                }
                 if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {

                     $opt .= ' pbq="' . $objp->idprodfournprice . '" data-pbq="' . $objp->idprodfournprice . '" data-pbqqty="' . $objp->quantity . '" data-pbqpercent="' . $objp->remise_percent . '"';

                 }

                 $opt .= '>';

 

                 $objRef = $objp->ref;

-                if ($filterkey && $filterkey != '')

-                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);
+                }
                 $objRefFourn = $objp->ref_fourn;

-                if ($filterkey && $filterkey != '')

-                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);
+                }
                 $label = $objp->label;

-                if ($filterkey && $filterkey != '')

-                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);
+                }
 

                 $opt .= $objp->ref;

-                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $opt .= ' (' . $objp->ref_fourn . ')';

+                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
+                                    $opt .= ' (' . $objp->ref_fourn . ')';
+                }
                 $opt .= ' - ';

                 $outval .= $objRef;

-                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $outval .= ' (' . $objRefFourn . ')';

+                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
+                                    $outval .= ' (' . $objRefFourn . ')';
+                }
                 $outval .= ' - ';

                 $opt .= dol_trunc($label, 72) . ' - ';

                 $outval .= dol_trunc($label, 72) . ' - ';

@@ -2760,11 +2893,11 @@ 
             include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

-            if (empty($outputmode))

-                return $out;

+            if (empty($outputmode)) {
+                            return $out;
+            }
             return $outarray;

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

     }

@@ -2853,8 +2986,9 @@ 
                         $opt .= " - ";

                         $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, Globals::$conf->currency) . "/" . $langs->trans("Unit");

                     }

-                    if ($objp->duration)

-                        $opt .= " - " . $objp->duration;

+                    if ($objp->duration) {
+                                            $opt .= " - " . $objp->duration;
+                    }
                     $opt .= "</option>\n";

 

                     $form .= $opt;

@@ -2865,8 +2999,7 @@ 
             $form .= '</select>';

             $this->db->free($result);

             return $form;

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

     }

@@ -2894,8 +3027,9 @@ 
         $resql = $this->db->query($sql);

         if ($resql) {

             print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-            if ($showempty)

-                print '<option value="0">&nbsp;</option>';

+            if ($showempty) {
+                            print '<option value="0">&nbsp;</option>';
+            }
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -2929,8 +3063,10 @@ 
         global $langs;

 

         $num = count($this->cache_conditions_paiements);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -2975,8 +3111,10 @@ 
         global $langs;

 

         $num = count($this->cache_availability);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -3027,8 +3165,9 @@ 
         dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

 

         print '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0">&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0">&nbsp;</option>';
+        }
         foreach ($this->cache_availability as $id => $arrayavailability) {

             if ($selected == $id) {

                 print '<option value="' . $id . '" selected>';

@@ -3039,8 +3178,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     /**

@@ -3053,8 +3193,10 @@ 
         global $langs;

 

         $num = count($this->cache_demand_reason);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         $sql = "SELECT rowid, code, label";

         $sql .= " FROM " . MAIN_DB_PREFIX . 'c_input_reason';

@@ -3070,10 +3212,14 @@ 
 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

                 $label = ($obj->label != '-' ? $obj->label : '');

-                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code))

-                    $label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work

-                if ($langs->trans($obj->code) != $obj->code)

-                    $label = $langs->trans($obj->code);                // So translation key SRC_XXX will work

+                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code)) {
+                                    $label = $langs->trans("DemandReasonType" . $obj->code);
+                }
+                // So translation key DemandReasonTypeSRC_XXX will work

+                if ($langs->trans($obj->code) != $obj->code) {
+                                    $label = $langs->trans($obj->code);
+                }
+                // So translation key SRC_XXX will work

 

                 $tmparray[$obj->rowid]['id'] = $obj->rowid;

                 $tmparray[$obj->rowid]['code'] = $obj->code;

@@ -3085,8 +3231,7 @@ 
 

             unset($tmparray);

             return $num;

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

             return -1;

         }

@@ -3109,11 +3254,13 @@ 
         $this->loadCacheInputReason();

 

         print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';
+        }
         foreach ($this->cache_demand_reason as $id => $arraydemandreason) {

-            if ($arraydemandreason['code'] == $exclude)

-                continue;

+            if ($arraydemandreason['code'] == $exclude) {
+                            continue;
+            }
 

             if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {

                 print '<option value="' . $arraydemandreason['id'] . '" selected>';

@@ -3125,8 +3272,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -3141,8 +3289,10 @@ 
         global $langs;

 

         $num = count($this->cache_types_paiements);

-        if ($num > 0)

-            return $num;    // Cache already loaded

+        if ($num > 0) {
+                    return $num;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -3203,12 +3353,14 @@ 
         $this->load_cache_conditions_paiements();

 

         // Set default value if not already set by caller

-        if (empty($selected) && !empty(Globals::$conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID))

-            $selected = Globals::$conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

+        if (empty($selected) && !empty(Globals::$conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) {
+                    $selected = Globals::$conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+        }
 

         print '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0">&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0">&nbsp;</option>';
+        }
         foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {

             if ($selected == $id) {

                 print '<option value="' . $id . '" selected>';

@@ -3219,8 +3371,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin && empty($noinfoadmin))

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin && empty($noinfoadmin)) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -3246,59 +3399,68 @@ 
         dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);

 

         $filterarray = array();

-        if ($filtertype == 'CRDT')

-            $filterarray = array(0, 2, 3);

-        elseif ($filtertype == 'DBIT')

-            $filterarray = array(1, 2, 3);

-        elseif ($filtertype != '' && $filtertype != '-1')

-            $filterarray = explode(',', $filtertype);

+        if ($filtertype == 'CRDT') {
+                    $filterarray = array(0, 2, 3);
+        } elseif ($filtertype == 'DBIT') {
+                    $filterarray = array(1, 2, 3);
+        } elseif ($filtertype != '' && $filtertype != '-1') {
+                    $filterarray = explode(',', $filtertype);
+        }
 

         $this->load_cache_types_paiements();

 

         print '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-        if ($empty)

-            print '<option value="">&nbsp;</option>';

+        if ($empty) {
+                    print '<option value="">&nbsp;</option>';
+        }
         foreach ($this->cache_types_paiements as $id => $arraytypes) {

             // If not good status

-            if ($active >= 0 && $arraytypes['active'] != $active)

-                continue;

+            if ($active >= 0 && $arraytypes['active'] != $active) {
+                            continue;
+            }
 

             // On passe si on a demande de filtrer sur des modes de paiments particuliers

-            if (count($filterarray) && !in_array($arraytypes['type'], $filterarray))

-                continue;

+            if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {
+                            continue;
+            }
 

             // We discard empty line if showempty is on because an empty line has already been output.

-            if ($empty && empty($arraytypes['code']))

-                continue;

-

-            if ($format == 0)

-                print '<option value="' . $id . '"';

-            elseif ($format == 1)

-                print '<option value="' . $arraytypes['code'] . '"';

-            elseif ($format == 2)

-                print '<option value="' . $arraytypes['code'] . '"';

-            elseif ($format == 3)

-                print '<option value="' . $id . '"';

+            if ($empty && empty($arraytypes['code'])) {
+                            continue;
+            }
+

+            if ($format == 0) {
+                            print '<option value="' . $id . '"';
+            } elseif ($format == 1) {
+                            print '<option value="' . $arraytypes['code'] . '"';
+            } elseif ($format == 2) {
+                            print '<option value="' . $arraytypes['code'] . '"';
+            } elseif ($format == 3) {
+                            print '<option value="' . $id . '"';
+            }
             // Si selected est text, on compare avec code, sinon avec id

-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code'])

-                print ' selected';

-            elseif ($selected == $id)

-                print ' selected';

+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {
+                            print ' selected';
+            } elseif ($selected == $id) {
+                            print ' selected';
+            }
             print '>';

-            if ($format == 0)

-                $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-            elseif ($format == 1)

-                $value = $arraytypes['code'];

-            elseif ($format == 2)

-                $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-            elseif ($format == 3)

-                $value = $arraytypes['code'];

+            if ($format == 0) {
+                            $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            } elseif ($format == 1) {
+                            $value = $arraytypes['code'];
+            } elseif ($format == 2) {
+                            $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            } elseif ($format == 3) {
+                            $value = $arraytypes['code'];
+            }
             print $value ? $value : '&nbsp;';

             print '</option>';

         }

         print '</select>';

-        if ($user->admin && !$noadmininfo)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin && !$noadmininfo) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     /**

@@ -3352,8 +3514,9 @@ 
         $sql = "SELECT rowid, code, libelle as label";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_shipment_mode";

         $sql .= " WHERE active > 0";

-        if ($filtre)

-            $sql .= " AND " . $filtre;

+        if ($filtre) {
+                    $sql .= " AND " . $filtre;
+        }
         $sql .= " ORDER BY libelle ASC";

 

         dol_syslog(get_class($this) . "::selectShippingMode", LOG_DEBUG);

@@ -3378,8 +3541,9 @@ 
                     $i++;

                 }

                 print "</select>";

-                if ($user->admin)

-                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                if ($user->admin) {
+                                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                }
             } else {

                 print $langs->trans("NoShippingMethodDefined");

             }

@@ -3492,8 +3656,9 @@ 
 

         $resql = $this->db->query($sql);

         if ($resql && $this->db->num_rows($resql) > 0) {

-            if ($showempty)

-                $return .= '<option value="none"></option>';

+            if ($showempty) {
+                            $return .= '<option value="none"></option>';
+            }
 

             while ($res = $this->db->fetch_object($resql)) {

                 $unitLabel = $res->label;

@@ -3536,10 +3701,12 @@ 
         $sql = "SELECT rowid, label, bank, clos as status, currency_code";

         $sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";

         $sql .= " WHERE entity IN (" . getEntity('bank_account') . ")";

-        if ($statut != 2)

-            $sql .= " AND clos = '" . $statut . "'";

-        if ($filtre)

-            $sql .= " AND " . $filtre;

+        if ($statut != 2) {
+                    $sql .= " AND clos = '" . $statut . "'";
+        }
+        if ($filtre) {
+                    $sql .= " AND " . $filtre;
+        }
         $sql .= " ORDER BY label";

 

         dol_syslog(get_class($this) . "::select_comptes", LOG_DEBUG);

@@ -3561,23 +3728,24 @@ 
                         print '<option value="' . $obj->rowid . '">';

                     }

                     print trim($obj->label);

-                    if ($showcurrency)

-                        print ' (' . $obj->currency_code . ')';

-                    if ($statut == 2 && $obj->status == 1)

-                        print ' (' . $langs->trans("Closed") . ')';

+                    if ($showcurrency) {
+                                            print ' (' . $obj->currency_code . ')';
+                    }
+                    if ($statut == 2 && $obj->status == 1) {
+                                            print ' (' . $langs->trans("Closed") . ')';
+                    }
                     print '</option>';

                     $i++;

                 }

                 print "</select>";

+            } else {

+                if ($statut == 0) {
+                                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';
+                } else {
+                                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';
+                }
             }

-            else {

-                if ($statut == 0)

-                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';

-                else

-                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';

-            }

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

 

@@ -3601,8 +3769,9 @@ 
             print '<input type="hidden" name="action" value="setbankaccount">';

             print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

             $nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);

-            if ($nbaccountfound > 0)

-                print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            if ($nbaccountfound > 0) {
+                            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+            }
             print '</form>';

         } else {

 

@@ -3612,8 +3781,9 @@ 
                 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

                 $bankstatic = new Account($this->db);

                 $result = $bankstatic->fetch($selected);

-                if ($result)

-                    print $bankstatic->getNomUrl(1);

+                if ($result) {
+                                    print $bankstatic->getNomUrl(1);
+                }
             } else {

                 print "&nbsp;";

             }

@@ -3659,15 +3829,16 @@ 
                 $i = 0;

                 while ($i < $num) {

                     $objp = $this->db->fetch_object($result);

-                    if ($objp)

-                        $cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label);

+                    if ($objp) {
+                                            $cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label);
+                    }
                     $i++;

                 }

                 $this->db->free($result);

-            } else

-                AlDolUtils::dol_print_error($this->db);

-        }

-        else {

+            } else {
+                            AlDolUtils::dol_print_error($this->db);
+            }
+        } else {

             $cat = new Categorie($this->db);

             $cate_arbo = $cat->get_full_arbo($type, $excludeafterid);

         }

@@ -3675,9 +3846,9 @@ 
         $output = '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

         $outarray = array();

         if (is_array($cate_arbo)) {

-            if (!count($cate_arbo))

-                $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';

-            else {

+            if (!count($cate_arbo)) {
+                            $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';
+            } else {

                 $output .= '<option value="-1">&nbsp;</option>';

                 foreach ($cate_arbo as $key => $value) {

                     if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1)) {

@@ -3694,8 +3865,9 @@ 
         $output .= '</select>';

         $output .= "\n";

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $output;

     }

 

@@ -3759,8 +3931,9 @@ 
 

         // Clean parameters

         $newselectedchoice = empty($selectedchoice) ? "no" : $selectedchoice;

-        if (Globals::$conf->browser->layout == 'phone')

-            $width = '95%';

+        if (Globals::$conf->browser->layout == 'phone') {
+                    $width = '95%';
+        }
 

         if (is_array($formquestion) && !empty($formquestion)) {

             // First add hidden fields and value

@@ -3774,8 +3947,9 @@ 
 

             // Now add questions

             $more .= '<table class="paddingtopbottomonly" width="100%">' . "\n";

-            if (!empty($formquestion['text']))

-                $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";

+            if (!empty($formquestion['text'])) {
+                            $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";
+            }
             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

                     $size = (!empty($input['size']) ? ' size="' . $input['size'] . '"' : '');

@@ -3788,42 +3962,45 @@ 
                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="password" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

                     } elseif ($input['type'] == 'select') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

-                        if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td class="tdtop" align="left">';

+                        if (!empty($input['label'])) {
+                                                    $more .= $input['label'] . '</td><td class="tdtop" align="left">';
+                        }
                         $more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);

                         $more .= '</td></tr>' . "\n";

-                    }

-                    elseif ($input['type'] == 'checkbox') {

+                    } elseif ($input['type'] == 'checkbox') {

                         $more .= '<tr>';

                         $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . ' </td><td align="left">';

                         $more .= '<input type="checkbox" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $moreattr;

-                        if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0')

-                            $more .= ' checked';

-                        if (is_bool($input['value']) && $input['value'])

-                            $more .= ' checked';

-                        if (isset($input['disabled']))

-                            $more .= ' disabled';

+                        if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') {
+                                                    $more .= ' checked';
+                        }
+                        if (is_bool($input['value']) && $input['value']) {
+                                                    $more .= ' checked';
+                        }
+                        if (isset($input['disabled'])) {
+                                                    $more .= ' disabled';
+                        }
                         $more .= ' /></td>';

                         $more .= '</tr>' . "\n";

-                    }

-                    elseif ($input['type'] == 'radio') {

+                    } elseif ($input['type'] == 'radio') {

                         $i = 0;

                         foreach ($input['values'] as $selkey => $selval) {

                             $more .= '<tr>';

-                            if ($i == 0)

-                                $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

-                            else

-                                $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';

+                            if ($i == 0) {
+                                                            $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';
+                            } else {
+                                                            $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';
+                            }
                             $more .= '<td><input type="radio" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . $selkey . '"' . $moreattr;

-                            if ($input['disabled'])

-                                $more .= ' disabled';

+                            if ($input['disabled']) {
+                                                            $more .= ' disabled';
+                            }
                             $more .= ' /> ';

                             $more .= $selval;

                             $more .= '</td></tr>' . "\n";

                             $i++;

                         }

-                    }

-                    elseif ($input['type'] == 'date') {

+                    } elseif ($input['type'] == 'date') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

                         $more .= '<td align="left">';

                         $more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);

@@ -3835,13 +4012,12 @@ 
                         $formquestion[] = array('name' => $input['name'] . 'min');

                     } elseif ($input['type'] == 'other') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

-                        if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td align="left">';

+                        if (!empty($input['label'])) {
+                                                    $more .= $input['label'] . '</td><td align="left">';
+                        }
                         $more .= $input['value'];

                         $more .= '</td></tr>' . "\n";

-                    }

-

-                    elseif ($input['type'] == 'onecolumn') {

+                    } elseif ($input['type'] == 'onecolumn') {

                         $more .= '<tr><td colspan="2" align="left">';

                         $more .= $input['value'];

                         $more .= '</td></tr>' . "\n";

@@ -3854,10 +4030,12 @@ 
         // JQUI method dialog is broken with jmobile, we use standard HTML.

         // Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx

         // See page product/card.php for example

-        if (!empty(Globals::$conf->dol_use_jmobile))

-            $useajax = 0;

-        if (empty(Globals::$conf->use_javascript_ajax))

-            $useajax = 0;

+        if (!empty(Globals::$conf->dol_use_jmobile)) {
+                    $useajax = 0;
+        }
+        if (empty(Globals::$conf->use_javascript_ajax)) {
+                    $useajax = 0;
+        }
 

         if ($useajax) {

             $autoOpen = true;

@@ -3875,10 +4053,12 @@ 
             if (is_array($formquestion)) {

                 foreach ($formquestion as $key => $input) {

                     //print "xx ".$key." rr ".is_array($input)."<br>\n";

-                    if (is_array($input) && isset($input['name']))

-                        array_push($inputok, $input['name']);

-                    if (isset($input['inputko']) && $input['inputko'] == 1)

-                        array_push($inputko, $input['name']);

+                    if (is_array($input) && isset($input['name'])) {
+                                            array_push($inputok, $input['name']);
+                    }
+                    if (isset($input['inputko']) && $input['inputko'] == 1) {
+                                            array_push($inputko, $input['name']);
+                    }
                 }

             }

             // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template

@@ -3963,12 +4143,14 @@ 
         } else {

             $formconfirm .= "\n<!-- begin formconfirm page=" . $page . " -->\n";

 

-            if (empty($disableformtag))

-                $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";
+            }
 

             $formconfirm .= '<input type="hidden" name="action" value="' . $action . '">' . "\n";

-            if (empty($disableformtag))

-                $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
+            }
 

             $formconfirm .= '<table width="100%" class="valid">' . "\n";

 

@@ -3993,8 +4175,9 @@ 
 

             $formconfirm .= '</table>' . "\n";

 

-            if (empty($disableformtag))

-                $formconfirm .= "</form>\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= "</form>\n";
+            }
             $formconfirm .= '<br>';

 

             $formconfirm .= "<!-- end formconfirm -->\n";

@@ -4184,14 +4367,16 @@ 
             $ret .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

             $ret .= '</tr></table></form>';

         } else {

-            if ($displayhour)

-                $ret .= AlDolUtils::dol_print_date($selected, 'dayhour');

-            else

-                $ret .= AlDolUtils::dol_print_date($selected, 'day');

+            if ($displayhour) {
+                            $ret .= AlDolUtils::dol_print_date($selected, 'dayhour');
+            } else {
+                            $ret .= AlDolUtils::dol_print_date($selected, 'day');
+            }
         }

 

-        if (empty($nooutput))

-            print $ret;

+        if (empty($nooutput)) {
+                    print $ret;
+        }
         return $ret;

     }

 

@@ -4317,10 +4502,10 @@ 
         } else {

             if (!empty($rate)) {

                 print price($rate, 1, $langs, 1, 0);

-                if ($currency && $rate != 1)

-                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . Globals::$conf->currency . ')';

-            }

-            else {

+                if ($currency && $rate != 1) {
+                                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . Globals::$conf->currency . ')';
+                }
+            } else {

                 print 1;

             }

         }

@@ -4353,34 +4538,41 @@ 
             print '<div class="inline-block">';

             if (!empty($discount_type)) {

                 if (!empty(Globals::$conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

-                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice

-                    else

-                        $translationKey = 'HasCreditNoteFromSupplier';

-                }

-                else {

-                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';

-                    else

-                        $translationKey = 'HasCreditNoteFromSupplier';

+                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") {
+                                            $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    }
+                    // If we want deposit to be substracted to payments only and not to total of final invoice

+                    else {
+                                            $translationKey = 'HasCreditNoteFromSupplier';
+                    }
+                } else {

+                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+                                            $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    } else {
+                                            $translationKey = 'HasCreditNoteFromSupplier';
+                    }
                 }

             } else {

                 if (!empty(Globals::$conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

-                    if (!$filter || $filter == "fk_facture_source IS NULL")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice

-                    else

-                        $translationKey = 'CompanyHasCreditNote';

-                }

-                else {

-                    if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';

-                    else

-                        $translationKey = 'CompanyHasCreditNote';

+                    if (!$filter || $filter == "fk_facture_source IS NULL") {
+                                            $translationKey = 'CompanyHasAbsoluteDiscount';
+                    }
+                    // If we want deposit to be substracted to payments only and not to total of final invoice

+                    else {
+                                            $translationKey = 'CompanyHasCreditNote';
+                    }
+                } else {

+                    if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+                                            $translationKey = 'CompanyHasAbsoluteDiscount';
+                    } else {
+                                            $translationKey = 'CompanyHasCreditNote';
+                    }
                 }

             }

             print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, Globals::$conf->currency));

-            if (empty($hidelist))

-                print ': ';

+            if (empty($hidelist)) {
+                            print ': ';
+            }
             print '</div>';

             if (empty($hidelist)) {

                 print '<div class="inline-block" style="padding-right: 10px">';

@@ -4390,15 +4582,18 @@ 
                 } else {

                     $newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available

                 }

-                if ($filter)

-                    $newfilter .= ' AND (' . $filter . ')';

+                if ($filter) {
+                                    $newfilter .= ' AND (' . $filter . ')';
+                }
                 $nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);

                 if ($nbqualifiedlines > 0) {

                     print ' &nbsp; <input type="submit" class="button" value="' . AlDolUtils::dol_escape_htmltag($langs->trans("UseLine")) . '"';

-                    if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

-                    if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                    if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+                                            print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';
+                    }
+                    if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+                                            print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';
+                    }
 

                     print '>';

                 }

@@ -4499,10 +4694,11 @@ 
             }

         }

 

-        if ($nooutput)

-            return $out;

-        else

-            print $out;

+        if ($nooutput) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -4535,8 +4731,10 @@ 
 

         $out = '';

 

-        if ($selected == 'euro' || $selected == 'euros')

-            $selected = 'EUR';   // Pour compatibilite

+        if ($selected == 'euro' || $selected == 'euros') {
+                    $selected = 'EUR';
+        }
+        // Pour compatibilite

 

         $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="' . $htmlname . '" id="' . $htmlname . '">';

         foreach ($langs->cache_currencies as $code_iso => $currency) {

@@ -4550,8 +4748,9 @@ 
             $out .= '</option>';

         }

         $out .= '</select>';

-        if ($user->admin)

-            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
 

         // Make select dynamic

         include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

@@ -4580,14 +4779,16 @@ 
         $sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";

         $resql = $db->query($sql);

         if ($resql) {

-            while ($obj = $db->fetch_object($resql))

-                $TCurrency[$obj->code] = $obj->code;

+            while ($obj = $db->fetch_object($resql)) {
+                            $TCurrency[$obj->code] = $obj->code;
+            }
         }

 

         $out = '';

         $out .= '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

-        if ($useempty)

-            $out .= '<option value=""></option>';

+        if ($useempty) {
+                    $out .= '<option value=""></option>';
+        }
         // If company current currency not in table, we add it into list. Should always be available.

         if (!in_array(Globals::$conf->currency, $TCurrency)) {

             $TCurrency[Globals::$conf->currency] = Globals::$conf->currency;

@@ -4595,10 +4796,11 @@ 
         if (count($TCurrency) > 0) {

             foreach ($langs->cache_currencies as $code_iso => $currency) {

                 if (isset($TCurrency[$code_iso])) {

-                    if (!empty($selected) && $selected == $code_iso)

-                        $out .= '<option value="' . $code_iso . '" selected="selected">';

-                    else

-                        $out .= '<option value="' . $code_iso . '">';

+                    if (!empty($selected) && $selected == $code_iso) {
+                                            $out .= '<option value="' . $code_iso . '" selected="selected">';
+                    } else {
+                                            $out .= '<option value="' . $code_iso . '">';
+                    }
 

                     $out .= $currency['label'];

                     $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

@@ -4628,8 +4830,10 @@ 
         global $langs;

 

         $num = count($this->cache_vatrates);

-        if ($num > 0)

-            return $num;    // Cache already loaded

+        if ($num > 0) {
+                    return $num;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -4658,20 +4862,23 @@ 
                     $this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : '');   // Label must contains only 0-9 , . % or *

                     $this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

                     $positiverates = '';

-                    if ($obj->taux)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->taux;

-                    if ($obj->localtax1)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;

-                    if ($obj->localtax2)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;

-                    if (empty($positiverates))

-                        $positiverates = '0';

+                    if ($obj->taux) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->taux;
+                    }
+                    if ($obj->localtax1) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;
+                    }
+                    if ($obj->localtax2) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;
+                    }
+                    if (empty($positiverates)) {
+                                            $positiverates = '0';
+                    }
                     $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

                 }

 

                 return $num;

-            }

-            else {

+            } else {

                 $this->error = '<font class="error">' . $langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code) . '</font>';

                 return -1;

             }

@@ -4808,16 +5015,19 @@ 
             $selectedfound = false;

             foreach ($this->cache_vatrates as $rate) {

                 // Keep only 0 if seller is not subject to VAT

-                if ($disabled && $rate['txtva'] != 0)

-                    continue;

+                if ($disabled && $rate['txtva'] != 0) {
+                                    continue;
+                }
 

                 // Define key to use into select list

                 $key = $rate['txtva'];

                 $key .= $rate['nprtva'] ? '*' : '';

-                if ($mode > 0 && $rate['code'])

-                    $key .= ' (' . $rate['code'] . ')';

-                if ($mode < 0)

-                    $key = $rate['rowid'];

+                if ($mode > 0 && $rate['code']) {
+                                    $key .= ' (' . $rate['code'] . ')';
+                }
+                if ($mode < 0) {
+                                    $key = $rate['rowid'];
+                }
 

                 $return .= '<option value="' . $key . '"';

                 if (!$selectedfound) {

@@ -4844,10 +5054,10 @@ 
                 $return .= '</option>';

             }

 

-            if (!$options_only)

-                $return .= '</select>';

-        }

-        else {

+            if (!$options_only) {
+                            $return .= '</select>';
+            }
+        } else {

             $return .= $this->error;

         }

 

@@ -4919,12 +5129,15 @@ 
 

         $retstring = '';

 

-        if ($prefix == '')

-            $prefix = 're';

-        if ($h == '')

-            $h = 0;

-        if ($m == '')

-            $m = 0;

+        if ($prefix == '') {
+                    $prefix = 're';
+        }
+        if ($h == '') {
+                    $h = 0;
+        }
+        if ($m == '') {
+                    $m = 0;
+        }
         $emptydate = 0;

         $emptyhours = 0;

         if ($empty == 1) {

@@ -4973,10 +5186,12 @@ 
             $smin = !isset(Globals::$conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : Globals::$conf->global->MAIN_DEFAULT_DATE_MIN;

             $ssec = !isset(Globals::$conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : Globals::$conf->global->MAIN_DEFAULT_DATE_SEC;

         }

-        if ($h == 3)

-            $shour = '';

-        if ($m == 3)

-            $smin = '';

+        if ($h == 3) {
+                    $shour = '';
+        }
+        if ($m == 3) {
+                    $smin = '';
+        }
 

         // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'

         $usecalendar = 'combo';

@@ -5008,14 +5223,14 @@ 
                         $base = DOL_URL_ROOT . '/core/';

                         $retstring .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';

                         $retstring .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';

-                    } else

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                    } else {
+                                            $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
+                    }
 

                     $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

                     $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

                     $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

-                }

-                elseif ($usecalendar == 'jquery') {

+                } elseif ($usecalendar == 'jquery') {

                     if (!$disabled) {

                         // Output javascript for datepicker

                         $retstring .= "<script type='text/javascript'>";

@@ -5125,32 +5340,38 @@ 
             }

         }

 

-        if ($d && $h)

-            $retstring .= ($h == 2 ? '<br>' : ' ');

+        if ($d && $h) {
+                    $retstring .= ($h == 2 ? '<br>' : ' ');
+        }
 

         if ($h) {

             // Show hour

             $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'hour' : '') . '" id="' . $prefix . 'hour" name="' . $prefix . 'hour">';

-            if ($emptyhours)

-                $retstring .= '<option value="-1">&nbsp;</option>';

+            if ($emptyhours) {
+                            $retstring .= '<option value="-1">&nbsp;</option>';
+            }
             for ($hour = 0; $hour < 24; $hour++) {

-                if (strlen($hour) < 2)

-                    $hour = "0" . $hour;

+                if (strlen($hour) < 2) {
+                                    $hour = "0" . $hour;
+                }
                 $retstring .= '<option value="' . $hour . '"' . (($hour == $shour) ? ' selected' : '') . '>' . $hour . (empty(Globals::$conf->dol_optimize_smallscreen) ? '' : 'H') . '</option>';

             }

             $retstring .= '</select>';

-            if ($m && empty(Globals::$conf->dol_optimize_smallscreen))

-                $retstring .= ":";

+            if ($m && empty(Globals::$conf->dol_optimize_smallscreen)) {
+                            $retstring .= ":";
+            }
         }

 

         if ($m) {

             // Show minutes

             $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'min' : '') . '" id="' . $prefix . 'min" name="' . $prefix . 'min">';

-            if ($emptyhours)

-                $retstring .= '<option value="-1">&nbsp;</option>';

+            if ($emptyhours) {
+                            $retstring .= '<option value="-1">&nbsp;</option>';
+            }
             for ($min = 0; $min < 60; $min++) {

-                if (strlen($min) < 2)

-                    $min = "0" . $min;

+                if (strlen($min) < 2) {
+                                    $min = "0" . $min;
+                }
                 $retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty(Globals::$conf->dol_optimize_smallscreen) ? '' : '') . '</option>';

             }

             $retstring .= '</select>';

@@ -5181,21 +5402,25 @@ 
               } */

             // Update the hour part

             if ($h) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';

                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . AlDolUtils::dol_print_date(dol_now(), '%H') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // Update the minute part

             if ($m) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';

                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . AlDolUtils::dol_print_date(dol_now(), '%M') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty(Globals::$conf->dol_optimize_smallscreen)) {

@@ -5217,19 +5442,23 @@ 
             $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . AlDolUtils::dol_print_date(dol_now(), '%Y') . '\');';

             // Update the hour part

             if ($h) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . AlDolUtils::dol_print_date(dol_now(), '%H') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // Update the minute part

             if ($m) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . AlDolUtils::dol_print_date(dol_now(), '%M') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty(Globals::$conf->dol_optimize_smallscreen)) {

@@ -5292,41 +5521,46 @@ 
             $retstring .= "</select>";

         } elseif ($typehour == 'text' || $typehour == 'textselect') {

             $retstring .= '<input placeholder="' . $langs->trans('HourShort') . '" type="number" min="0" size="1" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputhour" value="' . (($hourSelected != '') ? ((int) $hourSelected) : '') . '">';

-        } else

-            return 'BadValueForParameterTypeHour';

+        } else {
+                    return 'BadValueForParameterTypeHour';
+        }
 

-        if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('HourShort');

-        else

-            $retstring .= '<span class="hideonsmartphone">:</span>';

+        if ($typehour != 'text') {
+                    $retstring .= ' ' . $langs->trans('HourShort');
+        } else {
+                    $retstring .= '<span class="hideonsmartphone">:</span>';
+        }
 

         // Minutes

-        if ($minunderhours)

-            $retstring .= '<br>';

-        else

-            $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

+        if ($minunderhours) {
+                    $retstring .= '<br>';
+        } else {
+                    $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+        }
 

         if ($typehour == 'select' || $typehour == 'textselect') {

             $retstring .= '<select class="flat" id="select_' . $prefix . 'min" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . '>';

             for ($min = 0; $min <= 55; $min = $min + 5) {

                 $retstring .= '<option value="' . $min . '"';

-                if ($minSelected == $min)

-                    $retstring .= ' selected';

+                if ($minSelected == $min) {
+                                    $retstring .= ' selected';
+                }
                 $retstring .= '>' . $min . '</option>';

             }

             $retstring .= "</select>";

-        }

-        elseif ($typehour == 'text') {

+        } elseif ($typehour == 'text') {

             $retstring .= '<input placeholder="' . $langs->trans('MinuteShort') . '" type="number" min="0" size="1" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputminute" value="' . (($minSelected != '') ? ((int) $minSelected) : '') . '">';

         }

 

-        if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('MinuteShort');

+        if ($typehour != 'text') {
+                    $retstring .= ' ' . $langs->trans('MinuteShort');
+        }
 

         //$retstring.="&nbsp;";

 

-        if (!empty($nooutput))

-            return $retstring;

+        if (!empty($nooutput)) {
+                    return $retstring;
+        }
 

         print $retstring;

         return;

@@ -5369,8 +5603,9 @@ 
         }

 

         $prefixforautocompletemode = $objecttmp->element;

-        if ($prefixforautocompletemode == 'societe')

-            $prefixforautocompletemode = 'company';

+        if ($prefixforautocompletemode == 'societe') {
+                    $prefixforautocompletemode = 'company';
+        }
         $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         dol_syslog(get_class($this) . "::selectForForms", LOG_DEBUG);

@@ -5385,11 +5620,11 @@ 
             // Activate the auto complete using ajax call.

             $out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, Globals::$conf->global->$confkeyforautocompletemode, 0, array());

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

-            if ($placeholder)

-                $placeholder = ' placeholder="' . $placeholder . '"';

+            if ($placeholder) {
+                            $placeholder = ' placeholder="' . $placeholder . '"';
+            }
             $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $preselectedvalue . '"' . $placeholder . ' />';

-        }

-        else {

+        } else {

             // Immediate load of all database

             $out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo);

         }

@@ -5419,19 +5654,22 @@ 
         global $conf, $langs, $user;

 

         $prefixforautocompletemode = $objecttmp->element;

-        if ($prefixforautocompletemode == 'societe')

-            $prefixforautocompletemode = 'company';

+        if ($prefixforautocompletemode == 'societe') {
+                    $prefixforautocompletemode = 'company';
+        }
         $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         $fieldstoshow = 't.ref';

         if (!empty($objecttmp->fields)) { // For object that declare it, it is better to use declared fields ( like societe, contact, ...)

             $tmpfieldstoshow = '';

             foreach ($objecttmp->fields as $key => $val) {

-                if ($val['showoncombobox'])

-                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;

+                if ($val['showoncombobox']) {
+                                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;
+                }
             }

-            if ($tmpfieldstoshow)

-                $fieldstoshow = $tmpfieldstoshow;

+            if ($tmpfieldstoshow) {
+                            $fieldstoshow = $tmpfieldstoshow;
+            }
         }

 

         $out = '';

@@ -5441,23 +5679,28 @@ 
 

         // Search data

         $sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . MAIN_DB_PREFIX . $objecttmp->table_element . " as t";

-        if ($objecttmp->ismultientitymanaged == 2)

-            if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+        if ($objecttmp->ismultientitymanaged == 2) {
+                    if (!$user->rights->societe->client->voir && !$user->societe_id)

+                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " WHERE 1=1";

-        if (!empty($objecttmp->ismultientitymanaged))

-            $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";

+        if (!empty($objecttmp->ismultientitymanaged)) {
+                    $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";
+        }
         if ($objecttmp->ismultientitymanaged == 1 && !empty($user->societe_id)) {

-            if ($objecttmp->element == 'societe')

-                $sql .= " AND t.rowid = " . $user->societe_id;

-            else

-                $sql .= " AND t.fk_soc = " . $user->societe_id;

-        }

-        if ($searchkey != '')

-            $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

-        if ($objecttmp->ismultientitymanaged == 2)

-            if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+            if ($objecttmp->element == 'societe') {
+                            $sql .= " AND t.rowid = " . $user->societe_id;
+            } else {
+                            $sql .= " AND t.fk_soc = " . $user->societe_id;
+            }
+        }

+        if ($searchkey != '') {
+                    $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
+        }
+        if ($objecttmp->ismultientitymanaged == 2) {
+                    if (!$user->rights->societe->client->voir && !$user->societe_id)

+                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        }
         $sql .= $this->db->order($fieldstoshow, "ASC");

         //$sql.=$this->db->plimit($limit, 0);

         // Build output string

@@ -5476,13 +5719,15 @@ 
 

             //if (! empty(Globals::$conf->use_javascript_ajax) || $forcecombo) $textifempty='';

             if (!empty(Globals::$conf->global->$confkeyforautocompletemode)) {

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+            if ($showempty) {
+                            $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";
+            }
 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -5506,21 +5751,22 @@ 
                     }

 

                     $i++;

-                    if (($i % 10) == 0)

-                        $out .= "\n";

+                    if (($i % 10) == 0) {
+                                            $out .= "\n";
+                    }
                 }

             }

 

             $out .= '</select>' . "\n";

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

 

         $this->result = array('nbofelement' => $num);

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -5556,8 +5802,9 @@ 
         //if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;

         $jsbeautify = 1;

 

-        if ($value_as_key)

-            $array = array_combine($array, $array);

+        if ($value_as_key) {
+                    $array = array_combine($array, $array);
+        }
 

         $out = '';

 

@@ -5577,10 +5824,13 @@ 
 

         if ($show_empty) {

             $textforempty = ' ';

-            if (!empty(Globals::$conf->use_javascript_ajax))

-                $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-            if (!is_numeric($show_empty))

-                $textforempty = $show_empty;

+            if (!empty(Globals::$conf->use_javascript_ajax)) {
+                            $textforempty = '&nbsp;';
+            }
+            // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

+            if (!is_numeric($show_empty)) {
+                            $textforempty = $show_empty;
+            }
             $out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

         }

 

@@ -5593,10 +5843,11 @@ 
             }

 

             // Sort

-            if ($sort == 'ASC')

-                asort($array);

-            elseif ($sort == 'DESC')

-                arsort($array);

+            if ($sort == 'ASC') {
+                            asort($array);
+            } elseif ($sort == 'DESC') {
+                            arsort($array);
+            }
 

             foreach ($array as $key => $value) {

                 $disabled = '';

@@ -5610,26 +5861,31 @@ 
                 }

 

                 if ($key_in_label) {

-                    if (empty($nohtmlescape))

-                        $selectOptionValue = AlDolUtils::dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));

-                    else

-                        $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);

-                }

-                else {

-                    if (empty($nohtmlescape))

-                        $selectOptionValue = AlDolUtils::dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);

-                    else

-                        $selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;

-                    if ($value == '' || $value == '-')

-                        $selectOptionValue = '&nbsp;';

+                    if (empty($nohtmlescape)) {
+                                            $selectOptionValue = AlDolUtils::dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));
+                    } else {
+                                            $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);
+                    }
+                } else {

+                    if (empty($nohtmlescape)) {
+                                            $selectOptionValue = AlDolUtils::dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);
+                    } else {
+                                            $selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;
+                    }
+                    if ($value == '' || $value == '-') {
+                                            $selectOptionValue = '&nbsp;';
+                    }
                 }

 

                 $out .= '<option value="' . $key . '"';

                 $out .= $style . $disabled;

-                if ($id != '' && $id == $key && !$disabled)

-                    $out .= ' selected';  // To preselect a value

-                if ($nohtmlescape)

-                    $out .= ' data-html="' . AlDolUtils::dol_escape_htmltag($selectOptionValue) . '"';

+                if ($id != '' && $id == $key && !$disabled) {
+                                    $out .= ' selected';
+                }
+                // To preselect a value

+                if ($nohtmlescape) {
+                                    $out .= ' data-html="' . AlDolUtils::dol_escape_htmltag($selectOptionValue) . '"';
+                }
                 $out .= '>';

                 //var_dump($selectOptionValue);

                 $out .= $selectOptionValue;

@@ -5665,8 +5921,9 @@ 
         global $delayedhtmlcontent;

 

         // TODO Use an internal dolibarr component instead of select2

-        if (empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

-            return '';

+        if (empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+                    return '';
+        }
 

         $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"></select>';

 

@@ -5765,8 +6022,9 @@ 
         global $delayedhtmlcontent;

 

         // TODO Use an internal dolibarr component instead of select2

-        if (empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

-            return '';

+        if (empty(Globals::$conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+                    return '';
+        }
 

         $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"><option></option></select>';

 

@@ -5936,8 +6194,9 @@ 
 

         $out .= '<select id="' . $htmlname . '" class="multiselect' . ($morecss ? ' ' . $morecss : '') . '" multiple name="' . $htmlname . '[]"' . ($moreattrib ? ' ' . $moreattrib : '') . ($width ? ' style="width: ' . (preg_match('/%/', $width) ? $width : $width . 'px') . '"' : '') . '>' . "\n";

         if (is_array($array) && !empty($array)) {

-            if ($value_as_key)

-                $array = array_combine($array, $array);

+            if ($value_as_key) {
+                            $array = array_combine($array, $array);
+            }
 

             if (!empty($array)) {

                 foreach ($array as $key => $value) {

@@ -5972,8 +6231,9 @@ 
     {

         global $conf, $langs, $user;

 

-        if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-            return '';

+        if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                    return '';
+        }
 

         $tmpvar = "MAIN_SELECTEDFIELDS_" . $varpage;

         if (!empty($user->conf->$tmpvar)) {

@@ -5981,10 +6241,11 @@ 
             foreach ($array as $key => $val) {

                 //var_dump($key);

                 //var_dump($tmparray);

-                if (in_array($key, $tmparray))

-                    $array[$key]['checked'] = 1;

-                else

-                    $array[$key]['checked'] = 0;

+                if (in_array($key, $tmparray)) {
+                                    $array[$key]['checked'] = 1;
+                } else {
+                                    $array[$key]['checked'] = 0;
+                }
             }

         }

         //var_dump($array);

@@ -6150,40 +6411,47 @@ 
                 // To work with non standard path

                 if ($objecttype == 'facture') {

                     $tplpath = 'compta/' . $element;

-                    if (empty(Globals::$conf->facture->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'facturerec') {

+                    if (empty(Globals::$conf->facture->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'facturerec') {

                     $tplpath = 'compta/facture';

                     $tplname = 'linkedobjectblockForRec';

-                    if (empty(Globals::$conf->facture->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'propal') {

+                    if (empty(Globals::$conf->facture->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'propal') {

                     $tplpath = 'comm/' . $element;

-                    if (empty(Globals::$conf->propal->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'supplier_proposal') {

-                    if (empty(Globals::$conf->supplier_proposal->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'shipping' || $objecttype == 'shipment') {

+                    if (empty(Globals::$conf->propal->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'supplier_proposal') {

+                    if (empty(Globals::$conf->supplier_proposal->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'shipping' || $objecttype == 'shipment') {

                     $tplpath = 'expedition';

-                    if (empty(Globals::$conf->expedition->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'reception') {

+                    if (empty(Globals::$conf->expedition->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'reception') {

                     $tplpath = 'reception';

-                    if (empty(Globals::$conf->reception->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'delivery') {

+                    if (empty(Globals::$conf->reception->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'delivery') {

                     $tplpath = 'livraison';

-                    if (empty(Globals::$conf->expedition->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'invoice_supplier') {

+                    if (empty(Globals::$conf->expedition->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'invoice_supplier') {

                     $tplpath = 'fourn/facture';

                 } else if ($objecttype == 'order_supplier') {

                     $tplpath = 'fourn/commande';

@@ -6247,20 +6515,23 @@ 
         $linktoelemlist = '';

         $listofidcompanytoscan = '';

 

-        if (!is_object($object->thirdparty))

-            $object->fetch_thirdparty();

+        if (!is_object($object->thirdparty)) {
+                    $object->fetch_thirdparty();
+        }
 

         $possiblelinks = array();

         if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {

             $listofidcompanytoscan = $object->thirdparty->id;

-            if (($object->thirdparty->parent > 0) && !empty(Globals::$conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO))

-                $listofidcompanytoscan .= ',' . $object->thirdparty->parent;

+            if (($object->thirdparty->parent > 0) && !empty(Globals::$conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) {
+                            $listofidcompanytoscan .= ',' . $object->thirdparty->parent;
+            }
             if (($object->fk_project > 0) && !empty(Globals::$conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO)) {

                 include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

                 $tmpproject = new Project($this->db);

                 $tmpproject->fetch($object->fk_project);

-                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id))

-                    $listofidcompanytoscan .= ',' . $tmpproject->socid;

+                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) {
+                                    $listofidcompanytoscan .= ',' . $tmpproject->socid;
+                }
                 unset($tmpproject);

             }

 

@@ -6296,8 +6567,9 @@ 
         foreach ($possiblelinks as $key => $possiblelink) {

             $num = 0;

 

-            if (empty($possiblelink['enabled']))

-                continue;

+            if (empty($possiblelink['enabled'])) {
+                            continue;
+            }
 

             if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {

                 print '<div id="' . $key . 'list"' . (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '') . '>';

@@ -6348,11 +6620,13 @@ 
                 }

 

                 //$linktoelem.=($linktoelem?' &nbsp; ':'');

-                if ($num > 0)

-                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';

+                if ($num > 0) {
+                                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';
+                }
                 //else $linktoelem.=$langs->trans($possiblelink['label']);

-                else

-                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';

+                else {
+                                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';
+                }
             }

         }

 

@@ -6410,8 +6684,9 @@ 
         $disabled = ($disabled ? ' disabled' : '');

 

         $resultyesno = '<select class="flat width75" id="' . $htmlname . '" name="' . $htmlname . '"' . $disabled . '>' . "\n";

-        if ($useempty)

-            $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+        if ($useempty) {
+                    $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+        }
         if (("$value" == 'yes') || ($value == 1)) {

             $resultyesno .= '<option value="' . $yes . '" selected>' . $langs->trans("Yes") . '</option>' . "\n";

             $resultyesno .= '<option value="' . $no . '">' . $langs->trans("No") . '</option>' . "\n";

@@ -6490,10 +6765,12 @@ 
         global $langs, $conf, $hookmanager;

 

         $ret = '';

-        if (empty($fieldid))

-            $fieldid = 'rowid';

-        if (empty($fieldref))

-            $fieldref = 'ref';

+        if (empty($fieldid)) {
+                    $fieldid = 'rowid';
+        }
+        if (empty($fieldref)) {
+                    $fieldref = 'ref';
+        }
 

         // Add where from hooks

         if (is_object($hookmanager)) {

@@ -6532,8 +6809,9 @@ 
         $ret .= '<!-- Start banner content --><div style="vertical-align: middle">';

 

         // Right part of banner

-        if ($morehtmlright)

-            $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';

+        if ($morehtmlright) {
+                    $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';
+        }
 

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '<div class="pagination paginationref"><ul class="right">';

@@ -6551,26 +6829,32 @@ 
 

         $parameters = array();

         $reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object);    // Note that $action and $object may have been modified by hook

-        if (empty($reshook))

-            $morehtmlstatus .= $hookmanager->resPrint;

-        else

-            $morehtmlstatus = $hookmanager->resPrint;

-        if ($morehtmlstatus)

-            $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';

+        if (empty($reshook)) {
+                    $morehtmlstatus .= $hookmanager->resPrint;
+        } else {
+                    $morehtmlstatus = $hookmanager->resPrint;
+        }
+        if ($morehtmlstatus) {
+                    $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';
+        }
 

         $parameters = array();

         $reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook

-        if (empty($reshook))

-            $morehtmlref .= $hookmanager->resPrint;

-        elseif ($reshook > 0)

-            $morehtmlref = $hookmanager->resPrint;

+        if (empty($reshook)) {
+                    $morehtmlref .= $hookmanager->resPrint;
+        } elseif ($reshook > 0) {
+                    $morehtmlref = $hookmanager->resPrint;
+        }
 

         // Left part of banner

         if ($morehtmlleft) {

-            if (Globals::$conf->browser->layout == 'phone')

-                $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';    // class="center" to have photo in middle

-            else

-                $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';
+            }
+            // class="center" to have photo in middle

+            else {
+                            $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';
+            }
         }

 

         //if (Globals::$conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';

@@ -6595,8 +6879,9 @@ 
             $ret .= $object->label;

         } else if ($object->element == 'ecm_directories') {

             $ret .= '';

-        } else if ($fieldref != 'none')

-            $ret .= dol_htmlentities($object->$fieldref);

+        } else if ($fieldref != 'none') {
+                    $ret .= dol_htmlentities($object->$fieldref);
+        }
 

 

         if ($morehtmlref) {

@@ -6621,15 +6906,17 @@ 
         global $conf;

 

         //Check if barcode is filled in the card

-        if (empty($object->barcode))

-            return '';

+        if (empty($object->barcode)) {
+                    return '';
+        }
 

         // Complete object if not complete

         if (empty($object->barcode_type_code) || empty($object->barcode_type_coder)) {

             $result = $object->fetch_barcode();

             //Check if fetch_barcode() failed

-            if ($result < 1)

-                return '<!-- ErrorFetchBarcode -->';

+            if ($result < 1) {
+                            return '<!-- ErrorFetchBarcode -->';
+            }
         }

 

         // Barcode image

@@ -6717,66 +7004,74 @@ 
                 if ($modulepart == 'memberphoto') {

                     $dir = Globals::$conf->adherent->dir_output;

                     if (!empty($object->photo)) {

-                        if ((string) $imagesize == 'mini')

-                            $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-                        else if ((string) $imagesize == 'small')

-                            $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-                        else

-                            $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

+                        if ((string) $imagesize == 'mini') {
+                                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');
+                        } else if ((string) $imagesize == 'small') {
+                                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');
+                        } else {
+                                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;
+                        }
                         $originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

                     }

-                    if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS))

-                        $altfile = $object->id . ".jpg"; // For backward compatibility

+                    if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                                            $altfile = $object->id . ".jpg";
+                    }
+                    // For backward compatibility

                     $email = $object->email;

                     $capture = 'user';

-                }

-                else {

+                } else {

                     // Generic case to show photos

                     $dir = Globals::$conf->$modulepart->dir_output;

                     if (!empty($object->photo)) {

-                        if ((string) $imagesize == 'mini')

-                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-                        else if ((string) $imagesize == 'small')

-                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-                        else

-                            $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

+                        if ((string) $imagesize == 'mini') {
+                                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');
+                        } else if ((string) $imagesize == 'small') {
+                                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');
+                        } else {
+                                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;
+                        }
                         $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

                     }

-                    if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS))

-                        $altfile = $object->id . ".jpg"; // For backward compatibility

+                    if (!empty(Globals::$conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                                            $altfile = $object->id . ".jpg";
+                    }
+                    // For backward compatibility

                     $email = $object->email;

                 }

             }

         }

-        if ($forcecapture)

-            $capture = $forcecapture;

+        if ($forcecapture) {
+                    $capture = $forcecapture;
+        }
 

         if ($dir) {

             if ($file && file_exists($dir . "/" . $file)) {

                 if ($addlinktofullsize) {

                     $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-                    if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

-                    else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                    if ($urladvanced) {
+                                            $ret .= '<a href="' . $urladvanced . '">';
+                    } else {
+                                            $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
+                    }
                 }

                 $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';

-                if ($addlinktofullsize)

-                    $ret .= '</a>';

-            }

-            else if ($altfile && file_exists($dir . "/" . $altfile)) {

+                if ($addlinktofullsize) {
+                                    $ret .= '</a>';
+                }
+            } else if ($altfile && file_exists($dir . "/" . $altfile)) {

                 if ($addlinktofullsize) {

                     $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-                    if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

-                    else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                    if ($urladvanced) {
+                                            $ret .= '<a href="' . $urladvanced . '">';
+                    } else {
+                                            $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
+                    }
                 }

                 $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo alt" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" class="' . $cssclass . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($altfile) . '&cache=' . $cache . '">';

-                if ($addlinktofullsize)

-                    $ret .= '</a>';

-            }

-            else {

+                if ($addlinktofullsize) {
+                                    $ret .= '</a>';
+                }
+            } else {

                 $nophoto = '/public/theme/common/nophoto.png';

                 if (in_array($modulepart, array('userphoto', 'contact'))) { // For module that are "physical" users

                     $nophoto = '/public/theme/common/user_anonymous.png';

@@ -6814,8 +7109,9 @@ 
                 $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"' . ($capture ? ' capture="' . $capture . '"' : '') . '></td></tr>';

                 $ret .= '</table>';

             }

-        } else

-            AlDolUtils::dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);

+        } else {
+                    AlDolUtils::dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);
+        }
 

         return $ret;

     }

@@ -6842,14 +7138,17 @@ 
         global $conf, $user, $langs;

 

         // Permettre l'exclusion de groupes

-        if (is_array($exclude))

-            $excludeGroups = implode("','", $exclude);

+        if (is_array($exclude)) {
+                    $excludeGroups = implode("','", $exclude);
+        }
         // Permettre l'inclusion de groupes

-        if (is_array($include))

-            $includeGroups = implode("','", $include);

+        if (is_array($include)) {
+                    $includeGroups = implode("','", $include);
+        }
 

-        if (!is_array($selected))

-            $selected = array($selected);

+        if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         $out = '';

 

@@ -6861,18 +7160,20 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup as ug ";

         if (!empty(Globals::$conf->multicompany->enabled) && Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=ug.entity";

-            if ($force_entity)

-                $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";

-            else

-                $sql .= " WHERE ug.entity IS NOT NULL";

-        }

-        else {

+            if ($force_entity) {
+                            $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";
+            } else {
+                            $sql .= " WHERE ug.entity IS NOT NULL";
+            }
+        } else {

             $sql .= " WHERE ug.entity IN (0," . Globals::$conf->entity . ")";

         }

-        if (is_array($exclude) && $excludeGroups)

-            $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";

-        if (is_array($include) && $includeGroups)

-            $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";

+        if (is_array($exclude) && $excludeGroups) {
+                    $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";
+        }
+        if (is_array($include) && $includeGroups) {
+                    $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";
+        }
         $sql .= " ORDER BY ug.nom ASC";

 

         dol_syslog(get_class($this) . "::select_dolgroups", LOG_DEBUG);

@@ -6887,18 +7188,21 @@ 
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

-                if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                if ($show_empty && !$multiple) {
+                                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+                }
 

                 while ($i < $num) {

                     $obj = $this->db->fetch_object($resql);

                     $disableline = 0;

-                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

-                        $disableline = 1;

+                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+                                            $disableline = 1;
+                    }
 

                     $out .= '<option value="' . $obj->rowid . '"';

-                    if ($disableline)

-                        $out .= ' disabled';

+                    if ($disableline) {
+                                            $out .= ' disabled';
+                    }
                     if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected) )) {

                         $out .= ' selected';

                     }

@@ -6913,13 +7217,13 @@ 
                     $i++;

                 }

             } else {

-                if ($show_empty)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";

+                if ($show_empty) {
+                                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";
+                }
                 $out .= '<option value="" disabled>' . $langs->trans("NoUserGroupDefined") . '</option>';

             }

             $out .= '</select>';

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($this->db);

         }

 

@@ -6955,8 +7259,9 @@ 
         global $conf, $langs;

 

         $out = '';

-        if (!empty(Globals::$conf->use_javascript_ajax))

-            $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';

+        if (!empty(Globals::$conf->use_javascript_ajax)) {
+                    $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
+        }
         $out .= '<script type="text/javascript">

             $(document).ready(function() {

             	$("#checkallactions").click(function() {

@@ -6969,8 +7274,9 @@ 
                         console.log("We uncheck all");

                 		$(".' . $cssclass . '").prop(\'checked\', false).trigger(\'change\');

                     }' . "\n";

-        if ($calljsfunction)

-            $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

+        if ($calljsfunction) {
+                    $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+        }
         $out .= '         });

 

         	$(".checkforselect").change(function() {

@@ -7018,22 +7324,25 @@ 
 

         $sql = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_cat WHERE active = 1';

         $sql .= ' AND entity IN (0,' . getEntity('exp_tax_cat') . ')';

-        if (!empty($excludeid))

-            $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';

+        if (!empty($excludeid)) {
+                    $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';
+        }
         $sql .= ' ORDER BY label';

 

         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0">&nbsp;</option>';

+            if ($useempty) {
+                            $out .= '<option value="0">&nbsp;</option>';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . $langs->trans($obj->label) . '</option>';

             }

             $out .= '</select>';

-            if (!empty($htmlname) && $user->admin)

-                $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+            if (!empty($htmlname) && $user->admin) {
+                            $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+            }
 

             if (!empty($target)) {

                 $sql = "SELECT c.id FROM " . MAIN_DB_PREFIX . "c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

@@ -7046,8 +7355,9 @@ 
 								$("select[name=' . $target . ']").on("change", function() {

 									var current_val = $(this).val();

 									if (current_val == ' . $obj->id . ') {';

-                        if (!empty($default_selected) || !empty($selected))

-                            $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';

+                        if (!empty($default_selected) || !empty($selected)) {
+                                                    $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';
+                        }
 

                         $out .= '

 										$("select[name=' . $htmlname . ']").change();

@@ -7083,8 +7393,7 @@ 
                     }

                 }

             }

-        }

-        else {

+        } else {

             AlDolUtils::dol_print_error($db);

         }

 

@@ -7109,8 +7418,9 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0"></option>';

+            if ($useempty) {
+                            $out .= '<option value="0"></option>';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . price($obj->range_ik, 0, $langs, 1, 0) . '</option>';

@@ -7143,14 +7453,17 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0"></option>';

-            if ($allchoice)

-                $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';

+            if ($useempty) {
+                            $out .= '<option value="0"></option>';
+            }
+            if ($allchoice) {
+                            $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';
+            }
 

             $field = 'code';

-            if ($useid)

-                $field = 'id';

+            if ($useid) {
+                            $field = 'id';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $key = $langs->trans($obj->code);

dolibarr/htdocs/adherents/index.php

Braces +13 added lines, -10 removed lines

@@ -124,12 +124,14 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';

 

 

-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo

+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+    // This is useless due to the global search combo

 {

     // Search contact/address

     if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)

     {

-    	$listofsearchfields['search_member']=array('text'=>'Member');

+    	$listofsearchfields['search_member']=array('text'=>'Member');
+}
     }

 

     if (count($listofsearchfields))

@@ -140,10 +142,14 @@ 
     	$i=0;

     	foreach($listofsearchfields as $key => $value)

     	{

-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';

+    		if ($i == 0) {
+    		    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		}
     		print '<tr class="oddeven">';

     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';

-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';

+    		if ($i == 0) {
+    		    print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		}
     		print '</tr>';

     		$i++;

     	}

@@ -315,8 +321,7 @@ 
 				$staticmember->fk_soc = $obj->fk_soc;

 				$staticmember->fetch_thirdparty();

 				$staticmember->name=$staticmember->thirdparty->name;

-			}

-			else

+			} else

 			{

 				$staticmember->name=$obj->company;

 			}

@@ -333,8 +338,7 @@ 
 	}

 	print "</table></div>";

 	print "<br>";

-}

-else

+} else

 {

 	dol_print_error($db);

 }

@@ -395,8 +399,7 @@ 
 	}

 	print "</table></div>";

 	print "<br>";

-}

-else

+} else

 {

 	dol_print_error($db);

 }

dolibarr/htdocs/categories/index.php

Braces +12 added lines, -15 removed lines

@@ -35,13 +35,18 @@ 
 // Load translation files required by the page

 $langs->load("categories");

 

-if (! $user->rights->categorie->lire) accessforbidden();

+if (! $user->rights->categorie->lire) {
+    accessforbidden();
+}
 

 $id=GETPOST('id','int');

 $type=(GETPOST('type','aZ09') ? GETPOST('type','aZ09') : Categorie::TYPE_PRODUCT);

 $catname=GETPOST('catname','alpha');

 

-if (is_numeric($type)) $type=Categorie::$MAP_ID_TO_CODE[$type];	// For backward compatibility

+if (is_numeric($type)) {
+    $type=Categorie::$MAP_ID_TO_CODE[$type];
+}
+// For backward compatibility

 

 

 /*

@@ -51,15 +56,7 @@ 
 $categstatic = new Categorie($db);

 $form = new Form($db);

 

-if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; }

-elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; }

-elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; }

-elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; }

-elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; }

-elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='bank_account'; }

-elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; }

-elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; }

-else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }

+if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; } elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; } elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; } elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; } elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; } elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='bank_account'; } elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; } elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; } else                                        { $title=$langs->trans("CategoriesArea");          $typetext='unknown'; }

 

 $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');

 $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');

@@ -138,8 +135,9 @@ 
 		print "\t</tr>\n";

 	}

 	print "</table>";

-}

-else print '&nbsp;';

+} else {
+    print '&nbsp;';
+}
 

 

 //print '</td></tr></table>';

@@ -194,8 +192,7 @@ 
 	print '<tr class="pair"><td colspan="3">';

 	tree_recur($data,$data[0],0);

 	print '</td></tr>';

-}

-else

+} else

 {

 	print '<tr class="pair">';

 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';

dolibarr/htdocs/install/index.php

Braces +3 added lines, -1 removed lines

@@ -70,5 +70,7 @@
 print '<br><br>'.$langs->trans("SomeTranslationAreUncomplete");

 

 // If there's no error, we display the next step button

-if ($err == 0) pFooter(0);

+if ($err == 0) {
+    pFooter(0);
+}
 

dolibarr/htdocs/install/check.php

Braces +40 added lines, -27 removed lines

@@ -74,9 +74,10 @@ 
     $tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);

     $browserversion = $tmp['browserversion'];

     $browsername = $tmp['browsername'];

-    if ($browsername == 'ie' && $browserversion < 7)

-        print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/warning.png" alt="Error"> ' . $langs->trans("WarningBrowserTooOld") . "<br>\n";

-}

+    if ($browsername == 'ie' && $browserversion < 7) {
+            print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/warning.png" alt="Error"> ' . $langs->trans("WarningBrowserTooOld") . "<br>\n";
+    }
+    }

 

 

 // Check PHP version

@@ -91,8 +92,9 @@ 
 } else {

     print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"> ' . $langs->trans("PHPVersion") . " " . versiontostring(versionphparray());

 }

-if (empty($force_install_nophpinfo))

-    print ' (<a href="phpinfo.php" target="_blank">' . $langs->trans("MoreInformation") . '</a>)';

+if (empty($force_install_nophpinfo)) {
+    print ' (<a href="phpinfo.php" target="_blank">' . $langs->trans("MoreInformation") . '</a>)';
+}
 print "<br>\n";

 

 

@@ -156,12 +158,15 @@ 
 if ($memmaxorig != '') {

     preg_match('/([0-9]+)([a-zA-Z]*)/i', $memmax, $reg);

     if ($reg[2]) {

-        if (strtoupper($reg[2]) == 'G')

-            $memmax = $reg[1] * 1024 * 1024 * 1024;

-        if (strtoupper($reg[2]) == 'M')

-            $memmax = $reg[1] * 1024 * 1024;

-        if (strtoupper($reg[2]) == 'K')

-            $memmax = $reg[1] * 1024;

+        if (strtoupper($reg[2]) == 'G') {
+                    $memmax = $reg[1] * 1024 * 1024 * 1024;
+        }
+        if (strtoupper($reg[2]) == 'M') {
+                    $memmax = $reg[1] * 1024 * 1024;
+        }
+        if (strtoupper($reg[2]) == 'K') {
+                    $memmax = $reg[1] * 1024;
+        }
     }

     if ($memmax >= $memrequired || $memmax == -1) {

         print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"> ' . $langs->trans("PHPMemoryOK", $memmaxorig, $memrequiredorig) . "<br>\n";

@@ -203,8 +208,9 @@ 
             @fwrite($fp, '<?php');

             @fputs($fp, "\n");

             fclose($fp);

-        } else

-            dolibarr_install_syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR);

+        } else {
+                    dolibarr_install_syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR);
+        }
     }

 

     // First install: no upgrade necessary/required

@@ -276,8 +282,9 @@ 
                         if (preg_match('/crypted:/i', $dolibarr_main_db_pass)) {

                             $dolibarr_main_db_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted

                             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);

-                        } else

-                            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);

+                        } else {
+                                                    $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+                        }
                     }

 

                     // $conf already created in inc.php

@@ -297,17 +304,20 @@ 
 

         // If database access is available, we set more variables

         if ($ok) {

-            if (empty($dolibarr_main_db_encryption))

-                $dolibarr_main_db_encryption = 0;

+            if (empty($dolibarr_main_db_encryption)) {
+                            $dolibarr_main_db_encryption = 0;
+            }
             $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;

-            if (empty($dolibarr_main_db_cryptkey))

-                $dolibarr_main_db_cryptkey = '';

+            if (empty($dolibarr_main_db_cryptkey)) {
+                            $dolibarr_main_db_cryptkey = '';
+            }
             $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;

 

             $conf->setValues($db);

             // Reset forced setup after the setValues

-            if (defined('SYSLOG_FILE'))

-                $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');

+            if (defined('SYSLOG_FILE')) {
+                            $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+            }
             $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;

 

             // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE

@@ -323,8 +333,9 @@ 
             //print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));

             print '<br>';

             print '<br>';

-        } else

-            print "<br>\n";

+        } else {
+                    print "<br>\n";
+        }
 

         print $langs->trans("InstallEasy") . " ";

         print $langs->trans("ChooseYourSetupMode");

@@ -371,10 +382,12 @@ 
         if (empty($dolibarr_main_db_host)) { // This means install process was not run

             $allowupgrade = false;

         }

-        if (defined("MAIN_NOT_INSTALLED"))

-            $allowupgrade = false;

-        if (GETPOST('allowupgrade'))

-            $allowupgrade = true;

+        if (defined("MAIN_NOT_INSTALLED")) {
+                    $allowupgrade = false;
+        }
+        if (GETPOST('allowupgrade')) {
+                    $allowupgrade = true;
+        }
         $migrationscript = array(array('from' => '3.0.0', 'to' => '3.1.0'),

             array('from' => '3.1.0', 'to' => '3.2.0'),

             array('from' => '3.2.0', 'to' => '3.3.0'),