alxarafe / alixar

dolibarr/htdocs/stripe/config.php

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))

 {

 	$stripearrayofkeys = $stripearrayofkeysbyenv[0];	// Test

-}

-else

+} else

 {

 	$stripearrayofkeys = $stripearrayofkeysbyenv[1];	// Live

 }

dolibarr/htdocs/core/lib/functions.lib.php

Braces +1463 added lines, -1051 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 .= $conf->entity;

         return $out;

     }

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

     global $mysoc, $user, $conf;

 

-    if (empty($paramname))

-        return 'BadFirstParameterForGETPOST';

+    if (empty($paramname)) {
+            return 'BadFirstParameterForGETPOST';
+    }
     if (empty($check)) {

         dol_syslog("Deprecated use of 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 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 'BadThirdParameterForGETPOST';

+    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 'BadThirdParameterForGETPOST';
+    }
 

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

         $relativepathstring = $_SERVER["PHP_SELF"];

         // Clean $relativepathstring

-        if (constant('DOL_URL_ROOT'))

-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+        if (constant('DOL_URL_ROOT')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $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 = $conf->entity;

-            } else

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

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

 

 

 

@@ -564,18 +581,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':

@@ -584,27 +603,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);

@@ -614,16 +637,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 'BadFourthParameterForGETPOST';

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

             break;

     }

@@ -663,10 +688,11 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) { // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

-                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME')

-                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;

-                else if (isset($_SERVER["SERVER_NAME"]))

-                    return $_SERVER["SERVER_NAME"];

+                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+                                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+                } else if (isset($_SERVER["SERVER_NAME"])) {
+                                    return $_SERVER["SERVER_NAME"];
+                }
             }

             return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

         }

@@ -739,22 +765,27 @@ 
             }

         }

         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

         // using proxy, rewriting, virtual path, etc...

         $res = '';

-        if ($type == 1)

-            $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;   // Standard value

-        if ($type == 2)

-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

-        if ($type == 3)

-            $res = DOL_URL_ROOT . '/' . $path;

+        if ($type == 1) {
+                    $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;
+        }
+        // Standard value

+        if ($type == 2) {
+                    $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;
+        }
+        // Standard value

