alxarafe / alixar

Helpers/DolUtils.php

Braces +1453 added lines, -1047 removed lines

@@ -75,8 +75,9 @@ 
           if ($found) return $result;

           } */

 

-        if (isset($class::$member))

-            return $class::$member;

+        if (isset($class::$member)) {
+                    return $class::$member;
+        }
         dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

         return null;

     }

@@ -127,8 +128,9 @@ 
         } else {

             $out = '';

             $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

-            if (in_array($element, $addzero))

-                $out .= '0,';

+            if (in_array($element, $addzero)) {
+                            $out .= '0,';
+            }
             $out .= Globals::$conf->entity;

             return $out;

         }

@@ -307,32 +309,35 @@ 
     {

        // global $mysoc, $user, Globals::$conf;

 

-        if (empty($paramname))

-            return 'BadFirstParameterForDolUtils::GETPOST';

+        if (empty($paramname)) {
+                    return 'BadFirstParameterForDolUtils::GETPOST';
+        }
         if (empty($check)) {

             dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

         }

 

-        if (empty($method))

-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-        elseif ($method == 1)

-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-        elseif ($method == 2)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-        elseif ($method == 3)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-        elseif ($method == 4)

-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));

-        else

-            return 'BadThirdParameterForDolUtils::GETPOST';

+        if (empty($method)) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+        } elseif ($method == 1) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+        } elseif ($method == 2) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+        } elseif ($method == 3) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+        } elseif ($method == 4) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+        } else {
+                    return 'BadThirdParameterForDolUtils::GETPOST';
+        }
 

         if (empty($method) || $method == 3 || $method == 4) {

             $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);

             //var_dump($relativepathstring);

@@ -381,14 +386,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -415,20 +423,24 @@ 
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                             $foundintru = 0;

                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                    $foundintru = 1;

+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }

-                                            if (!$foundintru)

-                                                $qualified = 1;

+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
                                             //var_dump($defkey.'-'.$qualified);

-                                        } else

-                                            $qualified = 1;

+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 

                                         if ($qualified) {

                                             $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-                                                if ($out)

-                                                    $out .= ', ';

+                                                if ($out) {
+                                                                                                    $out .= ', ';
+                                                }
                                                 if ($paramname == 'sortfield') {

                                                     $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);

                                                 }

@@ -448,14 +460,17 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -527,8 +542,10 @@ 
                     $newout = $user->fk_user;

                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                     $newout = Globals::$conf->entity;

-                } else

-                    $newout = '';     // Key not found, we replace with empty string

+                } else {
+                                    $newout = '';
+                }
+                // Key not found, we replace with empty string

 

 

 

@@ -577,18 +594,20 @@ 
                 }

                 break;

             case 'intcomma':

-                if (preg_match('/[^0-9,-]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^0-9,-]+/i', $out)) {
+                                    $out = '';
+                }
                 break;

             case 'alpha':

                 if (!is_array($out)) {

                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'san_alpha':

@@ -597,27 +616,31 @@ 
             case 'aZ':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'array':

-                if (!is_array($out) || empty($out))

-                    $out = array();

+                if (!is_array($out) || empty($out)) {
+                                    $out = array();
+                }
                 break;

             case 'nohtml':  // Recommended for most scalar parameters

                 $out = dol_string_nohtmltag($out, 0);

@@ -627,16 +650,18 @@ 
                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                     $out = dol_string_nohtmltag($out);

                 }

                 break;

             case 'custom':

-                if (empty($filter))

-                    return 'BadFourthParameterForDolUtils::GETPOST';

+                if (empty($filter)) {
+                                    return 'BadFourthParameterForDolUtils::GETPOST';
+                }
                 $out = filter_var($out, $filter, $options);

                 break;

         }

@@ -754,11 +779,11 @@ 
                 }

             }

             if ($returnemptyifnotfound) {        // Not found into alternate dir

-                if ($returnemptyifnotfound == 1 || !file_exists($res))

-                    return '';

+                if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                                    return '';
+                }
             }

-        }

-        else {    // For an url path

+        } else {    // For an url path

 // We try to get local path of file on filesystem from url

 // Note that trying to know if a file on disk exist by forging path on disk from url

 // works only for some web server and some setup. This is bugged when

@@ -853,12 +878,14 @@ 
     static function dol_size($size, $type = '')

     {

         //global Globals::$conf;

-        if (empty(Globals::$conf->dol_optimize_smallscreen))

-            return $size;

-        if ($type == 'width' && $size > 250)

-            return 250;

-        else

-            return 10;

+        if (empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    return $size;
+        }
+        if ($type == 'width' && $size > 250) {
+                    return 250;
+        } else {
+                    return 10;
+        }
     }

 

     /**

@@ -958,9 +985,10 @@ 
     {

         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

-        if (is_array($badcharstoreplace))

-            $forbidden_chars_to_replace = $badcharstoreplace;

-//$forbidden_chars_to_remove=array("(",")");

+        if (is_array($badcharstoreplace)) {
+                    $forbidden_chars_to_replace = $badcharstoreplace;
+        }
+        //$forbidden_chars_to_remove=array("(",")");

 

         return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));

     }

@@ -996,9 +1024,9 @@ 
         if (empty($mode)) {

             $substitjs["'"] = "\\'";

             $substitjs['"'] = "\\'";

-        } else if ($mode == 1)

-            $substitjs["'"] = "\\'";

-        else if ($mode == 2) {

+        } else if ($mode == 1) {
+                    $substitjs["'"] = "\\'";
+        } else if ($mode == 2) {

             $substitjs['"'] = '\\"';

         } else if ($mode == 3) {

             $substitjs["'"] = "\\'";

@@ -1020,10 +1048,12 @@ 
     {

 // escape quotes and backslashes, newlines, etc.

         $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

-        if (!$keepb)

-            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

-        if (!$keepn)

-            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

+        if (!$keepb) {
+                    $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+        }
+        if (!$keepn) {
+                    $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+        }
         return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

@@ -1073,8 +1103,9 @@ 
     {

        // global Globals::$conf, $user;

 // If syslog module enabled

-        if (empty(Globals::$conf->syslog->enabled))

-            return;

+        if (empty(Globals::$conf->syslog->enabled)) {
+                    return;
+        }
 

         if ($ident < 0) {

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

@@ -1088,8 +1119,9 @@ 
             if (!in_array($level, $logLevels, true)) {

                 throw new Exception('Incorrect log level');

             }

-            if ($level > Globals::$conf->global->SYSLOG_LEVEL)

-                return;

+            if ($level > Globals::$conf->global->SYSLOG_LEVEL) {
+                            return;
+            }
 

             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

@@ -1114,24 +1146,30 @@ 
             );

 

 // This is when server run behind a reverse proxy

-            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

-// This is when server run normally on a server

-            else if (!empty($_SERVER["REMOTE_ADDR"]))

-                $data['ip'] = $_SERVER['REMOTE_ADDR'];

-// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-            else if (!empty($_SERVER['SERVER_ADDR']))

-                $data['ip'] = $_SERVER['SERVER_ADDR'];

-// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-            else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

-// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-            else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

-// Loop on each log handler and send output

+            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+            }
+            // This is when server run normally on a server

+            else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                            $data['ip'] = $_SERVER['REMOTE_ADDR'];
+            }
+            // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

+            else if (!empty($_SERVER['SERVER_ADDR'])) {
+                            $data['ip'] = $_SERVER['SERVER_ADDR'];
+            }
+            // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

+            else if (!empty($_SERVER['COMPUTERNAME'])) {
+                            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+            }
+            // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

+            else if (!empty($_SERVER['LOGNAME'])) {
+                            $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+            }
+            // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

-                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

-                    continue;

+                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                                    continue;
+                }
                 $loghandlerinstance->export($data, $suffixinfilename);

             }

             unset($data);

@@ -1187,13 +1225,15 @@ 
 

 // Show title

         $showtitle = 1;

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $showtitle = 0;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $showtitle = 0;
+        }
         if (!empty($title) && $showtitle) {

             $limittitle = 30;

             $out .= '<a class="tabTitle">';

-            if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

+            if ($picto) {
+                            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+            }
             $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

             $out .= '</a>';

         }

@@ -1202,12 +1242,14 @@ 
         $maxkey = -1;

         if (is_array($links) && !empty($links)) {

             $keys = array_keys($links);

-            if (count($keys))

-                $maxkey = max($keys);

+            if (count($keys)) {
+                            $maxkey = max($keys);
+            }
         }

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;
+        }
 

 // Show tabs

         $bactive = false;

@@ -1220,8 +1262,9 @@ 
         for ($i = 0; $i <= $maxkey; $i++) {

             if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {

 // If active tab is already present

-                if ($i >= $limittoshow)

-                    $limittoshow--;

+                if ($i >= $limittoshow) {
+                                    $limittoshow--;
+                }
             }

         }

 

@@ -1262,12 +1305,12 @@ 
                 }

                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-                    if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

-                    else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

-                }

-                else if (!empty($links[$i][1])) {

+                    if (!empty($links[$i][0])) {
+                                            $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                    } else {
+                                            $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                    }
+                } else if (!empty($links[$i][1])) {

                     $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

                     $outmore .= '</a>' . "\n";

@@ -1278,8 +1321,9 @@ 
             }

             $displaytab = $i;

         }

-        if ($popuptab)

-            $outmore .= '</div>';

+        if ($popuptab) {
+                    $outmore .= '</div>';
+        }
 

         if ($displaytab > $limittoshow) {

             $left = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1302,8 +1346,9 @@ 
 

         $out .= "</div>\n";

 

-        if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+        if (!$notab || $notab == -1) {
+                    $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+        }
 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1333,10 +1378,11 @@ 
      */

     static function dol_get_fiche_end($notab = 0)

     {

-        if (!$notab || $notab == -1)

-            return "\n</div>\n";

-        else

-            return '';

+        if (!$notab || $notab == -1) {
+                    return "\n</div>\n";
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -1368,40 +1414,55 @@ 
         $showimage = 1;

         $entity = (empty($object->entity) ? Globals::$conf->entity : $object->entity);

         $showbarcode = empty(Globals::$conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

-        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-            $showbarcode = 0;

+        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
         $modulepart = 'unknown';

 

-        if ($object->element == 'societe')

-            $modulepart = 'societe';

-        if ($object->element == 'contact')

-            $modulepart = 'contact';

-        if ($object->element == 'member')

-            $modulepart = 'memberphoto';

-        if ($object->element == 'user')

-            $modulepart = 'userphoto';

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

-            $modulepart = 'product';

+        if ($object->element == 'societe') {
+                    $modulepart = 'societe';
+        }
+        if ($object->element == 'contact') {
+                    $modulepart = 'contact';
+        }
+        if ($object->element == 'member') {
+                    $modulepart = 'memberphoto';
+        }
+        if ($object->element == 'user') {
+                    $modulepart = 'userphoto';
+        }
+        if ($object->element == 'product') {
+                    $modulepart = 'product';
+        }
 

         if (class_exists("Imagick")) {

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

-                $modulepart = 'propal';

-            if ($object->element == 'commande')

-                $modulepart = 'commande';

-            if ($object->element == 'facture')

-                $modulepart = 'facture';

-            if ($object->element == 'fichinter')

-                $modulepart = 'ficheinter';

-            if ($object->element == 'contrat')

-                $modulepart = 'contract';

-            if ($object->element == 'supplier_proposal')

-                $modulepart = 'supplier_proposal';

-            if ($object->element == 'order_supplier')

-                $modulepart = 'supplier_order';

-            if ($object->element == 'invoice_supplier')

-                $modulepart = 'supplier_invoice';

-            if ($object->element == 'expensereport')

-                $modulepart = 'expensereport';

+            if ($object->element == 'propal') {
+                            $modulepart = 'propal';
+            }
+            if ($object->element == 'commande') {
+                            $modulepart = 'commande';
+            }
+            if ($object->element == 'facture') {
+                            $modulepart = 'facture';
+            }
+            if ($object->element == 'fichinter') {
+                            $modulepart = 'ficheinter';
+            }
+            if ($object->element == 'contrat') {
+                            $modulepart = 'contract';
+            }
+            if ($object->element == 'supplier_proposal') {
+                            $modulepart = 'supplier_proposal';
+            }
+            if ($object->element == 'order_supplier') {
+                            $modulepart = 'supplier_order';
+            }
+            if ($object->element == 'invoice_supplier') {
+                            $modulepart = 'supplier_invoice';
+            }
+            if ($object->element == 'expensereport') {
+                            $modulepart = 'expensereport';
+            }
         }

 

         if ($object->element == 'product') {

@@ -1409,11 +1470,12 @@ 
             $cssclass = 'photoref';

             $showimage = $object->is_photo_available(Globals::$conf->product->multidir_output[$entity]);

             $maxvisiblephotos = (isset(Globals::$conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);

-            if (Globals::$conf->browser->layout == 'phone')

-                $maxvisiblephotos = 1;

-            if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-            else {

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $maxvisiblephotos = 1;
+            }
+            if ($showimage) {
+                            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+            } else {

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

                     $nophoto = '';

                     $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1429,11 +1491,12 @@ 
             $cssclass = 'photoref';

             $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

             $maxvisiblephotos = (isset(Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

-            if (Globals::$conf->browser->layout == 'phone')

-                $maxvisiblephotos = 1;

-            if ($showimage)

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-            else {

+            if (Globals::$conf->browser->layout == 'phone') {
+                            $maxvisiblephotos = 1;
+            }
+            if ($showimage) {
+                            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+            } else {

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

                     $nophoto = '';

                     $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1458,8 +1521,10 @@ 
                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

-                        if (empty($subdir))

-                            $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                        if (empty($subdir)) {
+                                                    $subdir = 'errorgettingsubdirofobject';
+                        }
+                        // Protection to avoid to return empty path

 

                         $filepath = $dir_output . $subdir . "/";

 

@@ -1480,14 +1545,16 @@ 
                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                     include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

-                                    if ($ret < 0)

-                                        $error++;

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

                             }

 

                             $heightforphotref = 70;

-                            if (!empty(Globals::$conf->dol_optimize_smallscreen))

-                                $heightforphotref = 60;

+                            if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                                                            $heightforphotref = 60;
+                            }
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1523,8 +1590,10 @@ 
                         $width = 14;

                         $cssclass = 'photorefcenter';

                         $picto = $object->picto;

-                        if ($object->element == 'project' && !$object->public)

-                            $picto = 'project'; // instead of projectpub

+                        if ($object->element == 'project' && !$object->public) {
+                                                    $picto = 'project';
+                        }
+                        // instead of projectpub

                         $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

@@ -1535,8 +1604,9 @@ 
             }

         }

 

-        if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+        if ($showbarcode) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+        }
 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1560,35 +1630,37 @@ 
             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5, $object->totalpaye);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+            }
             $morehtmlstatus .= $tmptxt;

-        }

-        elseif ($object->element == 'contrat' || $object->element == 'contract') {

-            if ($object->statut == 0)

-                $morehtmlstatus .= $object->getLibStatut(5);

-            else

-                $morehtmlstatus .= $object->getLibStatut(4);

-        }

-        elseif ($object->element == 'facturerec') {

-            if ($object->frequency == 0)

-                $morehtmlstatus .= $object->getLibStatut(2);

-            else

-                $morehtmlstatus .= $object->getLibStatut(5);

-        }

-        elseif ($object->element == 'project_task') {

+        } elseif ($object->element == 'contrat' || $object->element == 'contract') {

+            if ($object->statut == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(4);
+            }
+        } elseif ($object->element == 'facturerec') {

+            if ($object->frequency == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(2);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            }
+        } elseif ($object->element == 'project_task') {

             $object->fk_statut = 1;

-            if ($object->progress > 0)

-                $object->fk_statut = 2;

-            if ($object->progress >= 100)

-                $object->fk_statut = 3;

+            if ($object->progress > 0) {
+                            $object->fk_statut = 2;
+            }
+            if ($object->progress >= 100) {
+                            $object->fk_statut = 3;
+            }
             $tmptxt = $object->getLibStatut(5);

             $morehtmlstatus .= $tmptxt;  // No status on task

-        }

-        else { // Generic case

+        } else { // Generic case

             $tmptxt = $object->getLibStatut(6);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5);
+            }
             $morehtmlstatus .= $tmptxt;

         }

 

@@ -1602,13 +1674,15 @@ 
         }

 

 // Add alias for thirdparty

