alxarafe / alixar

Views/CategoriesIndexView.php

Spacing +14 added lines, -14 removed lines

@@ -109,7 +109,7 @@ 
 

         $this->llxHeader('', $this->title, '', '', 0, 0, $arrayofjs, $arrayofcss);

 

-        $newcardbutton = '<a class="butActionNew" href="' . BASE_URI . '/categories/card.php?action=create&type=' . $this->type . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . $this->type) . '"><span class="valignmiddle">' . Globals::$langs->trans("NewCategory") . '</span>';

+        $newcardbutton = '<a class="butActionNew" href="'.BASE_URI.'/categories/card.php?action=create&type='.$this->type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$this->type).'"><span class="valignmiddle">'.Globals::$langs->trans("NewCategory").'</span>';

         $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';

         $newcardbutton .= '</a>';

 

@@ -123,17 +123,17 @@ 
         /*

          * Zone recherche produit/service

          */

-        print '<form method="post" action="index.php?type=' . $this->type . '">';

-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-        print '<input type="hidden" name="type" value="' . $this->type . '">';

+        print '<form method="post" action="index.php?type='.$this->type.'">';

+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+        print '<input type="hidden" name="type" value="'.$this->type.'">';

 

 

         print '<table class="noborder nohover" width="100%">';

         print '<tr class="liste_titre">';

-        print '<td colspan="3">' . Globals::$langs->trans("Search") . '</td>';

+        print '<td colspan="3">'.Globals::$langs->trans("Search").'</td>';

         print '</tr>';

         print '<tr class="oddeven"><td>';

-        print Globals::$langs->trans("Name") . ':</td><td><input class="flat inputsearch" type="text" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="' . Globals::$langs->trans("Search") . '"></td></tr>';

+        print Globals::$langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.Globals::$langs->trans("Search").'"></td></tr>';

         /*

           // faire une rech dans une sous categorie uniquement

           print '<tr '.$bc[0].'><td>';

@@ -158,17 +158,17 @@ 
             $cats = $categstatic->rechercher($id, $catname, $this->typetext);

 

             print '<table class="noborder" width="100%">';

-            print '<tr class="liste_titre"><td colspan="2">' . Globals::$langs->trans("FoundCats") . '</td></tr>';

+            print '<tr class="liste_titre"><td colspan="2">'.Globals::$langs->trans("FoundCats").'</td></tr>';

 

             foreach ($cats as $cat) {

-                print "\t" . '<tr class="oddeven">' . "\n";

+                print "\t".'<tr class="oddeven">'."\n";

                 print "\t\t<td>";

                 $categstatic->id = $cat->id;

                 $categstatic->ref = $cat->label;

                 $categstatic->label = $cat->label;

                 $categstatic->type = $cat->type;

                 $categstatic->color = $cat->color;

-                print '<span class="noborderoncategories" ' . ($categstatic->color ? ' style="background: #' . $categstatic->color . ';"' : ' style="background: #aaa"') . '>';

+                print '<span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>';

                 print $categstatic->getNomUrl(1, '');

                 print '</span>';

                 print "</td>\n";

@@ -208,9 +208,9 @@ 
             $data[] = array(

                 'rowid' => $val['rowid'],

                 'fk_menu' => $val['fk_parent'],

-                'entry' => '<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" ' . ($categstatic->color ? ' style="background: #' . $categstatic->color . ';"' : ' style="background: #aaa"') . '>' . $li . '</span></td>' .

+                'entry' => '<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>'.$li.'</span></td>'.

                 //'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.

-                '<td align="right" width="20px;"><a href="' . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $val['id'] . '&type=' . $this->type . '">' . img_view() . '</a></td>' .

+                '<td align="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$this->type.'">'.img_view().'</a></td>'.

                 '</tr></table>'

             );

         }

@@ -219,9 +219,9 @@ 
 //print_barre_liste('', 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, 0, '', 0, $newcardbutton, '', 0, 1, 1);

 

         print '<table class="liste nohover" width="100%">';

-        print '<tr class="liste_titre"><td>' . Globals::$langs->trans("Categories") . '</td><td></td><td align="right">';

+        print '<tr class="liste_titre"><td>'.Globals::$langs->trans("Categories").'</td><td></td><td align="right">';

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

-            print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">' . img_picto('', 'object_category') . ' ' . Globals::$langs->trans("UndoExpandAll") . '</a> | <a class="notasortlink" href="#">' . img_picto('', 'object_category-expanded') . ' ' . Globals::$langs->trans("ExpandAll") . '</a></div>';

+            print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'object_category').' '.Globals::$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'object_category-expanded').' '.Globals::$langs->trans("ExpandAll").'</a></div>';

         }

         print '</td></tr>';

 

@@ -233,7 +233,7 @@ 
             print '</td></tr>';

         } else {

             print '<tr class="pair">';

-            print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>' . DolUtils::img_picto_common('', 'treemenu/branchbottom.gif') . '</td>';

+            print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.DolUtils::img_picto_common('', 'treemenu/branchbottom.gif').'</td>';

             print '<td valign="middle">';

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

             print '</td>';

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->beginTransaction();
 
                 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/CommonObject.php

Spacing +1479 added lines, -1479 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,7 +4760,7 @@ 
 	 *  @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)) {

@@ -4772,9 +4772,9 @@ 
 			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)

@@ -4790,7 +4790,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

 		{

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

@@ -4828,17 +4828,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]);

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

 		}

@@ -4898,37 +4898,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];

@@ -4936,13 +4936,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;

 			   		}

 			   	}

@@ -4953,25 +4953,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;

 						}

@@ -4985,12 +4985,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'...

@@ -5001,7 +5001,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

 									{

@@ -5012,7 +5012,7 @@ 
 			   					}

 			   					else

 			   					{

-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept

+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

 			   					}

 			   				}

 			   			}

@@ -5029,13 +5029,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]);

@@ -5044,18 +5044,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;

 								}

@@ -5079,46 +5079,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

 			}

@@ -5147,26 +5147,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];

@@ -5179,25 +5179,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;

 					}

@@ -5214,13 +5214,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]);

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

 			}

@@ -5238,24 +5238,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;

 			}

@@ -5282,71 +5282,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'];

 		}

@@ -5360,16 +5360,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

 			{

@@ -5388,12 +5388,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';

@@ -5401,235 +5401,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)

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

@@ -5651,23 +5651,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')

@@ -5682,24 +5682,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';

 					}

 				}

 

@@ -5710,50 +5710,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);

 

@@ -5762,8 +5762,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]};

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

@@ -5794,66 +5794,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() {

@@ -5868,7 +5868,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)';

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

@@ -5908,28 +5908,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 '';

 

@@ -5953,18 +5953,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

 			{

@@ -5985,49 +5985,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')

 		{

@@ -6035,40 +6035,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;

@@ -6077,38 +6077,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]};

 					}

 				}

 			}

@@ -6116,18 +6116,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')

@@ -6142,7 +6142,7 @@ 
 

 			if (count($InfoFieldList) >= 3) {

 				$selectkey = $InfoFieldList[2];

-				$keyList = $InfoFieldList[2] . ' as rowid';

+				$keyList = $InfoFieldList[2].' as rowid';

 			}

 

 			$fields_label = explode('|', $InfoFieldList[1]);

@@ -6151,75 +6151,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

@@ -6228,15 +6228,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')

 		{

@@ -6244,7 +6244,7 @@ 
 		}

 

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

-		$out=$value;

+		$out = $value;

 

 		return $out;

 	}

@@ -6261,11 +6261,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 = '';

 

@@ -6276,10 +6276,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]))

@@ -6293,25 +6293,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))

 						{

@@ -6322,7 +6322,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;

@@ -6334,11 +6334,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'];

 						}

 					}

 

@@ -6360,35 +6360,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;

@@ -6453,7 +6453,7 @@ 
 		global $user;

 

 		$element = $this->element;

-		if ($element == 'facturerec') $element='facture';

+		if ($element == 'facturerec') $element = 'facture';

 

 		return $user->rights->{$element};

 	}

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

 			}

@@ -6511,7 +6511,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';

@@ -6582,18 +6582,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')

 		{

@@ -6608,26 +6608,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

           {

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

@@ -6661,36 +6661,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)

 						{

@@ -6698,81 +6698,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>';

 							}

 						}

 					}

@@ -6782,18 +6782,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>';

 				}

 			}

 		}

@@ -6812,9 +6812,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;

@@ -6828,9 +6828,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;

@@ -6844,7 +6844,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;

 	}

 

@@ -6856,9 +6856,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;

@@ -6872,7 +6872,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;

@@ -6888,9 +6888,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;

@@ -6904,9 +6904,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;

@@ -6922,13 +6922,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;

 				}

@@ -6937,10 +6937,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});

@@ -6948,20 +6948,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

 			{

@@ -6969,7 +6969,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;

@@ -6985,35 +6985,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

 			{

@@ -7022,7 +7022,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;

 	}

 

 	/**

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

@@ -7080,58 +7080,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

 		}

@@ -7160,13 +7160,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)

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

@@ -7220,10 +7220,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));

 			/*

@@ -7234,13 +7234,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();

@@ -7249,7 +7249,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++;

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

 		}

@@ -7283,68 +7283,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();

 			}

@@ -7385,9 +7385,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/Categorie.php

Spacing +171 added lines, -171 removed lines

@@ -254,17 +254,17 @@ 
         }

 

         $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 = '" . $label . "' AND entity IN (" . DolUtils::getEntity('category') . ")";

+            $sql .= " WHERE label = '".$label."' AND entity IN (".DolUtils::getEntity('category').")";

             if (!is_null($type)) {

-                $sql .= " AND type = " . $type;

+                $sql .= " AND type = ".$type;

             }

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

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

         if ($resql) {

             if (count($resql) > 0) {

@@ -323,7 +323,7 @@ 
 

         $error = 0;

 

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

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

 

         // Clean parameters

         $this->label = trim($this->label);

@@ -337,14 +337,14 @@ 
 

         if ($this->already_exists()) {

             $this->error = $langs->trans("ImpossibleAddCat", $this->label);

-            $this->error .= " : " . $langs->trans("CategoryExistsAtSameLevel");

+            $this->error .= " : ".$langs->trans("CategoryExistsAtSameLevel");

             dol_syslog($this->error, LOG_WARNING);

             return -4;

         }

 

         Config::$dbEngine->beginTransaction();

 

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie (";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (";

         $sql .= "fk_parent,";

         $sql .= " label,";

         $sql .= " description,";

@@ -357,22 +357,22 @@ 
         $sql .= " import_key,";

         $sql .= " entity";

         $sql .= ") VALUES (";

-        $sql .= Config::$dbEngine->escape($this->fk_parent) . ",";

-        $sql .= "'" . Config::$dbEngine->escape($this->label) . "',";

-        $sql .= "'" . Config::$dbEngine->escape($this->description) . "',";

-        $sql .= "'" . Config::$dbEngine->escape($this->color) . "',";

+        $sql .= Config::$dbEngine->escape($this->fk_parent).",";

+        $sql .= "'".Config::$dbEngine->escape($this->label)."',";

+        $sql .= "'".Config::$dbEngine->escape($this->description)."',";

+        $sql .= "'".Config::$dbEngine->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 .= "'" . Config::$dbEngine->escape($this->visible) . "',";

-        $sql .= Config::$dbEngine->escape($type) . ",";

-        $sql .= (!empty($this->import_key) ? "'" . Config::$dbEngine->escape($this->import_key) . "'" : 'null') . ",";

+        $sql .= "'".Config::$dbEngine->escape($this->visible)."',";

+        $sql .= Config::$dbEngine->escape($type).",";

+        $sql .= (!empty($this->import_key) ? "'".Config::$dbEngine->escape($this->import_key)."'" : 'null').",";

         $sql .= Config::$dbEngine->escape(Globals::$conf->entity);

         $sql .= ")";

 

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

         if ($res) {

-            $id = Config::$dbEngine->last_insert_id(MAIN_DB_PREFIX . "categorie");

+            $id = Config::$dbEngine->last_insert_id(MAIN_DB_PREFIX."categorie");

 

             if ($id > 0) {

                 $this->id = $id;

@@ -436,24 +436,24 @@ 
 

         if ($this->already_exists()) {

             $this->error = $langs->trans("ImpossibleUpdateCat");

-            $this->error .= " : " . $langs->trans("CategoryExistsAtSameLevel");

+            $this->error .= " : ".$langs->trans("CategoryExistsAtSameLevel");

             return -1;

         }

 

         Config::$dbEngine->begin();

 

-        $sql = "UPDATE " . MAIN_DB_PREFIX . "categorie";

-        $sql .= " SET label = '" . Config::$dbEngine->escape($this->label) . "',";

-        $sql .= " description = '" . Config::$dbEngine->escape($this->description) . "',";

-        $sql .= " color = '" . Config::$dbEngine->escape($this->color) . "'";

+        $sql = "UPDATE ".MAIN_DB_PREFIX."categorie";

+        $sql .= " SET label = '".Config::$dbEngine->escape($this->label)."',";

+        $sql .= " description = '".Config::$dbEngine->escape($this->description)."',";

+        $sql .= " color = '".Config::$dbEngine->escape($this->color)."'";

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

-            $sql .= ", fk_soc = " . ($this->socid != -1 ? $this->socid : 'null');

+            $sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');

         }

-        $sql .= ", visible = '" . Config::$dbEngine->escape($this->visible) . "'";

-        $sql .= ", fk_parent = " . $this->fk_parent;

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

+        $sql .= ", visible = '".Config::$dbEngine->escape($this->visible)."'";

+        $sql .= ", fk_parent = ".$this->fk_parent;

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

 

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

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

         if (Config::$dbEngine->select($sql)) {

             $action = 'update';

 

@@ -502,7 +502,7 @@ 
         // Clean parameters

         $this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);

 

-        dol_syslog(get_class($this) . "::remove");

+        dol_syslog(get_class($this)."::remove");

 

         Config::$dbEngine->begin();

 

@@ -516,9 +516,9 @@ 
 

         /* FIX #1317 : Check for child category and move up 1 level */

         if (!$error) {

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "categorie";

-            $sql .= " SET fk_parent = " . $this->fk_parent;

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

+            $sql = "UPDATE ".MAIN_DB_PREFIX."categorie";

+            $sql .= " SET fk_parent = ".$this->fk_parent;

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

 

             if (!Config::$dbEngine->select($sql)) {

                 $this->error = Config::$dbEngine->lasterror();

@@ -538,11 +538,11 @@ 
             'categorie' => 'rowid',

         );

         foreach ($arraydelete as $key => $value) {

-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . $key;

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

+            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$key;

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

             if (!Config::$dbEngine->select($sql)) {

                 $this->errors[] = Config::$dbEngine->lasterror();

-                dol_syslog("Error sql=" . $sql . " " . $this->error, LOG_ERR);

+                dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);

                 $error++;

             }

         }