+        if ($type == 3) {
+                    $res = DOL_URL_ROOT . '/' . $path;
+        }
 

         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

             if ($key == 'main') {

@@ -834,13 +865,15 @@ 
 function dol_size($size, $type = '')

 {

     global $conf;

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

-        return $size;

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

-        return 250;

-    else

-        return 10;

-}

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

 

 /**

  * 	Clean a string to use it as a file name

@@ -939,8 +972,9 @@ 
 {

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

     $forbidden_chars_to_remove = array();

-    if (is_array($badcharstoreplace))

-        $forbidden_chars_to_replace = $badcharstoreplace;

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

@@ -977,9 +1011,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["'"] = "\\'";

@@ -1001,10 +1035,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

 }

 

@@ -1055,8 +1091,9 @@ 
     global $conf, $user;

 

     // If syslog module enabled

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

-        return;

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

     if ($ident < 0) {

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

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

             throw new Exception('Incorrect log level');

         }

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

-            return;

+        if ($level > $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

@@ -1096,24 +1134,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']);

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

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

+        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']);

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

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

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

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

-                continue;

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

         }

         unset($data);

@@ -1169,13 +1213,15 @@ 
 

     // Show title

     $showtitle = 1;

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

-        $showtitle = 0;

+    if (!empty($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>';

     }

@@ -1184,12 +1230,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($conf->dol_optimize_smallscreen))

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

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

     // Show tabs

     $bactive = false;

@@ -1202,8 +1250,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--;
+            }
         }

     }

 

@@ -1244,12 +1293,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";

@@ -1260,8 +1309,9 @@ 
         }

         $displaytab = $i;

     }

-    if ($popuptab)

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

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

     if ($displaytab > $limittoshow) {

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

@@ -1284,8 +1334,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"

@@ -1315,11 +1366,12 @@ 
  */

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

 

 /**

  *  Show tab footer of a card.

@@ -1350,40 +1402,55 @@ 
     $showimage = 1;

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

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

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

-        $showbarcode = 0;

+    if (!empty($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') {

@@ -1391,11 +1458,12 @@ 
         $cssclass = 'photoref';

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

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

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

-            $maxvisiblephotos = 1;

-        if ($showimage)

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

-        else {

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

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

                 $nophoto = '';

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

@@ -1411,11 +1479,12 @@ 
         $cssclass = 'photoref';

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

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

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

-            $maxvisiblephotos = 1;

-        if ($showimage)

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

-        else {

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

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

                 $nophoto = '';

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

@@ -1440,8 +1509,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 . "/";

 

@@ -1462,14 +1533,16 @@ 
                             if (empty($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($conf->dol_optimize_smallscreen))

-                            $heightforphotref = 60;

+                        if (!empty($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">';

@@ -1505,8 +1578,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 -->';

@@ -1517,8 +1592,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($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1542,35 +1618,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) || $conf->browser->layout == 'phone')

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

+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $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) || $conf->browser->layout == 'phone')

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

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

     }

 

@@ -1584,13 +1662,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') {

@@ -1623,15 +1703,19 @@ 
 {

     global $conf, $langs;

     $ret = '';

-    if ($fieldrequired)

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

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

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

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

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

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

-    if ($fieldrequired)

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

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

 }

 

@@ -1646,8 +1730,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;

 }

 

@@ -1678,18 +1763,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) {

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

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

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

         $langs->load("dict");

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

@@ -1728,9 +1814,10 @@ 
 {

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

 

 /**

  * 	Output date in a string format according to outputlangs (or langs if not defined).

@@ -1776,10 +1863,12 @@ 
             }

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

-    if (!$format)

-        $format = 'daytextshort';

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

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

     if ($formatwithoutreduce != $format) {

@@ -1788,40 +1877,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") : $conf->format_date_short);

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

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

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

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

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

-        $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $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") : $conf->format_date_text_short);

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

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

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

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

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

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

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

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

+    if ($format == 'day') {
+            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+    } else if ($format == 'hour') {
+            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+    } else if ($format == 'hourduration') {
+            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+    } else if ($format == 'daytext') {
+            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $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") : $conf->format_date_text_short);
+    } else if ($format == 'dayhour') {
+            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+    } else if ($format == 'dayhoursec') {
+            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+    } else if ($format == 'dayhourtext') {
+            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+    } else if ($format == 'dayhourtextshort') {
+            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $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';

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

@@ -1829,8 +1924,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)

 

 

 

@@ -1885,8 +1982,9 @@ 
             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with 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)) {

@@ -1957,10 +2055,14 @@ 
     global $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);

@@ -1995,27 +2097,36 @@ 
     global $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')) {

@@ -2072,8 +2183,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() 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

@@ -2107,8 +2220,9 @@ 
     global $conf, $langs;

     $level = 1024;

 

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

-        $shortunit = 1;

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

     // Set value text

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

@@ -2143,19 +2257,23 @@ 
 {

     global $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($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2179,13 +2297,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);

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

             $type = 'AC_EMAIL';

             $link = '';

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

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

-            if ($link)

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

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

-    }

-    else {

+    } else {

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

             $langs->load("errors");

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

@@ -2236,8 +2357,9 @@ 
 

     $newskype = $value;

 

-    if (empty($value))

-        return '&nbsp;';

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

     if (!empty($type)) {

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

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

             $addlink = 'AC_SKYPE';

             $link = '';

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

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

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

         }

         $newskype .= '</div>';

-    }

-    else {

+    } else {

         $langs->load("errors");

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

     }

@@ -2294,12 +2416,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 ($conf->dol_optimize_smallscreen)

-        $separ = '';

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

     $newphone = $phone;

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

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

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

         } else if (!empty($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($conf->global->CLICKTODIAL_URL))

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

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

-                $urlmask = $user->clicktodial_url;

+            if (!empty($conf->global->CLICKTODIAL_URL)) {
+                            $urlmask = $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) : '');

@@ -2488,8 +2615,9 @@ 
             $url = make_substitutions($url, $substitarray);

             $newphonesav = $newphone;

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

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

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

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

         }

 

@@ -2497,12 +2625,15 @@ 
         if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

             $type = 'AC_TEL';

             $link = '';

-            if ($addlink == 'AC_FAX')

-                $type = 'AC_FAX';

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

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

-            if ($link)

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

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

     }

 

@@ -2529,15 +2660,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;

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

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

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

-            } else

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

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

     }

 

@@ -2667,26 +2801,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($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS))

-                $showgmap = 1;

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

-                $showgmap = 1;

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

-                $showgmap = 1;

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

-                $showomap = 1;

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

-                $showomap = 1;

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

-                $showomap = 1;

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

             if ($showgmap) {

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

@@ -2698,11 +2839,12 @@ 
             }

         }

     }

-    if ($noprint)

-        return $out;

-    else

-        print $out;

-}

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

 

 /**

  * 	Return true if email syntax is ok

@@ -2713,10 +2855,12 @@ 
  */

 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;

 }