-        if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+        if (!empty($object->name_alias)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+        }
 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

-            if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+            if (!empty($object->label)) {
+                            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+            }
         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1641,15 +1715,19 @@ 
     {

        // global Globals::$conf, Globals::$langs;

         $ret = '';

-        if ($fieldrequired)

-            $ret .= '<span class="fieldrequired">';

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+        if ($fieldrequired) {
+                    $ret .= '<span class="fieldrequired">';
+        }
+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '<label for="' . $fieldkey . '">';
+        }
         $ret .= Globals::$langs->trans($langkey);

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '</label>';

-        if ($fieldrequired)

-            $ret .= '</span>';

+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '</label>';
+        }
+        if ($fieldrequired) {
+                    $ret .= '</span>';
+        }
         return $ret;

     }

 

@@ -1664,8 +1742,9 @@ 
     {

        // global $bc;

         $ret = ' ' . $bc[$var];

-        if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+        if ($moreclass) {
+                    $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+        }
         return $ret;

     }

 

@@ -1696,18 +1775,18 @@ 
             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

-        }

-        else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? ", " : '') . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

             $ret .= ($ret ? $sep : '' ) . $object->town;

             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

-        }

-        else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? $sep : '' ) . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

             $ret .= ($ret ? $sep : '' ) . $object->zip;

             $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

             if ($object->state) {

@@ -1724,8 +1803,9 @@ 
                 $ret .= ($ret ? ", " : '') . $object->state;

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
         if ($withcountry) {

             Globals::$langs->load("dict");

             $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1746,8 +1826,9 @@ 
     {

         if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

             return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);

-        } else

-            return 'Error date into a not supported range';

+        } else {
+                    return 'Error date into a not supported range';
+        }
     }

 

     /**

@@ -1793,10 +1874,12 @@ 
                 }

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

-        if (!$format)

-            $format = 'daytextshort';

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
+        if (!$format) {
+                    $format = 'daytextshort';
+        }
         $reduceformat = (!empty(Globals::$conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

         $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);

         if ($formatwithoutreduce != $format) {

@@ -1805,40 +1888,46 @@ 
         }  // so format 'dayreduceformat' is processed like day

 // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.

 // TODO Add format daysmallyear and dayhoursmallyear

-        if ($format == 'day')

-            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);

-        else if ($format == 'hour')

-            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);

-        else if ($format == 'hourduration')

-            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);

-        else if ($format == 'daytext')

-            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);

-        else if ($format == 'daytextshort')

-// Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);

-        else if ($format == 'dayhour')

-            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short);

-        else if ($format == 'dayhoursec')

-            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);

-        else if ($format == 'dayhourtext')

-            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);

-        else if ($format == 'dayhourtextshort')

-            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);

-// Format not sensitive to language

-        else if ($format == 'dayhourlog')

-            $format = '%Y%m%d%H%M%S';

-        else if ($format == 'dayhourldap')

-            $format = '%Y%m%d%H%M%SZ';

-        else if ($format == 'dayhourxcard')

-            $format = '%Y%m%dT%H%M%SZ';

-        else if ($format == 'dayxcard')

-            $format = '%Y%m%d';

-        else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

-        else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

-        else if ($format == 'standard')

-            $format = '%Y-%m-%d %H:%M:%S';

+        if ($format == 'day') {
+                    $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);
+        } else if ($format == 'hour') {
+                    $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);
+        } else if ($format == 'hourduration') {
+                    $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);
+        } else if ($format == 'daytext') {
+                    $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);
+        } else if ($format == 'daytextshort') {
+            // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);
+        } else if ($format == 'dayhour') {
+                    $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short);
+        } else if ($format == 'dayhoursec') {
+                    $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);
+        } else if ($format == 'dayhourtext') {
+                    $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);
+        } else if ($format == 'dayhourtextshort') {
+                    $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);
+        }
+        // Format not sensitive to language

+        else if ($format == 'dayhourlog') {
+                    $format = '%Y%m%d%H%M%S';
+        } else if ($format == 'dayhourldap') {
+                    $format = '%Y%m%d%H%M%SZ';
+        } else if ($format == 'dayhourxcard') {
+                    $format = '%Y%m%dT%H%M%SZ';
+        } else if ($format == 'dayxcard') {
+                    $format = '%Y%m%d';
+        } else if ($format == 'dayrfc') {
+                    $format = '%Y-%m-%d';
+        }
+        // DATE_RFC3339

+        else if ($format == 'dayhourrfc') {
+                    $format = '%Y-%m-%dT%H:%M:%SZ';
+        }
+        // DATETIME RFC3339

+        else if ($format == 'standard') {
+                    $format = '%Y-%m-%d %H:%M:%S';
+        }
 

         if ($reduceformat) {

             $format = str_replace('%Y', '%y', $format);

@@ -1846,8 +1935,10 @@ 
         }

 

 // If date undefined or "", we return ""

-        if (dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+        if (dol_strlen($time) == 0) {
+                    return '';
+        }
+        // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1915,8 +2006,9 @@ 
                 $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

-            } else

-                $ret = 'Bad value ' . $time . ' for date';

+            } else {
+                            $ret = 'Bad value ' . $time . ' for date';
+            }
         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -1987,10 +2079,14 @@ 
        // global Globals::$conf;

 

         $usealternatemethod = false;

-        if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

-        if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+        if ($timestamp <= 0) {
+                    $usealternatemethod = true;
+        }
+        // <= 1970

+        if ($timestamp >= 2145913200) {
+                    $usealternatemethod = true;
+        }
+        // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2025,27 +2121,36 @@ 
        // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

-        if ($hour == -1 || empty($hour))

-            $hour = 0;

-        if ($minute == -1 || empty($minute))

-            $minute = 0;

-        if ($second == -1 || empty($second))

-            $second = 0;

+        if ($hour == -1 || empty($hour)) {
+                    $hour = 0;
+        }
+        if ($minute == -1 || empty($minute)) {
+                    $minute = 0;
+        }
+        if ($second == -1 || empty($second)) {
+                    $second = 0;
+        }
 

 // Check parameters

         if ($check) {

-            if (!$month || !$day)

-                return '';

-            if ($day > 31)

-                return '';

-            if ($month > 12)

-                return '';

-            if ($hour < 0 || $hour > 24)

-                return '';

-            if ($minute < 0 || $minute > 60)

-                return '';

-            if ($second < 0 || $second > 60)

-                return '';

+            if (!$month || !$day) {
+                            return '';
+            }
+            if ($day > 31) {
+                            return '';
+            }
+            if ($month > 12) {
+                            return '';
+            }
+            if ($hour < 0 || $hour > 24) {
+                            return '';
+            }
+            if ($minute < 0 || $minute > 60) {
+                            return '';
+            }
+            if ($second < 0 || $second > 60) {
+                            return '';
+            }
         }

 

         if (method_exists('DateTime', 'getTimestamp')) {

@@ -2102,8 +2207,10 @@ 
 

 // Note that gmmktime and mktime return same value (GMT) when used without parameters

 //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() static function instead

-        if ($mode == 'gmt')

-            $ret = time(); // Time for now at greenwich.

+        if ($mode == 'gmt') {
+                    $ret = time();
+        }
+        // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

             require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

             $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2137,8 +2244,9 @@ 
        // global Globals::$conf, Globals::$langs;

         $level = 1024;

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $shortunit = 1;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $shortunit = 1;
+        }
 

 // Set value text

         if (empty($shortvalue) || $size < ($level * 10)) {

@@ -2173,19 +2281,23 @@ 
     {

        // global Globals::$langs;

 

-        if (empty($url))

-            return '';

+        if (empty($url)) {
+                    return '';
+        }
 

         $link = '<a href="';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= $url;

         $link .= '"';

-        if ($target)

-            $link .= ' target="' . $target . '"';

+        if ($target) {
+                    $link .= ' target="' . $target . '"';
+        }
         $link .= '>';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= dol_trunc($url, $max);

         $link .= '</a>';

         return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2209,13 +2321,15 @@ 
 

         $newemail = $email;

 

-        if (empty($email))

-            return '&nbsp;';

+        if (empty($email)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($addlink)) {

             $newemail = '<a style="text-overflow: ellipsis;" href="';

-            if (!preg_match('/^mailto:/i', $email))

-                $newemail .= 'mailto:';

+            if (!preg_match('/^mailto:/i', $email)) {
+                            $newemail .= 'mailto:';
+            }
             $newemail .= $email;

             $newemail .= '">';

             $newemail .= dol_trunc($email, $max);

@@ -2228,13 +2342,14 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_EMAIL';

                 $link = '';

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

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+                }
             }

-        }

-        else {

+        } else {

             if ($showinvalid && !isValidEmail($email)) {

                 Globals::$langs->load("errors");

                 $newemail .= img_warning(Globals::$langs->trans("ErrorBadEMail", $email));

@@ -2266,8 +2381,9 @@ 
 

         $newskype = $value;

 

-        if (empty($value))

-            return '&nbsp;';

+        if (empty($value)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2288,13 +2404,13 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

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

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
                 $newskype .= ($link ? ' ' . $link : '');

             }

             $newskype .= '</div>';

-        }

-        else {

+        } else {

             Globals::$langs->load("errors");

             $newskype .= img_warning(Globals::$langs->trans("ErrorBadSocialNetworkValue", $value));

         }

@@ -2323,12 +2439,14 @@ 
         if (empty($phone)) {

             return '';

         }

-        if (empty($countrycode))

-            $countrycode = $mysoc->country_code;

+        if (empty($countrycode)) {
+                    $countrycode = $mysoc->country_code;
+        }
 

 // Short format for small screens

-        if (Globals::$conf->dol_optimize_smallscreen)

-            $separ = '';

+        if (Globals::$conf->dol_optimize_smallscreen) {
+                    $separ = '';
+        }
 

         $newphone = $phone;

         if (strtoupper($countrycode) == "FR") {

@@ -2494,15 +2612,18 @@ 
                 $newphone = '<a href="tel:' . $phone . '"';

                 $newphone .= '>' . $phone . '</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

-                if (empty($user->clicktodial_loaded))

-                    $user->fetch_clicktodial();

+                if (empty($user->clicktodial_loaded)) {
+                                    $user->fetch_clicktodial();
+                }
 

 // Define urlmask

                 $urlmask = 'ErrorClickToDialModuleNotConfigured';

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

-                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;

-                if (!empty($user->clicktodial_url))

-                    $urlmask = $user->clicktodial_url;

+                if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) {
+                                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;
+                }
+                if (!empty($user->clicktodial_url)) {
+                                    $urlmask = $user->clicktodial_url;
+                }
 

                 $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

                 $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

@@ -2517,8 +2638,9 @@ 
                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

                 $newphone = '<a href="' . $url . '"';

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

-                    $newphone .= ' target="_blank"';

+                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                                    $newphone .= ' target="_blank"';
+                }
                 $newphone .= '>' . $newphonesav . '</a>';

             }

 

@@ -2526,12 +2648,15 @@ 
             if (!empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_TEL';

                 $link = '';

-                if ($addlink == 'AC_FAX')

-                    $type = 'AC_FAX';

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

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                if ($addlink == 'AC_FAX') {
+                                    $type = 'AC_FAX';
+                }
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+                }
             }

         }

 

@@ -2558,15 +2683,17 @@ 
                     $picto = '';

                 }

             }

-            if ($adddivfloat)

-                $rep .= '<div class="nospan float" style="margin-right: 10px">';

-            else

-                $rep .= '<span style="margin-right: 10px;">';

+            if ($adddivfloat) {
+                            $rep .= '<div class="nospan float" style="margin-right: 10px">';
+            } else {
+                            $rep .= '<span style="margin-right: 10px;">';
+            }
             $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

-            if ($adddivfloat)

-                $rep .= '</div>';

-            else

-                $rep .= '</span>';

+            if ($adddivfloat) {
+                            $rep .= '</div>';
+            } else {
+                            $rep .= '</span>';
+            }
         }

 

         return $rep;

@@ -2596,8 +2723,9 @@ 
             if ($countrycode) { // If success, countrycode is us, fr, ...

                 if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

                     $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-                } else

-                    $ret .= ' (' . $countrycode . ')';

+                } else {
+                                    $ret .= ' (' . $countrycode . ')';
+                }
             }

         }

 

@@ -2694,26 +2822,33 @@ 
                 $out .= $hookmanager->resPrint;

             }

             if (empty($reshook)) {

-                if (empty($charfornl))

-                    $out .= nl2br($address);

-                else

-                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

+                if (empty($charfornl)) {
+                                    $out .= nl2br($address);
+                } else {
+                                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+                }
 

                 $showgmap = $showomap = 0;

 

 // TODO Add a hook here

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS))

-                    $showgmap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))

-                    $showgmap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))

-                    $showgmap = 1;

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS))

-                    $showomap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))

-                    $showomap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))

-                    $showomap = 1;

+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                                    $showgmap = 1;
+                }
+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                                    $showomap = 1;
+                }
 

                 if ($showgmap) {

                     $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2725,10 +2860,11 @@ 
                 }

             }

         }

-        if ($noprint)

-            return $out;

-        else

-            print $out;

+        if ($noprint) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     /**

@@ -2740,10 +2876,12 @@ 
      */

     static function isValidEmail($address, $acceptsupervisorkey = 0)

     {

-        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')

-            return true;

-        if (filter_var($address, FILTER_VALIDATE_EMAIL))

-            return true;

+        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+                    return true;
+        }
+        if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                    return true;
+        }
 

         return false;

     }

@@ -2765,10 +2903,12 @@ 
                 $mxhosts = array();

                 $weight = array();

                 getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-                if (count($mxhosts) > 1)

-                    return 1;

-                if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                    return 1;

+                if (count($mxhosts) > 1) {
+                                    return 1;
+                }
+                if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                                    return 1;
+                }
 

                 return 0;

             }