@@ -552,7 +552,7 @@ 
             $result = $this->deleteExtraFields();

             if ($result < 0) {

                 $error++;

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

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

             }

         }

 

@@ -585,17 +585,17 @@ 
 

         Config::$dbEngine->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);

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

         if (Config::$dbEngine->select($sql)) {

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

-                $sql = 'SELECT fk_parent FROM ' . MAIN_DB_PREFIX . 'categorie';

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

+                $sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';

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

 

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

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

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

                 if ($resql) {

                     if (Config::$dbEngine->num_rows($resql) > 0) {

@@ -672,19 +672,19 @@ 
         // 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);

         }

 

         Config::$dbEngine->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);

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

         if (Config::$dbEngine->select($sql)) {

             // Call trigger

             $this->context = array('unlinkoff' => $obj); // Save object we want to link category to into category instance to provide information to trigger

@@ -722,28 +722,28 @@ 
 

         $obj = new $this->MAP_OBJ_CLASS[$type](Config::$dbEngine);

 

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

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

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

         if ($resql) {

             while ($rec = Config::$dbEngine->fetch_array($resql)) {

                 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](Config::$dbEngine);

-                    $obj->fetch($rec['fk_' . $this->MAP_CAT_FK[$type]]);

+                    $obj->fetch($rec['fk_'.$this->MAP_CAT_FK[$type]]);

                     $objs[] = $obj;

                 }

             }

             return $objs;

         } else {

-            $this->error = Config::$dbEngine->error() . ' sql=' . $sql;

+            $this->error = Config::$dbEngine->error().' sql='.$sql;

             return -1;

         }

     }

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

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

+        $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 = Config::$dbEngine->select($sql);

         if ($resql) {

             return Config::$dbEngine->fetch_object($resql)->nb;

         } else {

-            $this->error = Config::$dbEngine->error() . ' sql=' . $sql;

+            $this->error = Config::$dbEngine->error().' sql='.$sql;

             return -1;

         }

     }

@@ -788,7 +788,7 @@ 
         $categories = array();

 

         $sub_type = $type;

-        $subcol_name = "fk_" . $type;

+        $subcol_name = "fk_".$type;

         if ($type == "customer") {

             $sub_type = "societe";

             $subcol_name = "fk_soc";

@@ -801,12 +801,12 @@ 
             $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 .= " 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 .= ' AND sub.'.$subcol_name.' = '.$id;

 

         $sql .= Config::$dbEngine->order($sortfield, $sortorder);

 

@@ -870,8 +870,8 @@ 
     function get_filles()

     {

         // phpcs:enable

-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";

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

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";

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

 

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

         if ($res) {

@@ -903,11 +903,11 @@ 
 

         // Load array[child]=parent

         $sql = "SELECT fk_parent as id_parent, rowid as id_son";

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

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

         $sql .= " WHERE fk_parent != 0";

-        $sql .= " AND entity IN (" . DolUtils::getEntity('category') . ")";

+        $sql .= " AND entity IN (".DolUtils::getEntity('category').")";

 

-        DolUtils::dol_syslog(get_class($this) . "::load_motherof", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);

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

         if (is_array($resql)) {

             foreach ($resql as $_obj) {

@@ -959,15 +959,15 @@ 
         {

             $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 .= " 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 (" . DolUtils::getEntity('category') . ")";

-        $sql .= " AND c.type = " . $type;

+        $sql .= " WHERE c.entity IN (".DolUtils::getEntity('category').")";

+        $sql .= " AND c.type = ".$type;

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_arbo get category list", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_arbo get category list", LOG_DEBUG);

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

         if (is_array($resql)) {

             foreach ($resql as $_obj) {

@@ -987,7 +987,7 @@ 
         }

 

         // We add the fullpath property to each elements of first level (no parent exists)

-        DolUtils::dol_syslog(get_class($this) . "::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);

         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)

@@ -996,18 +996,18 @@ 
         // Exclude leaf including $markafterid from tree

         if ($markafterid) {

             //print "Look to discard category ".$markafterid."\n";

-            $keyfilter1 = '^' . $markafterid . '$';

-            $keyfilter2 = '_' . $markafterid . '$';

-            $keyfilter3 = '^' . $markafterid . '_';

-            $keyfilter4 = '_' . $markafterid . '_';

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

                 }

             }

         }

 

-        DolUtils::dol_syslog(get_class($this) . "::get_full_arbo dol_sort_array", LOG_DEBUG);

+        DolUtils::dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);

         $this->cats = DolUtils::dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);

 

         //$this->debug_cats();

@@ -1026,26 +1026,26 @@ 
     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);

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

             // Already defined

-            dol_syslog(get_class($this) . "::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);

+            dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);

             return;

         }

 

         // First build full array $motherof

         //$this->load_motherof();	// Disabled because already done by caller of build_path_from_id_categ

         // Define fullpath and fulllabel

-        $this->cats[$id_categ]['fullpath'] = '_' . $id_categ;

+        $this->cats[$id_categ]['fullpath'] = '_'.$id_categ;

         $this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];

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

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

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

@@ -1068,12 +1068,12 @@ 
         // phpcs:enable

         // Display $this->cats

         foreach ($this->cats as $key => $val) {

-            print 'id: ' . $this->cats[$key]['id'];

-            print ' label: ' . $this->cats[$key]['label'];

-            print ' mother: ' . $this->cats[$key]['fk_parent'];

+            print 'id: '.$this->cats[$key]['id'];

+            print ' label: '.$this->cats[$key]['label'];

+            print ' mother: '.$this->cats[$key]['fk_parent'];

             //print ' children: '.(is_array($this->cats[$key]['id_children'])?join(',',$this->cats[$key]['id_children']):'');

-            print ' fullpath: ' . $this->cats[$key]['fullpath'];

-            print ' fulllabel: ' . $this->cats[$key]['fulllabel'];

+            print ' fullpath: '.$this->cats[$key]['fullpath'];

+            print ' fulllabel: '.$this->cats[$key]['fulllabel'];

             print "<br>\n";

         }

     }

@@ -1092,10 +1092,10 @@ 
         if (!is_numeric($type))

             $type = $this->MAP_ID[$type];

 

-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";

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

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";

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

         if (!is_null($type))

-            $sql .= " AND type = " . $type;

+            $sql .= " AND type = ".$type;

         if ($parent)

             $sql .= " AND fk_parent = 0";

 

@@ -1132,13 +1132,13 @@ 
          * 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 = '" . Config::$dbEngine->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 = '".Config::$dbEngine->escape($this->label)."'";

 

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

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

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

         if ($resql) {

             if (Config::$dbEngine->num_rows($resql) > 0) {      // Checking for empty resql{

@@ -1149,11 +1149,11 @@ 
                  * update may be for label.

                  */

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

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

                 }

             }

-            dol_syslog(get_class($this) . "::already_exists no category with same name=" . $this->label . " and same parent " . $this->fk_parent . " than category id=" . $this->id, LOG_DEBUG);

+            dol_syslog(get_class($this)."::already_exists no category with same name=".$this->label." and same parent ".$this->fk_parent." than category id=".$this->id, LOG_DEBUG);

             return 0;

         } else {

             $this->error = Config::$dbEngine->error();

@@ -1210,11 +1210,11 @@ 
                 }

 

                 if ($url == '') {

-                    $link = '<a href="' . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $cat->id . '&type=' . $cat->type . '" class="' . $forced_color . '">';

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

+                    $w[] = $link.$cat->label.$linkend;

                 } else {

-                    $w[] = "<a href='" . DOL_URL_ROOT . "/$url?catid=" . $cat->id . "'>" . $cat->label . "</a>";

+                    $w[] = "<a href='".DOL_URL_ROOT."/$url?catid=".$cat->id."'>".$cat->label."</a>";

                 }

             }

             $newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));

@@ -1236,8 +1236,8 @@ 
         // phpcs:enable

         $parents = array();

 

-        $sql = "SELECT fk_parent FROM " . MAIN_DB_PREFIX . "categorie";

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

+        $sql = "SELECT fk_parent FROM ".MAIN_DB_PREFIX."categorie";

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

 

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

 

@@ -1306,8 +1306,8 @@ 
         if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code

             // 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 .= " 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 = Config::$dbEngine->select($sql);

@@ -1330,9 +1330,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 = Config::$dbEngine->select($sql);

             if ($res) {

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

@@ -1381,23 +1381,23 @@ 
             // We want to reverse lookup

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

-                $nom = '%' . str_replace('*', '%', $nom) . '%';

+                $nom = '%'.str_replace('*', '%', $nom).'%';

             if (!$case)

-                $sql .= " AND label LIKE '" . Config::$dbEngine->escape($nom) . "'";

+                $sql .= " AND label LIKE '".Config::$dbEngine->escape($nom)."'";

             else

-                $sql .= " AND label LIKE BINARY '" . Config::$dbEngine->escape($nom) . "'";

+                $sql .= " AND label LIKE BINARY '".Config::$dbEngine->escape($nom)."'";

         }

         if ($id) {

-            $sql .= " AND rowid = '" . $id . "'";

+            $sql .= " AND rowid = '".$id."'";

         }

 

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

@@ -1410,7 +1410,7 @@ 
 

             return $cats;

         } else {

-            $this->error = Config::$dbEngine->error() . ' sql=' . $sql;

+            $this->error = Config::$dbEngine->error().' sql='.$sql;

             return -1;

         }

     }

@@ -1429,7 +1429,7 @@ 
         global $langs;

 

         $result = '';

-        $label = $langs->trans("ShowCategory") . ': ' . ($this->ref ? $this->ref : $this->label);

+        $label = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label);

 

         // Check contrast with background and correct text color

         $forced_color = 'categtextwhite';

@@ -1438,18 +1438,18 @@ 
                 $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 . '">';

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

 

 

         if ($withpicto)

-            $result .= ($link . img_object($label, $picto, 'class="classfortooltip"') . $linkend);

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

+            $result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;

         return $result;

     }

 