@@ -2738,10 +2882,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;

         }

@@ -2770,11 +2916,12 @@ 
  */

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

 

 /**

  * Make a substring. Works even if mbstring module is not enabled for better compatibility.

@@ -2790,8 +2937,9 @@ 
 {

     global $langs;

 

-    if (empty($stringencoding))

-        $stringencoding = $langs->charset_output;

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

     $ret = '';

     if (empty($trunconbytes)) {

@@ -2827,49 +2975,56 @@ 
 {

     global $conf;

 

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

-        return $string;

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

-    if (empty($stringencoding))

-        $stringencoding = 'UTF-8';

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

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

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

+    if ($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';
+    }
+    }

 

 /**

  * 	Show picto whatever it's its name (generic function)

@@ -3079,8 +3234,9 @@ 
 {

     global $conf;

 

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

-        $picto .= '.png';

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

     //$path = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/weather/' . $picto;

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

@@ -3102,20 +3258,22 @@ 
 {

     global $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_URL_ROOT . '/theme/common/' . $picto;

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

 

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

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

 

-            if (file_exists($themepath))

-                $path = $themepath;

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

     }

 

@@ -3154,8 +3312,9 @@ 
             $numaction = 0;

         }

     }

-    if (!is_numeric($numaction))

-        $numaction = 0;

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

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

 }

@@ -3171,8 +3330,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3188,8 +3348,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3205,8 +3366,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3223,8 +3385,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3241,8 +3404,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 

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

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

+    if ($titlealt == 'default') {
+            $titlealt = $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>';

@@ -3277,8 +3442,9 @@ 
 function img_printer($titlealt = "default", $other = '')

 {

     global $conf, $langs;

-    if ($titlealt == "default")

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

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

 }

 

@@ -3293,8 +3459,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3311,10 +3478,11 @@ 
     global $conf, $langs;

 

     if ($usealttitle) {

-        if (is_string($usealttitle))

-            $usealttitle = dol_escape_htmltag($usealttitle);

-        else

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

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

 

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

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

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3347,8 +3516,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

+    if ($titlealt == 'default') {
+            $titlealt = $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) : ''));

@@ -3364,8 +3534,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3381,8 +3552,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

+    if ($titlealt == 'default') {
+            $titlealt = $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>';

@@ -3399,8 +3571,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

+    if ($titlealt == 'default') {
+            $titlealt = $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>';

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

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3436,8 +3610,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3454,8 +3629,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3472,8 +3648,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 }

@@ -3489,11 +3666,13 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

-    if ($allow == 1)

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

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

     return '-';

 }

@@ -3541,8 +3720,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>';

@@ -3564,13 +3744,15 @@ 
 

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

+    if ($titlealt == 'default') {
+            $titlealt = $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);

 }

@@ -3586,8 +3768,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 

@@ -3608,8 +3791,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

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

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

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

 

@@ -3671,14 +3855,16 @@ 
 

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

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

-        if (!empty($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($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 .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";

 

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

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

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

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

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

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

         }

@@ -3721,18 +3907,20 @@ 
         $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>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

             } else {                        // Mode CLI

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

     }

 

-    if (empty($dolibarr_main_prod))

-        print $out;

-    else {

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

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

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

         define("MAIN_CORE_ERROR", 1);

@@ -3775,16 +3963,18 @@ 
 {

     global $langs, $conf;

 

-    if (empty($email))

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

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

     $langs->load("errors");

     $now = dol_now();

 

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

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

@@ -4027,12 +4217,15 @@ 
     $savtotalnboflines = $totalnboflines;

     $totalnboflines = abs($totalnboflines);

 

-    if ($picto == 'setup')

-        $picto = 'title_setup.png';

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

-        $picto = 'title.gif';

-    if ($limit < 0)

-        $limit = $conf->liste_limit;

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

         $nextpage = 1;

     } else {

@@ -4046,11 +4239,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

@@ -4060,10 +4255,12 @@ 
 

     // Right

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

-    if ($sortfield)

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

-    if ($sortorder)

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

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

     $pagelist = '';

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

@@ -4071,10 +4268,11 @@ 
             // Define nb of extra page links before and after selected page + ... + first or last

             $maxnbofpage = (empty($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;

@@ -4082,10 +4280,11 @@ 
 

             if ($cpt >= 1) {

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

-                if ($cpt > 2)

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

-                else if ($cpt == 2)

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

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

 

             do {

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

 

             if ($cpt < $nbpages) {

-                if ($cpt < $nbpages - 2)

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

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

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

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

             }

-        }

-        else {

+        } else {

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

         }

     }

@@ -4141,18 +4340,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:'.$langs->trans("All");     // Not yet supported

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

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

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

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

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

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

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

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

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

-            $tmpchoice[] = $tmpkey;

+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         $tmpkey = $conf->liste_limit . ':' . $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) {

@@ -4228,14 +4430,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;

 }

@@ -4260,11 +4463,14 @@ 
     global $langs, $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($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);

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

 

     // Output separators by default (french)

@@ -4272,17 +4478,21 @@ 
     $thousand = ' ';

 

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

-    if (!is_object($outlangs))

-        $outlangs = $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 = ' ';

+    if (!is_object($outlangs)) {
+            $outlangs = $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

@@ -4294,8 +4504,9 @@ 
     $end = '';

 

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

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

-        $nbdecimal = dol_strlen($decpart);

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

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

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

@@ -4306,8 +4517,9 @@ 
     }

 

     // If force rounding

-    if ($forcerounding >= 0)

-        $nbdecimal = $forcerounding;

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

     // Format number

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

@@ -4318,13 +4530,14 @@ 
     // Add symbol of currency if requested

     $cursymbolbefore = $cursymbolafter = '';

     if ($currency_code) {

-        if ($currency_code == 'auto')

-            $currency_code = $conf->currency;

+        if ($currency_code == 'auto') {
+                    $currency_code = $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);

         }

@@ -4358,14 +4571,17 @@ 
     // Decimal delimiter for PHP and database SQL requests must be '.'

     $dec = ',';

     $thousand = ' ';

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

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

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

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

-    if ($thousand == 'None')

-        $thousand = '';

-    elseif ($thousand == 'Space')

-        $thousand = ' ';

+    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $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

@@ -4381,8 +4597,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);

@@ -4391,19 +4609,23 @@ 
     // Now, make a rounding if required

     if ($rounding) {

         $nbofdectoround = '';

-        if ($rounding == 'MU')

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

-        elseif ($rounding == 'MT')

-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;

-        elseif ($rounding == 'MS')

-            $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;

-        elseif (is_numeric($rounding))

-            $nbofdectoround = $rounding;

+        if ($rounding == 'MU') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+        } elseif ($rounding == 'MT') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+        } elseif ($rounding == 'MS') {
+                    $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $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';

+        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.

@@ -4417,8 +4639,10 @@ 
         //print "TT".$amount.'<br>';

         // Always make replace because each math 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);

@@ -4477,8 +4701,9 @@ 
 {

     global $db, $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);

 

@@ -4496,37 +4721,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.

@@ -4568,19 +4799,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;

@@ -4626,10 +4861,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;

@@ -4655,9 +4891,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)"

@@ -4670,19 +4906,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();

 }

@@ -4712,9 +4951,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)"

@@ -4723,13 +4962,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);

@@ -4775,17 +5018,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

         }

@@ -4805,14 +5048,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 = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+            } else {
+                            dol_print_error($db);
+            }
+        } else {
+                    $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+        }
+        // Forced value if autodetect fails

     }

 

     dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4867,13 +5114,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);

@@ -4976,15 +5225,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;

@@ -5010,30 +5260,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) {

@@ -5058,31 +5313,38 @@ 
     $classname = '';

     if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

         $result = $langs->trans('yes');

-        if ($case == 1 || $case == 3)

-            $result = $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 = $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 = $langs->trans("no");

-        if ($case == 1 || $case == 3)

-            $result = $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 = $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;

 }

 

@@ -5108,23 +5370,27 @@ 
     $path = '';

 

     $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

-    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

-        $arrayforoldpath[] = 'product';

+    if (!empty($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.

@@ -5135,8 +5401,9 @@ 
         }

     }

 

-    if (empty($withoutslash) && !empty($path))

-        $path .= '/';

+    if (empty($withoutslash) && !empty($path)) {
+            $path .= '/';
+    }
 

     return $path;

 }

@@ -5156,8 +5423,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;

@@ -5172,12 +5440,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

 

 

 

@@ -5256,8 +5527,9 @@ 
  */

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

