alxarafe / alixar

Base/AlixarController.php

Spacing +89 added lines, -89 removed lines

@@ -50,13 +50,13 @@ 
         // Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
         $prefix = DolUtils::dol_getprefix('');
 
-        $sessionname = 'DOLSESSID_' . $prefix;
-        $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+        $sessionname = 'DOLSESSID_'.$prefix;
+        $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
         if (!empty($_COOKIE[$sessiontimeout])) {
             ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
         }
         session_name($sessionname);
-        session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+        session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
         // This create lock, released when session_write_close() or end of page.
         // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
         if (!defined('NOSESSION')) {
@@ -80,7 +80,7 @@ 
             Globals::$conf->browser->name = $tmp['browsername'];
             Globals::$conf->browser->os = $tmp['browseros'];
             Globals::$conf->browser->version = $tmp['browserversion'];
-            Globals::$conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
+            Globals::$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
 //var_dump(Globals::$conf->browser);
 
             if (Globals::$conf->browser->layout == 'phone') {
@@ -101,18 +101,18 @@ 
                         $newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
                     }
                 } else { // Check HTTPS environment variable (Apache/mod_ssl only)
-                    $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT) . $_SERVER["REQUEST_URI"];
+                    $newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
                 }
             } else {
 // Check HTTPS environment variable (Apache/mod_ssl only)
-                $newurl = Globals::$conf->file->main_force_https . $_SERVER["REQUEST_URI"];
+                $newurl = Globals::$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
             }
 // Start redirect
             if ($newurl) {
-                DolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to " . $newurl);
+                DolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
                 echo $newurl;
                 throw Exception('x');
-                header("Location: " . $newurl);
+                header("Location: ".$newurl);
                 exit;
             } else {
                 DolUtils::dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
@@ -137,29 +137,29 @@ 
 
 // Loading of additional presentation includes
         if (!defined('NOREQUIREHTML')) {
-            require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
+            require_once DOL_BASE_PATH.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
         }
         if (!defined('NOREQUIREAJAX') && Globals::$conf->use_javascript_ajax) {
-            require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+            require_once DOL_BASE_PATH.'/core/lib/ajax.lib.php'; // Need 22ko memory
         }
 // If install or upgrade process not done or not completely finished, we call the install page.
         if (!empty(Globals::$conf->global->MAIN_NOT_INSTALLED) || !empty(Globals::$conf->global->MAIN_NOT_UPGRADED)) {
             DolUtils::dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
             throw Exception('x');
-            header("Location: " . DOL_BASE_URI . "/install/index.php");
+            header("Location: ".DOL_BASE_URI."/install/index.php");
             exit;
         }
 // If an upgrade process is required, we call the install page.
         if ((!empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) && (Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION)) || (empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty(Globals::$conf->global->MAIN_VERSION_LAST_INSTALL) && (Globals::$conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
             $versiontocompare = empty(Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE) ? Globals::$conf->global->MAIN_VERSION_LAST_INSTALL : Globals::$conf->global->MAIN_VERSION_LAST_UPGRADE;
-            require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
+            require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
             $dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
             $dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
             $rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
             if ($rescomp > 0) {   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-                DolUtils::dol_syslog("main.inc: database version " . $versiontocompare . " is lower than programs version " . DOL_VERSION . ". Redirect to install page.", LOG_WARNING);
+                DolUtils::dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
                 throw Exception('x');
-                header("Location: " . DOL_BASE_URI . "/install/index.php");
+                header("Location: ".DOL_BASE_URI."/install/index.php");
                 exit;
             }
         }
@@ -183,7 +183,7 @@ 
             }
             if ($_SERVER['REQUEST_METHOD'] === 'POST') {  // This test must be after loading $_SESSION['token'].
                 if (DolUtils::GETPOST('token', 'alpha') != $_SESSION['token']) {
-                    DolUtils::dol_syslog("Invalid token in " . $_SERVER['HTTP_REFERER'] . ", action=" . DolUtils::GETPOST('action', 'aZ09') . ", _POST['token']=" . DolUtils::GETPOST('token', 'alpha') . ", _SESSION['token']=" . $_SESSION['token'], LOG_WARNING);
+                    DolUtils::dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".DolUtils::GETPOST('action', 'aZ09').", _POST['token']=".DolUtils::GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
 //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
                     unset($_POST);
                 }
@@ -261,19 +261,19 @@ 
                 $dol_use_jmobile = DolUtils::GETPOST('dol_use_jmobile', 'int', 3);
 //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 // If in demo mode, we check we go to home page through the public/demo/index.php page
-                if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI . '/index.php') {  // We ask index page
+                if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_BASE_URI.'/index.php') {  // We ask index page
                     if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-                        DolUtils::dol_syslog("Call index page from another url than demo page (call is done from page " . $_SERVER['HTTP_REFERER'] . ")");
+                        DolUtils::dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
                         $url = '';
-                        $url .= ($url ? '&' : '') . ($dol_hide_topmenu ? 'dol_hide_topmenu=' . $dol_hide_topmenu : '');
-                        $url .= ($url ? '&' : '') . ($dol_hide_leftmenu ? 'dol_hide_leftmenu=' . $dol_hide_leftmenu : '');
-                        $url .= ($url ? '&' : '') . ($dol_optimize_smallscreen ? 'dol_optimize_smallscreen=' . $dol_optimize_smallscreen : '');
-                        $url .= ($url ? '&' : '') . ($dol_no_mouse_hover ? 'dol_no_mouse_hover=' . $dol_no_mouse_hover : '');
-                        $url .= ($url ? '&' : '') . ($dol_use_jmobile ? 'dol_use_jmobile=' . $dol_use_jmobile : '');
-                        $url = DOL_BASE_URI . '/public/demo/index.php' . ($url ? '?' . $url : '');
+                        $url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+                        $url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+                        $url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+                        $url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+                        $url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+                        $url = DOL_BASE_URI.'/public/demo/index.php'.($url ? '?'.$url : '');
                         echo $url;
                         throw Exception('x');
-                        header("Location: " . $url);
+                        header("Location: ".$url);
                         exit;
                     }
                 }
@@ -293,7 +293,7 @@ 
                         $test = false;
 
 // Call trigger for the "security events" log
-                        Globals::$user->trigger_mesg = 'ErrorBadValueForCode - login=' . DolUtils::GETPOST("username", "alpha", 2);
+                        Globals::$user->trigger_mesg = 'ErrorBadValueForCode - login='.DolUtils::GETPOST("username", "alpha", 2);
 // Call of triggers
                         //include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
                         $interface = new Interfaces($db);
@@ -306,7 +306,7 @@ 
                         $action = '';
                         Globals::$hookManager->initHooks(array('login'));
                         $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                        $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                        $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                         if ($reshook < 0)
                             $error++;
 
@@ -381,7 +381,7 @@ 
                         }
 
                         // Call trigger for the "security events" log
-                        Globals::$user->trigger_mesg = Globals::$langs->trans("ErrorBadLoginPassword") . ' - login=' . DolUtils::GETPOST("username", "alpha", 2);
+                        Globals::$user->trigger_mesg = Globals::$langs->trans("ErrorBadLoginPassword").' - login='.DolUtils::GETPOST("username", "alpha", 2);
 
                         // Call of triggers
                         //include_once DOL_BASE_PATH . '/core/class/interfaces.class.php';
@@ -395,7 +395,7 @@ 
                         $action = '';
                         Globals::$hookManager->initHooks(array('login'));
                         $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                        $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                        $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                         if ($reshook < 0) {
                             $error++;
                         }
@@ -407,7 +407,7 @@ 
                 // End test login / passwords
                 if (!$login || (in_array('ldap', $this->authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
                 // No data to test login, so we show the login page
-                    DolUtils::dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
+                    DolUtils::dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
                     if (defined('NOREDIRECTBYMAINTOLOGIN')) {
                         return 'ERROR_NOT_LOGGED';
                     } else {
@@ -422,8 +422,8 @@ 
                     DolUtils::dol_syslog('User not found, connexion refused');
                     session_destroy();
                     session_name($sessionname);
-                    session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                    session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                    session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                    session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                     if ($resultFetchUser == 0) {
 // Load translation files required by page
@@ -431,7 +431,7 @@ 
 
                         $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                        Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                        Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
                     }
                     if ($resultFetchUser < 0) {
                         $_SESSION["dol_loginmesg"] = Globals::$user->error;
@@ -451,40 +451,40 @@ 
                     $action = '';
                     Globals::$hookManager->initHooks(array('login'));
                     $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                     if ($reshook < 0) {
                         $error++;
                     }
 
                     $paramsurl = array();
                     if (DolUtils::GETPOST('textbrowser', 'int')) {
-                        $paramsurl[] = 'textbrowser=' . DolUtils::GETPOST('textbrowser', 'int');
+                        $paramsurl[] = 'textbrowser='.DolUtils::GETPOST('textbrowser', 'int');
                     }
                     if (DolUtils::GETPOST('nojs', 'int')) {
-                        $paramsurl[] = 'nojs=' . DolUtils::GETPOST('nojs', 'int');
+                        $paramsurl[] = 'nojs='.DolUtils::GETPOST('nojs', 'int');
                     }
                     if (DolUtils::GETPOST('lang', 'aZ09')) {
-                        $paramsurl[] = 'lang=' . DolUtils::GETPOST('lang', 'aZ09');
+                        $paramsurl[] = 'lang='.DolUtils::GETPOST('lang', 'aZ09');
                     }
-                    echo 'Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : '');
+                    echo 'Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '');
                     throw Exception('x');
-                    header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                    header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
                     exit;
                 }
             } else {
 // We are already into an authenticated session
                 $login = $_SESSION["dol_login"];
                 $entity = $_SESSION["dol_entity"];
-                DolUtils::dol_syslog("- This is an already logged session. _SESSION['dol_login']=" . $login . " _SESSION['dol_entity']=" . $entity, LOG_DEBUG);
+                DolUtils::dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
                 $resultFetchUser = Globals::$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
                 if ($resultFetchUser <= 0) {
 // Account has been removed after login
-                    DolUtils::dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=" . $login, LOG_WARNING);
+                    DolUtils::dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
                     session_destroy();
                     session_name($sessionname);
-                    session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-                    session_start();    // Fixing the bug of register_globals here is useless since session is empty
+                    session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+                    session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
                     if ($resultFetchUser == 0) {
 // Load translation files required by page
@@ -492,7 +492,7 @@ 
 
                         $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-                        Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login=' . $login;
+                        Globals::$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
                     }
                     if ($resultFetchUser < 0) {
                         $_SESSION["dol_loginmesg"] = Globals::$user->error;
@@ -512,24 +512,24 @@ 
                     $action = '';
                     Globals::$hookManager->initHooks(array('login'));
                     $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
-                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                     if ($reshook < 0) {
                         $error++;
                     }
 
                     $paramsurl = array();
                     if (DolUtils::GETPOST('textbrowser', 'int')) {
-                        $paramsurl[] = 'textbrowser=' . DolUtils::GETPOST('textbrowser', 'int');
+                        $paramsurl[] = 'textbrowser='.DolUtils::GETPOST('textbrowser', 'int');
                     }
                     if (DolUtils::GETPOST('nojs', 'int')) {
-                        $paramsurl[] = 'nojs=' . DolUtils::GETPOST('nojs', 'int');
+                        $paramsurl[] = 'nojs='.DolUtils::GETPOST('nojs', 'int');
                     }
                     if (DolUtils::GETPOST('lang', 'aZ09')) {
-                        $paramsurl[] = 'lang=' . DolUtils::GETPOST('lang', 'aZ09');
+                        $paramsurl[] = 'lang='.DolUtils::GETPOST('lang', 'aZ09');
                     }
-                    echo 'Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : '');
+                    echo 'Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '');
                     throw Exception('x');
-                    header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
+                    header('Location: '.DOL_BASE_URI.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
                     exit;
                 } else {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -538,30 +538,30 @@ 
 // Code for search criteria persistence.
                     if (!empty($_GET['save_lastsearch_values'])) {    // We must use $_GET here
                         $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
-                        $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
+                        $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
 // Clean $relativepathstring
                         if (constant('DOL_BASE_URI')) {
-                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
                         }
                         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 //var_dump($relativepathstring);
 // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-                        if (!empty($_SESSION['lastsearch_values_tmp_' . $relativepathstring])) {
-                            $_SESSION['lastsearch_values_' . $relativepathstring] = $_SESSION['lastsearch_values_tmp_' . $relativepathstring];
-                            unset($_SESSION['lastsearch_values_tmp_' . $relativepathstring]);
+                        if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring])) {
+                            $_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                            unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
                         }
-                        if (!empty($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring])) {
-                            $_SESSION['lastsearch_contextpage_' . $relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring];
-                            unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
+                        if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring])) {
+                            $_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+                            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
                         }
-                        if (!empty($_SESSION['lastsearch_page_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_page_tmp_' . $relativepathstring] > 1) {
-                            $_SESSION['lastsearch_page_' . $relativepathstring] = $_SESSION['lastsearch_page_tmp_' . $relativepathstring];
-                            unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
+                        if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1) {
+                            $_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+                            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
                         }
-                        if (!empty($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]) && $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] != Globals::$conf->liste_limit) {
-                            $_SESSION['lastsearch_limit_' . $relativepathstring] = $_SESSION['lastsearch_limit_tmp_' . $relativepathstring];
-                            unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+                        if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != Globals::$conf->liste_limit) {
+                            $_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+                            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
                         }
                     }
 
@@ -609,14 +609,14 @@ 
                     $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
                 }
 
-                DolUtils::dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
+                DolUtils::dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
                 // Config::$dbEngine->begin();
                 Config::$dbEngine->startTransaction();
 
                 Globals::$user->update_last_login_date();
 
-                $loginfo = 'TZ=' . $_SESSION["dol_tz"] . ';TZString=' . $_SESSION["dol_tz_string"] . ';Screen=' . $_SESSION["dol_screenwidth"] . 'x' . $_SESSION["dol_screenheight"];
+                $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
 
 // Call triggers for the "security events" log
                 Globals::$user->trigger_mesg = $loginfo;
@@ -632,7 +632,7 @@ 
                 $action = '';
                 Globals::$hookManager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginfo' => $loginfo);
-                $reshook = Globals::$hookManager->executeHooks('afterLogin', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
+                $reshook = Globals::$hookManager->executeHooks('afterLogin', $parameters, Globals::$user, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) {
                     $error++;
                 }
@@ -653,7 +653,7 @@ 
                     if ($_SERVER["PHP_SELF"] != $newpath) {   // not already on landing page (avoid infinite loop)
                         echo $newpath;
                         throw Exception('x');
-                        header('Location: ' . $newpath);
+                        header('Location: '.$newpath);
                         exit;
                     }
                 }
@@ -685,7 +685,7 @@ 
             if (empty(Globals::$conf->global->MAIN_FORCETHEME) && !empty(Globals::$user->conf->MAIN_THEME)) {
                 Globals::$conf->theme = Globals::$user->conf->MAIN_THEME;
 // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-                Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+                Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
             }
         }
 
@@ -693,7 +693,7 @@ 
         if (DolUtils::GETPOST('theme', 'alpha')) {
             Globals::$conf->theme = DolUtils::GETPOST('theme', 'alpha', 1);
 // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
 
 
@@ -743,7 +743,7 @@ 
         if (!empty(Globals::$conf->dol_use_jmobile) && in_array(Globals::$conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
             Globals::$conf->theme = 'eldy';
 // Globals::$conf->css = "/theme/" . Globals::$conf->theme . "/style.css.php";
-            Globals::$conf->css = '?controller=theme/' . Globals::$conf->theme . '&method=style.css';
+            Globals::$conf->css = '?controller=theme/'.Globals::$conf->theme.'&method=style.css';
         }
 
         if (!defined('NOREQUIRETRAN')) {
@@ -780,7 +780,7 @@ 
         }
 
 
-        DolUtils::dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . ' - action=' . DolUtils::GETPOST('action', 'az09') . ', massaction=' . DolUtils::GETPOST('massaction', 'az09'));
+        DolUtils::dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.DolUtils::GETPOST('action', 'az09').', massaction='.DolUtils::GETPOST('massaction', 'az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 // Load main languages files
@@ -792,7 +792,7 @@ 
 // Define some constants used for style of arrays
         $bc = array(0 => 'class="impair"', 1 => 'class="pair"');
         $bcdd = array(0 => 'class="drag drop oddeven"', 1 => 'class="drag drop oddeven"');
-        $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"');  // Used for tr to add new lines
+        $bcnd = array(0 => 'class="nodrag nodrop nohover"', 1 => 'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
         $bctag = array(0 => 'class="impair tagtr"', 1 => 'class="pair tagtr"');
 
 // Define messages variables
@@ -840,7 +840,7 @@ 
 // Load the menu manager (only if not already done)
             $file_menu = Globals::$conf->standard_menu;
             if (DolUtils::GETPOST('menu', 'alpha')) {
-                $file_menu = DolUtils::GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+                $file_menu = DolUtils::GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
             }
             if (!class_exists('MenuManager')) {
                 $menufound = 0;
@@ -852,7 +852,7 @@ 
                     }
                 }
                 if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
-                    DolUtils::dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
+                    DolUtils::dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
                     $file_menu = 'eldy_menu.php';
                     // include_once DOL_DOCUMENT_ROOT . "/core/menus/standard/" . $file_menu;
                 }
@@ -896,7 +896,7 @@ 
 
         // This is to make Dolibarr working with Plesk
         if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs') {
-            set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+            set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
         }
 
         // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
@@ -907,7 +907,7 @@ 
             $tmplist = explode(',', $tmpautoset[1]);
             $cookiearrayvalue = array();
             foreach ($tmplist as $tmpkey) {
-                $postkey = $tmpautoset[0] . '_' . $tmpkey;
+                $postkey = $tmpautoset[0].'_'.$tmpkey;
 //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
                 if (!empty($_POST[$postkey])) {
                     $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
@@ -968,8 +968,8 @@ 
             $inj += preg_match('/insert\s+into/i', $val);
             $inj += preg_match('/select\s+from/i', $val);
             $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
-            $inj += preg_match('/user\s*\(/i', $val);      // avoid to use function user() that return current database login
-            $inj += preg_match('/information_schema/i', $val);    // avoid to use request that read information_schema database
+            $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
+            $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
         }
         if ($type == 3) {
             $inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i', $val);
@@ -993,15 +993,15 @@ 
             $inj += preg_match('/<style/i', $val);
         }
         $inj += preg_match('/base[\s]+href/si', $val);
-        $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-        $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-        $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-        $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-        $inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-        $inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-        $inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+        $inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+        $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+        $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+        $inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+        $inj += preg_match('/onloadstart\s*=/i', $val); // onload can be set on audio tag <audio onloadstart=alert(1)>
+        $inj += preg_match('/onclick\s*=/i', $val); // onclick can be set on img text html tag like <img onclick = alert(1)>
+        $inj += preg_match('/onscroll\s*=/i', $val); // onscroll can be on textarea
 //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-        $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);  // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+        $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 //if ($type == 1)
 //{
         $inj += preg_match('/javascript:/i', $val);
@@ -1009,10 +1009,10 @@ 
 //}
 // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
         if ($type == 1) {
-            $inj += preg_match('/"/i', $val);  // We refused " in GET parameters value
+            $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
         }
         if ($type == 2) {
-            $inj += preg_match('/[;"]/', $val);  // PHP_SELF is a file system path. It can contains spaces.
+            $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
         }
         return $inj;
     }
@@ -1031,7 +1031,7 @@ 
                 if ($this->analyseVarsForSqlAndScriptsInjection($key, $type) && $this->analyseVarsForSqlAndScriptsInjection($value, $type)) {
 //$var[$key] = $value;	// This is useless
                 } else {
-                    print 'Access refused by SQL/Script injection protection in main.inc.php (type=' . htmlentities($type) . ' key=' . htmlentities($key) . ' value=' . htmlentities($value) . ' page=' . htmlentities($_SERVER["REQUEST_URI"]) . ')';
+                    print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
                     exit;
                 }
             }

Base/Langs.php

Spacing +66 added lines, -66 removed lines

@@ -22,13 +22,13 @@ 
 class Langs

 {

 

-    public $dir;                          // Directories that contains /langs subdirectory

-    public $defaultlang;                  // Current language for current user

-    public $charset_output = 'UTF-8';       // Codage used by "trans" method outputs

-    public $tab_translate = array();        // Array of all translations key=>value

-    private $_tab_loaded = array();         // Array to store result after loading each language file

-    public $cache_labels = array();         // Cache for labels return by getLabelFromKey method

-    public $cache_currencies = array();     // Cache to store currency symbols

+    public $dir; // Directories that contains /langs subdirectory

+    public $defaultlang; // Current language for current user

+    public $charset_output = 'UTF-8'; // Codage used by "trans" method outputs

+    public $tab_translate = array(); // Array of all translations key=>value

+    private $_tab_loaded = array(); // Array to store result after loading each language file

+    public $cache_labels = array(); // Cache for labels return by getLabelFromKey method

+    public $cache_currencies = array(); // Cache to store currency symbols

     private $cache_currencies_all_loaded = false;

 

     /**

@@ -61,13 +61,13 @@ 
             $more = array();

             $i = 0;

             foreach (Globals::$conf->file->dol_document_root as $dir) {

-                $newdir = $dir . Globals::$conf->global->MAIN_FORCELANGDIR;    // For example Globals::$conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'

+                $newdir = $dir.Globals::$conf->global->MAIN_FORCELANGDIR; // For example Globals::$conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'

                 if (!in_array($newdir, $this->dir)) {

-                    $more['module_' . $i] = $newdir;

-                    $i++;   // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.

+                    $more['module_'.$i] = $newdir;

+                    $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.

                 }

             }

-            $this->dir = array_merge($more, $this->dir);    // Forced dir ($more) are before standard dirs ($this->dir)

+            $this->dir = array_merge($more, $this->dir); // Forced dir ($more) are before standard dirs ($this->dir)

         }

 

         $this->origlang = $srclang;

@@ -91,12 +91,12 @@ 
             if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep))

                 $srclang = $longforshort[strtolower($langpart[0])];

             else if (!is_numeric($langpart[1])) {  // Second part YY may be a numeric with some Chrome browser

-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[1]);

+                $srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);

                 $longforlong = array('no_nb' => 'nb_NO');

                 if (isset($longforlong[strtolower($srclang)]))

                     $srclang = $longforlong[strtolower($srclang)];

             } else

-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);

+                $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);

         }

         else {      // If it's for a codetouse that is a short code xx

             // Array to convert short lang code into long code.

@@ -104,7 +104,7 @@ 
             if (isset($longforshort[strtolower($langpart[0])]))

                 $srclang = $longforshort[strtolower($langpart[0])];

             else if (!empty($langpart[0]))

-                $srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);

+                $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);

             else

                 $srclang = 'en_US';

         }

@@ -168,11 +168,11 @@ 
         //DolUtils::dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);

         // Check parameters

         if (empty($domain)) {

-            dol_print_error('', get_class($this) . "::Load ErrorWrongParameters");

+            dol_print_error('', get_class($this)."::Load ErrorWrongParameters");

             return -1;

         }

         if ($this->defaultlang == 'none_NONE')

-            return 0;    // Special language code to not translate keys

+            return 0; // Special language code to not translate keys

 

 

 

@@ -181,7 +181,7 @@ 
             

 // Load $this->tab_translate[] from database

         if (empty($loadfromfileonly) && count($this->tab_translate) == 0)

-            $this->loadFromDatabase($db);      // No translation was never loaded yet, so we load database.

+            $this->loadFromDatabase($db); // No translation was never loaded yet, so we load database.

 

 

         $newdomain = $domain;

@@ -210,13 +210,13 @@ 
             $alt = 2;

 

         if (empty($langofdir)) { // This may occurs when load is called without setting the language and without providing a value for forcelangdir

-            DolUtils::dol_syslog("Error: " . get_class($this) . "::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

+            DolUtils::dol_syslog("Error: ".get_class($this)."::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

             return -1;

         }

 

         foreach ($this->dir as $keydir => $searchdir) {

             // Directory of translation files

-            $file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang";

+            $file_lang = $searchdir.($modulename ? '/'.$modulename : '')."/langs/".$langofdir."/".$newdomain.".lang";

             $file_lang_osencoded = dol_osencode($file_lang);

 

             $filelangexists = is_file($file_lang_osencoded);

@@ -232,7 +232,7 @@ 
                 $usecachekey = '';

                 // Using a memcached server

                 if (!empty(Globals::$conf->memcached->enabled) && !empty(Globals::$conf->global->MEMCACHED_SERVER)) {

-                    $usecachekey = $newdomain . '_' . $langofdir . '_' . md5($file_lang);    // Should not contains special chars

+                    $usecachekey = $newdomain.'_'.$langofdir.'_'.md5($file_lang); // Should not contains special chars

                 }

                 // Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)

                 else if (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) && (Globals::$conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {

@@ -243,7 +243,7 @@ 
                     //DolUtils::dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);

                     //global $aaa; $aaa+=1;

                     //print $aaa." ".$usecachekey."\n";

-                    require_once DOL_BASE_PATH . '/core/lib/memory.lib.php';

+                    require_once DOL_BASE_PATH.'/core/lib/memory.lib.php';

                     $tmparray = dol_getcache($usecachekey);

                     if (is_array($tmparray) && count($tmparray)) {

                         $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.

@@ -251,7 +251,7 @@ 
                         //var_dump($this->tab_translate);

                         if ($alt == 2)

                             $fileread = 1;

-                        $found = true;      // Found in dolibarr PHP cache

+                        $found = true; // Found in dolibarr PHP cache

                     }

                 }

 

@@ -301,13 +301,13 @@ 
                         if ($usecachekey && count($tabtranslatedomain)) {

                             $ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);

                             if ($ressetcache < 0) {

-                                $error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;

+                                $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;

                                 DolUtils::dol_syslog($error, LOG_ERR);

                             }

                         }

 

                         if (empty(Globals::$conf->global->MAIN_FORCELANGDIR))

-                            break;  // Break loop on each root dir. If a module has forced dir, we do not stop loop.

+                            break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.

                     }

                 }

             }

@@ -317,11 +317,11 @@ 
         if ($alt == 0) {

             // This function MUST NOT contains call to syslog

             //DolUtils::dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);

-            $langofdir = strtolower($langarray[0]) . '_' . strtoupper($langarray[0]);

+            $langofdir = strtolower($langarray[0]).'_'.strtoupper($langarray[0]);

             if ($langofdir == 'el_EL')

-                $langofdir = 'el_GR';                     // main parent for el_CY is not 'el_EL' but 'el_GR'

+                $langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'

             if ($langofdir == 'ar_AR')

-                $langofdir = 'ar_SA';                     // main parent for ar_EG is not 'ar_AR' but 'ar_SA'

+                $langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'

             $this->load($domain, $alt + 1, $stopafterdirection, $langofdir);

         }

 

@@ -336,7 +336,7 @@ 
         // We are in the pass of the reference file. No more files to scan to complete.

         if ($alt == 2) {

             if ($fileread)

-                $this->_tab_loaded[$newdomain] = 1;        // Set domain file as found so loaded

+                $this->_tab_loaded[$newdomain] = 1; // Set domain file as found so loaded

 

             if (empty($this->_tab_loaded[$newdomain]))

                 $this->_tab_loaded[$newdomain] = 2; // Set this file as not found

@@ -345,7 +345,7 @@ 
         // This part is deprecated and replaced with table llx_overwrite_trans

         // Kept for backward compatibility.

         if (empty($loadfromfileonly)) {

-            $overwritekey = 'MAIN_OVERWRITE_TRANS_' . $this->defaultlang;

+            $overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;

             if (!empty(Globals::$conf->global->$overwritekey)) {    // Overwrite translation with key1:newstring1,key2:newstring2

                 // Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX

                 $tmparray = explode(',', Globals::$conf->global->$overwritekey);

@@ -384,7 +384,7 @@ 
 

         // Check parameters

         if (empty($db))

-            return 0;    // Database handler can't be used

+            return 0; // Database handler can't be used

 

 

 

@@ -401,13 +401,13 @@ 
             return 0;

         }

 

-        $this->_tab_loaded[$newdomain] = 1;   // We want to be sure this function is called once only for domain 'database'

+        $this->_tab_loaded[$newdomain] = 1; // We want to be sure this function is called once only for domain 'database'

 

         $fileread = 0;

         $langofdir = $this->defaultlang;

 

         if (empty($langofdir)) { // This may occurs when load is called without setting the language and without providing a value for forcelangdir

-            DolUtils::dol_syslog("Error: " . get_class($this) . "::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

+            DolUtils::dol_syslog("Error: ".get_class($this)."::Load was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

             return -1;

         }

 

@@ -418,7 +418,7 @@ 
         $usecachekey = '';

         // Using a memcached server

         if (!empty(Globals::$conf->memcached->enabled) && !empty(Globals::$conf->global->MEMCACHED_SERVER)) {

-            $usecachekey = $newdomain . '_' . $langofdir;    // Should not contains special chars

+            $usecachekey = $newdomain.'_'.$langofdir; // Should not contains special chars

         }

         // Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)

         else if (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) && (Globals::$conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {

@@ -429,20 +429,20 @@ 
             //DolUtils::dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);

             //global $aaa; $aaa+=1;

             //print $aaa." ".$usecachekey."\n";

-            require_once DOL_BASE_PATH . '/core/lib/memory.lib.php';

+            require_once DOL_BASE_PATH.'/core/lib/memory.lib.php';

             $tmparray = dol_getcache($usecachekey);

             if (is_array($tmparray) && count($tmparray)) {

                 $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a valuer already exists into tab_translate, value into tmparaay is not added.

                 //print $newdomain."\n";

                 //var_dump($this->tab_translate);

                 $fileread = 1;

-                $found = true;      // Found in dolibarr PHP cache

+                $found = true; // Found in dolibarr PHP cache

             }

         }

 

         if (!$found && !empty(Globals::$conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {

             // Overwrite translation with database read

-            $sql = "SELECT transkey, transvalue FROM " . MAIN_DB_PREFIX . "overwrite_trans where lang='" . $db->escape($this->defaultlang) . "'";

+            $sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."'";

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

 

             if ($resql) {

@@ -477,7 +477,7 @@ 
                     if ($usecachekey && count($tabtranslatedomain)) {

                         $ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);

                         if ($ressetcache < 0) {

-                            $error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;

+                            $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;

                             DolUtils::dol_syslog($error, LOG_ERR);

                         }

                     }

@@ -491,7 +491,7 @@ 
             $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded

 

         if (empty($this->_tab_loaded[$newdomain]))

-            $this->_tab_loaded[$newdomain] = 2;           // Marque ce cas comme non trouve (no lines found for language)

+            $this->_tab_loaded[$newdomain] = 2; // Marque ce cas comme non trouve (no lines found for language)

 

         return 1;

     }

@@ -561,12 +561,12 @@ 
             $str = $this->tab_translate[$key];

 

             // Make some string replacement after translation

-            $replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;

+            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;

             if (!empty(Globals::$conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2

                 $tmparray = explode(';', Globals::$conf->global->$replacekey);

                 foreach ($tmparray as $tmp) {

                     $tmparray2 = explode(':', $tmp);

-                    $str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);

+                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);

                 }

             }

 

@@ -636,12 +636,12 @@ 
             $str = $this->tab_translate[$key];

 

             // Make some string replacement after translation

-            $replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;

+            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;

             if (!empty(Globals::$conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2

                 $tmparray = explode(';', Globals::$conf->global->$replacekey);

                 foreach ($tmparray as $tmp) {

                     $tmparray2 = explode(':', $tmp);

-                    $str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);

+                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);

                 }

             }

 

@@ -724,7 +724,7 @@ 
         }

 

         // We scan directory langs to detect available languages

-        $handle = opendir($langdir . "/langs");

+        $handle = opendir($langdir."/langs");

         $langs_available = array();

         while ($dir = trim(readdir($handle))) {

             if (preg_match('/^[a-z]+_[A-Z]+/i', $dir)) {

@@ -734,9 +734,9 @@ 
                     $langs_available[$dir] = $dir;

                 }

                 if ($usecode == 1 || !empty(Globals::$conf->global->MAIN_SHOW_LANGUAGE_CODE)) {

-                    $langs_available[$dir] = $dir . ': ' . dol_trunc($this->trans('Language_' . $dir), $maxlength);

+                    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);

                 } else {

-                    $langs_available[$dir] = $this->trans('Language_' . $dir);

+                    $langs_available[$dir] = $this->trans('Language_'.$dir);

                 }

             }

         }

@@ -756,13 +756,13 @@ 
         // phpcs:enable

         // Test si fichier dans repertoire de la langue

         foreach ($this->dir as $searchdir) {

-            if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename)))

+            if (is_readable(dol_osencode($searchdir."/langs/".$this->defaultlang."/".$filename)))

                 return true;

 

             if ($searchalt) {

                 // Test si fichier dans repertoire de la langue alternative

                 if ($this->defaultlang != "en_US")

-                    $filenamealt = $searchdir . "/langs/en_US/" . $filename;

+                    $filenamealt = $searchdir."/langs/en_US/".$filename;

                 //else $filenamealt = $searchdir."/langs/fr_FR/".$filename;

                 if (is_readable(dol_osencode($filenamealt)))

                     return true;

@@ -799,8 +799,8 @@ 
                 continue; // We must not use dol_is_dir here, function may not be loaded

 

             $fonc = 'numberwords';

-            if (file_exists($newdir . '/functions_' . $fonc . '.lib.php')) {

-                include_once $newdir . '/functions_' . $fonc . '.lib.php';

+            if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {

+                include_once $newdir.'/functions_'.$fonc.'.lib.php';

                 $newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);

                 break;

             }

@@ -834,20 +834,20 @@ 
         // Check if a translation is available (this can call getTradFromKey)

         $tmp = $this->transnoentitiesnoconv($key);

         if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString') {

-            return $tmp;    // Found in language array

+            return $tmp; // Found in language array

         }

 

         // Check in cache

         if (isset($this->cache_labels[$tablename][$key])) { // Can be defined to 0 or ''

-            return $this->cache_labels[$tablename][$key];   // Found in cache

+            return $this->cache_labels[$tablename][$key]; // Found in cache

         }

 

-        $sql = "SELECT " . $fieldlabel . " as label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

-        $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($keyforselect ? $keyforselect : $key) . "'";

+        $sql = "SELECT ".$fieldlabel." as label";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$tablename;

+        $sql .= " WHERE ".$fieldkey." = '".$db->escape($keyforselect ? $keyforselect : $key)."'";

         if ($filteronentity)

-            $sql .= " AND entity IN (" . getEntity($tablename) . ')';

-        DolUtils::dol_syslog(get_class($this) . '::getLabelFromKey', LOG_DEBUG);

+            $sql .= " AND entity IN (".getEntity($tablename).')';

+        DolUtils::dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);

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

         if ($resql) {

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

@@ -879,9 +879,9 @@ 
         $symbol = $this->getCurrencySymbol($currency_code);

 

         if (in_array($currency_code, array('USD')))

-            return $symbol . $amount;

+            return $symbol.$amount;

         else

-            return $amount . $symbol;

+            return $amount.$symbol;

     }

 

     /**

@@ -920,18 +920,18 @@ 
         global $db;

 

         if ($this->cache_currencies_all_loaded)

-            return 0;                                           // Cache already loaded for all

+            return 0; // Cache already loaded for all

         if (!empty($currency_code) && isset($this->cache_currencies[$currency_code]))

-            return 0;    // Cache already loaded for the currency

+            return 0; // Cache already loaded for the currency

 

         $sql = "SELECT code_iso, label, unicode";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_currencies";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_currencies";

         $sql .= " WHERE active = 1";

         if (!empty($currency_code))

-            $sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";

+            $sql .= " AND code_iso = '".$db->escape($currency_code)."'";

         //$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later

 

-        DolUtils::dol_syslog(get_class($this) . '::loadCacheCurrencies', LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG);

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

         if ($resql) {

             $this->load("dict");

@@ -946,7 +946,7 @@ 
                 $obj = $db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency" . $obj->code_iso) != "Currency" . $obj->code_iso ? $this->trans("Currency" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

+                $this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency".$obj->code_iso) != "Currency".$obj->code_iso ? $this->trans("Currency".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode($obj->unicode, true);

                 $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];

                 $i++;

@@ -978,8 +978,8 @@ 
         $substitutionarray = array();

 

         foreach ($this->tab_translate as $code => $label) {

-            $substitutionarray['lang_' . $code] = $label;

-            $substitutionarray['__(' . $code . ')__'] = $label;

+            $substitutionarray['lang_'.$code] = $label;

+            $substitutionarray['__('.$code.')__'] = $label;

         }

 

         return $substitutionarray;

Base/AlixarView.php

Spacing +90 added lines, -90 removed lines

@@ -125,7 +125,7 @@ 
 // html header
         $this->top_htmlhead(/* $this->head, $this->title, $this->disablejs, $this->disablehead, $this->arrayofjs, $this->arrayofcss */);
 
-        print '<body id="mainbody"' . ($this->morecssonbody ? ' class="' . $this->morecssonbody . '"' : '') . '>' . "\n";
+        print '<body id="mainbody"'.($this->morecssonbody ? ' class="'.$this->morecssonbody.'"' : '').'>'."\n";
 
 // top menu and left menu area
         if (empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) {
@@ -134,7 +134,7 @@ 
 
         if (empty(Globals::$conf->dol_hide_leftmenu)) {
             //$this->left_menu('', $this->help_url, '', '', 1, $this->title, 1);  // $menumanager is retreived with a global $menumanager inside this function
-            $this->left_menu('', /* $this->help_url, */ '', '', 1, /* $this->title, */ 1);  // $menumanager is retreived with a global $menumanager inside this function
+            $this->left_menu('', /* $this->help_url, */ '', '', 1, /* $this->title, */ 1); // $menumanager is retreived with a global $menumanager inside this function
         }
 
 // main area
@@ -185,13 +185,13 @@ 
          * Top menu
          */
         if ((empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
-            print "\n" . '<!-- Start top horizontal -->' . "\n";
+            print "\n".'<!-- Start top horizontal -->'."\n";
 
-            print '<div class="side-nav-vert' . (DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '') . '"><div id="id-top">';  // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+            print '<div class="side-nav-vert'.(DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 // Show menu entries
-            print '<div id="tmenu_tooltip' . (empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert') . '" class="tmenu">' . "\n";
+            print '<div id="tmenu_tooltip'.(empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
             Globals::$menuManager->atarget = $this->target;
-            Globals::$menuManager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks));      // This contains a \n
+            Globals::$menuManager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks)); // This contains a \n
             print "</div>\n";
 
 // Define link to login card
@@ -199,36 +199,36 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                    if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                        $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
             } else
-                $appli .= " " . DOL_VERSION;
+                $appli .= " ".DOL_VERSION;
 
             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+                $appli .= "<br>".Globals::$langs->trans("LevelOfFeature").': '.Globals::$conf->global->MAIN_FEATURES_LEVEL;
 
             $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 //$logouthtmltext=$appli.'<br>';
                 $logouthtmltext = '';
                 if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') { {
-                        $logouthtmltext .= Globals::$langs->trans("Logout") . '<br>';
+                        $logouthtmltext .= Globals::$langs->trans("Logout").'<br>';
                     }
 
 //$logouttext .='<a accesskey="l" href="'.DOL_BASE_URI.'/user/logout.php">';
-                    $logouttext .= '<a accesskey="l" href="' . BASE_URI . '?controller=user&method=logout">';
+                    $logouttext .= '<a accesskey="l" href="'.BASE_URI.'?controller=user&method=logout">';
 //$logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                     $logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
                     $logouttext .= '</a>';
                 } else {
                     $logouthtmltext .= Globals::$langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
-                    $logouttext .= img_picto(Globals::$langs->trans('Logout') . ":" . Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                    $logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                 }
             }
 
-            print '<div class="login_block">' . "\n";
+            print '<div class="login_block">'."\n";
 
 // Add login user link
             $toprightmenu .= '<div class="login_block_user">';
@@ -239,18 +239,18 @@ 
             $toprightmenu .= Globals::$user->getNomUrl($mode, '', 1, 0, 11, 0, (Globals::$user->firstname ? 'firstname' : -1), 'atoplogin');
             $toprightmenu .= '</div></div>';
 
-            $toprightmenu .= '</div>' . "\n";
+            $toprightmenu .= '</div>'."\n";
 
             $toprightmenu .= '<div class="login_block_other">';
 
 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
             $parameters = array();
-            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
                 if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
+                    $toprightmenu .= Globals::$hookManager->resPrint; // add
                 else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
+                    $toprightmenu = Globals::$hookManager->resPrint; // replace
             }
             else {
                 $toprightmenu .= $result; // For backward compatibility
@@ -259,7 +259,7 @@ 
 // Link to module builder
             if (!empty(Globals::$conf->modulebuilder->enabled)) {
 //$text = '<a href="' . DOL_BASE_URI . '/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-                $text = '<a href="' . BASE_URI . '?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+                $text = '<a href="'.BASE_URI.'?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 //$text.= img_picto(":".Globals::$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-bug atoplogin"></span>';
                 $text .= '</a>';
@@ -273,12 +273,12 @@ 
                 if (is_array($_POST)) {
                     foreach ($_POST as $key => $value) {
                         if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
-                            $qs .= '&' . $key . '=' . urlencode($value);
+                            $qs .= '&'.$key.'='.urlencode($value);
                         }
                     }
                 }
-                $qs .= (($qs && $this->morequerystring) ? '&' : '') . $this->morequerystring;
-                $text = '<a href="' . DolUtils::dol_escape_htmltag($_SERVER["PHP_SELF"]) . '?' . $qs . ($qs ? '&' : '') . 'optioncss=print" target="_blank">';
+                $qs .= (($qs && $this->morequerystring) ? '&' : '').$this->morequerystring;
+                $text = '<a href="'.DolUtils::dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 //$text.= img_picto(":".Globals::$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-print atoplogin"></span>';
                 $text .= '</a>';
@@ -307,12 +307,12 @@ 
                     $text = '';
                     if (!empty(Globals::$conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                         Globals::$langs->load('admin');
-                        $appli .= '<br>' . Globals::$langs->trans("Database") . ': ' . $db->database_name;
+                        $appli .= '<br>'.Globals::$langs->trans("Database").': '.$db->database_name;
                     }
-                    $this->title = $appli . '<br>';
+                    $this->title = $appli.'<br>';
                     $this->title .= Globals::$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
                     if ($mode == 'wiki') {
-                        $this->title .= ' - ' . Globals::$langs->trans("PageWiki") . ' &quot;' . DolUtils::dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                        $this->title .= ' - '.Globals::$langs->trans("PageWiki").' &quot;'.DolUtils::dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
                     }
                     $text .= '<a class="help" target="_blank" rel="noopener" href="';
                     if ($mode == 'wiki') {
@@ -338,7 +338,7 @@ 
 
             print $toprightmenu;
 
-            print "</div>\n";  // end div class="login_block"
+            print "</div>\n"; // end div class="login_block"
 
             print '</div></div>';
 
@@ -347,7 +347,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . (isset($morecss) && $morecss ? ' ' . $morecss : '') . '">';
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container'.(isset($morecss) && $morecss ? ' '.$morecss : '').'">';
         }
     }
 
@@ -380,7 +380,7 @@ 
             // Instantiate hooks of thirdparty module
             Globals::$hookManager->initHooks(array('searchform', 'leftblock'));
 
-            print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
+            print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
             if (Globals::$conf->browser->layout == 'phone') {
                 Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
@@ -409,7 +409,7 @@ 
 // Execute hook printSearchForm
             $parameters = array('searchform' => $searchform);
 
-            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
             } else
@@ -417,10 +417,10 @@ 
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
-                $urltosearch = DOL_BASE_URI . '/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="' . $urltosearch . '" alt="' . DolUtils::dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div></div>';
+                $urltosearch = DOL_BASE_URI.'/core/search_page.php?showtitlebefore=1';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.DolUtils::dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div></div>';
             } elseif (Globals::$conf->use_javascript_ajax && !empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="' . DolUtils::dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div><div id="divsearchforms2" style="display: none">' . $searchform . '</div>';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.DolUtils::dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
                 $searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
@@ -433,16 +433,16 @@ 
 
 // Define $bookmarks
             if (!empty(Globals::$conf->bookmark->enabled) && Globals::$user->rights->bookmark->lire) {
-                include_once DOL_BASE_PATH . '/bookmarks/bookmarks.lib.php';
+                include_once DOL_BASE_PATH.'/bookmarks/bookmarks.lib.php';
                 Globals::$langs->load("bookmarks");
 
                 $bookmarks = printBookmarksList($db, Globals::$langs);
             }
 
 // Left column
-            print '<!-- Begin left menu -->' . "\n";
+            print '<!-- Begin left menu -->'."\n";
 
-            print '<div class="vmenu"' . (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"') . '>' . "\n\n";
+            print '<div class="vmenu"'.(empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 // Show left menu with other forms
             Globals::$menuManager->menu_array = $menu_array_before;
@@ -451,7 +451,7 @@ 
 // Dolibarr version + help + bug report link
             print "\n";
             print "<!-- Begin Help Block-->\n";
-            print '<div id="blockvmenuhelp" class="blockvmenuhelp">' . "\n";
+            print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 // Version
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
@@ -478,18 +478,18 @@ 
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
                     $doliurl = '';
                     if (preg_match('/\d\.\d/', $appli)) {
-                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
-                            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+                            $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                         }
                     } else {
-                        $appli .= " " . DOL_VERSION;
+                        $appli .= " ".DOL_VERSION;
                     }
                 } else {
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
                 }
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
                 if ($doliurl) {
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                    print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
                 } else {
                     print '<span class="help">';
                 }
@@ -499,12 +499,12 @@ 
                 } else {
                     print '</span>';
                 }
-                print '</div>' . "\n";
+                print '</div>'."\n";
             }
 
 // Link to bugtrack
             if (!empty(Globals::$conf->global->MAIN_BUGTRACK_ENABLELINK)) {
-                require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+                require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
                 $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
                 $bugbaseurl .= '?title=';
@@ -513,16 +513,16 @@ 
                 $bugbaseurl .= urlencode("# Bug\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Environment\n");
-                $bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
-                $bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
-                $bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-                $bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-                $bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-                $bugbaseurl .= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+                $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+                $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+                $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+                $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+                $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+                $bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Report\n");
                 print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-                print '<a class="help" target="_blank" rel="noopener" href="' . $bugbaseurl . '">' . Globals::$langs->trans("FindBug") . '</a>';
+                print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.Globals::$langs->trans("FindBug").'</a>';
                 print '</div>';
             }
 
@@ -536,14 +536,14 @@ 
 
 // Execute hook printLeftBlock
             $parameters = array();
-            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
             print Globals::$hookManager->resPrint;
 
             print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
         }
 
         print "\n";
-        print '<!-- Begin right area -->' . "\n";
+        print '<!-- Begin right area -->'."\n";
 
         if (empty($leftmenuwithoutmainarea)) {
             main_area($this->title);
@@ -566,7 +566,7 @@ 
 
         print "\n";
 
-        print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
+        print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
         if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
             print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
@@ -633,18 +633,18 @@ 
 // global Globals::$conf, Globals::$langs, Globals::$user;
 
         $ret = '';
-        $ret .= '<form action="' . $urlaction . '" method="post" class="searchform">';
-        $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        $ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+        $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         $ret .= '<input type="hidden" name="mode" value="search">';
-        $ret .= '<input type="hidden" name="savelogin" value="' . DolUtils::dol_escape_htmltag(Globals::$user->login) . '">';
+        $ret .= '<input type="hidden" name="savelogin" value="'.DolUtils::dol_escape_htmltag(Globals::$user->login).'">';
         if ($showtitlebefore) {
-            $ret .= $this->title . ' ';
+            $ret .= $this->title.' ';
         }
-        $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
-        $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
-        $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
-        $ret .= ' placeholder="' . strip_tags($this->title) . '"';
-        $ret .= ' name="' . $htmlinputname . '" id="' . $prefhtmlinputname . $htmlinputname . '" />';
+        $ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+        $ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+        $ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+        $ret .= ' placeholder="'.strip_tags($this->title).'"';
+        $ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
         //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.Globals::$langs->trans("Go").'">';
         $ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
         $ret .= '<span class="fa fa-search"></span>';
@@ -669,7 +669,7 @@ 
 // global $delayedhtmlcontent;
 // global $contextpage, $page, $limit;
 
-        $ext = 'layout=' . Globals::$conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
+        $ext = 'layout='.Globals::$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
 // Global html output events ($mesgs, $errors, $warnings)
         DolUtils::dol_htmloutput_events($disabledoutputofmessages);
@@ -679,7 +679,7 @@ 
         if (is_object(Globals::$user) && !empty(Globals::$user->lastsearch_values_tmp) && is_array(Globals::$user->lastsearch_values_tmp)) {
 // Clean and save data
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
-                unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
+                unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
                     if (empty($val['sortfield'])) {
                         unset($val['sortfield']);
@@ -687,9 +687,9 @@ 
                     if (empty($val['sortorder'])) {
                         unset($val['sortorder']);
                     }
-                    dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
-                    $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
-                    unset($_SESSION['lastsearch_values_' . $key]);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
                 }
             }
         }
@@ -698,37 +698,37 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
         if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
-            unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
             if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+                $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
             if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+                $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
             if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+                $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
-            unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
         }
 
 // Core error message
         if (!empty(Globals::$conf->global->MAIN_CORE_ERROR)) {
 // Ajax version
             if (Globals::$conf->use_javascript_ajax) {
-                $this->title = img_warning() . ' ' . Globals::$langs->trans('CoreErrorTitle');
+                $this->title = img_warning().' '.Globals::$langs->trans('CoreErrorTitle');
                 print ajax_dialog($this->title, Globals::$langs->trans('CoreErrorMessage'));
             }
 // html version
             else {
-                $msg = img_warning() . ' ' . Globals::$langs->trans('CoreErrorMessage');
-                print '<div class="error">' . $msg . '</div>';
+                $msg = img_warning().' '.Globals::$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
             }
 
 //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
@@ -736,17 +736,17 @@ 
 
         print "\n\n";
 
-        print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
         if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+            print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+            print '</div> <!-- End div id-container -->'."\n"; // End div container
 
         print "\n";
         if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+            print '<!-- '.$comment.' -->'."\n";
 
         DolUtils::printCommonFooter($zone);
 
@@ -754,8 +754,8 @@ 
             print $delayedhtmlcontent;
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
-            print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";
-            print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_foot.js&lang=' . Globals::$langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_foot.js&lang='.Globals::$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
         }
 
 // Wrapper to add log when clicking on download or preview
@@ -767,7 +767,7 @@ 
                 <script type="text/javascript">
                     jQuery(document).ready(function () {
                         $('a.documentpreview').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -776,7 +776,7 @@ 
                             );
                         });
                         $('a.documentdownload').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -792,7 +792,7 @@ 
 
 // A div for the address popup
         print "\n<!-- A div to allow dialog popup -->\n";
-        print '<div id="dialogforpopup" style="display: none;"></div>' . "\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
         print "</body>\n";
 

Base/CommonObject.php

Spacing +1480 added lines, -1480 removed lines

@@ -35,7 +35,7 @@ 
 	/**

 	 * @var string[]	Array of error strings

 	 */

-	public $errors=array();

+	public $errors = array();

 

 	/**

 	 * @var string ID to identify managed object

@@ -50,7 +50,7 @@ 
 	/**

 	 * @var int    Name of subtable line

 	 */

-	public $table_element_line='';

+	public $table_element_line = '';

 

 	/**

 	 * @var string		Key value used to track if data is coming from import wizard

@@ -60,7 +60,7 @@ 
 	/**

 	 * @var mixed		Contains data to manage extrafields

 	 */

-	public $array_options=array();

+	public $array_options = array();

 

 	/**

 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked

@@ -89,7 +89,7 @@ 
 	/**

 	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method

 	 */

-	public $context=array();

+	public $context = array();

 

 	/**

 	 * @var string		Contains canvas name if record is an alternative canvas record

@@ -349,7 +349,7 @@ 
 	 * @var mixed		Contains comments

 	 * @see fetchComments()

 	 */

-	public $comments=array();

+	public $comments = array();

 

 	/**

 	 * @var int

@@ -375,9 +375,9 @@ 
 	public $civility_id;

 

 	// Dates

-	public $date_creation;			// Date creation

-	public $date_validation;		// Date validation

-	public $date_modification;		// Date last change (tms field)

+	public $date_creation; // Date creation

+	public $date_validation; // Date validation

+	public $date_modification; // Date last change (tms field)

 

 

 

@@ -393,30 +393,30 @@ 
 	 *  @param	string	$ref_ext	Ref ext of object to check

 	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists

 	 */

-	static function isExistingObject($element, $id, $ref='', $ref_ext='')

+	static function isExistingObject($element, $id, $ref = '', $ref_ext = '')

 	{

-		global $db,$conf;

+		global $db, $conf;

 

 		$sql = "SELECT rowid, ref, ref_ext";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;

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

+		$sql .= " FROM ".MAIN_DB_PREFIX.$element;

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

 

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

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

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

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

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

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

 		else {

-			$error='ErrorWrongParameters';

+			$error = 'ErrorWrongParameters';

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

 			return -1;

 		}

 		if ($ref || $ref_ext)

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

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

 

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

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

 		if ($resql)

 		{

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

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

 			if ($num > 0) return 1;

 			else return 0;

 		}

@@ -430,7 +430,7 @@ 
 	 */

 	function errorsToString()

 	{

-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ',$this->errors)):'');

+		return $this->error.(is_array($this->errors) ? (($this->error != '' ? ', ' : '').join(', ', $this->errors)) : '');

 	}

 

 	/**

@@ -442,18 +442,18 @@ 
 	 * 	@param	int			$maxlen			Maximum length

 	 * 	@return	string						String with full name

 	 */

-	function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0)

+	function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)

 	{

 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

-		$lastname=$this->lastname;

-		$firstname=$this->firstname;

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

+		$lastname = $this->lastname;

+		$firstname = $this->firstname;

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

 

-		$ret='';

+		$ret = '';

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

 		{

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

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

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

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

 		}

 

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

@@ -469,24 +469,24 @@ 
 	 *  @param		int		    $withregion			1=Add region into address string

 	 *	@return		string							Full address string

 	 */

-	function getFullAddress($withcountry=0, $sep="\n", $withregion=0)

+	function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0)

 	{

 		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))

 		{

-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

-			$tmparray=getCountry($this->country_id,'all');

-			$this->country_code=$tmparray['code'];

-			$this->country     =$tmparray['label'];

+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+			$tmparray = getCountry($this->country_id, 'all');

+			$this->country_code = $tmparray['code'];

+			$this->country     = $tmparray['label'];

 		}

 

         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))

     	{

-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';

-    		$tmparray=getState($this->state_id,'all',0,1);

-			$this->state_code   =$tmparray['code'];

-			$this->state        =$tmparray['label'];

-			$this->region_code  =$tmparray['region_code'];

-			$this->region       =$tmparray['region'];

+    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+    		$tmparray = getState($this->state_id, 'all', 0, 1);

+			$this->state_code   = $tmparray['code'];

+			$this->state        = $tmparray['label'];

+			$this->region_code  = $tmparray['region_code'];

+			$this->region       = $tmparray['region'];

         }

 

 		return dol_format_address($this, $withcountry, $sep);

@@ -504,105 +504,105 @@ 
 	{

 		global $conf, $langs;

 

-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS

+		$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS

 

-		$contactid=0;

-		$thirdpartyid=0;

+		$contactid = 0;

+		$thirdpartyid = 0;

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

 		{

-			$thirdpartyid=$this->id;

+			$thirdpartyid = $this->id;

 		}

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

 		{

-			$contactid=$this->id;

-			$thirdpartyid=$object->fk_soc;

+			$contactid = $this->id;

+			$thirdpartyid = $object->fk_soc;

 		}

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

 		{

-			$contactid=$this->contact_id;

-			$thirdpartyid=$object->fk_soc;

+			$contactid = $this->contact_id;

+			$thirdpartyid = $object->fk_soc;

 		}

 

-		$out='<!-- BEGIN part to show address block -->';

+		$out = '<!-- BEGIN part to show address block -->';

 

-		$outdone=0;

+		$outdone = 0;

 		$coords = $this->getFullAddress(1, ', ', Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

         if ($coords)

 		{

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

-				$namecoords = $this->getFullName($langs,1).'<br>'.$coords;

+				$namecoords = $this->getFullName($langs, 1).'<br>'.$coords;

 				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile

-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

-				$out.=img_picto($langs->trans("Address"), 'object_address.png');

-				$out.='</a> ';

+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

+				$out .= img_picto($langs->trans("Address"), 'object_address.png');

+				$out .= '</a> ';

 			}

-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

+			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

 			$outdone++;

 		}

 

 		if (!in_array($this->country_code, $countriesusingstate) && empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

             && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) {

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

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

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

             }

             else {

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

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

             }

 			$outdone++;

 		}

 

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

-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

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

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

+		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

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

 		}

-		if (! empty($this->phone_pro)) {

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

+		if (!empty($this->phone_pro)) {

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

 		}

-		if (! empty($this->phone_mobile)) {

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

+		if (!empty($this->phone_mobile)) {

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

 		}

-		if (! empty($this->phone_perso)) {

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

+		if (!empty($this->phone_perso)) {

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

 		}

-		if (! empty($this->office_phone)) {

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

+		if (!empty($this->office_phone)) {

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

 		}

-		if (! empty($this->user_mobile)) {

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

+		if (!empty($this->user_mobile)) {

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

 		}

-		if (! empty($this->fax)) {

-			$out.=dol_print_phone($this->fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

+		if (!empty($this->fax)) {

+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;

 		}

-		if (! empty($this->office_fax)) {

-			$out.=dol_print_phone($this->office_fax,$this->country_code,$contactid,$thirdpartyid,'AC_FAX','&nbsp;','fax',$langs->trans("Fax")); $outdone++;

+		if (!empty($this->office_fax)) {

+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;

 		}

 

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

-		$outdone=0;

-		if (! empty($this->email))

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

+		$outdone = 0;

+		if (!empty($this->email))

 		{

-			$out.=dol_print_email($this->email,$this->id,$object->id,'AC_EMAIL',0,0,1);

+			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);

 			$outdone++;

 		}

-		if (! empty($this->url))

+		if (!empty($this->url))

 		{

-			$out.=dol_print_url($this->url,'_goout',0,1);

+			$out .= dol_print_url($this->url, '_goout', 0, 1);

 			$outdone++;

 		}

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

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

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

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

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

 			$outdone++;

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

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

 			$outdone++;

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

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

 			$outdone++;

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

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

 			$outdone++;

 		}

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

+		$out .= '</div>';

 

-		$out.='<!-- END Part to show address block -->';

+		$out .= '<!-- END Part to show address block -->';

 

 		return $out;

 	}

@@ -615,17 +615,17 @@ 
 	 * @param	int		$relativelink		0=Return full external link, 1=Return link relative to root of file

 	 * @return	string						Link or empty string if there is no download link

 	 */

-	function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0)

+	function getLastMainDocLink($modulepart, $initsharekey = 0, $relativelink = 0)

 	{

 		global $user, $dolibarr_main_url_root;

 

 		if (empty($this->last_main_doc))

 		{

-			return '';		// No way to known which document name to use

+			return ''; // No way to known which document name to use

 		}

 

 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-		$ecmfile=new EcmFiles($this->db);

+		$ecmfile = new EcmFiles($this->db);

 		$result = $ecmfile->fetch(0, '', $this->last_main_doc);

 		if ($result < 0)

 		{

@@ -673,26 +673,26 @@ 
 		}

 

 		// Define $urlwithroot

-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));

-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file

+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-		$forcedownload=0;

+		$forcedownload = 0;

 

-		$paramlink='';

+		$paramlink = '';

 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

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

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

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

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

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

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

 

 		if ($relativelink)

 		{

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

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

 		}

 		else

 		{

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

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

 		}

 

 		// Here $ecmfile->share is defined

@@ -710,10 +710,10 @@ 
 	 *  @param  int		$notrigger			Disable all triggers

 	 *  @return int                 		<0 if KO, >0 if OK

 	 */

-	function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0)

+	function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)

 	{

         // phpcs:enable

-		global $user,$langs;

+		global $user, $langs;

 

 

 		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");

@@ -722,43 +722,43 @@ 
 		if ($fk_socpeople <= 0)

 		{

 			$langs->load("errors");

-			$this->error=$langs->trans("ErrorWrongValueForParameterX","1");

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

+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "1");

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

 			return -1;

 		}

-		if (! $type_contact)

+		if (!$type_contact)

 		{

 			$langs->load("errors");

-			$this->error=$langs->trans("ErrorWrongValueForParameterX","2");

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

+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");

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

 			return -2;

 		}

 

-		$id_type_contact=0;

+		$id_type_contact = 0;

 		if (is_numeric($type_contact))

 		{

-			$id_type_contact=$type_contact;

+			$id_type_contact = $type_contact;

 		}

 		else

 		{

 			// We look for id type_contact

 			$sql = "SELECT tc.rowid";

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

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

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

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

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

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

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

+			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";

 			//print $sql;

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

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

 			if ($resql)

 			{

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

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

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

 			}

 		}

 

 		if ($id_type_contact == 0)

 		{

-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';

+			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';

 			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");

 			return -3;

 		}

@@ -766,35 +766,35 @@ 
 		$datecreate = dol_now();

 

 		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error

-		$TListeContacts=$this->liste_contact(-1, $source);

-		$already_added=false;

-		if(!empty($TListeContacts)) {

-			foreach($TListeContacts as $array_contact) {

-				if($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {

-					$already_added=true;

+		$TListeContacts = $this->liste_contact(-1, $source);

+		$already_added = false;

+		if (!empty($TListeContacts)) {

+			foreach ($TListeContacts as $array_contact) {

+				if ($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {

+					$already_added = true;

 					break;

 				}

 			}

 		}

 

-		if(!$already_added) {

+		if (!$already_added) {

 

 			$this->db->begin();

 

 			// Insert into database

 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";

-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";

-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;

-			$sql.= "'".$this->db->idate($datecreate)."'";

-			$sql.= ", 4, ". $id_type_contact;

-			$sql.= ")";

+			$sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";

+			$sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";

+			$sql .= "'".$this->db->idate($datecreate)."'";

+			$sql .= ", 4, ".$id_type_contact;

+			$sql .= ")";

 

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

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

 			if ($resql)

 			{

-				if (! $notrigger)

+				if (!$notrigger)

 				{

-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);

+					$result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);

 					if ($result < 0)

 					{

 						$this->db->rollback();

@@ -809,14 +809,14 @@ 
 			{

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

 				{

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

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

 					$this->db->rollback();

 					echo 'err rollback';

 					return -2;

 				}

 				else

 				{

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

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

 					$this->db->rollback();

 					return -1;

 				}

@@ -832,15 +832,15 @@ 
 	 *    @param    string          $source     Nature of contact ('internal' or 'external')

 	 *    @return   int                         >0 if OK, <0 if KO

 	 */

-	function copy_linked_contact($objFrom, $source='internal')

+	function copy_linked_contact($objFrom, $source = 'internal')

 	{

         // phpcs:enable

 		$contacts = $objFrom->liste_contact(-1, $source);

-		foreach($contacts as $contact)

+		foreach ($contacts as $contact)

 		{

 			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)

 			{

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

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

 				return -1;

 			}

 		}

@@ -857,23 +857,23 @@ 
 	 *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)

 	 *      @return int                 		<0 if KO, >= 0 if OK

 	 */

-	function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)

+	function update_contact($rowid, $statut, $type_contact_id = 0, $fk_socpeople = 0)

 	{

         // phpcs:enable

 		// Insert into database

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

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

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

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

-		$sql.= " where rowid = ".$rowid;

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

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

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

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

+		$sql .= " where rowid = ".$rowid;

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

 		if ($resql)

 		{

 			return 0;

 		}

 		else

 		{

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

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

 			return -1;

 		}

 	}

@@ -886,7 +886,7 @@ 
 	 *    @param	int		$notrigger		Disable all triggers

 	 *    @return   int						>0 if OK, <0 if KO

 	 */

-	function delete_contact($rowid, $notrigger=0)

+	function delete_contact($rowid, $notrigger = 0)

 	{

         // phpcs:enable

 		global $user;

@@ -895,14 +895,14 @@ 
 		$this->db->begin();

 

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

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

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

 

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

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

 		{

-			if (! $notrigger)

+			if (!$notrigger)

 			{

-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

+				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

 				if ($result < 0) { $this->db->rollback(); return -1; }

 			}

 

@@ -911,7 +911,7 @@ 
 		}

 		else

 		{

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

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

 			$this->db->rollback();

 			return -1;

 		}

@@ -925,22 +925,22 @@ 
 	 *	  @param	string	$code		Type of contact (code or id)

 	 *    @return   int					>0 if OK, <0 if KO

 	 */

-	function delete_linked_contact($source='',$code='')

+	function delete_linked_contact($source = '', $code = '')

 	{

         // phpcs:enable

 		$temp = array();

-		$typeContact = $this->liste_type_contact($source,'',0,0,$code);

+		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);

 

-		foreach($typeContact as $key => $value)

+		foreach ($typeContact as $key => $value)

 		{

-			array_push($temp,$key);

+			array_push($temp, $key);

 		}

 		$listId = implode(",", $temp);

 

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

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

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

 		if ($listId)

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

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

 

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

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

@@ -949,7 +949,7 @@ 
 		}

 		else

 		{

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

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

 			return -1;

 		}

 	}

@@ -964,54 +964,54 @@ 
 	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)

 	 *    @return	array|int		        Array of contacts, -1 if error

 	 */

-	function liste_contact($statut=-1,$source='external',$list=0,$code='')

+	function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '')

 	{

         // phpcs:enable

 		global $langs;

 

-		$tab=array();

-

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

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

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

-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

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

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

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

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

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

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

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

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

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

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

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

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

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

-		$sql.=" ORDER BY t.lastname ASC";

+		$tab = array();

+

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

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

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

+		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";

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

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

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

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

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

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

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

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

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

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

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

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

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

+		$sql .= " ORDER BY t.lastname ASC";

 

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

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

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

 		if ($resql)

 		{

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

-			$i=0;

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

+			$i = 0;

 			while ($i < $num)

 			{

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

 

-				if (! $list)

+				if (!$list)

 				{

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

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

-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,

-								   'nom'=>$obj->lastname,      // For backward compatibility

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

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

+					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,

+								   'nom'=>$obj->lastname, // For backward compatibility

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

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

 				}

 				else

 				{

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

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

 				}

 

 				$i++;

@@ -1021,7 +1021,7 @@ 
 		}

 		else

 		{

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

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

 			dol_print_error($this->db);

 			return -1;

 		}

@@ -1037,16 +1037,16 @@ 
 	function swapContactStatus($rowid)

 	{

 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";

-		$sql.= " tc.code, tc.libelle";

+		$sql .= " tc.code, tc.libelle";

 		//$sql.= ", s.fk_soc";

-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

+		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe

-		$sql.= " WHERE ec.rowid =".$rowid;

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

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

+		$sql .= " WHERE ec.rowid =".$rowid;

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

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

 

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

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

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

 		if ($resql)

 		{

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

@@ -1057,7 +1057,7 @@ 
 		}

 		else

 		{

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

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

 			dol_print_error($this->db);

 			return -1;

 		}

@@ -1074,44 +1074,44 @@ 
 	 *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')

 	 *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)

 	 */

-	function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='')

+	function liste_type_contact($source = 'internal', $order = 'position', $option = 0, $activeonly = 0, $code = '')

 	{

         // phpcs:enable

 		global $langs;

 

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

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

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

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

 

 		$tab = array();

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

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

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

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

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

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

-		$sql.= $this->db->order($order,'ASC');

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

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

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

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

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

+		$sql .= $this->db->order($order, 'ASC');

 

 		//print "sql=".$sql;

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

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

 		if ($resql)

 		{

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

-			$i=0;

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

+			$i = 0;

 			while ($i < $num)

 			{

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

 

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

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

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

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

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

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

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

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

 				$i++;

 			}

 			return $tab;

 		}

 		else

 		{

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

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

 			//dol_print_error($this->db);

 			return null;

 		}

@@ -1128,53 +1128,53 @@ 
 	 *		@param	int		$status		limited to a certain status

 	 *      @return array       		List of id for such contacts

 	 */

-	function getIdContact($source,$code,$status=0)

+	function getIdContact($source, $code, $status = 0)

 	{

 		global $conf;

 

-		$result=array();

-		$i=0;

+		$result = array();

+		$i = 0;

 		//cas particulier pour les expeditions

-		if($this->element=='shipping' && $this->origin_id != 0) {

-			$id=$this->origin_id;

-			$element='commande';

-        } else if($this->element=='reception' && $this->origin_id != 0) {

-            $id=$this->origin_id;

-            $element='order_supplier';

+		if ($this->element == 'shipping' && $this->origin_id != 0) {

+			$id = $this->origin_id;

+			$element = 'commande';

+        } else if ($this->element == 'reception' && $this->origin_id != 0) {

+            $id = $this->origin_id;

+            $element = 'order_supplier';

 		} else {

-			$id=$this->id;

-			$element=$this->element;

+			$id = $this->id;

+			$element = $this->element;

 		}

 

 		$sql = "SELECT ec.fk_socpeople";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

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

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

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

 		if ($resql)

 		{

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

 			{

-				$result[$i]=$obj->fk_socpeople;

+				$result[$i] = $obj->fk_socpeople;

 				$i++;

 			}

 		}

 		else

 		{

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

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

 			return null;

 		}

 

@@ -1188,16 +1188,16 @@ 
 	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.

 	 *		@return	int						<0 if KO, >0 if OK

 	 */

-	function fetch_contact($contactid=null)

+	function fetch_contact($contactid = null)

 	{

         // phpcs:enable

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

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

 

 		if (empty($contactid)) return 0;

 

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

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

-		$result=$contact->fetch($contactid);

+		$result = $contact->fetch($contactid);

 		$this->contact = $contact;

 		return $result;

 	}

@@ -1209,7 +1209,7 @@ 
 	 *		@param		int		$force_thirdparty_id	Force thirdparty id

 	 *		@return		int								<0 if KO, >0 if OK

 	 */

-	function fetch_thirdparty($force_thirdparty_id=0)

+	function fetch_thirdparty($force_thirdparty_id = 0)

 	{

         // phpcs:enable

 		global $conf;

@@ -1217,7 +1217,7 @@ 
 		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

 			return 0;

 

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

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

 

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

 		if ($force_thirdparty_id)

@@ -1280,7 +1280,7 @@ 
 

 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);

 

-		$idtype=$this->barcode_type;

+		$idtype = $this->barcode_type;

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

 		{

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

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

 			{

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

-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

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

+				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";

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

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

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

 				if ($resql)

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

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

 

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

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

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

 

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

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

 

-		$this->projet = $project;	// deprecated

+		$this->projet = $project; // deprecated

 		$this->project = $project;

 		return $result;

 	}

@@ -1371,7 +1371,7 @@ 
 	{

         // phpcs:enable

 		$user = new User($this->db);

-		$result=$user->fetch($userid);

+		$result = $user->fetch($userid);

 		$this->user = $user;

 		return $result;

 	}

@@ -1409,14 +1409,14 @@ 
 	{

 		global $conf;

 

-		$result=false;

+		$result = false;

 

 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;

-		$sql.= " WHERE ".$field." = '".$key."'";

-		if (! empty($element)) {

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

+		$sql .= " WHERE ".$field." = '".$key."'";

+		if (!empty($element)) {

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

 		} else {

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

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

         }

 

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

@@ -1443,10 +1443,10 @@ 
 	 */

 	function getValueFrom($table, $id, $field)

 	{

-		$result=false;

+		$result = false;

 		if (!empty($id) && !empty($field) && !empty($table)) {

 			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;

-			$sql.= " WHERE rowid = ".$id;

+			$sql .= " WHERE rowid = ".$id;

 

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

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

@@ -1475,36 +1475,36 @@ 
 	 *	@return	int							<0 if KO, >0 if OK

 	 *  @see updateExtraField

 	 */

-	function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif')

+	function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif')

 	{

-		global $user,$langs,$conf;

+		global $user, $langs, $conf;

 

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

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

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

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

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

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

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

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

 

-		$error=0;

+		$error = 0;

 

 		$this->db->begin();

 

 		// Special case

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

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

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

 

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

 

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

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

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

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

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

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

 

 		if ($fk_user_field)

 		{

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

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

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

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

 		}

 

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

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

 

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

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

@@ -1521,11 +1521,11 @@ 
 				{

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

 				}

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

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

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

 			}

 

-			if (! $error)

+			if (!$error)

 			{

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

 				$this->db->commit();

@@ -1539,7 +1539,7 @@ 
 		}

 		else

 		{

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

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

 			$this->db->rollback();

 			return -1;

 		}

@@ -1554,14 +1554,14 @@ 
 	 *		@param	int		$nodbprefix	Do not include DB prefix to forge table name

 	 *      @return int         		<0 if KO, >0 if OK

 	 */

-	function load_previous_next_ref($filter, $fieldid, $nodbprefix=0)

+	function load_previous_next_ref($filter, $fieldid, $nodbprefix = 0)

 	{

         // phpcs:enable

 		global $conf, $user;

 

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

+			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");

 			return -1;

 		}

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

@@ -1576,45 +1576,45 @@ 
 		if ($this->element == 'societe') $alias = 'te';

 

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

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

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

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

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

-		}

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

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

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

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

-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

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

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

-		if (! empty($filter))

-		{

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

-			$sql.=$filter;

-		}

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

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

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

+		}

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

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

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

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

+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

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

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

+		if (!empty($filter))

+		{

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

+			$sql .= $filter;

+		}

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

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

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

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

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

-                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

+                    $sql .= " AND te.entity IS NOT NULL"; // Show all users

 				} else {

-					$sql.= " AND ug.fk_user = te.rowid";

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

+					$sql .= " AND ug.fk_user = te.rowid";

+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";

 				}

 			} else {

-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

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

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

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

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

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

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

 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

 

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

-		if (! $result)

+		if (!$result)

 		{

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

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

 			return -1;

 		}

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

@@ -1622,46 +1622,46 @@ 
 

 

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

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

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

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

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

-		}

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

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

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

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

-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)

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

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

-		if (! empty($filter))

-		{

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

-			$sql.=$filter;

-		}

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

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

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

+		}

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

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

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

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

+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

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

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

+		if (!empty($filter))

+		{

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

+			$sql .= $filter;

+		}

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

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

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

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

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

-                    $sql.= " AND te.entity IS NOT NULL"; // Show all users

+                    $sql .= " AND te.entity IS NOT NULL"; // Show all users

 				} else {

-					$sql.= " AND ug.fk_user = te.rowid";

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

+					$sql .= " AND ug.fk_user = te.rowid";

+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";

 				}

 			} else {

-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';

+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';

 			}

 		}

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

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

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

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

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

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

 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

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

 

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

-		if (! $result)

+		if (!$result)

 		{

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

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

 			return -2;

 		}

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

@@ -1678,11 +1678,11 @@ 
 	 *      @return array				Array of id of contacts (if source=external or internal)

 	 * 									Array of id of third parties with at least one contact on object (if source=thirdparty)

 	 */

-	function getListContactId($source='external')

+	function getListContactId($source = 'external')

 	{

 		$contactAlreadySelected = array();

-		$tab = $this->liste_contact(-1,$source);

-		$num=count($tab);

+		$tab = $this->liste_contact(-1, $source);

+		$num = count($tab);

 		$i = 0;

 		while ($i < $num)

 		{

@@ -1702,24 +1702,24 @@ 
 	 */

 	function setProject($projectid)

 	{

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

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

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

 		{

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

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

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

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

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

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

 		}

 		else

 		{

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

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

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

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

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

+			$sql .= ' WHERE rowid = '.$this->id;

 		}

 

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

@@ -1765,14 +1765,14 @@ 
 			else

 			{

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

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

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

 				return -1;

 			}

 		}

 		else

 		{

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

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

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

 			return -2;

 		}

 	}

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

 

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

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

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

 

 				return 1;

 			}

 			else

 			{

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

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

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

 				return -1;

 			}

 		}

 		else

 		{

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

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

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

 			return -2;

 		}

 	}

@@ -1825,7 +1825,7 @@ 
 	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency

 	 *  @return		int				>0 if OK, <0 if KO

 	 */

-	function setMulticurrencyRate($rate, $mode=1)

+	function setMulticurrencyRate($rate, $mode = 1)

 	{

 		dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')');

 		if ($this->statut >= 0 || $this->element == 'societe')

@@ -1845,7 +1845,7 @@ 
 				{

 					foreach ($this->lines as &$line)

 					{

-						if($mode == 1) {

+						if ($mode == 1) {

 							$line->subprice = 0;

 						}

 

@@ -1853,14 +1853,14 @@ 
 							case 'propal':

 								$this->updateline(

 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,

 									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

 								);

 								break;

 							case 'commande':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,

 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

 									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

@@ -1868,7 +1868,7 @@ 
 								break;

 							case 'facture':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

 									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,

 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

 									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice

@@ -1877,21 +1877,21 @@ 
 							case 'supplier_proposal':

 								$this->updateline(

 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,

 									$line->ref_fourn, $line->multicurrency_subprice

 								);

 								break;

 							case 'order_supplier':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,

 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

 								);

 								break;

 							case 'invoice_supplier':

 								$this->updateline(

-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

 									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,

 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

 								);

@@ -1908,14 +1908,14 @@ 
 			else

 			{

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

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

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

 				return -1;

 			}

 		}

 		else

 		{

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

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

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

 			return -2;

 		}

 	}

@@ -1945,20 +1945,20 @@ 
 				$this->cond_reglement_id = $id;

 				// for supplier

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

-				$this->cond_reglement = $id;	// for compatibility

+				$this->cond_reglement = $id; // for compatibility

 				return 1;

 			}

 			else

 			{

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

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

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

 				return -1;

 			}

 		}

 		else

 		{

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

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

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

 			return -2;

 		}

 	}

@@ -1976,7 +1976,7 @@ 
 		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

 

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

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

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

 

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

 		{

@@ -1985,7 +1985,7 @@ 
 		}

 		else

 		{

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

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

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

 			return -1;

 		}

@@ -2001,29 +2001,29 @@ 
 	 *

 	 *  @return     int              1 if OK, 0 if KO

 	 */

-	function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null)

+	function setShippingMethod($shipping_method_id, $notrigger = false, $userused = null)

 	{

         global $user;

 

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

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

 

         $error = 0;

 

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);

+		if (!$this->table_element) {

+			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

         $this->db->begin();

 

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

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

 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');

 

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

-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;

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

+		$sql .= " SET fk_shipping_method = ".$shipping_method_id;

+		$sql .= " WHERE rowid=".$this->id;

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

-		if (! $resql) {

+		if (!$resql) {

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

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

 			$error++;

@@ -2031,8 +2031,8 @@ 
             if (!$notrigger)

             {

                 // Call trigger

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

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

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

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

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

                 // End call trigger

             }

@@ -2042,7 +2042,7 @@ 
             $this->db->rollback();

             return -1;

         } else {

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

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

             $this->db->commit();

             return 1;

         }

@@ -2057,23 +2057,23 @@ 
 	 */

 	function setWarehouse($warehouse_id)

 	{

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);

+		if (!$this->table_element) {

+			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

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

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

 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');

 

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

-		$sql.= " SET fk_warehouse = ".$warehouse_id;

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

+		$sql .= " SET fk_warehouse = ".$warehouse_id;

+		$sql .= " WHERE rowid=".$this->id;

 

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

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

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

 			return 1;

 		} else {

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

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

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

 			return 0;

 		}

 	}

@@ -2088,25 +2088,25 @@ 
 	 */

 	function setDocModel($user, $modelpdf)

 	{

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

-		$newmodelpdf=dol_trunc($modelpdf,255);

+		$newmodelpdf = dol_trunc($modelpdf, 255);

 

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

-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";

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

+		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";

+		$sql .= " WHERE rowid = ".$this->id;

 		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";

 		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";

 

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

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

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

 		if ($resql)

 		{

-			$this->modelpdf=$modelpdf;

+			$this->modelpdf = $modelpdf;

 			return 1;

 		}

 		else

@@ -2125,29 +2125,29 @@ 
 	 *  @param      User	$userused		Object user

 	 *  @return		int				1 if OK, 0 if KO

 	 */

-	function setBankAccount($fk_account, $notrigger=false, $userused=null)

+	function setBankAccount($fk_account, $notrigger = false, $userused = null)

 	{

         global $user;

 

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

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

 

         $error = 0;

 

-		if (! $this->table_element) {

-			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);

+		if (!$this->table_element) {

+			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

         $this->db->begin();

 

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

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

 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');

 

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

-		$sql.= " SET fk_account = ".$fk_account;

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

+		$sql .= " SET fk_account = ".$fk_account;

+		$sql .= " WHERE rowid=".$this->id;

 

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

-        if (! $resql)

+        if (!$resql)

         {

             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());

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

@@ -2158,8 +2158,8 @@ 
             if (!$notrigger)

             {

                 // Call trigger

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

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

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

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

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

                 // End call trigger

             }

@@ -2171,7 +2171,7 @@ 
         }

         else

         {

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

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

             $this->db->commit();

             return 1;

         }

@@ -2190,26 +2190,26 @@ 
 	 * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not

 	 * 	@return		int                            <0 if KO, >0 if OK

 	 */

-	function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true)

+	function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)

 	{

         // phpcs:enable

-		if (! $this->table_element_line)

+		if (!$this->table_element_line)

 		{

-			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);

 			return -1;

 		}

-		if (! $this->fk_element)

+		if (!$this->fk_element)

 		{

-			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined",LOG_ERR);

+			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);

 			return -1;

 		}

 

 		// Count number of lines to reorder (according to choice $renum)

-		$nl=0;

+		$nl = 0;

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

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

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

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

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

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

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

 

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

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

@@ -2223,28 +2223,28 @@ 
 		{

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

 			// counter that parents.

-			$rows=array();

+			$rows = array();

 

 			// We first search all lines that are parent lines (for multilevel details lines)

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

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

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

-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;

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

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

+			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;

 

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

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

 			if ($resql)

 			{

-				$i=0;

+				$i = 0;

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

 				while ($i < $num)

 				{

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

-					$rows[] = $row[0];	// Add parent line into array rows

+					$rows[] = $row[0]; // Add parent line into array rows

 					$childrens = $this->getChildrenOfLine($row[0]);

-					if (! empty($childrens))

+					if (!empty($childrens))

 					{

-						foreach($childrens as $child)

+						foreach ($childrens as $child)

 						{

 							array_push($rows, $child);

 						}

@@ -2253,11 +2253,11 @@ 
 				}

 

 				// Now we set a new number for each lines (parent and children with children included into parent tree)

-				if (! empty($rows))

+				if (!empty($rows))

 				{

-					foreach($rows as $key => $row)

+					foreach ($rows as $key => $row)

 					{

-						$this->updateRangOfLine($row, ($key+1));

+						$this->updateRangOfLine($row, ($key + 1));

 					}

 				}

 			}

@@ -2277,18 +2277,18 @@ 
 	 */

 	function getChildrenOfLine($id)

 	{

-		$rows=array();

+		$rows = array();

 

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

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

-		$sql.= ' AND fk_parent_line = '.$id;

-		$sql.= ' ORDER BY rang ASC';

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

+		$sql .= ' AND fk_parent_line = '.$id;

+		$sql .= ' ORDER BY rang ASC';

 

 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);

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

 		if ($resql)

 		{

-			$i=0;

+			$i = 0;

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

 			while ($i < $num)

 			{

@@ -2309,7 +2309,7 @@ 
 	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

 	 * 	@return	void

 	 */

-	function line_up($rowid, $fk_parent_line=true)

+	function line_up($rowid, $fk_parent_line = true)

 	{

         // phpcs:enable

 		$this->line_order(false, 'ASC', $fk_parent_line);

@@ -2329,7 +2329,7 @@ 
 	 * 	@param	boolean		$fk_parent_line		Table with fk_parent_line field or not

 	 * 	@return	void

 	 */

-	function line_down($rowid, $fk_parent_line=true)

+	function line_down($rowid, $fk_parent_line = true)

 	{

         // phpcs:enable

 		$this->line_order(false, 'ASC', $fk_parent_line);

@@ -2351,16 +2351,16 @@ 
 	 * 	@param	int		$rang		Position

 	 * 	@return	void

 	 */

-	function updateRangOfLine($rowid,$rang)

+	function updateRangOfLine($rowid, $rang)

 	{

 		$fieldposition = 'rang';

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

 

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

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

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

 

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

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

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

 		{

 			dol_print_error($this->db);

 		}

@@ -2377,9 +2377,9 @@ 
 	{

         // phpcs:enable

 		$num = count($rows);

-		for ($i = 0 ; $i < $num ; $i++)

+		for ($i = 0; $i < $num; $i++)

 		{

-			$this->updateRangOfLine($rows[$i], ($i+1));

+			$this->updateRangOfLine($rows[$i], ($i + 1));

 		}

 	}

 

@@ -2390,21 +2390,21 @@ 
 	 * 	@param	int		$rang		Position

 	 * 	@return	void

 	 */

-	function updateLineUp($rowid,$rang)

+	function updateLineUp($rowid, $rang)

 	{

 		if ($rang > 1)

 		{

 			$fieldposition = 'rang';

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

 

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

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

-			$sql.= ' AND rang = '.($rang - 1);

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

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

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

+			$sql .= ' AND rang = '.($rang - 1);

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

 			{

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

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

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

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

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

 				{

 					dol_print_error($this->db);

 				}

@@ -2424,7 +2424,7 @@ 
 	 * 	@param	int		$max		Max

 	 * 	@return	void

 	 */

-	function updateLineDown($rowid,$rang,$max)

+	function updateLineDown($rowid, $rang, $max)

 	{

 		if ($rang < $max)

 		{

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

 

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

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

-			$sql.= ' AND rang = '.($rang+1);

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

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

+			$sql .= ' AND rang = '.($rang + 1);

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

 			{

-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);

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

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

+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);

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

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

 				{

 					dol_print_error($this->db);

 				}

@@ -2459,7 +2459,7 @@ 
 	function getRangOfLine($rowid)

 	{

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

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

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

 

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

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

@@ -2479,8 +2479,8 @@ 
 	function getIdOfLine($rang)

 	{

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

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

-		$sql.= ' AND rang = '.$rang;

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

+		$sql .= ' AND rang = '.$rang;

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

 		if ($resql)

 		{

@@ -2496,22 +2496,22 @@ 
 	 * 	@param		int		$fk_parent_line		Parent line id

 	 *  @return     int  			   			Max value of rang in table of lines

 	 */

-	function line_max($fk_parent_line=0)

+	function line_max($fk_parent_line = 0)

 	{

         // phpcs:enable

 		// Search the last rang with fk_parent_line

 		if ($fk_parent_line)

 		{

 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

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

-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;

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

+			$sql .= ' AND fk_parent_line = '.$fk_parent_line;

 

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

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

 			if ($resql)

 			{

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

-				if (! empty($row[0]))

+				if (!empty($row[0]))

 				{

 					return $row[0];

 				}

@@ -2525,7 +2525,7 @@ 
 		else

 		{

 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

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

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

 

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

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

@@ -2547,15 +2547,15 @@ 
 	function update_ref_ext($ref_ext)

 	{

         // phpcs:enable

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

 

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

-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";

-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;

+		$sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";

+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;

 

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

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

@@ -2565,7 +2565,7 @@ 
 		}

 		else

 		{

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

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

 			return -1;

 		}

 	}

@@ -2578,31 +2578,31 @@ 
 	 *  @param		string		$suffix		'', '_public' or '_private'

 	 *  @return     int      		   		<0 if KO, >0 if OK

 	 */

-	function update_note($note, $suffix='')

+	function update_note($note, $suffix = '')

 	{

         // phpcs:enable

 		global $user;

 

-		if (! $this->table_element)

+		if (!$this->table_element)

 		{

-			$this->error='update_note was called on objet with property table_element not defined';

+			$this->error = 'update_note was called on objet with property table_element not defined';

 			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);

 			return -1;

 		}

-		if (! in_array($suffix,array('','_public','_private')))

+		if (!in_array($suffix, array('', '_public', '_private')))

 		{

-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';

+			$this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';

 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);

 			return -2;

 		}

 		// Special cas

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

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

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

 

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

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

-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;

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

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

+		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;

+		$sql .= " WHERE rowid =".$this->id;

 

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

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

@@ -2611,14 +2611,14 @@ 
 			else if ($suffix == '_private') $this->note_private = $note;

 			else

 			{

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

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

 				$this->note_private = $note;

 			}

 			return 1;

 		}

 		else

 		{

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

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

 			return -1;

 		}

 	}

@@ -2635,7 +2635,7 @@ 
 	function update_note_public($note)

 	{

         // phpcs:enable

-		return $this->update_note($note,'_public');

+		return $this->update_note($note, '_public');

 	}

 

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

@@ -2649,7 +2649,7 @@ 
 	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.

 	 *	@return	int    			           	<0 if KO, >0 if OK

 	 */

-	function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null)

+	function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null)

 	{

         // phpcs:enable

 		global $conf, $hookmanager, $action;

@@ -2669,7 +2669,7 @@ 
 		elseif ($this->element == 'supplier_proposal')

 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";

 

-		if (! empty($MODULE)) {

+		if (!empty($MODULE)) {

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

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

                 foreach ($modsactivated as $mod) {

@@ -2681,45 +2681,45 @@ 
 

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

 

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

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

 

-		$forcedroundingmode=$roundingadjust;

+		$forcedroundingmode = $roundingadjust;

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

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

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

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

 

-		$error=0;

+		$error = 0;

 

 		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;

 

 		// Define constants to find lines to sum

-		$fieldtva='total_tva';

-		$fieldlocaltax1='total_localtax1';

-		$fieldlocaltax2='total_localtax2';

-		$fieldup='subprice';

+		$fieldtva = 'total_tva';

+		$fieldlocaltax1 = 'total_localtax1';

+		$fieldlocaltax2 = 'total_localtax2';

+		$fieldup = 'subprice';

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

 		{

-			$fieldtva='tva';

-			$fieldup='pu_ht';

+			$fieldtva = 'tva';

+			$fieldup = 'pu_ht';

 		}

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

 		{

-			$fieldup='value_unit';

+			$fieldup = 'value_unit';

 		}

 

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

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

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

-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

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

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

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

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

+			$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';

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

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

 		if ($exclspec)

 		{

-			$product_field='product_type';

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

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

+			$product_field = 'product_type';

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

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

 		}

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

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

 

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

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

@@ -2733,7 +2733,7 @@ 
 			$total_ht_by_vats  = array();

 			$total_tva_by_vats = array();

 			$total_ttc_by_vats = array();

-			$this->multicurrency_total_ht	= 0;

+			$this->multicurrency_total_ht = 0;

 			$this->multicurrency_total_tva	= 0;

 			$this->multicurrency_total_ttc	= 0;

 

@@ -2744,54 +2744,54 @@ 
 				$obj = $this->db->fetch_object($resql);

 

 				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'

-				$parameters=array('fk_element' => $obj->rowid);

+				$parameters = array('fk_element' => $obj->rowid);

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

 

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

 				{

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

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

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

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

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

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

 					if ($diff)

 					{

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

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

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

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

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

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

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

 								$obj->total_tva = $tmpcal[1];

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

 						//

 					}

 				}

 

-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail

+				$this->total_ht        += $obj->total_ht; // The field visible at end of line detail

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

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

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

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

-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail

+				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht; // The field visible at end of line detail

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

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

 

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

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

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

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

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

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

 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;

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

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

 

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

 				{

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

-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);

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

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

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

 					if ($diff)

 					{

 						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }

-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

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

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

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

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

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

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

 								$this->total_tva -= $diff;

 								$this->total_ttc -= $diff;

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

@@ -2803,11 +2803,11 @@ 
 			}

 

 			// Add revenue stamp to total

-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;

-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;

+			$this->total_ttc += isset($this->revenuestamp) ? $this->revenuestamp : 0;

+			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;

 

 			// Situations totals

-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )

+			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)

 			{

 				$prev_sits = $this->get_prev_sits();

 

@@ -2826,17 +2826,17 @@ 
 			$this->db->free($resql);

 

 			// Now update global field total_ht, total_ttc and tva

-			$fieldht='total_ht';

-			$fieldtva='tva';

-			$fieldlocaltax1='localtax1';

-			$fieldlocaltax2='localtax2';

-			$fieldttc='total_ttc';

+			$fieldht = 'total_ht';

+			$fieldtva = 'tva';

+			$fieldlocaltax1 = 'localtax1';

+			$fieldlocaltax2 = 'localtax2';

+			$fieldttc = 'total_ttc';

 			// Specific code for backward compatibility with old field names

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

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

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

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

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

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

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

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

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

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

 

 			if (empty($nodatabaseupdate))

 			{

@@ -2853,16 +2853,16 @@ 
 

 

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

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

-				if (! $resql)

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

+				if (!$resql)

 				{

 					$error++;

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

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

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

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

 				}

 			}

 

-			if (! $error)

+			if (!$error)

 			{

 				return 1;

 			}

@@ -2873,7 +2873,7 @@ 
 		}

 		else

 		{

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

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

 			return -1;

 		}

 	}

@@ -2887,30 +2887,30 @@ 
 	 *	@return		int					<=0 if KO, >0 if OK

 	 *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked

 	 */

-	function add_object_linked($origin=null, $origin_id=null)

+	function add_object_linked($origin = null, $origin_id = null)

 	{

         // phpcs:enable

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

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

+		$origin = (!empty($origin) ? $origin : $this->origin);

+		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);

 

 		// Special case

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

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

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

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

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

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

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

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

 		$this->db->begin();

 

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

-		$sql.= "fk_source";

-		$sql.= ", sourcetype";

-		$sql.= ", fk_target";

-		$sql.= ", targettype";

-		$sql.= ") VALUES (";

-		$sql.= $origin_id;

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

-		$sql.= ", ".$this->id;

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

-		$sql.= ")";

+		$sql .= "fk_source";

+		$sql .= ", sourcetype";

+		$sql .= ", fk_target";

+		$sql .= ", targettype";

+		$sql .= ") VALUES (";

+		$sql .= $origin_id;

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

+		$sql .= ", ".$this->id;

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

+		$sql .= ")";

 

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

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

@@ -2920,7 +2920,7 @@ 
 	  	}

 	  	else

 	  	{

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

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

 	  		$this->db->rollback();

 	  		return 0;

 	  	}

@@ -2948,33 +2948,33 @@ 
 	 *	@return int							<0 if KO, >0 if OK

 	 *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked

 	 */

-	function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1)

+	function fetchObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $clause = 'OR', $alsosametype = 1, $orderby = 'sourcetype', $loadalsoobjects = 1)

 	{

 		global $conf;

 

-		$this->linkedObjectsIds=array();

-		$this->linkedObjects=array();

+		$this->linkedObjectsIds = array();

+		$this->linkedObjects = array();

 

-		$justsource=false;

-		$justtarget=false;

-		$withtargettype=false;

-		$withsourcetype=false;

+		$justsource = false;

+		$justtarget = false;

+		$withtargettype = false;

+		$withsourcetype = false;

 

-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))

 		{

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

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

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

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

 		}

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

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

 		{

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

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

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

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

 		}

 

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

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

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

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

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

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

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

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

 

 		/*if (empty($sourceid) && empty($targetid))

 		 {

@@ -2984,25 +2984,25 @@ 
 

 		// Links between objects are stored in table element_element

 		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';

-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';

-		$sql.= " WHERE ";

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';

+		$sql .= " WHERE ";

 		if ($justsource || $justtarget)

 		{

 			if ($justsource)

 			{

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

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

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

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

 			}

 			else if ($justtarget)

 			{

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

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

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

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

 			}

 		}

 		else

 		{

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

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

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

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

 		}

 		$sql .= ' ORDER BY '.$orderby;

 

@@ -3019,36 +3019,36 @@ 
 				{

 					if ($justsource)

 					{

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

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

 					}

 					else if ($justtarget)

 					{

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

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

 					}

 				}

 				else

 				{

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

 					{

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

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

 					}

 					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)

 					{

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

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

 					}

 				}

 				$i++;

 			}

 

-			if (! empty($this->linkedObjectsIds))

+			if (!empty($this->linkedObjectsIds))

 			{

 				$tmparray = $this->linkedObjectsIds;

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

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

 				{

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

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

 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'

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

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

 					{

 						$module = $element = $regs[1];

 						$subelement = $regs[2];

@@ -3056,31 +3056,31 @@ 
 

 					$classpath = $element.'/class';

 					// To work with non standard classpath or module name

-					if ($objecttype == 'facture')			{

+					if ($objecttype == 'facture') {

 						$classpath = 'compta/facture/class';

 					}

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

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

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

 					}

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

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

 						$classpath = 'comm/propal/class';

 					}

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

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

 						$classpath = 'supplier_proposal/class';

 					}

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

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

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

 					}

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

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

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

 					}

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

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

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

 					}

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

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

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

 					}

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

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

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

 					}

 

@@ -3093,16 +3093,16 @@ 
 					else if ($objecttype == 'invoice_supplier') {

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

 					}

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

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

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

 					}

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

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

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

 					}

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

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

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

 					}

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

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

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

 					}

 

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

 							if (class_exists($classname))

 							{

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

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

 								{

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

 									$ret = $object->fetch($objectid);

@@ -3151,28 +3151,28 @@ 
 	 *	@return							int	>0 if OK, <0 if KO

 	 *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked

 	 */

-	function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='')

+	function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')

 	{

-		$updatesource=false;

-		$updatetarget=false;

+		$updatesource = false;

+		$updatetarget = false;

 

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

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

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

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

 

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

 		if ($updatesource)

 		{

-			$sql.= "fk_source = ".$sourceid;

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

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

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

+			$sql .= "fk_source = ".$sourceid;

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

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

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

 		}

 		else if ($updatetarget)

 		{

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

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

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

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

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

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

+			$sql .= " WHERE fk_source = ".$this->id;

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

 		}

 

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

@@ -3182,7 +3182,7 @@ 
 		}

 		else

 		{

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

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

 			return -1;

 		}

 	}

@@ -3198,42 +3198,42 @@ 
 	 *	@return     					int	>0 if OK, <0 if KO

 	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked

 	 */

-	function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='')

+	function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')

 	{

-		$deletesource=false;

-		$deletetarget=false;

+		$deletesource = false;

+		$deletetarget = false;

 

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

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

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

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

 

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

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

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

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

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

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

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

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

 

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

-		$sql.= " WHERE";

+		$sql .= " WHERE";

 		if ($rowid > 0)

 		{

-			$sql.=" rowid = ".$rowid;

+			$sql .= " rowid = ".$rowid;

 		}

 		else

 		{

 			if ($deletesource)

 			{

-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

+				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

+				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

 			}

 			else if ($deletetarget)

 			{

-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

+				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

+				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

 			}

 			else

 			{

-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

-				$sql.= " OR";

-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

+				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

+				$sql .= " OR";

+				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

 			}

 		}

 

@@ -3244,8 +3244,8 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

-			$this->errors[]=$this->error;

+			$this->error = $this->db->lasterror();

+			$this->errors[] = $this->error;

 			return -1;

 		}

 	}

@@ -3259,30 +3259,30 @@ 
 	 *      @param	string	$trigkey		Trigger key to use for trigger

 	 *      @return int						<0 if KO, >0 if OK

 	 */

-	function setStatut($status, $elementId=null, $elementType='', $trigkey='')

+	function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')

 	{

-		global $user,$langs,$conf;

+		global $user, $langs, $conf;

 

-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.

+		$savElementId = $elementId; // To be used later to know if we were using the method using the id of this or not.

 

-		$elementId = (!empty($elementId)?$elementId:$this->id);

-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);

+		$elementId = (!empty($elementId) ? $elementId : $this->id);

+		$elementTable = (!empty($elementType) ? $elementType : $this->table_element);

 

 		$this->db->begin();

 

-		$fieldstatus="fk_statut";

-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";

-		if ($elementTable == 'mailing') $fieldstatus="statut";

-		if ($elementTable == 'cronjob') $fieldstatus="status";

-		if ($elementTable == 'user') $fieldstatus="statut";

-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";

-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";

+		$fieldstatus = "fk_statut";

+		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";

+		if ($elementTable == 'mailing') $fieldstatus = "statut";

+		if ($elementTable == 'cronjob') $fieldstatus = "status";

+		if ($elementTable == 'user') $fieldstatus = "statut";

+		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";

+		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

-		$sql.= " SET ".$fieldstatus." = ".$status;

+		$sql .= " SET ".$fieldstatus." = ".$status;

 		// If status = 1 = validated, update also fk_user_valid

-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;

-		$sql.= " WHERE rowid=".$elementId;

+		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;

+		$sql .= " WHERE rowid=".$elementId;

 

 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -3292,27 +3292,27 @@ 
 			// Try autoset of trigkey

 			if (empty($trigkey))

 			{

-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';

-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';

-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';

+				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

+				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';

+				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';

+				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';

 			}

 

 			if ($trigkey)

 			{

 				// Appel des triggers

-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

-				$interface=new Interfaces($this->db);

-				$result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);

+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';

+				$interface = new Interfaces($this->db);

+				$result = $interface->run_triggers($trigkey, $this, $user, $langs, $conf);

 				if ($result < 0) {

-					$error++; $this->errors=$interface->errors;

+					$error++; $this->errors = $interface->errors;

 				}

 				// Fin appel triggers

 			}

 

-			if (! $error)

+			if (!$error)

 			{

 				$this->db->commit();

 

@@ -3327,13 +3327,13 @@ 
 			else

 			{

 				$this->db->rollback();

-				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);

+				dol_syslog(get_class($this)."::setStatus ".$this->error, LOG_ERR);

 				return -1;

 			}

 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -3347,22 +3347,22 @@ 
 	 *  @param      string	$ref    Record ref

 	 *  @return		int				<0 if KO, 0 if nothing done, >0 if OK

 	 */

-	function getCanvas($id=0,$ref='')

+	function getCanvas($id = 0, $ref = '')

 	{

 		global $conf;

 

 		if (empty($id) && empty($ref)) return 0;

 		if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS))

-            return 0;    // To increase speed. Not enabled by default.

+            return 0; // To increase speed. Not enabled by default.

 

             // Clean parameters

 		$ref = trim($ref);

 

 		$sql = "SELECT rowid, canvas";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " WHERE entity IN (".getEntity($this->element).")";

-		if (! empty($id))  $sql.= " AND rowid = ".$id;

-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " WHERE entity IN (".getEntity($this->element).")";

+		if (!empty($id))  $sql .= " AND rowid = ".$id;

+		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";

 

 		$resql = $this->db->query($sql);

 		if ($resql)

@@ -3370,7 +3370,7 @@ 
 			$obj = $this->db->fetch_object($resql);

 			if ($obj)

 			{

-				$this->canvas   = $obj->canvas;

+				$this->canvas = $obj->canvas;

 				return 1;

 			}

 			else return 0;

@@ -3392,7 +3392,7 @@ 
 	function getSpecialCode($lineid)

 	{

 		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;

-		$sql.= ' WHERE rowid = '.$lineid;

+		$sql .= ' WHERE rowid = '.$lineid;

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

@@ -3408,14 +3408,14 @@ 
 	 *  @param	int		$id			Force id of object

 	 *  @return	int					<0 if KO, 0 if not used, >0 if already used

 	 */

-	function isObjectUsed($id=0)

+	function isObjectUsed($id = 0)

 	{

 		global $langs;

 

-		if (empty($id)) $id=$this->id;

+		if (empty($id)) $id = $this->id;

 

 		// Check parameters

-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)

+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)

 		{

 			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');

 			return -1;

@@ -3423,24 +3423,24 @@ 
 

 		$arraytoscan = $this->childtables;

 		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)

-		$tmparray=array_keys($this->childtables);

+		$tmparray = array_keys($this->childtables);

 		if (is_numeric($tmparray[0]))

 		{

 			$arraytoscan = array_flip($this->childtables);

 		}

 

 		// Test if child exists

-		$haschild=0;

-		foreach($arraytoscan as $table => $elementname)

+		$haschild = 0;

+		foreach ($arraytoscan as $table => $elementname)

 		{

 			//print $id.'-'.$table.'-'.$elementname.'<br>';

 			// Check if third party can be deleted

 			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;

-			$sql.= " WHERE ".$this->fk_element." = ".$id;

-			$resql=$this->db->query($sql);

+			$sql .= " WHERE ".$this->fk_element." = ".$id;

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

-				$obj=$this->db->fetch_object($resql);

+				$obj = $this->db->fetch_object($resql);

 				if ($obj->nb > 0)

 				{

 					$langs->load("errors");

@@ -3448,24 +3448,24 @@ 
 					$haschild += $obj->nb;

 					if (is_numeric($elementname))	// old usage

 					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

 					}

 					else	// new usage: $elementname=Translation key

 					{

-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

 					}

-					break;    // We found at least one, we stop here

+					break; // We found at least one, we stop here

 				}

 			}

 			else

 			{

-				$this->errors[]=$this->db->lasterror();

+				$this->errors[] = $this->db->lasterror();

 				return -1;

 			}

 		}

 		if ($haschild > 0)

 		{

-			$this->errors[]="ErrorRecordHasChildren";

+			$this->errors[] = "ErrorRecordHasChildren";

 			return $haschild;

 		}

 		else return 0;

@@ -3477,18 +3477,18 @@ 
 	 *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service

 	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found

 	 */

-	function hasProductsOrServices($predefined=-1)

+	function hasProductsOrServices($predefined = -1)

 	{

-		$nb=0;

+		$nb = 0;

 

-		foreach($this->lines as $key => $val)

+		foreach ($this->lines as $key => $val)

 		{

-			$qualified=0;

-			if ($predefined == -1) $qualified=1;

-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;

-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;

-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;

-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;

+			$qualified = 0;

+			if ($predefined == -1) $qualified = 1;

+			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;

+			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;

+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;

+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;

 			if ($qualified) $nb++;

 		}

 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

@@ -3502,24 +3502,24 @@ 
 	 */

 	function getTotalDiscount()

 	{

-		$total_discount=0.00;

+		$total_discount = 0.00;

 

 		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";

-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

+		$sql .= " WHERE ".$this->fk_element." = ".$this->id;

 

 		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$num=$this->db->num_rows($resql);

-			$i=0;

+			$num = $this->db->num_rows($resql);

+			$i = 0;

 			while ($i < $num)

 			{

 				$obj = $this->db->fetch_object($resql);

 

 				$pu_ht = $obj->pu_ht;

-				$qty= $obj->qty;

+				$qty = $obj->qty;

 				$total_ht = $obj->total_ht;

 

 				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));

@@ -3553,17 +3553,17 @@ 
 		{

 			if (isset($line->qty_asked))

 			{

-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''

-				$totalOrdered+=$line->qty_asked;    // defined for shipment only

+				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''

+				$totalOrdered += $line->qty_asked; // defined for shipment only

 			}

 			if (isset($line->qty_shipped))

 			{

-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''

-				$totalToShip+=$line->qty_shipped;   // defined for shipment only

-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''

+				$totalToShip += $line->qty_shipped; // defined for shipment only

+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

             {

-                if (empty($totalToShip)) $totalToShip=0;

-                $totalToShip+=$line->qty;   // defined for reception only

+                if (empty($totalToShip)) $totalToShip = 0;

+                $totalToShip += $line->qty; // defined for reception only

 			}

 

 			// Define qty, weight, volume, weight_units, volume_units

@@ -3576,27 +3576,27 @@ 
 			}

 

 			$weight = $line->weight ? $line->weight : 0;

-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;

+            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;

 			$volume = $line->volume ? $line->volume : 0;

-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;

+			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;

 

-			$weight_units=$line->weight_units;

-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;

-			$volume_units=$line->volume_units;

-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;

+			$weight_units = $line->weight_units;

+			($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;

+			$volume_units = $line->volume_units;

+			($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;

 

-			$weightUnit=0;

-			$volumeUnit=0;

-			if (! empty($weight_units)) $weightUnit = $weight_units;

-			if (! empty($volume_units)) $volumeUnit = $volume_units;

+			$weightUnit = 0;

+			$volumeUnit = 0;

+			if (!empty($weight_units)) $weightUnit = $weight_units;

+			if (!empty($volume_units)) $volumeUnit = $volume_units;

 

-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''

-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''

+			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''

+			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''

 

 			//var_dump($line->volume_units);

 			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

-				$trueWeightUnit=pow(10, $weightUnit);

+				$trueWeightUnit = pow(10, $weightUnit);

 				$totalWeight += $weight * $qty * $trueWeightUnit;

 			}

 			else {

@@ -3610,18 +3610,18 @@ 
 			$totalWeight += $weight * $qty * $trueWeightUnit;

 		}

 		else

-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units

+					$totalWeight += $weight * $qty; // This may be wrong if we mix different units

 			}

 			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

 			{

 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;

-				$trueVolumeUnit=pow(10, $volumeUnit);

+				$trueVolumeUnit = pow(10, $volumeUnit);

 				//print $line->volume;

 				$totalVolume += $volume * $qty * $trueVolumeUnit;

 			}

 			else

 			{

-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units

+				$totalVolume += $volume * $qty; // This may be wrong if we mix different units

 			}

 		}

 

@@ -3638,17 +3638,17 @@ 
 	{

 		$this->db->begin();

 

-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);

+		$extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");

-		$sql.= " WHERE rowid = ".$this->id;

+		$sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");

+		$sql .= " WHERE rowid = ".$this->id;

 

 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);

 		$resql = $this->db->query($sql);

-		if (! $resql)

+		if (!$resql)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -3683,7 +3683,7 @@ 
 			}

 		}

 

-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;

+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;

 

 		return $out;

 	}

@@ -3729,11 +3729,11 @@ 
 		if ($this->id && $this->table_element)

 		{

 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

-			$sql.= " WHERE rowid = " . $this->id;

+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

+			$sql .= " WHERE rowid = ".$this->id;

 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);

-			$resql=$this->db->query($sql);

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

 				$this->fk_incoterms = $id_incoterm;

@@ -3774,24 +3774,24 @@ 
 	 */

 	function formAddObjectLine($dateSelector, $seller, $buyer)

 	{

-		global $conf,$user,$langs,$object,$hookmanager;

-		global $form,$bcnd,$var;

+		global $conf, $user, $langs, $object, $hookmanager;

+		global $form, $bcnd, $var;

 

 		// Line extrafield

 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 		$extrafieldsline = new ExtraFields($this->db);

-		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+		$extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);

 

 		// Output template part (modules that overwrite templates must declare this into descriptor)

 		// Use global variables + $dateSelector + $seller and $buyer

 		$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-        foreach($dirtpls as $reldir)

+        foreach ($dirtpls as $reldir)

 		{

 			$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');

 			if (empty(Globals::$conf->file->strict_mode)) {

-                $res=@include $tpl;

+                $res = @include $tpl;

 			} else {

-				$res=include $tpl; // for debug

+				$res = include $tpl; // for debug

 			}

 			if ($res) break;

 		}

@@ -3815,14 +3815,14 @@ 
 	 *	@param  int	    	$dateSelector      	1=Show also date range input fields

 	 *	@return	void

 	 */

-	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)

+	function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0)

 	{

 		global $conf, $hookmanager, $langs, $user;

 		// TODO We should not use global var for this !

 		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;

 

 		// Define usemargins

-		$usemargins=0;

+		$usemargins = 0;

 		if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande')))

             $usemargins = 1;

 

@@ -3831,9 +3831,9 @@ 
 		// Line extrafield

 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 		$extrafieldsline = new ExtraFields($this->db);

-		$extralabelslines=$extrafieldsline->fetch_name_optionals_label($this->table_element_line);

+		$extralabelslines = $extrafieldsline->fetch_name_optionals_label($this->table_element_line);

 

-		$parameters = array('num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+		$parameters = array('num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

 		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 		if (empty($reshook))

 		{

@@ -3862,7 +3862,7 @@ 
 

 			// Multicurrency

 			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>';

+                print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';

 

             if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';

 

@@ -3877,7 +3877,7 @@ 
 			print '<td class="linecoldiscount" align="right">'.$langs->trans('ReductionShort').'</td>';

 

 			if ($this->situation_cycle_ref) {

-				print '<td class="linecolcycleref" align="right">' . $langs->trans('Progress') . '</td>';

+				print '<td class="linecolcycleref" align="right">'.$langs->trans('Progress').'</td>';

 			}

 

 			if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) {

@@ -3900,17 +3900,17 @@ 
 

 			// Multicurrency

 			if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency)

-                print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>';

+                print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';

 

             if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';

 

-			print '<td class="linecoledit"></td>';  // No width to allow autodim

+			print '<td class="linecoledit"></td>'; // No width to allow autodim

 

 			print '<td class="linecoldelete" width="10"></td>';

 

 			print '<td class="linecolmove" width="10"></td>';

 

-			if($action == 'selectlines')

+			if ($action == 'selectlines')

 			{

 			    print '<td class="linecolcheckall" align="center">';

 			    print '<input type="checkbox" class="linecheckboxtoggle" />';

@@ -3923,7 +3923,7 @@ 
 		}

 

 		$var = true;

-		$i	 = 0;

+		$i = 0;

 

 		print "<tbody>\n";

 		foreach ($this->lines as $line)

@@ -3936,18 +3936,18 @@ 
 			{

 				if (empty($line->fk_parent_line))

 				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);

+					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 				}

 				else

 				{

-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);

+					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 				}

 			}

 			if (empty($reshook))

 			{

-				$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);

+				$this->printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected, $extrafieldsline);

 			}

 

 			$i++;

@@ -3971,23 +3971,23 @@ 
 	 *  @param  int			$extrafieldsline	Object of extrafield line attribute

 	 *	@return	void

 	 */

-	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0)

+	function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafieldsline = 0)

 	{

-		global $conf,$langs,$user,$object,$hookmanager;

-		global $form,$bc,$bcdd;

-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !

+		global $conf, $langs, $user, $object, $hookmanager;

+		global $form, $bc, $bcdd;

+		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !

 

 		$object_rights = $this->getRights();

 

-		$element=$this->element;

+		$element = $this->element;

 

-		$text=''; $description=''; $type=0;

+		$text = ''; $description = ''; $type = 0;

 

 		// Show product and description

-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);

+		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);

 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.

-		if (! empty($line->date_start)) $type=1; // deprecated

-		if (! empty($line->date_end)) $type=1; // deprecated

+		if (!empty($line->date_start)) $type = 1; // deprecated

+		if (!empty($line->date_end)) $type = 1; // deprecated

 

 		// Ligne en mode visu

 		if ($action != 'editline' || $selected != $line->id)

@@ -4000,13 +4000,13 @@ 
 

 				$product_static->ref = $line->ref; //can change ref in hook

 				$product_static->label = $line->label; //can change label in hook

-				$text=$product_static->getNomUrl(1);

+				$text = $product_static->getNomUrl(1);

 

 				// Define output language and label

 				if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {

-					if (! is_object($this->thirdparty))

+					if (!is_object($this->thirdparty))

 					{

-						dol_print_error('','Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');

+						dol_print_error('', 'Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');

 						return;

 					}

 

@@ -4014,39 +4014,39 @@ 
 					$prod->fetch($line->fk_product);

 

 					$outputlangs = $langs;

-					$newlang='';

-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');

+					$newlang = '';

+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

 					if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang))

-                        $newlang = $this->thirdparty->default_lang;  // For language to language of customer

-                    if (! empty($newlang))

+                        $newlang = $this->thirdparty->default_lang; // For language to language of customer

+                    if (!empty($newlang))

 					{

-						$outputlangs = new Translate("",$conf);

+						$outputlangs = new Translate("", $conf);

 						$outputlangs->setDefaultLang($newlang);

 					}

 

-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;

 				}

 				else

 				{

 					$label = $line->product_label;

 				}

 

-				$text.= ' - '.(! empty($line->label)?$line->label:$label);

+				$text .= ' - '.(!empty($line->label) ? $line->label : $label);

 				$description .= (!empty(Globals::$conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.

             }

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');

 

 			// Output template part (modules that overwrite templates must declare this into descriptor)

 			// Use global variables + $dateSelector + $seller and $buyer

 			$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-            foreach($dirtpls as $reldir)

+            foreach ($dirtpls as $reldir)

 			{

 				$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');

 				if (empty(Globals::$conf->file->strict_mode)) {

-                    $res=@include $tpl;

+                    $res = @include $tpl;

 				} else {

-					$res=include $tpl; // for debug

+					$res = include $tpl; // for debug

 				}

 				if ($res) break;

 			}

@@ -4055,21 +4055,21 @@ 
 		// Ligne en mode update

 		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)

 		{

-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));

-			$placeholder=' placeholder="'.$langs->trans("Label").'"';

+			$label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));

+			$placeholder = ' placeholder="'.$langs->trans("Label").'"';

 

-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');

+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');

 

 			// Output template part (modules that overwrite templates must declare this into descriptor)

 			// Use global variables + $dateSelector + $seller and $buyer

 			$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-            foreach($dirtpls as $reldir)

+            foreach ($dirtpls as $reldir)

 			{

 				$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');

 				if (empty(Globals::$conf->file->strict_mode)) {

-                    $res=@include $tpl;

+                    $res = @include $tpl;

 				} else {

-					$res=include $tpl; // for debug

+					$res = include $tpl; // for debug

 				}

 				if ($res) break;

 			}

@@ -4089,7 +4089,7 @@ 
 	 *	@param	string		$restrictlist		''=All lines, 'services'=Restrict to services only

 	 *  @return	void

 	 */

-	function printOriginLinesList($restrictlist='')

+	function printOriginLinesList($restrictlist = '')

 	{

 		global $langs, $hookmanager, $conf;

 

@@ -4099,7 +4099,7 @@ 
 		print '<td align="right">'.$langs->trans('VATRate').'</td>';

 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';

 		if (!empty(Globals::$conf->multicurrency->enabled))

-            print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>';

+            print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';

         print '<td align="right">'.$langs->trans('Qty').'</td>';

 		if (Globals::$conf->global->PRODUCT_USE_UNITS) {

 			print '<td align="left">'.$langs->trans('Unit').'</td>';

@@ -4107,19 +4107,19 @@ 
 		print '<td align="right">'.$langs->trans('ReductionShort').'</td></tr>';

 

 		$var = true;

-		$i	 = 0;

+		$i = 0;

 

-		if (! empty($this->lines))

+		if (!empty($this->lines))

 		{

 			foreach ($this->lines as $line)

 			{

-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))

 				{

 					if (empty($line->fk_parent_line))

 					{

-						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);

-						$action='';

-						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks

+						$parameters = array('line'=>$line, 'var'=>$var, 'i'=>$i);

+						$action = '';

+						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 					}

 				}

 				else

@@ -4143,103 +4143,103 @@ 
 	 *	@param	string				$restrictlist		''=All lines, 'services'=Restrict to services only (strike line if not)

 	 * 	@return	void

 	 */

-	function printOriginLine($line, $var, $restrictlist='')

+	function printOriginLine($line, $var, $restrictlist = '')

 	{

 		global $langs, $conf;

 

 		//var_dump($line);

 		if (!empty($line->date_start))

 		{

-			$date_start=$line->date_start;

+			$date_start = $line->date_start;

 		}

 		else

 		{

-			$date_start=$line->date_debut_prevue;

-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;

+			$date_start = $line->date_debut_prevue;

+			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;

 		}

 		if (!empty($line->date_end))

 		{

-			$date_end=$line->date_end;

+			$date_end = $line->date_end;

 		}

 		else

 		{

-			$date_end=$line->date_fin_prevue;

-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;

+			$date_end = $line->date_fin_prevue;

+			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;

 		}

 

 		$this->tpl['label'] = '';

-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');

+		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');

 

 		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

 		{

-			$discount=new DiscountAbsolute($this->db);

+			$discount = new DiscountAbsolute($this->db);

 			$discount->fk_soc = $this->socid;

-			$this->tpl['label'].= $discount->getNomUrl(0,'discount');

+			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');

 		}

-		else if (! empty($line->fk_product))

+		else if (!empty($line->fk_product))

 		{

 			$productstatic = new Product($this->db);

 			$productstatic->id = $line->fk_product;

 			$productstatic->ref = $line->ref;

 			$productstatic->type = $line->fk_product_type;

-            if(empty($productstatic->ref)){

+            if (empty($productstatic->ref)) {

 				$line->fetch_product();

 				$productstatic = $line->product;

 			}

 			

-			$this->tpl['label'].= $productstatic->getNomUrl(1);

-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);

+			$this->tpl['label'] .= $productstatic->getNomUrl(1);

+			$this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);

 			// Dates

 			if ($line->product_type == 1 && ($date_start || $date_end))

 			{

-				$this->tpl['label'].= get_date_range($date_start,$date_end);

+				$this->tpl['label'] .= get_date_range($date_start, $date_end);

 			}

 		}

 		else

 		{

-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));

+			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));

 			if (!empty($line->desc)) {

-				$this->tpl['label'].=$line->desc;

-			}else {

-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');

+				$this->tpl['label'] .= $line->desc;

+			} else {

+				$this->tpl['label'] .= ($line->label ? '&nbsp;'.$line->label : '');

 			}

 			

 			// Dates

 			if ($line->product_type == 1 && ($date_start || $date_end))

 			{

-				$this->tpl['label'].= get_date_range($date_start,$date_end);

+				$this->tpl['label'] .= get_date_range($date_start, $date_end);

 			}

 		}

 

-		if (! empty($line->desc))

+		if (!empty($line->desc))

 		{

 			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));

 			}

 			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));

 			}

 			elseif ($line->desc == '(EXCESS RECEIVED)')

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));

 			}

 			elseif ($line->desc == '(EXCESS PAID)')

 			{

-				$discount=new DiscountAbsolute($this->db);

+				$discount = new DiscountAbsolute($this->db);

 				$discount->fetch($line->fk_remise_except);

-				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));

+				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));

 			}

 			else

 			{

-				$this->tpl['description'] = dol_trunc($line->desc,60);

+				$this->tpl['description'] = dol_trunc($line->desc, 60);

 			}

 		}

 		else

@@ -4250,7 +4250,7 @@ 
         // VAT Rate

         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';

+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';

 

 		$this->tpl['price'] = price($line->subprice);

 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);

@@ -4260,19 +4260,19 @@ 
         $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';

 

 		// Is the line strike or not

-		$this->tpl['strike']=0;

-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;

+		$this->tpl['strike'] = 0;

+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;

 

 		// Output template part (modules that overwrite templates must declare this into descriptor)

 		// Use global variables + $dateSelector + $seller and $buyer

 		$dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl'));

-        foreach($dirtpls as $reldir)

+        foreach ($dirtpls as $reldir)

 		{

 			$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');

 			if (empty(Globals::$conf->file->strict_mode)) {

-                $res=@include $tpl;

+                $res = @include $tpl;

 			} else {

-				$res=include $tpl; // for debug

+				$res = include $tpl; // for debug

 			}

 			if ($res) break;

 		}

@@ -4290,26 +4290,26 @@ 
 	 *	@param		int		$mandatory			Mandatory or not

 	 *	@return		int							<=0 if KO, >0 if OK

 	 */

-	function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)

+	function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0)

 	{

         // phpcs:enable

 		$this->db->begin();

 

 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";

-		$sql.= "resource_id";

-		$sql.= ", resource_type";

-		$sql.= ", element_id";

-		$sql.= ", element_type";

-		$sql.= ", busy";

-		$sql.= ", mandatory";

-		$sql.= ") VALUES (";

-		$sql.= $resource_id;

-		$sql.= ", '".$this->db->escape($resource_type)."'";

-		$sql.= ", '".$this->db->escape($this->id)."'";

-		$sql.= ", '".$this->db->escape($this->element)."'";

-		$sql.= ", '".$this->db->escape($busy)."'";

-		$sql.= ", '".$this->db->escape($mandatory)."'";

-		$sql.= ")";

+		$sql .= "resource_id";

+		$sql .= ", resource_type";

+		$sql .= ", element_id";

+		$sql .= ", element_type";

+		$sql .= ", busy";

+		$sql .= ", mandatory";

+		$sql .= ") VALUES (";

+		$sql .= $resource_id;

+		$sql .= ", '".$this->db->escape($resource_type)."'";

+		$sql .= ", '".$this->db->escape($this->id)."'";

+		$sql .= ", '".$this->db->escape($this->element)."'";

+		$sql .= ", '".$this->db->escape($busy)."'";

+		$sql .= ", '".$this->db->escape($mandatory)."'";

+		$sql .= ")";

 

 		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);

 		if ($this->db->query($sql))

@@ -4319,7 +4319,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return  0;

 		}

@@ -4334,7 +4334,7 @@ 
 	 *    @param	int		$notrigger		Disable all triggers

 	 *    @return   int						>0 if OK, <0 if KO

 	 */

-	function delete_resource($rowid, $element, $notrigger=0)

+	function delete_resource($rowid, $element, $notrigger = 0)

 	{

         // phpcs:enable

 		global $user;

@@ -4342,22 +4342,22 @@ 
 		$this->db->begin();

 

 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";

-		$sql.= " WHERE rowid=".$rowid;

+		$sql .= " WHERE rowid=".$rowid;

 

 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);

 

-		$resql=$this->db->query($sql);

-		if (! $resql)

+		$resql = $this->db->query($sql);

+		if (!$resql)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

 		else

 		{

-			if (! $notrigger)

+			if (!$notrigger)

 			{

-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);

+				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);

 				if ($result < 0) { $this->db->rollback(); return -1; }

 			}

 			$this->db->commit();

@@ -4376,8 +4376,8 @@ 
 		// Force a copy of this->lines, otherwise it will point to same object.

 		if (isset($this->lines) && is_array($this->lines))

 		{

-			$nboflines=count($this->lines);

-			for($i=0; $i < $nboflines; $i++)

+			$nboflines = count($this->lines);

+			for ($i = 0; $i < $nboflines; $i++)

 			{

 				$this->lines[$i] = clone $this->lines[$i];

 			}

@@ -4397,44 +4397,44 @@ 
 	 * @return 	int 						>0 if OK, <0 if KO

 	 * @see	addFileIntoDatabaseIndex

 	 */

-	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null)

+	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams = null)

 	{

 		global $conf, $langs, $user;

 

-		$srctemplatepath='';

+		$srctemplatepath = '';

 

 		// Increase limit for PDF build

-		$err=error_reporting();

+		$err = error_reporting();

 		error_reporting(0);

 		@set_time_limit(120);

 		error_reporting($err);

 

 		// If selected model is a filename template (then $modele="modelname" or "modelname:filename")

-		$tmp=explode(':',$modele,2);

-		if (! empty($tmp[1]))

+		$tmp = explode(':', $modele, 2);

+		if (!empty($tmp[1]))

 		{

-			$modele=$tmp[0];

-			$srctemplatepath=$tmp[1];

+			$modele = $tmp[0];

+			$srctemplatepath = $tmp[1];

 		}

 

 		// Search template files

-		$file=''; $classname=''; $filefound=0;

-		$dirmodels=array('/');

+		$file = ''; $classname = ''; $filefound = 0;

+		$dirmodels = array('/');

 		if (is_array(Globals::$conf->modules_parts['models']))

             $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']);

-        foreach($dirmodels as $reldir)

+        foreach ($dirmodels as $reldir)

 		{

-			foreach(array('doc','pdf') as $prefix)

+			foreach (array('doc', 'pdf') as $prefix)

 			{

-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php

+				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php

 				else $file = $prefix."_".$modele.".modules.php";

 

 				// On verifie l'emplacement du modele

-				$file=dol_buildpath($reldir.$modelspath.$file,0);

+				$file = dol_buildpath($reldir.$modelspath.$file, 0);

 				if (file_exists($file))

 				{

-					$filefound=1;

-					$classname=$prefix.'_'.$modele;

+					$filefound = 1;

+					$classname = $prefix.'_'.$modele;

 					break;

 				}

 			}

@@ -4444,7 +4444,7 @@ 
 		// If generator was found

 		if ($filefound)

 		{

-			global $db;  // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db

+			global $db; // Required to solve a conception default in commonstickergenerator.class.php making an include of code using $db

 

 			require_once $file;

 

@@ -4453,31 +4453,31 @@ 
 			// If generator is ODT, we must have srctemplatepath defined, if not we set it.

 			if ($obj->type == 'odt' && empty($srctemplatepath))

 			{

-				$varfortemplatedir=$obj->scandir;

+				$varfortemplatedir = $obj->scandir;

 				if ($varfortemplatedir && !empty(Globals::$conf->global->$varfortemplatedir)) {

 					$dirtoscan = Globals::$conf->global->$varfortemplatedir;

 

-                    $listoffiles=array();

+                    $listoffiles = array();

 

 					// Now we add first model found in directories scanned

-					$listofdir=explode(',',$dirtoscan);

-					foreach($listofdir as $key => $tmpdir)

+					$listofdir = explode(',', $dirtoscan);

+					foreach ($listofdir as $key => $tmpdir)

 					{

-						$tmpdir=trim($tmpdir);

-						$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);

-						if (! $tmpdir) { unset($listofdir[$key]); continue; }

+						$tmpdir = trim($tmpdir);

+						$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);

+						if (!$tmpdir) { unset($listofdir[$key]); continue; }

 						if (is_dir($tmpdir))

 						{

-							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);

-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+							$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);

+							if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);

 						}

 					}

 

 					if (count($listoffiles))

 					{

-						foreach($listoffiles as $record)

+						foreach ($listoffiles as $record)

 						{

-							$srctemplatepath=$record['fullname'];

+							$srctemplatepath = $record['fullname'];

 							break;

 						}

 					}

@@ -4485,27 +4485,27 @@ 
 

 				if (empty($srctemplatepath))

 				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

+					$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

 					return -1;

 				}

 			}

 

-			if ($obj->type == 'odt' && ! empty($srctemplatepath))

+			if ($obj->type == 'odt' && !empty($srctemplatepath))

 			{

-				if (! dol_is_file($srctemplatepath))

+				if (!dol_is_file($srctemplatepath))

 				{

-					$this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

+					$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

 					return -1;

 				}

 			}

 

 			// We save charset_output to restore it because write_file can change it if needed for

 			// output format that does not support UTF8.

-			$sav_charset_output=$outputlangs->charset_output;

+			$sav_charset_output = $outputlangs->charset_output;

 

 			if (in_array(get_class($this), array('Adherent')))

 			{

-				$arrayofrecords = array();   // The write_file of templates of adherent class need this var

+				$arrayofrecords = array(); // The write_file of templates of adherent class need this var

 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

 			}

 			else

@@ -4516,36 +4516,36 @@ 
 

 			if ($resultwritefile > 0)

 			{

-				$outputlangs->charset_output=$sav_charset_output;

+				$outputlangs->charset_output = $sav_charset_output;

 

 				// We delete old preview

 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 				dol_delete_preview($this);

 

 				// Index file in database

-				if (! empty($obj->result['fullpath']))

+				if (!empty($obj->result['fullpath']))

 				{

 					$destfull = $obj->result['fullpath'];

 					$upload_dir = dirname($destfull);

 					$destfile = basename($destfull);

-					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);

+					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);

 

-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+					if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

 					{

 						$filename = basename($destfile);

 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

 

 						include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-						$ecmfile=new EcmFiles($this->db);

-						$result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);

+						$ecmfile = new EcmFiles($this->db);

+						$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);

 

 						// Set the public "share" key

 						$setsharekey = false;

 						if ($this->element == 'propal')

 						{

 							$useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

-                            if ($useonlinesignature) $setsharekey=true;

+                            if ($useonlinesignature) $setsharekey = true;

 							if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))

                                 $setsharekey = true;

                         }

@@ -4567,11 +4567,11 @@ 
 

 						if ($result > 0)

 						{

-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+							$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

 							$ecmfile->fullpath_orig = '';

 							$ecmfile->gen_or_uploaded = 'generated';

-							$ecmfile->description = '';    // indexed content

-							$ecmfile->keyword = '';        // keyword content

+							$ecmfile->description = ''; // indexed content

+							$ecmfile->keyword = ''; // keyword content

 							$result = $ecmfile->update($user);

 							if ($result < 0)

 							{

@@ -4583,11 +4583,11 @@ 
 							$ecmfile->entity = Globals::$conf->entity;

                             $ecmfile->filepath = $rel_dir;

 							$ecmfile->filename = $filename;

-							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content

+							$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

 							$ecmfile->fullpath_orig = '';

 							$ecmfile->gen_or_uploaded = 'generated';

-							$ecmfile->description = '';    // indexed content

-							$ecmfile->keyword = '';        // keyword content

+							$ecmfile->description = ''; // indexed content

+							$ecmfile->keyword = ''; // keyword content

 							$ecmfile->src_object_type = $this->table_element;

 							$ecmfile->src_object_id   = $this->id;

 

@@ -4604,14 +4604,14 @@ 
 						//var_dump($obj->update_main_doc_field);exit;

 

 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

-						$update_main_doc_field=0;

-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;

-						if ($update_main_doc_field && ! empty($this->table_element))

+						$update_main_doc_field = 0;

+						if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;

+						if ($update_main_doc_field && !empty($this->table_element))

 						{

 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";

-							$sql.= ' WHERE rowid = '.$this->id;

+							$sql .= ' WHERE rowid = '.$this->id;

 							$resql = $this->db->query($sql);

-							if (! $resql) dol_print_error($this->db);

+							if (!$resql) dol_print_error($this->db);

 						}

 					}

 				}

@@ -4627,15 +4627,15 @@ 
 			}

 			else

 			{

-				$outputlangs->charset_output=$sav_charset_output;

+				$outputlangs->charset_output = $sav_charset_output;

 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

 				return -1;

 			}

 		}

 		else

 		{

-			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);

-			dol_print_error('',$this->error);

+			$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);

+			dol_print_error('', $this->error);

 			return -1;

 		}

 	}

@@ -4651,9 +4651,9 @@ 
 	{

 		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;

 

-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...

+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...

 

-		$file_osencoded=dol_osencode($file);

+		$file_osencoded = dol_osencode($file);

 		if (file_exists($file_osencoded))

 		{

 			// Create small thumbs for company (Ratio is near 16/9)

@@ -4683,7 +4683,7 @@ 
 	 * @param   string              $alternatevalue     Alternate value to use

 	 * @return  string|string[]                         Default value (can be an array if the GETPOST return an array)

 	 **/

-	function getDefaultCreateValueFor($fieldname, $alternatevalue=null)

+	function getDefaultCreateValueFor($fieldname, $alternatevalue = null)

 	{

 		global $conf, $_POST;

 

@@ -4692,16 +4692,16 @@ 
 

 		if (isset($alternatevalue)) return $alternatevalue;

 

-		$newelement=$this->element;

-		if ($newelement == 'facture') $newelement='invoice';

-		if ($newelement == 'commande') $newelement='order';

+		$newelement = $this->element;

+		if ($newelement == 'facture') $newelement = 'invoice';

+		if ($newelement == 'commande') $newelement = 'order';

 		if (empty($newelement))

 		{

 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);

 			return '';

 		}

 

-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);

+		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);

 		//var_dump($keyforfieldname);

 		if (isset(Globals::$conf->global->$keyforfieldname))

             return Globals::$conf->global->$keyforfieldname;

@@ -4727,21 +4727,21 @@ 
 	function call_trigger($trigger_name, $user)

 	{

         // phpcs:enable

-		global $langs,$conf;

+		global $langs, $conf;

 

-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

-		$interface=new Interfaces($this->db);

-		$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);

+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';

+		$interface = new Interfaces($this->db);

+		$result = $interface->run_triggers($trigger_name, $this, $user, $langs, $conf);

 

 		if ($result < 0)

 		{

 			if (!empty($this->errors))

 			{

-				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

+				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.

 			}

 			else

 			{

-				$this->errors=$interface->errors;

+				$this->errors = $interface->errors;

 			}

 		}

 		return $result;

@@ -4760,19 +4760,19 @@ 
 	 *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.

 	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded

 	 */

-	function fetch_optionals($rowid=null, $optionsArray=null)

+	function fetch_optionals($rowid = null, $optionsArray = null)

 	{

         // phpcs:enable

-		if (empty($rowid)) $rowid=$this->id;

+		if (empty($rowid)) $rowid = $this->id;

 

 		// To avoid SQL errors. Probably not the better solution though

 		if (!$this->table_element) {

 			return 0;

 		}

 

-		$this->array_options=array();

+		$this->array_options = array();

 

-		if (! is_array($optionsArray))

+		if (!is_array($optionsArray))

 		{

 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.

 			// TODO Use of existing $extrafield is not yet ready (must mutualize code that use extrafields in form first)

@@ -4788,7 +4788,7 @@ 
 			{

 				$extrafields->fetch_name_optionals_label($this->table_element);

 			}

-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);

+			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);

 		}

 		else

 		{

@@ -4807,18 +4807,18 @@ 
 			{

 				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')

 				{

-					$sql.= ", ".$name;

+					$sql .= ", ".$name;

 				}

 			}

-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

-			$sql.= " WHERE fk_object = ".$rowid;

+			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

+			$sql .= " WHERE fk_object = ".$rowid;

 

 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose

-			$resql=$this->db->query($sql);

+			$resql = $this->db->query($sql);

 			if ($resql)

 			{

 				$this->array_options = array();

-				$numrows=$this->db->num_rows($resql);

+				$numrows = $this->db->num_rows($resql);

 				if ($numrows)

 				{

 					$tab = $this->db->fetch_array($resql);

@@ -4826,17 +4826,17 @@ 
 					foreach ($tab as $key => $value)

 					{

 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)

-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))

+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))

 						{

 							// we can add this attribute to object

-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))

+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))

 							{

 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);

-								$this->array_options["options_".$key]=$this->db->jdate($value);

+								$this->array_options["options_".$key] = $this->db->jdate($value);

 							}

 							else

 							{

-								$this->array_options["options_".$key]=$value;

+								$this->array_options["options_".$key] = $value;

 							}

 

 							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);

@@ -4872,10 +4872,10 @@ 
 

 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);

-		$resql=$this->db->query($sql_del);

-		if (! $resql)

+		$resql = $this->db->query($sql_del);

+		if (!$resql)

 		{

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			$this->db->rollback();

 			return -1;

 		}

@@ -4896,37 +4896,37 @@ 
 	 *  @return int 						-1=error, O=did nothing, 1=OK

 	 *  @see updateExtraField, setValueFrom

 	 */

-	function insertExtraFields($trigger='', $userused=null)

+	function insertExtraFields($trigger = '', $userused = null)

 	{

-		global $conf,$langs,$user;

+		global $conf, $langs, $user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) $userused = $user;

 

-		$error=0;

+		$error = 0;

 

 		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

             return 0; // For avoid conflicts if trigger used

 

-        if (! empty($this->array_options))

+        if (!empty($this->array_options))

 		{

 			// Check parameters

 			$langs->load('admin');

 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 			$extrafields = new ExtraFields($this->db);

-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);

 

 			//Eliminate copied source object extra_fields that do not exist in target object

-			$new_array_options=array();

+			$new_array_options = array();

 			foreach ($this->array_options as $key => $value) {

-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

+				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

 					$new_array_options[$key] = $value;

 				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

 					$new_array_options['options_'.$key] = $value;

 			}

 

-			foreach($new_array_options as $key => $value)

+			foreach ($new_array_options as $key => $value)

 			{

-			   	$attributeKey      = substr($key,8);   // Remove 'options_' prefix

+			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix

 			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];

 			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];

 			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];

@@ -4934,13 +4934,13 @@ 
 

 			   	if ($attributeRequired)

 			   	{

-			   		$mandatorypb=false;

-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;

-			   		if ($this->array_options[$key] === '') $mandatorypb=true;

+			   		$mandatorypb = false;

+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;

+			   		if ($this->array_options[$key] === '') $mandatorypb = true;

 			   		if ($mandatorypb)

 			   		{

 			   			dol_syslog($this->error);

-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);

+			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);

 			   			return -1;

 			   		}

 			   	}

@@ -4951,25 +4951,25 @@ 
 			   	switch ($attributeType)

 			   	{

 			   		case 'int':

-			  			if (!is_numeric($value) && $value!='')

+			  			if (!is_numeric($value) && $value != '')

 			   			{

-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 			   				return -1;

 			  			}

-			   			elseif ($value=='')

+			   			elseif ($value == '')

 			   			{

 			   				$new_array_options[$key] = null;

 			   			}

 			 			break;

 					case 'double':

 						$value = price2num($value);

-						if (!is_numeric($value) && $value!='')

+						if (!is_numeric($value) && $value != '')

 						{

 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 							return -1;

 						}

-						elseif ($value=='')

+						elseif ($value == '')

 						{

 							$new_array_options[$key] = null;

 						}

@@ -4983,12 +4983,12 @@ 
              			}

              			break;*/

 			   		case 'password':

-			   			$algo='';

+			   			$algo = '';

 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))

 			   			{

 			   				// If there is an encryption choice, we use it to crypt data before insert

 			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

-			   				$algo=reset($tmparrays);

+			   				$algo = reset($tmparrays);

 			   				if ($algo != '')

 			   				{

 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...

@@ -4999,7 +4999,7 @@ 
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

 				   					{

-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

+				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

 				   					}

 									else

 									{

@@ -5010,7 +5010,7 @@ 
 			   					}

 			   					else

 			   					{

-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

 			   					}

 			   				}

 			   			}

@@ -5027,13 +5027,13 @@ 
 						break;

 					case 'datetime':

 						// If data is a string instead of a timestamp, we convert it

-						if (! is_int($this->array_options[$key])) {

+						if (!is_int($this->array_options[$key])) {

 							$this->array_options[$key] = strtotime($this->array_options[$key]);

 						}

 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);

 						break;

 		   			case 'link':

-						$param_list=array_keys($attributeParam['options']);

+						$param_list = array_keys($attributeParam['options']);

 						// 0 : ObjectName

 						// 1 : classPath

 						$InfoFieldList = explode(":", $param_list[0]);

@@ -5042,18 +5042,18 @@ 
 						{

 							if ($value == '-1')	// -1 is key for no defined in combo list of objects

 							{

-								$new_array_options[$key]='';

+								$new_array_options[$key] = '';

 							}

 							elseif ($value)

 							{

 								$object = new $InfoFieldList[0]($this->db);

-								if (is_numeric($value)) $res=$object->fetch($value);

-								else $res=$object->fetch('',$value);

+								if (is_numeric($value)) $res = $object->fetch($value);

+								else $res = $object->fetch('', $value);

 

-								if ($res > 0) $new_array_options[$key]=$object->id;

+								if ($res > 0) $new_array_options[$key] = $object->id;

 								else

 								{

-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";

+									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";

 									$this->db->rollback();

 									return -1;

 								}

@@ -5077,46 +5077,46 @@ 
 			$this->db->query($sql_del);

 

 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";

-			foreach($new_array_options as $key => $value)

+			foreach ($new_array_options as $key => $value)

 			{

-				$attributeKey = substr($key,8);   // Remove 'options_' prefix

+				$attributeKey = substr($key, 8); // Remove 'options_' prefix

 				// Add field of attribut

 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

-					$sql.=",".$attributeKey;

+					$sql .= ",".$attributeKey;

 			}

 			$sql .= ") VALUES (".$this->id;

 

-			foreach($new_array_options as $key => $value)

+			foreach ($new_array_options as $key => $value)

 			{

-				$attributeKey = substr($key,8);   // Remove 'options_' prefix

+				$attributeKey = substr($key, 8); // Remove 'options_' prefix

 				// Add field of attribute

 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

 				{

 					if ($new_array_options[$key] != '')

 					{

-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";

+						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";

 					}

 					else

 					{

-						$sql.=",null";

+						$sql .= ",null";

 					}

 				}

 			}

-			$sql.=")";

+			$sql .= ")";

 

 			dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);

 			$resql = $this->db->query($sql);

-			if (! $resql)

+			if (!$resql)

 			{

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 				$error++;

 			}

 

-			if (! $error && $trigger)

+			if (!$error && $trigger)

 			{

 				// Call trigger

-				$this->context=array('extrafieldaddupdate'=>1);

-				$result=$this->call_trigger($trigger, $userused);

+				$this->context = array('extrafieldaddupdate'=>1);

+				$result = $this->call_trigger($trigger, $userused);

 				if ($result < 0) $error++;

 				// End call trigger

 			}

@@ -5145,26 +5145,26 @@ 
 	 *  @return int                 		-1=error, O=did nothing, 1=OK

 	 *  @see setValueFrom, insertExtraFields

 	 */

-	function updateExtraField($key, $trigger=null, $userused=null)

+	function updateExtraField($key, $trigger = null, $userused = null)

 	{

-		global $conf,$langs,$user;

+		global $conf, $langs, $user;

 

-		if (empty($userused)) $userused=$user;

+		if (empty($userused)) $userused = $user;

 

-		$error=0;

+		$error = 0;

 

 		if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED))

             return 0; // For avoid conflicts if trigger used

 

-        if (! empty($this->array_options) && isset($this->array_options["options_".$key]))

+        if (!empty($this->array_options) && isset($this->array_options["options_".$key]))

 		{

 			// Check parameters

 			$langs->load('admin');

 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 			$extrafields = new ExtraFields($this->db);

-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);

+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);

 

-			$value=$this->array_options["options_".$key];

+			$value = $this->array_options["options_".$key];

 

 			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];

 			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];

@@ -5177,25 +5177,25 @@ 
 			switch ($attributeType)

 			{

 				case 'int':

-					if (!is_numeric($value) && $value!='')

+					if (!is_numeric($value) && $value != '')

 					{

-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);

+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 						return -1;

 					}

-					elseif ($value=='')

+					elseif ($value == '')

 					{

 						$this->array_options["options_".$key] = null;

 					}

 					break;

 				case 'double':

 					$value = price2num($value);

-					if (!is_numeric($value) && $value!='')

+					if (!is_numeric($value) && $value != '')

 					{

 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

 						return -1;

 					}

-					elseif ($value=='')

+					elseif ($value == '')

 					{

 						$this->array_options["options_".$key] = null;

 					}

@@ -5212,13 +5212,13 @@ 
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);

 					break;

 				case 'date':

-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

 					break;

 				case 'datetime':

-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);

+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

 					break;

 				case 'link':

-					$param_list=array_keys($attributeParam['options']);

+					$param_list = array_keys($attributeParam['options']);

 					// 0 : ObjectName

 					// 1 : classPath

 					$InfoFieldList = explode(":", $param_list[0]);

@@ -5226,8 +5226,8 @@ 
 					if ($value)

 					{

 						$object = new $InfoFieldList[0]($this->db);

-						$object->fetch(0,$value);

-						$this->array_options["options_".$key]=$object->id;

+						$object->fetch(0, $value);

+						$this->array_options["options_".$key] = $object->id;

 					}

 					break;

 			}

@@ -5236,24 +5236,24 @@ 
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";

 			$sql .= " WHERE fk_object = ".$this->id;

 			$resql = $this->db->query($sql);

-			if (! $resql)

+			if (!$resql)

 			{

 				$error++;

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 			}

 

-			if (! $error && $trigger)

+			if (!$error && $trigger)

 			{

 				// Call trigger

-				$this->context=array('extrafieldupdate'=>1);

-				$result=$this->call_trigger($trigger, $userused);

+				$this->context = array('extrafieldupdate'=>1);

+				$result = $this->call_trigger($trigger, $userused);

 				if ($result < 0) $error++;

 				// End call trigger

 			}

 

 			if ($error)

 			{

-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);

+				dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);

 				$this->db->rollback();

 				return -1;

 			}

@@ -5280,71 +5280,71 @@ 
 	 * @param  string|int		$morecss       Value for css to define style/length of field. May also be a numeric.

 	 * @return string

 	 */

-	function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0)

+	function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0)

 	{

-		global $conf,$langs,$form;

+		global $conf, $langs, $form;

 

-		if (! is_object($form))

+		if (!is_object($form))

 		{

 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form=new Form($this->db);

+			$form = new Form($this->db);

 		}

 

-		$val=$this->fields[$key];

+		$val = $this->fields[$key];

 

-		$out='';

-        $type='';

+		$out = '';

+        $type = '';

         $param = array();

-        $param['options']=array();

-        $size =$this->fields[$key]['size'];

+        $param['options'] = array();

+        $size = $this->fields[$key]['size'];

         // Because we work on extrafields

-        if(preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)){

-            $param['options']=array($reg[1].':'.$reg[2]=>'N');

-            $type ='link';

-        } elseif(preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {

-            $param['options']=array($reg[1].':'.$reg[2]=>'N');

-            $type ='link';

-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');

-            $type ='sellist';

-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'],$reg)) {

-            $param['options']=array();

-            $type ='varchar';

-            $size=$reg[1];

-        } elseif(preg_match('/varchar/', $val['type'])) {

-            $param['options']=array();

-            $type ='varchar';

-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {

-            $param['options']=$this->fields[$key]['arrayofkeyval'];

-            $type ='select';

+        if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2]=>'N');

+            $type = 'link';

+        } elseif (preg_match('/^link:(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2]=>'N');

+            $type = 'link';

+        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4]=>'N');

+            $type = 'sellist';

+        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {

+            $param['options'] = array();

+            $type = 'varchar';

+            $size = $reg[1];

+        } elseif (preg_match('/varchar/', $val['type'])) {

+            $param['options'] = array();

+            $type = 'varchar';

+        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {

+            $param['options'] = $this->fields[$key]['arrayofkeyval'];

+            $type = 'select';

         } else {

-            $param['options']=array();

-            $type =$this->fields[$key]['type'];

+            $param['options'] = array();

+            $type = $this->fields[$key]['type'];

         }

 

-		$label=$this->fields[$key]['label'];

+		$label = $this->fields[$key]['label'];

 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used

-		$default=$this->fields[$key]['default'];

-		$computed=$this->fields[$key]['computed'];

-		$unique=$this->fields[$key]['unique'];

-		$required=$this->fields[$key]['required'];

+		$default = $this->fields[$key]['default'];

+		$computed = $this->fields[$key]['computed'];

+		$unique = $this->fields[$key]['unique'];

+		$required = $this->fields[$key]['required'];

 

-		$langfile=$this->fields[$key]['langfile'];

-		$list=$this->fields[$key]['list'];

-		$hidden=abs($this->fields[$key]['visible'])!=1?1:0;

+		$langfile = $this->fields[$key]['langfile'];

+		$list = $this->fields[$key]['list'];

+		$hidden = abs($this->fields[$key]['visible']) != 1 ? 1 : 0;

 

 		$objectid = $this->id;

 

 

 		if ($computed)

 		{

-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

 			else return '';

 		}

 

 

 		// Use in priority showsize from parameters, then $val['css'] then autodefine

-		if (empty($morecss) && ! empty($val['css']))

+		if (empty($morecss) && !empty($val['css']))

 		{

 			$showsize = $val['css'];

 		}

@@ -5358,16 +5358,16 @@ 
 			{

 				$morecss = 'minwidth200imp';

 			}

-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))

 			{

 				$morecss = 'maxwidth75';

                         }elseif ($type == 'url')

 			{

-				$morecss='minwidth400';

+				$morecss = 'minwidth400';

 			}

 			elseif ($type == 'boolean')

 			{

-				$morecss='';

+				$morecss = '';

 			}

 			else

 			{

@@ -5386,12 +5386,12 @@ 
 			}

 		}

 

-		if (in_array($type,array('date','datetime')))

+		if (in_array($type, array('date', 'datetime')))

 		{

-			$tmp=explode(',',$size);

-			$newsize=$tmp[0];

+			$tmp = explode(',', $size);

+			$newsize = $tmp[0];

 

-			$showtime = in_array($type,array('datetime')) ? 1 : 0;

+			$showtime = in_array($type, array('datetime')) ? 1 : 0;

 

 			// Do not show current date when field not required (see selectDate() method)

 			if (!$required && $value == '') $value = '-1';

@@ -5399,235 +5399,235 @@ 
 			// TODO Must also support $moreparam

 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

 		}

-		elseif (in_array($type,array('int','integer')))

+		elseif (in_array($type, array('int', 'integer')))

 		{

-			$tmp=explode(',',$size);

-			$newsize=$tmp[0];

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

+			$tmp = explode(',', $size);

+			$newsize = $tmp[0];

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

 		}

 		elseif (preg_match('/varchar/', $type))

 		{

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';

 		}

 		elseif (in_array($type, array('mail', 'phone', 'url')))

 		{

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

 		}

 		elseif ($type == 'text')

 		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

 			{

 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');

-				$out=$doleditor->Create(1);

+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');

+				$out = $doleditor->Create(1);

 			}

 			else

 			{

-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

 			}

 		}

 		elseif ($type == 'html')

 		{

-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

 			{

 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-				$doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

-                $out=$doleditor->Create(1);

+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

+                $out = $doleditor->Create(1);

 			}

 			else

 			{

-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';

+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

 			}

 		}

 		elseif ($type == 'boolean')

 		{

-			$checked='';

+			$checked = '';

 			if (!empty($value)) {

-				$checked=' checked value="1" ';

+				$checked = ' checked value="1" ';

 			} else {

-				$checked=' value="1" ';

+				$checked = ' value="1" ';

 			}

-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';

+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';

 		}

 		elseif ($type == 'price')

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

-				$value=price($value);

+				$value = price($value);

 			}

-			$out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol(Globals::$conf->currency);

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol(Globals::$conf->currency);

         }

-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))

+		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))

 		{

 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.

-				$value=price($value);

+				$value = price($value);

 			}

-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';

 		}

 		elseif ($type == 'select')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

 			}

 

-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';

+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';

 			foreach ($param['options'] as $key => $val)

 			{

 				if ((string) $key == '') continue;

 				list($val, $parent) = explode('|', $val);

-				$out.='<option value="'.$key.'"';

-				$out.= (((string) $value == (string) $key)?' selected':'');

-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');

-				$out.='>'.$val.'</option>';

+				$out .= '<option value="'.$key.'"';

+				$out .= (((string) $value == (string) $key) ? ' selected' : '');

+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+				$out .= '>'.$val.'</option>';

 			}

-			$out.='</select>';

+			$out .= '</select>';

 		}

 		elseif ($type == 'sellist')

 		{

 			$out = '';

 			if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

 			}

 

-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';

+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

 			if (is_array($param['options']))

 			{

-				$param_list=array_keys($param['options']);

+				$param_list = array_keys($param['options']);

 				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName='';

-				$parentField='';

+				$parentName = '';

+				$parentField = '';

 				// 0 : tableName

 				// 1 : label field name

 				// 2 : key fields name (if differ of rowid)

 				// 3 : key field parent (for dependent lists)

 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');

+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

 

-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))

+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))

 				{

 					if (strpos($InfoFieldList[4], 'extra.') !== false)

 					{

-						$keyList='main.'.$InfoFieldList[2].' as rowid';

+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';

 					} else {

-						$keyList=$InfoFieldList[2].' as rowid';

+						$keyList = $InfoFieldList[2].' as rowid';

 					}

 				}

-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))

 				{

 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-					$keyList.= ', '.$parentField;

+					$keyList .= ', '.$parentField;

 				}

 

-				$fields_label = explode('|',$InfoFieldList[1]);

+				$fields_label = explode('|', $InfoFieldList[1]);

 				if (is_array($fields_label))

 				{

-					$keyList .=', ';

+					$keyList .= ', ';

 					$keyList .= implode(', ', $fields_label);

 				}

 

-				$sqlwhere='';

+				$sqlwhere = '';

 				$sql = 'SELECT '.$keyList;

-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

 				if (!empty($InfoFieldList[4]))

 				{

 					// can use SELECT request

-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {

-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

 					}

 

 					// current object id can be use into filter

-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

 					} else {

-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

 					}

 					//We have to join on extrafield table

-					if (strpos($InfoFieldList[4], 'extra')!==false)

+					if (strpos($InfoFieldList[4], 'extra') !== false)

 					{

-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';

-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];

+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

 					}

 					else

 					{

-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];

+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];

 					}

 				}

 				else

 				{

-					$sqlwhere.= ' WHERE 1=1';

+					$sqlwhere .= ' WHERE 1=1';

 				}

 				// Some tables may have field, some other not. For the moment we disable it.

-				if (in_array($InfoFieldList[0],array('tablewithentity')))

+				if (in_array($InfoFieldList[0], array('tablewithentity')))

 				{

-					$sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+					$sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

-				$sql.=$sqlwhere;

+				$sql .= $sqlwhere;

 				//print $sql;

 

-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);

+				$sql .= ' ORDER BY '.implode(', ', $fields_label);

 

 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

 				$resql = $this->db->query($sql);

 				if ($resql)

 				{

-					$out.='<option value="0">&nbsp;</option>';

+					$out .= '<option value="0">&nbsp;</option>';

 					$num = $this->db->num_rows($resql);

 					$i = 0;

 					while ($i < $num)

 					{

-						$labeltoshow='';

+						$labeltoshow = '';

 						$obj = $this->db->fetch_object($resql);

 

 						// Several field into label (eq table:code|libelle:rowid)

 						$notrans = false;

-						$fields_label = explode('|',$InfoFieldList[1]);

+						$fields_label = explode('|', $InfoFieldList[1]);

 						if (is_array($fields_label))

 						{

 							$notrans = true;

 							foreach ($fields_label as $field_toshow)

 							{

-								$labeltoshow.= $obj->$field_toshow.' ';

+								$labeltoshow .= $obj->$field_toshow.' ';

 							}

 						}

 						else

 						{

-							$labeltoshow=$obj->{$InfoFieldList[1]};

+							$labeltoshow = $obj->{$InfoFieldList[1]};

 						}

-						$labeltoshow=dol_trunc($labeltoshow,45);

+						$labeltoshow = dol_trunc($labeltoshow, 45);

 

 						if ($value == $obj->rowid)

 						{

 							foreach ($fields_label as $field_toshow)

 							{

-								$translabel=$langs->trans($obj->$field_toshow);

-								if ($translabel!=$obj->$field_toshow) {

-									$labeltoshow=dol_trunc($translabel,18).' ';

-								}else {

-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';

+								$translabel = $langs->trans($obj->$field_toshow);

+								if ($translabel != $obj->$field_toshow) {

+									$labeltoshow = dol_trunc($translabel, 18).' ';

+								} else {

+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

 								}

 							}

-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

 						}

 						else

 						{

-							if (! $notrans)

+							if (!$notrans)

 							{

-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});

-								if ($translabel!=$obj->{$InfoFieldList[1]}) {

-									$labeltoshow=dol_trunc($translabel,18);

+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

+								if ($translabel != $obj->{$InfoFieldList[1]}) {

+									$labeltoshow = dol_trunc($translabel, 18);

 								}

 								else {

-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);

+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]},18);

 								}

 							}

-							if (empty($labeltoshow)) $labeltoshow='(not defined)';

-							if ($value==$obj->rowid)

+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';

+							if ($value == $obj->rowid)

 							{

-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

 							}

 

 							if (!empty($InfoFieldList[3]) && $parentField)

@@ -5635,10 +5635,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};

 							}

 

-							$out.='<option value="'.$obj->rowid.'"';

-							$out.= ($value==$obj->rowid?' selected':'');

-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');

-							$out.='>'.$labeltoshow.'</option>';

+							$out .= '<option value="'.$obj->rowid.'"';

+							$out .= ($value == $obj->rowid ? ' selected' : '');

+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+							$out .= '>'.$labeltoshow.'</option>';

 						}

 

 						$i++;

@@ -5649,23 +5649,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

 				}

 			}

-			$out.='</select>';

+			$out .= '</select>';

 		}

 		elseif ($type == 'checkbox')

 		{

-			$value_arr=explode(',',$value);

-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

+			$value_arr = explode(',', $value);

+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

 		}

 		elseif ($type == 'radio')

 		{

-			$out='';

+			$out = '';

 			foreach ($param['options'] as $keyopt => $val)

 			{

-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');

-				$out.=' value="'.$keyopt.'"';

-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

-				$out.= ($value==$keyopt?'checked':'');

-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');

+				$out .= ' value="'.$keyopt.'"';

+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

+				$out .= ($value == $keyopt ? 'checked' : '');

+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

 			}

 		}

 		elseif ($type == 'chkbxlst')

@@ -5680,24 +5680,24 @@ 
 			if (is_array($param['options'])) {

 				$param_list = array_keys($param['options']);

 				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName='';

-				$parentField='';

+				$parentName = '';

+				$parentField = '';

 				// 0 : tableName

 				// 1 : label field name

 				// 2 : key fields name (if differ of rowid)

 				// 3 : key field parent (for dependent lists)

 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');

+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

 

-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {

-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);

-					$keyList .= ', ' . $parentField;

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+					$keyList .= ', '.$parentField;

 				}

-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {

+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

 					if (strpos($InfoFieldList[4], 'extra.') !== false) {

-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';

+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';

 					} else {

-						$keyList = $InfoFieldList[2] . ' as rowid';

+						$keyList = $InfoFieldList[2].' as rowid';

 					}

 				}

 

@@ -5708,50 +5708,50 @@ 
 				}

 

 				$sqlwhere = '';

-				$sql = 'SELECT ' . $keyList;

-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

-				if (! empty($InfoFieldList[4])) {

+				$sql = 'SELECT '.$keyList;

+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+				if (!empty($InfoFieldList[4])) {

 

 					// can use SELECT request

-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {

-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

 					}

 

 					// current object id can be use into filter

-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {

-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);

+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

 					} else {

-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);

+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

 					}

 

 					// We have to join on extrafield table

 					if (strpos($InfoFieldList[4], 'extra') !== false) {

-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';

-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];

+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

 					} else {

-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];

+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];

 					}

 				} else {

 					$sqlwhere .= ' WHERE 1=1';

 				}

 				// Some tables may have field, some other not. For the moment we disable it.

-				if (in_array($InfoFieldList[0], array ('tablewithentity')))

+				if (in_array($InfoFieldList[0], array('tablewithentity')))

 				{

-					$sqlwhere .= ' AND entity = ' . Globals::$conf->entity;

+					$sqlwhere .= ' AND entity = '.Globals::$conf->entity;

                 }

 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);

 				// print $sql;

 

 				$sql .= $sqlwhere;

-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);

+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

 				$resql = $this->db->query($sql);

 				if ($resql) {

 					$num = $this->db->num_rows($resql);

 					$i = 0;

 

-					$data=array();

+					$data = array();

 

-					while ( $i < $num ) {

+					while ($i < $num) {

 						$labeltoshow = '';

 						$obj = $this->db->fetch_object($resql);

 

@@ -5760,8 +5760,8 @@ 
 						$fields_label = explode('|', $InfoFieldList[1]);

 						if (is_array($fields_label)) {

 							$notrans = true;

-							foreach ( $fields_label as $field_toshow ) {

-								$labeltoshow .= $obj->$field_toshow . ' ';

+							foreach ($fields_label as $field_toshow) {

+								$labeltoshow .= $obj->$field_toshow.' ';

 							}

 						} else {

 							$labeltoshow = $obj->{$InfoFieldList[1]};

@@ -5769,18 +5769,18 @@ 
 						$labeltoshow = dol_trunc($labeltoshow, 45);

 

 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							foreach ( $fields_label as $field_toshow ) {

+							foreach ($fields_label as $field_toshow) {

 								$translabel = $langs->trans($obj->$field_toshow);

 								if ($translabel != $obj->$field_toshow) {

-									$labeltoshow = dol_trunc($translabel, 18) . ' ';

+									$labeltoshow = dol_trunc($translabel, 18).' ';

 								} else {

-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

 								}

 							}

 

-							$data[$obj->rowid]=$labeltoshow;

+							$data[$obj->rowid] = $labeltoshow;

 						} else {

-							if (! $notrans) {

+							if (!$notrans) {

 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

 								if ($translabel != $obj->{$InfoFieldList[1]}) {

 									$labeltoshow = dol_trunc($translabel, 18);

@@ -5792,66 +5792,66 @@ 
 								$labeltoshow = '(not defined)';

 

 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-									$data[$obj->rowid]=$labeltoshow;

+									$data[$obj->rowid] = $labeltoshow;

 								}

 

-								if (! empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName . ':' . $obj->{$parentField};

+								if (!empty($InfoFieldList[3]) && $parentField) {

+									$parent = $parentName.':'.$obj->{$parentField};

 								}

 

-								$data[$obj->rowid]=$labeltoshow;

+								$data[$obj->rowid] = $labeltoshow;

 						}

 

-						$i ++;

+						$i++;

 					}

 					$this->db->free($resql);

 

-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

 				} else {

-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

 				}

 			}

 		}

 		elseif ($type == 'link')

 		{

-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

-			$showempty=(($required && $default != '')?0:1);

-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

+			$showempty = (($required && $default != '') ? 0 : 1);

+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);

 			if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) {

-            			list($class,$classfile)=explode(':',$param_list[0]);

-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);

-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);

-            			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+            			list($class, $classfile) = explode(':', $param_list[0]);

+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);

+            			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php', 1);

+            			$out .= '<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

             			// TODO Add Javascript code to add input fields contents to new elements urls

 			}

 		}

 		elseif ($type == 'password')

 		{

 			// If prefix is 'search_', field is used as a filter, we use a common text field.

-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';

+			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

 		}

 		elseif ($type == 'array')

 		{

 			$newval = $val;

 			$newval['type'] = 'varchar(256)';

 

-			$out='';

+			$out = '';

 

 			$inputs = array();

-			if(! empty($value)) {

-				foreach($value as $option) {

-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';

+			if (!empty($value)) {

+				foreach ($value as $option) {

+					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

+					$out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $showsize).'<br></span>';

 				}

 			}

 

-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+			$out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';

 

 			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';

+			$newInput .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $showsize).'<br></span>';

 

 			if (!empty(Globals::$conf->use_javascript_ajax)) {

-                $out.= '

+                $out .= '

 					<script type="text/javascript">

 					$(document).ready(function() {

 						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {

@@ -5866,7 +5866,7 @@ 
 			}

 		}

 		if (!empty($hidden)) {

-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';

 		}

 		/* Add comments

 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';

@@ -5888,14 +5888,14 @@ 
 	 * @param  mixed   $showsize       Value for css to define size. May also be a numeric.

 	 * @return string

 	 */

-	function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0)

+	function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $showsize = 0)

 	{

-		global $conf,$langs,$form;

+		global $conf, $langs, $form;

 

-		if (! is_object($form))

+		if (!is_object($form))

 		{

 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form=new Form($this->db);

+			$form = new Form($this->db);

 		}

 

 		$objectid = $this->id;

@@ -5906,28 +5906,28 @@ 
 		// Convert var to be able to share same code than showOutputField of extrafields

 		if (preg_match('/varchar\((\d+)\)/', $type, $reg))

 		{

-			$type = 'varchar';		// convert varchar(xx) int varchar

+			$type = 'varchar'; // convert varchar(xx) int varchar

 			$size = $reg[1];

 		}

-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar

-		if (is_array($val['arrayofkeyval'])) $type='select';

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';

+		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar

+		if (is_array($val['arrayofkeyval'])) $type = 'select';

+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';

 

-		$default=$val['default'];

-		$computed=$val['computed'];

-		$unique=$val['unique'];

-		$required=$val['required'];

-		$param=$val['param'];

+		$default = $val['default'];

+		$computed = $val['computed'];

+		$unique = $val['unique'];

+		$required = $val['required'];

+		$param = $val['param'];

 		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

 		{

-			$type='link';

-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

+			$type = 'link';

+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

 		}

-		$langfile=$val['langfile'];

-		$list=$val['list'];

-		$help=$val['help'];

-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+		$langfile = $val['langfile'];

+		$list = $val['list'];

+		$help = $val['help'];

+		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

 

 		if ($hidden) return '';

 

@@ -5951,18 +5951,18 @@ 
 				//$showsize=19;

 				$showsize = 'minwidth200imp';

 			}

-			elseif (in_array($type,array('int','double','price')))

+			elseif (in_array($type, array('int', 'double', 'price')))

 			{

 				//$showsize=10;

 				$showsize = 'maxwidth75';

 			}

 			elseif ($type == 'url')

 			{

-				$showsize='minwidth400';

+				$showsize = 'minwidth400';

 			}

 			elseif ($type == 'boolean')

 			{

-				$showsize='';

+				$showsize = '';

 			}

 			else

 			{

@@ -5983,49 +5983,49 @@ 
 		}

 

 		// Format output value differently according to properties of field

-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);

-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);

+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);

+		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);

 		elseif ($type == 'date')

 		{

-			if(! empty($value)) {

-				$value=dol_print_date($value,'day');

+			if (!empty($value)) {

+				$value = dol_print_date($value, 'day');

 			} else {

-				$value='';

+				$value = '';

 			}

 		}

 		elseif ($type == 'datetime')

 		{

-			if(! empty($value)) {

-				$value=dol_print_date($value,'dayhour');

+			if (!empty($value)) {

+				$value = dol_print_date($value, 'dayhour');

 			} else {

-				$value='';

+				$value = '';

 			}

 		}

 		elseif ($type == 'double')

 		{

 			if (!empty($value)) {

-				$value=price($value);

+				$value = price($value);

 			}

 		}

 		elseif ($type == 'boolean')

 		{

-			$checked='';

+			$checked = '';

 			if (!empty($value)) {

-				$checked=' checked ';

+				$checked = ' checked ';

 			}

-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';

+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';

 		}

 		elseif ($type == 'mail')

 		{

-			$value=dol_print_email($value,0,0,0,64,1,1);

+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);

 		}

 		elseif ($type == 'url')

 		{

-			$value=dol_print_url($value,'_blank',32,1);

+			$value = dol_print_url($value, '_blank', 32, 1);

 		}

 		elseif ($type == 'phone')

 		{

-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

 		}

 		elseif ($type == 'price')

 		{

@@ -6033,40 +6033,40 @@ 
         }

 		elseif ($type == 'select')

 		{

-			$value=$param['options'][$value];

+			$value = $param['options'][$value];

 		}

 		elseif ($type == 'sellist')

 		{

-			$param_list=array_keys($param['options']);

+			$param_list = array_keys($param['options']);

 			$InfoFieldList = explode(":", $param_list[0]);

 

-			$selectkey="rowid";

-			$keyList='rowid';

+			$selectkey = "rowid";

+			$keyList = 'rowid';

 

-			if (count($InfoFieldList)>=3)

+			if (count($InfoFieldList) >= 3)

 			{

 				$selectkey = $InfoFieldList[2];

-				$keyList=$InfoFieldList[2].' as rowid';

+				$keyList = $InfoFieldList[2].' as rowid';

 			}

 

-			$fields_label = explode('|',$InfoFieldList[1]);

-			if(is_array($fields_label)) {

-				$keyList .=', ';

+			$fields_label = explode('|', $InfoFieldList[1]);

+			if (is_array($fields_label)) {

+				$keyList .= ', ';

 				$keyList .= implode(', ', $fields_label);

 			}

 

 			$sql = 'SELECT '.$keyList;

-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];

-			if (strpos($InfoFieldList[4], 'extra')!==false)

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+			if (strpos($InfoFieldList[4], 'extra') !== false)

 			{

-				$sql.= ' as main';

+				$sql .= ' as main';

 			}

-			if ($selectkey=='rowid' && empty($value)) {

-				$sql.= " WHERE ".$selectkey."=0";

-			} elseif ($selectkey=='rowid') {

-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);

-			}else {

-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

+			if ($selectkey == 'rowid' && empty($value)) {

+				$sql .= " WHERE ".$selectkey."=0";

+			} elseif ($selectkey == 'rowid') {

+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);

+			} else {

+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			}

 

 			//$sql.= ' AND entity = '.Globals::$conf->entity;

@@ -6075,38 +6075,38 @@ 
 			$resql = $this->db->query($sql);

 			if ($resql)

 			{

-				$value='';	// value was used, so now we reste it to use it to build final output

+				$value = ''; // value was used, so now we reste it to use it to build final output

 

 				$obj = $this->db->fetch_object($resql);

 

 				// Several field into label (eq table:code|libelle:rowid)

-				$fields_label = explode('|',$InfoFieldList[1]);

+				$fields_label = explode('|', $InfoFieldList[1]);

 

-				if(is_array($fields_label) && count($fields_label)>1)

+				if (is_array($fields_label) && count($fields_label) > 1)

 				{

 					foreach ($fields_label as $field_toshow)

 					{

-						$translabel='';

+						$translabel = '';

 						if (!empty($obj->$field_toshow)) {

-							$translabel=$langs->trans($obj->$field_toshow);

+							$translabel = $langs->trans($obj->$field_toshow);

 						}

-						if ($translabel!=$field_toshow) {

-							$value.=dol_trunc($translabel,18).' ';

-						}else {

-							$value.=$obj->$field_toshow.' ';

+						if ($translabel != $field_toshow) {

+							$value .= dol_trunc($translabel, 18).' ';

+						} else {

+							$value .= $obj->$field_toshow.' ';

 						}

 					}

 				}

 				else

 				{

-					$translabel='';

+					$translabel = '';

 					if (!empty($obj->{$InfoFieldList[1]})) {

-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});

+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});

 					}

-					if ($translabel!=$obj->{$InfoFieldList[1]}) {

-						$value=dol_trunc($translabel,18);

-					}else {

-						$value=$obj->{$InfoFieldList[1]};

+					if ($translabel != $obj->{$InfoFieldList[1]}) {

+						$value = dol_trunc($translabel, 18);

+					} else {

+						$value = $obj->{$InfoFieldList[1]};

 					}

 				}

 			}

@@ -6114,18 +6114,18 @@ 
 		}

 		elseif ($type == 'radio')

 		{

-			$value=$param['options'][$value];

+			$value = $param['options'][$value];

 		}

 		elseif ($type == 'checkbox')

 		{

-			$value_arr=explode(',',$value);

-			$value='';

-			if (is_array($value_arr) && count($value_arr)>0)

+			$value_arr = explode(',', $value);

+			$value = '';

+			if (is_array($value_arr) && count($value_arr) > 0)

 			{

 				foreach ($value_arr as $keyval=>$valueval) {

-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

 				}

-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

 			}

 		}

 		elseif ($type == 'chkbxlst')

@@ -6140,7 +6140,7 @@ 
 

 			if (count($InfoFieldList) >= 3) {

 				$selectkey = $InfoFieldList[2];

-				$keyList = $InfoFieldList[2] . ' as rowid';

+				$keyList = $InfoFieldList[2].' as rowid';

 			}

 

 			$fields_label = explode('|', $InfoFieldList[1]);

@@ -6149,75 +6149,75 @@ 
 				$keyList .= implode(', ', $fields_label);

 			}

 

-			$sql = 'SELECT ' . $keyList;

-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];

+			$sql = 'SELECT '.$keyList;

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

 			if (strpos($InfoFieldList[4], 'extra') !== false) {

 				$sql .= ' as main';

 			}

 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

 			// $sql.= ' AND entity = '.Globals::$conf->entity;

 

-            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);

+            dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);

 			$resql = $this->db->query($sql);

 			if ($resql) {

 				$value = ''; // value was used, so now we reste it to use it to build final output

-				$toprint=array();

-				while ( $obj = $this->db->fetch_object($resql) ) {

+				$toprint = array();

+				while ($obj = $this->db->fetch_object($resql)) {

 

 					// Several field into label (eq table:code|libelle:rowid)

 					$fields_label = explode('|', $InfoFieldList[1]);

 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

 						if (is_array($fields_label) && count($fields_label) > 1) {

-							foreach ( $fields_label as $field_toshow ) {

+							foreach ($fields_label as $field_toshow) {

 								$translabel = '';

-								if (! empty($obj->$field_toshow)) {

+								if (!empty($obj->$field_toshow)) {

 									$translabel = $langs->trans($obj->$field_toshow);

 								}

 								if ($translabel != $field_toshow) {

-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

 								} else {

-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

 								}

 							}

 						} else {

 							$translabel = '';

-							if (! empty($obj->{$InfoFieldList[1]})) {

+							if (!empty($obj->{$InfoFieldList[1]})) {

 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

 							}

 							if ($translabel != $obj->{$InfoFieldList[1]}) {

-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

 							} else {

-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

 							}

 						}

 					}

 				}

-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

 			} else {

-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);

+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

 			}

 		}

 		elseif ($type == 'link')

 		{

-			$out='';

+			$out = '';

 

 			// only if something to display (perf)

 			if ($value)

 			{

-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'

+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

 

 				$InfoFieldList = explode(":", $param_list[0]);

-				$classname=$InfoFieldList[0];

-				$classpath=$InfoFieldList[1];

-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

-				if (! empty($classpath))

+				$classname = $InfoFieldList[0];

+				$classpath = $InfoFieldList[1];

+				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

+				if (!empty($classpath))

 				{

 					dol_include_once($InfoFieldList[1]);

 					if ($classname && class_exists($classname))

 					{

 						$object = new $classname($this->db);

 						$object->fetch($value);

-						$value=$object->getNomUrl($getnomurlparam);

+						$value = $object->getNomUrl($getnomurlparam);

 					}

 				}

 				else

@@ -6226,15 +6226,15 @@ 
 					return 'Error bad setup of extrafield';

 				}

 			}

-			else $value='';

+			else $value = '';

 		}

 		elseif ($type == 'text' || $type == 'html')

 		{

-			$value=dol_htmlentitiesbr($value);

+			$value = dol_htmlentitiesbr($value);

 		}

 		elseif ($type == 'password')

 		{

-			$value=preg_replace('/./i','*',$value);

+			$value = preg_replace('/./i', '*', $value);

 		}

 		elseif ($type == 'array')

 		{

@@ -6242,7 +6242,7 @@ 
 		}

 

 		//print $type.'-'.$size;

-		$out=$value;

+		$out = $value;

 

 		return $out;

 	}

@@ -6259,11 +6259,11 @@ 
 	 * @param	string		$onetrtd		All fields in same tr td

 	 * @return 	string

 	 */

-	function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0)

+	function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)

 	{

 		global $db, $conf, $langs, $action, $form;

 

-		if (! is_object($form)) $form=new Form($db);

+		if (!is_object($form)) $form = new Form($db);

 

 		$out = '';

 

@@ -6274,10 +6274,10 @@ 
 			$out .= "\n";

 

 			$e = 0;

-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

 			{

 				// Show only the key field in params

-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;

+				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;

 

 				$enabled = 1;

 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))

@@ -6291,25 +6291,25 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

 				}

 

-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list

+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list

 				if (empty($perms)) continue;

 

 				// Load language if required

-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

 

-				$colspan='3';

-				if (is_array($params) && count($params)>0) {

-					if (array_key_exists('colspan',$params)) {

-						$colspan=$params['colspan'];

+				$colspan = '3';

+				if (is_array($params) && count($params) > 0) {

+					if (array_key_exists('colspan', $params)) {

+						$colspan = $params['colspan'];

 					}

 				}

 

-				switch($mode) {

+				switch ($mode) {

 					case "view":

-						$value=$this->array_options["options_".$key.$keysuffix];

+						$value = $this->array_options["options_".$key.$keysuffix];

 						break;

 					case "edit":

-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.

+						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.

 						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')

 						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))

 						{

@@ -6320,7 +6320,7 @@ 
 								$value = $getposttemp;

 							}

 						} else {

-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.

+							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.

 						}

 						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);

 						break;

@@ -6332,11 +6332,11 @@ 
 				}

 				else

 				{

-					$csstyle='';

-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

-					if (is_array($params) && count($params)>0) {

-						if (array_key_exists('style',$params)) {

-							$csstyle=$params['style'];

+					$csstyle = '';

+					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

+					if (is_array($params) && count($params) > 0) {

+						if (array_key_exists('style', $params)) {

+							$csstyle = $params['style'];

 						}

 					}

 

@@ -6358,35 +6358,35 @@ 
 					if ($action == 'selectlines') { $colspan++; }

 

 					// Convert date into timestamp format (value in memory must be a timestamp)

-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))

 					{

-						$datenotinstring = $this->array_options['options_' . $key];

-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility

+						$datenotinstring = $this->array_options['options_'.$key];

+						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility

 						{

 							$datenotinstring = $this->db->jdate($datenotinstring);

 						}

-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;

+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;

 					}

 					// Convert float submited string into real php numeric (value in memory must be a php numeric)

-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('price','double')))

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))

 					{

-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];

+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];

 					}

 

 					$labeltoshow = $langs->trans($label);

 

 					$out .= '<td class="titlefield';

-					if (GETPOST('action','none') == 'create') $out.='create';

-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

+					if (GETPOST('action', 'none') == 'create') $out .= 'create';

+					if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

 					$out .= '">';

-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

+					if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);

 					else $out .= $labeltoshow;

 					$out .= '</td>';

 

 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';

+					$out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

 

-					switch($mode) {

+					switch ($mode) {

 						case "view":

 							$out .= $extrafields->showOutputField($key, $value);

 							break;

@@ -6451,7 +6451,7 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') $element = 'facture';

 

 		return $user->rights->{$element};

 	}

@@ -6468,15 +6468,15 @@ 
 	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one)

 	 * @return bool						  True if success, False if error

 	 */

-	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0)

+	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)

 	{

 		foreach ($tables as $table)

 		{

 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;

 

-			if (! $db->query($sql))

+			if (!$db->query($sql))

 			{

-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

+				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

 				//$this->errors = $db->lasterror();

 				return false;

 			}

@@ -6509,7 +6509,7 @@ 
 		else

 		{

 			// Get cost price for margin calculation

-			if (! empty($fk_product))

+			if (!empty($fk_product))

 			{

 				if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'costprice') {

 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

@@ -6580,18 +6580,18 @@ 
 	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)

 	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto

 	 */

-	function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0)

+	function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)

 	{

         // phpcs:enable

-		global $conf,$user,$langs;

+		global $conf, $user, $langs;

 

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

 

-		$sortfield='position_name';

-		$sortorder='asc';

+		$sortfield = 'position_name';

+		$sortorder = 'asc';

 

-		$dir = $sdir . '/';

+		$dir = $sdir.'/';

 		$pdir = '/';

 		if ($modulepart == 'ticket')

 		{

@@ -6606,26 +6606,26 @@ 
 

 		// For backward compatibility

 		if ($modulepart == 'product' && !empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

-			$dir = $sdir . '/'. get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

-			$pdir = '/' . get_exdir($this->id,2,0,0,$this,$modulepart) . $this->id ."/photos/";

+			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

+			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

 		}

 

 		// Defined relative dir to DOL_DATA_ROOT

 		$relativedir = '';

 		if ($dir)

 		{

-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);

-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);

-			$relativedir = preg_replace('/[\\/]$/','',$relativedir);

+			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);

+			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);

+			$relativedir = preg_replace('/[\\/]$/', '', $relativedir);

 		}

 

 		$dirthumb = $dir.'thumbs/';

 		$pdirthumb = $pdir.'thumbs/';

 

-		$return ='<!-- Photo -->'."\n";

-		$nbphoto=0;

+		$return = '<!-- Photo -->'."\n";

+		$nbphoto = 0;

 

-		$filearray=dol_dir_list($dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);

+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);

 

 		/* if (! empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs

           {

@@ -6639,12 +6639,12 @@ 
 		{

 			if ($sortfield && $sortorder)

 			{

-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);

+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);

 			}

 

-			foreach($filearray as $key => $val)

+			foreach ($filearray as $key => $val)

 			{

-				$photo='';

+				$photo = '';

 				$file = $val['name'];

 

 				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory

@@ -6659,36 +6659,36 @@ 
 					if ($size == 1 || $size == 'small') {   // Format vignette

 

 						// Find name of thumb file

-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));

-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';

+						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));

+						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';

 

 						// Get filesize of original file

-						$imgarray=dol_getImageSize($dir.$photo);

+						$imgarray = dol_getImageSize($dir.$photo);

 

 						if ($nbbyrow > 0)

 						{

-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

+							if ($nbphoto == 1) $return .= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';

 

-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';

-							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';

+							if ($nbphoto % $nbbyrow == 1) $return .= '<tr align=center valign=middle border=1>';

+							$return .= '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';

 						}

 						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';

 

-						$return.= "\n";

+						$return .= "\n";

 

-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);

+						$relativefile = preg_replace('/^\//', '', $pdir.$photo);

 						if (empty($nolink))

 						{

-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';

-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

+							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);

+							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';

+							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

 						}

 

 						// Show image (width height=$maxHeight)

 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine

-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;

-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

-						if ($notitle) $alt='';

+						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;

+						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];

+						if ($notitle) $alt = '';

 

 						if ($usesharelink)

 						{

@@ -6696,81 +6696,81 @@ 
 							{

 								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

 								{

-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';

-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';

+									$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

 								}

 								else {

-									$return.= '<!-- Show original file -->';

-									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+									$return .= '<!-- Show original file -->';

+									$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

 								}

 							}

 							else

 							{

-								$return.= '<!-- Show nophoto file (because file is not shared) -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<!-- Show nophoto file (because file is not shared) -->';

+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

 							}

 						}

 						else

 						{

 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

 							{

-								$return.= '<!-- Show thumb -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<!-- Show thumb -->';

+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

 							}

 							else {

-								$return.= '<!-- Show original file -->';

-								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<!-- Show original file -->';

+								$return .= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

 							}

 						}

 

-						if (empty($nolink)) $return.= '</a>';

-						$return.="\n";

+						if (empty($nolink)) $return .= '</a>';

+						$return .= "\n";

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) $return .= '<br>'.$viewfilename;

 						if ($showaction)

 						{

-							$return.= '<br>';

+							$return .= '<br>';

 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites

 							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))

 							{

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';

 							}

 							// Special cas for product

 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

 							{

 								// Link to resize

-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

 

 								// Link to delete

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

-								$return.= img_delete().'</a>';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

+								$return .= img_delete().'</a>';

 							}

 						}

-						$return.= "\n";

+						$return .= "\n";

 

 						if ($nbbyrow > 0)

 						{

-							$return.= '</td>';

-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';

+							$return .= '</td>';

+							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';

 						}

-						else if ($nbbyrow < 0) $return.='</div>';

+						else if ($nbbyrow < 0) $return .= '</div>';

 					}

 

 					if (empty($size)) {     // Format origine

-						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

+						$return .= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';

 

-						if ($showfilename) $return.= '<br>'.$viewfilename;

+						if ($showfilename) $return .= '<br>'.$viewfilename;

 						if ($showaction)

 						{

 							// Special case for product

 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

 							{

 								// Link to resize

-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

 

 								// Link to delete

-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

-								$return.= img_delete().'</a>';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

+								$return .= img_delete().'</a>';

 							}

 						}

 					}

@@ -6780,18 +6780,18 @@ 
 				}

 			}

 

-			if ($size==1 || $size=='small')

+			if ($size == 1 || $size == 'small')

 			{

 				if ($nbbyrow > 0)

 				{

 					// Ferme tableau

 					while ($nbphoto % $nbbyrow)

 					{

-						$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';

+						$return .= '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';

 						$nbphoto++;

 					}

 

-					if ($nbphoto) $return.= '</table>';

+					if ($nbphoto) $return .= '</table>';

 				}

 			}

 		}

@@ -6810,9 +6810,9 @@ 
 	 */

 	protected function isArray($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='array') return true;

+			if (isset($info['type']) && $info['type'] == 'array') return true;

 			else return false;

 		}

 		else return false;

@@ -6826,9 +6826,9 @@ 
 	 */

 	protected function isNull($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='null') return true;

+			if (isset($info['type']) && $info['type'] == 'null') return true;

 			else return false;

 		}

 		else return false;

@@ -6842,7 +6842,7 @@ 
 	 */

 	public function isDate($info)

 	{

-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;

+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;

 		else return false;

 	}

 

@@ -6854,9 +6854,9 @@ 
 	 */

 	public function isInt($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;

+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;

 			else return false;

 		}

 		else return false;

@@ -6870,7 +6870,7 @@ 
 	 */

 	public function isFloat($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

 			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;

 			else return false;

@@ -6886,9 +6886,9 @@ 
 	 */

 	public function isText($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['type']) && $info['type']=='text') return true;

+			if (isset($info['type']) && $info['type'] == 'text') return true;

 			else return false;

 		}

 		else return false;

@@ -6902,9 +6902,9 @@ 
 	 */

 	protected function isIndex($info)

 	{

-		if(is_array($info))

+		if (is_array($info))

 		{

-			if(isset($info['index']) && $info['index']==true) return true;

+			if (isset($info['index']) && $info['index'] == true) return true;

 			else return false;

 		}

 		else return false;

@@ -6920,13 +6920,13 @@ 
 	{

 		global $conf;

 

-		$queryarray=array();

+		$queryarray = array();

 		foreach ($this->fields as $field=>$info)	// Loop on definition of fields

 		{

 			// Depending on field type ('datetime', ...)

-			if($this->isDate($info))

+			if ($this->isDate($info))

 			{

-				if(empty($this->{$field}))

+				if (empty($this->{$field}))

 				{

 					$queryarray[$field] = null;

 				}

@@ -6935,10 +6935,10 @@ 
 					$queryarray[$field] = $this->db->idate($this->{$field});

 				}

 			}

-			else if($this->isArray($info))

+			else if ($this->isArray($info))

 			{

-				if(! empty($this->{$field})) {

-					if(! is_array($this->{$field})) {

+				if (!empty($this->{$field})) {

+					if (!is_array($this->{$field})) {

 						$this->{$field} = array($this->{$field});

 					}

 					$queryarray[$field] = serialize($this->{$field});

@@ -6946,20 +6946,20 @@ 
 					$queryarray[$field] = null;

 				}

 			}

-			else if($this->isInt($info))

+			else if ($this->isInt($info))

 			{

 				if ($field == 'entity' && is_null($this->{$field}))

                     $queryarray[$field] = Globals::$conf->entity;

                 else

 				{

 					$queryarray[$field] = (int) price2num($this->{$field});

-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.

+					if (empty($queryarray[$field])) $queryarray[$field] = 0; // May be reset to null later if property 'notnull' is -1 for this field.

 				}

 			}

-			else if($this->isFloat($info))

+			else if ($this->isFloat($info))

 			{

 				$queryarray[$field] = (double) price2num($this->{$field});

-				if (empty($queryarray[$field])) $queryarray[$field]=0;

+				if (empty($queryarray[$field])) $queryarray[$field] = 0;

 			}

 			else

 			{

@@ -6967,7 +6967,7 @@ 
 			}

 

 			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;

 		}

 

 		return $queryarray;

@@ -6983,35 +6983,35 @@ 
 	{

 		foreach ($this->fields as $field => $info)

 		{

-			if($this->isDate($info))

+			if ($this->isDate($info))

 			{

-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

 				else $this->{$field} = strtotime($obj->{$field});

 			}

-			elseif($this->isArray($info))

+			elseif ($this->isArray($info))

 			{

-				if(! empty($obj->{$field})) {

+				if (!empty($obj->{$field})) {

 					$this->{$field} = @unserialize($obj->{$field});

 					// Hack for data not in UTF8

-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

+					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

 				} else {

 					$this->{$field} = array();

 				}

 			}

-			elseif($this->isInt($info))

+			elseif ($this->isInt($info))

 			{

 				if ($field == 'rowid') $this->id = (int) $obj->{$field};

 				else $this->{$field} = (int) $obj->{$field};

 			}

-			elseif($this->isFloat($info))

+			elseif ($this->isFloat($info))

 			{

 				$this->{$field} = (double) $obj->{$field};

 			}

-			elseif($this->isNull($info))

+			elseif ($this->isNull($info))

 			{

 				$val = $obj->{$field};

 				// zero is not null

-				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);

+				$this->{$field} = (is_null($val) || (empty($val) && $val !== 0 && $val !== '0') ? null : $val);

 			}

 			else

 			{

@@ -7020,7 +7020,7 @@ 
 		}

 

 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.

-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

+		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

 	}

 

 	/**

@@ -7062,14 +7062,14 @@ 
 

 		$error = 0;

 

-		$now=dol_now();

+		$now = dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);

-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;

-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);

+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;

+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.

 

-		$keys=array();

+		$keys = array();

 		$values = array();

 		foreach ($fieldvalues as $k => $v) {

 			$keys[$k] = $k;

@@ -7078,58 +7078,58 @@ 
 		}

 

 		// Clean and check mandatory

-		foreach($keys as $key)

+		foreach ($keys as $key)

 		{

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';

+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';

 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))

+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($val['default']))

 			{

 				$error++;

-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

+				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);

 			}

 

 			// If field is an implicit foreign key field

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';

-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key] = 'null';

+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';

 		}

 

 		if ($error) return -1;

 

 		$this->db->begin();

 

-		if (! $error)

+		if (!$error)

 		{

 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;

-			$sql.= ' ('.implode( ", ", $keys ).')';

-			$sql.= ' VALUES ('.implode( ", ", $values ).')';

+			$sql .= ' ('.implode(", ", $keys).')';

+			$sql .= ' VALUES ('.implode(", ", $values).')';

 

 			$res = $this->db->query($sql);

-			if ($res===false) {

+			if ($res === false) {

 				$error++;

 				$this->errors[] = $this->db->lasterror();

 			}

 		}

 

-		if (! $error)

+		if (!$error)

 		{

-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);

 		}

 

 		// Create extrafields

-		if (! $error)

+		if (!$error)

 		{

-			$result=$this->insertExtraFields();

+			$result = $this->insertExtraFields();

 			if ($result < 0) $error++;

 		}

 

 		// Triggers

-		if (! $error && ! $notrigger)

+		if (!$error && !$notrigger)

 		{

 			// Call triggers

-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);

+			$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);

 			if ($result < 0) { $error++; }

 			// End call triggers

 		}

@@ -7158,13 +7158,13 @@ 
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;

 

 		$sql = 'SELECT '.$this->getFieldList();

-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

 

-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;

-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare

-		if ($morewhere)   $sql.= $morewhere;

-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record

+		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;

+		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

+		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare

+		if ($morewhere)   $sql .= $morewhere;

+		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record

 

 		$res = $this->db->query($sql);

 		if ($res)

@@ -7201,14 +7201,14 @@ 
 

 		$error = 0;

 

-		$now=dol_now();

+		$now = dol_now();

 

 		$fieldvalues = $this->setSaveQuery();

-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);

-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;

-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);

+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;

+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.

 

-		$keys=array();

+		$keys = array();

 		$values = array();

 		foreach ($fieldvalues as $k => $v) {

 			$keys[$k] = $k;

@@ -7218,10 +7218,10 @@ 
 		}

 

 		// Clean and check mandatory

-		foreach($keys as $key)

+		foreach ($keys as $key)

 		{

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field

-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field

+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field

 

 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

 			/*

@@ -7232,13 +7232,13 @@ 
 			}*/

 		}

 

-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode( ',', $tmp ).' WHERE rowid='.$this->id ;

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;

 

 		$this->db->begin();

-		if (! $error)

+		if (!$error)

 		{

 			$res = $this->db->query($sql);

-			if ($res===false)

+			if ($res === false)

 			{

 				$error++;

 				$this->errors[] = $this->db->lasterror();

@@ -7247,7 +7247,7 @@ 
 

 		// Update extrafield

 		if (!$error && empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0) {

-			$result=$this->insertExtraFields();

+			$result = $this->insertExtraFields();

 			if ($result < 0)

 			{

 				$error++;

@@ -7255,10 +7255,10 @@ 
 		}

 

 		// Triggers

-		if (! $error && ! $notrigger)

+		if (!$error && !$notrigger)

 		{

 			// Call triggers

-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);

+			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);

 			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail

 			// End call triggers

 		}

@@ -7281,68 +7281,68 @@ 
 	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children

 	 * @return 	int             				<=0 if KO, >0 if OK

 	 */

-	public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0)

+	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)

 	{

-		$error=0;

+		$error = 0;

 

 		$this->db->begin();

 

 		if ($forcechilddeletion)

 		{

-			foreach($this->childtables as $table)

+			foreach ($this->childtables as $table)

 			{

 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;

 				$resql = $this->db->query($sql);

-				if (! $resql)

+				if (!$resql)

 				{

-					$this->error=$this->db->lasterror();

-					$this->errors[]=$this->error;

+					$this->error = $this->db->lasterror();

+					$this->errors[] = $this->error;

 					$this->db->rollback();

 					return -1;

 				}

 			}

 		}

-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

+		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

 		{

 			$objectisused = $this->isObjectUsed($this->id);

-			if (! empty($objectisused))

+			if (!empty($objectisused))

 			{

 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);

-				$this->error='ErrorRecordHasChildren';

-				$this->errors[]=$this->error;

+				$this->error = 'ErrorRecordHasChildren';

+				$this->errors[] = $this->error;

 				$this->db->rollback();

 				return 0;

 			}

 		}

 

-		if (! $error) {

-			if (! $notrigger) {

+		if (!$error) {

+			if (!$notrigger) {

 				// Call triggers

-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);

+				$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);

 				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail

 				// End call triggers

 			}

 		}

 

-		if (! $error && ! empty($this->isextrafieldmanaged))

+		if (!$error && !empty($this->isextrafieldmanaged))

 		{

-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";

-			$sql.= " WHERE fk_object=" . $this->id;

+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";

+			$sql .= " WHERE fk_object=".$this->id;

 

 			$resql = $this->db->query($sql);

-			if (! $resql)

+			if (!$resql)

 			{

 				$this->errors[] = $this->db->lasterror();

 				$error++;

 			}

 		}

 

-		if (! $error)

+		if (!$error)

 		{

 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;

 

 			$res = $this->db->query($sql);

-			if($res===false) {

+			if ($res === false) {

 				$error++;

 				$this->errors[] = $this->db->lasterror();

 			}

@@ -7383,9 +7383,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';

 

 		$comment = new Comment($this->db);

-		$result=$comment->fetchAllFor($this->element, $this->id);

-		if ($result<0) {

-			$this->errors=array_merge($this->errors, $comment->errors);

+		$result = $comment->fetchAllFor($this->element, $this->id);

+		if ($result < 0) {

+			$this->errors = array_merge($this->errors, $comment->errors);

 			return -1;

 		} else {

 			$this->comments = $comment->comments;

Base/Conf.php

Spacing +101 added lines, -101 removed lines

@@ -36,8 +36,8 @@ 
     //! Used to store current currency (ISO code like 'USD', 'EUR', ...)

     public $currency;

     //! Used to store current css (from theme)

-    public $theme;        // Contains current theme ("eldy", "auguria", ...)

-    public $css;          // Contains full path of css page ("/theme/eldy/style.css.php", ...)

+    public $theme; // Contains current theme ("eldy", "auguria", ...)

+    public $css; // Contains full path of css page ("/theme/eldy/style.css.php", ...)

     //! Used to store current menu handler

     public $standard_menu;

     public $modules = array(); // List of activated modules

@@ -54,11 +54,11 @@ 
     public $entity = 1;

     //! Used to store list of entities to use for each element

     public $entities = array();

-    public $dol_hide_topmenu;   // Set if we force param dol_hide_topmenu into login url

-    public $dol_hide_leftmenu;   // Set if we force param dol_hide_leftmenu into login url

+    public $dol_hide_topmenu; // Set if we force param dol_hide_topmenu into login url

+    public $dol_hide_leftmenu; // Set if we force param dol_hide_leftmenu into login url

     public $dol_optimize_smallscreen; // Set if we force param dol_optimize_smallscreen into login url or if browser is smartphone

-    public $dol_no_mouse_hover;   // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone

-    public $dol_use_jmobile;   // Set if we force param dol_use_jmobile into login url

+    public $dol_no_mouse_hover; // Set if we force param dol_no_mouse_hover into login url or if browser is smartphone

+    public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url

     public $user;

 

     /**

@@ -79,7 +79,7 @@ 
         $this->multicompany = new \stdClass();

 

         //! Charset for HTML output and for storing data in memory

-        $this->file->character_set_client = 'UTF-8';   // UTF-8, ISO-8859-1

+        $this->file->character_set_client = 'UTF-8'; // UTF-8, ISO-8859-1

         // First level object

         // TODO Remove this part.

         $this->expedition_bon = new \stdClass();

@@ -116,13 +116,13 @@ 
         var_dump($this);

         die('en setValues');

 

-        dol_syslog(get_class($this) . "::setValues");

+        dol_syslog(get_class($this)."::setValues");

 

         //Define all global constants into Conf::$global->key=value

-        $sql = "SELECT " . $db->decrypt('name') . " as name,";

-        $sql .= " " . $db->decrypt('value') . " as value, entity";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "const";

-        $sql .= " WHERE entity IN (0," . $this->entity . ")";

+        $sql = "SELECT ".$db->decrypt('name')." as name,";

+        $sql .= " ".$db->decrypt('value')." as value, entity";

+        $sql .= " FROM ".MAIN_DB_PREFIX."const";

+        $sql .= " WHERE entity IN (0,".$this->entity.")";

         $sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.

 

         $resql = $db->query($sql);

@@ -162,13 +162,13 @@ 
                             if (is_array($arrValue) && !empty($arrValue))

                                 $value = $arrValue;

                             else if (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl')))

-                                $value = '/' . $modulename . '/core/' . $partname . '/';

+                                $value = '/'.$modulename.'/core/'.$partname.'/';

                             else if (in_array($partname, array('models', 'theme')))

-                                $value = '/' . $modulename . '/';

+                                $value = '/'.$modulename.'/';

                             else if (in_array($partname, array('sms')))

-                                $value = '/' . $modulename . '/';

+                                $value = '/'.$modulename.'/';

                             else if ($value == 1)

-                                $value = '/' . $modulename . '/core/modules/' . $partname . '/'; // ex: partname = societe

+                                $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe

                             $this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array

                         }

                         // If this is a module constant (must be at end)

@@ -181,7 +181,7 @@ 
                             if (!isset($this->$modulename) || !is_object($this->$modulename))

                                 $this->$modulename = new \stdClass();

                             $this->$modulename->enabled = true;

-                            $this->modules[] = $modulename;              // Add this module in list of enabled modules

+                            $this->modules[] = $modulename; // Add this module in list of enabled modules

                         }

                     }

                 }

@@ -196,7 +196,7 @@ 
             $filesList = explode(":", Conf::$global->LOCAL_CONSTS_FILES);

             foreach ($filesList as $file) {

                 $file = dol_sanitizeFileName($file);

-                include_once DOL_DOCUMENT_ROOT . "/" . $file . "/" . $file . "_consts.php";

+                include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php";

                 foreach ($file2bddconsts as $key => $value) {

                     Conf::$global->$key = $value;

                 }

@@ -212,7 +212,7 @@ 
             try {

                 date_default_timezone_set(Globals::$conf->$global->MAIN_SERVER_TZ);

             } catch (Exception $e) {

-                dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=" . Conf::$global->MAIN_SERVER_TZ, LOG_ERR);

+                dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".Conf::$global->MAIN_SERVER_TZ, LOG_ERR);

             }

         }

 

@@ -273,18 +273,18 @@ 
         $rootforuser = DOL_DATA_ROOT;

         // If multicompany module is enabled, we redefine the root of data

         if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) {

-            $rootfordata .= '/' . $this->entity;

+            $rootfordata .= '/'.$this->entity;

         }

 

         // Define default dir_output and dir_temp for directories of modules

         foreach ($this->modules as $module) {

             //var_dump($module);

             // For multicompany sharings

-            $this->$module->multidir_output = array($this->entity => $rootfordata . "/" . $module);

-            $this->$module->multidir_temp = array($this->entity => $rootfordata . "/" . $module . "/temp");

+            $this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);

+            $this->$module->multidir_temp = array($this->entity => $rootfordata."/".$module."/temp");

             // For backward compatibility

-            $this->$module->dir_output = $rootfordata . "/" . $module;

-            $this->$module->dir_temp = $rootfordata . "/" . $module . "/temp";

+            $this->$module->dir_output = $rootfordata."/".$module;

+            $this->$module->dir_temp = $rootfordata."/".$module."/temp";

         }

 

         // External modules storage

@@ -294,45 +294,45 @@ 
                     foreach ($dirs as $type => $name) {

                         $subdir = ($type == 'temp' ? '/temp' : '');

                         // For multicompany sharings

-                        $varname = 'multidir_' . $type;

-                        $this->$module->$varname = array($this->entity => $rootfordata . "/" . $name . $subdir);

+                        $varname = 'multidir_'.$type;

+                        $this->$module->$varname = array($this->entity => $rootfordata."/".$name.$subdir);

                         // For backward compatibility

-                        $varname = 'dir_' . $type;

-                        $this->$module->$varname = $rootfordata . "/" . $name . $subdir;

+                        $varname = 'dir_'.$type;

+                        $this->$module->$varname = $rootfordata."/".$name.$subdir;

                     }

                 }

             }

         }

 

         // For mycompany storage

-        $this->mycompany->dir_output = $rootfordata . "/mycompany";

-        $this->mycompany->dir_temp = $rootfordata . "/mycompany/temp";

+        $this->mycompany->dir_output = $rootfordata."/mycompany";

+        $this->mycompany->dir_temp = $rootfordata."/mycompany/temp";

 

         // For admin storage

-        $this->admin->dir_output = $rootfordata . '/admin';

-        $this->admin->dir_temp = $rootfordata . '/admin/temp';

+        $this->admin->dir_output = $rootfordata.'/admin';

+        $this->admin->dir_temp = $rootfordata.'/admin/temp';

 

         // For user storage

-        $this->user->multidir_output = array($this->entity => $rootfordata . "/users");

-        $this->user->multidir_temp = array($this->entity => $rootfordata . "/users/temp");

+        $this->user->multidir_output = array($this->entity => $rootfordata."/users");

+        $this->user->multidir_temp = array($this->entity => $rootfordata."/users/temp");

         // For backward compatibility

-        $this->user->dir_output = $rootforuser . "/users";

-        $this->user->dir_temp = $rootforuser . "/users/temp";

+        $this->user->dir_output = $rootforuser."/users";

+        $this->user->dir_temp = $rootforuser."/users/temp";

 

         // For usergroup storage

-        $this->usergroup->dir_output = $rootforuser . "/usergroups";

-        $this->usergroup->dir_temp = $rootforuser . "/usergroups/temp";

+        $this->usergroup->dir_output = $rootforuser."/usergroups";

+        $this->usergroup->dir_temp = $rootforuser."/usergroups/temp";

 

         // For proposal storage

-        $this->propal->multidir_output = array($this->entity => $rootfordata . "/propale");

-        $this->propal->multidir_temp = array($this->entity => $rootfordata . "/propale/temp");

+        $this->propal->multidir_output = array($this->entity => $rootfordata."/propale");

+        $this->propal->multidir_temp = array($this->entity => $rootfordata."/propale/temp");

         // For backward compatibility

-        $this->propal->dir_output = $rootfordata . "/propale";

-        $this->propal->dir_temp = $rootfordata . "/propale/temp";

+        $this->propal->dir_output = $rootfordata."/propale";

+        $this->propal->dir_temp = $rootfordata."/propale/temp";

 

         // For medias storage

-        $this->medias->multidir_output = array($this->entity => $rootfordata . "/medias");

-        $this->medias->multidir_temp = array($this->entity => $rootfordata . "/medias/temp");

+        $this->medias->multidir_output = array($this->entity => $rootfordata."/medias");

+        $this->medias->multidir_temp = array($this->entity => $rootfordata."/medias/temp");

 

         // Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.

         // Sous module bons d'expedition

@@ -343,72 +343,72 @@ 
         // Module fournisseur

         if (!empty($this->fournisseur)) {

             $this->fournisseur->commande = new \stdClass();

-            $this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata . "/fournisseur/commande");

-            $this->fournisseur->commande->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/commande/temp");

-            $this->fournisseur->commande->dir_output = $rootfordata . "/fournisseur/commande";  // For backward compatibility

-            $this->fournisseur->commande->dir_temp = $rootfordata . "/fournisseur/commande/temp"; // For backward compatibility

+            $this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

+            $this->fournisseur->commande->multidir_temp = array($this->entity => $rootfordata."/fournisseur/commande/temp");

+            $this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility

+            $this->fournisseur->commande->dir_temp = $rootfordata."/fournisseur/commande/temp"; // For backward compatibility

             $this->fournisseur->facture = new \stdClass();

-            $this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata . "/fournisseur/facture");

-            $this->fournisseur->facture->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/facture/temp");

-            $this->fournisseur->facture->dir_output = $rootfordata . "/fournisseur/facture";  // For backward compatibility

-            $this->fournisseur->facture->dir_temp = $rootfordata . "/fournisseur/facture/temp"; // For backward compatibility

+            $this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");

+            $this->fournisseur->facture->multidir_temp = array($this->entity => $rootfordata."/fournisseur/facture/temp");

+            $this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility

+            $this->fournisseur->facture->dir_temp = $rootfordata."/fournisseur/facture/temp"; // For backward compatibility

             $this->supplierproposal = new \stdClass();

-            $this->supplierproposal->multidir_output = array($this->entity => $rootfordata . "/supplier_proposal");

-            $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata . "/supplier_proposal/temp");

-            $this->supplierproposal->dir_output = $rootfordata . "/supplier_proposal";    // For backward compatibility

-            $this->supplierproposal->dir_temp = $rootfordata . "/supplier_proposal/temp";   // For backward compatibility

+            $this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");

+            $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata."/supplier_proposal/temp");

+            $this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility

+            $this->supplierproposal->dir_temp = $rootfordata."/supplier_proposal/temp"; // For backward compatibility

             $this->fournisseur->payment = new \stdClass();

-            $this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata . "/fournisseur/payment");

-            $this->fournisseur->payment->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/payment/temp");

-            $this->fournisseur->payment->dir_output = $rootfordata . "/fournisseur/payment";  // For backward compatibility

-            $this->fournisseur->payment->dir_temp = $rootfordata . "/fournisseur/payment/temp"; // For backward compatibility

+            $this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");

+            $this->fournisseur->payment->multidir_temp = array($this->entity => $rootfordata."/fournisseur/payment/temp");

+            $this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility

+            $this->fournisseur->payment->dir_temp = $rootfordata."/fournisseur/payment/temp"; // For backward compatibility

             // To prepare split of module fournisseur into fournisseur + supplier_order + supplier_invoice

             if (!empty($this->fournisseur->enabled) && empty(Globals::$conf->$global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, we set new properties

                 $this->supplier_order = new \stdClass();

                 $this->supplier_order->enabled = 1;

-                $this->supplier_order->multidir_output = array($this->entity => $rootfordata . "/fournisseur/commande");

-                $this->supplier_order->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/commande/temp");

-                $this->supplier_order->dir_output = $rootfordata . "/fournisseur/commande";   // For backward compatibility

-                $this->supplier_order->dir_temp = $rootfordata . "/fournisseur/commande/temp";  // For backward compatibility

+                $this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

+                $this->supplier_order->multidir_temp = array($this->entity => $rootfordata."/fournisseur/commande/temp");

+                $this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility

+                $this->supplier_order->dir_temp = $rootfordata."/fournisseur/commande/temp"; // For backward compatibility

                 $this->supplier_invoice = new \stdClass();

                 $this->supplier_invoice->enabled = 1;

-                $this->supplier_invoice->multidir_output = array($this->entity => $rootfordata . "/fournisseur/facture");

-                $this->supplier_invoice->multidir_temp = array($this->entity => $rootfordata . "/fournisseur/facture/temp");

-                $this->supplier_invoice->dir_output = $rootfordata . "/fournisseur/facture";  // For backward compatibility

-                $this->supplier_invoice->dir_temp = $rootfordata . "/fournisseur/facture/temp";  // For backward compatibility

+                $this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");

+                $this->supplier_invoice->multidir_temp = array($this->entity => $rootfordata."/fournisseur/facture/temp");

+                $this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility

+                $this->supplier_invoice->dir_temp = $rootfordata."/fournisseur/facture/temp"; // For backward compatibility

                 $this->supplierproposal = new \stdClass();

-                $this->supplierproposal->multidir_output = array($this->entity => $rootfordata . "/supplier_proposal");

-                $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata . "/supplier_proposal/temp");

-                $this->supplierproposal->dir_output = $rootfordata . "/supplier_proposal";   // For backward compatibility

-                $this->supplierproposal->dir_temp = $rootfordata . "/supplier_proposal/temp";  // For backward compatibility

+                $this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");

+                $this->supplierproposal->multidir_temp = array($this->entity => $rootfordata."/supplier_proposal/temp");

+                $this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility

+                $this->supplierproposal->dir_temp = $rootfordata."/supplier_proposal/temp"; // For backward compatibility

             }

         }

 

         // Module product/service

-        $this->product->multidir_output = array($this->entity => $rootfordata . "/produit");

-        $this->product->multidir_temp = array($this->entity => $rootfordata . "/produit/temp");

-        $this->service->multidir_output = array($this->entity => $rootfordata . "/produit");

-        $this->service->multidir_temp = array($this->entity => $rootfordata . "/produit/temp");

+        $this->product->multidir_output = array($this->entity => $rootfordata."/produit");

+        $this->product->multidir_temp = array($this->entity => $rootfordata."/produit/temp");

+        $this->service->multidir_output = array($this->entity => $rootfordata."/produit");

+        $this->service->multidir_temp = array($this->entity => $rootfordata."/produit/temp");

         // For backward compatibility

-        $this->product->dir_output = $rootfordata . "/produit";

-        $this->product->dir_temp = $rootfordata . "/produit/temp";

-        $this->service->dir_output = $rootfordata . "/produit";

-        $this->service->dir_temp = $rootfordata . "/produit/temp";

+        $this->product->dir_output = $rootfordata."/produit";

+        $this->product->dir_temp = $rootfordata."/produit/temp";

+        $this->service->dir_output = $rootfordata."/produit";

+        $this->service->dir_temp = $rootfordata."/produit/temp";

 

         // Module productbatch

-        $this->productbatch->multidir_output = array($this->entity => $rootfordata . "/produitlot");

-        $this->productbatch->multidir_temp = array($this->entity => $rootfordata . "/produitlot/temp");

+        $this->productbatch->multidir_output = array($this->entity => $rootfordata."/produitlot");

+        $this->productbatch->multidir_temp = array($this->entity => $rootfordata."/produitlot/temp");

 

         // Module contrat

-        $this->contrat->multidir_output = array($this->entity => $rootfordata . "/contract");

-        $this->contrat->multidir_temp = array($this->entity => $rootfordata . "/contract/temp");

+        $this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");

+        $this->contrat->multidir_temp = array($this->entity => $rootfordata."/contract/temp");

         // For backward compatibility

-        $this->contrat->dir_output = $rootfordata . "/contract";

-        $this->contrat->dir_temp = $rootfordata . "/contract/temp";

+        $this->contrat->dir_output = $rootfordata."/contract";

+        $this->contrat->dir_temp = $rootfordata."/contract/temp";

 

         // Module bank

-        $this->bank->dir_output = $rootfordata . "/bank";

-        $this->bank->dir_temp = $rootfordata . "/bank/temp";

+        $this->bank->dir_output = $rootfordata."/bank";

+        $this->bank->dir_temp = $rootfordata."/bank/temp";

 

 

         // Set some default values

@@ -431,7 +431,7 @@ 
         if (empty(Globals::$conf->$global->USER_PASSWORD_GENERATED))

             Conf::$global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator

         if (empty(Globals::$conf->$global->MAIN_UMASK))

-            Conf::$global->MAIN_UMASK = '0664';         // Default mask

+            Conf::$global->MAIN_UMASK = '0664'; // Default mask

 

 

 

@@ -472,7 +472,7 @@ 
         $this->currency = Conf::$global->MAIN_MONNAIE;

 

         if (empty(Globals::$conf->$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY))

-            Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure

+            Conf::$global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure

 

 

 

@@ -482,7 +482,7 @@ 
 

 // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)

         if (empty(Globals::$conf->$global->ACCOUNTING_MODE))

-            Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

+            Conf::$global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

 

 

 

@@ -514,7 +514,7 @@ 
             Conf::$global->MAIN_THEME = Conf::$global->MAIN_FORCETHEME;

         $this->theme = Conf::$global->MAIN_THEME;

         //$this->css  = "/theme/".$this->theme."/style.css.php";

-        $this->css = '?controller=theme/' . $this->theme . '&method=style.css';

+        $this->css = '?controller=theme/'.$this->theme.'&method=style.css';

 

         // conf->email_from = email pour envoi par dolibarr des mails automatiques

         $this->email_from = "robot@example.com";

@@ -534,8 +534,8 @@ 
             Conf::$global->MAIN_EMAIL_ADD_TRACK_ID = 1;

 

         // Format for date (used by default when not found or not searched in lang)

-        $this->format_date_short = "%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)

-        $this->format_date_short_java = "dd/MM/yyyy";     // Format of day with Java tags

+        $this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)

+        $this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags

         $this->format_hour_short = "%H:%M";

         $this->format_hour_short_duration = "%H:%M";

         $this->format_date_text_short = "%d %b %Y";

@@ -559,9 +559,9 @@ 
 

         // Default pdf option

         if (!isset(Globals::$conf->$global->MAIN_PDF_DASH_BETWEEN_LINES))

-            Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1;    // use dash between lines

+            Conf::$global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines

         if (!isset(Globals::$conf->$global->PDF_ALLOW_HTML_FOR_FREE_TEXT))

-            Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1;  // allow html content into free footer text

+            Conf::$global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text

 

 

 

@@ -578,7 +578,7 @@ 
 

         // By default, we propagate contacts

         if (!isset(Globals::$conf->$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))

-            Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

+            Conf::$global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

 

 

 

@@ -603,7 +603,7 @@ 
             Conf::$global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.

         if (!empty($this->modules_parts['moduleforexternal'])) {  // Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list

             foreach ($this->modules_parts['moduleforexternal'] as $key => $value)

-                Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= "," . $key;

+                Conf::$global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;

         }

 

         // Enable select2

@@ -696,7 +696,7 @@ 
 

         // Save inconsistent option

         if (empty(Globals::$conf->$global->AGENDA_USE_EVENT_TYPE) && (!isset(Globals::$conf->$global->AGENDA_DEFAULT_FILTER_TYPE) || Conf::$global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {

-            Conf::$global->AGENDA_DEFAULT_FILTER_TYPE = '0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

+            Conf::$global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

         }

 

         if (!isset(Globals::$conf->$global->MAIN_EXTRAFIELDS_IN_ONE_TD))

@@ -738,7 +738,7 @@ 
                 $dir = dol_buildpath($reldir, 0);

                 $newdir = dol_osencode($dir);

                 if (is_dir($newdir)) {

-                    $file = $newdir . $handler . '.php';

+                    $file = $newdir.$handler.'.php';

                     if (file_exists($file)) {

                         $handler_files[] = $file;

                     }

@@ -746,7 +746,7 @@ 
             }

 

             if (empty($handler_files)) {

-                throw new Exception('Missing log handler file ' . $handler . '.php');

+                throw new Exception('Missing log handler file '.$handler.'.php');

             }

 

             require_once $handler_files[0];

Base/Categorie.php

Spacing +292 added lines, -292 removed lines

@@ -108,7 +108,7 @@ 
 		'member'   => 'member',

 		'contact'  => 'socpeople',

 		'user'     => 'user',

-        'account'  => 'account',		// old for bank_account

+        'account'  => 'account', // old for bank_account

         'bank_account' => 'account',

         'project'  => 'project',

 	);

@@ -125,7 +125,7 @@ 
 		'member'   => 'member',

 		'contact'  => 'contact',

 		'user'     => 'user',

-        'account'  => 'account',		// old for bank_account

+        'account'  => 'account', // old for bank_account

         'bank_account'=> 'account',

         'project'  => 'project',

 	);

@@ -142,7 +142,7 @@ 
 		'member'   => 'Adherent',

 		'contact'  => 'Contact',

 		'user'     => 'User',

-		'account'  => 'Account',		// old for bank account

+		'account'  => 'Account', // old for bank account

 		'bank_account'  => 'Account',

         'project'  => 'Project',

 	);

@@ -166,12 +166,12 @@ 
 	/**

 	 * @var string ID to identify managed object

 	 */

-	public $element='category';

+	public $element = 'category';

 

 	/**

 	 * @var string Name of table without prefix where object is stored

 	 */

-	public $table_element='categorie';

+	public $table_element = 'categorie';

 

 	/**

      * @var int ID

@@ -238,24 +238,24 @@ 
 	 *  @param		string	$type	Type of category ('product', '...') or (0, 1, ...)

 	 * 	@return		int				<0 if KO, >0 if OK

 	 */

-	function fetch($id, $label='', $type=null)

+	function fetch($id, $label = '', $type = null)

 	{

 		global $conf;

 

 		// Check parameters

 		if (empty($id) && empty($label)) return -1;

-		if (! is_numeric($type)) $type=$this->MAP_ID[$type];

+		if (!is_numeric($type)) $type = $this->MAP_ID[$type];

 

 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type";

-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";

+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";

 		if ($id > 0)

 		{

-			$sql.= " WHERE rowid = ".$id;

+			$sql .= " WHERE rowid = ".$id;

 		}

 		else

 		{

-			$sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";

-			if (! is_null($type)) $sql.= " AND type = ".$this->db->escape($type);

+			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";

+			if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);

 		}

 

 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

@@ -266,16 +266,16 @@ 
 			{

 				$res = $this->db->fetch_array($resql);

 

-				$this->id			= $res['rowid'];

+				$this->id = $res['rowid'];

 				//$this->ref			= $res['rowid'];

 				$this->fk_parent	= $res['fk_parent'];

 				$this->label		= $res['label'];

-				$this->description	= $res['description'];

+				$this->description = $res['description'];

 				$this->color    	= $res['color'];

 				$this->socid		= $res['fk_soc'];

-				$this->visible		= $res['visible'];

+				$this->visible = $res['visible'];

 				$this->type			= $res['type'];

-				$this->entity		= $res['entity'];

+				$this->entity = $res['entity'];

 

 				// Retreive all extrafield

 				// fetch optionals attributes and labels

@@ -312,14 +312,14 @@ 
 	 */

 	function create($user)

 	{

-		global $conf,$langs,$hookmanager;

+		global $conf, $langs, $hookmanager;

 		$langs->load('categories');

 

-		$type=$this->type;

+		$type = $this->type;

 

-		if (! is_numeric($type)) $type=$this->MAP_ID[$type];

+		if (!is_numeric($type)) $type = $this->MAP_ID[$type];

 

-		$error=0;

+		$error = 0;

 

 		dol_syslog(get_class($this).'::create', LOG_DEBUG);

 

@@ -328,13 +328,13 @@ 
 		$this->description = trim($this->description);

 		$this->color = trim($this->color);

 		$this->import_key = trim($this->import_key);

-		if (empty($this->visible)) $this->visible=0;

+		if (empty($this->visible)) $this->visible = 0;

 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);

 

 		if ($this->already_exists())

 		{

-			$this->error=$langs->trans("ImpossibleAddCat", $this->label);

-			$this->error.=" : ".$langs->trans("CategoryExistsAtSameLevel");

+			$this->error = $langs->trans("ImpossibleAddCat", $this->label);

+			$this->error .= " : ".$langs->trans("CategoryExistsAtSameLevel");

 			dol_syslog($this->error, LOG_WARNING);

 			return -4;

 		}

@@ -342,30 +342,30 @@ 
 		$this->db->begin();

 

 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (";

-		$sql.= "fk_parent,";

-		$sql.= " label,";

-		$sql.= " description,";

-		$sql.= " color,";

+		$sql .= "fk_parent,";

+		$sql .= " label,";

+		$sql .= " description,";

+		$sql .= " color,";

 		if (!empty(Globals::$conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {

-			$sql.= "fk_soc,";

+			$sql .= "fk_soc,";

 		}

-		$sql.= " visible,";

-		$sql.= " type,";

-		$sql.= " import_key,";

-		$sql.= " entity";

-		$sql.= ") VALUES (";

-		$sql.= $this->db->escape($this->fk_parent).",";

-		$sql.= "'".$this->db->escape($this->label)."',";

-		$sql.= "'".$this->db->escape($this->description)."',";

-		$sql.= "'".$this->db->escape($this->color)."',";

+		$sql .= " visible,";

+		$sql .= " type,";

+		$sql .= " import_key,";

+		$sql .= " entity";

+		$sql .= ") VALUES (";

+		$sql .= $this->db->escape($this->fk_parent).",";

+		$sql .= "'".$this->db->escape($this->label)."',";

+		$sql .= "'".$this->db->escape($this->description)."',";

+		$sql .= "'".$this->db->escape($this->color)."',";

 		if (!empty(Globals::$conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {

-			$sql.= ($this->socid != -1 ? $this->socid : 'null').",";

+			$sql .= ($this->socid != -1 ? $this->socid : 'null').",";

 		}

-		$sql.= "'".$this->db->escape($this->visible)."',";

-		$sql.= $this->db->escape($type).",";

-		$sql.= (! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":'null').",";

+		$sql .= "'".$this->db->escape($this->visible)."',";

+		$sql .= $this->db->escape($type).",";

+		$sql .= (!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : 'null').",";

 		$sql .= $this->db->escape(Globals::$conf->entity);

-        $sql.= ")";

+        $sql .= ")";

 

 		$res = $this->db->query($sql);

 		if ($res)

@@ -376,26 +376,26 @@ 
 			{

 				$this->id = $id;

 

-				$action='create';

+				$action = 'create';

 

 				// Actions on extra fields

 				if (empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used{

-					$result=$this->insertExtraFields();

+					$result = $this->insertExtraFields();

 					if ($result < 0)

 					{

 						$error++;

 					}

 				}

 

-				if (! $error)

+				if (!$error)

 				{

 	                // Call trigger

-    	            $result=$this->call_trigger('CATEGORY_CREATE',$user);

+    	            $result = $this->call_trigger('CATEGORY_CREATE', $user);

         	        if ($result < 0) { $error++; }

             	    // End call triggers

 				}

 

-                if ( ! $error )

+                if (!$error)

                 {

     				$this->db->commit();

     				return $id;

@@ -414,7 +414,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			$this->db->rollback();

 			return -1;

 		}

@@ -430,29 +430,29 @@ 
 	 */

 	function update(User $user)

 	{

-		global $conf, $langs,$hookmanager;

+		global $conf, $langs, $hookmanager;

 

-		$error=0;

+		$error = 0;

 

 		// Clean parameters

-		$this->label=trim($this->label);

-		$this->description=trim($this->description);

+		$this->label = trim($this->label);

+		$this->description = trim($this->description);

 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);

 		$this->visible = ($this->visible != "" ? intval($this->visible) : 0);

 

 		if ($this->already_exists())

 		{

-			$this->error=$langs->trans("ImpossibleUpdateCat");

-			$this->error.=" : ".$langs->trans("CategoryExistsAtSameLevel");

+			$this->error = $langs->trans("ImpossibleUpdateCat");

+			$this->error .= " : ".$langs->trans("CategoryExistsAtSameLevel");

 			return -1;

 		}

 

 		$this->db->begin();

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX."categorie";

-		$sql.= " SET label = '".$this->db->escape($this->label)."',";

-		$sql.= " description = '".$this->db->escape($this->description)."',";

-		$sql.= " color = '".$this->db->escape($this->color)."'";

+		$sql .= " SET label = '".$this->db->escape($this->label)."',";

+		$sql .= " description = '".$this->db->escape($this->description)."',";

+		$sql .= " color = '".$this->db->escape($this->color)."'";

 		if (!empty(Globals::$conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {

 			$sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');

 		}

@@ -463,21 +463,21 @@ 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

-			$action='update';

+			$action = 'update';

 

 			// Actions on extra fields

 			if (empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used{

-				$result=$this->insertExtraFields();

+				$result = $this->insertExtraFields();

 				if ($result < 0)

 				{

 					$error++;

 				}

 			}

 

-			if (! $error)

+			if (!$error)

 			{

 	            // Call trigger

-    	        $result=$this->call_trigger('CATEGORY_MODIFY',$user);

+    	        $result = $this->call_trigger('CATEGORY_MODIFY', $user);

         	    if ($result < 0) { $error++; $this->db->rollback(); return -1; }

             	// End call triggers

 			}

@@ -501,11 +501,11 @@ 
      *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers

 	 *	@return	int                 <0 KO >0 OK

 	 */

-	function delete($user, $notrigger=0)

+	function delete($user, $notrigger = 0)

 	{

-		global $conf,$langs;

+		global $conf, $langs;

 

-		$error=0;

+		$error = 0;

 

         // Clean parameters

 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);

@@ -514,24 +514,24 @@ 
 

 		$this->db->begin();

 

-		if (! $error && ! $notrigger)

+		if (!$error && !$notrigger)

 		{

 		    // Call trigger

-		    $result=$this->call_trigger('CATEGORY_DELETE',$user);

+		    $result = $this->call_trigger('CATEGORY_DELETE', $user);

 		    if ($result < 0) $error++;

 		    // End call triggers

 		}

 

 		/* FIX #1317 : Check for child category and move up 1 level*/

-		if (! $error)

+		if (!$error)

 		{

 			$sql = "UPDATE ".MAIN_DB_PREFIX."categorie";

-			$sql.= " SET fk_parent = ".$this->fk_parent;

-			$sql.= " WHERE fk_parent = ".$this->id;

+			$sql .= " SET fk_parent = ".$this->fk_parent;

+			$sql .= " WHERE fk_parent = ".$this->id;

 

 			if (!$this->db->query($sql))

 			{

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 				$error++;

 			}

 		}

@@ -548,7 +548,7 @@ 
             'categorie' => 'rowid',

         );

         foreach ($arraydelete as $key => $value) {

-            $sql  = "DELETE FROM " . MAIN_DB_PREFIX . $key;

+            $sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;

             $sql .= " WHERE ".$value." = ".$this->id;

             if (!$this->db->query($sql)) {

                 $this->errors[] = $this->db->lasterror();

@@ -559,7 +559,7 @@ 
 

 		// Removed extrafields

 		if (!$error && empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) { // For avoid conflicts if trigger used{

-			$result=$this->deleteExtraFields();

+			$result = $this->deleteExtraFields();

 			if ($result < 0)

 			{

 				$error++;

@@ -567,7 +567,7 @@ 
 			}

 		}

 

-		if (! $error)

+		if (!$error)

 		{

 			$this->db->commit();

 			return 1;

@@ -590,27 +590,27 @@ 
 	function add_type($obj, $type)

 	{

         // phpcs:enable

-		global $user,$langs,$conf;

+		global $user, $langs, $conf;

 

-		$error=0;

+		$error = 0;

 

 		if ($this->id == -1) return -2;

 

         $this->db->begin();

 

-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type];

-		$sql .= " (fk_categorie, fk_" . $this->MAP_CAT_FK[$type] . ")";

-		$sql .= " VALUES (" . $this->id . ", " . $obj->id . ")";

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type];

+		$sql .= " (fk_categorie, fk_".$this->MAP_CAT_FK[$type].")";

+		$sql .= " VALUES (".$this->id.", ".$obj->id.")";

 

 		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

 			if (!empty(Globals::$conf->global->CATEGORIE_RECURSIV_ADD)) {

 				$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';

-				$sql.= " WHERE rowid = ".$this->id;

+				$sql .= " WHERE rowid = ".$this->id;

 

 				dol_syslog(get_class($this)."::add_type", LOG_DEBUG);

-				$resql=$this->db->query($sql);

+				$resql = $this->db->query($sql);

 				if ($resql)

 				{

 					if ($this->db->num_rows($resql) > 0)

@@ -635,7 +635,7 @@ 
 				else

 				{

 					$error++;

-					$this->error=$this->db->lasterror();

+					$this->error = $this->db->lasterror();

 				}

 

 				if ($error)

@@ -648,12 +648,12 @@ 
 

 

             // Call trigger

-			$this->context=array('linkto'=>$obj);	// Save object we want to link category to into category instance to provide information to trigger

-			$result=$this->call_trigger('CATEGORY_LINK',$user);

+			$this->context = array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger

+			$result = $this->call_trigger('CATEGORY_LINK', $user);

             if ($result < 0) { $error++; }

             // End call triggers

 

-			if (! $error)

+			if (!$error)

 			{

 			    $this->db->commit();

 			    return 1;

@@ -669,12 +669,12 @@ 
 		    $this->db->rollback();

 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 			{

-				$this->error=$this->db->lasterrno();

+				$this->error = $this->db->lasterrno();

 				return -3;

 			}

 			else

 			{

-				$this->error=$this->db->lasterror();

+				$this->error = $this->db->lasterror();

 			}

 			return -1;

 		}

@@ -689,38 +689,38 @@ 
 	 *

 	 * @return  int          1 if OK, -1 if KO

 	 */

-	function del_type($obj,$type)

+	function del_type($obj, $type)

 	{

         // phpcs:enable

-		global $user,$langs,$conf;

+		global $user, $langs, $conf;

 

-		$error=0;

+		$error = 0;

 

 		// For backward compatibility

 		if ($type == 'societe') {

 			$type = 'customer';

-			dol_syslog( get_class( $this ) . "::del_type(): type 'societe' is deprecated, please use 'customer' instead", LOG_WARNING);

+			dol_syslog(get_class($this)."::del_type(): type 'societe' is deprecated, please use 'customer' instead", LOG_WARNING);

 		} elseif ($type == 'fournisseur') {

 			$type = 'supplier';

-			dol_syslog( get_class( $this ) . "::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);

+			dol_syslog(get_class($this)."::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);

 		}

 

         $this->db->begin();

 

-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type];

-		$sql .= " WHERE fk_categorie = " . $this->id;

-		$sql .= " AND   fk_" . $this->MAP_CAT_FK[$type] . "  = " . $obj->id;

+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type];

+		$sql .= " WHERE fk_categorie = ".$this->id;

+		$sql .= " AND   fk_".$this->MAP_CAT_FK[$type]."  = ".$obj->id;

 

 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);

 		if ($this->db->query($sql))

 		{

             // Call trigger

-			$this->context=array('unlinkoff'=>$obj);	// Save object we want to link category to into category instance to provide information to trigger

-			$result=$this->call_trigger('CATEGORY_UNLINK',$user);

+			$this->context = array('unlinkoff'=>$obj); // Save object we want to link category to into category instance to provide information to trigger

+			$result = $this->call_trigger('CATEGORY_UNLINK', $user);

             if ($result < 0) { $error++; }

             // End call triggers

 

-			if (! $error)

+			if (!$error)

 			{

 			    $this->db->commit();

 			    return 1;

@@ -734,7 +734,7 @@ 
 		else

 		{

 		    $this->db->rollback();

-			$this->error=$this->db->lasterror();

+			$this->error = $this->db->lasterror();

 			return -1;

 		}

 	}

@@ -747,18 +747,18 @@ 
 	 * @return  array|int              -1 if KO, array of instance of object if OK

 	 * @see containsObject

 	 */

-	function getObjectsInCateg($type, $onlyids=0)

+	function getObjectsInCateg($type, $onlyids = 0)

 	{

 		$objs = array();

 

-		$obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );

+		$obj = new $this->MAP_OBJ_CLASS[$type]($this->db);

 

-		$sql = "SELECT c.fk_" . $this->MAP_CAT_FK[$type];

-		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as c";

-		$sql .= ", " . MAIN_DB_PREFIX . $this->MAP_OBJ_TABLE[$type] . " as o";

-		$sql .= " WHERE o.entity IN (" . getEntity( $obj->element).")";

-		$sql.= " AND c.fk_categorie = ".$this->id;

-		$sql .= " AND c.fk_" . $this->MAP_CAT_FK[$type] . " = o.rowid";

+		$sql = "SELECT c.fk_".$this->MAP_CAT_FK[$type];

+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]." as c";

+		$sql .= ", ".MAIN_DB_PREFIX.$this->MAP_OBJ_TABLE[$type]." as o";

+		$sql .= " WHERE o.entity IN (".getEntity($obj->element).")";

+		$sql .= " AND c.fk_categorie = ".$this->id;

+		$sql .= " AND c.fk_".$this->MAP_CAT_FK[$type]." = o.rowid";

 

 		dol_syslog(get_class($this)."::getObjectsInCateg", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -768,12 +768,12 @@ 
 			{

 			    if ($onlyids)

 			    {

-			        $objs[] = $rec['fk_' . $this->MAP_CAT_FK[$type]];

+			        $objs[] = $rec['fk_'.$this->MAP_CAT_FK[$type]];

 			    }

 			    else

 			    {

-				    $obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );

-				    $obj->fetch( $rec['fk_' . $this->MAP_CAT_FK[$type]]);

+				    $obj = new $this->MAP_OBJ_CLASS[$type]($this->db);

+				    $obj->fetch($rec['fk_'.$this->MAP_CAT_FK[$type]]);

 				    $objs[] = $obj;

 			    }

 			}

@@ -781,7 +781,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error().' sql='.$sql;

+			$this->error = $this->db->error().' sql='.$sql;

 			return -1;

 		}

 	}

@@ -796,14 +796,14 @@ 
 	 */

 	function containsObject($type, $object_id)

 	{

-		$sql = "SELECT COUNT(*) as nb FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type];

-		$sql .= " WHERE fk_categorie = " . $this->id . " AND fk_" . $this->MAP_CAT_FK[$type] . " = " . $object_id;

+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type];

+		$sql .= " WHERE fk_categorie = ".$this->id." AND fk_".$this->MAP_CAT_FK[$type]." = ".$object_id;

 		dol_syslog(get_class($this)."::containsObject", LOG_DEBUG);

 		$resql = $this->db->query($sql);

 		if ($resql) {

 			return $this->db->fetch_object($resql)->nb;

 		} else {

-			$this->error=$this->db->error().' sql='.$sql;

+			$this->error = $this->db->error().' sql='.$sql;

 			return -1;

 		}

 	}

@@ -819,7 +819,7 @@ 
 	 * @param	int		$page		Page number

 	 * @return	array|int			Array of categories, 0 if no cat, -1 on error

 	 */

-	function getListForItem($id, $type='customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)

+	function getListForItem($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)

 	{

 		global $conf;

 

@@ -827,26 +827,26 @@ 
 

 		$sub_type = $type;

 		$subcol_name = "fk_".$type;

-		if ($type=="customer") {

-			$sub_type="societe";

-			$subcol_name="fk_soc";

+		if ($type == "customer") {

+			$sub_type = "societe";

+			$subcol_name = "fk_soc";

 		}

-		if ($type=="supplier") {

-			$sub_type="fournisseur";

-			$subcol_name="fk_soc";

+		if ($type == "supplier") {

+			$sub_type = "fournisseur";

+			$subcol_name = "fk_soc";

 		}

-		if ($type=="contact") {

-			$subcol_name="fk_socpeople";

+		if ($type == "contact") {

+			$subcol_name = "fk_socpeople";

 		}

 		$sql = "SELECT s.rowid";

-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as s";

-		$sql.= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";

-		$sql.= ' WHERE s.entity IN ('.getEntity('category').')';

-		$sql.= ' AND s.type='.array_search($type, self::$MAP_ID_TO_CODE);

-		$sql.= ' AND s.rowid = sub.fk_categorie';

-		$sql.= ' AND sub.'.$subcol_name.' = '.$id;

+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as s";

+		$sql .= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";

+		$sql .= ' WHERE s.entity IN ('.getEntity('category').')';

+		$sql .= ' AND s.type='.array_search($type, self::$MAP_ID_TO_CODE);

+		$sql .= ' AND s.rowid = sub.fk_categorie';

+		$sql .= ' AND sub.'.$subcol_name.' = '.$id;

 

-		$sql.= $this->db->order($sortfield, $sortorder);

+		$sql .= $this->db->order($sortfield, $sortorder);

 

 		$offset = 0;

 		$nbtotalofrecords = '';

@@ -860,12 +860,12 @@ 
 			}

 		}

 

-		$sql.= $this->db->plimit($limit + 1, $offset);

+		$sql .= $this->db->plimit($limit + 1, $offset);

 

 		$result = $this->db->query($sql);

 		if ($result)

 		{

-			$i=0;

+			$i = 0;

 			$num = $this->db->num_rows($result);

 			$min = min($num, ($limit <= 0 ? $num : $limit));

 			while ($i < $min)

@@ -874,20 +874,20 @@ 
 				$category_static = new Categorie($this->db);

 				if ($category_static->fetch($obj->rowid))

 				{

-					$categories[$i]['id'] 				= $category_static->id;

+					$categories[$i]['id'] = $category_static->id;

 					$categories[$i]['fk_parent']		= $category_static->fk_parent;

 					$categories[$i]['label']			= $category_static->label;

-					$categories[$i]['description']		= $category_static->description;

+					$categories[$i]['description'] = $category_static->description;

 					$categories[$i]['color']    		= $category_static->color;

 					$categories[$i]['socid']			= $category_static->socid;

-					$categories[$i]['visible']			= $category_static->visible;

-					$categories[$i]['type']			= $category_static->type;

-					$categories[$i]['entity']			= $category_static->entity;

-					$categories[$i]['array_options']	= $category_static->array_options;

+					$categories[$i]['visible'] = $category_static->visible;

+					$categories[$i]['type'] = $category_static->type;

+					$categories[$i]['entity'] = $category_static->entity;

+					$categories[$i]['array_options'] = $category_static->array_options;

 

 					// multilangs

 					if (!empty(Globals::$conf->global->MAIN_MULTILANGS)) {

-                        $categories[$i]['multilangs']	= $category_static->multilangs;

+                        $categories[$i]['multilangs'] = $category_static->multilangs;

 					}

 				}

 				$i++;

@@ -897,7 +897,7 @@ 
 			$this->error = $this->db->lasterror();

 			return -1;

 		}

-		if ( ! count($categories)) {

+		if (!count($categories)) {

 			return 0;

 		}

 

@@ -914,12 +914,12 @@ 
 	{

         // phpcs:enable

 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";

-		$sql.= " WHERE fk_parent = ".$this->id;

+		$sql .= " WHERE fk_parent = ".$this->id;

 

-		$res  = $this->db->query($sql);

+		$res = $this->db->query($sql);

 		if ($res)

 		{

-			$cats = array ();

+			$cats = array();

 			while ($rec = $this->db->fetch_array($res))

 			{

 				$cat = new Categorie($this->db);

@@ -946,21 +946,21 @@ 
         // phpcs:enable

 		global $conf;

 

-		$this->motherof=array();

+		$this->motherof = array();

 

 		// Load array[child]=parent

 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";

-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";

-		$sql.= " WHERE fk_parent != 0";

-		$sql.= " AND entity IN (".getEntity('category').")";

+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";

+		$sql .= " WHERE fk_parent != 0";

+		$sql .= " AND entity IN (".getEntity('category').")";

 

 		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			while ($obj= $this->db->fetch_object($resql))

+			while ($obj = $this->db->fetch_object($resql))

 			{

-				$this->motherof[$obj->id_son]=$obj->id_parent;

+				$this->motherof[$obj->id_son] = $obj->id_parent;

 			}

 			return 1;

 		}

@@ -987,12 +987,12 @@ 
 	 *

 	 * @return  array|int               Array of categories. this->cats and this->motherof are set, -1 on error

 	 */

-	function get_full_arbo($type, $markafterid=0)

+	function get_full_arbo($type, $markafterid = 0)

 	{

         // phpcs:enable

 	    global $conf, $langs;

 

-		if (! is_numeric($type)) $type = $this->MAP_ID[$type];

+		if (!is_numeric($type)) $type = $this->MAP_ID[$type];

 

 		$this->cats = array();

 

@@ -1001,27 +1001,27 @@ 
 		$current_lang = $langs->getDefaultLang();

 

 		// Init $this->cats array

-		$sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.color, c.fk_parent, c.visible";	// Distinct reduce pb with old tables with duplicates

+		$sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates

 		if (!empty(Globals::$conf->global->MAIN_MULTILANGS))

             $sql .= ", t.label as label_trans, t.description as description_trans";

-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie as c";

+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";

 		if (!empty(Globals::$conf->global->MAIN_MULTILANGS))

-            $sql .= " LEFT  JOIN " . MAIN_DB_PREFIX . "categorie_lang as t ON t.fk_category=c.rowid AND t.lang='" . $current_lang . "'";

-        $sql .= " WHERE c.entity IN (" . getEntity( 'category') . ")";

-		$sql .= " AND c.type = " . $type;

+            $sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$current_lang."'";

+        $sql .= " WHERE c.entity IN (".getEntity('category').")";

+		$sql .= " AND c.type = ".$type;

 

 		dol_syslog(get_class($this)."::get_full_arbo get category list", LOG_DEBUG);

 		$resql = $this->db->query($sql);

 		if ($resql)

 		{

-			$i=0;

+			$i = 0;

 			while ($obj = $this->db->fetch_object($resql))

 			{

 				$this->cats[$obj->rowid]['rowid'] = $obj->rowid;

 				$this->cats[$obj->rowid]['id'] = $obj->rowid;

 				$this->cats[$obj->rowid]['fk_parent'] = $obj->fk_parent;

-				$this->cats[$obj->rowid]['label'] = ! empty($obj->label_trans) ? $obj->label_trans : $obj->label;

-				$this->cats[$obj->rowid]['description'] = ! empty($obj->description_trans) ? $obj->description_trans : $obj->description;

+				$this->cats[$obj->rowid]['label'] = !empty($obj->label_trans) ? $obj->label_trans : $obj->label;

+				$this->cats[$obj->rowid]['description'] = !empty($obj->description_trans) ? $obj->description_trans : $obj->description;

 				$this->cats[$obj->rowid]['color'] = $obj->color;

 				$this->cats[$obj->rowid]['visible'] = $obj->visible;

 				$i++;

@@ -1035,24 +1035,24 @@ 
 

 		// We add the fullpath property to each elements of first level (no parent exists)

 		dol_syslog(get_class($this)."::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);

-		foreach($this->cats as $key => $val)

+		foreach ($this->cats as $key => $val)

 		{

 			//print 'key='.$key.'<br>'."\n";

-			$this->build_path_from_id_categ($key,0);	// Process a branch from the root category key (this category has no parent)

+			$this->build_path_from_id_categ($key, 0); // Process a branch from the root category key (this category has no parent)

 		}

 

         // Exclude leaf including $markafterid from tree

         if ($markafterid)

         {

             //print "Look to discard category ".$markafterid."\n";

-            $keyfilter1='^'.$markafterid.'$';

-            $keyfilter2='_'.$markafterid.'$';

-            $keyfilter3='^'.$markafterid.'_';

-            $keyfilter4='_'.$markafterid.'_';

-            foreach($this->cats as $key => $val)

+            $keyfilter1 = '^'.$markafterid.'$';

+            $keyfilter2 = '_'.$markafterid.'$';

+            $keyfilter3 = '^'.$markafterid.'_';

+            $keyfilter4 = '_'.$markafterid.'_';

+            foreach ($this->cats as $key => $val)

             {

-                if (preg_match('/'.$keyfilter1.'/',$val['fullpath']) || preg_match('/'.$keyfilter2.'/',$val['fullpath'])

-                || preg_match('/'.$keyfilter3.'/',$val['fullpath']) || preg_match('/'.$keyfilter4.'/',$val['fullpath']))

+                if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])

+                || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']))

                 {

                     unset($this->cats[$key]);

                 }

@@ -1060,7 +1060,7 @@ 
         }

 

 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);

-		$this->cats=dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);

+		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);

 

 		//$this->debug_cats();

 

@@ -1075,12 +1075,12 @@ 
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop

 	 *	@return		void

 	 */

-	function build_path_from_id_categ($id_categ,$protection=1000)

+	function build_path_from_id_categ($id_categ, $protection = 1000)

 	{

         // phpcs:enable

 		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);

 

-		if (! empty($this->cats[$id_categ]['fullpath']))

+		if (!empty($this->cats[$id_categ]['fullpath']))

 		{

 			// Already defined

 			dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);

@@ -1093,20 +1093,20 @@ 
 		// Define fullpath and fulllabel

 		$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;

 		$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];

-		$i=0; $cursor_categ=$id_categ;

+		$i = 0; $cursor_categ = $id_categ;

 		//print 'Work for id_categ='.$id_categ.'<br>'."\n";

-		while ((empty($protection) || $i < $protection) && ! empty($this->motherof[$cursor_categ]))

+		while ((empty($protection) || $i < $protection) && !empty($this->motherof[$cursor_categ]))

 		{

 			//print '&nbsp; cursor_categ='.$cursor_categ.' i='.$i.' '.$this->motherof[$cursor_categ].'<br>'."\n";

 			$this->cats[$id_categ]['fullpath'] = '_'.$this->motherof[$cursor_categ].$this->cats[$id_categ]['fullpath'];

 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->motherof[$cursor_categ]]['label'].' >> '.$this->cats[$id_categ]['fulllabel'];

 			//print '&nbsp; Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].' '.$this->cats[$id_categ]['fulllabel'].'<br>'."\n";

-			$i++; $cursor_categ=$this->motherof[$cursor_categ];

+			$i++; $cursor_categ = $this->motherof[$cursor_categ];

 		}

 		//print 'Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].'<br>'."\n";

 

 		// We count number of _ to have level

-		$this->cats[$id_categ]['level']=dol_strlen(preg_replace('/[^_]/i','',$this->cats[$id_categ]['fullpath']));

+		$this->cats[$id_categ]['level'] = dol_strlen(preg_replace('/[^_]/i', '', $this->cats[$id_categ]['fullpath']));

 

 		return;

 	}

@@ -1121,7 +1121,7 @@ 
 	{

         // phpcs:enable

 		// Display $this->cats

-		foreach($this->cats as $key => $val)

+		foreach ($this->cats as $key => $val)

 		{

 			print 'id: '.$this->cats[$key]['id'];

 			print ' label: '.$this->cats[$key]['label'];

@@ -1142,22 +1142,22 @@ 
 	 *	@param	boolean		$parent		Just parent categories if true

 	 *	@return	array|int				Table of Object Category, -1 on error

 	 */

-	function get_all_categories($type=null, $parent=false)

+	function get_all_categories($type = null, $parent = false)

 	{

         // phpcs:enable

-		if (! is_numeric($type)) $type = $this->MAP_ID[$type];

+		if (!is_numeric($type)) $type = $this->MAP_ID[$type];

 

 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";

-		$sql.= " WHERE entity IN (".getEntity('category').")";

-		if (! is_null($type))

-			$sql.= " AND type = ".$type;

+		$sql .= " WHERE entity IN (".getEntity('category').")";

+		if (!is_null($type))

+			$sql .= " AND type = ".$type;

 		if ($parent)

-			$sql.= " AND fk_parent = 0";

+			$sql .= " AND fk_parent = 0";

 

 		$res = $this->db->query($sql);

 		if ($res)

 		{

-			$cats = array ();

+			$cats = array();

 			while ($rec = $this->db->fetch_array($res))

 			{

 				$cat = new Categorie($this->db);

@@ -1182,19 +1182,19 @@ 
 	function already_exists()

 	{

         // phpcs:enable

-		$type=$this->type;

+		$type = $this->type;

 

-		if (! is_numeric($type)) $type=$this->MAP_ID[$type];

+		if (!is_numeric($type)) $type = $this->MAP_ID[$type];

 

 		/* We have to select any rowid from llx_categorie which category's mother and label

 		 * are equals to those of the calling category

 		 */

 		$sql = "SELECT c.rowid";

-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c ";

-		$sql.= " WHERE c.entity IN (".getEntity('category').")";

-		$sql.= " AND c.type = ".$type;

-		$sql.= " AND c.fk_parent = ".$this->fk_parent;

-		$sql.= " AND c.label = '".$this->db->escape($this->label)."'";

+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c ";

+		$sql .= " WHERE c.entity IN (".getEntity('category').")";

+		$sql .= " AND c.type = ".$type;

+		$sql .= " AND c.fk_parent = ".$this->fk_parent;

+		$sql .= " AND c.label = '".$this->db->escape($this->label)."'";

 

 		dol_syslog(get_class($this)."::already_exists", LOG_DEBUG);

 		$resql = $this->db->query($sql);

@@ -1208,7 +1208,7 @@ 
 				 * So if the result have the same id, update is not for label, and if result have an other one,

 				 * update may be for label.

 				 */

-				if($obj[0] > 0 && $obj[0] != $this->id)

+				if ($obj[0] > 0 && $obj[0] != $this->id)

 				{

 					dol_syslog(get_class($this)."::already_exists category with name=".$this->label." and parent ".$this->fk_parent." exists: rowid=".$obj[0]." current_id=".$this->id, LOG_DEBUG);

 					return 1;

@@ -1219,7 +1219,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error();

+			$this->error = $this->db->error();

 			return -1;

 		}

 	}

@@ -1231,7 +1231,7 @@ 
 	 *	@param		int		$type		Type of category (0, 1, ...)

 	 *	@return		array

 	 */

-	function get_main_categories($type=null)

+	function get_main_categories($type = null)

 	{

         // phpcs:enable

 		return $this->get_all_categories($type, true);

@@ -1247,7 +1247,7 @@ 
 	 * @param   int     $nocolor     0

 	 * @return	array

 	 */

-	function print_all_ways($sep = " &gt;&gt; ", $url='', $nocolor=0)

+	function print_all_ways($sep = " &gt;&gt; ", $url = '', $nocolor = 0)

 	{

         // phpcs:enable

 		$ways = array();

@@ -1257,29 +1257,29 @@ 
 		{

 			$w = array();

 			$i = 0;

-			$forced_color='';

+			$forced_color = '';

 			foreach ($way as $cat)

 			{

 			    $i++;

 

 			    if (empty($nocolor))

 			    {

-    			    $forced_color='toreplace';

+    			    $forced_color = 'toreplace';

     			    if ($i == count($way))

     			    {

     			        // Check contrast with background and correct text color

-    			        $forced_color='categtextwhite';

+    			        $forced_color = 'categtextwhite';

     			        if ($cat->color)

     			        {

-    			            if (colorIsLight($cat->color)) $forced_color='categtextblack';

+    			            if (colorIsLight($cat->color)) $forced_color = 'categtextblack';

     			        }

     			    }

 			    }

 

 				if ($url == '')

 				{

-			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color .'">';

-			        $linkend='</a>';

+			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';

+			        $linkend = '</a>';

 				    $w[] = $link.$cat->label.$linkend;

 				}

 				else

@@ -1308,9 +1308,9 @@ 
 		$parents = array();

 

 		$sql = "SELECT fk_parent FROM ".MAIN_DB_PREFIX."categorie";

-		$sql.= " WHERE rowid = ".$this->id;

+		$sql .= " WHERE rowid = ".$this->id;

 

-		$res  = $this->db->query($sql);

+		$res = $this->db->query($sql);

 

 		if ($res)

 		{

@@ -1344,17 +1344,17 @@ 
         // phpcs:enable

 		$ways = array();

 

-		$parents=$this->get_meres();

-		if (! empty($parents))

+		$parents = $this->get_meres();

+		if (!empty($parents))

 		{

 			foreach ($parents as $parent)

 			{

-				$allways=$parent->get_all_ways();

+				$allways = $parent->get_all_ways();

 				foreach ($allways as $way)

 				{

-					$w		= $way;

-					$w[]	= $this;

-					$ways[]	= $w;

+					$w = $way;

+					$w[] = $this;

+					$ways[] = $w;

 				}

 			}

 		}

@@ -1375,7 +1375,7 @@ 
 	 *                      	    labels, 'id'= Get array of category IDs

 	 * @return  array|int           Array of category objects or < 0 if KO

 	 */

-	function containing($id, $type, $mode='object')

+	function containing($id, $type, $mode = 'object')

 	{

 		$cats = array();

 

@@ -1385,9 +1385,9 @@ 
 		{

 		    // Load bank groups

 		    $sql = "SELECT c.label, c.rowid";

-		    $sql.= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";

-		    $sql.= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";

-		    $sql.= " ORDER BY c.label";

+		    $sql .= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";

+		    $sql .= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";

+		    $sql .= " ORDER BY c.label";

 

 		    $res = $this->db->query($sql);

 		    if ($res)

@@ -1415,9 +1415,9 @@ 
         else

         {

     		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";

-    		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as ct, " . MAIN_DB_PREFIX . "categorie as c";

-    		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . (int) $id . " AND c.type = " . $this->MAP_ID[$type];

-    		$sql .= " AND c.entity IN (" . getEntity( 'category') . ")";

+    		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]." as ct, ".MAIN_DB_PREFIX."categorie as c";

+    		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".$this->MAP_CAT_FK[$type]." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];

+    		$sql .= " AND c.entity IN (".getEntity('category').")";

 

     		$res = $this->db->query($sql);

     		if ($res)

@@ -1461,7 +1461,7 @@ 
 	{

 		// Deprecation warning

 		if (is_numeric($type)) {

-			dol_syslog(__METHOD__ . ': using numeric types is deprecated.', LOG_WARNING);

+			dol_syslog(__METHOD__.': using numeric types is deprecated.', LOG_WARNING);

 		}

 

 		$cats = array();

@@ -1469,28 +1469,28 @@ 
 		// For backward compatibility

 		if (is_numeric($type)) {

 			// We want to reverse lookup

-			$map_type = array_flip( $this->MAP_ID );

+			$map_type = array_flip($this->MAP_ID);

 			$type = $map_type[$type];

-			dol_syslog( get_class( $this ) . "::rechercher(): numeric types are deprecated, please use string instead",

-				LOG_WARNING );

+			dol_syslog(get_class($this)."::rechercher(): numeric types are deprecated, please use string instead",

+				LOG_WARNING);

 		}

 

 		// Generation requete recherche

-		$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";

-		$sql .= " WHERE type = " . $this->MAP_ID[$type];

-		$sql .= " AND entity IN (" . getEntity( 'category') . ")";

+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";

+		$sql .= " WHERE type = ".$this->MAP_ID[$type];

+		$sql .= " AND entity IN (".getEntity('category').")";

 		if ($nom)

 		{

-			if (! $exact)

+			if (!$exact)

 				$nom = '%'.str_replace('*', '%', $nom).'%';

-			if (! $case)

-				$sql.= " AND label LIKE '".$this->db->escape($nom)."'";

+			if (!$case)

+				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";

 			else

-				$sql.= " AND label LIKE BINARY '".$this->db->escape($nom)."'";

+				$sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";

 		}

 		if ($id)

 		{

-			$sql.=" AND rowid = '".$id."'";

+			$sql .= " AND rowid = '".$id."'";

 		}

 

 		$res  = $this->db->query($sql);

@@ -1507,7 +1507,7 @@ 
 		}

 		else

 		{

-			$this->error=$this->db->error().' sql='.$sql;

+			$this->error = $this->db->error().' sql='.$sql;

 			return -1;

 		}

 	}

@@ -1521,29 +1521,29 @@ 
 	 * 	@param		int		$maxlength		Max length of text

 	 *	@return		string					Chaine avec URL

 	 */

-	function getNomUrl($withpicto=0,$option='',$maxlength=0)

+	function getNomUrl($withpicto = 0, $option = '', $maxlength = 0)

 	{

 		global $langs;

 

-		$result='';

-		$label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label);

+		$result = '';

+		$label = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label);

 

 		// Check contrast with background and correct text color

-		$forced_color='categtextwhite';

+		$forced_color = 'categtextwhite';

 		if ($this->color)

 		{

-			if (colorIsLight($this->color)) $forced_color='categtextblack';

+			if (colorIsLight($this->color)) $forced_color = 'categtextblack';

 		}

 

-		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'&backtopage='.urlencode($_SERVER['PHP_SELF']).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color .'">';

-		$linkend='</a>';

+		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'&backtopage='.urlencode($_SERVER['PHP_SELF']).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';

+		$linkend = '</a>';

 

-		$picto='category';

+		$picto = 'category';

 

 

-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);

-		if ($withpicto && $withpicto != 2) $result.=' ';

-		if ($withpicto != 2) $result.=$link.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$linkend;

+        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);

+		if ($withpicto && $withpicto != 2) $result .= ' ';

+		if ($withpicto != 2) $result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;

 		return $result;

 	}

 

@@ -1561,10 +1561,10 @@ 
         // phpcs:enable

 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 

-		$dir = $sdir .'/'. get_exdir($this->id,2,0,0,$this,'category') . $this->id ."/";

+		$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, 'category').$this->id."/";

 		$dir .= "photos/";

 

-		if (! file_exists($dir))

+		if (!file_exists($dir))

 		{

 			dol_mkdir($dir);

 		}

@@ -1573,9 +1573,9 @@ 
 			if (is_array($file['name']) && count($file['name']) > 0)

 			{

 				$nbfile = count($file['name']);

-				for ($i = 0; $i <= $nbfile; $i ++) {

+				for ($i = 0; $i <= $nbfile; $i++) {

 

-					$originImage = $dir . $file['name'][$i];

+					$originImage = $dir.$file['name'][$i];

 

 					// Cree fichier en taille origine

 					dol_move_uploaded_file($file['tmp_name'][$i], $originImage, 1, 0, 0);

@@ -1586,7 +1586,7 @@ 
 					}

 				}

 			} else {

-				$originImage = $dir . $file['name'];

+				$originImage = $dir.$file['name'];

 

 				// Cree fichier en taille origine

 				dol_move_uploaded_file($file['tmp_name'], $originImage, 1, 0, 0);

@@ -1607,42 +1607,42 @@ 
 	 *    @param      int		$nbmax      Nombre maximum de photos (0=pas de max)

 	 *    @return     array       			Tableau de photos

 	 */

-	function liste_photos($dir,$nbmax=0)

+	function liste_photos($dir, $nbmax = 0)

 	{

         // phpcs:enable

-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 

-		$nbphoto=0;

-		$tabobj=array();

+		$nbphoto = 0;

+		$tabobj = array();

 

 		$dirthumb = $dir.'thumbs/';

 

 		if (file_exists($dir))

 		{

-			$handle=opendir($dir);

+			$handle = opendir($dir);

             if (is_resource($handle))

             {

     			while (($file = readdir($handle)) !== false)

     			{

-    				if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i',$dir.$file))

+    				if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))

     				{

     					$nbphoto++;

     					$photo = $file;

 

     					// On determine nom du fichier vignette

-    					$photo_vignette='';

-    					if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i',$photo,$regs))

+    					$photo_vignette = '';

+    					if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))

     					{

-    						$photo_vignette=preg_replace('/'.$regs[0].'/i','',$photo).'_small'.$regs[0];

+    						$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];

     					}

 

     					// Objet

-    					$obj=array();

-    					$obj['photo']=$photo;

-    					if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']='thumbs/' . $photo_vignette;

-    					else $obj['photo_vignette']="";

+    					$obj = array();

+    					$obj['photo'] = $photo;

+    					if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;

+    					else $obj['photo_vignette'] = "";

 

-    					$tabobj[$nbphoto-1]=$obj;

+    					$tabobj[$nbphoto - 1] = $obj;

 

     					// On continue ou on arrete de boucler

     					if ($nbmax && $nbphoto >= $nbmax) break;

@@ -1670,18 +1670,18 @@ 
 

 	    $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine

 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette

-		$filename = preg_replace('/'.preg_quote($dir,'/').'/i','',$file); // Nom du fichier

+		$filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier

 

 		// On efface l'image d'origine

-		dol_delete_file($file,1);

+		dol_delete_file($file, 1);

 

 		// Si elle existe, on efface la vignette

-		if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i',$filename,$regs))

+		if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $filename, $regs))

 		{

-			$photo_vignette=preg_replace('/'.$regs[0].'/i','',$filename).'_small'.$regs[0];

+			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];

 			if (file_exists($dirthumb.$photo_vignette))

 			{

-				dol_delete_file($dirthumb.$photo_vignette,1);

+				dol_delete_file($dirthumb.$photo_vignette, 1);

 			}

 		}

 	}

@@ -1718,9 +1718,9 @@ 
 	    foreach ($langs_available as $key => $value)

 	    {

 	        $sql = "SELECT rowid";

-	        $sql.= " FROM ".MAIN_DB_PREFIX."categorie_lang";

-	        $sql.= " WHERE fk_category=".$this->id;

-	        $sql.= " AND lang='".$key."'";

+	        $sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";

+	        $sql .= " WHERE fk_category=".$this->id;

+	        $sql .= " AND lang='".$key."'";

 

 	        $result = $this->db->query($sql);

 

@@ -1729,20 +1729,20 @@ 
 	            if ($this->db->num_rows($result)) // si aucune ligne dans la base

 	            {

 	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";

-	                $sql2.= " SET label='".$this->db->escape($this->label)."',";

-	                $sql2.= " description='".$this->db->escape($this->description)."'";

-	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";

+	                $sql2 .= " SET label='".$this->db->escape($this->label)."',";

+	                $sql2 .= " description='".$this->db->escape($this->description)."'";

+	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";

 	            }

 	            else

 	            {

 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";

-	                $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label);

-	                $sql2.= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";

+	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);

+	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";

 	            }

 	            dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);

-	            if (! $this->db->query($sql2))

+	            if (!$this->db->query($sql2))

 	            {

-	                $this->error=$this->db->lasterror();

+	                $this->error = $this->db->lasterror();

 	                return -1;

 	            }

 	        }

@@ -1751,30 +1751,30 @@ 
 	            if ($this->db->num_rows($result)) // si aucune ligne dans la base

 	            {

 	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";

-	                $sql2.= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";

-	                $sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";

-	                $sql2.= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";

+	                $sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";

+	                $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";

+	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";

 	            }

 	            else

 	            {

 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";

-	                $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->multilangs["$key"]["label"]);

-	                $sql2.= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";

+	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);

+	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";

 	            }

 

 	            // on ne sauvegarde pas des champs vides

-	            if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )

+	            if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])

 	                dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);

-	            if (! $this->db->query($sql2))

+	            if (!$this->db->query($sql2))

 	            {

-	                $this->error=$this->db->lasterror();

+	                $this->error = $this->db->lasterror();

 	                return -1;

 	            }

 	        }

 	    }

 

 			// Call trigger

-			$result = $this->call_trigger('CATEGORY_SET_MULTILANGS',$user);

+			$result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);

 			if ($result < 0) {

 				$this->error = $this->db->lasterror();

 				return -1;

@@ -1796,28 +1796,28 @@ 
 	    $current_lang = $langs->getDefaultLang();

 

 	    $sql = "SELECT lang, label, description";

-	    $sql.= " FROM ".MAIN_DB_PREFIX."categorie_lang";

-	    $sql.= " WHERE fk_category=".$this->id;

+	    $sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";

+	    $sql .= " WHERE fk_category=".$this->id;

 

 	    $result = $this->db->query($sql);

 	    if ($result)

 	    {

-	        while ( $obj = $this->db->fetch_object($result) )

+	        while ($obj = $this->db->fetch_object($result))

 	        {

 	            //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';

-	            if( $obj->lang == $current_lang ) // si on a les traduct. dans la langue courante on les charge en infos principales.

+	            if ($obj->lang == $current_lang) // si on a les traduct. dans la langue courante on les charge en infos principales.

 	            {

-	                $this->label		= $obj->label;

-	                $this->description	= $obj->description;

+	                $this->label = $obj->label;

+	                $this->description = $obj->description;

 	            }

-	            $this->multilangs["$obj->lang"]["label"]		= $obj->label;

-	            $this->multilangs["$obj->lang"]["description"]	= $obj->description;

+	            $this->multilangs["$obj->lang"]["label"] = $obj->label;

+	            $this->multilangs["$obj->lang"]["description"] = $obj->description;

 	        }

 	        return 1;

 	    }

 	    else

 	    {

-	        $this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;

+	        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;

 	        return -1;

 	    }

 	}

@@ -1846,10 +1846,10 @@ 
         dol_syslog(get_class($this)."::initAsSpecimen");

 

         // Initialise parametres

-        $this->id=0;

-        $this->fk_parent=0;

+        $this->id = 0;

+        $this->fk_parent = 0;

         $this->label = 'SPECIMEN';

-        $this->specimen=1;

+        $this->specimen = 1;

         $this->description = 'This is a description';

         $this->socid = 1;

         $this->type = self::TYPE_PRODUCT;

Base/FormOther.php

Spacing +218 added lines, -218 removed lines

@@ -68,14 +68,14 @@ 
      *    @param    int		$fk_user          Utilisateur créant le modèle

      *    @return	void

      */

-    function select_export_model($selected='', $htmlname='exportmodelid', $type='', $useempty=0, $fk_user=null)

+    function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)

     {

         // phpcs:enable

         $sql = "SELECT rowid, label";

-        $sql.= " FROM ".MAIN_DB_PREFIX."export_model";

-        $sql.= " WHERE type = '".$type."'";

-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

-        $sql.= " ORDER BY rowid";

+        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";

+        $sql .= " WHERE type = '".$type."'";

+		if (!empty($fk_user)) $sql .= " AND fk_user=".$fk_user;

+        $sql .= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

         {

@@ -120,13 +120,13 @@ 
      *    @param    int		$useempty          Affiche valeur vide dans liste

      *    @return	void

      */

-    function select_import_model($selected='', $htmlname='importmodelid', $type='', $useempty=0)

+    function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0)

     {

         // phpcs:enable

         $sql = "SELECT rowid, label";

-        $sql.= " FROM ".MAIN_DB_PREFIX."import_model";

-        $sql.= " WHERE type = '".$type."'";

-        $sql.= " ORDER BY rowid";

+        $sql .= " FROM ".MAIN_DB_PREFIX."import_model";

+        $sql .= " WHERE type = '".$type."'";

+        $sql .= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

         {

@@ -169,19 +169,19 @@ 
      *    @param    string	$htmlname	Name of combo list

      *    @return	integer

      */

-    function select_ecotaxes($selected='', $htmlname='ecotaxe_id')

+    function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')

     {

         // phpcs:enable

         global $langs;

 

         $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";

-        $sql.= " c.label as country";

-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";

-        $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

-        $sql.= " ORDER BY country, e.organization ASC, e.code ASC";

+        $sql .= " c.label as country";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

+        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";

 

     	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);

-        $resql=$this->db->query($sql);

+        $resql = $this->db->query($sql);

         if ($resql)

         {

             print '<select class="flat" name="'.$htmlname.'">';

@@ -228,26 +228,26 @@ 
      *    @param    string	$country_code   Country Code

      *    @return	string					HTML select list

      */

-    function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='')

+    function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')

     {

         // phpcs:enable

     	global $langs;

 

-    	$out='';

+    	$out = '';

 

     	$sql = "SELECT r.taux, r.revenuestamp_type";

-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

-    	$sql.= " AND c.code = '".$country_code."'";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

+    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

+    	$sql .= " AND c.code = '".$country_code."'";

 

     	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);

-    	$resql=$this->db->query($sql);

+    	$resql = $this->db->query($sql);

     	if ($resql)

     	{

-    		$out.='<select class="flat" name="'.$htmlname.'">';

+    		$out .= '<select class="flat" name="'.$htmlname.'">';

     		$num = $this->db->num_rows($resql);

     		$i = 0;

-    		$out.='<option value="0">&nbsp;</option>'."\n";

+    		$out .= '<option value="0">&nbsp;</option>'."\n";

     		if ($num)

     		{

     			while ($i < $num)

@@ -255,19 +255,19 @@ 
     				$obj = $this->db->fetch_object($resql);

     				if (($selected && $selected == $obj->taux) || $num == 1)

     				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

     				}

     				else

     				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

     				}

-    				$out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

-    				$out.='</option>';

+    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

+    				$out .= '</option>';

     				$i++;

     			}

     		}

-    		$out.='</select>';

+    		$out .= '</select>';

     		return $out;

     	}

     	else

@@ -291,27 +291,27 @@ 
      *    @param    int     $showempty      Add also an empty line

      *    @return   string					HTML select string

      */

-    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100,$showempty=0)

+    function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)

     {

         // phpcs:enable

-        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';

-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';

+        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';

+        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';

 

-        for ($i = $start ; $i <= $end ; $i += $increment)

+        for ($i = $start; $i <= $end; $i += $increment)

         {

             if ($selected != '' && (int) $selected == $i)

             {

-                $return.= '<option value="'.$i.'" selected>';

+                $return .= '<option value="'.$i.'" selected>';

             }

             else

             {

-                $return.= '<option value="'.$i.'">';

+                $return .= '<option value="'.$i.'">';

             }

-            $return.= $i.' % ';

-            $return.= '</option>';

+            $return .= $i.' % ';

+            $return .= '</option>';

         }

 

-        $return.= '</select>';

+        $return .= '</select>';

 

         return $return;

     }

@@ -329,7 +329,7 @@ 
      * @return  string		        	Html combo list code

      * @see	select_all_categories

      */

-    function select_categories($type, $selected=0, $htmlname='search_categ', $nocateg=0, $showempty=1, $morecss='')

+    function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')

     {

         // phpcs:enable

         global $conf, $langs;

@@ -338,7 +338,7 @@ 
         // For backward compatibility

         if (is_numeric($type))

         {

-            dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

+            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

         }

 

         // Load list of "categories"

@@ -348,30 +348,30 @@ 
         $moreforfilter = '';

         // Enhance with select2

         if (Globals::$conf->use_javascript_ajax) {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $comboenhancement = ajax_combobox('select_categ_'.$htmlname);

-            $moreforfilter.=$comboenhancement;

+            $moreforfilter .= $comboenhancement;

         }

 

         // Print a select with each of them

-        $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing

+        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

+        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing

 

         if (is_array($tab_categs))

         {

             foreach ($tab_categs as $categ)

             {

-                $moreforfilter.='<option value="'.$categ['id'].'"';

-                if ($categ['id'] == $selected) $moreforfilter.=' selected';

-                $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';

+                $moreforfilter .= '<option value="'.$categ['id'].'"';

+                if ($categ['id'] == $selected) $moreforfilter .= ' selected';

+                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';

             }

         }

         if ($nocateg)

         {

         	$langs->load("categories");

-        	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';

+        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';

         }

-        $moreforfilter.='</select>';

+        $moreforfilter .= '</select>';

 

         return $moreforfilter;

     }

@@ -389,43 +389,43 @@ 
      *  @param	string	$morecss		More CSS

      *  @return string					Html combo list code

      */

-    function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0,$showempty=1,$morecss='')

+    function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '')

     {

         // phpcs:enable

-        global $conf,$langs;

+        global $conf, $langs;

         $langs->load('users');

 

         $out = '';

         // Enhance with select2

         if (Globals::$conf->use_javascript_ajax) {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

 

             $comboenhancement = ajax_combobox($htmlname);

             if ($comboenhancement)

             {

-            	$out.=$comboenhancement;

+            	$out .= $comboenhancement;

             }

         }

         // Select each sales and print them in a select input

-        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $out.='<option value="0">&nbsp;</option>';

+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

+        if ($showempty) $out .= '<option value="0">&nbsp;</option>';

 

         // Get list of users allowed to be viewed

         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";

-        $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";

-        $sql_usr .= " WHERE u.entity IN (0," . Globals::$conf->entity . ")";

-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;

-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;

+        $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";

+        $sql_usr .= " WHERE u.entity IN (0,".Globals::$conf->entity.")";

+        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;

+        if (!empty($user->societe_id)) $sql_usr .= " AND u.fk_soc = ".$user->societe_id;

         // Add existing sales representatives of thirdparty of external user

         if (empty($user->rights->user->user->lire) && $user->societe_id)

         {

-            $sql_usr.=" UNION ";

-            $sql_usr.= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";

-            $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-            $sql_usr .= " WHERE u2.entity IN (0," . Globals::$conf->entity . ")";

-            $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;

+            $sql_usr .= " UNION ";

+            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";

+            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+            $sql_usr .= " WHERE u2.entity IN (0,".Globals::$conf->entity.")";

+            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;

         }

-	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

+	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

         //print $sql_usr;exit;

 

         $resql_usr = $this->db->query($sql_usr);

@@ -434,33 +434,33 @@ 
             while ($obj_usr = $this->db->fetch_object($resql_usr))

             {

 

-                $out.='<option value="'.$obj_usr->rowid.'"';

+                $out .= '<option value="'.$obj_usr->rowid.'"';

 

-                if ($obj_usr->rowid == $selected) $out.=' selected';

+                if ($obj_usr->rowid == $selected) $out .= ' selected';

 

-                $out.='>';

-                $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);

+                $out .= '>';

+                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);

                 // Complete name with more info

-                $moreinfo=0;

+                $moreinfo = 0;

                 if (!empty(Globals::$conf->global->MAIN_SHOW_LOGIN)) {

-                    $out.=($moreinfo?' - ':' (').$obj_usr->login;

+                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;

                     $moreinfo++;

                 }

                 if ($showstatus >= 0)

                 {

 					if ($obj_usr->statut == 1 && $showstatus == 1)

 					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');

+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

 	                	$moreinfo++;

 					}

 					if ($obj_usr->statut == 0)

 					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');

+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');

                 		$moreinfo++;

 					}

 				}

-				$out.=($moreinfo?')':'');

-                $out.='</option>';

+				$out .= ($moreinfo ? ')' : '');

+                $out .= '</option>';

             }

             $this->db->free($resql_usr);

         }

@@ -468,7 +468,7 @@ 
         {

             dol_print_error($this->db);

         }

-        $out.='</select>';

+        $out .= '</select>';

 

         return $out;

     }

@@ -488,21 +488,21 @@ 
      *  @param	string	$morecss				More css

      *  @return	void

      */

-    function selectProjectTasks($selectedtask='', $projectid=0, $htmlname='task_parent', $modeproject=0, $modetask=0, $mode=0, $useempty=0, $disablechildoftaskid=0, $filteronprojstatus='', $morecss='')

+    function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')

     {

         global $user, $langs;

 

         require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

 

         //print $modeproject.'-'.$modetask;

-        $task=new Task($this->db);

-        $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode, '', $filteronprojstatus);

+        $task = new Task($this->db);

+        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);

         if ($tasksarray)

         {

-        	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

             if ($useempty) print '<option value="0">&nbsp;</option>';

-            $j=0;

-            $level=0;

+            $j = 0;

+            $level = 0;

             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);

             print '</select>';

 

@@ -526,14 +526,14 @@ 
      * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

      * @return	void

      */

-    private function _pLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0, $disablechildoftaskid=0)

+    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)

     {

         global $langs, $user, $conf;

 

-        $lastprojectid=0;

+        $lastprojectid = 0;

 

-        $numlines=count($lines);

-        for ($i = 0 ; $i < $numlines ; $i++)

+        $numlines = count($lines);

+        for ($i = 0; $i < $numlines; $i++)

         {

         	if ($lines[$i]->fk_parent == $parent)

             {

@@ -549,7 +549,7 @@ 
                         if ($i > 0) print '<option value="0" disabled>----------</option>';

                         print '<option value="'.$lines[$i]->fk_project.'_0"';

                         if ($selectedproject == $lines[$i]->fk_project) print ' selected';

-                        print '>';	// Project -> Task

+                        print '>'; // Project -> Task

                         print $langs->trans("Project").' '.$lines[$i]->projectref;

                         if (empty($lines[$i]->public))

                         {

@@ -562,22 +562,22 @@ 
                         //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;

                         print "</option>\n";

 

-                        $lastprojectid=$lines[$i]->fk_project;

+                        $lastprojectid = $lines[$i]->fk_project;

                         $inc++;

                     }

                 }

 

-                $newdisablechildoftaskid=$disablechildoftaskid;

+                $newdisablechildoftaskid = $disablechildoftaskid;

 

                 // Print task

                 if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

                 {

                 	// Check if we must disable entry

-                	$disabled=0;

+                	$disabled = 0;

                 	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

                 	{

                			$disabled++;

-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too

                 	}

 

                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

@@ -595,7 +595,7 @@ 
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

                     }

                     if ($lines[$i]->id) print ' > ';

-                    for ($k = 0 ; $k < $level ; $k++)

+                    for ($k = 0; $k < $level; $k++)

                     {

                         print "&nbsp;&nbsp;&nbsp;";

                     }

@@ -619,13 +619,13 @@ 
      * 		@return	string							HTML code for color thumb

      *		@see selectColor

      */

-    static function showColor($color, $textifnotdefined='')

+    static function showColor($color, $textifnotdefined = '')

     {

-    	$textcolor='FFF';

+    	$textcolor = 'FFF';

     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-    	if(colorIsLight($color)) $textcolor='000';

+    	if (colorIsLight($color)) $textcolor = '000';

 

-    	$color = colorArrayToHex(colorStringToArray($color,array()),'');

+    	$color = colorArrayToHex(colorStringToArray($color, array()), '');

 

 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

 		else print $textifnotdefined;

@@ -644,7 +644,7 @@ 
      * 		@deprecated Use instead selectColor

      *      @see selectColor()

      */

-    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')

+    function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')

     {

         // phpcs:enable

     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

@@ -662,24 +662,24 @@ 
      * 		@return	string

      *		@see showColor

      */

-    static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')

+    static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')

     {

 	    // Deprecation warning

 	    if ($form_name) {

-		    dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);

+		    dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);

 	    }

 

-        global $langs,$conf;

+        global $langs, $conf;

 

-        $out='';

+        $out = '';

 

-        if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)

+        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)

         {

             $langs->load("other");

             if (empty(Globals::$conf->dol_use_jmobile)) {

-	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

-	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

-	            $out.= '<script type="text/javascript">

+	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

+	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

+	            $out .= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                $(\'#colorpicker'.$prefix.'\').jPicker( {

 	                window: {

@@ -717,14 +717,14 @@ 
 			        } ); });

 	             </script>';

             }

-            $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';

+            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.$set_color.'" />';

         }

         else  // In most cases, this is not used. We used instead function with no specific list of colors

         {

             if (empty(Globals::$conf->dol_use_jmobile)) {

-	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

-	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

-	            $out.= '<script type="text/javascript">

+	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

+	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

+	            $out .= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({

 	                     size: 14,

@@ -734,15 +734,15 @@ 
 	             });

 	             </script>';

             }

-            $out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';

+            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';

             //print '<option value="-1">&nbsp;</option>';

             foreach ($arrayofcolors as $val)

             {

-                $out.= '<option value="'.$val.'"';

-                if ($set_color == $val) $out.= ' selected';

-                $out.= '>'.$val.'</option>';

+                $out .= '<option value="'.$val.'"';

+                if ($set_color == $val) $out .= ' selected';

+                $out .= '>'.$val.'</option>';

             }

-            $out.= '</select>';

+            $out .= '</select>';

         }

 

         return $out;

@@ -759,12 +759,12 @@ 
      *	@param	int		$y      	Hauteur de l'image en pixels

      *	@return	void

      */

-    function CreateColorIcon($color,$module,$name,$x='12',$y='12')

+    function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')

     {

         // phpcs:enable

         global $conf;

 

-        $file = Globals::$conf->$module->dir_temp . '/' . $name . '.png';

+        $file = Globals::$conf->$module->dir_temp.'/'.$name.'.png';

 

         // On cree le repertoire contenant les icones

         if (!file_exists(Globals::$conf->$module->dir_temp)) {

@@ -772,19 +772,19 @@ 
         }

 

         // On cree l'image en vraies couleurs

-        $image = imagecreatetruecolor($x,$y);

+        $image = imagecreatetruecolor($x, $y);

 

-        $color = substr($color,1,6);

+        $color = substr($color, 1, 6);

 

-        $rouge = hexdec(substr($color,0,2)); //conversion du canal rouge

-        $vert  = hexdec(substr($color,2,2)); //conversion du canal vert

-        $bleu  = hexdec(substr($color,4,2)); //conversion du canal bleu

+        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge

+        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert

+        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu

 

-        $couleur = imagecolorallocate($image,$rouge,$vert,$bleu);

+        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);

         //print $rouge.$vert.$bleu;

-        imagefill($image,0,0,$couleur); //on remplit l'image

+        imagefill($image, 0, 0, $couleur); //on remplit l'image

         // On cree la couleur et on l'attribue a une variable pour ne pas la perdre

-        ImagePng($image,$file); //renvoie une image sous format png

+        ImagePng($image, $file); //renvoie une image sous format png

         ImageDestroy($image);

     }

 

@@ -797,7 +797,7 @@ 
      *    	@param  int			$useempty          Affiche valeur vide dans liste

      *    	@return	string

      */

-    function select_dayofweek($selected='',$htmlname='weekid',$useempty=0)

+    function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)

     {

         // phpcs:enable

         global $langs;

@@ -845,17 +845,17 @@ 
      *      @param	string		$morecss			More Css

      *      @return string

      */

-    function select_month($selected='', $htmlname='monthid', $useempty=0, $longlabel=0, $morecss='')

+    function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = '')

     {

         // phpcs:enable

         global $langs;

 

         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array

+        if ($longlabel) $montharray = monthArray($langs, 0); // Get array

         else $montharray = monthArray($langs, 1);

 

-        $select_month = '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

         if ($useempty)

         {

             $select_month .= '<option value="0">&nbsp;</option>';

@@ -892,10 +892,10 @@ 
      *  @param	string		$morecss		More CSS

      *  @return	string

      */

-    function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')

+    function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle widthauto')

     {

         // phpcs:enable

-        print $this->selectyear($selected,$htmlname,$useempty,$min_year,$max_year,$offset,$invert,$option,$morecss);

+        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);

     }

 

     /**

@@ -912,41 +912,41 @@ 
      *  @param	string	$morecss		More css

      *  @return	string

      */

-    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')

+    function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle widthauto')

     {

-        $out='';

+        $out = '';

 

-        $currentyear = date("Y")+$offset;

-        $max_year = $currentyear+$max_year;

-        $min_year = $currentyear-$min_year;

-        if(empty($selected) && empty($useempty)) $selected = $currentyear;

+        $currentyear = date("Y") + $offset;

+        $max_year = $currentyear + $max_year;

+        $min_year = $currentyear - $min_year;

+        if (empty($selected) && empty($useempty)) $selected = $currentyear;

 

-        $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';

-        if($useempty)

+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';

+        if ($useempty)

         {

-        	$selected_html='';

+        	$selected_html = '';

             if ($selected == '') $selected_html = ' selected';

-            $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';

+            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';

         }

-        if (! $invert)

+        if (!$invert)

         {

             for ($y = $max_year; $y >= $min_year; $y--)

             {

-                $selected_html='';

+                $selected_html = '';

                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';

-                $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

         }

         else

         {

             for ($y = $min_year; $y <= $max_year; $y++)

             {

-                $selected_html='';

+                $selected_html = '';

                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';

-                $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

         }

-        $out.= "</select>\n";

+        $out .= "</select>\n";

 

         return $out;

     }

@@ -963,10 +963,10 @@ 
      * @param  	int		$originid      	Id de l'origine

      * @return	void

      */

-    function form_address($page, $selected, $socid, $htmlname='address_id', $origin='', $originid='')

+    function form_address($page, $selected, $socid, $htmlname = 'address_id', $origin = '', $originid = '')

     {

         // phpcs:enable

-        global $langs,$conf;

+        global $langs, $conf;

         global $form;

 

         if ($htmlname != "none")

@@ -984,9 +984,9 @@ 
         {

             if ($selected)

             {

-                require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php';

-                $address=new Address($this->db);

-                $result=$address->fetch_address($selected);

+                require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php';

+                $address = new Address($this->db);

+                $result = $address->fetch_address($selected);

                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';

             }

             else

@@ -1006,70 +1006,70 @@ 
      * 	@param	   String       $areacode    Code of area for pages ('0'=value for Home page)

      * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)

      */

-    static function getBoxesArea($user,$areacode)

+    static function getBoxesArea($user, $areacode)

     {

-        global $conf,$langs,$db;

+        global $conf, $langs, $db;

 

         include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';

 

-        $confuserzone='MAIN_BOXES_'.$areacode;

+        $confuserzone = 'MAIN_BOXES_'.$areacode;

 

         // $boxactivated will be array of boxes enabled into global setup

         // $boxidactivatedforuser will be array of boxes choosed by user

 

-        $selectboxlist='';

-        $boxactivated=InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone)?null:$user), array(), 0);	// Search boxes of common+user (or common only if user has no specific setup)

+        $selectboxlist = '';

+        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)

 

-        $boxidactivatedforuser=array();

-        foreach($boxactivated as $box)

+        $boxidactivatedforuser = array();

+        foreach ($boxactivated as $box)

         {

-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user

         }

 

         // Define selectboxlist

-        $arrayboxtoactivatelabel=array();

-        if (! empty($user->conf->$confuserzone))

+        $arrayboxtoactivatelabel = array();

+        if (!empty($user->conf->$confuserzone))

         {

-        	$boxorder='';

-        	$langs->load("boxes");	// Load label of boxes

-        	foreach($boxactivated as $box)

+        	$boxorder = '';

+        	$langs->load("boxes"); // Load label of boxes

+        	foreach ($boxactivated as $box)

         	{

-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

-        		$label=$langs->transnoentitiesnoconv($box->boxlabel);

+        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user

+        		$label = $langs->transnoentitiesnoconv($box->boxlabel);

         		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

         		if (preg_match('/graph/', $box->class) && Globals::$conf->browser->layout != 'phone') {

-        			$label=$label.' <span class="fa fa-bar-chart"></span>';

+        			$label = $label.' <span class="fa fa-bar-chart"></span>';

         		}

-        		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list

+        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list

         	}

-            foreach($boxidactivatedforuser as $boxid)

+            foreach ($boxidactivatedforuser as $boxid)

         	{

-       			if (empty($boxorder)) $boxorder.='A:';

-  				$boxorder.=$boxid.',';

+       			if (empty($boxorder)) $boxorder .= 'A:';

+  				$boxorder .= $boxid.',';

         	}

 

         	//var_dump($boxidactivatedforuser);

 

         	// Class Form must have been already loaded

-        	$selectboxlist.='<!-- Form with select box list -->'."\n";

-			$selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';

-			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';

-			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

-			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

+        	$selectboxlist .= '<!-- Form with select box list -->'."\n";

+			$selectboxlist .= '<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

+			$selectboxlist .= '<input type="hidden" name="addbox" value="addbox">';

+			$selectboxlist .= '<input type="hidden" name="userid" value="'.$user->id.'">';

+			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';

+			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';

+			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

             if (empty(Globals::$conf->use_javascript_ajax))

-                $selectboxlist .= ' <input type="submit" class="button" value="' . $langs->trans("AddBox") . '">';

-            $selectboxlist.='</form>';

+                $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

+            $selectboxlist .= '</form>';

             if (!empty(Globals::$conf->use_javascript_ajax)) {

-            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-            	$selectboxlist.=ajax_combobox("boxcombo");

+            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+            	$selectboxlist .= ajax_combobox("boxcombo");

             }

         }

 

         // Javascript code for dynamic actions

         if (!empty(Globals::$conf->use_javascript_ajax)) {

-	        $selectboxlist.='<script type="text/javascript" language="javascript">

+	        $selectboxlist .= '<script type="text/javascript" language="javascript">

 

 	        // To update list of activated boxes

 	        function updateBoxOrder(closing) {

@@ -1083,7 +1083,7 @@ 
 	        			async: false

 	        		});

 	        		// We force reload to be sure to get all boxes into list

-	        		window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=delbox\';

+	        		window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=delbox\';

 	        	}

 	        	else

 	        	{

@@ -1105,11 +1105,11 @@ 
 	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',

 	    			        async: false

 	    		        });

-	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;

+	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;

 	                }

 	        	});';

-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

-	        	$selectboxlist.='

+	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';

+	        	$selectboxlist .= '

 

 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({

 	    	    	handle: \'.boxhandle\',

@@ -1134,79 +1134,79 @@ 
 

         	});'."\n";

 

-	        $selectboxlist.='</script>'."\n";

+	        $selectboxlist .= '</script>'."\n";

         }

 

         // Define boxlista and boxlistb

-        $nbboxactivated=count($boxidactivatedforuser);

+        $nbboxactivated = count($boxidactivatedforuser);

 

         if ($nbboxactivated)

         {

         	// Load translation files required by the page

-            $langs->loadLangs(array("boxes","projects"));

+            $langs->loadLangs(array("boxes", "projects"));

 

-        	$emptybox=new ModeleBoxes($db);

+        	$emptybox = new ModeleBoxes($db);

 

-            $boxlista.="\n<!-- Box left container -->\n";

+            $boxlista .= "\n<!-- Box left container -->\n";

 

             // Define $box_max_lines

-            $box_max_lines=5;

+            $box_max_lines = 5;

             if (!empty(Globals::$conf->global->MAIN_BOXES_MAXLINES))

                 $box_max_lines = Globals::$conf->global->MAIN_BOXES_MAXLINES;

 

-            $ii=0;

+            $ii = 0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^A/i',$box->box_order)) // column A

+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^A/i', $box->box_order)) // column A

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

                     $box->loadBox($box_max_lines);

-                    $boxlista.= $box->outputBox();

+                    $boxlista .= $box->outputBox();

                 }

             }

 

             if (Globals::$conf->browser->layout != 'phone') {

-            	$emptybox->box_id='A';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlista.= $emptybox->outputBox(array(),array());

+            	$emptybox->box_id = 'A';

+            	$emptybox->info_box_head = array();

+            	$emptybox->info_box_contents = array();

+            	$boxlista .= $emptybox->outputBox(array(), array());

             }

-            $boxlista.= "<!-- End box left container -->\n";

+            $boxlista .= "<!-- End box left container -->\n";

 

-            $boxlistb.= "\n<!-- Box right container -->\n";

+            $boxlistb .= "\n<!-- Box right container -->\n";

 

-            $ii=0;

+            $ii = 0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^B/i',$box->box_order)) // colonne B

+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^B/i', $box->box_order)) // colonne B

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

                     $box->loadBox($box_max_lines);

-                    $boxlistb.= $box->outputBox();

+                    $boxlistb .= $box->outputBox();

                 }

             }

 

             if (Globals::$conf->browser->layout != 'phone') {

-            	$emptybox->box_id='B';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlistb.= $emptybox->outputBox(array(),array());

+            	$emptybox->box_id = 'B';

+            	$emptybox->info_box_head = array();

+            	$emptybox->info_box_contents = array();

+            	$boxlistb .= $emptybox->outputBox(array(), array());

             }

 

-            $boxlistb.= "<!-- End box right container -->\n";

+            $boxlistb .= "<!-- End box right container -->\n";

         }

 

-        return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);

+        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);

     }

 

 

@@ -1223,7 +1223,7 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag

      * 	@return	void

      */

-    function select_dictionary($htmlname,$dictionarytable,$keyfield='code',$labelfield='label',$selected='',$useempty=0,$moreattrib='')

+    function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')

     {

         // phpcs:enable

         global $langs, $conf;

@@ -1231,8 +1231,8 @@ 
         $langs->load("admin");

 

         $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;

-        $sql.= " FROM ".MAIN_DB_PREFIX.$dictionarytable;

-        $sql.= " ORDER BY ".$labelfield;

+        $sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;

+        $sql .= " ORDER BY ".$labelfield;

 

         dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);

         $result = $this->db->query($sql);

@@ -1242,7 +1242,7 @@ 
             $i = 0;

             if ($num)

             {

-                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';

+                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

                 if ($useempty == 1 || ($useempty == 2 && $num > 1))

                 {

                     print '<option value="-1">&nbsp;</option>';

Helpers/DolUtils2.php

Spacing +536 added lines, -536 removed lines

@@ -56,7 +56,7 @@ 
                 $pos++;

                 $unicodeHexVal = substr($source, $pos, 4);

                 $unicode = hexdec($unicodeHexVal);

-                $entity = "&#". $unicode . ';';

+                $entity = "&#".$unicode.';';

                 $decodedStr .= utf8_encode($entity);

                 $pos += 4;

             }

@@ -82,31 +82,31 @@ 
  * @param	string	$subdir		Sub directory (Example: '/mailings')

  * @return	array				Array of directories that can contains module descriptors

  */

-function dolGetModulesDirs($subdir='')

+function dolGetModulesDirs($subdir = '')

 {

     global $conf;

 

-    $modulesdir=array();

+    $modulesdir = array();

 

     foreach (Globals::$conf->file->dol_document_root as $type => $dirroot) {

         // Default core/modules dir

         if ($type === 'main') {

-            $modulesdir[$dirroot . '/core/modules' . $subdir . '/'] = $dirroot . '/core/modules' . $subdir . '/';

+            $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';

         }

 

         // Scan dir from external modules

-        $handle=@opendir($dirroot);

+        $handle = @opendir($dirroot);

         if (is_resource($handle))

         {

-            while (($file = readdir($handle))!==false)

+            while (($file = readdir($handle)) !== false)

             {

-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.

+                if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.

 

                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')

                 {

-                    if (is_dir($dirroot . '/' . $file . '/core/modules'.$subdir.'/'))

+                    if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))

                     {

-                        $modulesdir[$dirroot . '/' . $file . '/core/modules'.$subdir.'/'] = $dirroot . '/' . $file . '/core/modules'.$subdir.'/';

+                        $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';

                     }

                 }

             }

@@ -127,13 +127,13 @@ 
 {

     global $langs;

 

-    $selected='EUA4';

+    $selected = 'EUA4';

     if (!$outputlangs) {

-    	$outputlangs=$langs;

+    	$outputlangs = $langs;

     }

 

-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada

-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US

+    if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada

+    if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US

     return $selected;

 }

 

@@ -145,19 +145,19 @@ 
  *  @param  int			$searchalt      1=Search also in alternative languages

  *	@return	boolean						true if OK, false if KO

  */

-function dol_print_file($langs,$filename,$searchalt=0)

+function dol_print_file($langs, $filename, $searchalt = 0)

 {

     global $conf;

 

     // Test if file is in lang directory

-    foreach($langs->dir as $searchdir)

+    foreach ($langs->dir as $searchdir)

     {

-        $formfile=($searchdir."/langs/".$langs->defaultlang."/".$filename);

+        $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);

         dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);

         if (is_readable($formfile))

         {

-            $content=file_get_contents($formfile);

-            $isutf8=utf8_check($content);

+            $content = file_get_contents($formfile);

+            $isutf8 = utf8_check($content);

             if (!$isutf8 && Globals::$conf->file->character_set_client == 'UTF-8')

                     print utf8_encode($content);

                 elseif ($isutf8 && Globals::$conf->file->character_set_client == 'ISO-8859-1')

@@ -175,8 +175,8 @@ 
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);

             if (is_readable($formfilealt))

             {

-                $content=file_get_contents($formfilealt);

-                $isutf8=utf8_check($content);

+                $content = file_get_contents($formfilealt);

+                $isutf8 = utf8_check($content);

                 if (!$isutf8 && Globals::$conf->file->character_set_client == 'UTF-8')

                         print utf8_encode($content);

                     elseif ($isutf8 && Globals::$conf->file->character_set_client == 'ISO-8859-1')

@@ -199,7 +199,7 @@ 
  *  @param  int     $usetable       Output into a table

  *	@return	void

  */

-function dol_print_object_info($object, $usetable=0)

+function dol_print_object_info($object, $usetable = 0)

 {

     global $langs, $db;

 

@@ -208,16 +208,16 @@ 
 

     include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

-    $deltadateforserver=getServerTimeZoneInt('now');

-    $deltadateforclient=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

+    $deltadateforserver = getServerTimeZoneInt('now');

+    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

     //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

-    $deltadateforuser=round($deltadateforclient-$deltadateforserver);

+    $deltadateforuser = round($deltadateforclient - $deltadateforserver);

     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;

 

     if ($usetable) print '<table class="border centpercent">';

 

     // Import key

-    if (! empty($object->import_key))

+    if (!empty($object->import_key))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ImportedWithSet");

@@ -229,7 +229,7 @@ 
     }

 

     // User creation (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_creation) || ! empty($object->user_creation_id))

+    if (!empty($object->user_creation) || !empty($object->user_creation_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("CreatedBy");

@@ -242,7 +242,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);

             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -252,20 +252,20 @@ 
     }

 

     // Date creation

-    if (! empty($object->date_creation))

+    if (!empty($object->date_creation))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateCreation");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_creation, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User change (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_modification) || ! empty($object->user_modification_id))

+    if (!empty($object->user_modification) || !empty($object->user_modification_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ModifiedBy");

@@ -278,7 +278,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);

             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -288,20 +288,20 @@ 
     }

 

     // Date change

-    if (! empty($object->date_modification))

+    if (!empty($object->date_modification))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateLastModification");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_modification, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User validation (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_validation) || ! empty($object->user_validation_id))

+    if (!empty($object->user_validation) || !empty($object->user_validation_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ValidatedBy");

@@ -314,7 +314,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -324,20 +324,20 @@ 
     }

 

     // Date validation

-    if (! empty($object->date_validation))

+    if (!empty($object->date_validation))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateValidation");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_validation, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User approve (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_approve) || ! empty($object->user_approve_id))

+    if (!empty($object->user_approve) || !empty($object->user_approve_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ApprovedBy");

@@ -350,7 +350,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -360,26 +360,26 @@ 
     }

 

     // Date approve

-    if (! empty($object->date_approve))

+    if (!empty($object->date_approve))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateApprove");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_approve, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User approve

-    if (! empty($object->user_approve_id2))

+    if (!empty($object->user_approve_id2))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ApprovedBy");

         if ($usetable) print '</td><td>';

         else print ': ';

-        $userstatic=new User($db);

+        $userstatic = new User($db);

         $userstatic->fetch($object->user_approve_id2);

         if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         else print $langs->trans("Unknown");

@@ -388,20 +388,20 @@ 
     }

 

     // Date approve

-    if (! empty($object->date_approve2))

+    if (!empty($object->date_approve2))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateApprove2");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_approve2, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User close

-    if (! empty($object->user_cloture))

+    if (!empty($object->user_cloture))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ClosedBy");

@@ -414,7 +414,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_cloture);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -424,20 +424,20 @@ 
     }

 

     // Date close

-    if (! empty($object->date_cloture))

+    if (!empty($object->date_cloture))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateClosing");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_cloture, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User conciliate

-    if (! empty($object->user_rappro))

+    if (!empty($object->user_rappro))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("ConciliatedBy");

@@ -450,7 +450,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_rappro);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -460,27 +460,27 @@ 
     }

 

     // Date conciliate

-    if (! empty($object->date_rappro))

+    if (!empty($object->date_rappro))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateConciliating");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_rappro, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // Date send

-    if (! empty($object->date_envoi))

+    if (!empty($object->date_envoi))

     {

         if ($usetable) print '<tr><td class="titlefield">';

         print $langs->trans("DateLastSend");

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_envoi, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

@@ -499,8 +499,8 @@ 
  */

 function dolAddEmailTrackId($email, $trackingid)

 {

-	$tmp=explode('@',$email);

-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');

+	$tmp = explode('@', $email);

+	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1]) ? $tmp[1] : '');

 }

 

 /**

@@ -535,7 +535,7 @@ 
  *  @param  int		$anchor		1: verify anchor is provided, 0: not verify anchor

  *	@return int					1=Check is OK, 0=Check is KO

  */

-function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)

+function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)

 {

     $ValidUrl = 0;

     $urlregex = '';

@@ -549,7 +549,7 @@ 
     // HOSTNAME OR IP

     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)

     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x

-    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*";  // x ou x.xx (2 x ou plus)

+    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)

     //use only one of the above

 

     // PORT

@@ -578,33 +578,33 @@ 
  *	@param  integer	$http		1 = keep both http:// and https://, 0: remove http:// but not https://

  *	@return string				Cleaned url

  */

-function clean_url($url,$http=1)

+function clean_url($url, $http = 1)

 {

     // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)

     // To include the minus sign in a char class, we must not escape it but put it at the end of the class

     // Also, there's no need of escape a dot sign in a class

-    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i',$url,$regs))

+    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))

     {

-        $proto=$regs[1];

-        $domain=$regs[2];

-        $port=isset($regs[3])?$regs[3]:'';

+        $proto = $regs[1];

+        $domain = $regs[2];

+        $port = isset($regs[3]) ? $regs[3] : '';

         //print $url." -> ".$proto." - ".$domain." - ".$port;

         //$url = dol_string_nospecial(trim($url));

         $url = trim($url);

 

         // Si http: defini on supprime le http (Si https on ne supprime pas)

-        $newproto=$proto;

-        if ($http==0)

+        $newproto = $proto;

+        if ($http == 0)

         {

-            if (preg_match('/^http:[\\/]+/i',$url))

+            if (preg_match('/^http:[\\/]+/i', $url))

             {

-                $url = preg_replace('/^http:[\\/]+/i','',$url);

+                $url = preg_replace('/^http:[\\/]+/i', '', $url);

                 $newproto = '';

             }

         }

 

         // On passe le nom de domaine en minuscule

-        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);

+        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);

 

         return $CleanUrl;

     }

@@ -624,35 +624,35 @@ 
  * 	@param 		bool		$displaytld			Display tld (default: true)

  * 	@return		string							Return email with hidden parts or '';

  */

-function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)

+function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail = 4, $nbdisplaydomain = 3, $displaytld = true)

 {

-	if(!isValidEmail($mail))return '';

+	if (!isValidEmail($mail))return '';

 	$tab = explode('@', $mail);

-	$tab2 = explode('.',$tab[1]);

+	$tab2 = explode('.', $tab[1]);

 	$string_replace = '';

 	$mail_name = $tab[0];

 	$mail_domaine = $tab2[0];

 	$mail_tld = '';

 

 	$nbofelem = count($tab2);

-	for($i=1; $i < $nbofelem && $displaytld; $i++)

+	for ($i = 1; $i < $nbofelem && $displaytld; $i++)

 	{

 		$mail_tld .= '.'.$tab2[$i];

 	}

 

-	for($i=0; $i < $nbreplace; $i++){

+	for ($i = 0; $i < $nbreplace; $i++) {

 		$string_replace .= $replace;

 	}

 

-	if(strlen($mail_name) > $nbdisplaymail){

+	if (strlen($mail_name) > $nbdisplaymail) {

 		$mail_name = substr($mail_name, 0, $nbdisplaymail);

 	}

 

-	if(strlen($mail_domaine) > $nbdisplaydomain){

-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);

+	if (strlen($mail_domaine) > $nbdisplaydomain) {

+		$mail_domaine = substr($mail_domaine, strlen($mail_domaine) - $nbdisplaydomain);

 	}

 

-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;

+	return $mail_name.$string_replace.$mail_domaine.$mail_tld;

 }

 

 

@@ -665,14 +665,14 @@ 
  * 	@param	string	$tdoptions	Options for td

  * 	@return	string

  */

-function array2tr($data,$troptions='',$tdoptions='')

+function array2tr($data, $troptions = '', $tdoptions = '')

 {

-    $text = '<tr '.$troptions.'>' ;

-    foreach($data as $key => $item){

-        $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;

+    $text = '<tr '.$troptions.'>';

+    foreach ($data as $key => $item) {

+        $text .= '<td '.$tdoptions.'>'.$item.'</td>';

     }

-    $text.= '</tr>' ;

-    return $text ;

+    $text .= '</tr>';

+    return $text;

 }

 

 /**

@@ -685,22 +685,22 @@ 
  * 	@param	string	$tdoptions		Options for td

  * 	@return	string

  */

-function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')

+function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')

 {

-    $text='' ;

-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;

-    foreach($data as $key => $item){

-        if(is_array($item)){

-            $text.=array2tr($item,$troptions,$tdoptions);

+    $text = '';

+    if ($tableMarkup) $text = '<table '.$tableoptions.'>';

+    foreach ($data as $key => $item) {

+        if (is_array($item)) {

+            $text .= array2tr($item, $troptions, $tdoptions);

         } else {

-            $text.= '<tr '.$troptions.'>' ;

-            $text.= '<td '.$tdoptions.'>'.$key.'</td>' ;

-            $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;

-            $text.= '</tr>' ;

+            $text .= '<tr '.$troptions.'>';

+            $text .= '<td '.$tdoptions.'>'.$key.'</td>';

+            $text .= '<td '.$tdoptions.'>'.$item.'</td>';

+            $text .= '</tr>';

         }

     }

-    if($tableMarkup) $text.= '</table>' ;

-    return $text ;

+    if ($tableMarkup) $text .= '</table>';

+    return $text;

 }

 

 /**

@@ -719,19 +719,19 @@ 
  * @param	int			$forceentity	Entity id to force

  * @return 	string						New value (numeric) or error message

  */

-function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true, $objuser=null, $forceentity=null)

+function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)

 {

-    global $conf,$user;

+    global $conf, $user;

 

-    if (! is_object($objsoc)) $valueforccc=$objsoc;

-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;

-    else $valueforccc=$objsoc->code_client;

+    if (!is_object($objsoc)) $valueforccc = $objsoc;

+    else if ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = $objsoc->code_fournisseur;

+    else $valueforccc = $objsoc->code_client;

 

     $sharetable = $table;

     if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function

 

     // Clean parameters

-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers

+    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers

     // but we should use local year and month of user

 

     // For debugging

@@ -741,132 +741,132 @@ 
     //$date=dol_mktime(12, 0, 0, 1, 1, 1900);

     //$date=dol_stringtotime('20130101');

 

-    $hasglobalcounter=false;

+    $hasglobalcounter = false;

     // Extract value for mask counter, mask raz and mask offset

-    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$mask,$reg))

+    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))

     {

-        $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');

-        $maskcounter=$reg[1];

-        $hasglobalcounter=true;

+        $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');

+        $maskcounter = $reg[1];

+        $hasglobalcounter = true;

     }

     else

     {

         // setting some defaults so the rest of the code won't fail if there is a third party counter

-        $masktri='00000';

-        $maskcounter='00000';

+        $masktri = '00000';

+        $maskcounter = '00000';

     }

 

-    $maskraz=-1;

-    $maskoffset=0;

-    $resetEveryMonth=false;

+    $maskraz = -1;

+    $maskoffset = 0;

+    $resetEveryMonth = false;

     if (dol_strlen($maskcounter) < 3 && empty(Globals::$conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS))

             return 'ErrorCounterMustHaveMoreThan3Digits';

 

         // Extract value for third party mask counter

-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))

+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))

     {

-        $maskrefclient=$regClientRef[1].$regClientRef[2];

-        $maskrefclient_maskclientcode=$regClientRef[1];

-        $maskrefclient_maskcounter=$regClientRef[2];

-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset

-        $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask

-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like

+        $maskrefclient = $regClientRef[1].$regClientRef[2];

+        $maskrefclient_maskclientcode = $regClientRef[1];

+        $maskrefclient_maskcounter = $regClientRef[2];

+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

+        $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask

+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

     }

-    else $maskrefclient='';

+    else $maskrefclient = '';

 

     // fail if there is neither a global nor a third party counter

-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))

+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))

     {

         return 'ErrorBadMask';

     }

 

     // Extract value for third party type

-    if (preg_match('/\{(t+)\}/i',$mask,$regType))

+    if (preg_match('/\{(t+)\}/i', $mask, $regType))

     {

-        $masktype=$regType[1];

-        $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)

-        $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

+        $masktype = $regType[1];

+        $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)

+        $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

     }

     else

     {

-    	$masktype='';

-    	$masktype_value='';

+    	$masktype = '';

+    	$masktype_value = '';

     }

 

     // Extract value for user

-    if (preg_match('/\{(u+)\}/i',$mask,$regType))

+    if (preg_match('/\{(u+)\}/i', $mask, $regType))

     {

     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

     	if (is_object($objuser)) $lastname = $objuser->lastname;

 

-    	$maskuser=$regType[1];

-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)

-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

+    	$maskuser = $regType[1];

+    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)

+    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

     }

     else

     {

-    	$maskuser='';

-    	$maskuser_value='';

+    	$maskuser = '';

+    	$maskuser_value = '';

     }

 

     // Personalized field {XXX-1} à {XXX-9}

-    $maskperso=array();

-    $maskpersonew=array();

-    $tmpmask=$mask;

-    while (preg_match('/\{([A-Z]+)\-([1-9])\}/',$tmpmask,$regKey))

+    $maskperso = array();

+    $maskpersonew = array();

+    $tmpmask = $mask;

+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))

     {

-        $maskperso[$regKey[1]]='{'.$regKey[1].'-'.$regKey[2].'}';

-        $maskpersonew[$regKey[1]]=str_pad('', $regKey[2], '_', STR_PAD_RIGHT);

-        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);

+        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';

+        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);

+        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);

     }

 

-    if (strstr($mask,'user_extra_'))

+    if (strstr($mask, 'user_extra_'))

     {

 			$start = "{user_extra_";

 			$end = "\}";

-			$extra= get_string_between($mask, "user_extra_", "}");

-			if(!empty($user->array_options['options_'.$extra])){

-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);

+			$extra = get_string_between($mask, "user_extra_", "}");

+			if (!empty($user->array_options['options_'.$extra])) {

+				$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);

 			}

     }

-    $maskwithonlyymcode=$mask;

-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(u+)\}/i',$maskuser_value,$maskwithonlyymcode);

-    foreach($maskperso as $key => $val)

+    $maskwithonlyymcode = $mask;

+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);

+    foreach ($maskperso as $key => $val)

     {

-        $maskwithonlyymcode=preg_replace('/'.preg_quote($val,'/').'/i', $maskpersonew[$key], $maskwithonlyymcode);

+        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);

     }

-    $maskwithnocode=$maskwithonlyymcode;

-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);

+    $maskwithnocode = $maskwithonlyymcode;

+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

     // Now maskwithnocode = 0000ddmmyyyyccc for example

     // and maskcounter    = 0000 for example

     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

     //var_dump($reg);

 

     // If an offset is asked

-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);

 

     // Define $sqlwhere

-    $sqlwhere='';

-    $yearoffset=0;	// Use year of current $date by default

-    $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

+    $sqlwhere = '';

+    $yearoffset = 0; // Use year of current $date by default

+    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

 

     // If a restore to zero after a month is asked we check if there is already a value for this year.

-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);

 

     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;

     if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)

-        $maskraz=$yearoffsettype; // For backward compatibility

+        $maskraz = $yearoffsettype; // For backward compatibility

     else if ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && Globals::$conf->global->SOCIETE_FISCAL_MONTH_START > 1))

             $maskraz = Globals::$conf->global->SOCIETE_FISCAL_MONTH_START;

         //print "maskraz=".$maskraz;	// -1=no reset

@@ -881,79 +881,79 @@ 
         // Define posy, posm and reg

         if ($maskraz > 1)	// if reset is not first month, we need month and year into mask

         {

-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }

+            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }

             else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

 

             if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';

         }

         else // if reset is for a specific month in year, we need year

         {

-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }

+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }

+        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }

+            else if (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }

             else return 'ErrorCantUseRazIfNoYearInMask';

         }

         // Define length

-        $yearlen = $posy?dol_strlen($reg[$posy]):0;

-        $monthlen = $posm?dol_strlen($reg[$posm]):0;

+        $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;

+        $monthlen = $posm ?dol_strlen($reg[$posm]) : 0;

         // Define pos

-       	$yearpos = (dol_strlen($reg[1])+1);

-        $monthpos = ($yearpos+$yearlen);

+       	$yearpos = (dol_strlen($reg[1]) + 1);

+        $monthpos = ($yearpos + $yearlen);

         if ($posy == 3 && $posm == 2) {		// if month is before year

-          	$monthpos = (dol_strlen($reg[1])+1);

-           	$yearpos = ($monthpos+$monthlen);

+          	$monthpos = (dol_strlen($reg[1]) + 1);

+           	$yearpos = ($monthpos + $monthlen);

         }

         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";

 

         // Define $yearcomp and $monthcomp (that will be use in the select where to search max number)

-        $monthcomp=$maskraz;

-        $yearcomp=0;

+        $monthcomp = $maskraz;

+        $yearcomp = 0;

 

-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

+        if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

         {

-        	$currentyear=date("Y", $date);

-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);

-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);

-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);

+        	$currentyear = date("Y", $date);

+        	$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);

+        	$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);

+        	$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);

         	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';

 

         	// If after or equal of current fiscal date

         	if ($date >= $fiscaldate)

         	{

         		// If before of next new year date

-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;

+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;

         	}

         	// If after or equal of current new year date

-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;

+        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;

         }

         // For backward compatibility

-        else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year

+        else if (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year

 

-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);

-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);

-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;

+        if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);

+        elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);

+        elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;

         if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)

         {

-            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);

-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);

-

-            $sqlwhere.="(";

-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

-            $sqlwhere.=" OR";

-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";

-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

-            $sqlwhere.=')';

+            if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);

+            elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);

+

+            $sqlwhere .= "(";

+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

+            $sqlwhere .= " OR";

+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

+            $sqlwhere .= ')';

         }

 		else if ($resetEveryMonth)

 		{

-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

 		}

         else   // reset is done on january

         {

-            $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

+            $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

         }

     }

     //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset

@@ -962,49 +962,49 @@ 
     // Define $sqlstring

     if (function_exists('mb_strrpos'))

     	{

-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');

+    	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');

 	}

 	else

 	{

-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);

+    	$posnumstart = strrpos($maskwithnocode, $maskcounter);

 	}	// Pos of counter in final string (from 0 to ...)

     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';

-    $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';

+    $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';

 

     // Define $maskLike

     $maskLike = dol_string_nospecial($mask);

-    $maskLike = str_replace("%","_",$maskLike);

+    $maskLike = str_replace("%", "_", $maskLike);

     // Replace protected special codes with matching number of _ as wild card caracter

-    $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);

-    $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);

-    $maskLike = preg_replace('/\{y\}/i','_',$maskLike);

-    $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);

-    $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);

-    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);

-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);

-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);

-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

-    foreach($maskperso as $key => $val)

+    $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

+    $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

+    $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

+    $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

+    $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);

+    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

+    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

+    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

+    foreach ($maskperso as $key => $val)

     {

-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);

+    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);

     }

 

     // Get counter in database

-    $counter=0;

+    $counter = 0;

     $sql = "SELECT MAX(".$sqlstring.") as val";

-    $sql.= " FROM ".MAIN_DB_PREFIX.$table;

-    $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";

+    $sql .= " FROM ".MAIN_DB_PREFIX.$table;

+    $sql .= " WHERE ".$field." LIKE '".$maskLike."'";

+	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";

     if ($bentityon) // only if entity enable

-    	$sql.= " AND entity IN (".getEntity($sharetable).")";

-    else if (! empty($forceentity))

-    	$sql.= " AND entity IN (".$forceentity.")";

-    if ($where) $sql.=$where;

-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;

+    	$sql .= " AND entity IN (".getEntity($sharetable).")";

+    else if (!empty($forceentity))

+    	$sql .= " AND entity IN (".$forceentity.")";

+    if ($where) $sql .= $where;

+    if ($sqlwhere) $sql .= ' AND '.$sqlwhere;

 

     //print $sql.'<br>';

     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

-    $resql=$db->query($sql);

+    $resql = $db->query($sql);

     if ($resql)

     {

         $obj = $db->fetch_object($resql);

@@ -1013,10 +1013,10 @@ 
     else dol_print_error($db);

 

     // Check if we must force counter to maskoffset

-    if (empty($counter)) $counter=$maskoffset;

-    else if (preg_match('/[^0-9]/i',$counter))

+    if (empty($counter)) $counter = $maskoffset;

+    else if (preg_match('/[^0-9]/i', $counter))

     {

-    	$counter=0;

+    	$counter = 0;

     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

     }

     else if ($counter < $maskoffset && empty(Globals::$conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST))

@@ -1024,36 +1024,36 @@ 
 

         if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.

     {

-        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);

+        $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

 

         // Define $maskLike

         $maskLike = dol_string_nospecial($mask);

-        $maskLike = str_replace("%","_",$maskLike);

+        $maskLike = str_replace("%", "_", $maskLike);

         // Replace protected special codes with matching number of _ as wild card caracter

-        $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);

-        $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);

-        $maskLike = preg_replace('/\{y\}/i','_',$maskLike);

-        $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);

-        $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);

-        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);

-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);

-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);

-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

-

-        $ref='';

+        $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

+        $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

+        $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

+        $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

+        $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

+        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);

+        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

+        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

+        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

+

+        $ref = '';

         $sql = "SELECT ".$field." as ref";

-        $sql.= " FROM ".MAIN_DB_PREFIX.$table;

-        $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$table;

+        $sql .= " WHERE ".$field." LIKE '".$maskLike."'";

+    	$sql .= " AND ".$field." NOT LIKE '%PROV%'";

     	if ($bentityon) // only if entity enable

-        	$sql.= " AND entity IN (".getEntity($sharetable).")";

-        else if (! empty($forceentity))

-        	$sql.= " AND entity IN (".$forceentity.")";

-        if ($where) $sql.=$where;

-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;

+        	$sql .= " AND entity IN (".getEntity($sharetable).")";

+        else if (!empty($forceentity))

+        	$sql .= " AND entity IN (".$forceentity.")";

+        if ($where) $sql .= $where;

+        if ($sqlwhere) $sql .= ' AND '.$sqlwhere;

 

         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

-        $resql=$db->query($sql);

+        $resql = $db->query($sql);

         if ($resql)

         {

             $obj = $db->fetch_object($resql);

@@ -1061,7 +1061,7 @@ 
         }

         else dol_print_error($db);

 

-        $numFinal=$ref;

+        $numFinal = $ref;

     }

     else if ($mode == 'next')

     {

@@ -1070,47 +1070,47 @@ 
         // If value for $counter has a length higher than $maskcounter chars

         if ($counter >= pow(10, dol_strlen($maskcounter)))

         {

-        	$counter='ErrorMaxNumberReachForThisMask';

+        	$counter = 'ErrorMaxNumberReachForThisMask';

         }

 

-        if (! empty($maskrefclient_maskcounter))

+        if (!empty($maskrefclient_maskcounter))

         {

             //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";

 

             // Define $sqlstring

-            $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)

+            $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)

             if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';

-            $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';

+            $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';

             //print "x".$sqlstring;

 

             // Define $maskrefclient_maskLike

             $maskrefclient_maskLike = dol_string_nospecial($mask);

-            $maskrefclient_maskLike = str_replace("%","_",$maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);

             // Replace protected special codes with matching number of _ as wild card caracter

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'),'____',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'),'__',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'),'_',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'),'__',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'),'__',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),$maskrefclient_clientcode.str_pad("",dol_strlen($maskrefclient_maskcounter),"_"),$maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);

 

             // Get counter in database

-            $maskrefclient_counter=0;

+            $maskrefclient_counter = 0;

             $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";

-            $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;

+            $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;

             //$sql.= " WHERE ".$field." not like '(%'";

-            $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

+            $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

             if ($bentityon) // only if entity enable

-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";

-            else if (! empty($forceentity))

-            	$sql.= " AND entity IN (".$forceentity.")";

-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask

-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask

-            $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

+            	$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";

+            else if (!empty($forceentity))

+            	$sql .= " AND entity IN (".$forceentity.")";

+            if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask

+            if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask

+            $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

 

             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);

-            $maskrefclient_resql=$db->query($maskrefclient_sql);

+            $maskrefclient_resql = $db->query($maskrefclient_sql);

             if ($maskrefclient_resql)

             {

                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);

@@ -1118,7 +1118,7 @@ 
             }

             else dol_print_error($db);

 

-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;

+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;

 			$maskrefclient_counter++;

         }

 

@@ -1126,54 +1126,54 @@ 
         $numFinal = $mask;

 

         // We replace special codes except refclient

-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

 		{

-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);

-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);

-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);

+	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);

+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);

+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);

 		}

 		else	// we want yyyy to be current year

 		{

-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);

-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);

-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);

+        	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);

+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);

+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);

 		}

-        $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);

-        $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);

+        $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);

+        $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);

 

         // Now we replace the counter

-        $maskbefore='{'.$masktri.'}';

-        $maskafter=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);

+        $maskbefore = '{'.$masktri.'}';

+        $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

         //print 'x'.$maskbefore.'-'.$maskafter.'y';

-        $numFinal = str_replace($maskbefore,$maskafter,$numFinal);

+        $numFinal = str_replace($maskbefore, $maskafter, $numFinal);

 

         // Now we replace the refclient

         if ($maskrefclient)

         {

             //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

-            $maskrefclient_maskbefore='{'.$maskrefclient.'}';

-            $maskrefclient_maskafter=$maskrefclient_clientcode.str_pad($maskrefclient_counter,dol_strlen($maskrefclient_maskcounter),"0",STR_PAD_LEFT);

-            $numFinal = str_replace($maskrefclient_maskbefore,$maskrefclient_maskafter,$numFinal);

+            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';

+            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);

+            $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);

         }

 

         // Now we replace the type

         if ($masktype)

         {

-            $masktype_maskbefore='{'.$masktype.'}';

-            $masktype_maskafter=$masktype_value;

-            $numFinal = str_replace($masktype_maskbefore,$masktype_maskafter,$numFinal);

+            $masktype_maskbefore = '{'.$masktype.'}';

+            $masktype_maskafter = $masktype_value;

+            $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);

         }

 

         // Now we replace the user

         if ($maskuser)

         {

-        	$maskuser_maskbefore='{'.$maskuser.'}';

-        	$maskuser_maskafter=$maskuser_value;

-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);

+        	$maskuser_maskbefore = '{'.$maskuser.'}';

+        	$maskuser_maskafter = $maskuser_value;

+        	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);

         }

     }

 

-    dol_syslog("functions2::get_next_value return ".$numFinal,LOG_DEBUG);

+    dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);

     return $numFinal;

 }

 

@@ -1188,11 +1188,11 @@ 
 function get_string_between($string, $start, $end)

 {

     $string = " ".$string;

-     $ini = strpos($string,$start);

+     $ini = strpos($string, $start);

      if ($ini == 0) return "";

      $ini += strlen($start);

-     $len = strpos($string,$end,$ini) - $ini;

-     return substr($string,$ini,$len);

+     $len = strpos($string, $end, $ini) - $ini;

+     return substr($string, $ini, $len);

 }

 

 /**

@@ -1202,78 +1202,78 @@ 
  * @param 	string	$value		Value

  * @return	int|string		    <0 or error string if KO, 0 if OK

  */

-function check_value($mask,$value)

+function check_value($mask, $value)

 {

-    $result=0;

+    $result = 0;

 

-    $hasglobalcounter=false;

+    $hasglobalcounter = false;

     // Extract value for mask counter, mask raz and mask offset

-    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))

+    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))

     {

-        $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');

-        $maskcounter=$reg[1];

-        $hasglobalcounter=true;

+        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');

+        $maskcounter = $reg[1];

+        $hasglobalcounter = true;

     }

     else

     {

         // setting some defaults so the rest of the code won't fail if there is a third party counter

-        $masktri='00000';

-        $maskcounter='00000';

+        $masktri = '00000';

+        $maskcounter = '00000';

     }

 

-    $maskraz=-1;

-    $maskoffset=0;

+    $maskraz = -1;

+    $maskoffset = 0;

     if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

 

     // Extract value for third party mask counter

-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))

+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))

     {

-        $maskrefclient=$regClientRef[1].$regClientRef[2];

-        $maskrefclient_maskclientcode=$regClientRef[1];

-        $maskrefclient_maskcounter=$regClientRef[2];

-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset

-        $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode

-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like

+        $maskrefclient = $regClientRef[1].$regClientRef[2];

+        $maskrefclient_maskclientcode = $regClientRef[1];

+        $maskrefclient_maskcounter = $regClientRef[2];

+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

+        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode

+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

     }

-    else $maskrefclient='';

+    else $maskrefclient = '';

 

     // fail if there is neither a global nor a third party counter

-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))

+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))

     {

         return 'ErrorBadMask';

     }

 

-    $maskwithonlyymcode=$mask;

-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);

-    $maskwithnocode=$maskwithonlyymcode;

-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);

+    $maskwithonlyymcode = $mask;

+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

+    $maskwithnocode = $maskwithonlyymcode;

+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

     // Now maskwithnocode = 0000ddmmyyyyccc for example

     // and maskcounter    = 0000 for example

     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

 

     // If an offset is asked

-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);

 

     // Define $sqlwhere

 

     // If a restore to zero after a month is asked we check if there is already a value for this year.

-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);

     if ($maskraz >= 0)

     {

         if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';

 

         // Define reg

-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';

+        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

+        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';

         //print "x".$maskwithonlyymcode." ".$maskraz;

     }

     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

@@ -1282,8 +1282,8 @@ 
     //

 

     // Check length

-    $len=dol_strlen($maskwithnocode);

-    if (dol_strlen($value) != $len) $result=-1;

+    $len = dol_strlen($maskwithnocode);

+    if (dol_strlen($value) != $len) $result = -1;

 

     // Define $maskLike

     /* seems not used

@@ -1299,7 +1299,7 @@ 
     if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);

 	*/

 

-    dol_syslog("functions2::check_value result=".$result,LOG_DEBUG);

+    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);

     return $result;

 }

 

@@ -1311,13 +1311,13 @@ 
  *	@param   boolean	$upper		Convert to tupper

  *	@return  string					x

  */

-function binhex($bin, $pad=false, $upper=false)

+function binhex($bin, $pad = false, $upper = false)

 {

-    $last = dol_strlen($bin)-1;

-    for($i=0; $i<=$last; $i++){ $x += $bin[$last-$i] * pow(2,$i); }

+    $last = dol_strlen($bin) - 1;

+    for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }

     $x = dechex($x);

-    if($pad){ while(dol_strlen($x) < intval(dol_strlen($bin))/4){ $x = "0$x"; } }

-    if($upper){ $x = strtoupper($x); }

+    if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }

+    if ($upper) { $x = strtoupper($x); }

     return $x;

 }

 

@@ -1329,11 +1329,11 @@ 
  */

 function hexbin($hexa)

 {

-    $bin='';

+    $bin = '';

     $strLength = dol_strlen($hexa);

-    for($i=0;$i<$strLength;$i++)

+    for ($i = 0; $i < $strLength; $i++)

     {

-        $bin.=str_pad(decbin(hexdec($hexa{$i})),4,'0',STR_PAD_LEFT);

+        $bin .= str_pad(decbin(hexdec($hexa{$i})), 4, '0', STR_PAD_LEFT);

     }

     return $bin;

 }

@@ -1346,9 +1346,9 @@ 
  */

 function numero_semaine($time)

 {

-    $stime = strftime('%Y-%m-%d',$time);

+    $stime = strftime('%Y-%m-%d', $time);

 

-    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i',$stime,$reg))

+    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))

     {

         // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'

         $annee = $reg[1];

@@ -1364,47 +1364,47 @@ 
      */

 

     // Definition du Jeudi de la semaine

-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;

-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;

-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;

+    if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;

+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;

+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;

     else // Jeudi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);

 

     // Definition du premier Jeudi de l'annee

-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche

+    if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;

     }

-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi

+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;

     }

-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi

+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;

     }

     else // Jeudi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));

     }

 

     // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";

-    $numeroSemaine =     (

+    $numeroSemaine = (

     (

-    date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))

+    date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))

     -

-    date("z",mktime(12,0,0,date("m",$premierJeudiAnnee),date("d",$premierJeudiAnnee),date("Y",$premierJeudiAnnee)))

+    date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))

     ) / 7

     ) + 1;

 

     // Cas particulier de la semaine 53

-    if ($numeroSemaine==53)

+    if ($numeroSemaine == 53)

     {

         // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53

-        if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))

+        if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))

         {

             $numeroSemaine = 53;

         }

@@ -1416,7 +1416,7 @@ 
 

     //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";

 

-    return sprintf("%02d",$numeroSemaine);

+    return sprintf("%02d", $numeroSemaine);

 }

 

 /**

@@ -1427,26 +1427,26 @@ 
  *	@param  int		$to_unit   		Nouvelle unite  en puissance de 10

  *	@return float	        		Masse convertie

  */

-function weight_convert($weight,&$from_unit,$to_unit)

+function weight_convert($weight, &$from_unit, $to_unit)

 {

     /* Pour convertire 320 gr en Kg appeler

      *  $f = -3

      *  weigh_convert(320, $f, 0) retournera 0.32

      *

      */

-    while ($from_unit  <> $to_unit)

+    while ($from_unit <> $to_unit)

     {

         if ($from_unit > $to_unit)

         {

             $weight = $weight * 10;

             $from_unit = $from_unit - 1;

-            $weight = weight_convert($weight,$from_unit, $to_unit);

+            $weight = weight_convert($weight, $from_unit, $to_unit);

         }

         if ($from_unit < $to_unit)

         {

             $weight = $weight / 10;

             $from_unit = $from_unit + 1;

-            $weight = weight_convert($weight,$from_unit, $to_unit);

+            $weight = weight_convert($weight, $from_unit, $to_unit);

         }

     }

 

@@ -1473,21 +1473,21 @@ 
 

     // We remove old parameters for all keys in $tab

     $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";

-    $sql.= " WHERE fk_user = ".$user->id;

-    $sql .= " AND entity = " . Globals::$conf->entity;

-        $sql.= " AND param in (";

-    $i=0;

+    $sql .= " WHERE fk_user = ".$user->id;

+    $sql .= " AND entity = ".Globals::$conf->entity;

+        $sql .= " AND param in (";

+    $i = 0;

     foreach ($tab as $key => $value)

     {

-        if ($i > 0) $sql.=',';

-        $sql.="'".$db->escape($key)."'";

+        if ($i > 0) $sql .= ',';

+        $sql .= "'".$db->escape($key)."'";

         $i++;

     }

-    $sql.= ")";

+    $sql .= ")";

     dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

 

-    $resql=$db->query($sql);

-    if (! $resql)

+    $resql = $db->query($sql);

+    if (!$resql)

     {

         dol_print_error($db);

         $db->rollback();

@@ -1500,12 +1500,12 @@ 
         if ($value)

         {

             $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";

-            $sql .= " VALUES (" . $user->id . "," . Globals::$conf->entity . ",";

-                $sql.= " '".$db->escape($key)."','".$db->escape($value)."')";

+            $sql .= " VALUES (".$user->id.",".Globals::$conf->entity.",";

+                $sql .= " '".$db->escape($key)."','".$db->escape($value)."')";

 

             dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

-            $result=$db->query($sql);

-            if (! $result)

+            $result = $db->query($sql);

+            if (!$result)

             {

                 dol_print_error($db);

                 $db->rollback();

@@ -1531,7 +1531,7 @@ 
  *	@param	Translate	$langs			Output language

  *	@return	string						Formated reduction

  */

-function dol_print_reduction($reduction,$langs)

+function dol_print_reduction($reduction, $langs)

 {

     $string = '';

     if ($reduction == 100)

@@ -1540,7 +1540,7 @@ 
     }

     else

     {

-    	$string = vatrate($reduction,true);

+    	$string = vatrate($reduction, true);

     }

 

     return $string;

@@ -1554,7 +1554,7 @@ 
  */

 function version_os()

 {

-    $osversion=php_uname();

+    $osversion = php_uname();

     return $osversion;

 }

 

@@ -1598,18 +1598,18 @@ 
  *  @param  int		    $maxfilenamelength  Max length of value to show

  * 	@return	mixed			    			0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".

  */

-function getListOfModels($db,$type,$maxfilenamelength=0)

+function getListOfModels($db, $type, $maxfilenamelength = 0)

 {

-    global $conf,$langs;

-    $liste=array();

-    $found=0;

-    $dirtoscan='';

+    global $conf, $langs;

+    $liste = array();

+    $found = 0;

+    $dirtoscan = '';

 

     $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";

-    $sql.= " FROM ".MAIN_DB_PREFIX."document_model";

-    $sql.= " WHERE type = '".$type."'";

-    $sql .= " AND entity IN (0," . Globals::$conf->entity . ")";

-        $sql.= " ORDER BY description DESC";

+    $sql .= " FROM ".MAIN_DB_PREFIX."document_model";

+    $sql .= " WHERE type = '".$type."'";

+    $sql .= " AND entity IN (0,".Globals::$conf->entity.")";

+        $sql .= " ORDER BY description DESC";

 

     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);

     $resql = $db->query($sql);

@@ -1619,48 +1619,48 @@ 
         $i = 0;

         while ($i < $num)

         {

-            $found=1;

+            $found = 1;

 

             $obj = $db->fetch_object($resql);

 

             // If this generation module needs to scan a directory, then description field is filled

             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).

-            if (! empty($obj->description))	// A list of directories to scan is defined

+            if (!empty($obj->description))	// A list of directories to scan is defined

             {

                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 

-                $const=$obj->description;

+                $const = $obj->description;

                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim(Globals::$conf->global->$const));

                     $dirtoscan = preg_replace('/[\r\n]+/', ',', trim(Globals::$conf->global->$const));

 

-                    $listoffiles=array();

+                    $listoffiles = array();

 

                 // Now we add models found in directories scanned

-                $listofdir=explode(',',$dirtoscan);

-                foreach($listofdir as $key=>$tmpdir)

+                $listofdir = explode(',', $dirtoscan);

+                foreach ($listofdir as $key=>$tmpdir)

                 {

-                    $tmpdir=trim($tmpdir);

-                    $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);

-                    if (! $tmpdir) { unset($listofdir[$key]); continue; }

+                    $tmpdir = trim($tmpdir);

+                    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);

+                    if (!$tmpdir) { unset($listofdir[$key]); continue; }

                     if (is_dir($tmpdir))

                     {

 			// all type of template is allowed

-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+			$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

+                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);

                     }

                 }

 

                 if (count($listoffiles))

                 {

-                    foreach($listoffiles as $record)

+                    foreach ($listoffiles as $record)

                     {

-                        $max=($maxfilenamelength?$maxfilenamelength:28);

-                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');

+                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);

+                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');

                     }

                 }

                 else

                 {

-                    $liste[0]=$obj->label.': '.$langs->trans("None");

+                    $liste[0] = $obj->label.': '.$langs->trans("None");

                 }

             }

             else

@@ -1669,14 +1669,14 @@ 
                 {

                     global $_Avery_Labels;

                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';

-                    foreach($_Avery_Labels as $key => $val)

+                    foreach ($_Avery_Labels as $key => $val)

                     {

-                        $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];

+                        $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->lib).' '.$val['name'];

                     }

                 }

                 else    // Common usage

                 {

-                    $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;

+                    $liste[$obj->id] = $obj->label ? $obj->label : $obj->lib;

                 }

             }

             $i++;

@@ -1705,10 +1705,10 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {

 

 		// Then we test if it is a private range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

 

 		// Then we test if it is a reserved range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

 

 		return 1;

 	}

@@ -1723,12 +1723,12 @@ 
  *  @param  string		$firstname		Firstname

  *	@return	string						Login

  */

-function dol_buildlogin($lastname,$firstname)

+function dol_buildlogin($lastname, $firstname)

 {

-    $login=strtolower(dol_string_unaccent($firstname));

-    $login.=($login?'.':'');

-    $login.=strtolower(dol_string_unaccent($lastname));

-    $login=dol_string_nospecial($login,''); // For special names

+    $login = strtolower(dol_string_unaccent($firstname));

+    $login .= ($login ? '.' : '');

+    $login .= strtolower(dol_string_unaccent($lastname));

+    $login = dol_string_nospecial($login, ''); // For special names

     return $login;

 }

 

@@ -1741,18 +1741,18 @@ 
 {

     global $conf;

 

-    $params=array();

+    $params = array();

     $proxyuse = (empty(Globals::$conf->global->MAIN_PROXY_USE) ? false : true);

         $proxyhost = (empty(Globals::$conf->global->MAIN_PROXY_USE) ? false : Globals::$conf->global->MAIN_PROXY_HOST);

         $proxyport = (empty(Globals::$conf->global->MAIN_PROXY_USE) ? false : Globals::$conf->global->MAIN_PROXY_PORT);

         $proxyuser = (empty(Globals::$conf->global->MAIN_PROXY_USE) ? false : Globals::$conf->global->MAIN_PROXY_USER);

         $proxypass = (empty(Globals::$conf->global->MAIN_PROXY_USE) ? false : Globals::$conf->global->MAIN_PROXY_PASS);

-        $timeout = (empty(Globals::$conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : Globals::$conf->global->MAIN_USE_CONNECT_TIMEOUT);               // Connection timeout

-        $response_timeout = (empty(Globals::$conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : Globals::$conf->global->MAIN_USE_RESPONSE_TIMEOUT);    // Response timeout

+        $timeout = (empty(Globals::$conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : Globals::$conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout

+        $response_timeout = (empty(Globals::$conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : Globals::$conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout

         //print extension_loaded('soap');

     if ($proxyuse)

     {

-        $params=array('connection_timeout'=>$timeout,

+        $params = array('connection_timeout'=>$timeout,

                       'response_timeout'=>$response_timeout,

                       'proxy_use'      => 1,

                       'proxy_host'     => $proxyhost,

@@ -1764,7 +1764,7 @@ 
     }

     else

     {

-        $params=array('connection_timeout'=>$timeout,

+        $params = array('connection_timeout'=>$timeout,

                       'response_timeout'=>$response_timeout,

                       'proxy_use'      => 0,

                       'proxy_host'     => false,

@@ -1787,15 +1787,15 @@ 
  * @param 	string	$option			More options

  * @return	string					URL of link to object id/type

  */

-function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')

+function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')

 {

 	global $db, $conf, $langs;

 

-	$ret='';

+	$ret = '';

 

 	// Parse element/subelement (ex: project_task)

 	$module = $element = $subelement = $objecttype;

-	if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))

+	if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))

 	{

 		$module = $element = $regs[1];

 		$subelement = $regs[2];

@@ -1806,18 +1806,18 @@ 
 	// To work with non standard path

 	if ($objecttype == 'facture' || $objecttype == 'invoice') {

 		$classpath = 'compta/facture/class';

-		$module='facture';

-		$subelement='facture';

+		$module = 'facture';

+		$subelement = 'facture';

 	}

 	if ($objecttype == 'commande' || $objecttype == 'order') {

 		$classpath = 'commande/class';

-		$module='commande';

-		$subelement='commande';

+		$module = 'commande';

+		$subelement = 'commande';

 	}

-	if ($objecttype == 'propal')  {

+	if ($objecttype == 'propal') {

 		$classpath = 'comm/propal/class';

 	}

-	if ($objecttype == 'supplier_proposal')  {

+	if ($objecttype == 'supplier_proposal') {

 		$classpath = 'supplier_proposal/class';

 	}

 	if ($objecttype == 'shipping') {

@@ -1832,33 +1832,33 @@ 
 	}

 	if ($objecttype == 'contract') {

 		$classpath = 'contrat/class';

-		$module='contrat';

-		$subelement='contrat';

+		$module = 'contrat';

+		$subelement = 'contrat';

 	}

 	if ($objecttype == 'member') {

 		$classpath = 'adherents/class';

-		$module='adherent';

-		$subelement='adherent';

+		$module = 'adherent';

+		$subelement = 'adherent';

 	}

 	if ($objecttype == 'cabinetmed_cons') {

 		$classpath = 'cabinetmed/class';

-		$module='cabinetmed';

-		$subelement='cabinetmedcons';

+		$module = 'cabinetmed';

+		$subelement = 'cabinetmedcons';

 	}

 	if ($objecttype == 'fichinter') {

 		$classpath = 'fichinter/class';

-		$module='ficheinter';

-		$subelement='fichinter';

+		$module = 'ficheinter';

+		$subelement = 'fichinter';

 	}

 	if ($objecttype == 'task') {

 		$classpath = 'projet/class';

-		$module='projet';

-		$subelement='task';

+		$module = 'projet';

+		$subelement = 'task';

 	}

 	if ($objecttype == 'stock') {

 		$classpath = 'product/stock/class';

-		$module='stock';

-		$subelement='stock';

+		$module = 'stock';

+		$subelement = 'stock';

 	}

 

 	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;

@@ -1866,33 +1866,33 @@ 
 	$classfile = strtolower($subelement); $classname = ucfirst($subelement);

 	if ($objecttype == 'invoice_supplier') {

 		$classfile = 'fournisseur.facture';

-		$classname='FactureFournisseur';

+		$classname = 'FactureFournisseur';

 		$classpath = 'fourn/class';

-		$module='fournisseur';

+		$module = 'fournisseur';

 	}

-	elseif ($objecttype == 'order_supplier')   {

+	elseif ($objecttype == 'order_supplier') {

 		$classfile = 'fournisseur.commande';

-		$classname='CommandeFournisseur';

+		$classname = 'CommandeFournisseur';

 		$classpath = 'fourn/class';

-		$module='fournisseur';

+		$module = 'fournisseur';

 	}

-	elseif ($objecttype == 'stock')   {

+	elseif ($objecttype == 'stock') {

 		$classpath = 'product/stock/class';

-		$classfile='entrepot';

-		$classname='Entrepot';

+		$classfile = 'entrepot';

+		$classname = 'Entrepot';

 	}

 	if (!empty(Globals::$conf->$module->enabled)) {

-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

+		$res = dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

 		if ($res)

 		{

 			if (class_exists($classname))

 			{

 				$object = new $classname($db);

-				$res=$object->fetch($objectid);

+				$res = $object->fetch($objectid);

 				if ($res > 0) {

-					$ret=$object->getNomUrl($withpicto,$option);

-				} elseif($res==0) {

-					$ret=$langs->trans('Deleted');

+					$ret = $object->getNomUrl($withpicto, $option);

+				} elseif ($res == 0) {

+					$ret = $langs->trans('Deleted');

 				}

 				unset($object);

 			}

@@ -1913,12 +1913,12 @@ 
  */

 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)

 {

-	$totalnb=0;

-	$listofid=array();

-	$listofparentid=array();

+	$totalnb = 0;

+	$listofid = array();

+	$listofparentid = array();

 

 	// Get list of all id in array listofid and all parents in array listofparentid

-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

+	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

 	$resql = $db->query($sql);

 	if ($resql)

 	{

@@ -1927,8 +1927,8 @@ 
 		while ($i < $num)

 		{

 			$obj = $db->fetch_object($resql);

-			$listofid[]=$obj->rowid;

-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;

+			$listofid[] = $obj->rowid;

+			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;

 			$i++;

 		}

 	}

@@ -1942,78 +1942,78 @@ 
 		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";

 

 		// Check loops on each other

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid"; // So we update only records linked to themself

 		$resql = $db->query($sql);

 		if ($resql)

 		{

-			$nb=$db->affected_rows($sql);

+			$nb = $db->affected_rows($sql);

 			if ($nb > 0)

 			{

 				print '<br>Some record that were parent of themself were cleaned.';

 			}

 

-			$totalnb+=$nb;

+			$totalnb += $nb;

 		}

 		//else dol_print_error($db);

 

 		// Check other loops

-		$listofidtoclean=array();

-		foreach($listofparentid as $id => $pid)

+		$listofidtoclean = array();

+		foreach ($listofparentid as $id => $pid)

 		{

 			// Check depth

 			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';

 

-			$cursor=$id; $arrayidparsed=array();	// We start from child $id

+			$cursor = $id; $arrayidparsed = array(); // We start from child $id

 			while ($cursor > 0)

 			{

-				$arrayidparsed[$cursor]=1;

+				$arrayidparsed[$cursor] = 1;

 				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child

 				{

 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';

 					unset($arrayidparsed);

-					$listofidtoclean[$cursor]=$id;

+					$listofidtoclean[$cursor] = $id;

 					break;

 				}

-				$cursor=$listofparentid[$cursor];

+				$cursor = $listofparentid[$cursor];

 			}

 

 			if (count($listofidtoclean)) break;

 		}

 

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;

-		$sql.= " SET ".$fieldfkparent." = 0";

-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong

+		$sql .= " SET ".$fieldfkparent." = 0";

+		$sql .= " WHERE rowid IN (".join(',', $listofidtoclean).")"; // So we update only records detected wrong

 		$resql = $db->query($sql);

 		if ($resql)

 		{

-			$nb=$db->affected_rows($sql);

+			$nb = $db->affected_rows($sql);

 			if ($nb > 0)

 			{

 				// Removed orphelins records

 				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';

-				print join(',',$listofidtoclean);

+				print join(',', $listofidtoclean);

 			}

 

-			$totalnb+=$nb;

+			$totalnb += $nb;

 		}

 		//else dol_print_error($db);

 

 		// Check and clean orphelins

 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;

-		$sql.= " SET ".$fieldfkparent." = 0";

-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent

+		$sql .= " SET ".$fieldfkparent." = 0";

+		$sql .= " WHERE ".$fieldfkparent." NOT IN (".join(',', $listofid).")"; // So we update only records linked to a non existing parent

 		$resql = $db->query($sql);

 		if ($resql)

 		{

-			$nb=$db->affected_rows($sql);

+			$nb = $db->affected_rows($sql);

 			if ($nb > 0)

 			{

 				// Removed orphelins records

 				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';

-				print join(',',$listofid);

+				print join(',', $listofid);

 			}

 

-			$totalnb+=$nb;

+			$totalnb += $nb;

 		}

 		//else dol_print_error($db);

 

@@ -2034,21 +2034,21 @@ 
     $module = $element = $subelement = $element_type;

 

     // If we ask an resource form external module (instead of default path)

-    if (preg_match('/^([^@]+)@([^@]+)$/i',$element_type,$regs))

+    if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs))

     {

         $element = $subelement = $regs[1];

         $module 	= $regs[2];

     }

 

     //print '<br>1. element : '.$element.' - module : '.$module .'<br>';

-    if ( preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))

+    if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))

     {

         $module = $element = $regs[1];

         $subelement = $regs[2];

     }

 

     // For compat

-    if($element_type == "action") {

+    if ($element_type == "action") {

         $classpath = 'comm/action/class';

         $subelement = 'Actioncomm';

         $module = 'agenda';

@@ -2057,18 +2057,18 @@ 
     // To work with non standard path

     if ($element_type == 'facture' || $element_type == 'invoice') {

         $classpath = 'compta/facture/class';

-        $module='facture';

-        $subelement='facture';

+        $module = 'facture';

+        $subelement = 'facture';

     }

     if ($element_type == 'commande' || $element_type == 'order') {

         $classpath = 'commande/class';

-        $module='commande';

-        $subelement='commande';

+        $module = 'commande';

+        $subelement = 'commande';

     }

-    if ($element_type == 'propal')  {

+    if ($element_type == 'propal') {

         $classpath = 'comm/propal/class';

     }

-    if ($element_type == 'supplier_proposal')  {

+    if ($element_type == 'supplier_proposal') {

         $classpath = 'supplier_proposal/class';

     }

     if ($element_type == 'shipping') {

@@ -2083,45 +2083,45 @@ 
     }

     if ($element_type == 'contract') {

         $classpath = 'contrat/class';

-        $module='contrat';

-        $subelement='contrat';

+        $module = 'contrat';

+        $subelement = 'contrat';

     }

     if ($element_type == 'member') {

         $classpath = 'adherents/class';

-        $module='adherent';

-        $subelement='adherent';

+        $module = 'adherent';

+        $subelement = 'adherent';

     }

     if ($element_type == 'cabinetmed_cons') {

         $classpath = 'cabinetmed/class';

-        $module='cabinetmed';

-        $subelement='cabinetmedcons';

+        $module = 'cabinetmed';

+        $subelement = 'cabinetmedcons';

     }

     if ($element_type == 'fichinter') {

         $classpath = 'fichinter/class';

-        $module='ficheinter';

-        $subelement='fichinter';

+        $module = 'ficheinter';

+        $subelement = 'fichinter';

     }

     if ($element_type == 'dolresource' || $element_type == 'resource') {

         $classpath = 'resource/class';

-        $module='resource';

-        $subelement='dolresource';

+        $module = 'resource';

+        $subelement = 'dolresource';

     }

     if ($element_type == 'propaldet') {

         $classpath = 'comm/propal/class';

-        $module='propal';

-        $subelement='propaleligne';

+        $module = 'propal';

+        $subelement = 'propaleligne';

     }

-    if ($element_type == 'order_supplier')  {

+    if ($element_type == 'order_supplier') {

         $classpath = 'fourn/class';

-        $module='fournisseur';

-        $subelement='commandefournisseur';

-        $classfile='fournisseur.commande';

+        $module = 'fournisseur';

+        $subelement = 'commandefournisseur';

+        $classfile = 'fournisseur.commande';

     }

-    if ($element_type == 'invoice_supplier')  {

+    if ($element_type == 'invoice_supplier') {

         $classpath = 'fourn/class';

-        $module='fournisseur';

-        $subelement='facturefournisseur';

-        $classfile='fournisseur.facture';

+        $module = 'fournisseur';

+        $subelement = 'facturefournisseur';

+        $classfile = 'fournisseur.facture';

     }

 

     if (!isset($classfile)) $classfile = strtolower($subelement);

@@ -2148,10 +2148,10 @@ 
  * @param	ref     	$element_ref 	Element ref (Use this if element_id but not both)

  * @return 	int|object 					object || 0 || -1 if error

  */

-function fetchObjectByElement($element_id, $element_type, $element_ref='')

+function fetchObjectByElement($element_id, $element_type, $element_ref = '')

 {

     global $conf;

-	global $db,$conf;

+	global $db, $conf;

 

     $element_prop = getElementProperties($element_type);

     if (is_array($element_prop) && Globals::$conf->{$element_prop['module']}->enabled) {

@@ -2177,11 +2177,11 @@ 
  *  @return	string						RGB hex value (without # before). For example: 'FF00FF', '01FF02'

  *  @see	colorStringToArray

  */

-function colorArrayToHex($arraycolor,$colorifnotfound='888888')

+function colorArrayToHex($arraycolor, $colorifnotfound = '888888')

 {

-	if (! is_array($arraycolor)) return $colorifnotfound;

+	if (!is_array($arraycolor)) return $colorifnotfound;

 	if (empty($arraycolor)) return $colorifnotfound;

-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));

+	return sprintf("%02s", dechex($arraycolor[0])).sprintf("%02s", dechex($arraycolor[1])).sprintf("%02s", dechex($arraycolor[2]));

 }

 

 /**

@@ -2196,15 +2196,15 @@ 
  */

 static function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))

     {

-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is

-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);

-	if (! $tmp)

+	if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is

+	$tmp = preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/', $stringcolor, $reg);

+	if (!$tmp)

 	{

-		$tmp=explode(',',$stringcolor);

+		$tmp = explode(',', $stringcolor);

 		if (count($tmp) < 3) return $colorifnotfound;

 		return $tmp;

 	}

-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));

+	return array(hexdec($reg[1]), hexdec($reg[2]), hexdec($reg[3]));

 }

 

 /**

@@ -2224,8 +2224,8 @@ 
     foreach ($input as $key => $values) {

         $append = array();

 

-        foreach($result as $product) {

-            foreach($values as $item) {

+        foreach ($result as $product) {

+            foreach ($values as $item) {

                 $product[$key] = $item;

                 $append[] = $product;

             }

@@ -2246,8 +2246,8 @@ 
  */

 function getModuleDirForApiClass($module)

 {

-    $moduledirforclass=$module;

-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);

+    $moduledirforclass = $module;

+    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);

 

     if ($module == 'contracts') {

     	$moduledirforclass = 'contrat';

@@ -2323,9 +2323,9 @@ 
  * @param	$max	int	Between 0 and 255

  * @return String

  */

-function random_color_part($min=0,$max=255)

+function random_color_part($min = 0, $max = 255)

 {

-    return str_pad( dechex( mt_rand( $min, $max) ), 2, '0', STR_PAD_LEFT);

+    return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);

 }

 

 /*

@@ -2335,8 +2335,8 @@ 
  * @param	$max	int	Between 0 and 255

  * @return String

  */

-function random_color($min=0, $max=255)

+function random_color($min = 0, $max = 255)

 {

-    return random_color_part($min, $max) . random_color_part($min, $max) . random_color_part($min, $max);

+    return random_color_part($min, $max).random_color_part($min, $max).random_color_part($min, $max);

 }

 }

Helpers/Security.php

Spacing +67 added lines, -67 removed lines

@@ -105,12 +105,12 @@ 
     static function dol_hash($chain, $type = '0')

     {

         // No need to add salt for password_hash

-        if (($type == '0' || $type == 'auto') &&!empty(Globals::$conf->global->MAIN_SECURITY_HASH_ALGO) && Globals::$conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash')) {

+        if (($type == '0' || $type == 'auto') && !empty(Globals::$conf->global->MAIN_SECURITY_HASH_ALGO) && Globals::$conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash')) {

             return password_hash($chain, PASSWORD_DEFAULT);

         }

         // Salt value

         if (!empty(Globals::$conf->global->MAIN_SECURITY_SALT)) {

-            $chain = Globals::$conf->global->MAIN_SECURITY_SALT . $chain;

+            $chain = Globals::$conf->global->MAIN_SECURITY_SALT.$chain;

         }

         if ($type == '1' || $type == 'sha1') {

             return sha1($chain);

@@ -122,7 +122,7 @@ 
             return md5($chain);

         }

         if ($type == '4' || $type == 'md5openldap') {

-            return '{md5}' . base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)

+            return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)

         }

         if ($type == '5') {

             return hash('sha256', $chain);

@@ -202,7 +202,7 @@ 
             return false;

 

         if ($dbt_select != 'rowid' && $dbt_select != 'id')

-            $objectid = "'" . $objectid . "'";

+            $objectid = "'".$objectid."'";

 

         // Features/modules to check

         $featuresarray = array($features);

@@ -402,7 +402,7 @@ 
                 else if ($feature == 'ftp') {

                     if (!$user->rights->ftp->write)

                         $deleteok = 0;

-                }else if ($feature == 'salaries') {

+                } else if ($feature == 'salaries') {

                     if (!$user->rights->salaries->delete)

                         $deleteok = 0;

                 }

@@ -480,8 +480,8 @@ 
                 $feature = 'projet_task';

 

             $check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)

-            $checksoc = array('societe');  // Test for societe object

-            $checkother = array('contact', 'agenda');  // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).

+            $checksoc = array('societe'); // Test for societe object

+            $checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).

             $checkproject = array('projet', 'project'); // Test for project object

             $checktask = array('projet_task');

             $nocheck = array('barcode', 'stock'); // No test

@@ -489,32 +489,32 @@ 
             // If dbtablename not defined, we use same name for table than module name

             if (empty($dbtablename)) {

                 $dbtablename = $feature;

-                $sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);  // We change dbtablename, so we set sharedelement too.

+                $sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename); // We change dbtablename, so we set sharedelement too.

             }

 

             // Check permission for object with entity

             if (in_array($feature, $check)) {

-                $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

                 if (($feature == 'user' || $feature == 'usergroup') && !empty(Globals::$conf->multicompany->enabled)) {

                     if (!empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                         if (Globals::$conf->entity == 1 && $user->admin && !$user->entity) {

-                            $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

+                            $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

                             $sql .= " AND dbt.entity IS NOT NULL";

                         } else {

-                            $sql .= "," . MAIN_DB_PREFIX . "usergroup_user as ug";

-                            $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

+                            $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+                            $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

                             $sql .= " AND (ug.fk_user = dbt.rowid";

-                            $sql .= " AND ug.entity IN (" . getEntity('user') . "))";

+                            $sql .= " AND ug.entity IN (".getEntity('user')."))";

                             $sql .= " OR dbt.entity = 0"; // Show always superadmin

                         }

                     } else {

-                        $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                        $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                        $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                        $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                     }

                 } else {

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checksoc)) { // We check feature = checksoc

                 // If external user: Check permission for external users

@@ -525,47 +525,47 @@ 
                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

                     $sql = "SELECT COUNT(sc.fk_soc) as nb";

-                    $sql .= " FROM (" . MAIN_DB_PREFIX . "societe_commerciaux as sc";

-                    $sql .= ", " . MAIN_DB_PREFIX . "societe as s)";

-                    $sql .= " WHERE sc.fk_soc IN (" . $objectid . ")";

-                    $sql .= " AND sc.fk_user = " . $user->id;

+                    $sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";

+                    $sql .= ", ".MAIN_DB_PREFIX."societe as s)";

+                    $sql .= " WHERE sc.fk_soc IN (".$objectid.")";

+                    $sql .= " AND sc.fk_user = ".$user->id;

                     $sql .= " AND sc.fk_soc = s.rowid";

-                    $sql .= " AND s.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";

                 }

                 // If multicompany and internal users with all permissions, check user is in correct entity

                 else if (!empty(Globals::$conf->multicompany->enabled)) {

                     $sql = "SELECT COUNT(s.rowid) as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";

-                    $sql .= " WHERE s.rowid IN (" . $objectid . ")";

-                    $sql .= " AND s.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

+                    $sql .= " WHERE s.rowid IN (".$objectid.")";

+                    $sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checkother)) { // Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).

                 // If external user: Check permission for external users

                 if ($user->socid > 0) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.fk_soc = " . $user->socid;

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.fk_soc = ".$user->socid;

                 }

                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '" . $user->id . "'";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

                     $sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

                 // If multicompany and internal users with all permissions, check user is in correct entity

                 else if (!empty(Globals::$conf->multicompany->enabled)) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checkproject)) {

                 if (!empty(Globals::$conf->projet->enabled) && empty($user->rights->projet->all->lire)) {

-                    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+                    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

                     $projectstatic = new Project($db);

                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);

                     $tmparray = explode(',', $tmps);

@@ -573,17 +573,17 @@ 
                         return false;

                 }

                 else {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (in_array($feature, $checktask)) {

                 if (!empty(Globals::$conf->projet->enabled) && empty($user->rights->projet->all->lire)) {

                     $task = new Task($db);

                     $task->fetch($objectid);

 

-                    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+                    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

                     $projectstatic = new Project($db);

                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);

                     $tmparray = explode(',', $tmps);

@@ -591,41 +591,41 @@ 
                         return false;

                 }

                 else {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             } else if (!in_array($feature, $nocheck)) {  // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield

                 // If external user: Check permission for external users

                 if ($user->socid > 0) {

                     if (empty($dbt_keyfield))

                         dol_print_error('', 'Param dbt_keyfield is required but not defined');

-                    $sql = "SELECT COUNT(dbt." . $dbt_keyfield . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt.rowid IN (" . $objectid . ")";

-                    $sql .= " AND dbt." . $dbt_keyfield . " = " . $user->socid;

+                    $sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.rowid IN (".$objectid.")";

+                    $sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;

                 }

                 // If internal user: Check permission for internal users that are restricted on their objects

                 else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {

                     if (empty($dbt_keyfield))

                         dol_print_error('', 'Param dbt_keyfield is required but not defined');

                     $sql = "SELECT COUNT(sc.fk_soc) as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

-                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND sc.fk_soc = dbt." . $dbt_keyfield;

-                    $sql .= " AND dbt." . $dbt_keyfield . " = s.rowid";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

-                    $sql .= " AND sc.fk_user = " . $user->id;

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= ", ".MAIN_DB_PREFIX."societe as s";

+                    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;

+                    $sql .= " AND dbt.".$dbt_keyfield." = s.rowid";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

+                    $sql .= " AND sc.fk_user = ".$user->id;

                 }

                 // If multicompany and internal users with all permissions, check user is in correct entity

                 else if (!empty(Globals::$conf->multicompany->enabled)) {

-                    $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";

-                    $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";

-                    $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";

+                    $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

+                    $sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+                    $sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+                    $sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

                 }

             }

 

@@ -658,7 +658,7 @@ 
     {

         global $conf, $db, $user, $langs;

         if (!is_object($langs)) {

-            include_once DOL_DOCUMENT_ROOT . '/core/class/translate.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';

             $langs = new Translate('', $conf);

             $langs->setDefaultLang();

         }

@@ -680,7 +680,7 @@ 
         print '<br>';

         if (empty($showonlymessage)) {

             if ($user->login) {

-                print $langs->trans("CurrentLogin") . ': <font class="error">' . $user->login . '</font><br>';

+                print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';

                 print $langs->trans("ErrorForbidden2", $langs->trans("Home"), $langs->trans("Users"));

             } else {

                 print $langs->trans("ErrorForbidden3");