@@ -2797,10 +2937,11 @@ 
      */

     static function dol_strlen($string, $stringencoding = 'UTF-8')

     {

-        if (function_exists('mb_strlen'))

-            return mb_strlen($string, $stringencoding);

-        else

-            return strlen($string);

+        if (function_exists('mb_strlen')) {
+                    return mb_strlen($string, $stringencoding);
+        } else {
+                    return strlen($string);
+        }
     }

 

     /**

@@ -2817,8 +2958,9 @@ 
     {

        // global Globals::$langs;

 

-        if (empty($stringencoding))

-            $stringencoding = Globals::$langs->charset_output;

+        if (empty($stringencoding)) {
+                    $stringencoding = Globals::$langs->charset_output;
+        }
 

         $ret = '';

         if (empty($trunconbytes)) {

@@ -2854,48 +2996,55 @@ 
     {

        // global Globals::$conf;

 

-        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

-            return $string;

+        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) {
+                    return $string;
+        }
 

-        if (empty($stringencoding))

-            $stringencoding = 'UTF-8';

-// reduce for small screen

-        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1)

-            $size = round($size / 3);

+        if (empty($stringencoding)) {
+                    $stringencoding = 'UTF-8';
+        }
+        // reduce for small screen

+        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) {
+                    $size = round($size / 3);
+        }
 

 // We go always here

         if ($trunc == 'right') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-            else

-//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-                return $string;

-        }

-        elseif ($trunc == 'middle') {

+            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+            } else {
+                //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

+                return $string;
+            }
+        } elseif ($trunc == 'middle') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

                 return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-            } else

-                return $string;

-        }

-        elseif ($trunc == 'left') {

+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'left') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-            else

-                return $string;

-        }

-        elseif ($trunc == 'wrap') {

+            if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'wrap') {

             $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-            else

-                return $string;

-        } else

-            return 'BadParam3CallingDolTrunc';

+            if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+            } else {
+                            return $string;
+            }
+        } else {
+                    return 'BadParam3CallingDolTrunc';
+        }
     }

 

     /**

@@ -3105,8 +3254,9 @@ 
     {

        // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

         $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

@@ -3128,20 +3278,22 @@ 
     {

        // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

-        if ($pictoisfullpath)

-            $path = $picto;

-        else {

+        if ($pictoisfullpath) {
+                    $path = $picto;
+        } else {

 //$path = DOL_BASE_URI . '/theme/common/' . $picto;

             $path = DOL_BASE_URI . '/theme/common/' . $picto;

 

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

                 $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;

 

-                if (file_exists($themepath))

-                    $path = $themepath;

+                if (file_exists($themepath)) {
+                                    $path = $themepath;
+                }
             }

         }

 

@@ -3180,8 +3332,9 @@ 
                 $numaction = 0;

             }

         }

-        if (!is_numeric($numaction))

-            $numaction = 0;

+        if (!is_numeric($numaction)) {
+                    $numaction = 0;
+        }
 

         return img_picto($titlealt, 'stcomm' . $numaction . '.png');

     }

@@ -3197,8 +3350,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Show');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Show');
+        }
 

         return img_picto($titlealt, 'pdf' . $size . '.png');

     }

@@ -3214,8 +3368,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Add');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Add');
+        }
 

         return img_picto($titlealt, 'edit_add.png', $other);

     }

@@ -3231,8 +3386,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Remove');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Remove');
+        }
 

         return img_picto($titlealt, 'edit_remove.png', $other);

     }

@@ -3249,8 +3405,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Modify');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Modify');
+        }
 

         return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

     }

@@ -3267,8 +3424,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('View');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('View');
+        }
 

         $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3286,8 +3444,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Delete');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Delete');
+        }
 

         return img_picto($titlealt, 'delete.png', $other);

 //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3303,8 +3462,9 @@ 
     static function img_printer($titlealt = "default", $other = '')

     {

        // global Globals::$conf, Globals::$langs;

-        if ($titlealt == "default")

-            $titlealt = Globals::$langs->trans("Print");

+        if ($titlealt == "default") {
+                    $titlealt = Globals::$langs->trans("Print");
+        }
         return img_picto($titlealt, 'printer.png', $other);

     }

 

@@ -3319,8 +3479,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Split');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Split');
+        }
 

         return img_picto($titlealt, 'split.png', $other);

     }

@@ -3337,10 +3498,11 @@ 
        // global Globals::$conf, Globals::$langs;

 

         if ($usealttitle) {

-            if (is_string($usealttitle))

-                $usealttitle = dol_escape_htmltag($usealttitle);

-            else

-                $usealttitle = Globals::$langs->trans('Info');

+            if (is_string($usealttitle)) {
+                            $usealttitle = dol_escape_htmltag($usealttitle);
+            } else {
+                            $usealttitle = Globals::$langs->trans('Info');
+            }
         }

 

         return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

@@ -3356,8 +3518,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Informations');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Informations');
+        }
 

         return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');

     }

@@ -3373,8 +3536,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Warning');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Warning');
+        }
 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

         return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

@@ -3390,8 +3554,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Error');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Error');
+        }
 

         return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');

     }

@@ -3407,8 +3572,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Next');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Next');
+        }
 

 //return img_picto($titlealt, 'next.png', $moreatt);

         return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3425,8 +3591,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Previous');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Previous');
+        }
 

 //return img_picto($titlealt, 'previous.png', $moreatt);

         return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3444,8 +3611,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Down');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Down');
+        }
 

         return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3462,8 +3630,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Up');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Up');
+        }
 

         return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3480,8 +3649,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Left');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Left');
+        }
 

         return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);

     }

@@ -3498,8 +3668,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Right');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Right');
+        }
 

         return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);

     }

@@ -3515,11 +3686,13 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Active');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Active');
+        }
 

-        if ($allow == 1)

-            return img_picto($titlealt, 'tick.png');

+        if ($allow == 1) {
+                    return img_picto($titlealt, 'tick.png');
+        }
 

         return '-';

     }

@@ -3567,8 +3740,9 @@ 
         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

-        if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+        if (empty($titlealt)) {
+                    $titlealt = 'Mime type: ' . $mimetype;
+        }
 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

         return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

@@ -3590,13 +3764,15 @@ 
 

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Call');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Call');
+        }
 

-        if ($option == 1)

-            $img = 'call';

-        else

-            $img = 'call_out';

+        if ($option == 1) {
+                    $img = 'call';
+        } else {
+                    $img = 'call_out';
+        }
 

         return img_picto($titlealt, $img);

     }

@@ -3612,8 +3788,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

@@ -3634,8 +3811,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

@@ -3697,14 +3875,16 @@ 
 

         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

             $out .= Globals::$langs->trans("DolibarrHasDetectedError") . ".<br>\n";

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

-                $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+            }
             $out .= Globals::$langs->trans("InformationToHelpDiagnose") . ":<br>\n";

 

             $out .= "<b>" . Globals::$langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

             $out .= "<b>" . Globals::$langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

-            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL))

-                $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+            }
             if (function_exists("phpversion")) {

                 $out .= "<b>" . Globals::$langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

             }

@@ -3747,18 +3927,20 @@ 
             Globals::$langs->load("errors");

 

 // Merge all into $errors array

-            if (is_array($error) && is_array($errors))

-                $errors = array_merge($error, $errors);

-            elseif (is_array($error))

-                $errors = $error;

-            elseif (is_array($errors))

-                $errors = array_merge(array($error), $errors);

-            else

-                $errors = array_merge(array($error));

+            if (is_array($error) && is_array($errors)) {
+                            $errors = array_merge($error, $errors);
+            } elseif (is_array($error)) {
+                            $errors = $error;
+            } elseif (is_array($errors)) {
+                            $errors = array_merge(array($error), $errors);
+            } else {
+                            $errors = array_merge(array($error));
+            }
 

             foreach ($errors as $msg) {

-                if (empty($msg))

-                    continue;

+                if (empty($msg)) {
+                                    continue;
+                }
                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

                     $out .= "<b>" . Globals::$langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

                 } else {                        // Mode CLI

@@ -3776,9 +3958,9 @@ 
             $out .= "<br>\n";

         }

 

-        if (empty($dolibarr_main_prod))

-            print $out;

-        else {

+        if (empty($dolibarr_main_prod)) {
+                    print $out;
+        } else {

             print Globals::$langs->trans("DolibarrHasDetectedError") . '. ';

             print Globals::$langs->trans("YouCanSetOptionDolibarrMainProdToZero");

             define("MAIN_CORE_ERROR", 1);

@@ -3801,16 +3983,18 @@ 
     {

        // global Globals::$langs, Globals::$conf;

 

-        if (empty($email))

-            $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;

+        if (empty($email)) {
+                    $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        }
 

         Globals::$langs->load("errors");

         $now = dol_now();

 

         print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

         print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

-        if ($errormessage)

-            print '<br><br>' . $errormessage;

+        if ($errormessage) {
+                    print '<br><br>' . $errormessage;
+        }
         if (is_array($errormessages) && count($errormessages)) {

             foreach ($errormessages as $mesgtoshow) {

                 print '<br><br>' . $mesgtoshow;

@@ -4053,12 +4237,15 @@ 
         $savtotalnboflines = $totalnboflines;

         $totalnboflines = abs($totalnboflines);

 

-        if ($picto == 'setup')

-            $picto = 'title_setup.png';

-        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png')

-            $picto = 'title.gif';

-        if ($limit < 0)

-            $limit = Globals::$conf->liste_limit;

+        if ($picto == 'setup') {
+                    $picto = 'title_setup.png';
+        }
+        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+                    $picto = 'title.gif';
+        }
+        if ($limit < 0) {
+                    $limit = Globals::$conf->liste_limit;
+        }
         if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

             $nextpage = 1;

         } else {

@@ -4072,11 +4259,13 @@ 
 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

-        if ($picto && $titre)

-            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+        if ($picto && $titre) {
+                    print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+        }
         print '<div class="titre inline-block">' . $titre;

-        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+                    print ' (' . $totalnboflines . ')';
+        }
         print '</div></td>';

 

 // Center

@@ -4086,21 +4275,24 @@ 
 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

-        if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

-        if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

-// Show navigation bar

+        if ($sortfield) {
+                    $options .= "&sortfield=" . urlencode($sortfield);
+        }
+        if ($sortorder) {
+                    $options .= "&sortorder=" . urlencode($sortorder);
+        }
+        // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

             if ($totalnboflines) { // If we know total nb of lines

 // Define nb of extra page links before and after selected page + ... + first or last

                 $maxnbofpage = (empty(Globals::$conf->dol_optimize_smallscreen) ? 4 : 1);

 

-                if ($limit > 0)

-                    $nbpages = ceil($totalnboflines / $limit);

-                else

-                    $nbpages = 1;

+                if ($limit > 0) {
+                                    $nbpages = ceil($totalnboflines / $limit);
+                } else {
+                                    $nbpages = 1;
+                }
                 $cpt = ($page - $maxnbofpage);

                 if ($cpt < 0) {

                     $cpt = 0;

@@ -4108,10 +4300,11 @@ 
 

                 if ($cpt >= 1) {

                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

-                    if ($cpt > 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                    if ($cpt > 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                    }
                 }

 

                 do {

@@ -4124,14 +4317,14 @@ 
                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

-                    if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

+                    if ($cpt < $nbpages - 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == $nbpages - 2) {
+                                            $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                    }
                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

                 }

-            }

-            else {

+            } else {

                 $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

             }

         }

@@ -4167,18 +4360,21 @@ 
             $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

 //$pagesizechoices.=',0:'.Globals::$langs->trans("All");     // Not yet supported

 //$pagesizechoices.=',2:2';

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

-                $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

+            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) {
+                            $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;
+            }
 

             print '<li class="pagination">';

             print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">';

             $tmpchoice = explode(',', $pagesizechoices);

             $tmpkey = $limit . ':' . $limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             asort($tmpchoice, SORT_NUMERIC);

             $found = false;

             foreach ($tmpchoice as $val) {

@@ -4254,14 +4450,15 @@ 
         }

 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

-        if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

-        else {

+        if (!preg_match('/\//', $rate)) {
+                    $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+        } else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

             $ret = $rate . ($addpercent ? '%' : '');

         }

-        if (($info_bits & 1) && $usestarfornpr >= 0)

-            $ret .= ' *';

+        if (($info_bits & 1) && $usestarfornpr >= 0) {
+                    $ret .= ' *';
+        }
         $ret .= $morelabel;

         return $ret;

     }

@@ -4285,11 +4482,14 @@ 
     {

        // global Globals::$langs, Globals::$conf;

 // Clean parameters

-        if (empty($amount))

-            $amount = 0; // To have a numeric value if amount not defined or = ''

+        if (empty($amount)) {
+                    $amount = 0;
+        }
+        // To have a numeric value if amount not defined or = ''

         $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)

-        if ($rounding < 0)

-            $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);

+        if ($rounding < 0) {
+                    $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);
+        }
         $nbdecimal = $rounding;

 

 // Output separators by default (french)

@@ -4297,18 +4497,22 @@ 
         $thousand = ' ';

 

 // If $outlangs not forced, we use use language

-        if (!is_object($outlangs))

-            $outlangs = Globals::$langs;

-

-        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        else if ($thousand == 'Space')

-            $thousand = ' ';

-//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (!is_object($outlangs)) {
+                    $outlangs = Globals::$langs;
+        }
+

+        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } else if ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 //print "amount=".$amount."-";

         $amount = str_replace(',', '.', $amount); // should be useless

 //print $amount."-";

@@ -4319,9 +4523,10 @@ 
         $end = '';

 

 // We increase nbdecimal if there is more decimal than asked (to not loose information)

-        if (dol_strlen($decpart) > $nbdecimal)

-            $nbdecimal = dol_strlen($decpart);

-// Si on depasse max

+        if (dol_strlen($decpart) > $nbdecimal) {
+                    $nbdecimal = dol_strlen($decpart);
+        }
+        // Si on depasse max

         if ($trunc && $nbdecimal > Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN) {

             $nbdecimal = Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN;

             if (preg_match('/\.\.\./i', Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN)) {

@@ -4331,8 +4536,9 @@ 
         }

 

 // If force rounding

-        if ($forcerounding >= 0)

-            $nbdecimal = $forcerounding;

+        if ($forcerounding >= 0) {
+                    $nbdecimal = $forcerounding;
+        }
 

 // Format number

         $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4343,13 +4549,14 @@ 
 // Add symbol of currency if requested

         $cursymbolbefore = $cursymbolafter = '';

         if ($currency_code) {

-            if ($currency_code == 'auto')

-                $currency_code = Globals::$conf->currency;

+            if ($currency_code == 'auto') {
+                            $currency_code = Globals::$conf->currency;
+            }
 

             $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');

-            if (in_array($currency_code, $listofcurrenciesbefore))

-                $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-            else {

+            if (in_array($currency_code, $listofcurrenciesbefore)) {
+                            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+            } else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

                 $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

             }

@@ -4382,15 +4589,18 @@ 
 // Decimal delimiter for PHP and database SQL requests must be '.'

         $dec = ',';

         $thousand = ' ';

-        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");

-        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        elseif ($thousand == 'Space')

-            $thousand = ' ';

-//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } elseif ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 // Convert value to universal number format (no thousand separator, '.' as decimal separator)

         if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format

 //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';

@@ -4405,8 +4615,10 @@ 
             }

 //print "QQ".$amount.'<br>';

 // Now make replace (the main goal of function)

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4415,20 +4627,24 @@ 
 // Now, make a rounding if required

         if ($rounding) {

             $nbofdectoround = '';

-            if ($rounding == 'MU')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;

-            elseif ($rounding == 'MT')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;

-            elseif ($rounding == 'MS')

-                $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;

-            elseif (is_numeric($rounding))

-                $nbofdectoround = $rounding;

-//print "RR".$amount.' - '.$nbofdectoround.'<br>';

-            if (dol_strlen($nbofdectoround))

-                $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

-            else

-                return 'ErrorBadParameterProvidedToFunction';

-//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

+            if ($rounding == 'MU') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;
+            } elseif ($rounding == 'MT') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;
+            } elseif ($rounding == 'MS') {
+                            $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;
+            } elseif (is_numeric($rounding)) {
+                            $nbofdectoround = $rounding;
+            }
+            //print "RR".$amount.' - '.$nbofdectoround.'<br>';

+            if (dol_strlen($nbofdectoround)) {
+                            $amount = round($amount, $nbofdectoround);
+            }
+            // $nbofdectoround can be 0.

+            else {
+                            return 'ErrorBadParameterProvidedToFunction';
+            }
+            //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

 // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number

 // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

             if (is_numeric($amount)) {

@@ -4441,8 +4657,10 @@ 
 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4501,8 +4719,9 @@ 
     {

        // global $db, Globals::$conf, $mysoc;

 

-        if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

-            $thirdparty_seller = $mysoc;

+        if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+                    $thirdparty_seller = $mysoc;
+        }
 

         dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

 

@@ -4520,37 +4739,43 @@ 
 // Some test to guess with no need to make database access

         if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

             if ($local == 1) {

-                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                    return 0;

+                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                                    return 0;
+                }
                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax1_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax1_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax1_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax1_assuj) {
+                                            return 0;
+                    }
                 }

             }

 

             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-                if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                if (!$mysoc->localtax2_assuj) {
+                                    return 0;
+                }
+                // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax2_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax2_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax2_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax2_assuj) {
+                                            return 0;
+                    }
                 }

             }

-        }

-        else {

-            if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-                return 0;

-            if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-                return 0;

+        } else {

+            if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
         }

 

 // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.

@@ -4592,19 +4817,23 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

-        else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code ='" . $vatratecode . "'";
+        }
+        // If we have the code, we use it in priority

+        else {
+                    $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+        }
         dol_syslog("get_localtax", LOG_DEBUG);

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

 

         if ($resql) {

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

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4650,10 +4879,11 @@ 
         $resql = $db->query($sql);

         if ($resql) {

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

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4679,9 +4909,9 @@ 
 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4694,19 +4924,22 @@ 
               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

             $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

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

         if ($resql) {

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

-            if ($obj)

-                return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);

-            else

-                return array();

-        } else

-            dol_print_error($db);

+            if ($obj) {
+                            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+            } else {
+                            return array();
+            }
+        } else {
+                    dol_print_error($db);
+        }
 

         return array();

     }

@@ -4736,9 +4969,9 @@ 
 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"

@@ -4747,13 +4980,17 @@ 
             }

 

             $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

-            if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

-            else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

+            if ($mysoc->country_code == 'ES') {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+            }
+            // local tax in spain use the buyer country ??

+            else {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+            }
             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

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

@@ -4799,17 +5036,17 @@ 
                 if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

-                }

-                else {

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
+                } else {

                     $ret = $product->tva_tx;    // Default vat of product we defined

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
                 }

                 $found = 1;

-            }

-            else {

+            } else {

 // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

 // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

             }

@@ -4829,14 +5066,18 @@ 
                     $obj = $db->fetch_object($resql);

                     if ($obj) {

                         $ret = $obj->vat_rate;

-                        if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                        if ($obj->default_vat_code) {
+                                                    $ret .= ' (' . $obj->default_vat_code . ')';
+                        }
                     }

                     $db->free($sql);

-                } else

-                    dol_print_error($db);

-            } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                } else {
+                                    dol_print_error($db);
+                }
+            } else {
+                            $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+            }
+            // Forced value if autodetect fails

         }

 

         dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4891,13 +5132,15 @@ 
             if ($resql) {

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

                 if ($obj) {

-                    if ($local == 1)

-                        $ret = $obj->localtax1;

-                    elseif ($local == 2)

-                        $ret = $obj->localtax2;

+                    if ($local == 1) {
+                                            $ret = $obj->localtax1;
+                    } elseif ($local == 2) {
+                                            $ret = $obj->localtax2;
+                    }
                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
         }

 

         dol_syslog("get_product_localtax_for_country: ret=" . $ret);

@@ -5000,15 +5243,16 @@ 
        // global $db;

 

         if ($idprodfournprice > 0) {

-            if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+            if (!class_exists('ProductFournisseur')) {
+                            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+            }
             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

-        }

-        elseif ($idprod > 0) {

-            if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+        } elseif ($idprod > 0) {

+            if (!class_exists('Product')) {
+                            require_once DOL_BASE_PATH . 'product/class/product.class.php';
+            }
             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5034,30 +5278,35 @@ 
     {

        // global $mysoc;

 

-        if (!is_object($thirdparty_seller))

-            return -1;

-        if (!is_object($thirdparty_buyer))

-            return -1;

+        if (!is_object($thirdparty_seller)) {
+                    return -1;
+        }
+        if (!is_object($thirdparty_buyer)) {
+                    return -1;
+        }
 

         if ($local == 1) { // Localtax 1

             if ($mysoc->country_code == 'ES') {

-                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                    return 0;

-            }

-            else {

+                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

 // Si vendeur non assujeti a Localtax1, localtax1 par default=0

-                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)

-                    return 0;

-                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')

-                    return 0;

-            }

-        }

-        elseif ($local == 2) { //I Localtax 2

+                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
+                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                                    return 0;
+                }
+            }

+        } elseif ($local == 2) { //I Localtax 2

 // Si vendeur non assujeti a Localtax2, localtax2 par default=0

-            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)

-                return 0;

-            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')

-                return 0;

+            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                            return 0;
+            }
         }

 

         if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

@@ -5082,31 +5331,38 @@ 
         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

             $result = Globals::$langs->trans('yes');

-            if ($case == 1 || $case == 3)

-                $result = Globals::$langs->trans("Yes");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="1" checked disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("Yes");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="1" checked disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+            }
 

             $classname = 'ok';

-        }

-        elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+        } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

             $result = Globals::$langs->trans("no");

-            if ($case == 1 || $case == 3)

-                $result = Globals::$langs->trans("No");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="0" disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

-

-            if ($color == 2)

-                $classname = 'ok';

-            else

-                $classname = 'error';

-        }

-        if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("No");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="0" disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="0" disabled> ' . $result;
+            }
+

+            if ($color == 2) {
+                            $classname = 'ok';
+            } else {
+                            $classname = 'error';
+            }
+        }

+        if ($color) {
+                    return '<font class="' . $classname . '">' . $result . '</font>';
+        }
         return $result;

     }

 

@@ -5132,23 +5388,27 @@ 
         $path = '';

 

         $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

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

-            $arrayforoldpath[] = 'product';

+        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+                    $arrayforoldpath[] = 'product';
+        }
         if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

 // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

-            if (empty($alpha))

-                $num = preg_replace('/([^0-9])/i', '', $num);

-            else

-                $num = preg_replace('/^.*\-/i', '', $num);

+            if (empty($alpha)) {
+                            $num = preg_replace('/([^0-9])/i', '', $num);
+            } else {
+                            $num = preg_replace('/^.*\-/i', '', $num);
+            }
             $num = substr("000" . $num, -$level);

-            if ($level == 1)

-                $path = substr($num, 0, 1);

-            if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

-            if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

-        }

-        else {

+            if ($level == 1) {
+                            $path = substr($num, 0, 1);
+            }
+            if ($level == 2) {
+                            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+            if ($level == 3) {
+                            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+        } else {

 // TODO

 // We will enhance here a common way of forging path for document storage

 // Here, object->id, object->ref and modulepart are required.

@@ -5159,8 +5419,9 @@ 
             }

         }

 

-        if (empty($withoutslash) && !empty($path))

-            $path .= '/';

+        if (empty($withoutslash) && !empty($path)) {
+                    $path .= '/';
+        }
 

         return $path;

     }

@@ -5180,8 +5441,9 @@ 
         dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

-        if (@is_dir($dir_osencoded))

-            return 0;

+        if (@is_dir($dir_osencoded)) {
+                    return 0;
+        }
 

         $nberr = 0;

         $nbcreated = 0;

@@ -5196,12 +5458,15 @@ 
         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

-            if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

-            else

-                $ccdir .= $cdir[$i];

-            if (preg_match("/^.:$/", $ccdir, $regs))

-                continue; // Si chemin Windows incomplet, on poursuit par rep suivant

+            if ($i > 0) {
+                            $ccdir .= '/' . $cdir[$i];
+            } else {
+                            $ccdir .= $cdir[$i];
+            }
+            if (preg_match("/^.:$/", $ccdir, $regs)) {
+                            continue;
+            }
+            // Si chemin Windows incomplet, on poursuit par rep suivant

 

 

 

@@ -5293,8 +5558,9 @@ 
      */

     static function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

     {

-        if ($removelinefeed == 2)

-            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+        if ($removelinefeed == 2) {
+                    $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+        }
         $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

         if ($strip_tags) {

@@ -5311,8 +5577,9 @@ 
         $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

 // Supprime aussi les retours

-        if ($removelinefeed == 1)

-            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+        if ($removelinefeed == 1) {
+                    $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+        }
 

 // et les espaces doubles

         while (strpos($temp, "  ")) {

@@ -5398,18 +5665,21 @@ 
             if ($charset == 'UTF-8') {

                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-            else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            else {
+                            $pattern = '/(<br[^>]*>)/U';
+            }
+            // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

             $i = 0;

             $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

             while (($i < $nba) && ($i < ($nboflines * 2))) {

-                if ($i % 2 == 0)

-                    $firstline .= $a[$i];

-                elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))

-                    $firstline .= ($ishtml ? "<br>\n" : "\n");

+                if ($i % 2 == 0) {
+                                    $firstline .= $a[$i];
+                } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                                    $firstline .= ($ishtml ? "<br>\n" : "\n");
+                }
                 $i++;

             }

             unset($a);

@@ -5458,15 +5728,18 @@ 
         $newstring = $stringtoencode;

         if (dol_textishtml($stringtoencode)) { // Check if text is already HTML or not

             $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.

-            if ($removelasteolbr)

-                $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/<br>$/i', '', $newstring);
+            }
+            // Remove last <br> (remove only last one)

             $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));

             $newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding

             $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));