@@ -5274,8 +5546,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, "  ")) {

@@ -5361,18 +5634,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);

@@ -5421,15 +5697,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

@@ -5531,8 +5810,9 @@ 
  */

 function dol_nboflines($s, $maxchar = 0)

 {

-    if ($s == '')

-        return 0;

+    if ($s == '') {
+            return 0;
+    }
     $arraystring = explode("\n", $s);

     $nb = count($arraystring);

 

@@ -5551,15 +5831,18 @@ 
 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);

@@ -5606,39 +5889,47 @@ 
 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;

     }

@@ -5790,12 +6081,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;

@@ -5843,10 +6136,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');

@@ -5856,8 +6151,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) {

@@ -5878,12 +6174,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;

             }

@@ -5893,16 +6192,19 @@ 
 

             if (!empty($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($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($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)) {

@@ -5912,18 +6214,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, $conf->currency) : '';

         $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency)) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(1))

-            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
 

         // TODO Add keys for foreign multicurrency

         // For backward compatibility

@@ -5993,23 +6299,27 @@ 
 {

     global $conf, $langs;

 

-    if (!is_array($substitutionarray))

-        return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+    if (!is_array($substitutionarray)) {
+            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+    }
 

-    if (empty($outputlangs))

-        $outputlangs = $langs;

+    if (empty($outputlangs)) {
+            $outputlangs = $langs;
+    }
 

     // Make substitution for language keys

     if (is_object($outputlangs)) {

         while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

             $msgishtml = 0;

-            if (dol_textishtml($text, 1))

-                $msgishtml = 1;

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

         }

@@ -6019,23 +6329,29 @@ 
     // it is also converted.

     while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

         $msgishtml = 0;

-        if (dol_textishtml($text, 1))

-            $msgishtml = 1;

+        if (dol_textishtml($text, 1)) {
+                    $msgishtml = 1;
+        }
 

         $keyfound = $reg[1];

-        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-            $newval = '*****forbidden*****';

-        else

-            $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

+        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                    $newval = '*****forbidden*****';
+        } else {
+                    $newval = empty($conf->global->$keyfound) ? '' : $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($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = '';  // Protection

-        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = ''; // Protection

+        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection

+        if ($key == '__USER_SIGNATURE__' && (!empty($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

     }

@@ -6081,8 +6397,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) {

@@ -6094,8 +6411,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);
+                }
             }

         }

     }