@@ -1464,9 +1464,9 @@ 
     function add_photo($sdir, $file)

     {

         // phpcs:enable

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

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

@@ -1476,9 +1476,9 @@ 
         if (file_exists($dir)) {

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

@@ -1489,7 +1489,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);

@@ -1513,32 +1513,32 @@ 
     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();

 

-        $dirthumb = $dir . 'thumbs/';

+        $dirthumb = $dir.'thumbs/';

 

         if (file_exists($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 = 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;

+                        if ($photo_vignette && is_file($dirthumb.$photo_vignette))

+                            $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;

                         else

                             $obj['photo_vignette'] = "";

 

@@ -1567,19 +1567,19 @@ 
     function delete_photo($file)

     {

         // phpcs:enable

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

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

 

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

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

         // On efface l'image d'origine

         dol_delete_file($file, 1);

 

         // Si elle existe, on efface la vignette

         if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $filename, $regs)) {

-            $photo_vignette = preg_replace('/' . $regs[0] . '/i', '', $filename) . '_small' . $regs[0];

-            if (file_exists($dirthumb . $photo_vignette)) {

-                dol_delete_file($dirthumb . $photo_vignette, 1);

+            $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];

+            if (file_exists($dirthumb.$photo_vignette)) {

+                dol_delete_file($dirthumb.$photo_vignette, 1);

             }

         }

     }

@@ -1615,43 +1615,43 @@ 
 

         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 = Config::$dbEngine->select($sql);

 

             if ($key == $current_lang) {

                 if (Config::$dbEngine->num_rows($result)) { // si aucune ligne dans la base{

-                    $sql2 = "UPDATE " . MAIN_DB_PREFIX . "categorie_lang";

-                    $sql2 .= " SET label='" . Config::$dbEngine->escape($this->label) . "',";

-                    $sql2 .= " description='" . Config::$dbEngine->escape($this->description) . "'";

-                    $sql2 .= " WHERE fk_category=" . $this->id . " AND lang='" . Config::$dbEngine->escape($key) . "'";

+                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";

+                    $sql2 .= " SET label='".Config::$dbEngine->escape($this->label)."',";

+                    $sql2 .= " description='".Config::$dbEngine->escape($this->description)."'";

+                    $sql2 .= " WHERE fk_category=".$this->id." AND lang='".Config::$dbEngine->escape($key)."'";

                 } else {

-                    $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_lang (fk_category, lang, label, description)";

-                    $sql2 .= " VALUES(" . $this->id . ",'" . $key . "','" . Config::$dbEngine->escape($this->label);

-                    $sql2 .= "','" . Config::$dbEngine->escape($this->multilangs["$key"]["description"]) . "')";

+                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";

+                    $sql2 .= " VALUES(".$this->id.",'".$key."','".Config::$dbEngine->escape($this->label);

+                    $sql2 .= "','".Config::$dbEngine->escape($this->multilangs["$key"]["description"])."')";

                 }

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

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

                 if (!Config::$dbEngine->query($sql2)) {

                     $this->error = Config::$dbEngine->lasterror();

                     return -1;

                 }

             } else if (isset($this->multilangs["$key"])) {

                 if (Config::$dbEngine->num_rows($result)) { // si aucune ligne dans la base{

-                    $sql2 = "UPDATE " . MAIN_DB_PREFIX . "categorie_lang";

-                    $sql2 .= " SET label='" . Config::$dbEngine->escape($this->multilangs["$key"]["label"]) . "',";

-                    $sql2 .= " description='" . Config::$dbEngine->escape($this->multilangs["$key"]["description"]) . "'";

-                    $sql2 .= " WHERE fk_category=" . $this->id . " AND lang='" . Config::$dbEngine->escape($key) . "'";

+                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";

+                    $sql2 .= " SET label='".Config::$dbEngine->escape($this->multilangs["$key"]["label"])."',";

+                    $sql2 .= " description='".Config::$dbEngine->escape($this->multilangs["$key"]["description"])."'";

+                    $sql2 .= " WHERE fk_category=".$this->id." AND lang='".Config::$dbEngine->escape($key)."'";

                 } else {

-                    $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_lang (fk_category, lang, label, description)";

-                    $sql2 .= " VALUES(" . $this->id . ",'" . $key . "','" . Config::$dbEngine->escape($this->multilangs["$key"]["label"]);

-                    $sql2 .= "','" . Config::$dbEngine->escape($this->multilangs["$key"]["description"]) . "')";

+                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";

+                    $sql2 .= " VALUES(".$this->id.",'".$key."','".Config::$dbEngine->escape($this->multilangs["$key"]["label"]);

+                    $sql2 .= "','".Config::$dbEngine->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"])

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

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

                 if (!Config::$dbEngine->query($sql2)) {

                     $this->error = Config::$dbEngine->lasterror();

                     return -1;

@@ -1682,8 +1682,8 @@ 
         $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 = Config::$dbEngine->select($sql);

         if ($result) {

@@ -1698,7 +1698,7 @@ 
             }

             return 1;

         } else {

-            $this->error = $langs->trans("Error") . " : " . Config::$dbEngine->error() . " - " . $sql;

+            $this->error = $langs->trans("Error")." : ".Config::$dbEngine->error()." - ".$sql;

             return -1;

         }

     }

@@ -1723,7 +1723,7 @@ 
      */

     function initAsSpecimen()

     {

-        dol_syslog(get_class($this) . "::initAsSpecimen");

+        dol_syslog(get_class($this)."::initAsSpecimen");

 

         // Initialise parametres

         $this->id = 0;

Helpers/DolUtils.php

Spacing +532 added lines, -532 removed lines

@@ -52,7 +52,7 @@ 
      */

     static function getStaticMember($class, $member)

     {

-        DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        DolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member

         /* if (version_compare(phpversion(), '5.3.0', '<'))

@@ -77,7 +77,7 @@ 
 

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

             return $class::$member;

-        dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

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

         return null;

     }

 

@@ -94,9 +94,9 @@ 
      */

     static function getDoliDBInstance($type, $host, $user, $pass, $name, $port)

     {

-        require_once DOL_BASE_PATH . "/core/db/" . $type . '.class.php';

+        require_once DOL_BASE_PATH."/core/db/".$type.'.class.php';

 

-        $class = 'DoliDB' . ucfirst($type);

+        $class = 'DoliDB'.ucfirst($type);

         $dolidb = new $class($type, $host, $user, $pass, $name, $port);

         return $dolidb;

     }

@@ -265,7 +265,7 @@ 
             $depth = $db->transaction_opened;

             $disconnectdone = $db->close();

         }

-        DolUtils::dol_syslog("--- End access to " . $_SERVER["PHP_SELF"] . (($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was ' . $depth . ')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

+        DolUtils::dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

     }

 

     /**

@@ -310,7 +310,7 @@ 
         if (empty($paramname))

             return 'BadFirstParameterForDolUtils::GETPOST';

         if (empty($check)) {

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

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

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

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

         }

@@ -332,7 +332,7 @@ 
             $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);

             //var_dump($relativepathstring);

@@ -340,8 +340,8 @@ 
             // Code for search criteria persistence.

             // Retrieve values if restore_lastsearch_values

             if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not DolUtils::GETPOST

-                if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values

-                    $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);

+                if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values

+                    $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);

                     if (is_array($tmp)) {

                         foreach ($tmp as $key => $val) {

                             if ($key == $paramname) { // We are on the requested parameter

@@ -352,12 +352,12 @@ 
                     }

                 }

                 // If there is saved contextpage, page or limit

-                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];

-                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_page_' . $relativepathstring];

-                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_limit_' . $relativepathstring];

+                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];

+                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_page_'.$relativepathstring];

+                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_limit_'.$relativepathstring];

                 }

             }

             // Else, retreive default values if we are not doing a sort

@@ -425,7 +425,7 @@ 
                                             $qualified = 1;

 

                                         if ($qualified) {

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

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

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

                                                 if ($out)

                                                     $out .= ', ';

@@ -461,11 +461,11 @@ 
                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

                                             // We made a search from quick search menu, do we still use default filter ?

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

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

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

                                                 $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                             }

                                         } else {

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

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

                                             $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                         }

                                         break;

@@ -483,7 +483,7 @@ 
         // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.

         if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

             $maxloop = 20;

-            $loopnb = 0;    // Protection against infinite loop

+            $loopnb = 0; // Protection against infinite loop

             while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

                 $loopnb++;

                 $newout = '';

@@ -528,7 +528,7 @@ 
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

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

                 } else

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

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

 

 

 

@@ -573,7 +573,7 @@ 
 

                     

 //var_dump('__'.$reg[1].'__ -> '.$newout);

-                $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);

+                $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);

             }

         }

 

@@ -683,7 +683,7 @@ 
         // If prefix is for email

         if ($mode == 'email') {

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

-                return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+                return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

             }

             // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

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

@@ -693,16 +693,16 @@ 
                 return $_SERVER["SERVER_NAME"];

             }

 

-            return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

 

         if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-            return Security::dol_hash($_SERVER["SERVER_NAME"] . $_SERVER["DOCUMENT_ROOT"] . DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return Security::dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

 

             // Use this for a "readable" cookie name

             //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

-        return Security::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+        return Security::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

     }

 

     /**

@@ -722,7 +722,7 @@ 
         $fullpath = dol_buildpath($relpath);

 

         if (!file_exists($fullpath)) {

-            DolUtils::dol_syslog('functions::dol_include_once Tried to load unexisting file: ' . $relpath, LOG_ERR);

+            DolUtils::dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);

             return false;

         }

 

@@ -751,14 +751,14 @@ 
 

         if ($type == 0 /* empty($type) */) { // For a filesystem path

 //$res = DOL_BASE_PATH . '' . $path;  // Standard default path

-            $res = DOL_BASE_PATH . '/' . $path;  // Standard default path

+            $res = DOL_BASE_PATH.'/'.$path; // Standard default path

             if (isset(Globals::$conf->file->dol_document_root)) {

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

                     if ($key == 'main') {

                         continue;

                     }

-                    if (file_exists($dirroot . '/' . $path)) {

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

+                    if (file_exists($dirroot.'/'.$path)) {

+                        $res = $dirroot.'/'.$path;

                         return $res;

                     }

                 }

@@ -775,13 +775,13 @@ 
 // using proxy, rewriting, virtual path, etc...

             $res = '';

             if ($type == 1) {

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

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

             }

             if ($type == 2) {

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

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

             }

             if ($type == 3) {

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

+                $res = DOL_BASE_URI.'/'.$path;

             }

 

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

@@ -790,33 +790,33 @@ 
                         // global $dolibarr_main_url_root;

                         // Define $urlwithroot

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

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

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

 

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

+                        $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // 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

 

-                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . '/' . $path;     // Test on start with http is for old conf syntax

+                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax

                     }

                     continue;

                 }

-                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs);    // Take part before '?'

+                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'

                 if (!empty($regs[1])) {

                     //print $key.'-'.$dirroot.'/'.$path.'-'.Globals::$conf->file->dol_url_root[$type].'<br>'."\n";

-                    if (file_exists($dirroot . '/' . $regs[1])) {

+                    if (file_exists($dirroot.'/'.$regs[1])) {

                         if ($type == 1) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 2) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 3) {

                             // global $dolibarr_main_url_root;

                             // Define $urlwithroot

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

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

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

+                            $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // 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

 

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;     // Test on start with http is for old conf syntax

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).Globals::$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax

                         }

                         break;

                     }

@@ -844,7 +844,7 @@ 
         if (empty($native)) {

             $myclone = unserialize(serialize($object));

         } else {

-            $myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

+            $myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

         }

 

         return $myclone;

@@ -965,7 +965,7 @@ 
      */

     static function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

     {

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

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

         $forbidden_chars_to_remove = array();

         if (is_array($badcharstoreplace))

             $forbidden_chars_to_replace = $badcharstoreplace;

@@ -1028,12 +1028,12 @@ 
     static function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)

     {

 // escape quotes and backslashes, newlines, etc.

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

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

         if (!$keepb)

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

         if (!$keepn)

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

-        return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

+        return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

     /**

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

 // If adding log inside HTML page is required

             if (!empty($_REQUEST['logtohtml']) && (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_TO_HTML) || !empty(Globals::$conf->global->MAIN_LOGTOHTML))) {   // MAIN_LOGTOHTML kept for backward compatibility

-                Globals::$conf->logbuffer[] = DolUtils::dol_print_date(time(), "%Y-%m-%d %H:%M:%S") . " " . $message;

+                Globals::$conf->logbuffer[] = DolUtils::dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$message;

             }

 

 //TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output

 // If html log tag enabled and url parameter log defined, we show output log on HTML comments

             if (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {

                 print "\n\n<!-- Log start\n";

-                print $message . "\n";

+                print $message."\n";

                 print "Log end -->\n";

             }

 

@@ -1124,7 +1124,7 @@ 
 

 // This is when server run behind a reverse proxy

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

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

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

 // This is when server run normally on a server

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

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

@@ -1133,10 +1133,10 @@ 
                 $data['ip'] = $_SERVER['SERVER_ADDR'];

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

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

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

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

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

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

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

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

 // Loop on each log handler and send output

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

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

@@ -1188,10 +1188,10 @@ 
     {

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

 

-        $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

+        $out = "\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";

 

         if ($morehtmlright) {

-            $out .= '<div class="inline-block floatright tabsElem">' . $morehtmlright . '</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

+            $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

         }

 

 // Show title

@@ -1202,8 +1202,8 @@ 
             $limittitle = 30;

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

             if ($picto)

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

-            $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

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

+            $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

             $out .= '</a>';

         }

 

@@ -1243,23 +1243,23 @@ 
             }

 

             if ($i < $limittoshow || $isactive) {

-                $out .= '<div class="inline-block tabsElem' . ($isactive ? ' tabsElemActive' : '') . ((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '') . '"><!-- id tab = ' . (empty($links[$i][2]) ? '' : $links[$i][2]) . ' -->';

+                $out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

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

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

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

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

                     } else {

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

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

                     }

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

                     //print "x $i $active ".$links[$i][2]." z";

                     if ($isactive) {

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

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

                         $out .= $links[$i][1];

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

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

                     } else {

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

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

                         $out .= $links[$i][1];

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

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

                     }

                 }

                 $out .= '</div>';

@@ -1272,14 +1272,14 @@ 
                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

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

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

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

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

                     else

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

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

                 }

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

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

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

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

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

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

                 }

                 $outmore .= '</div>';

 

@@ -1295,24 +1295,24 @@ 
             $right = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');

 

             $tabsname = str_replace("@", "", $picto);

-            $out .= '<div id="moretabs' . $tabsname . '" class="inline-block tabsElem">';

-            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">' . Globals::$langs->trans("More") . '... (' . $nbintab . ')</a>';

-            $out .= '<div id="moretabsList' . $tabsname . '" style="position: absolute; ' . $left . ': -999em; text-align: ' . $left . '; margin:0px; padding:2px">';

+            $out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.Globals::$langs->trans("More").'... ('.$nbintab.')</a>';

+            $out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';

             $out .= $outmore;

             $out .= '</div>';

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

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

 

             $out .= "<script>";

-            $out .= "$('#moretabs" . $tabsname . "').mouseenter( function() { console.log('mouseenter " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','auto');});";

-            $out .= "$('#moretabs" . $tabsname . "').mouseleave( function() { console.log('mouseleave " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','-999em');});";

+            $out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

+            $out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";

             $out .= "</script>";

         }

 

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

 

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

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

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

 

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

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

@@ -1436,7 +1436,7 @@ 
                 $maxvisiblephotos = 1;

             }

             if ($showimage) {

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

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

             } else {

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

                     $nophoto = '';

@@ -1445,19 +1445,19 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 // $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } elseif ($object->element == 'ticket') {

             $width = 80;

             $cssclass = 'photoref';

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

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

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

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

                 $maxvisiblephotos = 1;

             }

             if ($showimage) {

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

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

             } else {

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

                     $nophoto = '';

@@ -1466,7 +1466,7 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 //$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } else {

@@ -1476,25 +1476,25 @@ 
                     // Check if a preview file is available

                     if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

                         $objectref = dol_sanitizeFileName($object->ref);

-                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity]) . "/";

+                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity])."/";

                         if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

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

-                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '') . $objectref;  // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

+                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

                         } else {

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

                         }

                         if (empty($subdir))

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

 

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

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

 

-                        $file = $filepath . $objectref . ".pdf";

-                        $relativepath = $subdir . '/' . $objectref . '.pdf';

+                        $file = $filepath.$objectref.".pdf";

+                        $relativepath = $subdir.'/'.$objectref.'.pdf';

 

                         // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")

-                        $fileimage = $file . '_preview.png';              // If PDF has 1 page

-                        $fileimagebis = $file . '_preview-0.png';         // If PDF has more than one page

-                        $relativepathimage = $relativepath . '_preview.png';

+                        $fileimage = $file.'_preview.png'; // If PDF has 1 page

+                        $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page

+                        $relativepathimage = $relativepath.'_preview.png';

 

                         // Si fichier PDF existe

                         if (file_exists($file)) {

@@ -1503,7 +1503,7 @@ 
                             if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file))) && (!file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))

                             ) {

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

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

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

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

                                     if ($ret < 0)

                                         $error++;

@@ -1516,14 +1516,14 @@ 
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

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

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($relativepathimage) . '">';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

                                 $phototoshow .= '</div></div>';

                             }

                             // Si fichier png PDF de plus d'1 page trouve

                             elseif (file_exists($fileimagebis)) {

-                                $preview = preg_replace('/\.png/', '', $relativepathimage) . "-0.png";

+                                $preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";

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

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($preview) . '"><p>';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';

                                 $phototoshow .= '</div></div>';

                             }

                         }

@@ -1550,10 +1550,10 @@ 
                         $picto = $object->picto;

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

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

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

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

                     }

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

-                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . $nophoto . '"></div></div>';

+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';

 

                     $morehtmlleft .= '</div>';

                 }

@@ -1561,7 +1561,7 @@ 
         }

 

         if ($showbarcode)

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

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

 

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

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

@@ -1574,14 +1574,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');

             } else {

-                $morehtmlstatus .= '<span class="statusrefsell">' . $object->getLibStatut(5, 0) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';

             }

             $morehtmlstatus .= ' &nbsp; ';

 //$morehtmlstatus.=Globals::$langs->trans("Status").' ('.Globals::$langs->trans("Buy").') ';

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

                 $morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');

             } else {

-                $morehtmlstatus .= '<span class="statusrefbuy">' . $object->getLibStatut(5, 1) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';

             }

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

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

@@ -1608,7 +1608,7 @@ 
             if ($object->progress >= 100)

                 $object->fk_statut = 3;

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

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

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

         }

         else { // Generic case

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

@@ -1622,18 +1622,18 @@ 
             if (method_exists($object, 'getVentilExportCompta')) {

                 $accounted = $object->getVentilExportCompta();

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

-                $morehtmlstatus .= '</div><div class="statusref statusrefbis">' . ($accounted > 0 ? Globals::$langs->trans("Accounted") : Globals::$langs->trans("NotYetAccounted"));

+                $morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? Globals::$langs->trans("Accounted") : Globals::$langs->trans("NotYetAccounted"));

             }

         }

 

 // Add alias for thirdparty

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

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

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

 

 // Add label

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

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

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

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

         }

 

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

@@ -1643,11 +1643,11 @@ 
         }

         if (!empty(Globals::$conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product'))) {

             $morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

-            $morehtmlref .= Globals::$langs->trans("TechnicalID") . ': ' . $object->id;

+            $morehtmlref .= Globals::$langs->trans("TechnicalID").': '.$object->id;

             $morehtmlref .= '</div>';

         }

 

-        print '<div class="' . ($onlybanner ? 'arearefnobottom ' : 'arearef ') . 'heightref valignmiddle" width="100%">';

+        print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';

         print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);

         print '</div>';

         print '<div class="underrefbanner clearboth"></div>';

@@ -1669,7 +1669,7 @@ 
         if ($fieldrequired)

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

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

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

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

         $ret .= Globals::$langs->trans($langkey);

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

             $ret .= '</label>';

@@ -1688,9 +1688,9 @@ 
     static function dol_bc($var, $moreclass = '')

     {

         // global $bc;

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

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

         if ($moreclass)

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

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

         return $ret;

     }

 

@@ -1710,50 +1710,50 @@ 
         // global Globals::$conf, Globals::$langs;

 

         $ret = '';

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

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

 // Address

         if (empty($mode)) {

             $ret .= $object->address;

         }

 // Zip/Town/State

         if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {    // US: title firstname name \n address lines \n town, state, zip \n country

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

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

             if ($object->state) {

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

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

             }

             if ($object->zip)

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

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

         }

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

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

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

             if ($object->state) {

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

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

             }

             if ($object->zip)

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

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

         }

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

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

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

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

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

             if ($object->state) {

-                $ret .= "\n" . $object->state;

+                $ret .= "\n".$object->state;

             }

         } else if (in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country

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

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

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

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

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

+            $ret .= ($object->departement_id ? (' ('.($object->departement_id).')') : '');

         } else {                                          // Other: title firstname name \n address lines \n zip town \n country

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

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

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

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

             if ($object->state && in_array($object->country_code, $countriesusingstate)) {

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

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

             }

         }

         if (!is_object($outputlangs))

             $outputlangs = Globals::$langs;

         if ($withcountry) {

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

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

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

         }

 

         return $ret;

@@ -1807,13 +1807,13 @@ 
             if (is_string($tzoutput)) {

                 if ($tzoutput == 'tzserver') {

                     $to_gmt = false;

-                    $offsettzstring = @date_default_timezone_get();  // Example 'Europe/Berlin' or 'Indian/Reunion'

+                    $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'

                     $offsettz = 0;

                     $offsetdst = 0;

                 } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {

                     $to_gmt = true;

                     $offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'

-                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;  // Will not be used anymore

+                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

                     $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

                 }

             }

@@ -1859,9 +1859,9 @@ 
         else if ($format == 'dayxcard')

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

         else if ($format == 'dayrfc')

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

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

         else if ($format == 'dayhourrfc')

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

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

         else if ($format == 'standard')

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

 

@@ -1872,7 +1872,7 @@ 
 

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

         if (DolUtils::dol_strlen($time) == 0)

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

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

 

 

 

@@ -1933,7 +1933,7 @@ 
         if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg) || preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) { // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

 // TODO Remove this.

 // This part of code should not be used.

-            DolUtils::dol_syslog("Functions.lib::DolUtils::dol_print_date static function call with deprecated value of time in page " . $_SERVER["PHP_SELF"], LOG_ERR);

+            DolUtils::dol_syslog("Functions.lib::DolUtils::dol_print_date static function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);

 // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'

             $syear = (!empty($reg[1]) ? $reg[1] : '');

             $smonth = (!empty($reg[2]) ? $reg[2] : '');

@@ -1951,7 +1951,7 @@ 
 

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

             } else

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

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

         }

 

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

@@ -1960,11 +1960,11 @@ 
             $month = adodb_strftime('%m', $timetouse);

             $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.

             if ($encodetooutput) {

-                $monthtext = $outputlangs->transnoentities('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentities('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentities('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);

             } else {

-                $monthtext = $outputlangs->transnoentitiesnoconv('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);

             }

 //print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;

             $ret = str_replace('__b__', $monthtextshort, $ret);

@@ -1975,8 +1975,8 @@ 
         if (preg_match('/__a__/i', $format)) {

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

 

-            $w = adodb_strftime('%w', $timetouse);      // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

-            $dayweek = $outputlangs->transnoentitiesnoconv('Day' . $w);

+            $w = adodb_strftime('%w', $timetouse); // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+            $dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);

             $ret = str_replace('__A__', $dayweek, $ret);

             $ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

         }

@@ -2023,9 +2023,9 @@ 
 

         $usealternatemethod = false;

         if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

+            $usealternatemethod = true; // <= 1970

         if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+            $usealternatemethod = true; // >= 2038

 

         if ($usealternatemethod) {

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

@@ -2085,23 +2085,23 @@ 
 

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

             if (empty($gm) || $gm === 'server') {

-                $default_timezone = @date_default_timezone_get();  // Example 'Europe/Berlin'

+                $default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'

                 $localtz = new \DateTimeZone($default_timezone);

             } else if ($gm === 'user') {

 // We use dol_tz_string first because it is more reliable.

-                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]);  // Example 'Europe/Berlin'

+                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'

                 try {

                     $localtz = new \DateTimeZone($default_timezone);

                 } catch (Exception $e) {

-                    DolUtils::dol_syslog("Warning dol_tz_string contains an invalid value " . $_SESSION["dol_tz_string"], LOG_WARNING);

+                    DolUtils::dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);

                     $default_timezone = @date_default_timezone_get();

                 }

             } else if (strrpos($gm, "tz,") !== false) {

-                $timezone = str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'

+                $timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'

                 try {

                     $localtz = new \DateTimeZone($timezone);

                 } catch (Exception $e) {

-                    DolUtils::dol_syslog("Warning passed timezone contains an invalid value " . $timezone, LOG_WARNING);

+                    DolUtils::dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);

                 }

             }

 

@@ -2140,8 +2140,8 @@ 
         if ($mode == 'gmt')

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

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

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

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

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

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

             $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));

         }

         /* else if ($mode == 'tzref')				// Time for now with parent company timezone is added

@@ -2187,9 +2187,9 @@ 
         }

 // Use long or short text unit

         if (empty($shortunit)) {

-            $ret .= ' ' . $textunitlong;

+            $ret .= ' '.$textunitlong;

         } else {

-            $ret .= ' ' . $textunitshort;

+            $ret .= ' '.$textunitshort;

         }

 

         return $ret;

@@ -2217,13 +2217,13 @@ 
         $link .= $url;

         $link .= '"';

         if ($target)

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

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

         $link .= '>';

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

             $link .= 'http://';

         $link .= dol_trunc($url, $max);

         $link .= '</a>';

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

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

     }

 

     /**

@@ -2264,9 +2264,9 @@ 
                 $type = 'AC_EMAIL';

                 $link = '';

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

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

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

                 if ($link)

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

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

             }

         }

         else {

@@ -2276,7 +2276,7 @@ 
             }

         }

 

-        $rep = '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("EMail"), 'object_email.png') . ' ' : '') . $newemail . '</div>';

+        $rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto(Globals::$langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';

         if (Globals::$hookManager) {

             $parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);

             $reshook = Globals::$hookManager->executeHooks('printEmail', $parameters, $email);

@@ -2306,26 +2306,26 @@ 
 

         if (!empty($type)) {

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

-            $newskype .= img_picto(Globals::$langs->trans(strtoupper($type)), $type . '.png', '', false, 0, 0, '', 'paddingright');

+            $newskype .= img_picto(Globals::$langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright');

             $newskype .= $value;

             if ($type == 'skype') {

                 $newskype .= '&nbsp;';

                 $newskype .= '<a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?call" alt="' . Globals::$langs->trans("Call") . '&nbsp;' . $value . '" title="' . Globals::$langs->trans("Call") . '&nbsp;' . $value . '">';

-                $newskype .= '<img src="' . DOL_BASE_URI . '/theme/common/skype_callbutton.png" border="0">';

+                $newskype .= '?call" alt="'.Globals::$langs->trans("Call").'&nbsp;'.$value.'" title="'.Globals::$langs->trans("Call").'&nbsp;'.$value.'">';

+                $newskype .= '<img src="'.DOL_BASE_URI.'/theme/common/skype_callbutton.png" border="0">';

                 $newskype .= '</a><a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?chat" alt="' . Globals::$langs->trans("Chat") . '&nbsp;' . $value . '" title="' . Globals::$langs->trans("Chat") . '&nbsp;' . $value . '">';

-                $newskype .= '<img class="paddingleft" src="' . DOL_BASE_URI . '/theme/common/skype_chatbutton.png" border="0">';

+                $newskype .= '?chat" alt="'.Globals::$langs->trans("Chat").'&nbsp;'.$value.'" title="'.Globals::$langs->trans("Chat").'&nbsp;'.$value.'">';

+                $newskype .= '<img class="paddingleft" src="'.DOL_BASE_URI.'/theme/common/skype_chatbutton.png" border="0">';

                 $newskype .= '</a>';

             }

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

                 $addlink = 'AC_SKYPE';

                 $link = '';

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

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

-                $newskype .= ($link ? ' ' . $link : '');

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

+                $newskype .= ($link ? ' '.$link : '');

             }

             $newskype .= '</div>';

         }

@@ -2369,165 +2369,165 @@ 
         if (strtoupper($countrycode) == "FR") {

 // France

             if (DolUtils::dol_strlen($phone) == 10) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 2) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);

             } elseif (DolUtils::dol_strlen($phone) == 7) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);

             } elseif (DolUtils::dol_strlen($phone) == 9) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);

             } elseif (DolUtils::dol_strlen($phone) == 11) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (DolUtils::dol_strlen($phone) == 12) {

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CA") {

             if (DolUtils::dol_strlen($phone) == 10) {

-                $newphone = ($separ != '' ? '(' : '') . substr($newphone, 0, 3) . ($separ != '' ? ')' : '') . $separ . substr($newphone, 3, 3) . ($separ != '' ? '-' : '') . substr($newphone, 6, 4);

+                $newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);

             }

         } elseif (strtoupper($countrycode) == "PT") {//Portugal

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "SR") {//Suriname

             if (DolUtils::dol_strlen($phone) == 10) {//ex: +597_ABC_DEF

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);

             } elseif (DolUtils::dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);

             }

         } elseif (strtoupper($countrycode) == "DE") {//Allemagne

             if (DolUtils::dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 4) . $separ . substr($newphone, 11, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);

             } elseif (DolUtils::dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 4) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "ES") {//Espagne

             if (DolUtils::dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "BF") {// Burkina Faso

             if (DolUtils::dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "RO") {// Roumanie

             if (DolUtils::dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TR") {//Turquie

             if (DolUtils::dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "US") {//Etat-Unis

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);

             }

         } elseif (strtoupper($countrycode) == "MX") {//Mexique

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (DolUtils::dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (DolUtils::dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "ML") {//Mali

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TH") {//Thaïlande

             if (DolUtils::dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (DolUtils::dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "MU") {//Maurice

             if (DolUtils::dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (DolUtils::dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "SY") {//Syrie

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (DolUtils::dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (DolUtils::dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             } elseif (DolUtils::dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);

             }

         } elseif (strtoupper($countrycode) == "DZ") {//Algérie

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "BE") {//Belgique

             if (DolUtils::dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (DolUtils::dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "PF") {//Polynésie française

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CO") {//Colombie

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "JO") {//Jordanie

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 1) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             }

         } elseif (strtoupper($countrycode) == "MG") {//Madagascar

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "GB") {//Royaume uni

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "CH") {//Suisse

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (DolUtils::dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL

-                $newphone = $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 3) . $separ . substr($newphone, 11, 4);

+                $newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);

             }

         } elseif (strtoupper($countrycode) == "TN") {//Tunisie

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "GF") {//Guyane francaise

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "GP") {//Guadeloupe

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "MQ") {//Martinique

             if (DolUtils::dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "IT") {//Italie

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             } elseif (DolUtils::dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "AU") {//Australie

             if (DolUtils::dol_strlen($phone) == 12) {//ex: +61_A_BCDE_FGHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);

             }

         }

         if (!empty($addlink)) { // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

             if (Globals::$conf->browser->layout == 'phone' || (!empty(Globals::$conf->clicktodial->enabled) && !empty(Globals::$conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) { // If phone or option for, we use link of phone

-                $newphone = '<a href="tel:' . $phone . '"';

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

+                $newphone = '<a href="tel:'.$phone.'"';

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

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

                 if (empty($user->clicktodial_loaded))

                     $user->fetch_clicktodial();

@@ -2551,10 +2551,10 @@ 
                     '__PASS__' => $clicktodial_password);

                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

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

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

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

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

-                $newphone .= '>' . $newphonesav . '</a>';

+                $newphone .= '>'.$newphonesav.'</a>';

             }

 

 //if (($cid || $socid) && ! empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create)

@@ -2564,9 +2564,9 @@ 
                 if ($addlink == 'AC_FAX')

                     $type = 'AC_FAX';

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

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

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

                 if ($link)

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

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

             }

         }

 

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

             else

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

-            $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

+            $rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

             if ($adddivfloat)

                 $rep .= '</div>';

             else

@@ -2624,15 +2624,15 @@ 
             $ret .= $ip;

         }

 

-        echo ('<p>DOL_BASE_PATH: ' . DOL_BASE_PATH . '/DOL_BASE_URI: ' . DOL_BASE_URI . '</p>');

+        echo ('<p>DOL_BASE_PATH: '.DOL_BASE_PATH.'/DOL_BASE_URI: '.DOL_BASE_URI.'</p>');

 

         if ($mode != 2) {

             $countrycode = dolGetCountryCodeFromIp($ip);

             if ($countrycode) { // If success, countrycode is us, fr, ...

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

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

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

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

                 } else

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

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

             }

         }

 

@@ -2670,7 +2670,7 @@ 
 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)

 

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

 //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";

 //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";

@@ -2696,7 +2696,7 @@ 
             $datafile = Globals::$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

             $countrycode = $geoip->getCountryCodeFromIP($ip);

             $ret = $countrycode;

@@ -2751,12 +2751,12 @@ 
                     $showomap = 1;

 

                 if ($showgmap) {

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

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

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

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

                 if ($showomap) {

-                    $url = dol_buildpath('/openstreetmap/maps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '_openstreetmap" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

             }

         }

@@ -2902,7 +2902,7 @@ 
         if ($trunc == 'right') {

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

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

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

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

             else

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

                 return $string;

@@ -2912,21 +2912,21 @@ 
             if (DolUtils::dol_strlen($newstring, $stringencoding) > 2 && DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

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

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

             } else

                 return $string;

         }

         elseif ($trunc == 'left') {

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

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

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

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

             else

                 return $string;

         }

         elseif ($trunc == 'wrap') {

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

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

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

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

             else

                 return $string;

         } else

@@ -2959,7 +2959,7 @@ 
         $url = DOL_BASE_URI;

 

         $theme = Globals::$conf->theme;

-        $path = 'theme/' . $theme;

+        $path = 'theme/'.$theme;

 

 // Define fullpathpicto to use into src

         if ($pictoisfullpath) {

@@ -3008,7 +3008,7 @@ 
                     $fakey = 'fa-pencil';

                     $facolor = '#444';

                 } elseif ($pictowithoutext == 'filter') {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                 } elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {

                     $fakey = 'fa-arrows';

                 } elseif ($pictowithoutext == 'listlight') {

@@ -3047,15 +3047,15 @@ 
                 } elseif ($pictowithoutext == 'jabber') {

                     $fakey = 'fa-comment-o';

                 } else {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                     $facolor = '#444';

                     $marginleftonlyshort = 0;

                 }

 

                 if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-                    $morecss .= ($morecss ? ' ' : '') . $reg[1];

+                    $morecss .= ($morecss ? ' ' : '').$reg[1];

                 }

-                $enabledisablehtml = '<span class="fa ' . $fakey . ' ' . ($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '') . ' valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" style="' . ($fasize ? ('font-size: ' . $fasize . ';') : '') . ($facolor ? (' color: ' . $facolor . ';') : '') . '" alt="' . DolUtils::dol_escape_htmltag($titlealt) . '"' . (($notitle || empty($title)) ? '' : ' title="' . DolUtils::dol_escape_htmltag($title) . '"') . ($moreatt ? ' ' . $moreatt : '') . '>';

+                $enabledisablehtml = '<span class="fa '.$fakey.' '.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '').' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.DolUtils::dol_escape_htmltag($titlealt).'"'.(($notitle || empty($title)) ? '' : ' title="'.DolUtils::dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : '').'>';

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

                     $enabledisablehtml .= $titlealt;

                 }

@@ -3065,11 +3065,11 @@ 
             }

 

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

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH . '/theme/' . $theme; // If the theme does not have the same name as the module

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module

             } else if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_RES)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES . '/theme/' . Globals::$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.Globals::$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme

             } else if (!empty(Globals::$conf->modules_parts['theme']) && array_key_exists($theme, Globals::$conf->modules_parts['theme'])) {

-                $path = $theme . '/theme/' . $theme; // If the theme have the same name as the module

+                $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module

             }

 

 // If we ask an image into $url/$mymodule/img (instead of default path)

@@ -3089,15 +3089,15 @@ 
                     continue;

                 }

 // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded

-                if (file_exists($dirroot . '/' . $path . '/img/' . $picto)) {

+                if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {

                     //$url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

-                    $url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

+                    $url = DOL_BASE_URI.Globals::$conf->file->dol_url_root[$type];

                     break;

                 }

             }

 

 // $url is '' or '/custom', $path is current theme or

-            $fullpathpicto = $url . '/' . $path . '/img/' . $picto;

+            $fullpathpicto = $url.'/'.$path.'/img/'.$picto;

         }

 

         if ($srconly) {

@@ -3105,7 +3105,7 @@ 
         }

 

 // tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people

-        return '<img src="' . $fullpathpicto . '" alt="' . DolUtils::dol_escape_htmltag($alt) . '"' . (($notitle || empty($titlealt)) ? '' : ' title="' . DolUtils::dol_escape_htmltag($titlealt) . '"') . ($moreatt ? ' ' . $moreatt : ' class="inline-block' . ($morecss ? ' ' . $morecss : '') . '"') . '>'; // Alt is used for accessibility, title for popup

+        return '<img src="'.$fullpathpicto.'" alt="'.DolUtils::dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.DolUtils::dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

     }

 

     /**

@@ -3123,7 +3123,7 @@ 
      */

     static function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)

     {

-        return img_picto($titlealt, 'object_' . $picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

+        return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

     }

 

     /**

@@ -3144,7 +3144,7 @@ 
             $picto .= '.png';

 

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

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

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

 

         return img_picto($titlealt, $path, $moreatt, 1);

     }

@@ -3171,10 +3171,10 @@ 
             $path = $picto;

         } else {

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

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

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

 

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

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

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

 

                 if (file_exists($themepath)) {

                     $path = $themepath;

@@ -3213,14 +3213,14 @@ 
                 $numaction = 3;

                 $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeContactDone');

             } else {

-                $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeStatus ' . $numaction);

+                $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

                 $numaction = 0;

             }

         }

         if (!is_numeric($numaction))

             $numaction = 0;

 

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

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

     }

 

     /**

@@ -3237,7 +3237,7 @@ 
         if ($titlealt == 'default')

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

 

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

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

     }

 

     /**

@@ -3289,7 +3289,7 @@ 
         if ($titlealt == 'default')

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

 

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

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

     }

 

     /**

@@ -3307,7 +3307,7 @@ 
         if ($titlealt == 'default')

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

 

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

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

 

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

     }

@@ -3380,7 +3380,7 @@ 
                 $usealttitle = Globals::$langs->trans('Info');

         }

 

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

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

     }

 

     /**

@@ -3414,7 +3414,7 @@ 
             $titlealt = Globals::$langs->trans('Warning');

 

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

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

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

     }

 

     /**

@@ -3448,7 +3448,7 @@ 
             $titlealt = Globals::$langs->trans('Next');

 

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

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

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

     }

 

     /**

@@ -3466,7 +3466,7 @@ 
             $titlealt = Globals::$langs->trans('Previous');

 

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

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

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

     }

 

     /**

@@ -3484,7 +3484,7 @@ 
         if ($titlealt == 'default')

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

 

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

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

     }

 

     /**

@@ -3502,7 +3502,7 @@ 
         if ($titlealt == 'default')

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

 

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

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

     }

 

     /**

@@ -3585,7 +3585,7 @@ 
             $brand = 'credit-card';

         }

 

-        return '<span class="fa fa-' . $brand . ' fa-2x fa-fw"></span>';

+        return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';

     }

 

     /**

@@ -3598,17 +3598,17 @@ 
      */

     static function img_mime($file, $titlealt = '', $morecss = '')

     {

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

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

 

         $mimetype = dol_mimetype($file, '', 1);

         $mimeimg = dol_mimetype($file, '', 2);

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

 

         if (empty($titlealt))

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

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

 

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

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

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

     }

 

     /**

@@ -3623,7 +3623,7 @@ 
      */

     static function img_phone($titlealt = 'default', $option = 0)

     {

-        DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        DolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

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

 

@@ -3654,8 +3654,8 @@ 
 

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

 

-        $input = '<input type="image" class="liste_titre" name="button_search" src="' . $img . '" ';

-        $input .= 'value="' . DolUtils::dol_escape_htmltag($titlealt) . '" title="' . DolUtils::dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';

+        $input .= 'value="'.DolUtils::dol_escape_htmltag($titlealt).'" title="'.DolUtils::dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3676,8 +3676,8 @@ 
 

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

 

-        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';

-        $input .= 'value="' . DolUtils::dol_escape_htmltag($titlealt) . '" title="' . DolUtils::dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';

+        $input .= 'value="'.DolUtils::dol_escape_htmltag($titlealt).'" title="'.DolUtils::dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3697,10 +3697,10 @@ 
         // global Globals::$conf, Globals::$langs;

 

         if ($infoonimgalt) {

-            return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

+            return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

         }

 

-        return ($nodiv ? '' : '<div class="' . (empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)) . ' hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '">') . '<span class="fa fa-info-circle" title="' . DolUtils::dol_escape_htmltag($admin ? Globals::$langs->trans('InfoAdmin') : Globals::$langs->trans('Note')) . '"></span> ' . $text . ($nodiv ? '' : '</div>');

+        return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.DolUtils::dol_escape_htmltag($admin ? Globals::$langs->trans('InfoAdmin') : Globals::$langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

     }

 

     /**

@@ -3734,39 +3734,39 @@ 
         Globals::$langs->loadLangs(array('main', 'errors'));

 

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

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

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

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

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

             }

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

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

 

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

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

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

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

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

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

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

             }

             if (function_exists("phpversion")) {

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

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

             }

-            $out .= "<b>" . Globals::$langs->trans("Server") . ":</b> " . $_SERVER["SERVER_SOFTWARE"] . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

             if (function_exists("php_uname")) {

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

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

             }

-            $out .= "<b>" . Globals::$langs->trans("UserAgent") . ":</b> " . $_SERVER["HTTP_USER_AGENT"] . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

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

-            $out .= "<b>" . Globals::$langs->trans("RequestedUrl") . ":</b> " . DolUtils::dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("Referer") . ":</b> " . (isset($_SERVER["HTTP_REFERER"]) ? DolUtils::dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("MenuManager") . ":</b> " . (isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '') . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("RequestedUrl").":</b> ".DolUtils::dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? DolUtils::dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("MenuManager").":</b> ".(isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '')."<br>\n";

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

-            $syslog .= "url=" . DolUtils::dol_escape_htmltag($_SERVER["REQUEST_URI"]);

-            $syslog .= ", query_string=" . DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]);

+            $syslog .= "url=".DolUtils::dol_escape_htmltag($_SERVER["REQUEST_URI"]);

+            $syslog .= ", query_string=".DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]);

         } else {                              // Mode CLI

-            $out .= '> ' . Globals::$langs->transnoentities("ErrorInternalErrorDetected") . ":\n" . $argv[0] . "\n";

-            $syslog .= "pid=" . dol_getmypid();

+            $out .= '> '.Globals::$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";

+            $syslog .= "pid=".dol_getmypid();

         }

 

         if (is_object($dbError)) {

-            $out .= '<pre>' . print_r($dbError, true) . '</pre>';

+            $out .= '<pre>'.print_r($dbError, true).'</pre>';

             /*

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

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

@@ -3805,31 +3805,31 @@ 
                     continue;

                 }

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

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

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

                 } else {                        // Mode CLI

-                    $out .= '> ' . Globals::$langs->transnoentities("Message") . ":\n" . $msg . "\n";

+                    $out .= '> '.Globals::$langs->transnoentities("Message").":\n".$msg."\n";

                 }

-                $syslog .= ", msg=" . $msg;

+                $syslog .= ", msg=".$msg;

             }

         }

         if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

             xdebug_print_function_stack();

-            $out .= '<b>XDebug informations:</b>' . "<br>\n";

-            $out .= 'File: ' . xdebug_call_file() . "<br>\n";

-            $out .= 'Line: ' . xdebug_call_line() . "<br>\n";

-            $out .= 'Function: ' . xdebug_call_function() . "<br>\n";

+            $out .= '<b>XDebug informations:</b>'."<br>\n";

+            $out .= 'File: '.xdebug_call_file()."<br>\n";

+            $out .= 'Line: '.xdebug_call_line()."<br>\n";

+            $out .= 'Function: '.xdebug_call_function()."<br>\n";

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

         }

 

         if (empty($dolibarr_main_prod)) {

             print $out;

         } else {

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

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

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

             define("MAIN_CORE_ERROR", 1);

         }

 //else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

-        DolUtils::dol_syslog("Error " . $syslog, LOG_ERR);

+        DolUtils::dol_syslog("Error ".$syslog, LOG_ERR);

     }

 

     /**

@@ -3853,14 +3853,14 @@ 
         Globals::$langs->load("errors");

         $now = dol_now();

 

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

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

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

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

         if ($errormessage) {

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

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

         }

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

             foreach ($errormessages as $mesgtoshow) {

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

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

             }

         }

         print '</div></div>';

@@ -3918,16 +3918,16 @@ 
         }

 

         $tmpsortfield = explode(',', $sortfield);

-        $sortfield1 = trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

+        $sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

         $tmpfield = explode(',', $field);

-        $field1 = trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'

+        $field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'

 //var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);

 // If field is used as sort criteria we use a specific css class liste_titre_sel

 // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")

         if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre_sel" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';

         } else {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';

         }

 

         if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

@@ -3935,7 +3935,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             $sortordertouseinlink = '';

@@ -3953,7 +3953,7 @@ 
                 }

             }

             $sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);

-            $out .= '<a class="reposition" href="' . $file . '?sortfield=' . $field . '&sortorder=' . $sortordertouseinlink . '&begin=' . $begin . $options . '">';

+            $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';

         }

 

         if ($tooltip) {

@@ -3971,7 +3971,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             if (!$sortorder || $field1 != $sortfield1) {

@@ -3981,19 +3981,19 @@ 
                 if (preg_match('/^DESC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_up("Z-A", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';

                 }

                 if (preg_match('/^ASC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_down("A-Z", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';

                 }

             }

         }

 

         $out .= $sortimg;

 

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

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

 

         return $out;

     }

@@ -4008,9 +4008,9 @@ 
      */

     static function print_titre($title)

     {

-        DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        DolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

-        print '<div class="titre">' . $title . '</div>';

+        print '<div class="titre">'.$title.'</div>';

     }

 

     /**

@@ -4053,20 +4053,20 @@ 
         }

 

         $return .= "\n";

-        $return .= '<table ' . ($id ? 'id="' . $id . '" ' : '') . 'summary="" class="centpercent notopnoleftnoright' . ($morecssontable ? ' ' . $morecssontable : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

+        $return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

         if ($picto) {

-            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">' . DolUtils::img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath) . '</td>';

+            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.DolUtils::img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

         }

         $return .= '<td class="nobordernopadding valignmiddle">';

-        $return .= '<div class="titre inline-block">' . $titre . '</div>';

+        $return .= '<div class="titre inline-block">'.$titre.'</div>';

         $return .= '</td>';

         if (DolUtils::dol_strlen($morehtmlcenter)) {

-            $return .= '<td class="nobordernopadding" align="center" valign="middle">' . $morehtmlcenter . '</td>';

+            $return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';

         }

         if (DolUtils::dol_strlen($morehtmlright)) {

-            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">' . $morehtmlright . '</td>';

+            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">'.$morehtmlright.'</td>';

         }

-        $return .= '</tr></table>' . "\n";

+        $return .= '</tr></table>'."\n";

 

         return $return;

     }

@@ -4114,29 +4114,29 @@ 
 //print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

 

         print "\n";

-        print "<!-- Begin title '" . $titre . "' -->\n";

-        print '<table border="0" class="centpercent notopnoleftnoright' . ($morecss ? ' ' . $morecss : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

+        print "<!-- Begin title '".$titre."' -->\n";

+        print '<table border="0" class="centpercent notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

 // Left

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

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

         if ($picto && $titre)

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

-        print '<div class="titre inline-block">' . $titre;

+        print '<div class="titre inline-block">'.$titre;

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

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

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

         print '</div></td>';

 

 // Center

         if ($morehtmlcenter) {

-            print '<td class="nobordernopadding center valignmiddle">' . $morehtmlcenter . '</td>';

+            print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

         }

 

 // Right

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

         if ($sortfield)

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

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

         if ($sortorder)

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

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

 // Show navigation bar

         $pagelist = '';

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

@@ -4154,40 +4154,40 @@ 
                 }

 

                 if ($cpt >= 1) {

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

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

                     if ($cpt > 2)

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

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

                     else if ($cpt == 2)

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

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

                 }

 

                 do {

                     if ($cpt == $page) {

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

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

                     } else {

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

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

                     }

                     $cpt++;

                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

                     if ($cpt < $nbpages - 2)

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

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

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

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

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

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

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

                 }

             }

             else {

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

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

             }

         }

 

-        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);  // output the div and ul for previous/last completed with page numbers into $pagelist

+        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

 

         print '</td>';

 

-        print '</tr></table>' . "\n";

+        print '</tr></table>'."\n";

         print "<!-- End title -->\n\n";

     }

 

@@ -4218,12 +4218,12 @@ 
                 $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

 

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

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

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

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

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

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

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

                 $tmpchoice[] = $tmpkey;

-            $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

+            $tmpkey = Globals::$conf->liste_limit.':'.Globals::$conf->liste_limit;

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

                 $tmpchoice[] = $tmpkey;

             asort($tmpchoice, SORT_NUMERIC);

@@ -4238,7 +4238,7 @@ 
                         $selected = ' selected="selected"';

                         $found = true;

                     }

-                    print '<option name="' . $key . '"' . $selected . '>' . DolUtils::dol_escape_htmltag($val) . '</option>' . "\n";

+                    print '<option name="'.$key.'"'.$selected.'>'.DolUtils::dol_escape_htmltag($val).'</option>'."\n";

                 }

             }

             print '</select>';

@@ -4257,20 +4257,20 @@ 
             print '</li>';

         }

         if ($page > 0) {

-            print '<li class="pagination"><a class="paginationprevious" href="' . $file . '?page=' . ($page - 1) . $options . '"><i class="fa fa-chevron-left" title="' . DolUtils::dol_escape_htmltag(Globals::$langs->trans("Previous")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.DolUtils::dol_escape_htmltag(Globals::$langs->trans("Previous")).'"></i></a></li>';

         }

         if ($betweenarrows) {

             print $betweenarrows;

         }

         if ($nextpage > 0) {

-            print '<li class="pagination"><a class="paginationnext" href="' . $file . '?page=' . ($page + 1) . $options . '"><i class="fa fa-chevron-right" title="' . DolUtils::dol_escape_htmltag(Globals::$langs->trans("Next")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.DolUtils::dol_escape_htmltag(Globals::$langs->trans("Next")).'"></i></a></li>';

         }

         if ($afterarrows) {

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

             print $afterarrows;

             print '</li>';

         }

-        print '</ul></div>' . "\n";

+        print '</ul></div>'."\n";

     }

 

     /**

@@ -4292,8 +4292,8 @@ 
             $addpercent = true;

         }

         if (preg_match('/\((.*)\)/', $rate, $reg)) {

-            $morelabel = ' (' . $reg[1] . ')';

-            $rate = preg_replace('/\s*' . preg_quote($morelabel, '/') . '/', '', $rate);

+            $morelabel = ' ('.$reg[1].')';

+            $rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);

         }

         if (preg_match('/\*/', $rate)) {

             $rate = str_replace('*', '', $rate);

@@ -4302,10 +4302,10 @@ 
 

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

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

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

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

         else {

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

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

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

         }

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

             $ret .= ' *';

@@ -4398,10 +4398,10 @@ 
                 $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

             else {

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

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

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

             }

         }

-        $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter;

+        $output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;

 

         return $output;

     }

@@ -4454,7 +4454,7 @@ 
 // Now make replace (the main goal of function)

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

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

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

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

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

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

         }