-        }

-        else {

-            if ($removelasteolbr)

-                $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+        } else {

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+            }
+            // Remove last \n (may remove several)

             $newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);

         }

 // Other substitutions that htmlentities does not do

@@ -5568,8 +5841,9 @@ 
      */

     static function dol_nboflines($s, $maxchar = 0)

     {

-        if ($s == '')

-            return 0;

+        if ($s == '') {
+                    return 0;
+        }
         $arraystring = explode("\n", $s);

         $nb = count($arraystring);

 

@@ -5588,15 +5862,18 @@ 
     static function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')

     {

         $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");

-        if (dol_textishtml($text))

-            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

+        if (dol_textishtml($text)) {
+                    $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+        }
 

         $text = strtr($text, $repTable);

         if ($charset == 'UTF-8') {

             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-        else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5643,39 +5920,47 @@ 
     static function dol_textishtml($msg, $option = 0)

     {

         if ($option == 1) {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<br/i', $msg))

-                return true;

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br/i', $msg)) {
+                            return true;
+            }
             return false;

-        }

-        else {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<(b|em|i|u)>/i', $msg))

-                return true;

-            elseif (preg_match('/<br\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))

-                return true; // must accept <img src="http://example.com/aaa.png" />

-            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))

-                return true; // must accept <a href="http://example.com/aaa.png" />

-            elseif (preg_match('/<h[0-9]>/i', $msg))

-                return true;

-            elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-            elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+        } else {

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <img src="http://example.com/aaa.png" />

+            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <a href="http://example.com/aaa.png" />

+            elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                            return true;
+            }
+            // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+            elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                            return true;
+            }
+            // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5827,12 +6112,14 @@ 
                 $birthday = dol_print_date($object->birth, 'day');

 

                 $substitutionarray['__MEMBER_ID__'] = $object->id;

-                if (method_exists($object, 'getCivilityLabel'))

-                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+                if (method_exists($object, 'getCivilityLabel')) {
+                                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+                }
                 $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->firstname) : $object->firstname;

                 $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->lastname) : $object->lastname;

-                if (method_exists($object, 'getFullName'))

-                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);

+                if (method_exists($object, 'getFullName')) {
+                                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+                }
                 $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? dol_htmlentitiesbr($object->societe) : $object->societe;

                 $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? dol_htmlentitiesbr($object->address) : $object->address;

                 $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? dol_htmlentitiesbr($object->zip) : $object->zip;

@@ -5880,10 +6167,12 @@ 
                     $dateplannedstart = '';

                     $datenextexpiration = '';

                     foreach ($object->lines as $line) {

-                        if ($line->date_ouverture_prevue > $dateplannedstart)

-                            $dateplannedstart = $line->date_ouverture_prevue;

-                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))

-                            $datenextexpiration = $line->date_fin_prevue;

+                        if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                                    $dateplannedstart = $line->date_ouverture_prevue;
+                        }
+                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                                    $datenextexpiration = $line->date_fin_prevue;
+                        }
                     }

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

@@ -5893,8 +6182,9 @@ 
 

 // Create dynamic tags for __EXTRAFIELD_FIELD__

                 if ($object->table_element && $object->id > 0) {

-                    if (!is_object($extrafields))

-                        $extrafields = new ExtraFields($db);

+                    if (!is_object($extrafields)) {
+                                            $extrafields = new ExtraFields($db);
+                    }
                     $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                     if ($object->fetch_optionals() > 0) {

@@ -5915,12 +6205,15 @@ 
                     require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

-                    if (is_object($object) && $object->element == 'commande')

-                        $typeforonlinepayment = 'order';

-                    if (is_object($object) && $object->element == 'facture')

-                        $typeforonlinepayment = 'invoice';

-                    if (is_object($object) && $object->element == 'member')

-                        $typeforonlinepayment = 'member';

+                    if (is_object($object) && $object->element == 'commande') {
+                                            $typeforonlinepayment = 'order';
+                    }
+                    if (is_object($object) && $object->element == 'facture') {
+                                            $typeforonlinepayment = 'invoice';
+                    }
+                    if (is_object($object) && $object->element == 'member') {
+                                            $typeforonlinepayment = 'member';
+                    }
                     $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                     $paymenturl = $url;

                 }

@@ -5930,16 +6223,19 @@ 
 

                 if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+                }
                 if (!empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+                }
                 if (!empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+                }
             }

         }

         if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5949,18 +6245,22 @@ 
             $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';

             $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';

             $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+            }
 

             $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency)) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
 

 // TODO Add keys for foreign multicurrency

 // For backward compatibility

@@ -6030,23 +6330,27 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if (!is_array($substitutionarray))

-            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+        if (!is_array($substitutionarray)) {
+                    return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+        }
 

-        if (empty($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (empty($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

 // Make substitution for language keys

         if (is_object($outputlangs)) {

             while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

                 $msgishtml = 0;

-                if (DolUtils::dol_textishtml($text, 1))

-                    $msgishtml = 1;

+                if (DolUtils::dol_textishtml($text, 1)) {
+                                    $msgishtml = 1;
+                }
 

 // If key is __(TranslationKey|langfile)__, then force load of langfile.lang

                 $tmp = explode('|', $reg[1]);

-                if (!empty($tmp[1]))

-                    $outputlangs->load($tmp[1]);

+                if (!empty($tmp[1])) {
+                                    $outputlangs->load($tmp[1]);
+                }
 

                 $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

@@ -6056,23 +6360,29 @@ 
 // it is also converted.

         while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

             $msgishtml = 0;

-            if (DolUtils::dol_textishtml($text, 1))

-                $msgishtml = 1;

+            if (DolUtils::dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 

             $keyfound = $reg[1];

-            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-                $newval = '*****forbidden*****';

-            else

-                $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                            $newval = '*****forbidden*****';
+            } else {
+                            $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;
+            }
             $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

-            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

-            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = ''; // Protection

+            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

+            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

 

             $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

         }

@@ -6118,8 +6428,9 @@ 
             $dir = dol_buildpath($reldir, 0);

 

 // Check if directory exists

-            if (!dol_is_dir($dir))

-                continue;

+            if (!dol_is_dir($dir)) {
+                            continue;
+            }
 

             $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');

             foreach ($substitfiles as $substitfile) {

@@ -6131,8 +6442,9 @@ 
                     require_once $dir . $substitfile['name'];

                     // Call the user's function, and only if it is defined

                     $function_name = $module . "_" . $callfunc;

-                    if (function_exists($function_name))

-                        $function_name($substitutionarray, $outputlangs, $object, $parameters);

+                    if (function_exists($function_name)) {
+                                            $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                    }
                 }

             }

         }

@@ -6168,8 +6480,9 @@ 
 

         $out = '';

 

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

         if ($date_start && $date_end) {

             $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6198,20 +6511,22 @@ 
 

         $ret = '';

 // If order not defined, we use the setup

-        if ($nameorder < 0)

-            $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+        if ($nameorder < 0) {
+                    $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+        }
         if ($nameorder && ((string) $nameorder != '2')) {

             $ret .= $firstname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $lastname;

-        }

-        else if ($nameorder == 2) {

+        } else if ($nameorder == 2) {

             $ret .= $firstname;

         } else {

             $ret .= $lastname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $firstname;

         }

         return $ret;

@@ -6231,13 +6546,14 @@ 
     {

 //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function

         if (!is_array($mesgs)) {  // If mesgs is a string

-            if ($mesgs)

-                $_SESSION['dol_events'][$style][] = $mesgs;

-        }

-        else {      // If mesgs is an array

+            if ($mesgs) {
+                            $_SESSION['dol_events'][$style][] = $mesgs;
+            }
+        } else {      // If mesgs is an array

             foreach ($mesgs as $mesg) {

-                if ($mesg)

-                    $_SESSION['dol_events'][$style][] = $mesg;

+                if ($mesg) {
+                                    $_SESSION['dol_events'][$style][] = $mesg;
+                }
             }

         }

     }

@@ -6257,13 +6573,16 @@ 
         if (empty($mesg) && empty($mesgs)) {

             dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

-            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

-            if (empty($mesgs))

-                setEventMessage($mesg, $style);

-            else {

-                if (!empty($mesg) && !in_array($mesg, $mesgs))

-                    setEventMessage($mesg, $style); // Add message string if not already into array

+            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+            }
+            if (empty($mesgs)) {
+                            setEventMessage($mesg, $style);
+            } else {

+                if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                                    setEventMessage($mesg, $style);
+                }
+                // Add message string if not already into array

                 setEventMessage($mesgs, $style);

             }

         }

@@ -6282,22 +6601,25 @@ 
     {

 // Show mesgs

         if (isset($_SESSION['dol_events']['mesgs'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+            }
             unset($_SESSION['dol_events']['mesgs']);

         }

 

 // Show errors

         if (isset($_SESSION['dol_events']['errors'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+            }
             unset($_SESSION['dol_events']['errors']);

         }

 

 // Show warnings

         if (isset($_SESSION['dol_events']['warnings'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+            }
             unset($_SESSION['dol_events']['warnings']);

         }

     }

@@ -6338,8 +6660,9 @@ 
                 foreach ($mesgarray as $message) {

                     $ret++;

                     $out .= Globals::$langs->trans($message);

-                    if ($ret < count($mesgarray))

-                        $out .= "<br>\n";

+                    if ($ret < count($mesgarray)) {
+                                            $out .= "<br>\n";
+                    }
                 }

             }

             if ($mesgstring) {

@@ -6405,8 +6728,9 @@ 
      */

     static function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)

     {

-        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))

-            return;

+        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+                    return;
+        }
 

         $iserror = 0;

         $iswarning = 0;

@@ -6421,14 +6745,17 @@ 
                     break;

                 }

             }