@@ -6131,8 +6449,9 @@ 
 

     $out = '';

 

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $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 ? ')' : '');

@@ -6161,20 +6480,22 @@ 
 

     $ret = '';

     // If order not defined, we use the setup

-    if ($nameorder < 0)

-        $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+    if ($nameorder < 0) {
+            $nameorder = (empty($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;

@@ -6194,13 +6515,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;
+            }
         }

     }

 }

@@ -6220,13 +6542,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);

         }

     }

@@ -6245,22 +6570,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']);

     }

 }

@@ -6301,8 +6629,9 @@ 
             foreach ($mesgarray as $message) {

                 $ret++;

                 $out .= $langs->trans($message);

-                if ($ret < count($mesgarray))

-                    $out .= "<br>\n";

+                if ($ret < count($mesgarray)) {
+                                    $out .= "<br>\n";
+                }
             }

         }

         if ($mesgstring) {

@@ -6368,8 +6697,9 @@ 
  */

 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;

@@ -6384,14 +6714,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

@@ -6410,9 +6743,10 @@ 
             $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);
+    }
+    }

 

 /**

  *  Print formated error messages to output (Used to show messages on html output).

@@ -6452,15 +6786,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();

@@ -6486,23 +6822,38 @@ 
     // We must use here a binary strlen 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;

@@ -6520,15 +6871,21 @@ 
     global $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($conf->global->MAIN_FILESYSTEM_ENCODING))

-        $tmp = $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($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+            $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+    }
+

+    if ($tmp == 'iso-8859-1') {
+            return utf8_decode($str);
+    }
     return $str;

 }

 

@@ -6550,8 +6907,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 ''

@@ -6563,20 +6921,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;

     }

 }

@@ -6623,16 +6982,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);
+        }
     }

 }

 

@@ -6658,8 +7018,9 @@ 
 {

     global $langs;

 

-    if (empty($codelang))

-        return '';

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

     if ($codelang == 'auto') {

         return '<span class="fa fa-globe"></span>';

@@ -6673,9 +7034,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];

     }

@@ -6693,15 +7054,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:

@@ -6879,8 +7245,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);

@@ -6934,18 +7301,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])

-                            $langs->load($values[3]);

+                        if ($values[3]) {
+                                                    $langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = $langs->trans($values[2]);

+                        } else {
+                                                    $label = $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]);

@@ -6953,30 +7323,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])

-                        $langs->load($values[3]);

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
+                    if ($values[3]) {
+                                            $langs->load($values[3]);
+                    }
                     if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                         $substitutionarray = array();

                         complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                         $label = make_substitutions($reg[1], $substitutionarray);

-                    } else

-                        $label = $langs->trans($values[2]);

+                    } else {
+                                            $label = $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);

@@ -7018,10 +7390,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";

@@ -7030,8 +7403,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($conf->global->MAIN_HTML_FOOTER))

-            print $conf->global->MAIN_HTML_FOOTER . "\n";

+        if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+                    print $conf->global->MAIN_HTML_FOOTER . "\n";
+        }
 

         print "\n";

         if (!empty($conf->use_javascript_ajax)) {

@@ -7054,8 +7428,9 @@ 
                 print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                 $relativepathstring = $_SERVER["PHP_SELF"];

                 // Clean $relativepathstring

-                if (constant('DOL_URL_ROOT'))

-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+                if (constant('DOL_URL_ROOT')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7066,14 +7441,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) {

@@ -7092,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) {

@@ -7138,8 +7519,9 @@ 
                 print "\n";

                 print "/* JS CODE TO ENABLE to add memory info */\n";

                 print 'window.console && console.log("';