@@ -4483,14 +4483,14 @@ 
                 $temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000

                 $temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1

                 $nbofdec = max(0, DolUtils::dol_strlen($temps) - 2); // -2 to remove "0."

-                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand);  // Convert amount to format with dolibarr dec and thousand

+                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

             }

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

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

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

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

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

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

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

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

         }

@@ -4511,7 +4511,7 @@ 
      */

     static function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

     {

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

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

 

         if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

             $dimension = $dimension * 1000000;

@@ -4527,7 +4527,7 @@ 
             $unit = $unit + 3;

         }

 

-        $ret = price($dimension, 0, $outputlangs, 0, 0, $round) . ' ' . measuring_units_string($unit, $type);

+        $ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);

 

         return $ret;

     }

@@ -4551,7 +4551,7 @@ 
         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

 

-        DolUtils::dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

+        DolUtils::dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);

 

         $vatratecleaned = $vatrate;

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4582,7 +4582,7 @@ 
             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

                 if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                    return 0; // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

                     if (!$thirdparty_buyer->localtax2_assuj)

                         return 0;

@@ -4636,13 +4636,13 @@ 
 

 // By default, search value of local tax on line of common tax

         $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";

+        $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

         if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

+            $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

         else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+            $sql .= " AND t.recuperableonly ='".$vatnpr."'";

         DolUtils::dol_syslog("get_localtax", LOG_DEBUG);

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

 