-        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))

-            $iserror++;

-        else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))

-            $iswarning++;

-        if ($style == 'error')

-            $iserror++;

-        if ($style == 'warning')

-            $iswarning++;

+        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+                    $iserror++;
+        } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+                    $iswarning++;
+        }
+        if ($style == 'error') {
+                    $iserror++;
+        }
+        if ($style == 'warning') {
+                    $iswarning++;
+        }
 

         if ($iserror || $iswarning) {

 // Remove div from texts

@@ -6447,8 +6774,9 @@ 
                 $mesgarray = $newmesgarray;

             }

             print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);

-        } else

-            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

+        } else {
+                    print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+        }
     }

 

     /**

@@ -6489,15 +6817,17 @@ 
             $sizearray = count($array);

             if ($sizearray > 0) {

                 $temp = array();

-                foreach (array_keys($array) as $key)

-                    $temp[$key] = $array[$key][$index];

+                foreach (array_keys($array) as $key) {
+                                    $temp[$key] = $array[$key][$index];
+                }
 

-                if (!$natsort)

-                    ($order == 'asc') ? asort($temp) : arsort($temp);

-                else {

+                if (!$natsort) {
+                                    ($order == 'asc') ? asort($temp) : arsort($temp);
+                } else {

                     ($case_sensitive) ? natsort($temp) : natcasesort($temp);

-                    if ($order != 'asc')

-                        $temp = array_reverse($temp, true);

+                    if ($order != 'asc') {
+                                            $temp = array_reverse($temp, true);
+                    }
                 }

 

                 $sorted = array();

@@ -6523,23 +6853,38 @@ 
 // We must use here a binary strlen static function (so not dol_strlen)

         $strLength = dol_strlen($str);

         for ($i = 0; $i < $strLength; $i++) {

-            if (ord($str[$i]) < 0x80)

-                continue; // 0bbbbbbb

-            elseif ((ord($str[$i]) & 0xE0) == 0xC0)

-                $n = 1; // 110bbbbb

-            elseif ((ord($str[$i]) & 0xF0) == 0xE0)

-                $n = 2; // 1110bbbb

-            elseif ((ord($str[$i]) & 0xF8) == 0xF0)

-                $n = 3; // 11110bbb

-            elseif ((ord($str[$i]) & 0xFC) == 0xF8)

-                $n = 4; // 111110bb

-            elseif ((ord($str[$i]) & 0xFE) == 0xFC)

-                $n = 5; // 1111110b

-            else

-                return false; // Does not match any model

+            if (ord($str[$i]) < 0x80) {
+                            continue;
+            }
+            // 0bbbbbbb

+            elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                            $n = 1;
+            }
+            // 110bbbbb

+            elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                            $n = 2;
+            }
+            // 1110bbbb

+            elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                            $n = 3;
+            }
+            // 11110bbb

+            elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                            $n = 4;
+            }
+            // 111110bb

+            elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                            $n = 5;
+            }
+            // 1111110b

+            else {
+                            return false;
+            }
+            // Does not match any model

             for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?

-                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

-                    return false;

+                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                                    return false;
+                }
             }

         }

         return true;

@@ -6557,15 +6902,21 @@ 
        // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

-        if (empty($tmp) && !empty($_SERVER["WINDIR"]))

-            $tmp = 'iso-8859-1'; // By default for windows

-        if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

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

-            $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

-

-        if ($tmp == 'iso-8859-1')

-            return utf8_decode($str);

+        if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+                    $tmp = 'iso-8859-1';
+        }
+        // By default for windows

+        if (empty($tmp)) {
+                    $tmp = 'utf-8';
+        }
+        // By default for other

+        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) {
+                    $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;
+        }
+

+        if ($tmp == 'iso-8859-1') {
+                    return utf8_decode($str);
+        }
         return $str;

     }

 

@@ -6586,8 +6937,9 @@ 
     {

        // global $cache_codes;

 // If key empty

-        if ($key == '')

-            return '';

+        if ($key == '') {
+                    return '';
+        }
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6599,20 +6951,21 @@ 
         $sql = "SELECT " . $fieldid . " as valuetoget";

         $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

         $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

-        if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+        if (!empty($entityfilter)) {
+                    $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+        }
 

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

         if ($resql) {

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

-            if ($obj)

-                $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-            else

-                $cache_codes[$tablename][$key][$fieldid] = '';

+            if ($obj) {
+                            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+            } else {
+                            $cache_codes[$tablename][$key][$fieldid] = '';
+            }
             $db->free($resql);

             return $cache_codes[$tablename][$key][$fieldid];

-        }

-        else {

+        } else {

             return -1;

         }

     }

@@ -6658,16 +7011,17 @@ 
         // global $soc;       // For backward compatibility

 //print $s."<br>\n";

         if ($returnvalue) {

-            if ($hideerrors)

-                return @eval('return ' . $s . ';');

-            else

-                return eval('return ' . $s . ';');

-        }

-        else {

-            if ($hideerrors)

-                @eval($s);

-            else

-                eval($s);

+            if ($hideerrors) {
+                            return @eval('return ' . $s . ';');
+            } else {
+                            return eval('return ' . $s . ';');
+            }
+        } else {

+            if ($hideerrors) {
+                            @eval($s);
+            } else {
+                            eval($s);
+            }
         }

     }

 

@@ -6693,8 +7047,9 @@ 
     {

        // global Globals::$langs;

 

-        if (empty($codelang))

-            return '';

+        if (empty($codelang)) {
+                    return '';
+        }
 

         if ($codelang == 'auto') {

             return '<span class="fa fa-globe"></span>';

@@ -6708,9 +7063,9 @@ 
             'sv_SV' => 'se'

         );

 

-        if (isset($langtocountryflag[$codelang]))

-            $flagImage = $langtocountryflag[$codelang];

-        else {

+        if (isset($langtocountryflag[$codelang])) {
+                    $flagImage = $langtocountryflag[$codelang];
+        } else {

             $tmparray = explode('_', $codelang);

             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

@@ -6728,15 +7083,20 @@ 
     {

        // global $mysoc;

 

-        if (strtoupper($countrycode) == 'MQ')

-            return 'fr_CA';

-        if (strtoupper($countrycode) == 'SE')

-            return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+        if (strtoupper($countrycode) == 'MQ') {
+                    return 'fr_CA';
+        }
+        if (strtoupper($countrycode) == 'SE') {
+                    return 'sv_SE';
+        }
+        // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

         if (strtoupper($countrycode) == 'CH') {

-            if ($mysoc->country_code == 'FR')

-                return 'fr_CH';

-            if ($mysoc->country_code == 'DE')

-                return 'de_CH';

+            if ($mysoc->country_code == 'FR') {
+                            return 'fr_CH';
+            }
+            if ($mysoc->country_code == 'DE') {
+                            return 'de_CH';
+            }
         }

 

 // Locale list taken from:

@@ -6914,8 +7274,9 @@ 
         );

 

         $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-        if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+        if (in_array($buildprimarykeytotest, $locales)) {
+                    return strtolower($countrycode) . '_' . strtoupper($countrycode);
+        }
 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

@@ -6969,18 +7330,21 @@ 
 

                 if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

                     if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-                        if ($values[0] != $type)

-                            continue;

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
 

                         if (verifCond($values[4])) {

-                            if ($values[3])

-                                Globals::$langs->load($values[3]);

+                            if ($values[3]) {
+                                                            Globals::$langs->load($values[3]);
+                            }
                             if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                                 $substitutionarray = array();

                                 complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));

                                 $label = make_substitutions($reg[1], $substitutionarray);

-                            } else

-                                $label = Globals::$langs->trans($values[2]);

+                            } else {
+                                                            $label = Globals::$langs->trans($values[2]);
+                            }
 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

                             $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -6988,30 +7352,32 @@ 
                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

                         }

-                    }

-                    else if (count($values) == 5) {       // deprecated

+                    } else if (count($values) == 5) {       // deprecated

                         dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

 

-                        if ($values[0] != $type)

-                            continue;

-                        if ($values[3])

-                            Globals::$langs->load($values[3]);

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
+                        if ($values[3]) {
+                                                    Globals::$langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = Globals::$langs->trans($values[2]);

+                        } else {
+                                                    $label = Globals::$langs->trans($values[2]);
+                        }
 

                         $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

                         $head[$h][1] = $label;

                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

                     }

-                }

-                else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-                    if ($values[0] != $type)

-                        continue;

+                } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
                     $tabname = str_replace('-', '', $values[1]);

                     foreach ($head as $key => $val) {

                         $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -7053,10 +7419,11 @@ 
         // global $action;

         // global $micro_start_time;

 

-        if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

-        else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+        if ($zone == 'private') {
+                    print "\n" . '<!-- Common footer for private page -->' . "\n";
+        } else {
+                    print "\n" . '<!-- Common footer for public page -->' . "\n";
+        }
 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7065,8 +7432,9 @@ 
         $parameters = array();

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

         if (empty($reshook)) {

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

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) {
+                            print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";
+            }
 

             print "\n";

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

@@ -7089,8 +7457,9 @@ 
                     print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                     $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);

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7101,14 +7470,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7127,14 +7499,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7173,8 +7548,9 @@ 
                     print "\n";

                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

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

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

+                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) {
+                                            print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';
+                    }
                     print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

@@ -7304,8 +7680,9 @@ 
 

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

         $res = '';

-        if (!is_array($fields))

-            $fields = array($fields);

+        if (!is_array($fields)) {
+                    $fields = array($fields);
+        }
 

         $nboffields = count($fields);

         $end2 = count($crits);

@@ -7368,8 +7745,9 @@ 
                     $tmpcrits = explode('|', $crit);

                     $i3 = 0;

                     foreach ($tmpcrits as $tmpcrit) {

-                        if (empty($tmpcrit))

-                            continue;

+                        if (empty($tmpcrit)) {
+                                                    continue;
+                        }
 

                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7405,8 +7783,9 @@ 
                 }

                 $i++;

             }

-            if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+            if ($newres) {
+                            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+            }
             $j++;

         }

         $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

@@ -7446,29 +7825,37 @@ 
     static function getImageFileNameForSize($file, $extName, $extImgTarget = '')

     {

         $dirName = dirname($file);

-        if ($dirName == '.')

-            $dirName = '';

+        if ($dirName == '.') {
+                    $dirName = '';
+        }
 

         $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case

         $fileName = basename($fileName);

 

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-

-        if (!$extImgTarget)

-            return $file;

+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+        }
+

+        if (!$extImgTarget) {
+                    return $file;
+        }
 

         $subdir = '';

-        if ($extName)

-            $subdir = 'thumbs/';

+        if ($extName) {
+                    $subdir = 'thumbs/';
+        }
 

         return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

     }

@@ -7486,8 +7873,9 @@ 
     {

        // global Globals::$conf, Globals::$langs;

 

-        if (empty(Globals::$conf->use_javascript_ajax))

-            return '';

+        if (empty(Globals::$conf->use_javascript_ajax)) {
+                    return '';
+        }
 

         $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

 //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7495,17 +7883,19 @@ 
         $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

         if ($alldata == 1) {

-            if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

-            else

-                return array();

+            if ($num_mime !== false) {
+                            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+            } else {
+                            return array();
+            }
         }

 

 // old behavior

-        if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';

-        else

-            return '';

+        if ($num_mime !== false) {
+                    return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -7523,8 +7913,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-        if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';

+        if ($addlink) {
+                    $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';
+        }
         return $out;

     }

 

@@ -7906,8 +8297,9 @@ 
         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

             $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-            if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+            if ($checkentity) {
+                            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+            }
 

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

             if ($resql) {

@@ -7919,11 +8311,14 @@ 
             }

         }

 

-        if (!empty($dictvalues[$tablename][$id]))

-            return $dictvalues[$tablename][$id]->{$field}; // Found

+        if (!empty($dictvalues[$tablename][$id])) {
+                    return $dictvalues[$tablename][$id]->{$field};
+        }
+        // Found

         else { // Not found

-            if ($id > 0)

-                return $id;

+            if ($id > 0) {
+                            return $id;
+            }
             return '';

         }

     }

@@ -7953,8 +8348,9 @@ 
                 $b = hexdec($hexb);

             }

             $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

-            if ($bright > 0.6)

-                $res = 1;

+            if ($bright > 0.6) {
+                            $res = 1;
+            }
         }

         return $res;

     }

@@ -7972,8 +8368,10 @@ 
        // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

-        if (empty($menuentry['enabled']))

-            return 0; // Entry disabled by condition

+        if (empty($menuentry['enabled'])) {
+                    return 0;
+        }
+        // Entry disabled by condition

         if ($type_user && $menuentry['module']) {

             $tmploops = explode('|', $menuentry['module']);

             $found = 0;

@@ -7983,15 +8381,23 @@ 
                     break;

                 }

             }

-            if (!$found)

-                return 0; // Entry is for menus all excluded to external users

-        }

-        if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

-        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

-            return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-        if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            if (!$found) {
+                            return 0;
+            }
+            // Entry is for menus all excluded to external users

+        }

+        if (!$menuentry['perms'] && $type_user) {
+                    return 0;
+        }
+        // No permissions and user is external

+        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+                    return 0;
+        }
+        // No permissions and option to hide when not allowed, even for internal user, is on

+        if (!$menuentry['perms']) {
+                    return 2;
+        }
+        // No permissions and user is external

         return 1;

     }

 

Helpers/EldyLib.php

Braces +34 added lines, -22 removed lines

@@ -303,8 +303,9 @@ 
             if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") {

                 $classname = 'class="tmenusel"';

                 $_SESSION['idmenu'] = '';

-            } else

-                $classname = 'class="tmenu"';

+            } else {
+                            $classname = 'class="tmenu"';
+            }
             $idsel = 'bank';

 

 //$menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', Globals::$langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 52, $id, $idsel, $classname);

@@ -1383,25 +1384,33 @@ 
                                     $nature = '';

 

 // Must match array $sourceList defined into journals_list.php

-                                    if ($objp->nature == 2 && !empty($conf->facture->enabled))

-                                        $nature = "sells";

-                                    if ($objp->nature == 3 && !empty($conf->fournisseur->enabled))

-                                        $nature = "purchases";

-                                    if ($objp->nature == 4 && !empty($conf->banque->enabled))

-                                        $nature = "bank";

-                                    if ($objp->nature == 5 && !empty($conf->expensereport->enabled))

-                                        $nature = "expensereports";

-                                    if ($objp->nature == 1)

-                                        $nature = "various";

-                                    if ($objp->nature == 8)

-                                        $nature = "inventory";

-                                    if ($objp->nature == 9)

-                                        $nature = "hasnew";

+                                    if ($objp->nature == 2 && !empty($conf->facture->enabled)) {
+                                                                            $nature = "sells";
+                                    }
+                                    if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) {
+                                                                            $nature = "purchases";
+                                    }
+                                    if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+                                                                            $nature = "bank";
+                                    }
+                                    if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) {
+                                                                            $nature = "expensereports";
+                                    }
+                                    if ($objp->nature == 1) {
+                                                                            $nature = "various";
+                                    }
+                                    if ($objp->nature == 8) {
+                                                                            $nature = "inventory";
+                                    }
+                                    if ($objp->nature == 9) {
+                                                                            $nature = "hasnew";
+                                    }
 

 // To enable when page exists

                                     if (empty(Conf::$global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {

-                                        if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory')

-                                            $nature = '';

+                                        if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+                                                                                    $nature = '';
+                                        }
                                     }

 

                                     if ($nature) {

@@ -1416,8 +1425,9 @@ 
 // Should not happend. Entries are added

                                 $newmenu->add('', Globals::$langs->trans("NoJournalDefined"), 2, Globals::$user->rights->accounting->comptarapport->lire);

                             }

-                        } else

-                            dol_print_error(Config::$dbEngine);

+                        } else {
+                                                    dol_print_error(Config::$dbEngine);
+                        }
                         Config::$dbEngine->free($resql);

                     }

 

@@ -1451,8 +1461,10 @@ 
                     }

 

                     $modecompta = 'CREANCES-DETTES';

-                    if (!empty($conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')

-                        $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+                    if (!empty($conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+                                            $modecompta = 'BOOKKEEPING';
+                    }
+                    // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

                     if ($modecompta) {

                         if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

                             /*

Base/AlixarView.php

Braces +123 added lines, -80 removed lines

@@ -189,15 +189,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)) {
@@ -237,12 +242,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
             }
 
@@ -336,8 +344,9 @@ 
             print "<!-- End top horizontal menu -->\n\n";
         }
 
-        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+        }
     }
 
     /**
@@ -362,8 +371,9 @@ 
         $searchform = '';
         $bookmarks = '';
 
-        if (!empty($menu_array_before))
-            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        if (!empty($menu_array_before)) {
+                    dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 // Instantiate hooks of thirdparty module
@@ -371,8 +381,10 @@ 
 
             print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-            if (Globals::$conf->browser->layout == 'phone')
-                Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+            if (Globals::$conf->browser->layout == 'phone') {
+                            Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+            }
+            // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
             print "\n";
 
@@ -399,8 +411,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)) {
@@ -444,38 +457,49 @@ 
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
                 $doliurl = 'https://www.dolibarr.org';
 //local communities
-                if (preg_match('/fr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.fr';
-                if (preg_match('/es/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.es';
-                if (preg_match('/de/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.de';
-                if (preg_match('/it/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.it';
-                if (preg_match('/gr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.gr';
+                if (preg_match('/fr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.fr';
+                }
+                if (preg_match('/es/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.es';
+                }
+                if (preg_match('/de/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.de';
+                }
+                if (preg_match('/it/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.it';
+                }
+                if (preg_match('/gr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.gr';
+                }
 
                 $appli = constant('DOL_APPLICATION_TITLE');
                 if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                     $doliurl = '';
                     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;
+                }
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-                if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-                else
-                    print '<span class="help">';
+                if ($doliurl) {
+                                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                } else {
+                                    print '<span class="help">';
+                }
                 print $appli;
-                if ($doliurl)
-                    print '</a>';
-                else
-                    print '</span>';
+                if ($doliurl) {
+                                    print '</a>';
+                } else {
+                                    print '</span>';
+                }
                 print '</div>' . "\n";
             }
 
@@ -522,8 +546,9 @@ 
         print "\n";
         print '<!-- Begin right area -->' . "\n";
 
-        if (empty($leftmenuwithoutmainarea))
-            main_area($title);
+        if (empty($leftmenuwithoutmainarea)) {
+                    main_area($title);
+        }
     }
 
     /**
@@ -536,15 +561,17 @@ 
     {
 // global Globals::$conf, Globals::$langs;
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '<div id="id-right">';
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+                    print '<div id="id-right">';
+        }
 
         print "\n";
 
         print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-            print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+                    print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+        }
     }
 
     /**
@@ -569,18 +596,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';
         }
@@ -611,8 +641,9 @@ 
         $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         $ret .= '<input type="hidden" name="mode" value="search">';
         $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag(Globals::$user->login) . '">';
-        if ($showtitlebefore)
-            $ret .= $title . ' ';
+        if ($showtitlebefore) {
+                    $ret .= $title . ' ';
+        }
         $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
         $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
         $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -654,10 +685,12 @@ 
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -668,8 +701,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)) {
@@ -677,12 +711,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]);
@@ -709,20 +746,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";
+        }
 
         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/User.php

Braces +10 added lines, -8 removed lines

@@ -520,16 +520,17 @@ 
                     $nid = $obj->id;

 

                     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_rights WHERE fk_user = " . $this->id . " AND fk_id=" . $nid . " AND entity = " . $entity;

-                    if (!Config::$dbEngine->query($sql))

-                        $error++;

+                    if (!Config::$dbEngine->query($sql)) {
+                                            $error++;
+                    }
                     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_rights (entity, fk_user, fk_id) VALUES (" . $entity . ", " . $this->id . ", " . $nid . ")";

-                    if (!Config::$dbEngine->query($sql))

-                        $error++;

+                    if (!Config::$dbEngine->query($sql)) {
+                                            $error++;
+                    }
 

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $error++;

                 dol_print_error(Config::$dbEngine);

             }

@@ -2224,8 +2225,9 @@ 
             } else {

                 $result .= $this->getFullName(Globals::$langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);

             }

-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-                $result .= '</div>';

+            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                            $result .= '</div>';
+            }
         }

         $result .= (($option == 'nolink') ? '' : $linkend);

 //if ($withpictoimg == -1) $result.='</div>';

Base/Conf.php

Braces +229 added lines, -151 removed lines

@@ -156,27 +156,32 @@ 
                                 $this->modules_parts[$partname] = array();

                             }

                             $arrValue = json_decode($value, true);

-                            if (is_array($arrValue) && !empty($arrValue))

-                                $value = $arrValue;

-                            else if (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl')))

-                                $value = '/' . $modulename . '/core/' . $partname . '/';

-                            else if (in_array($partname, array('models', 'theme')))

-                                $value = '/' . $modulename . '/';

-                            else if (in_array($partname, array('sms')))

-                                $value = '/' . $modulename . '/';

-                            else if ($value == 1)

-                                $value = '/' . $modulename . '/core/modules/' . $partname . '/'; // ex: partname = societe

+                            if (is_array($arrValue) && !empty($arrValue)) {
+                                                            $value = $arrValue;
+                            } else if (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {
+                                                            $value = '/' . $modulename . '/core/' . $partname . '/';
+                            } else if (in_array($partname, array('models', 'theme'))) {
+                                                            $value = '/' . $modulename . '/';
+                            } else if (in_array($partname, array('sms'))) {
+                                                            $value = '/' . $modulename . '/';
+                            } else if ($value == 1) {
+                                                            $value = '/' . $modulename . '/core/modules/' . $partname . '/';
+                            }
+                            // ex: partname = societe

                             $this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array

                         }

                         // If this is a module constant (must be at end)

                         elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {

                             $modulename = strtolower($reg[1]);

-                            if ($modulename == 'propale')

-                                $modulename = 'propal';

-                            if ($modulename == 'supplierproposal')

-                                $modulename = 'supplier_proposal';

-                            if (!isset($this->$modulename) || !is_object($this->$modulename))

-                                $this->$modulename = new \stdClass();

+                            if ($modulename == 'propale') {
+                                                            $modulename = 'propal';
+                            }
+                            if ($modulename == 'supplierproposal') {
+                                                            $modulename = 'supplier_proposal';
+                            }
+                            if (!isset($this->$modulename) || !is_object($this->$modulename)) {
+                                                            $this->$modulename = new \stdClass();
+                            }
                             $this->$modulename->enabled = true;

                             $this->modules[] = $modulename;              // Add this module in list of enabled modules

                         }

@@ -224,46 +229,60 @@ 
         }

 

         // Clean some variables

-        if (empty(Conf::$global->MAIN_MENU_STANDARD))

-            Conf::$global->MAIN_MENU_STANDARD = "eldy_menu.php";

-        if (empty(Conf::$global->MAIN_MENUFRONT_STANDARD))

-            Conf::$global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";

-        if (empty(Conf::$global->MAIN_MENU_SMARTPHONE))

-            Conf::$global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

-        if (empty(Conf::$global->MAIN_MENUFRONT_SMARTPHONE))

-            Conf::$global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

+        if (empty(Conf::$global->MAIN_MENU_STANDARD)) {
+                    Conf::$global->MAIN_MENU_STANDARD = "eldy_menu.php";
+        }
+        if (empty(Conf::$global->MAIN_MENUFRONT_STANDARD)) {
+                    Conf::$global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
+        }
+        if (empty(Conf::$global->MAIN_MENU_SMARTPHONE)) {
+                    Conf::$global->MAIN_MENU_SMARTPHONE = "eldy_menu.php";
+        }
+        // Use eldy by default because smartphone does not work on all phones

+        if (empty(Conf::$global->MAIN_MENUFRONT_SMARTPHONE)) {
+                    Conf::$global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php";
+        }
+        // Use eldy by default because smartphone does not work on all phones

 

 

 

 

             // Clean var use vat for company

-        if (!isset(Conf::$global->FACTURE_TVAOPTION))

-            Conf::$global->FACTURE_TVAOPTION = 1;

-        else if (!empty(Conf::$global->FACTURE_TVAOPTION) && !is_numeric(Conf::$global->FACTURE_TVAOPTION)) {

+        if (!isset(Conf::$global->FACTURE_TVAOPTION)) {
+                    Conf::$global->FACTURE_TVAOPTION = 1;
+        } else if (!empty(Conf::$global->FACTURE_TVAOPTION) && !is_numeric(Conf::$global->FACTURE_TVAOPTION)) {

             // Old value of option, we clean to use new value (0 or 1)

-            if (Conf::$global->FACTURE_TVAOPTION != "franchise")

-                Conf::$global->FACTURE_TVAOPTION = 1;

-            else

-                Conf::$global->FACTURE_TVAOPTION = 0;

+            if (Conf::$global->FACTURE_TVAOPTION != "franchise") {
+                            Conf::$global->FACTURE_TVAOPTION = 1;
+            } else {
+                            Conf::$global->FACTURE_TVAOPTION = 0;
+            }
         }

 

         // Variable globales LDAP

-        if (empty(Conf::$global->LDAP_FIELD_FULLNAME))

-            Conf::$global->LDAP_FIELD_FULLNAME = '';

-        if (!isset(Conf::$global->LDAP_KEY_USERS))

-            Conf::$global->LDAP_KEY_USERS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_GROUPS))

-            Conf::$global->LDAP_KEY_GROUPS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_CONTACTS))

-            Conf::$global->LDAP_KEY_CONTACTS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_MEMBERS))

-            Conf::$global->LDAP_KEY_MEMBERS = Conf::$global->LDAP_FIELD_FULLNAME;

-        if (!isset(Conf::$global->LDAP_KEY_MEMBERS_TYPES))

-            Conf::$global->LDAP_KEY_MEMBERS_TYPES = Conf::$global->LDAP_FIELD_FULLNAME;

+        if (empty(Conf::$global->LDAP_FIELD_FULLNAME)) {
+                    Conf::$global->LDAP_FIELD_FULLNAME = '';
+        }
+        if (!isset(Conf::$global->LDAP_KEY_USERS)) {
+                    Conf::$global->LDAP_KEY_USERS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_GROUPS)) {
+                    Conf::$global->LDAP_KEY_GROUPS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_CONTACTS)) {
+                    Conf::$global->LDAP_KEY_CONTACTS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_MEMBERS)) {
+                    Conf::$global->LDAP_KEY_MEMBERS = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
+        if (!isset(Conf::$global->LDAP_KEY_MEMBERS_TYPES)) {
+                    Conf::$global->LDAP_KEY_MEMBERS_TYPES = Conf::$global->LDAP_FIELD_FULLNAME;
+        }
 

         // Load translation object with current language

-        if (empty(Conf::$global->MAIN_LANG_DEFAULT))

-            Conf::$global->MAIN_LANG_DEFAULT = "en_US";

+        if (empty(Conf::$global->MAIN_LANG_DEFAULT)) {
+                    Conf::$global->MAIN_LANG_DEFAULT = "en_US";
+        }
 

         $rootfordata = DOL_DATA_ROOT;

         $rootforuser = DOL_DATA_ROOT;

@@ -413,21 +432,29 @@ 
         Conf::$global->MAIN_MAIL_USE_MULTI_PART = 1;

 

         // societe

-        if (empty(Conf::$global->SOCIETE_CODECLIENT_ADDON))

-            Conf::$global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";

-        if (empty(Conf::$global->SOCIETE_CODECOMPTA_ADDON))

-            Conf::$global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";

-

-        if (empty(Conf::$global->CHEQUERECEIPTS_ADDON))

-            Conf::$global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';

-        if (empty($conf->global->TICKETSUP_ADDON))

-            Conf::$global->TICKETSUP_ADDON = 'mod_ticket_simple';

+        if (empty(Conf::$global->SOCIETE_CODECLIENT_ADDON)) {
+                    Conf::$global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
+        }
+        if (empty(Conf::$global->SOCIETE_CODECOMPTA_ADDON)) {
+                    Conf::$global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
+        }
+

+        if (empty(Conf::$global->CHEQUERECEIPTS_ADDON)) {
+                    Conf::$global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+        }
+        if (empty($conf->global->TICKETSUP_ADDON)) {
+                    Conf::$global->TICKETSUP_ADDON = 'mod_ticket_simple';
+        }
 

         // Security

-        if (empty(Conf::$global->USER_PASSWORD_GENERATED))

-            Conf::$global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator

-        if (empty(Conf::$global->MAIN_UMASK))

-            Conf::$global->MAIN_UMASK = '0664';         // Default mask

+        if (empty(Conf::$global->USER_PASSWORD_GENERATED)) {
+                    Conf::$global->USER_PASSWORD_GENERATED = 'standard';
+        }
+        // Default password generator

+        if (empty(Conf::$global->MAIN_UMASK)) {
+                    Conf::$global->MAIN_UMASK = '0664';
+        }
+        // Default mask

 

 

 

@@ -435,8 +462,9 @@ 
 

             // conf->use_javascript_ajax

         $this->use_javascript_ajax = 1;

-        if (isset(Conf::$global->MAIN_DISABLE_JAVASCRIPT))

-            $this->use_javascript_ajax = !Conf::$global->MAIN_DISABLE_JAVASCRIPT;

+        if (isset(Conf::$global->MAIN_DISABLE_JAVASCRIPT)) {
+                    $this->use_javascript_ajax = !Conf::$global->MAIN_DISABLE_JAVASCRIPT;
+        }
         // If no javascript_ajax, Ajax features are disabled.

         if (empty($this->use_javascript_ajax)) {

             unset(Conf::$global->PRODUIT_USE_SEARCH_TO_SELECT);

@@ -452,29 +480,34 @@ 
             Conf::$global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;

             Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;

             Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;

-            if (empty($this->reception->enabled))

-                Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;

-            else {

+            if (empty($this->reception->enabled)) {
+                            Conf::$global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
+            } else {

                 Conf::$global->STOCK_CALCULATE_ON_RECEPTION = 1;

                 Conf::$global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;

             }

         }

 

         // conf->currency

-        if (empty(Conf::$global->MAIN_MONNAIE))

-            Conf::$global->MAIN_MONNAIE = 'EUR';

+        if (empty(Conf::$global->MAIN_MONNAIE)) {
+                    Conf::$global->MAIN_MONNAIE = 'EUR';
+        }
         $this->currency = Conf::$global->MAIN_MONNAIE;

 

-        if (empty(Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY))

-            Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure

+        if (empty(Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) {
+                    Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;
+        }
+        // Less than 1 minutes to be sure

 

 

 

 

 

             // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)

-        if (empty(Conf::$global->ACCOUNTING_MODE))

-            Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

+        if (empty(Conf::$global->ACCOUNTING_MODE)) {
+                    Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES';
+        }
+        // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

 

 

 

@@ -484,44 +517,53 @@ 
         Conf::$global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;

 

         // MAIN_HTML_TITLE

-        if (!isset(Conf::$global->MAIN_HTML_TITLE))

-            Conf::$global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';

+        if (!isset(Conf::$global->MAIN_HTML_TITLE)) {
+                    Conf::$global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+        }
 

         // conf->liste_limit = constante de taille maximale des listes

-        if (empty(Conf::$global->MAIN_SIZE_LISTE_LIMIT))

-            Conf::$global->MAIN_SIZE_LISTE_LIMIT = 25;

+        if (empty(Conf::$global->MAIN_SIZE_LISTE_LIMIT)) {
+                    Conf::$global->MAIN_SIZE_LISTE_LIMIT = 25;
+        }
         $this->liste_limit = Conf::$global->MAIN_SIZE_LISTE_LIMIT;

 

         // conf->product->limit_size = constante de taille maximale des select de produit

-        if (!isset(Conf::$global->PRODUIT_LIMIT_SIZE))

-            Conf::$global->PRODUIT_LIMIT_SIZE = 1000;

+        if (!isset(Conf::$global->PRODUIT_LIMIT_SIZE)) {
+                    Conf::$global->PRODUIT_LIMIT_SIZE = 1000;
+        }
         $this->product->limit_size = Conf::$global->PRODUIT_LIMIT_SIZE;

 

         // conf->theme et $this->css

-        if (empty(Conf::$global->MAIN_THEME))

-            Conf::$global->MAIN_THEME = "eldy";

-        if (!empty(Conf::$global->MAIN_FORCETHEME))

-            Conf::$global->MAIN_THEME = Conf::$global->MAIN_FORCETHEME;

+        if (empty(Conf::$global->MAIN_THEME)) {
+                    Conf::$global->MAIN_THEME = "eldy";
+        }
+        if (!empty(Conf::$global->MAIN_FORCETHEME)) {
+                    Conf::$global->MAIN_THEME = Conf::$global->MAIN_FORCETHEME;
+        }
         $this->theme = Conf::$global->MAIN_THEME;

         //$this->css  = "/theme/".$this->theme."/style.css.php";

         $this->css = '?controller=theme/' . $this->theme . '&method=style.css';

 

         // conf->email_from = email pour envoi par dolibarr des mails automatiques

         $this->email_from = "robot@example.com";

-        if (!empty(Conf::$global->MAIN_MAIL_EMAIL_FROM))

-            $this->email_from = Conf::$global->MAIN_MAIL_EMAIL_FROM;

+        if (!empty(Conf::$global->MAIN_MAIL_EMAIL_FROM)) {
+                    $this->email_from = Conf::$global->MAIN_MAIL_EMAIL_FROM;
+        }
 

         // conf->notification->email_from = email pour envoi par Dolibarr des notifications

         $this->notification->email_from = $this->email_from;

-        if (!empty(Conf::$global->NOTIFICATION_EMAIL_FROM))

-            $this->notification->email_from = Conf::$global->NOTIFICATION_EMAIL_FROM;

+        if (!empty(Conf::$global->NOTIFICATION_EMAIL_FROM)) {
+                    $this->notification->email_from = Conf::$global->NOTIFICATION_EMAIL_FROM;
+        }
 

         // conf->mailing->email_from = email pour envoi par Dolibarr des mailings

         $this->mailing->email_from = $this->email_from;

-        if (!empty(Conf::$global->MAILING_EMAIL_FROM))

-            $this->mailing->email_from = Conf::$global->MAILING_EMAIL_FROM;

-        if (!isset(Conf::$global->MAIN_EMAIL_ADD_TRACK_ID))

-            Conf::$global->MAIN_EMAIL_ADD_TRACK_ID = 1;

+        if (!empty(Conf::$global->MAILING_EMAIL_FROM)) {
+                    $this->mailing->email_from = Conf::$global->MAILING_EMAIL_FROM;
+        }
+        if (!isset(Conf::$global->MAIN_EMAIL_ADD_TRACK_ID)) {
+                    Conf::$global->MAIN_EMAIL_ADD_TRACK_ID = 1;
+        }
 

         // Format for date (used by default when not found or not searched in lang)

         $this->format_date_short = "%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)

@@ -536,81 +578,105 @@ 
         $this->format_date_hour_text = "%d %B %Y %H:%M";

 

         // Duration of workday

-        if (!isset(Conf::$global->MAIN_DURATION_OF_WORKDAY))

-            Conf::$global->MAIN_DURATION_OF_WORKDAY = 86400;

+        if (!isset(Conf::$global->MAIN_DURATION_OF_WORKDAY)) {
+                    Conf::$global->MAIN_DURATION_OF_WORKDAY = 86400;
+        }
 

         // Limites decimales si non definie (peuvent etre egale a 0)

-        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_UNIT))

-            Conf::$global->MAIN_MAX_DECIMALS_UNIT = 5;

-        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_TOT))

-            Conf::$global->MAIN_MAX_DECIMALS_TOT = 2;

-        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_SHOWN))

-            Conf::$global->MAIN_MAX_DECIMALS_SHOWN = 8;

+        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_UNIT)) {
+                    Conf::$global->MAIN_MAX_DECIMALS_UNIT = 5;
+        }
+        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_TOT)) {
+                    Conf::$global->MAIN_MAX_DECIMALS_TOT = 2;
+        }
+        if (!isset(Conf::$global->MAIN_MAX_DECIMALS_SHOWN)) {
+                    Conf::$global->MAIN_MAX_DECIMALS_SHOWN = 8;
+        }
 

         // Default pdf option

-        if (!isset(Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES))

-            Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1;    // use dash between lines

-        if (!isset(Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT))

-            Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1;  // allow html content into free footer text

+        if (!isset(Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES)) {
+                    Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1;
+        }
+        // use dash between lines

+        if (!isset(Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+                    Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1;
+        }
+        // allow html content into free footer text

 

 

 

 

 

             // Set default value to MAIN_SHOW_LOGO

-        if (!isset(Conf::$global->MAIN_SHOW_LOGO))

-            Conf::$global->MAIN_SHOW_LOGO = 1;

+        if (!isset(Conf::$global->MAIN_SHOW_LOGO)) {
+                    Conf::$global->MAIN_SHOW_LOGO = 1;
+        }
 

         // Default max file size for upload

         $this->maxfilesize = (empty(Conf::$global->MAIN_UPLOAD_DOC) ? 0 : (int) Conf::$global->MAIN_UPLOAD_DOC * 1024);

 

         // By default, we propagate contacts

-        if (!isset(Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))

-            Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

+        if (!isset(Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {
+                    Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*';
+        }
+        // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

 

 

 

 

 

             // By default, we do not use the zip town table but the table of third parties

-        if (!isset(Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY))

-            Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;

+        if (!isset(Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
+                    Conf::$global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
+        }
 

         // By default, we open card if one found

-        if (!isset(Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE))

-            Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;

+        if (!isset(Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) {
+                    Conf::$global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
+        }
 

         // By default, we show state code in combo list

-        if (!isset(Conf::$global->MAIN_SHOW_STATE_CODE))

-            Conf::$global->MAIN_SHOW_STATE_CODE = 1;

+        if (!isset(Conf::$global->MAIN_SHOW_STATE_CODE)) {
+                    Conf::$global->MAIN_SHOW_STATE_CODE = 1;
+        }
 

         // Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"

-        if (!isset(Conf::$global->MAIN_MODULES_FOR_EXTERNAL))

-            Conf::$global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.

+        if (!isset(Conf::$global->MAIN_MODULES_FOR_EXTERNAL)) {
+                    Conf::$global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog';
+        }
+        // '' means 'all'. Note that contact is added here as it should be a module later.

         if (!empty($this->modules_parts['moduleforexternal'])) {  // Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list

-            foreach ($this->modules_parts['moduleforexternal'] as $key => $value)

-                Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= "," . $key;

+            foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
+                            Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= "," . $key;
+            }
         }

 

         // Enable select2

-        if (empty(Conf::$global->MAIN_USE_JQUERY_MULTISELECT) || Conf::$global->MAIN_USE_JQUERY_MULTISELECT == '1')

-            Conf::$global->MAIN_USE_JQUERY_MULTISELECT = 'select2';

+        if (empty(Conf::$global->MAIN_USE_JQUERY_MULTISELECT) || Conf::$global->MAIN_USE_JQUERY_MULTISELECT == '1') {
+                    Conf::$global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
+        }
 

         // Timeouts

-        if (empty(Conf::$global->MAIN_USE_CONNECT_TIMEOUT))

-            Conf::$global->MAIN_USE_CONNECT_TIMEOUT = 10;

-        if (empty(Conf::$global->MAIN_USE_RESPONSE_TIMEOUT))

-            Conf::$global->MAIN_USE_RESPONSE_TIMEOUT = 30;

+        if (empty(Conf::$global->MAIN_USE_CONNECT_TIMEOUT)) {
+                    Conf::$global->MAIN_USE_CONNECT_TIMEOUT = 10;
+        }
+        if (empty(Conf::$global->MAIN_USE_RESPONSE_TIMEOUT)) {
+                    Conf::$global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+        }
 

         // Set default variable to calculate VAT as if option tax_mode was 0 (standard)

-        if (empty(Conf::$global->TAX_MODE_SELL_PRODUCT))

-            Conf::$global->TAX_MODE_SELL_PRODUCT = 'invoice';

-        if (empty(Conf::$global->TAX_MODE_BUY_PRODUCT))

-            Conf::$global->TAX_MODE_BUY_PRODUCT = 'invoice';

-        if (empty(Conf::$global->TAX_MODE_SELL_SERVICE))

-            Conf::$global->TAX_MODE_SELL_SERVICE = 'payment';

-        if (empty(Conf::$global->TAX_MODE_BUY_SERVICE))

-            Conf::$global->TAX_MODE_BUY_SERVICE = 'payment';

+        if (empty(Conf::$global->TAX_MODE_SELL_PRODUCT)) {
+                    Conf::$global->TAX_MODE_SELL_PRODUCT = 'invoice';
+        }
+        if (empty(Conf::$global->TAX_MODE_BUY_PRODUCT)) {
+                    Conf::$global->TAX_MODE_BUY_PRODUCT = 'invoice';
+        }
+        if (empty(Conf::$global->TAX_MODE_SELL_SERVICE)) {
+                    Conf::$global->TAX_MODE_SELL_SERVICE = 'payment';
+        }
+        if (empty(Conf::$global->TAX_MODE_BUY_SERVICE)) {
+                    Conf::$global->TAX_MODE_BUY_SERVICE = 'payment';
+        }
 

         // Delay before warnings

         // Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx

@@ -618,8 +684,9 @@ 
             $this->adherent->subscription = new \stdClass();

             $this->adherent->subscription->warning_delay = (isset(Conf::$global->MAIN_DELAY_MEMBERS) ? Conf::$global->MAIN_DELAY_MEMBERS : 0) * 24 * 60 * 60;

         }

-        if (isset($this->agenda))

-            $this->agenda->warning_delay = (isset(Conf::$global->MAIN_DELAY_ACTIONS_TODO) ? Conf::$global->MAIN_DELAY_ACTIONS_TODO : 7) * 24 * 60 * 60;

+        if (isset($this->agenda)) {
+                    $this->agenda->warning_delay = (isset(Conf::$global->MAIN_DELAY_ACTIONS_TODO) ? Conf::$global->MAIN_DELAY_ACTIONS_TODO : 7) * 24 * 60 * 60;
+        }
         if (isset($this->projet)) {

             $this->projet->warning_delay = (isset(Conf::$global->MAIN_DELAY_PROJECT_TO_CLOSE) ? Conf::$global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 24 * 60 * 60;

             $this->projet->task = new StdClass();

@@ -669,44 +736,55 @@ 
         }

 

         // For modules that want to disable top or left menu

-        if (!empty(Conf::$global->MAIN_HIDE_TOP_MENU))

-            $this->dol_hide_topmenu = Conf::$global->MAIN_HIDE_TOP_MENU;

-        if (!empty(Conf::$global->MAIN_HIDE_LEFT_MENU))

-            $this->dol_hide_leftmenu = Conf::$global->MAIN_HIDE_LEFT_MENU;

+        if (!empty(Conf::$global->MAIN_HIDE_TOP_MENU)) {
+                    $this->dol_hide_topmenu = Conf::$global->MAIN_HIDE_TOP_MENU;
+        }
+        if (!empty(Conf::$global->MAIN_HIDE_LEFT_MENU)) {
+                    $this->dol_hide_leftmenu = Conf::$global->MAIN_HIDE_LEFT_MENU;
+        }
 

-        if (empty(Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT))

-            Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT = 3;

+        if (empty(Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT)) {
+                    Conf::$global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
+        }
 

-        if (!isset(Conf::$global->THEME_HIDE_BORDER_ON_INPUT))

-            Conf::$global->THEME_HIDE_BORDER_ON_INPUT = 0;

+        if (!isset(Conf::$global->THEME_HIDE_BORDER_ON_INPUT)) {
+                    Conf::$global->THEME_HIDE_BORDER_ON_INPUT = 0;
+        }
 

         // Save inconsistent option

         if (empty(Conf::$global->AGENDA_USE_EVENT_TYPE) && (!isset(Conf::$global->AGENDA_DEFAULT_FILTER_TYPE) || Conf::$global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {

             Conf::$global->AGENDA_DEFAULT_FILTER_TYPE = '0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

         }

 

-        if (!isset(Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD))

-            Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1;

+        if (!isset(Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD)) {
+                    Conf::$global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1;
+        }
 

         Conf::$global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';

         Conf::$global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';

 

         // For backward compatibility

-        if (isset($this->product))

-            $this->produit = $this->product;

-        if (isset($this->facture))

-            $this->invoice = $this->facture;

-        if (isset($this->commande))

-            $this->order = $this->commande;

-        if (isset($this->contrat))

-            $this->contract = $this->contrat;

-        if (isset($this->categorie))

-            $this->category = $this->categorie;

+        if (isset($this->product)) {
+                    $this->produit = $this->product;
+        }
+        if (isset($this->facture)) {
+                    $this->invoice = $this->facture;
+        }
+        if (isset($this->commande)) {
+                    $this->order = $this->commande;
+        }
+        if (isset($this->contrat)) {
+                    $this->contract = $this->contrat;
+        }
+        if (isset($this->categorie)) {
+                    $this->category = $this->categorie;
+        }
 

         // Object $mc

         if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {

-            if (is_object($mc))

-                $mc->setValues($this);

+            if (is_object($mc)) {
+                            $mc->setValues($this);
+            }
         }

 

         // We init log handlers

Base/Menu.php

Braces +3 added lines, -1 removed lines

@@ -122,7 +122,9 @@
         $nb=0;

         foreach($this->liste as $val)

         {

-            if (! empty($val['enabled'])) $nb++;

+            if (! empty($val['enabled'])) {
+                $nb++;
+            }
         }

         return $nb;

     }

Base/CommonObject.php

Braces +1380 added lines, -847 removed lines

@@ -401,23 +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 = ".$conf->entity;

+		if ($ref || $ref_ext) {
+		    $sql.= " AND entity = ".$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;

 	}

@@ -446,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 .= DolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder);

@@ -545,14 +558,15 @@ 
 		{

             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $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++;

 		}

@@ -593,13 +607,21 @@ 
 		$out.='<div style="clear: both;">';

 		if (! empty($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>';

@@ -659,10 +681,10 @@ 
 					$this->errors = $ecmfile->errors;

 				}

 				*/