-                if (!empty($conf->global->MEMCACHED_SERVER))

-                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';

+                if (!empty($conf->global->MEMCACHED_SERVER)) {
+                                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';
+                }
                 print 'MAIN_OPTIMIZE_SPEED=' . (isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $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);

@@ -7269,8 +7651,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);

@@ -7333,8 +7716,9 @@ 
                 $tmpcrits = explode('|', $crit);

                 $i3 = 0;

                 foreach ($tmpcrits as $tmpcrit) {

-                    if (empty($tmpcrit))

-                        continue;

+                    if (empty($tmpcrit)) {
+                                            continue;
+                    }
 

                     $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7370,8 +7754,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 . ")";

@@ -7411,29 +7796,37 @@ 
 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

 }

@@ -7451,8 +7844,9 @@ 
 {

     global $conf, $langs;

 

-    if (empty($conf->use_javascript_ajax))

-        return '';

+    if (empty($conf->use_javascript_ajax)) {
+            return '';
+    }
 

     $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

     //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7460,18 +7854,20 @@ 
     $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_URL_ROOT . '/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_URL_ROOT . '/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_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';

-    else

-        return '';

-}

+    if ($num_mime !== false) {
+            return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';
+    } else {
+            return '';
+    }
+    }

 

 /**

  * Make content of an input box selected when we click into input field.

@@ -7488,8 +7884,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-    if ($addlink)

-        $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+    if ($addlink) {
+            $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';
+    }
     return $out;

 }

 

@@ -7871,8 +8268,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) {

@@ -7884,11 +8282,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 '';

     }

 }

@@ -7918,8 +8319,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;

 }

@@ -7938,8 +8340,10 @@ 
 

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

@@ -7949,15 +8353,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($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($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;

 }