@@ -4688,10 +4688,10 @@ 
     {

         // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

-        $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

-        $sql .= "  SELECT max(tt.taux) FROM " . MAIN_DB_PREFIX . "c_tva as tt inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=tt.fk_pays";

-        $sql .= "  WHERE c.code = '" . $mysoc->country_code . "' AND tt.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+        $sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+        $sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+        $sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

         $sql .= "  )";

 

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

@@ -4721,13 +4721,13 @@ 
     {

         // global $db, $mysoc;

 

-        DolUtils::dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

+        DolUtils::dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);

 

 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4736,13 +4736,13 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             /* if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??

               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

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

@@ -4778,13 +4778,13 @@ 
     {

         // global $db, $mysoc;

 

-        DolUtils::dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

+        DolUtils::dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);

 

 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4793,14 +4793,14 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??

             else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

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

@@ -4832,7 +4832,7 @@ 
     {

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

 

-        require_once DOL_BASE_PATH . '/product/class/product.class.php';

+        require_once DOL_BASE_PATH.'/product/class/product.class.php';

 

         $ret = 0;

         $found = 0;

@@ -4847,12 +4847,12 @@ 
                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 else {

-                    $ret = $product->tva_tx;    // Default vat of product we defined

+                    $ret = $product->tva_tx; // Default vat of product we defined

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 $found = 1;

             }

@@ -4866,8 +4866,8 @@ 
             if (empty(Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {

 // If vat of product for the country not found or not defined, we return the first higher vat of country.

                 $sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

                 $sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";

                 $sql .= $db->plimit(1);

 

@@ -4877,16 +4877,16 @@ 
                     if ($obj) {

                         $ret = $obj->vat_rate;

                         if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                            $ret .= ' ('.$obj->default_vat_code.')';

                     }

                     $db->free($sql);

                 } else

                     dol_print_error($db);

             } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

         }

 

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

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

         return $ret;

     }

 

@@ -4904,7 +4904,7 @@ 
         // global $db, $mysoc;

 

         if (!class_exists('Product')) {

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+            require_once DOL_BASE_PATH.'product/class/product.class.php';

         }

 

         $ret = 0;

@@ -4929,8 +4929,8 @@ 
         if (!$found) {

 // If vat of product for the country not found or not defined, we return higher vat of country.

             $sql = "SELECT taux as vat_rate, localtax1, localtax2";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

             $sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";

             $sql .= $db->plimit(1);

 

@@ -4947,7 +4947,7 @@ 
                 dol_print_error($db);

         }

 

-        DolUtils::dol_syslog("get_product_localtax_for_country: ret=" . $ret);

+        DolUtils::dol_syslog("get_product_localtax_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4971,7 +4971,7 @@ 
     {

         // global Globals::$conf;

 

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

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

 

 // Note: possible values for tva_assuj are 0/1 or franchise/reel

         $seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;

@@ -4982,7 +4982,7 @@ 
         $buyer_country_code = $thirdparty_buyer->country_code;

         $buyer_in_cee = isInEEC($thirdparty_buyer);

 

-        DolUtils::dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . $seller_in_cee . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . $buyer_in_cee . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+        DolUtils::dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

 

 // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)

 // we use the buyer VAT.

@@ -5048,14 +5048,14 @@ 
 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+                require_once DOL_BASE_PATH.'/fourn/class/fournisseur.product.class.php';

             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

         }

         elseif ($idprod > 0) {

             if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+                require_once DOL_BASE_PATH.'product/class/product.class.php';

             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5134,7 +5134,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="1" checked disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+                $result = '<input type="checkbox" value="1" checked disabled> '.$result;

 

             $classname = 'ok';

         }

@@ -5145,7 +5145,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="0" disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

+                $result = '<input type="checkbox" value="0" disabled> '.$result;

 

             if ($color == 2)

                 $classname = 'ok';

@@ -5153,7 +5153,7 @@ 
                 $classname = 'error';

         }

         if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            return '<font class="'.$classname.'">'.$result.'</font>';

         return $result;

     }

 

@@ -5187,13 +5187,13 @@ 
                 $num = preg_replace('/([^0-9])/i', '', $num);

             else

                 $num = preg_replace('/^.*\-/i', '', $num);

-            $num = substr("000" . $num, -$level);

+            $num = substr("000".$num, -$level);

             if ($level == 1)

                 $path = substr($num, 0, 1);

             if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 1, 1).'/'.substr($num, 0, 1);

             if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

         }

         else {

 // TODO

@@ -5224,7 +5224,7 @@ 
     {

         // global Globals::$conf;

 

-        DolUtils::dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

+        DolUtils::dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

         if (@is_dir($dir_osencoded))

@@ -5236,15 +5236,15 @@ 
         $ccdir = '';

         if (!empty($dataroot)) {

 // Remove data root from loop

-            $dir = str_replace($dataroot . '/', '', $dir);

-            $ccdir = $dataroot . '/';

+            $dir = str_replace($dataroot.'/', '', $dir);

+            $ccdir = $dataroot.'/';

         }

 

         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

             if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

+                $ccdir .= '/'.$cdir[$i];

             else

                 $ccdir .= $cdir[$i];

             if (preg_match("/^.:$/", $ccdir, $regs))

@@ -5298,20 +5298,20 @@ 
             if ($ccdir) {

                 $ccdir_osencoded = dol_osencode($ccdir);

                 if (!@is_dir($ccdir_osencoded)) {

-                    DolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

+                    DolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

 

                     umask(0);

                     $dirmaskdec = octdec($newmask);

                     if (empty($newmask)) {

                         $dirmaskdec = empty(Globals::$conf->global->MAIN_UMASK) ? octdec('0755') : octdec(Globals::$conf->global->MAIN_UMASK);

                     }

-                    $dirmaskdec |= octdec('0111');  // Set x bit required for directories

+                    $dirmaskdec |= octdec('0111'); // Set x bit required for directories

                     if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

                         // Si le is_dir a renvoye une fausse info, alors on passe ici.

-                        DolUtils::dol_syslog("functions.lib::dol_mkdir: Fails to create directory '" . $ccdir . "' or directory already exists.", LOG_WARNING);

+                        DolUtils::dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);

                         $nberr++;

                     } else {

-                        DolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' created", LOG_DEBUG);

+                        DolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);

                         $nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore

                         $nbcreated++;

                     }

@@ -5359,9 +5359,9 @@ 
         } else {

             $pattern = "/<[^<>]+>/";

 // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-            $temp = preg_replace($pattern, "", $temp);    // pass 1

+            $temp = preg_replace($pattern, "", $temp); // pass 1

 // $temp after pass 1: <a href="/myurl" title="A title">0000-021

-            $temp = preg_replace($pattern, "", $temp);    // pass 2

+            $temp = preg_replace($pattern, "", $temp); // pass 2

 // $temp after pass 2: 0000-021

         }

 

@@ -5417,8 +5417,8 @@ 
     {

         $temp = $stringtoclean;

         foreach ($disallowed_tags as $tagtoremove) {

-            $temp = preg_replace('/<\/?' . $tagtoremove . '>/', '', $temp);

-            $temp = preg_replace('/<\/?' . $tagtoremove . '\s+[^>]*>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);

         }

         return $temp;

     }

@@ -5435,12 +5435,12 @@ 
     {

         if ($nboflines == 1) {

             if (DolUtils::dol_textishtml($text)) {

-                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text);  // The s pattern modifier means the . can match newline characters

+                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters

                 $firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters

             } else {

                 $firstline = preg_replace('/[\n\r].*/', '', $text);

             }