-			}

-			else return '';

-		}

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

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

 		{

 			// Add entry into index

 			if ($initsharekey)

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

 				$ecmfile->share = getRandomPassword(true);

 				$ecmfile->update($user);

-			}

-			else return '';

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

 

 		// Define $urlwithroot

@@ -685,14 +708,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:'');

 		}

@@ -740,8 +767,7 @@ 
 		if (is_numeric($type_contact))

 		{

 			$id_type_contact=$type_contact;

-		}

-		else

+		} else

 		{

 			// We look for id type_contact

 			$sql = "SELECT tc.rowid";

@@ -754,7 +780,9 @@ 
 			if ($resql)

 			{

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

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

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

 		}

 

@@ -806,8 +834,7 @@ 
 

 				$this->db->commit();

 				return 1;

-			}

-			else

+			} else

 			{

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

 				{

@@ -815,15 +842,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

@@ -865,15 +893,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;

@@ -910,8 +941,7 @@ 
 

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

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

 			$this->db->rollback();

@@ -941,15 +971,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;

@@ -974,22 +1004,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);

@@ -1010,8 +1056,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;

 				}

@@ -1020,8 +1065,7 @@ 
 			}

 

 			return $tab;

-		}

-		else

+		} else

 		{

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

 			dol_print_error($this->db);

@@ -1056,8 +1100,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);

@@ -1081,16 +1124,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;

@@ -1105,13 +1159,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);

@@ -1150,19 +1206,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);

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

 				$i++;

 			}

-		}

-		else

+		} else

 		{

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

 			return null;

@@ -1193,9 +1258,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);

@@ -1216,14 +1285,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);

@@ -1236,8 +1307,9 @@ 
 			}

 

 			return $result;

-		} else

-			return -1;

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

 

 

@@ -1283,18 +1355,24 @@ 
 		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 = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-			else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

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

+			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		} else if ($this->element == 'societe') {
+			    $idtype = $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 +1385,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 +1406,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 +1433,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 +1469,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 +1569,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 +1625,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 +1677,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($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

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

@@ -1606,9 +1749,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 +1775,44 @@ 
 		if ($this->element == 'user' && ! empty($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($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

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

@@ -1652,9 +1825,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 +1865,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 +1893,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 +1914,7 @@ 
 		{

 			$this->fk_project = $projectid;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -1748,8 +1934,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 +1949,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 +1989,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 +2094,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 +2121,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 +2136,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 +2165,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 +2176,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 +2198,9 @@ 
 	{

         global $user;

 

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

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

         $error = 0;

 

@@ -2016,7 +2211,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 +2230,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 +2260,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 +2309,7 @@ 
 		{

 			$this->modelpdf=$modelpdf;

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return 0;

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

         global $user;

 

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

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

         $error = 0;

 

@@ -2139,7 +2341,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 +2356,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 +2373,7 @@ 
         {

             $this->db->rollback();

             return -1;

-        }

-        else

+        } else

         {

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

             $this->db->commit();

@@ -2208,8 +2412,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 +2425,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 +2437,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 +2471,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));

 					}

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2354,7 +2564,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 +2607,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 +2622,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

@@ -2429,7 +2642,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 +2657,7 @@ 
 				{

 					dol_print_error($this->db);

 				}

-			}

-			else

+			} else

 			{

 				dol_print_error($this->db);

 			}

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

 				{

 					return $row[0];

-				}

-				else

+				} else

 				{

 					return $this->getRangOfLine($fk_parent_line);

 				}

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

 			$this->ref_ext = $ref_ext;

 			return 1;

-		}

-		else

+		} else

 		{

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

 			return -1;

@@ -2597,7 +2809,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 +2821,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,36 +2871,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($conf->global->$MODULE)) {

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

 				foreach ($modsactivated as $mod) {

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

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

+					if ($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($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

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

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

 		$error=0;

 

@@ -2708,15 +2932,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

 

@@ -2746,9 +2977,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)

@@ -2756,7 +2989,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];

 						//

@@ -2772,16 +3007,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)

@@ -2790,7 +3033,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;

@@ -2831,11 +3076,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))

 			{

@@ -2864,13 +3119,11 @@ 
 			if (! $error)

 			{

 				return 1;

-			}

-			else

+			} else

 			{

 				return -1;

 			}