-            return $firstline . ((strlen($firstline) != strlen($text)) ? '...' : '');

+            return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

         } else {

             $ishtml = 0;

             if (DolUtils::dol_textishtml($text)) {

@@ -5456,7 +5456,7 @@ 
                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

             else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+                $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

@@ -5470,7 +5470,7 @@ 
                 $i++;

             }

             unset($a);

-            return $firstline . (($i < $nba) ? '...' : '');

+            return $firstline.(($i < $nba) ? '...' : '');

         }

     }

 

@@ -5541,9 +5541,9 @@ 
     static function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')

     {

         $ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

-        $ret = preg_replace('/' . "\r\n" . '<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\r\n" . '/i', "\r\n", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\n" . '/i', "\n", $ret);

+        $ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);

         $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);

         return $ret;

     }

@@ -5556,7 +5556,7 @@ 
      */

     static function dol_htmlcleanlastbr($stringtodecode)

     {

-        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $stringtodecode);

+        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

         return $ret;

     }

 

@@ -5653,7 +5653,7 @@ 
             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

         else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5684,7 +5684,7 @@ 
      */

     static function dol_microtime_float()

     {

-        DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        DolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         return microtime(true);

     }

@@ -5730,9 +5730,9 @@ 
             elseif (preg_match('/<h[0-9]>/i', $msg))

                 return true;

             elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

             elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5957,7 +5957,7 @@ 
                     if ($object->fetch_optionals() > 0) {

                         if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

                             foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];