-		}

-		else

+		} else

 		{

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

 			return -1;

@@ -2893,10 +3146,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 (";

@@ -2916,8 +3177,7 @@ 
 	  	{

 	  		$this->db->commit();

 	  		return 1;

-	  	}

-	  	else

+	  	} else

 	  	{

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

 	  		$this->db->rollback();

@@ -2962,12 +3222,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);

@@ -2990,15 +3254,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."')";

@@ -3019,13 +3285,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)

 					{

@@ -3042,10 +3306,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))

 					{

@@ -3057,29 +3323,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';

 					}

 

@@ -3088,20 +3346,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 +3367,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 +3380,14 @@ 
 								}

 							}

 						}

-					}

-					else

+					} else

 					{

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

 					}

 				}

 			}

 			return 1;

-		}

-		else

+		} else

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3156,8 +3409,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 +3422,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 +3434,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

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

 			return -1;

@@ -3203,8 +3457,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 +3473,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 +3495,7 @@ 
 		if ($this->db->query($sql))

 		{

 			return 1;

-		}

-		else

+		} else

 		{

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

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

@@ -3271,17 +3524,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 +3559,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 +3598,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,8 +3633,13 @@ 
 	{

 		global $conf;

 

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

-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.

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

 

 		// Clean parameters

 		$ref = trim($ref);

@@ -3360,8 +3647,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)

@@ -3371,10 +3662,10 @@ 
 			{

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

 				return 1;

-			}

-			else return 0;

-		}

-		else

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

 		{

 			dol_print_error($this->db);

 			return -1;

@@ -3411,7 +3702,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)

@@ -3445,18 +3738,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;

@@ -3466,8 +3759,9 @@ 
 		{

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

 			return $haschild;

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -3483,12 +3777,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;

@@ -3552,16 +3858,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

 			}

 

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

 				// for shipments

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

-			}

-			else {

+			} else {

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

 			}

 

@@ -3586,19 +3899,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;

@@ -3607,18 +3931,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

 			}

@@ -3650,8 +3976,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -3703,13 +4028,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;

@@ -3746,14 +4069,14 @@ 
 					$this->libelle_incoterms = $obj->libelle;

 				}

 				return 1;

-			}

-			else

+			} else

 			{

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

 				return -1;

 			}

-		}

-		else return -1;

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

 

 

@@ -3792,7 +4115,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -3822,7 +4147,9 @@ 
 

 		// Define usemargins

 		$usemargins=0;

-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;

+		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) {
+		    $usemargins=1;
+		}
 

 		$num = count($this->lines);

 

@@ -3841,7 +4168,9 @@ 
 			print '<tr class="liste_titre nodrag nodrop">';

 

 			// Adds a line numbering column

-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';

+			if (! empty($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>';

@@ -3858,9 +4187,13 @@ 
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';

 

 			// Multicurrency

-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';

+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $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>';

@@ -3881,25 +4214,32 @@ 
 			{

 				if (!empty($user->rights->margins->creer))

 				{

-					if ($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 ($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($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)

-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';

-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)

-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';

+				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+									print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				}
+				if (! empty($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($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';

+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $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

 

@@ -3929,14 +4269,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

@@ -3983,8 +4324,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)

@@ -4013,8 +4360,13 @@ 
 

 					$outputlangs = $langs;

 					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

-					if (! empty($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($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);

@@ -4022,8 +4374,7 @@ 
 					}

 

 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

-				}

-				else

+				} else

 				{

 					$label = $line->product_label;

 				}

@@ -4045,7 +4396,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 

@@ -4068,7 +4421,9 @@ 
 				} else {

 					$res=include $tpl; // for debug

 				}

-				if ($res) break;

+				if ($res) {
+				    break;
+				}
 			}

 		}

 	}

@@ -4095,7 +4450,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($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

+		if (!empty($conf->multicurrency->enabled)) {
+		    print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td align="right">'.$langs->trans('Qty').'</td>';

 		if($conf->global->PRODUCT_USE_UNITS)

 		{

@@ -4118,8 +4475,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);

 				}

@@ -4148,32 +4504,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;

@@ -4191,13 +4552,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 : '');

 			}

 			

@@ -4210,36 +4570,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;';

 		}

@@ -4247,17 +4606,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 ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

+		if ($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

@@ -4270,7 +4635,9 @@ 
 			} else {

 				$res=include $tpl; // for debug

 			}

-			if ($res) break;

+			if ($res) {
+			    break;
+			}
 		}

 	}

 

@@ -4312,8 +4679,7 @@ 
 		{

 			$this->db->commit();

 			return 1;

-		}

-		else

+		} else

 		{

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

 			$this->db->rollback();

@@ -4348,8 +4714,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			if (! $notrigger)

 			{

@@ -4416,13 +4781,20 @@ 
 		// Search template files

 		$file=''; $classname=''; $filefound=0;

 		$dirmodels=array('/');

-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);

+		if (is_array($conf->modules_parts['models'])) {
+		    $dirmodels=array_merge($dirmodels,$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);

@@ -4433,7 +4805,9 @@ 
 					break;

 				}

 			}

-			if ($filefound) break;

+			if ($filefound) {
+			    break;
+			}
 		}

 

 		// If generator was found

@@ -4465,7 +4839,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);
+							}
 						}

 					}

 

@@ -4503,8 +4879,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);

 			}

@@ -4526,9 +4901,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);

 

@@ -4541,18 +4918,30 @@ 
 						if ($this->element == 'propal')

 						{

 							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok

-							if ($useonlinesignature) $setsharekey=true;

-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+							if ($useonlinesignature) {
+							    $setsharekey=true;
+							}
+							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey=true;
+							}
 						}

-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;

-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;

-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;

+						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'bank_account' && ! empty($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);

 							}

 						}

@@ -4569,8 +4958,7 @@ 
 							{

 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

 							}

-						}

-						else

+						} else

 						{

 							$ecmfile->entity = $conf->entity;

 							$ecmfile->filepath = $rel_dir;

@@ -4597,17 +4985,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);

 				}

@@ -4616,15 +5007,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);

@@ -4680,13 +5069,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);

@@ -4695,7 +5092,9 @@ 
 

 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

 		//var_dump($keyforfieldname);

-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;

+		if (isset($conf->global->$keyforfieldname)) {
+		    return $conf->global->$keyforfieldname;
+		}
 

 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname

 	}

@@ -4729,8 +5128,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;

 			}

@@ -4754,7 +5152,9 @@ 
 	function fetch_optionals($rowid=null, $optionsArray=null)

 	{

         // phpcs:enable

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

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

 		// To avoid SQL errors. Probably not the better solution though

 		if (!$this->table_element) {

@@ -4780,15 +5180,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)

@@ -4824,8 +5226,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;

 							}

@@ -4837,10 +5238,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;

@@ -4859,7 +5262,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);

@@ -4869,8 +5275,7 @@ 
 			$this->error=$this->db->lasterror();

 			$this->db->rollback();

 			return -1;

-		}

-		else

+		} else

 		{

 			$this->db->commit();

 			return 1;

@@ -4891,11 +5296,16 @@ 
 	{

 		global $conf,$langs,$user;

 

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

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

 		$error=0;

 

-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used

+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used

 

 		if (! empty($this->array_options))

 		{

@@ -4908,10 +5318,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)

@@ -4925,8 +5338,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);

@@ -4945,8 +5362,7 @@ 
 			   			{

 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 			   				return -1;

-			  			}

-			   			elseif ($value=='')

+			  			} elseif ($value=='')

 			   			{

 			   				$new_array_options[$key] = null;

 			   			}

@@ -4958,8 +5374,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;

 						}

@@ -4984,27 +5399,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];

 			   			}

@@ -5030,26 +5445,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);

 						}

@@ -5060,7 +5479,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);

@@ -5071,8 +5493,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;

 

@@ -5080,13 +5504,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";

 					}

@@ -5107,7 +5532,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

 			}

 

@@ -5115,14 +5542,14 @@ 
 			{

 				$this->db->rollback();

 				return -1;

-			}

-			else

+			} else

 			{

 				$this->db->commit();

 				return 1;

 			}

-		}

-		else return 0;

+		} else {
+		    return 0;
+		}
 	}

 

 	/**

@@ -5139,11 +5566,16 @@ 
 	{

 		global $conf,$langs,$user;

 

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

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

 		$error=0;

 

-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used

+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used

 

 		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

 		{

@@ -5170,8 +5602,7 @@ 
 					{

 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

 						return -1;

-					}

-					elseif ($value=='')

+					} elseif ($value=='')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5183,8 +5614,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;

 					}

@@ -5236,7 +5666,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

 			}

 

@@ -5245,14 +5677,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;
+		}
 	}

 

 

@@ -5327,8 +5759,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 '';
+			}
 		}

 

 

@@ -5342,33 +5777,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';

 				}

@@ -5383,52 +5812,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($conf->fckeditor->enabled) && $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)) {

@@ -5437,22 +5864,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($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($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

@@ -5462,10 +5886,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':'');

@@ -5473,8 +5901,7 @@ 
 				$out.='>'.$val.'</option>';

 			}

 			$out.='</select>';

-		}

-		elseif ($type == 'sellist')

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

 		{

 			$out = '';

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

@@ -5541,13 +5968,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';

 				}

@@ -5583,8 +6008,7 @@ 
 							{

 								$labeltoshow.= $obj->$field_toshow.' ';

 							}

-						}

-						else

+						} else

 						{

 							$labeltoshow=$obj->{$InfoFieldList[1]};

 						}

@@ -5597,25 +6021,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>';

@@ -5635,19 +6059,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)

@@ -5658,13 +6079,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);

 			}

 

@@ -5779,8 +6198,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;

@@ -5802,8 +6222,7 @@ 
 					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);

@@ -5811,18 +6230,19 @@ 
 			if ($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)';

@@ -5900,17 +6320,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';

@@ -5921,7 +6349,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)

@@ -5937,36 +6367,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';

@@ -5975,59 +6398,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,$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]);

@@ -6057,7 +6473,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";

 			} elseif ($selectkey=='rowid') {

 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

+			} else {

 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			}

 

@@ -6084,12 +6500,11 @@ 
 						}

 						if ($translabel!=$field_toshow) {

 							$value.=dol_trunc($translabel,18).' ';

-						}else {

+						} else {

 							$value.=$obj->$field_toshow.' ';

 						}

 					}

-				}

-				else

+				} else

 				{

 					$translabel='';

 					if (!empty($obj->{$InfoFieldList[1]})) {

@@ -6097,18 +6512,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='';

@@ -6119,8 +6533,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);

 

@@ -6188,8 +6601,7 @@ 
 			} else {

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

 			}

-		}

-		elseif ($type == 'link')

+		} elseif ($type == 'link')

 		{

 			$out='';

 

@@ -6211,24 +6623,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);

 		}

@@ -6255,7 +6664,9 @@ 
 	{

 		global $db, $conf, $langs, $action, $form;

 

-		if (! is_object($form)) $form=new Form($db);

+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 

 		$out = '';

 

@@ -6269,7 +6680,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]))

@@ -6283,11 +6696,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) {

@@ -6321,8 +6741,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 ' : '');

@@ -6352,9 +6771,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;

 					}

@@ -6367,11 +6788,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 : '';

@@ -6388,8 +6816,11 @@ 
 

 					$out .= '</td>';

 

-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';

-					else $out .= '</tr>';

+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+					    $out .= '</tr>';
+					} else {
+					    $out .= '</tr>';
+					}
 					$e++;

 				}

 			}

@@ -6441,7 +6872,9 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') {
+		    $element='facture';
+		}
 

 		return $user->rights->{$element};

 	}

@@ -6466,7 +6899,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;

 			}

@@ -6493,11 +6929,12 @@ 
 

 		$buyPrice = 0;

 

-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false

+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+		    // In most cases, test here is false

 		{

-			$buyPrice = $unitPrice * (1 - $discountPercent / 100);

-		}

-		else

+			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
+		}
+		} else

 		{

 			// Get cost price for margin calculation

 			if (! empty($fk_product))

@@ -6515,13 +6952,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($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')

+				} else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')

 				{

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

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

@@ -6544,8 +6979,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;

@@ -6591,8 +7025,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.'/';

@@ -6655,19 +7088,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";

 

@@ -6675,15 +7115,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)

 						{

@@ -6693,35 +7138,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>';

@@ -6746,15 +7191,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

@@ -6771,7 +7221,9 @@ 
 					}

 

 					// On continue ou on arrete de boucler ?

-					if ($nbmax && $nbphoto >= $nbmax) break;

+					if ($nbmax && $nbphoto >= $nbmax) {
+					    break;
+					}
 				}

 			}

 

@@ -6786,7 +7238,9 @@ 
 						$nbphoto++;

 					}

 

-					if ($nbphoto) $return.= '</table>';

+					if ($nbphoto) {
+					    $return.= '</table>';
+					}
 				}

 			}

 		}

@@ -6807,10 +7261,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;
+		}
 	}

 

 	/**

@@ -6823,10 +7281,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;
+		}
 	}

 

 	/**

@@ -6837,8 +7299,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;
+		}
 	}

 

 	/**

@@ -6851,10 +7316,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;
+		}
 	}

 

 	/**

@@ -6867,10 +7336,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;
+		}
 	}

 

 	/**

@@ -6883,10 +7356,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;
+		}
 	}

 

 	/**

@@ -6899,10 +7376,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;
+		}
 	}

 

 	/**

@@ -6916,21 +7397,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})) {

@@ -6940,28 +7421,35 @@ 
 				} else {

 					$queryarray[$field] = null;

 				}

-			}

-			else if($this->isInt($info))

+			} else if($this->isInt($info))

 			{

-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;

-				else

+				if ($field == 'entity' && is_null($this->{$field})) {
+				    $queryarray[$field]=$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;

@@ -6979,42 +7467,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;
+		}
 	}

 

 	/**

@@ -7037,9 +7530,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)."'";
+		}
 	}

 

 

@@ -7059,8 +7556,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();

@@ -7075,8 +7576,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']))

@@ -7086,11 +7591,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();

 

@@ -7116,7 +7627,9 @@ 
 		if (! $error)

 		{

 			$result=$this->insertExtraFields();

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

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

 

 		// Triggers

@@ -7149,15 +7662,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);

@@ -7168,13 +7690,11 @@ 
 			{

 				$this->setVarsFromFetchObj($obj);

 				return $this->id;

-			}

-			else

+			} else

 			{

 				return 0;

 			}

-		}

-		else

+		} else

 		{

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

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

@@ -7198,8 +7718,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();

@@ -7214,8 +7738,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));

 			/*

@@ -7296,10 +7826,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);

@@ -7406,7 +7937,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);