+                                $substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

                             }

                         }

                     }

@@ -5969,7 +5969,7 @@ 
                     $paymenturl = '';

                 } else {

                     // Set the online payment url link into __ONLINE_PAYMENT_URL__ key

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

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

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

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

@@ -6030,7 +6030,7 @@ 
 

 //var_dump($substitutionarray['__AMOUNT_FORMATED__']);

         if (empty($exclude) || !in_array('date', $exclude)) {

-            include_once DOL_BASE_PATH . '/core/lib/date.lib.php';

+            include_once DOL_BASE_PATH.'/core/lib/date.lib.php';

 

             $tmp = dol_getdate(dol_now(), true);

             $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

@@ -6040,13 +6040,13 @@ 
 

             $substitutionarray = array_merge($substitutionarray, array(

                 '__DAY__' => (string) $tmp['mday'],

-                '__DAY_TEXT__' => $outputlangs->trans('Day' . $tmp['wday']), // Monday

-                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'] . 'Min'), // Mon

-                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short' . $tmp['weekday']), // M

+                '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

                 '__MONTH__' => (string) $tmp['mon'],

-                '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp['mon'])),

                 '__YEAR__' => (string) $tmp['year'],

                 '__PREVIOUS_DAY__' => (string) $tmp2['day'],

                 '__PREVIOUS_MONTH__' => (string) $tmp3['month'],

@@ -6105,7 +6105,7 @@ 
                 if (!empty($tmp[1]))

                     $outputlangs->load($tmp[1]);

 

-                $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

+                $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

         }

 

@@ -6121,13 +6121,13 @@ 
                 $newval = '*****forbidden*****';

             else

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

-            $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($newval) : $newval, $text);

+            $text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

             if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

+                $value = ''; // Protection

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

                 $value = ''; // Protection

 

@@ -6153,7 +6153,7 @@ 
     {

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

 

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

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

 

 // Add a substitution key for each extrafields, using key __EXTRA_XXX__

 // TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

@@ -6183,11 +6183,11 @@ 
                 if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

                     $module = $reg[1];

 

-                    DolUtils::dol_syslog("Library " . $substitfile['name'] . " found into " . $dir);

+                    DolUtils::dol_syslog("Library ".$substitfile['name']." found into ".$dir);

                     // Include the user's functions file

-                    require_once $dir . $substitfile['name'];

+                    require_once $dir.$substitfile['name'];

                     // Call the user's function, and only if it is defined

-                    $function_name = $module . "_" . $callfunc;

+                    $function_name = $module."_".$callfunc;

                     if (function_exists($function_name))

                         $function_name($substitutionarray, $outputlangs, $object, $parameters);

                 }

@@ -6229,13 +6229,13 @@ 
             $outputlangs = Globals::$langs;

 

         if ($date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', DolUtils::dol_print_date($date_start, $format, false, $outputlangs), DolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', DolUtils::dol_print_date($date_start, $format, false, $outputlangs), DolUtils::dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if ($date_start && !$date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFrom', DolUtils::dol_print_date($date_start, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', DolUtils::dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if (!$date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateUntil', DolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', DolUtils::dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

 

         return $out;

@@ -6315,7 +6315,7 @@ 
             DolUtils::dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

             if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

+                dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

             if (empty($mesgs))

                 setEventMessage($mesg, $style);

             else {

@@ -6384,7 +6384,7 @@ 
 

 // If inline message with no format, we add it.

         if ((empty(Globals::$conf->use_javascript_ajax) || !empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

-            $divstart = '<div class="' . $style . ' clearboth">';

+            $divstart = '<div class="'.$style.' clearboth">';

             $divend = '</div>';

         }

 

@@ -6411,14 +6411,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {

                 $return = '<script type="text/javascript">

 					$(document).ready(function() {

-						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false") . '

+						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

 						if (block) {

-							$.dolEventValid("","' . dol_escape_js($out) . '");

+							$.dolEventValid("","' . dol_escape_js($out).'");

 						} else {

 							/* jnotify(message, preset of message type, keepmessage) */

-							$.jnotify("' . dol_escape_js($out) . '",

-							"' . ($style == "ok" ? 3000 : $style) . '",

-							' . ($style == "ok" ? "false" : "true") . ',

+							$.jnotify("' . dol_escape_js($out).'",

+							"' . ($style == "ok" ? 3000 : $style).'",

+							' . ($style == "ok" ? "false" : "true").',

 							{ remove: static function (){} } );

 						}

 					});

@@ -6613,11 +6613,11 @@ 
     {

         // global Globals::$conf;

 

-        $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

+        $tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

             $tmp = 'iso-8859-1'; // By default for windows

         if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

+            $tmp = 'utf-8'; // By default for other

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

             $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

 

@@ -6648,16 +6648,16 @@ 
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

-            return $cache_codes[$tablename][$key][$fieldid];   // Found in cache

+            return $cache_codes[$tablename][$key][$fieldid]; // Found in cache

         }

 

         DolUtils::dol_syslog('dol_getIdFromCode (value not found into cache)', LOG_DEBUG);

 

-        $sql = "SELECT " . $fieldid . " as valuetoget";

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

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

+        $sql = "SELECT ".$fieldid." as valuetoget";

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

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

         if (!empty($entityfilter))

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

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

 

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

         if ($resql) {

@@ -6688,8 +6688,8 @@ 
 //print $strRights."<br>\n";

         $rights = true;

         if ($strRights != '') {

-            $str = 'if(!(' . $strRights . ')) { $rights = false; }';

-            self::dol_eval($str);  // The dol_eval must contains all the// global $xxx used into a condition

+            $str = 'if(!('.$strRights.')) { $rights = false; }';

+            self::dol_eval($str); // The dol_eval must contains all the// global $xxx used into a condition

         }

         return $rights;

     }

@@ -6716,9 +6716,9 @@ 
 //print $s."<br>\n";

         if ($returnvalue) {

             if ($hideerrors)

-                return @eval('return ' . $s . ';');

+                return @eval('return '.$s.';');

             else

-                return eval('return ' . $s . ';');

+                return eval('return '.$s.';');

         }

         else {

             if ($hideerrors)

@@ -6772,7 +6772,7 @@ 
             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

 

-        return img_picto_common($codelang, 'flags/' . strtolower($flagImage) . '.png', $moreatt);

+        return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

     }

 

     /**

@@ -6970,16 +6970,16 @@ 
             'zu-ZA',

         );

 

-        $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

+        $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);

         if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+            return strtolower($countrycode).'_'.strtoupper($countrycode);

 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

             $locale_region = locale_get_region($locale);

             if (strtoupper($countrycode) == $locale_region) {

 //var_dump($locale.'-'.$locale_language.'-'.$locale_region);

-                return strtolower($locale_language) . '_' . strtoupper($locale_region);

+                return strtolower($locale_language).'_'.strtoupper($locale_region);

             }

         }

 

@@ -7040,7 +7040,7 @@ 
                                 $label = Globals::$langs->trans($values[2]);

 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

-                            $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

+                            $head[$h][0] = BASE_URI.preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

                             $head[$h][1] = $label;

                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

@@ -7111,43 +7111,43 @@ 
         // global $micro_start_time;

 

         if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

+            print "\n".'<!-- Common footer for private page -->'."\n";

         else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+            print "\n".'<!-- Common footer for public page -->'."\n";

 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

-        print '<div id="page_y" style="display: none;">' . filter_input(INPUT_POST, 'page_y') . '</div>' . "\n";

+        print '<div id="page_y" style="display: none;">'.filter_input(INPUT_POST, 'page_y').'</div>'."\n";

 

         $parameters = array();

-        $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

+        $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

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

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

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

 

             print "\n";

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

-                print '<script type="text/javascript" language="javascript">' . "\n";

-                print 'jQuery(document).ready(function() {' . "\n";

+                print '<script type="text/javascript" language="javascript">'."\n";

+                print 'jQuery(document).ready(function() {'."\n";

 

                 if ($zone == 'private' && empty(Globals::$conf->dol_use_jmobile)) {

                     print "\n";

-                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";

                     print 'jQuery(".menuhider").click(function() {';

-                    print '  console.log("We click on .menuhider");' . "\n";

+                    print '  console.log("We click on .menuhider");'."\n";

                     //print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md

                     print "  $('.side-nav').toggle()\n";

                     print "  $('.login_block').toggle()\n";

-                    print '});' . "\n";

+                    print '});'."\n";

                 }

 

 // Management of focus and mandatory for fields

                 if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {

-                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

                     // Clean $relativepathstring

                     if (constant('DOL_BASE_URI'))

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

+                        $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);

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

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

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

@@ -7170,9 +7170,9 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Set focus on field

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").focus();' . "\n";  // Not really usefull, but we keep it in case of.

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.

                                 }

                             }

                         }

@@ -7196,16 +7196,16 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Add property 'required' on input

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";  // required on a select works only if key is "", this does not happen in Dolibarr

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

                                 }

                             }

                         }

                     }

                 }

 

-                print '});' . "\n";

+                print '});'."\n";

 

 // Google Analytics

 // TODO Add a hook here

@@ -7213,15 +7213,15 @@ 
                     if ((Globals::$conf->dol_use_jmobile != 4)) {

                         print "\n";

                         print "/* JS CODE TO ENABLE for google analtics tag */\n";

-                        print '  var _gaq = _gaq || [];' . "\n";

-                        print '  _gaq.push([\'_setAccount\', \'' . Globals::$conf->global->MAIN_GOOGLE_AN_ID . '\']);' . "\n";

-                        print '  _gaq.push([\'_trackPageview\']);' . "\n";

-                        print '' . "\n";

-                        print '  (function() {' . "\n";

-                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;' . "\n";

-                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';' . "\n";

-                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);' . "\n";

-                        print '  })();' . "\n";

+                        print '  var _gaq = _gaq || [];'."\n";

+                        print '  _gaq.push([\'_setAccount\', \''.Globals::$conf->global->MAIN_GOOGLE_AN_ID.'\']);'."\n";

+                        print '  _gaq.push([\'_trackPageview\']);'."\n";

+                        print ''."\n";

+                        print '  (function() {'."\n";

+                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;'."\n";

+                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';'."\n";

+                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);'."\n";

+                        print '  })();'."\n";

                     }

                 }

 

@@ -7231,27 +7231,27 @@ 
                     print "/* JS CODE TO ENABLE to add memory info */\n";

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

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

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

-                    print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

+                        print 'MEMCACHED_SERVER='.Globals::$conf->global->MEMCACHED_SERVER.' - ';

+                    print 'MAIN_OPTIMIZE_SPEED='.(isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

-                        print ' - Build time: ' . ceil(1000 * ($micro_end_time - $micro_start_time)) . ' ms';

+                        print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';

                     }

                     if (function_exists("memory_get_usage")) {

-                        print ' - Mem: ' . memory_get_usage();

+                        print ' - Mem: '.memory_get_usage();

                     }

                     if (function_exists("xdebug_memory_usage")) {

-                        print ' - XDebug time: ' . ceil(1000 * xdebug_time_index()) . ' ms';

-                        print ' - XDebug mem: ' . xdebug_memory_usage();

-                        print ' - XDebug mem peak: ' . xdebug_peak_memory_usage();

+                        print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';

+                        print ' - XDebug mem: '.xdebug_memory_usage();

+                        print ' - XDebug mem peak: '.xdebug_peak_memory_usage();

                     }

                     if (function_exists("zend_loader_file_encoded")) {

-                        print ' - Zend encoded file: ' . (zend_loader_file_encoded() ? 'yes' : 'no');

+                        print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');

                     }

-                    print '");' . "\n";

+                    print '");'."\n";

                 }

 

-                print "\n" . '</script>' . "\n";

+                print "\n".'</script>'."\n";

             }

 

 // Add Xdebug coverage of code

@@ -7265,7 +7265,7 @@ 
                 print "<!-- Start of log output\n";

 //print '<div class="hidden">'."\n";

                 foreach (Globals::$conf->logbuffer as $logline) {

-                    print $logline . "<br>\n";

+                    print $logline."<br>\n";

                 }

 //print '</div>'."\n";

                 print "End of log output -->\n";

@@ -7308,8 +7308,8 @@ 
      */

     static function dol_set_focus($selector)

     {

-        print "\n" . '<!-- Set focus onto a specific field -->' . "\n";

-        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("' . dol_escape_js($selector) . '").focus(); });</script>' . "\n";

+        print "\n".'<!-- Set focus onto a specific field -->'."\n";

+        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

     }

 

     /**

@@ -7354,7 +7354,7 @@ 
             $value = preg_replace('/\*/', '%', $value); // Replace * with %

         }

         if ($mode == 1) {

-            $value = preg_replace('/([<>=]+)\s+([0-9' . preg_quote(Globals::$langs->trans("DecimalSeparator"), '/') . '\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

+            $value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote(Globals::$langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

         }

 

         $value = preg_replace('/\s*\|\s*/', '|', $value);

@@ -7383,14 +7383,14 @@ 
                     if ($newcrit != '') {

                         $numnewcrit = price2num($newcrit);

                         if (is_numeric($numnewcrit)) {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' ' . $operator . ' ' . $numnewcrit;

+                            $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

                         } else {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false

+                            $newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

                         }

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 2) {

-                    $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";

+                    $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";

                     $i2++; // a criteria was added to string

                 } else if ($mode == 3) {

                     $tmparray = explode(',', trim($crit));

@@ -7399,10 +7399,10 @@ 
                         foreach ($tmparray as $val) {

                             if ($val) {

                                 $listofcodes .= ($listofcodes ? ',' : '');

-                                $listofcodes .= "'" . $db->escape(trim($val)) . "'";

+                                $listofcodes .= "'".$db->escape(trim($val))."'";

                             }

                         }

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";

+                        $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 4) {

@@ -7411,10 +7411,10 @@ 
                         $listofcodes = '';

                         foreach ($tmparray as $val) {

                             if ($val) {

-                                $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';

-                                $newres .= ' OR ' . $field . ' = \'' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';

+                                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+                                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

                                 $newres .= ')';

                                 $i2++;

                             }

@@ -7431,9 +7431,9 @@ 
                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

                         if (preg_match('/\.(id|rowid)$/', $field)) { // Special case for rowid that is sometimes a ref so used as a search field

-                            $newres .= $field . " = " . (is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

+                            $newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

                         } else {

-                            $newres .= $field . " LIKE '";

+                            $newres .= $field." LIKE '";

 

                             $tmpcrit = trim($tmpcrit);

                             $tmpcrit2 = $tmpcrit;

@@ -7452,7 +7452,7 @@ 
                             $newres .= $tmpafter;

                             $newres .= "'";

                             if ($tmpcrit2 == '') {

-                                $newres .= ' OR ' . $field . " IS NULL";

+                                $newres .= ' OR '.$field." IS NULL";

                             }

                         }

 

@@ -7463,10 +7463,10 @@ 
                 $i++;

             }

             if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+                $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

             $j++;

         }

-        $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

+        $res = ($nofirstand ? "" : " AND ")."(".$res.")";

 //print 'xx'.$res.'yy';

         return $res;

     }

@@ -7485,8 +7485,8 @@ 
         $url = $object->getLastMainDocLink($object->element);

 

         if ($url) {

-            $out .= img_picto('', 'object_globe.png') . ' ' . Globals::$langs->trans("DirectDownloadLink") . '<br>';

-            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="' . $url . '">';

+            $out .= img_picto('', 'object_globe.png').' '.Globals::$langs->trans("DirectDownloadLink").'<br>';

+            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

             $out .= ajax_autoselect("directdownloadlink", 0);

         }

         return $out;

@@ -7527,7 +7527,7 @@ 
         if ($extName)

             $subdir = 'thumbs/';

 

-        return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

+        return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb

     }

 

     /**

@@ -7553,14 +7553,14 @@ 
 

         if ($alldata == 1) {

             if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

+                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime' => dol_mimetype($relativepath),);

             else

                 return array();

         }

 

 // old behavior

         if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';

+            return 'javascript:document_preview(\''.dol_escape_js(DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js(Globals::$langs->trans('Preview')).'\')';

         else

             return '';

     }

@@ -7577,11 +7577,11 @@ 
         // global Globals::$langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

-				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

+				    jQuery("#' . $htmlname.'").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

         if ($addlink)

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

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

         return $out;

     }

 

@@ -7962,9 +7962,9 @@ 
 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

-            $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

+            $sql = 'SELECT * FROM '.$tablename.' WHERE 1';

             if ($checkentity)

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

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

 

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

             if ($resql) {

@@ -8002,14 +8002,14 @@ 
                 $g = $tmp[1];

                 $b = $tmp[2];

             } else {

-                $hexr = $stringcolor[0] . $stringcolor[1];

-                $hexg = $stringcolor[2] . $stringcolor[3];

-                $hexb = $stringcolor[4] . $stringcolor[5];

+                $hexr = $stringcolor[0].$stringcolor[1];

+                $hexg = $stringcolor[2].$stringcolor[3];

+                $hexb = $stringcolor[4].$stringcolor[5];

                 $r = hexdec($hexr);

                 $g = hexdec($hexg);

                 $b = hexdec($hexb);

             }

-            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

+            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm

             if ($bright > 0.6)

                 $res = 1;

         }

@@ -8044,11 +8044,11 @@ 
                 return 0; // Entry is for menus all excluded to external users

         }

         if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

+            return 0; // No permissions and user is external

         if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

             return 0; // No permissions and option to hide when not allowed, even for internal user, is on

         if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            return 2; // No permissions and user is external

         return 1;

     }