alxarafe / alixar

Controllers/Categories.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     {

 

 // Load translation files required by the page

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

+        Globals::$langs->load("categories");

 

 // Security check

         $socid = DolUtils::GETPOST('socid', 'int');

Spacing +17 added lines, -17 removed lines

@@ -104,28 +104,28 @@ 
             // Action ajout d'une categorie

             if ($cancel) {

                 if ($urlfrom) {

-                    header("Location: " . $urlfrom);

+                    header("Location: ".$urlfrom);

                     exit;

                 } else if ($idProdOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProdOrigin . '&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);

                     exit;

                 } else if ($idCompanyOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idCompanyOrigin . '&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);

                     exit;

                 } else if ($idSupplierOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idSupplierOrigin . '&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);

                     exit;

                 } else if ($idMemberOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idMemberOrigin . '&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);

                     exit;

                 } else if ($idContactOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idContactOrigin . '&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);

                     exit;

                 } else if ($idProjectOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProjectOrigin . '&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);

                     exit;

                 } else {

-                    header("Location: " . DOL_URL_ROOT . '/categories/index.php?leftmenu=cat&type=' . $type);

+                    header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);

                     exit;

                 }

             }

@@ -169,32 +169,32 @@ 
             // Action confirmation de creation categorie

             if ($action == 'confirmed') {

                 if ($urlfrom) {

-                    header("Location: " . $urlfrom);

+                    header("Location: ".$urlfrom);

                     exit;

                 } elseif ($backtopage) {

-                    header("Location: " . $backtopage);

+                    header("Location: ".$backtopage);

                     exit;

                 } else if ($idProdOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProdOrigin . '&type=' . $type . '&mesg=' . urlencode($langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));

                     exit;

                 } else if ($idCompanyOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idCompanyOrigin . '&type=' . $type . '&mesg=' . urlencode($langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));

                     exit;

                 } else if ($idSupplierOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idSupplierOrigin . '&type=' . $type . '&mesg=' . urlencode($langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));

                     exit;

                 } else if ($idMemberOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idMemberOrigin . '&type=' . $type . '&mesg=' . urlencode($langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));

                     exit;

                 } else if ($idContactOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idContactOrigin . '&type=' . $type . '&mesg=' . urlencode($langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));

                     exit;

                 } else if ($idProjectOrigin) {

-                    header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $idProjectOrigin . '&type=' . $type . '&mesg=' . urlencode($langs->trans("CatCreated")));

+                    header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));

                     exit;

                 }

 

-                header("Location: " . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $result . '&type=' . $type);

+                header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$type);

                 exit;

             }

         }

Braces +30 added lines, -20 removed lines

@@ -50,8 +50,9 @@ 
 

 // Security check

         $socid = DolUtils::GETPOST('socid', 'int');

-        if (!Globals::$user->rights->categorie->lire)

-            accessforbidden();

+        if (!Globals::$user->rights->categorie->lire) {
+                    accessforbidden();
+        }
 

         $action = DolUtils::GETPOST('action', 'alpha');

         $cancel = DolUtils::GETPOST('cancel', 'alpha');

@@ -69,22 +70,29 @@ 
         $parent = DolUtils::GETPOST('parent');

 

         if ($origin) {

-            if ($type == Categorie::TYPE_PRODUCT)

-                $idProdOrigin = $origin;

-            if ($type == Categorie::TYPE_SUPPLIER)

-                $idSupplierOrigin = $origin;

-            if ($type == Categorie::TYPE_CUSTOMER)

-                $idCompanyOrigin = $origin;

-            if ($type == Categorie::TYPE_MEMBER)

-                $idMemberOrigin = $origin;

-            if ($type == Categorie::TYPE_CONTACT)

-                $idContactOrigin = $origin;

-            if ($type == Categorie::TYPE_PROJECT)

-                $idProjectOrigin = $origin;

+            if ($type == Categorie::TYPE_PRODUCT) {
+                            $idProdOrigin = $origin;
+            }
+            if ($type == Categorie::TYPE_SUPPLIER) {
+                            $idSupplierOrigin = $origin;
+            }
+            if ($type == Categorie::TYPE_CUSTOMER) {
+                            $idCompanyOrigin = $origin;
+            }
+            if ($type == Categorie::TYPE_MEMBER) {
+                            $idMemberOrigin = $origin;
+            }
+            if ($type == Categorie::TYPE_CONTACT) {
+                            $idContactOrigin = $origin;
+            }
+            if ($type == Categorie::TYPE_PROJECT) {
+                            $idProjectOrigin = $origin;
+            }
         }

 

-        if ($catorigin && $type == Categorie::TYPE_PRODUCT)

-            $idCatOrigin = $catorigin;

+        if ($catorigin && $type == Categorie::TYPE_PRODUCT) {
+                    $idCatOrigin = $catorigin;
+        }
 

         $object = new Categorie();

 

@@ -139,12 +147,14 @@ 
             $object->visible = $visible;

             $object->type = $type;

 

-            if ($parent != "-1")

-                $object->fk_parent = $parent;

+            if ($parent != "-1") {
+                            $object->fk_parent = $parent;
+            }
 

             $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-            if ($ret < 0)

-                $error++;

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

             if (!$object->label) {

                 $error++;

Views/CategoriesView.php

Spacing +15 added lines, -15 removed lines

@@ -64,21 +64,21 @@ 
             if ($action == 'create' || $_POST["addcat"] == 'addcat') {

                 DolUtils::dol_set_focus('#label');

 

-                print '<form action="' . $_SERVER['PHP_SELF'] . '?type=' . $type . '" method="POST">';

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

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

+                print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';

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

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

                 print '<input type="hidden" name="action" value="add">';

                 print '<input type="hidden" name="addcat" value="addcat">';

-                print '<input type="hidden" name="id" value="' . DolUtils::GETPOST('origin', 'alpha') . '">';

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

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

+                print '<input type="hidden" name="id" value="'.DolUtils::GETPOST('origin', 'alpha').'">';

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

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

                 if ($origin)

                 {

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

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

                 }

                 if ($catorigin)

                 {

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

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

                 }

 

                 print load_fiche_titre($langs->trans("CreateCat"));

@@ -89,29 +89,29 @@ 
 

                 // Ref

                 print '<tr>';

-                print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td><input id="label" class="minwidth100" name="label" value="' . $label . '">';

+                print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';

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

 

                 // Description

-                print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';

+                print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

                 //require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

                 $doleditor = new DolEditor('description', $description, '', 200, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_6, '90%');

                 $doleditor->Create();

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

 

                 // Color

-                print '<tr><td>' . $langs->trans("Color") . '</td><td>';

+                print '<tr><td>'.$langs->trans("Color").'</td><td>';

                 print $formother->selectColor($color, 'color');

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

 

                 // Parent category

-                print '<tr><td>' . $langs->trans("AddIn") . '</td><td>';

+                print '<tr><td>'.$langs->trans("AddIn").'</td><td>';

                 print $form->select_all_categories($type, $catorigin, 'parent');

                 print ajax_combobox('parent');

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

 

                 $parameters = array();

-                $reshook = Globals::$hookManager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+                $reshook = Globals::$hookManager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

                 print Globals::$hookManager->resPrint;

                 if (empty($reshook)) {

                     print $object->showOptionals($extrafields, 'edit');

@@ -122,9 +122,9 @@ 
                 DolUtils::dol_fiche_end('');

 

                 print '<div class="center">';

-                print '<input type="submit" class="button" value="' . $langs->trans("CreateThisCat") . '" name="creation" />';

+                print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';

                 print '&nbsp; &nbsp; &nbsp;';

-                print '<input type="submit" class="button" value="' . $langs->trans("Cancel") . '" name="cancel" />';

+                print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';

                 print '</div>';

 

                 print '</form>';

Views/LoginView.php

Spacing +9 added lines, -9 removed lines

@@ -61,7 +61,7 @@ 
     public function draw()

     {

         header('Cache-Control: Public, must-revalidate');

-        header("Content-type: text/html; charset=" . Globals::$conf->file->character_set_client);

+        header("Content-type: text/html; charset=".Globals::$conf->file->character_set_client);

 

 // Need global variable $title to be defined by caller (like dol_loginfunction)

 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);

@@ -94,9 +94,9 @@ 
         }

 

         $php_self = DolUtils::dol_escape_htmltag($_SERVER['PHP_SELF']);

-        $php_self .= DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?' . DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';

+        $php_self .= DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.DolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';

         if (!preg_match('/mainmenu=/', $php_self)) {

-            $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?') . 'mainmenu=home';

+            $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';

         }

 

         $this->url = $php_self;

@@ -110,28 +110,28 @@ 
           );

          */

         $arrayofjs = array(

-            DOL_BASE_URI . '/includes/jstz/jstz.min.js' . (empty(Globals::$conf->dol_use_jmobile) ? '' : '?version=' . urlencode(DOL_VERSION)),

-            DOL_BASE_URI . '/core/js/dst.js' . (empty(Globals::$conf->dol_use_jmobile) ? '' : '?version=' . urlencode(DOL_VERSION))

+            DOL_BASE_URI.'/includes/jstz/jstz.min.js'.(empty(Globals::$conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)),

+            DOL_BASE_URI.'/core/js/dst.js'.(empty(Globals::$conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION))

         );

 

         // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php.

         // We must keep the @, some tools use it to know it is login page and find true dolibarr version.

         // $titleofloginpage = Globals::$langs->trans('Login') . ' @ ' . $titletruedolibarrversion;

-        $titleofloginpage = Globals::$langs->trans('Login') . ' @ ' . DOL_VERSION;

+        $titleofloginpage = Globals::$langs->trans('Login').' @ '.DOL_VERSION;

 

         $disablenofollow = 1;

-        if (!preg_match('/' . constant('DOL_APPLICATION_TITLE') . '/', $this->title)) {

+        if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $this->title)) {

             $disablenofollow = 0;

         }

 

         print $this->top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);

 

 

-        $colorbackhmenu1 = '60,70,100';      // topmenu

+        $colorbackhmenu1 = '60,70,100'; // topmenu

         if (!isset(Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1)) {

             Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;

         }

         $colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty(Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : Globals::$conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);

-        $colorbackhmenu1 = join(',', DolUtils2::colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'

+        $colorbackhmenu1 = join(',', DolUtils2::colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'

     }

 }

dolibarr/htdocs/install/inc.php

Spacing +72 added lines, -72 removed lines

@@ -33,12 +33,12 @@ 
 // Just to define version DOL_VERSION
 if (!defined('DOL_INC_FOR_VERSION_ERROR'))
     define('DOL_INC_FOR_VERSION_ERROR', '1');
-require_once DOL_BASE_PATH . '/filefunc.inc.php';
+require_once DOL_BASE_PATH.'/filefunc.inc.php';
 
-require_once DOL_BASE_PATH . '/core/class/translate.class.php';
-require_once DOL_BASE_PATH . '/core/lib/functions.lib.php';
-require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
-require_once DOL_BASE_PATH . '/core/lib/files.lib.php';
+require_once DOL_BASE_PATH.'/core/class/translate.class.php';
+require_once DOL_BASE_PATH.'/core/lib/functions.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/files.lib.php';
 
 /*
  * adobdbtime package
@@ -78,7 +78,7 @@ 
 // Define vars
 $conffiletoshowshort = "conf.php";
 // Define localization of conf file
-$conffile = DOL_BASE_PATH . "/conf/conf.php";
+$conffile = DOL_BASE_PATH."/conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
 //$conffile = "/etc/dolibarr/conf.php";
@@ -100,7 +100,7 @@ 
             $dolibarr_main_db_port = '3306'; // For backward compatibility
         }
         // Clean parameters
-        $dolibarr_main_data_root = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : DOL_BASE_PATH . '../documents';
+        $dolibarr_main_data_root = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : DOL_BASE_PATH.'../documents';
         $dolibarr_main_url_root = isset($dolibarr_main_url_root) ? trim($dolibarr_main_url_root) : '';
         $dolibarr_main_url_root_alt = isset($dolibarr_main_url_root_alt) ? trim($dolibarr_main_url_root_alt) : '';
         $dolibarr_main_document_root = isset($dolibarr_main_document_root) ? trim($dolibarr_main_document_root) : '';
@@ -126,7 +126,7 @@ 
         // Load database driver
         if ($result) {
             if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type)) {
-                $result = include_once $dolibarr_main_document_root . "/core/db/" . $dolibarr_main_db_type . '.class.php';
+                $result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
                 if (!$result) {
                     $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
                 }
@@ -146,14 +146,14 @@ 
 }
 define('MAIN_DB_PREFIX', (isset($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : ''));
 
-define('DOL_CLASS_PATH', 'class/');                             // Filsystem path to class dir
-define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : DOL_BASE_PATH . '../documents'));
-define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : ''));           // URL relative root
-$uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT'));  // $uri contains url without http*
-$suburi = strstr($uri, '/');       // $suburi contains url without domain
+define('DOL_CLASS_PATH', 'class/'); // Filsystem path to class dir
+define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : DOL_BASE_PATH.'../documents'));
+define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : '')); // URL relative root
+$uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
+$suburi = strstr($uri, '/'); // $suburi contains url without domain
 if ($suburi == '/')
-    $suburi = '';   // If $suburi is /, it is now ''
-define('DOL_URL_ROOT', $suburi);    // URL relative root ('', '/dolibarr', ...)
+    $suburi = ''; // If $suburi is /, it is now ''
+define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
 
 
 if (empty($conf->file->character_set_client))
@@ -189,14 +189,14 @@ 
     $langs->load("install");
     print $langs->trans("YouTryInstallDisabledByDirLock");
     if (!empty($dolibarr_main_url_root)) {
-        print 'Click on following link, <a href="' . $dolibarr_main_url_root . '/admin/index.php?mainmenu=home&leftmenu=setup' . (isset($_POST["login"]) ? '&username=' . urlencode($_POST["login"]) : '') . '">';
+        print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
     }
     exit;
 }
 
-$lockfile = DOL_DATA_ROOT . '/install.lock';
+$lockfile = DOL_DATA_ROOT.'/install.lock';
 if (constant('DOL_DATA_ROOT') === null) {
     // We don't have a configuration file yet
     // Try to detect any lockfile in the default documents path
@@ -210,8 +210,8 @@ 
     $langs->load("install");
     print $langs->trans("YouTryInstallDisabledByFileLock");
     if (!empty($dolibarr_main_url_root)) {
-        print $langs->trans("ClickOnLinkOrRemoveManualy") . '<br>';
-        print '<a href="' . $dolibarr_main_url_root . '/admin/index.php?mainmenu=home&leftmenu=setup' . (isset($_POST["login"]) ? '&username=' . urlencode($_POST["login"]) : '') . '">';
+        print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
+        print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
     } else {
@@ -230,13 +230,13 @@ 
     if (@is_writable('/tmp'))
         define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
     else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-        define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+        define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
     else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-        define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+        define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
     else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
         define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
     else if (@is_writable('../../'))
-        define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+        define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
 
 
 
@@ -258,9 +258,9 @@ 
 // We init log handler for install
 $handlers = array('mod_syslog_file');
 foreach ($handlers as $handler) {
-    $file = DOL_BASE_PATH . '/core/modules/syslog/' . $handler . '.php';
+    $file = DOL_BASE_PATH.'/core/modules/syslog/'.$handler.'.php';
     if (!file_exists($file)) {
-        throw new Exception('Missing log handler file ' . $handler . '.php');
+        throw new Exception('Missing log handler file '.$handler.'.php');
     }
 
     require_once $file;
@@ -320,7 +320,7 @@ 
     global $dolibarr_main_db_pass;
     global $character_set_client;
 
-    $return = include_once $dolibarr_main_document_root . '/core/class/conf.class.php';
+    $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
     if (!$return)
         return -1;
 
@@ -360,13 +360,13 @@ 
         if (@is_writable('/tmp'))
             define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
         else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-            define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+            define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
         else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-            define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+            define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
         else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
             define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
         else if (@is_writable('../../'))
-            define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+            define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
 
 
 
@@ -388,9 +388,9 @@ 
     // We init log handler for install
     $handlers = array('mod_syslog_file');
     foreach ($handlers as $handler) {
-        $file = DOL_BASE_PATH . '/core/modules/syslog/' . $handler . '.php';
+        $file = DOL_BASE_PATH.'/core/modules/syslog/'.$handler.'.php';
         if (!file_exists($file)) {
-            throw new Exception('Missing log handler file ' . $handler . '.php');
+            throw new Exception('Missing log handler file '.$handler.'.php');
         }
 
         require_once $file;
@@ -436,63 +436,63 @@ 
     }
 
     // We force the content charset
-    header("Content-type: text/html; charset=" . $conf->file->character_set_client);
+    header("Content-type: text/html; charset=".$conf->file->character_set_client);
     header("X-Content-Type-Options: nosniff");
 
-    print '<!DOCTYPE HTML>' . "\n";
-    print '<html>' . "\n";
-    print '<head>' . "\n";
-    print '<meta charset="' . $conf->file->character_set_client . '">' . "\n";
-    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">' . "\n";
-    print '<meta name="generator" content="Dolibarr installer">' . "\n";
-    print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/install/default.css">' . "\n";
+    print '<!DOCTYPE HTML>'."\n";
+    print '<html>'."\n";
+    print '<head>'."\n";
+    print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
+    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+    print '<meta name="generator" content="Dolibarr installer">'."\n";
+    print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/install/default.css">'."\n";
 
-    print '<!-- Includes CSS for JQuery -->' . "\n";
+    print '<!-- Includes CSS for JQuery -->'."\n";
     if ($jQueryUiCustomPath) {
-        print '<link rel="stylesheet" type="text/css" href="' . $jQueryUiCustomPath . 'css/' . $jquerytheme . '/jquery-ui.min.css" />' . "\n";  // JQuery
+        print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
     } else {
         //print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.min.css" />' . "\n";    // JQuery
-        print '<link rel="stylesheet" type="text/css" href="' . BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.min.css" />' . "\n";    // JQuery
+        print '<link rel="stylesheet" type="text/css" href="'.BASE_URI.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
     }
-    print '<!-- Includes JS for JQuery -->' . "\n";
+    print '<!-- Includes JS for JQuery -->'."\n";
     if ($jQueryCustomPath) {
-        print '<script type="text/javascript" src="' . $jQueryCustomPath . 'jquery.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
     } else {
         // print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js"></script>' . "\n";
-        print '<script type="text/javascript" src="' . BASE_URI . '/vendor/components/jquery/jquery.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.BASE_URI.'/vendor/components/jquery/jquery.min.js"></script>'."\n";
     }
     if ($jQueryUiCustomPath) {
-        print '<script type="text/javascript" src="' . $jQueryUiCustomPath . 'jquery-ui.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
     } else {
         // print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js"></script>' . "\n";
-        print '<script type="text/javascript" src="' . BASE_URI . '/vendor/components/jqueryui/jquery-ui.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.BASE_URI.'/vendor/components/jqueryui/jquery-ui.min.js"></script>'."\n";
     }
-    print '<title>' . $langs->trans("DolibarrSetup") . '</title>' . "\n";
+    print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
     print "<!-- Alixar debugBar header -->";
     print Debug::getRenderHeader(); // Includes Alixar debugBar header
-    print '</head>' . "\n";
+    print '</head>'."\n";
 
-    print '<body>' . "\n";
+    print '<body>'."\n";
 
     print '<div class="divlogoinstall" style="text-align:center">';
-    print '<img class="imglogoinstall" src="' . DOL_BASE_URI . '/theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
+    print '<img class="imglogoinstall" src="'.DOL_BASE_URI.'/theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
     print DOL_VERSION;
     print '</div><br>';
 
-    print '<span class="titre">' . $langs->trans("DolibarrSetup");
+    print '<span class="titre">'.$langs->trans("DolibarrSetup");
     if ($subtitle) {
-        print ' - ' . $subtitle;
+        print ' - '.$subtitle;
     }
-    print '</span>' . "\n";
+    print '</span>'."\n";
 
     //print '<form name="forminstall" style="width: 100%" action="' . $next . '.php' . ($param ? '?' . $param : '') . '" method="POST">' . "\n";
-    print '<form name="forminstall" style="width: 100%" action="' . BASE_URI . '?controller=install&method=' . $next . ($param ? '&' . $param : '') . '" method="POST">' . "\n";
-    print '<input type="hidden" name="testpost" value="ok">' . "\n";
-    print '<input type="hidden" name="action" value="' . $action . '">' . "\n";
+    print '<form name="forminstall" style="width: 100%" action="'.BASE_URI.'?controller=install&method='.$next.($param ? '&'.$param : '').'" method="POST">'."\n";
+    print '<input type="hidden" name="testpost" value="ok">'."\n";
+    print '<input type="hidden" name="action" value="'.$action.'">'."\n";
 
-    print '<table class="main" width="100%"><tr><td>' . "\n";
+    print '<table class="main" width="100%"><tr><td>'."\n";
 
-    print '<table class="' . $csstable . '" width="100%"><tr><td>' . "\n";
+    print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
 }
 
 /**
@@ -512,27 +512,27 @@ 
     $langs->load("other");
     $langs->load("admin");
 
-    print '</td></tr></table>' . "\n";
-    print '</td></tr></table>' . "\n";
+    print '</td></tr></table>'."\n";
+    print '</td></tr></table>'."\n";
 
     if (!$nonext || ($nonext == '2')) {
         print '<div class="nextbutton" id="nextbutton">';
         if ($nonext == '2') {
-            print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"] . '&ignoreerrors=1' : '') . '<br><br>';
+            print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"].'&ignoreerrors=1' : '').'<br><br>';
         }
 
-        print '<input type="submit" ' . ($nonext == '2' ? 'disabled="disabled" ' : '') . 'value="' . $langs->trans("NextStep") . ' ->"';
+        print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ' : '').'value="'.$langs->trans("NextStep").' ->"';
         if ($jscheckfunction)
-            print ' onClick="return ' . $jscheckfunction . '();"';
+            print ' onClick="return '.$jscheckfunction.'();"';
         print '></div>';
         if ($withpleasewait)
-            print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>' . $langs->trans("NextStepMightLastALongTime") . '<br><br><div class="blinkwait">' . $langs->trans("PleaseBePatient") . '</div></div>';
+            print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
     }
     if ($setuplang) {
-        print '<input type="hidden" name="selectlang" value="' . $setuplang . '">';
+        print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
     }
 
-    print '</form>' . "\n";
+    print '</form>'."\n";
 
     // If there is some logs in buffer to show
     if (isset($conf->logbuffer) && count($conf->logbuffer)) {
@@ -540,7 +540,7 @@ 
         print "<!-- Start of log output\n";
         //print '<div class="hidden">'."\n";
         foreach ($conf->logbuffer as $logline) {
-            print $logline . "<br>\n";
+            print $logline."<br>\n";
         }
         //print '</div>'."\n";
         print "End of log output -->\n";
@@ -549,8 +549,8 @@ 
 
     print "<!-- Alixar debugBar footer -->";
     print Debug::getRenderFooter(); // Includes Alixar debugBar footer
-    print '</body>' . "\n";
-    print '</html>' . "\n";
+    print '</body>'."\n";
+    print '</html>'."\n";
 }
 
 /**
@@ -615,16 +615,16 @@ 
         $dolibarr_main_url_root = $_SERVER["SCRIPT_URI"];
     } // If defined (Ie: Apache with Caudium)
     elseif (isset($_SERVER["SERVER_URL"]) && isset($_SERVER["DOCUMENT_URI"])) {
-        $dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"];
+        $dolibarr_main_url_root = $_SERVER["SERVER_URL"].$_SERVER["DOCUMENT_URI"];
     } // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
     else {
-        $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
+        $proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
         if (!empty($_SERVER["HTTP_HOST"])) {
             $serverport = $_SERVER["HTTP_HOST"];
         } else {
             $serverport = $_SERVER["SERVER_NAME"];
         }
-        $dolibarr_main_url_root = $proto . "://" . $serverport . $_SERVER["SCRIPT_NAME"];
+        $dolibarr_main_url_root = $proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
     }
     // Clean proposed URL
     // We assume /install to be under /htdocs, so we get the parent path of the current URL

Braces +101 added lines, -65 removed lines

@@ -31,8 +31,9 @@ 
  * 	\brief      File that define environment for support pages
  */
 // Just to define version DOL_VERSION
-if (!defined('DOL_INC_FOR_VERSION_ERROR'))
+if (!defined('DOL_INC_FOR_VERSION_ERROR')) {
     define('DOL_INC_FOR_VERSION_ERROR', '1');
+}
 require_once DOL_BASE_PATH . '/filefunc.inc.php';
 
 require_once DOL_BASE_PATH . '/core/class/translate.class.php';
@@ -151,23 +152,31 @@ 
 define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : ''));           // URL relative root
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT'));  // $uri contains url without http*
 $suburi = strstr($uri, '/');       // $suburi contains url without domain
-if ($suburi == '/')
-    $suburi = '';   // If $suburi is /, it is now ''
+if ($suburi == '/') {
+    $suburi = '';
+}
+// If $suburi is /, it is now ''
 define('DOL_URL_ROOT', $suburi);    // URL relative root ('', '/dolibarr', ...)
 
 
-if (empty($conf->file->character_set_client))
+if (empty($conf->file->character_set_client)) {
     $conf->file->character_set_client = "utf-8";
-if (empty($conf->db->character_set))
+}
+if (empty($conf->db->character_set)) {
     $conf->db->character_set = 'utf8';
-if (empty($conf->db->dolibarr_main_db_collation))
+}
+if (empty($conf->db->dolibarr_main_db_collation)) {
     $conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci';
-if (empty($conf->db->dolibarr_main_db_encryption))
+}
+if (empty($conf->db->dolibarr_main_db_encryption)) {
     $conf->db->dolibarr_main_db_encryption = 0;
-if (empty($conf->db->dolibarr_main_db_cryptkey))
+}
+if (empty($conf->db->dolibarr_main_db_cryptkey)) {
     $conf->db->dolibarr_main_db_cryptkey = '';
-if (empty($conf->db->user))
+}
+if (empty($conf->db->user)) {
     $conf->db->user = '';
+}
 
 // Define array of document root directories
 $conf->file->dol_document_root = array(DOL_DOCUMENT_ROOT);
@@ -224,19 +233,24 @@ 
 // Force usage of log file for install and upgrades
 $conf->syslog->enabled = 1;
 $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
-if (!defined('SYSLOG_HANDLERS'))
+if (!defined('SYSLOG_HANDLERS')) {
     define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+}
 if (!defined('SYSLOG_FILE')) { // To avoid warning on systems with constant already defined
-    if (@is_writable('/tmp'))
-        define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
-    else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-        define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
-    else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-        define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
-    else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
-        define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
-    else if (@is_writable('../../'))
-        define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+    if (@is_writable('/tmp')) {
+            define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
+    } else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) {
+            define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+    } else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) {
+            define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+    } else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) {
+            define('SYSLOG_FILE', '../../../../dolibarr_install.log');
+    }
+    // For DoliWamp
+    else if (@is_writable('../../')) {
+            define('SYSLOG_FILE', '../../dolibarr_install.log');
+    }
+    // For others
 
 
 
@@ -251,10 +265,12 @@ 
         
 //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
 }
-if (defined('SYSLOG_FILE'))
+if (defined('SYSLOG_FILE')) {
     $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-if (!defined('SYSLOG_FILE_NO_ERROR'))
+}
+if (!defined('SYSLOG_FILE_NO_ERROR')) {
     define('SYSLOG_FILE_NO_ERROR', 1);
+}
 // We init log handler for install
 $handlers = array('mod_syslog_file');
 foreach ($handlers as $handler) {
@@ -269,9 +285,10 @@ 
         throw new Exception('Log handler does not extend LogHandlerInterface');
     }
 
-    if (empty($conf->loghandlers[$handler]))
-        $conf->loghandlers[$handler] = $loghandlerinstance;
-}
+    if (empty($conf->loghandlers[$handler])) {
+            $conf->loghandlers[$handler] = $loghandlerinstance;
+    }
+    }
 
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc')) { // magic_quotes_* removed in PHP 5.4
@@ -295,10 +312,11 @@ 
 
 // Defini objet langs
 $langs = new Translate('..', $conf);
-if (GETPOST('lang', 'aZ09'))
+if (GETPOST('lang', 'aZ09')) {
     $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
-else
+} else {
     $langs->setDefaultLang('auto');
+}
 
 $bc[false] = ' class="bg1"';
 $bc[true] = ' class="bg2"';
@@ -321,8 +339,9 @@ 
     global $character_set_client;
 
     $return = include_once $dolibarr_main_document_root . '/core/class/conf.class.php';
-    if (!$return)
-        return -1;
+    if (!$return) {
+            return -1;
+    }
 
     $conf = new Conf();
     $conf->db->type = trim($dolibarr_main_db_type);
@@ -333,40 +352,51 @@ 
     $conf->db->pass = trim($dolibarr_main_db_pass);
 
     // Mysql driver support has been removed in favor of mysqli
-    if ($conf->db->type == 'mysql')
-        $conf->db->type = 'mysqli';
-    if (empty($character_set_client))
-        $character_set_client = "UTF-8";
+    if ($conf->db->type == 'mysql') {
+            $conf->db->type = 'mysqli';
+    }
+    if (empty($character_set_client)) {
+            $character_set_client = "UTF-8";
+    }
     $conf->file->character_set_client = strtoupper($character_set_client);
-    if (empty($dolibarr_main_db_character_set))
-        $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
+    if (empty($dolibarr_main_db_character_set)) {
+            $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
+    }
     $conf->db->character_set = $dolibarr_main_db_character_set;
-    if (empty($dolibarr_main_db_collation))
-        $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
+    if (empty($dolibarr_main_db_collation)) {
+            $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
+    }
     $conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
-    if (empty($dolibarr_main_db_encryption))
-        $dolibarr_main_db_encryption = 0;
+    if (empty($dolibarr_main_db_encryption)) {
+            $dolibarr_main_db_encryption = 0;
+    }
     $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey))
-        $dolibarr_main_db_cryptkey = '';
+    if (empty($dolibarr_main_db_cryptkey)) {
+            $dolibarr_main_db_cryptkey = '';
+    }
     $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
     // Force usage of log file for install and upgrades
     $conf->syslog->enabled = 1;
     $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
-    if (!defined('SYSLOG_HANDLERS'))
-        define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+    if (!defined('SYSLOG_HANDLERS')) {
+            define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+    }
     if (!defined('SYSLOG_FILE')) { // To avoid warning on systems with constant already defined
-        if (@is_writable('/tmp'))
-            define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
-        else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-            define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
-        else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-            define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
-        else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
-            define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
-        else if (@is_writable('../../'))
-            define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+        if (@is_writable('/tmp')) {
+                    define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
+        } else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) {
+                    define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+        } else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) {
+                    define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+        } else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) {
+                    define('SYSLOG_FILE', '../../../../dolibarr_install.log');
+        }
+        // For DoliWamp
+        else if (@is_writable('../../')) {
+                    define('SYSLOG_FILE', '../../dolibarr_install.log');
+        }
+        // For others
 
 
 
@@ -381,10 +411,12 @@ 
             
 //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
     }
-    if (defined('SYSLOG_FILE'))
-        $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-    if (!defined('SYSLOG_FILE_NO_ERROR'))
-        define('SYSLOG_FILE_NO_ERROR', 1);
+    if (defined('SYSLOG_FILE')) {
+            $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+    }
+    if (!defined('SYSLOG_FILE_NO_ERROR')) {
+            define('SYSLOG_FILE_NO_ERROR', 1);
+    }
     // We init log handler for install
     $handlers = array('mod_syslog_file');
     foreach ($handlers as $handler) {
@@ -399,8 +431,9 @@ 
             throw new Exception('Log handler does not extend LogHandlerInterface');
         }
 
-        if (empty($conf->loghandlers[$handler]))
-            $conf->loghandlers[$handler] = $loghandlerinstance;
+        if (empty($conf->loghandlers[$handler])) {
+                    $conf->loghandlers[$handler] = $loghandlerinstance;
+        }
     }
 
     return 1;
@@ -522,11 +555,13 @@ 
         }
 
         print '<input type="submit" ' . ($nonext == '2' ? 'disabled="disabled" ' : '') . 'value="' . $langs->trans("NextStep") . ' ->"';
-        if ($jscheckfunction)
-            print ' onClick="return ' . $jscheckfunction . '();"';
+        if ($jscheckfunction) {
+                    print ' onClick="return ' . $jscheckfunction . '();"';
+        }
         print '></div>';
-        if ($withpleasewait)
-            print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>' . $langs->trans("NextStepMightLastALongTime") . '<br><br><div class="blinkwait">' . $langs->trans("PleaseBePatient") . '</div></div>';
+        if ($withpleasewait) {
+                    print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>' . $langs->trans("NextStepMightLastALongTime") . '<br><br><div class="blinkwait">' . $langs->trans("PleaseBePatient") . '</div></div>';
+        }
     }
     if ($setuplang) {
         print '<input type="hidden" name="selectlang" value="' . $setuplang . '">';
@@ -562,8 +597,9 @@ 
  */
 function dolibarr_install_syslog($message, $level = LOG_DEBUG)
 {
-    if (!defined('LOG_DEBUG'))
-        define('LOG_DEBUG', 6);
+    if (!defined('LOG_DEBUG')) {
+            define('LOG_DEBUG', 6);
+    }
     dol_syslog($message, $level);
 }
 

Helpers/DolUtils2.php

Indentation +405 added lines, -405 removed lines

@@ -36,11 +36,11 @@ 
 {

 

     /**

- * Same function than javascript unescape() function but in PHP.

- *

- * @param 	string	$source		String to decode

- * @return	string				Unescaped string

- */

+     * Same function than javascript unescape() function but in PHP.

+     *

+     * @param 	string	$source		String to decode

+     * @return	string				Unescaped string

+     */

 function jsUnEscape($source)

 {

     $decodedStr = "";

@@ -130,7 +130,7 @@ 
 

     $selected='EUA4';

     if (!$outputlangs) {

-    	$outputlangs=$langs;

+        $outputlangs=$langs;

     }

 

     if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada

@@ -234,15 +234,15 @@ 
         else print ': ';

         if (is_object($object->user_creation))

         {

-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);

             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            else print $langs->trans("Unknown");

         }

         if ($usetable) print '</td></tr>';

         else print '<br>';

@@ -270,15 +270,15 @@ 
         else print ': ';

         if (is_object($object->user_modification))

         {

-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);

             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            else print $langs->trans("Unknown");

         }

         if ($usetable) print '</td></tr>';

         else print '<br>';

@@ -307,14 +307,14 @@ 
         if (is_object($object->user_validation))

         {

             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            else print $langs->trans("Unknown");

         }

         else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         if ($usetable) print '</td></tr>';

         else print '<br>';

@@ -343,14 +343,14 @@ 
         if (is_object($object->user_approve))

         {

             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            else print $langs->trans("Unknown");

         }

         else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         if ($usetable) print '</td></tr>';

         else print '<br>';

@@ -406,15 +406,15 @@ 
         else print ': ';

         if (is_object($object->user_cloture))

         {

-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_cloture);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         if ($usetable) print '</td></tr>';

         else print '<br>';

@@ -442,15 +442,15 @@ 
         else print ': ';

         if (is_object($object->user_rappro))

         {

-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_rappro);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+            else print $langs->trans("Unknown");

         }

         if ($usetable) print '</td></tr>';

         else print '<br>';

@@ -496,8 +496,8 @@ 
  */

 function dolAddEmailTrackId($email, $trackingid)

 {

-	$tmp=explode('@',$email);

-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');

+    $tmp=explode('@',$email);

+    return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');

 }

 

 /**

@@ -623,33 +623,33 @@ 
  */

 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)

 {

-	if(!isValidEmail($mail))return '';

-	$tab = explode('@', $mail);

-	$tab2 = explode('.',$tab[1]);

-	$string_replace = '';

-	$mail_name = $tab[0];

-	$mail_domaine = $tab2[0];

-	$mail_tld = '';

-

-	$nbofelem = count($tab2);

-	for($i=1; $i < $nbofelem && $displaytld; $i++)

-	{

-		$mail_tld .= '.'.$tab2[$i];

-	}

-

-	for($i=0; $i < $nbreplace; $i++){

-		$string_replace .= $replace;

-	}

-

-	if(strlen($mail_name) > $nbdisplaymail){

-		$mail_name = substr($mail_name, 0, $nbdisplaymail);

-	}

-

-	if(strlen($mail_domaine) > $nbdisplaydomain){

-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);

-	}

-

-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;

+    if(!isValidEmail($mail))return '';

+    $tab = explode('@', $mail);

+    $tab2 = explode('.',$tab[1]);

+    $string_replace = '';

+    $mail_name = $tab[0];

+    $mail_domaine = $tab2[0];

+    $mail_tld = '';

+

+    $nbofelem = count($tab2);

+    for($i=1; $i < $nbofelem && $displaytld; $i++)

+    {

+        $mail_tld .= '.'.$tab2[$i];

+    }

+

+    for($i=0; $i < $nbreplace; $i++){

+        $string_replace .= $replace;

+    }

+

+    if(strlen($mail_name) > $nbdisplaymail){

+        $mail_name = substr($mail_name, 0, $nbdisplaymail);

+    }

+

+    if(strlen($mail_domaine) > $nbdisplaydomain){

+        $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);

+    }

+

+    return $mail_name . $string_replace . $mail_domaine . $mail_tld;

 }

 

 

@@ -787,24 +787,24 @@ 
     }

     else

     {

-    	$masktype='';

-    	$masktype_value='';

+        $masktype='';

+        $masktype_value='';

     }

 

     // Extract value for user

     if (preg_match('/\{(u+)\}/i',$mask,$regType))

     {

-    	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

-    	if (is_object($objuser)) $lastname = $objuser->lastname;

+        $lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

+        if (is_object($objuser)) $lastname = $objuser->lastname;

 

-    	$maskuser=$regType[1];

-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)

-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

+        $maskuser=$regType[1];

+        $maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)

+        $maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

     }

     else

     {

-    	$maskuser='';

-    	$maskuser_value='';

+        $maskuser='';

+        $maskuser_value='';

     }

 

     // Personalized field {XXX-1} à {XXX-9}

@@ -820,12 +820,12 @@ 
 

     if (strstr($mask,'user_extra_'))

     {

-			$start = "{user_extra_";

-			$end = "\}";

-			$extra= get_string_between($mask, "user_extra_", "}");

-			if(!empty($user->array_options['options_'.$extra])){

-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);

-			}

+            $start = "{user_extra_";

+            $end = "\}";

+            $extra= get_string_between($mask, "user_extra_", "}");

+            if(!empty($user->array_options['options_'.$extra])){

+                $mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);

+            }

     }

     $maskwithonlyymcode=$mask;

     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);

@@ -886,7 +886,7 @@ 
         else // if reset is for a specific month in year, we need year

         {

             if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

+            else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

             else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }

             else return 'ErrorCantUseRazIfNoYearInMask';

         }

@@ -894,11 +894,11 @@ 
         $yearlen = $posy?dol_strlen($reg[$posy]):0;

         $monthlen = $posm?dol_strlen($reg[$posm]):0;

         // Define pos

-       	$yearpos = (dol_strlen($reg[1])+1);

+            $yearpos = (dol_strlen($reg[1])+1);

         $monthpos = ($yearpos+$yearlen);

         if ($posy == 3 && $posm == 2) {		// if month is before year

-          	$monthpos = (dol_strlen($reg[1])+1);

-           	$yearpos = ($monthpos+$monthlen);

+                $monthpos = (dol_strlen($reg[1])+1);

+                $yearpos = ($monthpos+$monthlen);

         }

         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";

 

@@ -908,20 +908,20 @@ 
 

         if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

         {

-        	$currentyear=date("Y", $date);

-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);

-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);

-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);

-        	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';

-

-        	// If after or equal of current fiscal date

-        	if ($date >= $fiscaldate)

-        	{

-        		// If before of next new year date

-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;

-        	}

-        	// If after or equal of current new year date

-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;

+            $currentyear=date("Y", $date);

+            $fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);

+            $newyeardate=dol_mktime('0','0','0','1','1',$currentyear);

+            $nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);

+            //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';

+

+            // If after or equal of current fiscal date

+            if ($date >= $fiscaldate)

+            {

+                // If before of next new year date

+                if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;

+            }

+            // If after or equal of current new year date

+            else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;

         }

         // For backward compatibility

         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year

@@ -942,11 +942,11 @@ 
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

             $sqlwhere.=')';

         }

-		else if ($resetEveryMonth)

-		{

-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+        else if ($resetEveryMonth)

+        {

+            $sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

-		}

+        }

         else   // reset is done on january

         {

             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

@@ -957,13 +957,13 @@ 
 

     // Define $sqlstring

     if (function_exists('mb_strrpos'))

-    	{

-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');

-	}

-	else

-	{

-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);

-	}	// Pos of counter in final string (from 0 to ...)

+        {

+        $posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');

+    }

+    else

+    {

+        $posnumstart=strrpos($maskwithnocode,$maskcounter);

+    }	// Pos of counter in final string (from 0 to ...)

     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';

     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';

 

@@ -982,7 +982,7 @@ 
     if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

     foreach($maskperso as $key => $val)

     {

-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);

+        $maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);

     }

 

     // Get counter in database

@@ -990,11 +990,11 @@ 
     $sql = "SELECT MAX(".$sqlstring.") as val";

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

     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";

+    $sql.= " AND ".$field." NOT LIKE '(PROV%)'";

     if ($bentityon) // only if entity enable

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

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

     else if (! empty($forceentity))

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

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

     if ($where) $sql.=$where;

     if ($sqlwhere) $sql.=' AND '.$sqlwhere;

 

@@ -1012,8 +1012,8 @@ 
     if (empty($counter)) $counter=$maskoffset;

     else if (preg_match('/[^0-9]/i',$counter))

     {

-    	$counter=0;

-    	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

+        $counter=0;

+        dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

     }

     else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;

 

@@ -1039,11 +1039,11 @@ 
         $sql = "SELECT ".$field." as ref";

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

         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";

-    	if ($bentityon) // only if entity enable

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

+        $sql.= " AND ".$field." NOT LIKE '%PROV%'";

+        if ($bentityon) // only if entity enable

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

         else if (! empty($forceentity))

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

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

         if ($where) $sql.=$where;

         if ($sqlwhere) $sql.=' AND '.$sqlwhere;

 

@@ -1065,7 +1065,7 @@ 
         // If value for $counter has a length higher than $maskcounter chars

         if ($counter >= pow(10, dol_strlen($maskcounter)))

         {

-        	$counter='ErrorMaxNumberReachForThisMask';

+            $counter='ErrorMaxNumberReachForThisMask';

         }

 

         if (! empty($maskrefclient_maskcounter))

@@ -1097,9 +1097,9 @@ 
             //$sql.= " WHERE ".$field." not like '(%'";

             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

             if ($bentityon) // only if entity enable

-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";

+                $maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";

             else if (! empty($forceentity))

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

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

             if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask

             if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask

             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

@@ -1114,25 +1114,25 @@ 
             else dol_print_error($db);

 

             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;

-			$maskrefclient_counter++;

+            $maskrefclient_counter++;

         }

 

         // Build numFinal

         $numFinal = $mask;

 

         // We replace special codes except refclient

-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

-		{

-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);

-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);

-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);

-		}

-		else	// we want yyyy to be current year

-		{

-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);

-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);

-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);

-		}

+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

+        {

+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);

+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);

+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);

+        }

+        else	// we want yyyy to be current year

+        {

+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);

+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);

+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);

+        }

         $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);

         $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);

 

@@ -1162,9 +1162,9 @@ 
         // Now we replace the user

         if ($maskuser)

         {

-        	$maskuser_maskbefore='{'.$maskuser.'}';

-        	$maskuser_maskafter=$maskuser_value;

-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);

+            $maskuser_maskbefore='{'.$maskuser.'}';

+            $maskuser_maskafter=$maskuser_value;

+            $numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);

         }

     }

 

@@ -1183,11 +1183,11 @@ 
 function get_string_between($string, $start, $end)

 {

     $string = " ".$string;

-     $ini = strpos($string,$start);

-     if ($ini == 0) return "";

-     $ini += strlen($start);

-     $len = strpos($string,$end,$ini) - $ini;

-     return substr($string,$ini,$len);

+        $ini = strpos($string,$start);

+        if ($ini == 0) return "";

+        $ini += strlen($start);

+        $len = strpos($string,$end,$ini) - $ini;

+        return substr($string,$ini,$len);

 }

 

 /**

@@ -1535,7 +1535,7 @@ 
     }

     else

     {

-    	$string = vatrate($reduction,true);

+        $string = vatrate($reduction,true);

     }

 

     return $string;

@@ -1628,7 +1628,7 @@ 
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

                 $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

 

-		$listoffiles=array();

+        $listoffiles=array();

 

                 // Now we add models found in directories scanned

                 $listofdir=explode(',',$dirtoscan);

@@ -1639,8 +1639,8 @@ 
                     if (! $tmpdir) { unset($listofdir[$key]); continue; }

                     if (is_dir($tmpdir))

                     {

-			// all type of template is allowed

-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

+            // all type of template is allowed

+            $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

                         if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

                     }

                 }

@@ -1696,19 +1696,19 @@ 
  */

 function is_ip($ip)

 {

-	// First we test if it is a valid IPv4

-	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {

+    // First we test if it is a valid IPv4

+    if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {

 

-		// Then we test if it is a private range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

+        // Then we test if it is a private range

+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

 

-		// Then we test if it is a reserved range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

+        // Then we test if it is a reserved range

+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

 

-		return 1;

-	}

+        return 1;

+    }

 

-	return 0;

+    return 0;

 }

 

 /**

@@ -1748,25 +1748,25 @@ 
     if ($proxyuse)

     {

         $params=array('connection_timeout'=>$timeout,

-                      'response_timeout'=>$response_timeout,

-                      'proxy_use'      => 1,

-                      'proxy_host'     => $proxyhost,

-                      'proxy_port'     => $proxyport,

-                      'proxy_login'    => $proxyuser,

-                      'proxy_password' => $proxypass,

-                      'trace'		   => 1

+                        'response_timeout'=>$response_timeout,

+                        'proxy_use'      => 1,

+                        'proxy_host'     => $proxyhost,

+                        'proxy_port'     => $proxyport,

+                        'proxy_login'    => $proxyuser,

+                        'proxy_password' => $proxypass,

+                        'trace'		   => 1

         );

     }

     else

     {

         $params=array('connection_timeout'=>$timeout,

-                      'response_timeout'=>$response_timeout,

-                      'proxy_use'      => 0,

-                      'proxy_host'     => false,

-                      'proxy_port'     => false,

-                      'proxy_login'    => false,

-                      'proxy_password' => false,

-                      'trace'		   => 1

+                        'response_timeout'=>$response_timeout,

+                        'proxy_use'      => 0,

+                        'proxy_host'     => false,

+                        'proxy_port'     => false,

+                        'proxy_login'    => false,

+                        'proxy_password' => false,

+                        'trace'		   => 1

         );

     }

     return $params;

@@ -1784,118 +1784,118 @@ 
  */

 function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')

 {

-	global $db, $conf, $langs;

-

-	$ret='';

-

-	// Parse element/subelement (ex: project_task)

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

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

-	{

-		$module = $element = $regs[1];

-		$subelement = $regs[2];

-	}

-

-	$classpath = $element.'/class';

-

-	// To work with non standard path

-	if ($objecttype == 'facture' || $objecttype == 'invoice') {

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

-		$module='facture';

-		$subelement='facture';

-	}

-	if ($objecttype == 'commande' || $objecttype == 'order') {

-		$classpath = 'commande/class';

-		$module='commande';

-		$subelement='commande';

-	}

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

-		$classpath = 'comm/propal/class';

-	}

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

-		$classpath = 'supplier_proposal/class';

-	}

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

-		$classpath = 'expedition/class';

-		$subelement = 'expedition';

-		$module = 'expedition_bon';

-	}

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

-		$classpath = 'livraison/class';

-		$subelement = 'livraison';

-		$module = 'livraison_bon';

-	}

-	if ($objecttype == 'contract') {

-		$classpath = 'contrat/class';

-		$module='contrat';

-		$subelement='contrat';

-	}

-	if ($objecttype == 'member') {

-		$classpath = 'adherents/class';

-		$module='adherent';

-		$subelement='adherent';

-	}

-	if ($objecttype == 'cabinetmed_cons') {

-		$classpath = 'cabinetmed/class';

-		$module='cabinetmed';

-		$subelement='cabinetmedcons';

-	}

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

-		$classpath = 'fichinter/class';

-		$module='ficheinter';

-		$subelement='fichinter';

-	}

-	if ($objecttype == 'task') {

-		$classpath = 'projet/class';

-		$module='projet';

-		$subelement='task';

-	}

-	if ($objecttype == 'stock') {

-		$classpath = 'product/stock/class';

-		$module='stock';

-		$subelement='stock';

-	}

-

-	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;

-

-	$classfile = strtolower($subelement); $classname = ucfirst($subelement);

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

-		$classfile = 'fournisseur.facture';

-		$classname='FactureFournisseur';

-		$classpath = 'fourn/class';

-		$module='fournisseur';

-	}

-	elseif ($objecttype == 'order_supplier')   {

-		$classfile = 'fournisseur.commande';

-		$classname='CommandeFournisseur';

-		$classpath = 'fourn/class';

-		$module='fournisseur';

-	}

-	elseif ($objecttype == 'stock')   {

-		$classpath = 'product/stock/class';

-		$classfile='entrepot';

-		$classname='Entrepot';

-	}

-	if (! empty($conf->$module->enabled))

-	{

-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

-		if ($res)

-		{

-			if (class_exists($classname))

-			{

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

-				$res=$object->fetch($objectid);

-				if ($res > 0) {

-					$ret=$object->getNomUrl($withpicto,$option);

-				} elseif($res==0) {

-					$ret=$langs->trans('Deleted');

-				}

-				unset($object);

-			}

-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);

-		}

-	}

-	return $ret;

+    global $db, $conf, $langs;

+

+    $ret='';

+

+    // Parse element/subelement (ex: project_task)

+    $module = $element = $subelement = $objecttype;

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

+    {

+        $module = $element = $regs[1];

+        $subelement = $regs[2];

+    }

+

+    $classpath = $element.'/class';

+

+    // To work with non standard path

+    if ($objecttype == 'facture' || $objecttype == 'invoice') {

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

+        $module='facture';

+        $subelement='facture';

+    }

+    if ($objecttype == 'commande' || $objecttype == 'order') {

+        $classpath = 'commande/class';

+        $module='commande';

+        $subelement='commande';

+    }

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

+        $classpath = 'comm/propal/class';

+    }

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

+        $classpath = 'supplier_proposal/class';

+    }

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

+        $classpath = 'expedition/class';

+        $subelement = 'expedition';

+        $module = 'expedition_bon';

+    }

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

+        $classpath = 'livraison/class';

+        $subelement = 'livraison';

+        $module = 'livraison_bon';

+    }

+    if ($objecttype == 'contract') {

+        $classpath = 'contrat/class';

+        $module='contrat';

+        $subelement='contrat';

+    }

+    if ($objecttype == 'member') {

+        $classpath = 'adherents/class';

+        $module='adherent';

+        $subelement='adherent';

+    }

+    if ($objecttype == 'cabinetmed_cons') {

+        $classpath = 'cabinetmed/class';

+        $module='cabinetmed';

+        $subelement='cabinetmedcons';

+    }

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

+        $classpath = 'fichinter/class';

+        $module='ficheinter';

+        $subelement='fichinter';

+    }

+    if ($objecttype == 'task') {

+        $classpath = 'projet/class';

+        $module='projet';

+        $subelement='task';

+    }

+    if ($objecttype == 'stock') {

+        $classpath = 'product/stock/class';

+        $module='stock';

+        $subelement='stock';

+    }

+

+    //print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;

+

+    $classfile = strtolower($subelement); $classname = ucfirst($subelement);

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

+        $classfile = 'fournisseur.facture';

+        $classname='FactureFournisseur';

+        $classpath = 'fourn/class';

+        $module='fournisseur';

+    }

+    elseif ($objecttype == 'order_supplier')   {

+        $classfile = 'fournisseur.commande';

+        $classname='CommandeFournisseur';

+        $classpath = 'fourn/class';

+        $module='fournisseur';

+    }

+    elseif ($objecttype == 'stock')   {

+        $classpath = 'product/stock/class';

+        $classfile='entrepot';

+        $classname='Entrepot';

+    }

+    if (! empty($conf->$module->enabled))

+    {

+        $res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

+        if ($res)

+        {

+            if (class_exists($classname))

+            {

+                $object = new $classname($db);

+                $res=$object->fetch($objectid);

+                if ($res > 0) {

+                    $ret=$object->getNomUrl($withpicto,$option);

+                } elseif($res==0) {

+                    $ret=$langs->trans('Deleted');

+                }

+                unset($object);

+            }

+            else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);

+        }

+    }

+    return $ret;

 }

 

 

@@ -1909,113 +1909,113 @@ 
  */

 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)

 {

-	$totalnb=0;

-	$listofid=array();

-	$listofparentid=array();

-

-	// Get list of all id in array listofid and all parents in array listofparentid

-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

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

-	if ($resql)

-	{

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

-		$i = 0;

-		while ($i < $num)

-		{

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

-			$listofid[]=$obj->rowid;

-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;

-			$i++;

-		}

-	}

-	else

-	{

-		dol_print_error($db);

-	}

-

-	if (count($listofid))

-	{

-		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";

-

-		// Check loops on each other

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself

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

-		if ($resql)

-		{

-			$nb=$db->affected_rows($sql);

-			if ($nb > 0)

-			{

-				print '<br>Some record that were parent of themself were cleaned.';

-			}

-

-			$totalnb+=$nb;

-		}

-		//else dol_print_error($db);

-

-		// Check other loops

-		$listofidtoclean=array();

-		foreach($listofparentid as $id => $pid)

-		{

-			// Check depth

-			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';

-

-			$cursor=$id; $arrayidparsed=array();	// We start from child $id

-			while ($cursor > 0)

-			{

-				$arrayidparsed[$cursor]=1;

-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child

-				{

-					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';

-					unset($arrayidparsed);

-					$listofidtoclean[$cursor]=$id;

-					break;

-				}

-				$cursor=$listofparentid[$cursor];

-			}

-

-			if (count($listofidtoclean)) break;

-		}

-

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

-		$sql.= " SET ".$fieldfkparent." = 0";

-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong

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

-		if ($resql)

-		{

-			$nb=$db->affected_rows($sql);

-			if ($nb > 0)

-			{

-				// Removed orphelins records

-				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';

-				print join(',',$listofidtoclean);

-			}

-

-			$totalnb+=$nb;

-		}

-		//else dol_print_error($db);

-

-		// Check and clean orphelins

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

-		$sql.= " SET ".$fieldfkparent." = 0";

-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent

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

-		if ($resql)

-		{

-			$nb=$db->affected_rows($sql);

-			if ($nb > 0)

-			{

-				// Removed orphelins records

-				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';

-				print join(',',$listofid);

-			}

-

-			$totalnb+=$nb;

-		}

-		//else dol_print_error($db);

-

-		print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';

-		return $totalnb;

-	}

+    $totalnb=0;

+    $listofid=array();

+    $listofparentid=array();

+

+    // Get list of all id in array listofid and all parents in array listofparentid

+    $sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

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

+    if ($resql)

+    {

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

+        $i = 0;

+        while ($i < $num)

+        {

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

+            $listofid[]=$obj->rowid;

+            if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;

+            $i++;

+        }

+    }

+    else

+    {

+        dol_print_error($db);

+    }

+

+    if (count($listofid))

+    {

+        print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";

+

+        // Check loops on each other

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself

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

+        if ($resql)

+        {

+            $nb=$db->affected_rows($sql);

+            if ($nb > 0)

+            {

+                print '<br>Some record that were parent of themself were cleaned.';

+            }

+

+            $totalnb+=$nb;

+        }

+        //else dol_print_error($db);

+

+        // Check other loops

+        $listofidtoclean=array();

+        foreach($listofparentid as $id => $pid)

+        {

+            // Check depth

+            //print 'Analyse record id='.$id.' with parent '.$pid.'<br>';

+

+            $cursor=$id; $arrayidparsed=array();	// We start from child $id

+            while ($cursor > 0)

+            {

+                $arrayidparsed[$cursor]=1;

+                if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child

+                {

+                    print 'Found a loop between id '.$id.' - '.$cursor.'<br>';

+                    unset($arrayidparsed);

+                    $listofidtoclean[$cursor]=$id;

+                    break;

+                }

+                $cursor=$listofparentid[$cursor];

+            }

+

+            if (count($listofidtoclean)) break;

+        }

+

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

+        $sql.= " SET ".$fieldfkparent." = 0";

+        $sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong

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

+        if ($resql)

+        {

+            $nb=$db->affected_rows($sql);

+            if ($nb > 0)

+            {

+                // Removed orphelins records

+                print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';

+                print join(',',$listofidtoclean);

+            }

+

+            $totalnb+=$nb;

+        }

+        //else dol_print_error($db);

+

+        // Check and clean orphelins

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

+        $sql.= " SET ".$fieldfkparent." = 0";

+        $sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent

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

+        if ($resql)

+        {

+            $nb=$db->affected_rows($sql);

+            if ($nb > 0)

+            {

+                // Removed orphelins records

+                print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';

+                print join(',',$listofid);

+            }

+

+            $totalnb+=$nb;

+        }

+        //else dol_print_error($db);

+

+        print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';

+        return $totalnb;

+    }

 }

 

 /**

@@ -2147,21 +2147,21 @@ 
 function fetchObjectByElement($element_id, $element_type, $element_ref='')

 {

     global $conf;

-	global $db,$conf;

+    global $db,$conf;

 

     $element_prop = getElementProperties($element_type);

     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)

     {

         dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');

 

-		$objecttmp = new $element_prop['classname']($db);

-		$ret = $objecttmp->fetch($element_id, $element_ref);

-		if ($ret >= 0)

-		{

-			return $objecttmp;

-		}

-	}

-	return 0;

+        $objecttmp = new $element_prop['classname']($db);

+        $ret = $objecttmp->fetch($element_id, $element_ref);

+        if ($ret >= 0)

+        {

+            return $objecttmp;

+        }

+    }

+    return 0;

 }

 

 

@@ -2176,9 +2176,9 @@ 
  */

 function colorArrayToHex($arraycolor,$colorifnotfound='888888')

 {

-	if (! is_array($arraycolor)) return $colorifnotfound;

-	if (empty($arraycolor)) return $colorifnotfound;

-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));

+    if (! is_array($arraycolor)) return $colorifnotfound;

+    if (empty($arraycolor)) return $colorifnotfound;

+    return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));

 }

 

 /**

@@ -2193,15 +2193,15 @@ 
  */

 static function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))

     {

-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is

-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);

-	if (! $tmp)

-	{

-		$tmp=explode(',',$stringcolor);

-		if (count($tmp) < 3) return $colorifnotfound;

-		return $tmp;

-	}

-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));

+    if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is

+    $tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);

+    if (! $tmp)

+    {

+        $tmp=explode(',',$stringcolor);

+        if (count($tmp) < 3) return $colorifnotfound;

+        return $tmp;

+    }

+    return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));

 }

 

 /**

@@ -2247,7 +2247,7 @@ 
     if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);

 

     if ($module == 'contracts') {

-    	$moduledirforclass = 'contrat';

+        $moduledirforclass = 'contrat';

     }

     elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {

         $moduledirforclass = 'api';

@@ -2274,7 +2274,7 @@ 
         $moduledirforclass = 'commande';

     }

     elseif ($module == 'shipments') {

-    	$moduledirforclass = 'expedition';

+        $moduledirforclass = 'expedition';

     }

     elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {

         $moduledirforclass = 'compta/facture';

@@ -2292,7 +2292,7 @@ 
         $moduledirforclass = 'product/stock';

     }

     elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {

-    	$moduledirforclass = 'supplier_proposal';

+        $moduledirforclass = 'supplier_proposal';

     }

     elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {

         $moduledirforclass = 'fourn';

@@ -2304,10 +2304,10 @@ 
         $moduledirforclass = 'user';

     }

     elseif ($module == 'ficheinter' || $module == 'interventions') {

-    	$moduledirforclass = 'fichinter';

+        $moduledirforclass = 'fichinter';

     }

     elseif ($module == 'tickets') {

-    	$moduledirforclass = 'ticket';

+        $moduledirforclass = 'ticket';

     }

 

     return $moduledirforclass;

Spacing +551 added lines, -551 removed lines

@@ -56,7 +56,7 @@ 
                 $pos++;

                 $unicodeHexVal = substr($source, $pos, 4);

                 $unicode = hexdec($unicodeHexVal);

-                $entity = "&#". $unicode . ';';

+                $entity = "&#".$unicode.';';

                 $decodedStr .= utf8_encode($entity);

                 $pos += 4;

             }

@@ -82,32 +82,32 @@ 
  * @param	string	$subdir		Sub directory (Example: '/mailings')

  * @return	array				Array of directories that can contains module descriptors

  */

-function dolGetModulesDirs($subdir='')

+function dolGetModulesDirs($subdir = '')

 {

     global $conf;

 

-    $modulesdir=array();

+    $modulesdir = array();

 

     foreach ($conf->file->dol_document_root as $type => $dirroot)

     {

         // Default core/modules dir

         if ($type === 'main') {

-            $modulesdir[$dirroot . '/core/modules' . $subdir . '/'] = $dirroot . '/core/modules' . $subdir . '/';

+            $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';

         }

 

         // Scan dir from external modules

-        $handle=@opendir($dirroot);

+        $handle = @opendir($dirroot);

         if (is_resource($handle))

         {

-            while (($file = readdir($handle))!==false)

+            while (($file = readdir($handle)) !== false)

             {

-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.

+                if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.

 

                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')

                 {

-                    if (is_dir($dirroot . '/' . $file . '/core/modules'.$subdir.'/'))

+                    if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))

                     {

-                        $modulesdir[$dirroot . '/' . $file . '/core/modules'.$subdir.'/'] = $dirroot . '/' . $file . '/core/modules'.$subdir.'/';

+                        $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';

                     }

                 }

             }

@@ -128,13 +128,13 @@ 
 {

     global $langs;

 

-    $selected='EUA4';

+    $selected = 'EUA4';

     if (!$outputlangs) {

-    	$outputlangs=$langs;

+    	$outputlangs = $langs;

     }

 

-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada

-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US

+    if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada

+    if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US

     return $selected;

 }

 

@@ -146,20 +146,20 @@ 
  *  @param  int			$searchalt      1=Search also in alternative languages

  *	@return	boolean						true if OK, false if KO

  */

-function dol_print_file($langs,$filename,$searchalt=0)

+function dol_print_file($langs, $filename, $searchalt = 0)

 {

     global $conf;

 

     // Test if file is in lang directory

-    foreach($langs->dir as $searchdir)

+    foreach ($langs->dir as $searchdir)

     {

-        $formfile=($searchdir."/langs/".$langs->defaultlang."/".$filename);

+        $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);

         dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);

         if (is_readable($formfile))

         {

-            $content=file_get_contents($formfile);

-            $isutf8=utf8_check($content);

-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

+            $content = file_get_contents($formfile);

+            $isutf8 = utf8_check($content);

+            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

             elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);

             else print $content;

             return true;

@@ -174,9 +174,9 @@ 
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);

             if (is_readable($formfilealt))

             {

-                $content=file_get_contents($formfilealt);

-                $isutf8=utf8_check($content);

-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

+                $content = file_get_contents($formfilealt);

+                $isutf8 = utf8_check($content);

+                if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

                 elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);

                 else print $content;

                 return true;

@@ -196,7 +196,7 @@ 
  *  @param  int     $usetable       Output into a table

  *	@return	void

  */

-function dol_print_object_info($object, $usetable=0)

+function dol_print_object_info($object, $usetable = 0)

 {

     global $langs, $db;

 

@@ -205,16 +205,16 @@ 
 

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

 

-    $deltadateforserver=getServerTimeZoneInt('now');

-    $deltadateforclient=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

+    $deltadateforserver = getServerTimeZoneInt('now');

+    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

     //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

-    $deltadateforuser=round($deltadateforclient-$deltadateforserver);

+    $deltadateforuser = round($deltadateforclient - $deltadateforserver);

     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;

 

     if ($usetable) print '<table class="border centpercent">';

 

     // Import key

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

+    if (!empty($object->import_key))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -226,7 +226,7 @@ 
     }

 

     // User creation (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_creation) || ! empty($object->user_creation_id))

+    if (!empty($object->user_creation) || !empty($object->user_creation_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -239,7 +239,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);

             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -249,20 +249,20 @@ 
     }

 

     // Date creation

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

+    if (!empty($object->date_creation))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_creation, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User change (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_modification) || ! empty($object->user_modification_id))

+    if (!empty($object->user_modification) || !empty($object->user_modification_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -275,7 +275,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);

             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -285,20 +285,20 @@ 
     }

 

     // Date change

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

+    if (!empty($object->date_modification))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_modification, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User validation (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_validation) || ! empty($object->user_validation_id))

+    if (!empty($object->user_validation) || !empty($object->user_validation_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -311,7 +311,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -321,20 +321,20 @@ 
     }

 

     // Date validation

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

+    if (!empty($object->date_validation))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_validation, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User approve (old method using already loaded object and not id is kept for backward compatibility)

-    if (! empty($object->user_approve) || ! empty($object->user_approve_id))

+    if (!empty($object->user_approve) || !empty($object->user_approve_id))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -347,7 +347,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -357,26 +357,26 @@ 
     }

 

     // Date approve

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

+    if (!empty($object->date_approve))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_approve, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User approve

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

+    if (!empty($object->user_approve_id2))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

-        $userstatic=new User($db);

+        $userstatic = new User($db);

         $userstatic->fetch($object->user_approve_id2);

         if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         else print $langs->trans("Unknown");

@@ -385,20 +385,20 @@ 
     }

 

     // Date approve

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

+    if (!empty($object->date_approve2))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_approve2, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User close

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

+    if (!empty($object->user_cloture))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -411,7 +411,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_cloture);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -421,20 +421,20 @@ 
     }

 

     // Date close

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

+    if (!empty($object->date_cloture))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_cloture, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // User conciliate

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

+    if (!empty($object->user_rappro))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

@@ -447,7 +447,7 @@ 
         }

         else

         {

-            $userstatic=new User($db);

+            $userstatic = new User($db);

             $userstatic->fetch($object->user_rappro);

 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

         	else print $langs->trans("Unknown");

@@ -457,27 +457,27 @@ 
     }

 

     // Date conciliate

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

+    if (!empty($object->date_rappro))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_rappro, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

 

     // Date send

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

+    if (!empty($object->date_envoi))

     {

         if ($usetable) print '<tr><td class="titlefield">';

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

         if ($usetable) print '</td><td>';

         else print ': ';

         print dol_print_date($object->date_envoi, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

         if ($usetable) print '</td></tr>';

         else print '<br>';

     }

@@ -496,8 +496,8 @@ 
  */

 function dolAddEmailTrackId($email, $trackingid)

 {

-	$tmp=explode('@',$email);

-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');

+	$tmp = explode('@', $email);

+	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1]) ? $tmp[1] : '');

 }

 

 /**

@@ -532,7 +532,7 @@ 
  *  @param  int		$anchor		1: verify anchor is provided, 0: not verify anchor

  *	@return int					1=Check is OK, 0=Check is KO

  */

-function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)

+function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)

 {

     $ValidUrl = 0;

     $urlregex = '';

@@ -546,7 +546,7 @@ 
     // HOSTNAME OR IP

     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)

     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x

-    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*";  // x ou x.xx (2 x ou plus)

+    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)

     //use only one of the above

 

     // PORT

@@ -575,33 +575,33 @@ 
  *	@param  integer	$http		1 = keep both http:// and https://, 0: remove http:// but not https://

  *	@return string				Cleaned url

  */

-function clean_url($url,$http=1)

+function clean_url($url, $http = 1)

 {

     // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)

     // To include the minus sign in a char class, we must not escape it but put it at the end of the class

     // Also, there's no need of escape a dot sign in a class

-    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i',$url,$regs))

+    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))

     {

-        $proto=$regs[1];

-        $domain=$regs[2];

-        $port=isset($regs[3])?$regs[3]:'';

+        $proto = $regs[1];

+        $domain = $regs[2];

+        $port = isset($regs[3]) ? $regs[3] : '';

         //print $url." -> ".$proto." - ".$domain." - ".$port;

         //$url = dol_string_nospecial(trim($url));

         $url = trim($url);

 

         // Si http: defini on supprime le http (Si https on ne supprime pas)

-        $newproto=$proto;

-        if ($http==0)

+        $newproto = $proto;

+        if ($http == 0)

         {

-            if (preg_match('/^http:[\\/]+/i',$url))

+            if (preg_match('/^http:[\\/]+/i', $url))

             {

-                $url = preg_replace('/^http:[\\/]+/i','',$url);

+                $url = preg_replace('/^http:[\\/]+/i', '', $url);

                 $newproto = '';

             }

         }

 

         // On passe le nom de domaine en minuscule

-        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);

+        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);

 

         return $CleanUrl;

     }

@@ -621,35 +621,35 @@ 
  * 	@param 		bool		$displaytld			Display tld (default: true)

  * 	@return		string							Return email with hidden parts or '';

  */

-function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)

+function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail = 4, $nbdisplaydomain = 3, $displaytld = true)

 {

-	if(!isValidEmail($mail))return '';

+	if (!isValidEmail($mail))return '';

 	$tab = explode('@', $mail);

-	$tab2 = explode('.',$tab[1]);

+	$tab2 = explode('.', $tab[1]);

 	$string_replace = '';

 	$mail_name = $tab[0];

 	$mail_domaine = $tab2[0];

 	$mail_tld = '';

 

 	$nbofelem = count($tab2);

-	for($i=1; $i < $nbofelem && $displaytld; $i++)

+	for ($i = 1; $i < $nbofelem && $displaytld; $i++)

 	{

 		$mail_tld .= '.'.$tab2[$i];

 	}

 

-	for($i=0; $i < $nbreplace; $i++){

+	for ($i = 0; $i < $nbreplace; $i++) {

 		$string_replace .= $replace;

 	}

 

-	if(strlen($mail_name) > $nbdisplaymail){

+	if (strlen($mail_name) > $nbdisplaymail) {

 		$mail_name = substr($mail_name, 0, $nbdisplaymail);

 	}

 

-	if(strlen($mail_domaine) > $nbdisplaydomain){

-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);

+	if (strlen($mail_domaine) > $nbdisplaydomain) {

+		$mail_domaine = substr($mail_domaine, strlen($mail_domaine) - $nbdisplaydomain);

 	}

 

-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;

+	return $mail_name.$string_replace.$mail_domaine.$mail_tld;

 }

 

 

@@ -662,14 +662,14 @@ 
  * 	@param	string	$tdoptions	Options for td

  * 	@return	string

  */

-function array2tr($data,$troptions='',$tdoptions='')

+function array2tr($data, $troptions = '', $tdoptions = '')

 {

-    $text = '<tr '.$troptions.'>' ;

-    foreach($data as $key => $item){

-        $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;

+    $text = '<tr '.$troptions.'>';

+    foreach ($data as $key => $item) {

+        $text .= '<td '.$tdoptions.'>'.$item.'</td>';

     }

-    $text.= '</tr>' ;

-    return $text ;

+    $text .= '</tr>';

+    return $text;

 }

 

 /**

@@ -682,22 +682,22 @@ 
  * 	@param	string	$tdoptions		Options for td

  * 	@return	string

  */

-function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')

+function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')

 {

-    $text='' ;

-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;

-    foreach($data as $key => $item){

-        if(is_array($item)){

-            $text.=array2tr($item,$troptions,$tdoptions);

+    $text = '';

+    if ($tableMarkup) $text = '<table '.$tableoptions.'>';

+    foreach ($data as $key => $item) {

+        if (is_array($item)) {

+            $text .= array2tr($item, $troptions, $tdoptions);

         } else {

-            $text.= '<tr '.$troptions.'>' ;

-            $text.= '<td '.$tdoptions.'>'.$key.'</td>' ;

-            $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;

-            $text.= '</tr>' ;

+            $text .= '<tr '.$troptions.'>';

+            $text .= '<td '.$tdoptions.'>'.$key.'</td>';

+            $text .= '<td '.$tdoptions.'>'.$item.'</td>';

+            $text .= '</tr>';

         }

     }

-    if($tableMarkup) $text.= '</table>' ;

-    return $text ;

+    if ($tableMarkup) $text .= '</table>';

+    return $text;

 }

 

 /**

@@ -716,19 +716,19 @@ 
  * @param	int			$forceentity	Entity id to force

  * @return 	string						New value (numeric) or error message

  */

-function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true, $objuser=null, $forceentity=null)

+function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)

 {

-    global $conf,$user;

+    global $conf, $user;

 

-    if (! is_object($objsoc)) $valueforccc=$objsoc;

-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;

-    else $valueforccc=$objsoc->code_client;

+    if (!is_object($objsoc)) $valueforccc = $objsoc;

+    else if ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = $objsoc->code_fournisseur;

+    else $valueforccc = $objsoc->code_client;

 

     $sharetable = $table;

     if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function

 

     // Clean parameters

-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers

+    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers

     // but we should use local year and month of user

 

     // For debugging

@@ -738,132 +738,132 @@ 
     //$date=dol_mktime(12, 0, 0, 1, 1, 1900);

     //$date=dol_stringtotime('20130101');

 

-    $hasglobalcounter=false;

+    $hasglobalcounter = false;

     // Extract value for mask counter, mask raz and mask offset

-    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$mask,$reg))

+    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))

     {

-        $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');

-        $maskcounter=$reg[1];

-        $hasglobalcounter=true;

+        $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');

+        $maskcounter = $reg[1];

+        $hasglobalcounter = true;

     }

     else

     {

         // setting some defaults so the rest of the code won't fail if there is a third party counter

-        $masktri='00000';

-        $maskcounter='00000';

+        $masktri = '00000';

+        $maskcounter = '00000';

     }

 

-    $maskraz=-1;

-    $maskoffset=0;

-    $resetEveryMonth=false;

+    $maskraz = -1;

+    $maskoffset = 0;

+    $resetEveryMonth = false;

     if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';

 

     // Extract value for third party mask counter

-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))

-    {

-        $maskrefclient=$regClientRef[1].$regClientRef[2];

-        $maskrefclient_maskclientcode=$regClientRef[1];

-        $maskrefclient_maskcounter=$regClientRef[2];

-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset

-        $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask

-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like

+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))

+    {

+        $maskrefclient = $regClientRef[1].$regClientRef[2];

+        $maskrefclient_maskclientcode = $regClientRef[1];

+        $maskrefclient_maskcounter = $regClientRef[2];

+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

+        $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask

+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

     }

-    else $maskrefclient='';

+    else $maskrefclient = '';

 

     // fail if there is neither a global nor a third party counter

-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))

+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))

     {

         return 'ErrorBadMask';

     }

 

     // Extract value for third party type

-    if (preg_match('/\{(t+)\}/i',$mask,$regType))

+    if (preg_match('/\{(t+)\}/i', $mask, $regType))

     {

-        $masktype=$regType[1];

-        $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)

-        $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

+        $masktype = $regType[1];

+        $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)

+        $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

     }

     else

     {

-    	$masktype='';

-    	$masktype_value='';

+    	$masktype = '';

+    	$masktype_value = '';

     }

 

     // Extract value for user

-    if (preg_match('/\{(u+)\}/i',$mask,$regType))

+    if (preg_match('/\{(u+)\}/i', $mask, $regType))

     {

     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

     	if (is_object($objuser)) $lastname = $objuser->lastname;

 

-    	$maskuser=$regType[1];

-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)

-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

+    	$maskuser = $regType[1];

+    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)

+    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

     }

     else

     {

-    	$maskuser='';

-    	$maskuser_value='';

+    	$maskuser = '';

+    	$maskuser_value = '';

     }

 

     // Personalized field {XXX-1} à {XXX-9}

-    $maskperso=array();

-    $maskpersonew=array();

-    $tmpmask=$mask;

-    while (preg_match('/\{([A-Z]+)\-([1-9])\}/',$tmpmask,$regKey))

+    $maskperso = array();

+    $maskpersonew = array();

+    $tmpmask = $mask;

+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))

     {

-        $maskperso[$regKey[1]]='{'.$regKey[1].'-'.$regKey[2].'}';

-        $maskpersonew[$regKey[1]]=str_pad('', $regKey[2], '_', STR_PAD_RIGHT);

-        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);

+        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';

+        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);

+        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);

     }

 

-    if (strstr($mask,'user_extra_'))

+    if (strstr($mask, 'user_extra_'))

     {

 			$start = "{user_extra_";

 			$end = "\}";

-			$extra= get_string_between($mask, "user_extra_", "}");

-			if(!empty($user->array_options['options_'.$extra])){

-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);

+			$extra = get_string_between($mask, "user_extra_", "}");

+			if (!empty($user->array_options['options_'.$extra])) {

+				$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);

 			}

     }

-    $maskwithonlyymcode=$mask;

-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(u+)\}/i',$maskuser_value,$maskwithonlyymcode);

-    foreach($maskperso as $key => $val)

-    {

-        $maskwithonlyymcode=preg_replace('/'.preg_quote($val,'/').'/i', $maskpersonew[$key], $maskwithonlyymcode);

-    }

-    $maskwithnocode=$maskwithonlyymcode;

-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);

+    $maskwithonlyymcode = $mask;

+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);

+    foreach ($maskperso as $key => $val)

+    {

+        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);

+    }

+    $maskwithnocode = $maskwithonlyymcode;

+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

     // Now maskwithnocode = 0000ddmmyyyyccc for example

     // and maskcounter    = 0000 for example

     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

     //var_dump($reg);

 

     // If an offset is asked

-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);

 

     // Define $sqlwhere

-    $sqlwhere='';

-    $yearoffset=0;	// Use year of current $date by default

-    $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

+    $sqlwhere = '';

+    $yearoffset = 0; // Use year of current $date by default

+    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

 

     // If a restore to zero after a month is asked we check if there is already a value for this year.

-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);

 

     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;

     if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)

-        $maskraz=$yearoffsettype; // For backward compatibility

-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))

+        $maskraz = $yearoffsettype; // For backward compatibility

+    else if ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))

         $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;

     //print "maskraz=".$maskraz;	// -1=no reset

 

@@ -877,79 +877,79 @@ 
         // Define posy, posm and reg

         if ($maskraz > 1)	// if reset is not first month, we need month and year into mask

         {

-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }

+            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }

             else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

 

             if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';

         }

         else // if reset is for a specific month in year, we need year

         {

-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }

+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }

+        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }

+            else if (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }

             else return 'ErrorCantUseRazIfNoYearInMask';

         }

         // Define length

-        $yearlen = $posy?dol_strlen($reg[$posy]):0;

-        $monthlen = $posm?dol_strlen($reg[$posm]):0;

+        $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;

+        $monthlen = $posm ?dol_strlen($reg[$posm]) : 0;

         // Define pos

-       	$yearpos = (dol_strlen($reg[1])+1);

-        $monthpos = ($yearpos+$yearlen);

+       	$yearpos = (dol_strlen($reg[1]) + 1);

+        $monthpos = ($yearpos + $yearlen);

         if ($posy == 3 && $posm == 2) {		// if month is before year

-          	$monthpos = (dol_strlen($reg[1])+1);

-           	$yearpos = ($monthpos+$monthlen);

+          	$monthpos = (dol_strlen($reg[1]) + 1);

+           	$yearpos = ($monthpos + $monthlen);

         }

         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";

 

         // Define $yearcomp and $monthcomp (that will be use in the select where to search max number)

-        $monthcomp=$maskraz;

-        $yearcomp=0;

+        $monthcomp = $maskraz;

+        $yearcomp = 0;

 

-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

+        if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

         {

-        	$currentyear=date("Y", $date);

-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);

-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);

-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);

+        	$currentyear = date("Y", $date);

+        	$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);

+        	$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);

+        	$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);

         	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';

 

         	// If after or equal of current fiscal date

         	if ($date >= $fiscaldate)

         	{

         		// If before of next new year date

-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;

+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;

         	}

         	// If after or equal of current new year date

-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;

+        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;

         }

         // For backward compatibility

-        else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year

+        else if (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year

 

-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);

-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);

-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;

+        if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);

+        elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);

+        elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;

         if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)

         {

-            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);

-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);

-

-            $sqlwhere.="(";

-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

-            $sqlwhere.=" OR";

-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";

-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

-            $sqlwhere.=')';

+            if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);

+            elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);

+

+            $sqlwhere .= "(";

+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

+            $sqlwhere .= " OR";

+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

+            $sqlwhere .= ')';

         }

 		else if ($resetEveryMonth)

 		{

-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

 		}

         else   // reset is done on january

         {

-            $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

+            $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

         }

     }

     //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset

@@ -958,49 +958,49 @@ 
     // Define $sqlstring

     if (function_exists('mb_strrpos'))

     	{

-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');

+    	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');

 	}

 	else

 	{

-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);

+    	$posnumstart = strrpos($maskwithnocode, $maskcounter);

 	}	// Pos of counter in final string (from 0 to ...)

     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';

-    $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';

+    $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';

 

     // Define $maskLike

     $maskLike = dol_string_nospecial($mask);

-    $maskLike = str_replace("%","_",$maskLike);

+    $maskLike = str_replace("%", "_", $maskLike);

     // Replace protected special codes with matching number of _ as wild card caracter

-    $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);

-    $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);

-    $maskLike = preg_replace('/\{y\}/i','_',$maskLike);

-    $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);

-    $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);

-    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);

-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);

-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);

-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

-    foreach($maskperso as $key => $val)

+    $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

+    $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

+    $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

+    $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

+    $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);

+    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

+    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

+    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

+    foreach ($maskperso as $key => $val)

     {

-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);

+    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);

     }

 

     // Get counter in database

-    $counter=0;

+    $counter = 0;

     $sql = "SELECT MAX(".$sqlstring.") as val";

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

-    $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";

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

+    $sql .= " WHERE ".$field." LIKE '".$maskLike."'";

+	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";

     if ($bentityon) // only if entity enable

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

-    else if (! empty($forceentity))

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

-    if ($where) $sql.=$where;

-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;

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

+    else if (!empty($forceentity))

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

+    if ($where) $sql .= $where;

+    if ($sqlwhere) $sql .= ' AND '.$sqlwhere;

 

     //print $sql.'<br>';

     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

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

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

     if ($resql)

     {

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

@@ -1009,46 +1009,46 @@ 
     else dol_print_error($db);

 

     // Check if we must force counter to maskoffset

-    if (empty($counter)) $counter=$maskoffset;

-    else if (preg_match('/[^0-9]/i',$counter))

+    if (empty($counter)) $counter = $maskoffset;

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

     {

-    	$counter=0;

+    	$counter = 0;

     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

     }

-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;

+    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;

 

     if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.

     {

-        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);

+        $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

 

         // Define $maskLike

         $maskLike = dol_string_nospecial($mask);

-        $maskLike = str_replace("%","_",$maskLike);

+        $maskLike = str_replace("%", "_", $maskLike);

         // Replace protected special codes with matching number of _ as wild card caracter

-        $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);

-        $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);

-        $maskLike = preg_replace('/\{y\}/i','_',$maskLike);

-        $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);

-        $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);

-        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);

-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);

-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);

-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

-

-        $ref='';

+        $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

+        $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

+        $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

+        $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

+        $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

+        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);

+        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

+        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

+        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

+

+        $ref = '';

         $sql = "SELECT ".$field." as ref";

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

-        $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";

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

+        $sql .= " WHERE ".$field." LIKE '".$maskLike."'";

+    	$sql .= " AND ".$field." NOT LIKE '%PROV%'";

     	if ($bentityon) // only if entity enable

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

-        else if (! empty($forceentity))

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

-        if ($where) $sql.=$where;

-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;

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

+        else if (!empty($forceentity))

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

+        if ($where) $sql .= $where;

+        if ($sqlwhere) $sql .= ' AND '.$sqlwhere;

 

         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

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

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

         if ($resql)

         {

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

@@ -1056,7 +1056,7 @@ 
         }

         else dol_print_error($db);

 

-        $numFinal=$ref;

+        $numFinal = $ref;

     }

     else if ($mode == 'next')

     {

@@ -1065,47 +1065,47 @@ 
         // If value for $counter has a length higher than $maskcounter chars

         if ($counter >= pow(10, dol_strlen($maskcounter)))

         {

-        	$counter='ErrorMaxNumberReachForThisMask';

+        	$counter = 'ErrorMaxNumberReachForThisMask';

         }

 

-        if (! empty($maskrefclient_maskcounter))

+        if (!empty($maskrefclient_maskcounter))

         {

             //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";

 

             // Define $sqlstring

-            $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)

+            $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)

             if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';

-            $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';

+            $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';

             //print "x".$sqlstring;

 

             // Define $maskrefclient_maskLike

             $maskrefclient_maskLike = dol_string_nospecial($mask);

-            $maskrefclient_maskLike = str_replace("%","_",$maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);

             // Replace protected special codes with matching number of _ as wild card caracter

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'),'____',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'),'__',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'),'_',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'),'__',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'),'__',$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskrefclient_maskLike);

-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),$maskrefclient_clientcode.str_pad("",dol_strlen($maskrefclient_maskcounter),"_"),$maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);

 

             // Get counter in database

-            $maskrefclient_counter=0;

+            $maskrefclient_counter = 0;

             $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";

-            $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;

+            $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;

             //$sql.= " WHERE ".$field." not like '(%'";

-            $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

+            $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

             if ($bentityon) // only if entity enable

-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";

-            else if (! empty($forceentity))

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

-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask

-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask

-            $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

+            	$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";

+            else if (!empty($forceentity))

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

+            if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask

+            if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask

+            $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

 

             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);

-            $maskrefclient_resql=$db->query($maskrefclient_sql);

+            $maskrefclient_resql = $db->query($maskrefclient_sql);

             if ($maskrefclient_resql)

             {

                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);

@@ -1113,7 +1113,7 @@ 
             }

             else dol_print_error($db);

 

-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;

+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;

 			$maskrefclient_counter++;

         }

 

@@ -1121,54 +1121,54 @@ 
         $numFinal = $mask;

 

         // We replace special codes except refclient

-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

 		{

-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);

-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);

-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);

+	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);

+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);

+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);

 		}

 		else	// we want yyyy to be current year

 		{

-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);

-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);

-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);

+        	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);

+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);

+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);

 		}

-        $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);

-        $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);

+        $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);

+        $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);

 

         // Now we replace the counter

-        $maskbefore='{'.$masktri.'}';

-        $maskafter=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);

+        $maskbefore = '{'.$masktri.'}';

+        $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

         //print 'x'.$maskbefore.'-'.$maskafter.'y';

-        $numFinal = str_replace($maskbefore,$maskafter,$numFinal);

+        $numFinal = str_replace($maskbefore, $maskafter, $numFinal);

 

         // Now we replace the refclient

         if ($maskrefclient)

         {

             //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

-            $maskrefclient_maskbefore='{'.$maskrefclient.'}';

-            $maskrefclient_maskafter=$maskrefclient_clientcode.str_pad($maskrefclient_counter,dol_strlen($maskrefclient_maskcounter),"0",STR_PAD_LEFT);

-            $numFinal = str_replace($maskrefclient_maskbefore,$maskrefclient_maskafter,$numFinal);

+            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';

+            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);

+            $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);

         }

 

         // Now we replace the type

         if ($masktype)

         {

-            $masktype_maskbefore='{'.$masktype.'}';

-            $masktype_maskafter=$masktype_value;

-            $numFinal = str_replace($masktype_maskbefore,$masktype_maskafter,$numFinal);

+            $masktype_maskbefore = '{'.$masktype.'}';

+            $masktype_maskafter = $masktype_value;

+            $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);

         }

 

         // Now we replace the user

         if ($maskuser)

         {

-        	$maskuser_maskbefore='{'.$maskuser.'}';

-        	$maskuser_maskafter=$maskuser_value;

-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);

+        	$maskuser_maskbefore = '{'.$maskuser.'}';

+        	$maskuser_maskafter = $maskuser_value;

+        	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);

         }

     }

 

-    dol_syslog("functions2::get_next_value return ".$numFinal,LOG_DEBUG);

+    dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);

     return $numFinal;

 }

 

@@ -1183,11 +1183,11 @@ 
 function get_string_between($string, $start, $end)

 {

     $string = " ".$string;

-     $ini = strpos($string,$start);

+     $ini = strpos($string, $start);

      if ($ini == 0) return "";

      $ini += strlen($start);

-     $len = strpos($string,$end,$ini) - $ini;

-     return substr($string,$ini,$len);

+     $len = strpos($string, $end, $ini) - $ini;

+     return substr($string, $ini, $len);

 }

 

 /**

@@ -1197,78 +1197,78 @@ 
  * @param 	string	$value		Value

  * @return	int|string		    <0 or error string if KO, 0 if OK

  */

-function check_value($mask,$value)

+function check_value($mask, $value)

 {

-    $result=0;

+    $result = 0;

 

-    $hasglobalcounter=false;

+    $hasglobalcounter = false;

     // Extract value for mask counter, mask raz and mask offset

-    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))

+    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))

     {

-        $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');

-        $maskcounter=$reg[1];

-        $hasglobalcounter=true;

+        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');

+        $maskcounter = $reg[1];

+        $hasglobalcounter = true;

     }

     else

     {

         // setting some defaults so the rest of the code won't fail if there is a third party counter

-        $masktri='00000';

-        $maskcounter='00000';

+        $masktri = '00000';

+        $maskcounter = '00000';

     }

 

-    $maskraz=-1;

-    $maskoffset=0;

+    $maskraz = -1;

+    $maskoffset = 0;

     if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

 

     // Extract value for third party mask counter

-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))

-    {

-        $maskrefclient=$regClientRef[1].$regClientRef[2];

-        $maskrefclient_maskclientcode=$regClientRef[1];

-        $maskrefclient_maskcounter=$regClientRef[2];

-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset

-        $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode

-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like

+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))

+    {

+        $maskrefclient = $regClientRef[1].$regClientRef[2];

+        $maskrefclient_maskclientcode = $regClientRef[1];

+        $maskrefclient_maskcounter = $regClientRef[2];

+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

+        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode

+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

     }

-    else $maskrefclient='';

+    else $maskrefclient = '';

 

     // fail if there is neither a global nor a third party counter

-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))

+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))

     {

         return 'ErrorBadMask';

     }

 

-    $maskwithonlyymcode=$mask;

-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);

-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);

-    $maskwithnocode=$maskwithonlyymcode;

-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);

-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);

+    $maskwithonlyymcode = $mask;

+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

+    $maskwithnocode = $maskwithonlyymcode;

+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

     // Now maskwithnocode = 0000ddmmyyyyccc for example

     // and maskcounter    = 0000 for example

     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

 

     // If an offset is asked

-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);

 

     // Define $sqlwhere

 

     // If a restore to zero after a month is asked we check if there is already a value for this year.

-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);

+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);

     if ($maskraz >= 0)

     {

         if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';

 

         // Define reg

-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';

+        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

+        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';

         //print "x".$maskwithonlyymcode." ".$maskraz;

     }

     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

@@ -1277,8 +1277,8 @@ 
     //

 

     // Check length

-    $len=dol_strlen($maskwithnocode);

-    if (dol_strlen($value) != $len) $result=-1;

+    $len = dol_strlen($maskwithnocode);

+    if (dol_strlen($value) != $len) $result = -1;

 

     // Define $maskLike

     /* seems not used

@@ -1294,7 +1294,7 @@ 
     if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);

 	*/

 

-    dol_syslog("functions2::check_value result=".$result,LOG_DEBUG);

+    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);

     return $result;

 }

 

@@ -1306,13 +1306,13 @@ 
  *	@param   boolean	$upper		Convert to tupper

  *	@return  string					x

  */

-function binhex($bin, $pad=false, $upper=false)

+function binhex($bin, $pad = false, $upper = false)

 {

-    $last = dol_strlen($bin)-1;

-    for($i=0; $i<=$last; $i++){ $x += $bin[$last-$i] * pow(2,$i); }

+    $last = dol_strlen($bin) - 1;

+    for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }

     $x = dechex($x);

-    if($pad){ while(dol_strlen($x) < intval(dol_strlen($bin))/4){ $x = "0$x"; } }

-    if($upper){ $x = strtoupper($x); }

+    if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }

+    if ($upper) { $x = strtoupper($x); }

     return $x;

 }

 

@@ -1324,11 +1324,11 @@ 
  */

 function hexbin($hexa)

 {

-    $bin='';

+    $bin = '';

     $strLength = dol_strlen($hexa);

-    for($i=0;$i<$strLength;$i++)

+    for ($i = 0; $i < $strLength; $i++)

     {

-        $bin.=str_pad(decbin(hexdec($hexa{$i})),4,'0',STR_PAD_LEFT);

+        $bin .= str_pad(decbin(hexdec($hexa{$i})), 4, '0', STR_PAD_LEFT);

     }

     return $bin;

 }

@@ -1341,9 +1341,9 @@ 
  */

 function numero_semaine($time)

 {

-    $stime = strftime('%Y-%m-%d',$time);

+    $stime = strftime('%Y-%m-%d', $time);

 

-    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i',$stime,$reg))

+    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))

     {

         // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'

         $annee = $reg[1];

@@ -1359,47 +1359,47 @@ 
      */

 

     // Definition du Jeudi de la semaine

-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;

-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;

-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;

+    if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;

+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;

+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;

     else // Jeudi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);

 

     // Definition du premier Jeudi de l'annee

-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche

+    if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;

     }

-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi

+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;

     }

-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi

+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;

     }

     else // Jeudi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));

     }

 

     // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";

-    $numeroSemaine =     (

+    $numeroSemaine = (

     (

-    date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))

+    date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))

     -

-    date("z",mktime(12,0,0,date("m",$premierJeudiAnnee),date("d",$premierJeudiAnnee),date("Y",$premierJeudiAnnee)))

+    date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))

     ) / 7

     ) + 1;

 

     // Cas particulier de la semaine 53

-    if ($numeroSemaine==53)

+    if ($numeroSemaine == 53)

     {

         // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53

-        if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))

+        if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))

         {

             $numeroSemaine = 53;

         }

@@ -1411,7 +1411,7 @@ 
 

     //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";

 

-    return sprintf("%02d",$numeroSemaine);

+    return sprintf("%02d", $numeroSemaine);

 }

 

 /**

@@ -1422,26 +1422,26 @@ 
  *	@param  int		$to_unit   		Nouvelle unite  en puissance de 10

  *	@return float	        		Masse convertie

  */

-function weight_convert($weight,&$from_unit,$to_unit)

+function weight_convert($weight, &$from_unit, $to_unit)

 {

     /* Pour convertire 320 gr en Kg appeler

      *  $f = -3

      *  weigh_convert(320, $f, 0) retournera 0.32

      *

      */

-    while ($from_unit  <> $to_unit)

+    while ($from_unit <> $to_unit)

     {

         if ($from_unit > $to_unit)

         {

             $weight = $weight * 10;

             $from_unit = $from_unit - 1;

-            $weight = weight_convert($weight,$from_unit, $to_unit);

+            $weight = weight_convert($weight, $from_unit, $to_unit);

         }

         if ($from_unit < $to_unit)

         {

             $weight = $weight / 10;

             $from_unit = $from_unit + 1;

-            $weight = weight_convert($weight,$from_unit, $to_unit);

+            $weight = weight_convert($weight, $from_unit, $to_unit);

         }

     }

 

@@ -1468,21 +1468,21 @@ 
 

     // We remove old parameters for all keys in $tab

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

-    $sql.= " WHERE fk_user = ".$user->id;

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

-    $sql.= " AND param in (";

-    $i=0;

+    $sql .= " WHERE fk_user = ".$user->id;

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

+    $sql .= " AND param in (";

+    $i = 0;

     foreach ($tab as $key => $value)

     {

-        if ($i > 0) $sql.=',';

-        $sql.="'".$db->escape($key)."'";

+        if ($i > 0) $sql .= ',';

+        $sql .= "'".$db->escape($key)."'";

         $i++;

     }

-    $sql.= ")";

+    $sql .= ")";

     dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

 

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

-    if (! $resql)

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

+    if (!$resql)

     {

         dol_print_error($db);

         $db->rollback();

@@ -1495,12 +1495,12 @@ 
         if ($value)

         {

             $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";

-            $sql.= " VALUES (".$user->id.",".$conf->entity.",";

-            $sql.= " '".$db->escape($key)."','".$db->escape($value)."')";

+            $sql .= " VALUES (".$user->id.",".$conf->entity.",";

+            $sql .= " '".$db->escape($key)."','".$db->escape($value)."')";

 

             dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

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

-            if (! $result)

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

+            if (!$result)

             {

                 dol_print_error($db);

                 $db->rollback();

@@ -1526,7 +1526,7 @@ 
  *	@param	Translate	$langs			Output language

  *	@return	string						Formated reduction

  */

-function dol_print_reduction($reduction,$langs)

+function dol_print_reduction($reduction, $langs)

 {

     $string = '';

     if ($reduction == 100)

@@ -1535,7 +1535,7 @@ 
     }

     else

     {

-    	$string = vatrate($reduction,true);

+    	$string = vatrate($reduction, true);

     }

 

     return $string;

@@ -1549,7 +1549,7 @@ 
  */

 function version_os()

 {

-    $osversion=php_uname();

+    $osversion = php_uname();

     return $osversion;

 }

 

@@ -1593,18 +1593,18 @@ 
  *  @param  int		    $maxfilenamelength  Max length of value to show

  * 	@return	mixed			    			0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".

  */

-function getListOfModels($db,$type,$maxfilenamelength=0)

+function getListOfModels($db, $type, $maxfilenamelength = 0)

 {

-    global $conf,$langs;

-    $liste=array();

-    $found=0;

-    $dirtoscan='';

+    global $conf, $langs;

+    $liste = array();

+    $found = 0;

+    $dirtoscan = '';

 

     $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";

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

-    $sql.= " WHERE type = '".$type."'";

-    $sql.= " AND entity IN (0,".$conf->entity.")";

-    $sql.= " ORDER BY description DESC";

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

+    $sql .= " WHERE type = '".$type."'";

+    $sql .= " AND entity IN (0,".$conf->entity.")";

+    $sql .= " ORDER BY description DESC";

 

     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);

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

@@ -1614,48 +1614,48 @@ 
         $i = 0;

         while ($i < $num)

         {

-            $found=1;

+            $found = 1;

 

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

 

             // If this generation module needs to scan a directory, then description field is filled

             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).

-            if (! empty($obj->description))	// A list of directories to scan is defined

+            if (!empty($obj->description))	// A list of directories to scan is defined

             {

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

 

-                $const=$obj->description;

+                $const = $obj->description;

                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

-                $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

+                $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));

 

-		$listoffiles=array();

+		$listoffiles = array();

 

                 // Now we add models found in directories scanned

-                $listofdir=explode(',',$dirtoscan);

-                foreach($listofdir as $key=>$tmpdir)

+                $listofdir = explode(',', $dirtoscan);

+                foreach ($listofdir as $key=>$tmpdir)

                 {

-                    $tmpdir=trim($tmpdir);

-                    $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);

-                    if (! $tmpdir) { unset($listofdir[$key]); continue; }

+                    $tmpdir = trim($tmpdir);

+                    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);

+                    if (!$tmpdir) { unset($listofdir[$key]); continue; }

                     if (is_dir($tmpdir))

                     {

 			// all type of template is allowed

-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+			$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

+                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);

                     }

                 }

 

                 if (count($listoffiles))

                 {

-                    foreach($listoffiles as $record)

+                    foreach ($listoffiles as $record)

                     {

-                        $max=($maxfilenamelength?$maxfilenamelength:28);

-                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');

+                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);

+                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');

                     }

                 }

                 else

                 {

-                    $liste[0]=$obj->label.': '.$langs->trans("None");

+                    $liste[0] = $obj->label.': '.$langs->trans("None");

                 }

             }

             else

@@ -1664,14 +1664,14 @@ 
                 {

                     global $_Avery_Labels;

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

-                    foreach($_Avery_Labels as $key => $val)

+                    foreach ($_Avery_Labels as $key => $val)

                     {

-                        $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];

+                        $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->lib).' '.$val['name'];

                     }

                 }

                 else    // Common usage

                 {

-                    $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;

+                    $liste[$obj->id] = $obj->label ? $obj->label : $obj->lib;

                 }

             }

             $i++;

@@ -1700,10 +1700,10 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {

 

 		// Then we test if it is a private range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

 

 		// Then we test if it is a reserved range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

 

 		return 1;

 	}

@@ -1718,12 +1718,12 @@ 
  *  @param  string		$firstname		Firstname

  *	@return	string						Login

  */

-function dol_buildlogin($lastname,$firstname)

+function dol_buildlogin($lastname, $firstname)

 {

-    $login=strtolower(dol_string_unaccent($firstname));

-    $login.=($login?'.':'');

-    $login.=strtolower(dol_string_unaccent($lastname));

-    $login=dol_string_nospecial($login,''); // For special names

+    $login = strtolower(dol_string_unaccent($firstname));

+    $login .= ($login ? '.' : '');

+    $login .= strtolower(dol_string_unaccent($lastname));

+    $login = dol_string_nospecial($login, ''); // For special names

     return $login;

 }

 

@@ -1736,18 +1736,18 @@ 
 {

     global $conf;

 

-    $params=array();

-    $proxyuse =(empty($conf->global->MAIN_PROXY_USE)?false:true);

-    $proxyhost=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_HOST);

-    $proxyport=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_PORT);

-    $proxyuser=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_USER);

-    $proxypass=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_PASS);

-    $timeout  =(empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?10:$conf->global->MAIN_USE_CONNECT_TIMEOUT);               // Connection timeout

-    $response_timeout=(empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);    // Response timeout

+    $params = array();

+    $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true);

+    $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST);

+    $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);

+    $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);

+    $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);

+    $timeout  = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout

+    $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout

     //print extension_loaded('soap');

     if ($proxyuse)

     {

-        $params=array('connection_timeout'=>$timeout,

+        $params = array('connection_timeout'=>$timeout,

                       'response_timeout'=>$response_timeout,

                       'proxy_use'      => 1,

                       'proxy_host'     => $proxyhost,

@@ -1759,7 +1759,7 @@ 
     }

     else

     {

-        $params=array('connection_timeout'=>$timeout,

+        $params = array('connection_timeout'=>$timeout,

                       'response_timeout'=>$response_timeout,

                       'proxy_use'      => 0,

                       'proxy_host'     => false,

@@ -1782,15 +1782,15 @@ 
  * @param 	string	$option			More options

  * @return	string					URL of link to object id/type

  */

-function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')

+function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')

 {

 	global $db, $conf, $langs;

 

-	$ret='';

+	$ret = '';

 

 	// Parse element/subelement (ex: project_task)

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

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

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

 	{

 		$module = $element = $regs[1];

 		$subelement = $regs[2];

@@ -1801,18 +1801,18 @@ 
 	// To work with non standard path

 	if ($objecttype == 'facture' || $objecttype == 'invoice') {

 		$classpath = 'compta/facture/class';

-		$module='facture';

-		$subelement='facture';

+		$module = 'facture';

+		$subelement = 'facture';

 	}

 	if ($objecttype == 'commande' || $objecttype == 'order') {

 		$classpath = 'commande/class';

-		$module='commande';

-		$subelement='commande';

+		$module = 'commande';

+		$subelement = 'commande';

 	}

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

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

 		$classpath = 'comm/propal/class';

 	}

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

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

 		$classpath = 'supplier_proposal/class';

 	}

 	if ($objecttype == 'shipping') {

@@ -1827,33 +1827,33 @@ 
 	}

 	if ($objecttype == 'contract') {

 		$classpath = 'contrat/class';

-		$module='contrat';

-		$subelement='contrat';

+		$module = 'contrat';

+		$subelement = 'contrat';

 	}

 	if ($objecttype == 'member') {

 		$classpath = 'adherents/class';

-		$module='adherent';

-		$subelement='adherent';

+		$module = 'adherent';

+		$subelement = 'adherent';

 	}

 	if ($objecttype == 'cabinetmed_cons') {

 		$classpath = 'cabinetmed/class';

-		$module='cabinetmed';

-		$subelement='cabinetmedcons';

+		$module = 'cabinetmed';

+		$subelement = 'cabinetmedcons';

 	}

 	if ($objecttype == 'fichinter') {

 		$classpath = 'fichinter/class';

-		$module='ficheinter';

-		$subelement='fichinter';

+		$module = 'ficheinter';

+		$subelement = 'fichinter';

 	}

 	if ($objecttype == 'task') {

 		$classpath = 'projet/class';

-		$module='projet';

-		$subelement='task';

+		$module = 'projet';

+		$subelement = 'task';

 	}

 	if ($objecttype == 'stock') {

 		$classpath = 'product/stock/class';

-		$module='stock';

-		$subelement='stock';

+		$module = 'stock';

+		$subelement = 'stock';

 	}

 

 	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;

@@ -1861,34 +1861,34 @@ 
 	$classfile = strtolower($subelement); $classname = ucfirst($subelement);

 	if ($objecttype == 'invoice_supplier') {

 		$classfile = 'fournisseur.facture';

-		$classname='FactureFournisseur';

+		$classname = 'FactureFournisseur';

 		$classpath = 'fourn/class';

-		$module='fournisseur';

+		$module = 'fournisseur';

 	}

-	elseif ($objecttype == 'order_supplier')   {

+	elseif ($objecttype == 'order_supplier') {

 		$classfile = 'fournisseur.commande';

-		$classname='CommandeFournisseur';

+		$classname = 'CommandeFournisseur';

 		$classpath = 'fourn/class';

-		$module='fournisseur';

+		$module = 'fournisseur';

 	}

-	elseif ($objecttype == 'stock')   {

+	elseif ($objecttype == 'stock') {

 		$classpath = 'product/stock/class';

-		$classfile='entrepot';

-		$classname='Entrepot';

+		$classfile = 'entrepot';

+		$classname = 'Entrepot';

 	}

-	if (! empty($conf->$module->enabled))

+	if (!empty($conf->$module->enabled))

 	{

-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

+		$res = dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');

 		if ($res)

 		{

 			if (class_exists($classname))

 			{

 				$object = new $classname($db);

-				$res=$object->fetch($objectid);

+				$res = $object->fetch($objectid);

 				if ($res > 0) {

-					$ret=$object->getNomUrl($withpicto,$option);

-				} elseif($res==0) {

-					$ret=$langs->trans('Deleted');

+					$ret = $object->getNomUrl($withpicto, $option);

+				} elseif ($res == 0) {

+					$ret = $langs->trans('Deleted');

 				}

 				unset($object);

 			}

@@ -1909,12 +1909,12 @@ 
  */

 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)

 {

-	$totalnb=0;

-	$listofid=array();

-	$listofparentid=array();

+	$totalnb = 0;

+	$listofid = array();

+	$listofparentid = array();

 

 	// Get list of all id in array listofid and all parents in array listofparentid

-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

+	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

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

 	if ($resql)

 	{

@@ -1923,8 +1923,8 @@ 
 		while ($i < $num)

 		{

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

-			$listofid[]=$obj->rowid;

-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;

+			$listofid[] = $obj->rowid;

+			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;

 			$i++;

 		}

 	}

@@ -1938,78 +1938,78 @@ 
 		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";

 

 		// Check loops on each other

-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid"; // So we update only records linked to themself

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

 		if ($resql)

 		{

-			$nb=$db->affected_rows($sql);

+			$nb = $db->affected_rows($sql);

 			if ($nb > 0)

 			{

 				print '<br>Some record that were parent of themself were cleaned.';

 			}

 

-			$totalnb+=$nb;

+			$totalnb += $nb;

 		}

 		//else dol_print_error($db);

 

 		// Check other loops

-		$listofidtoclean=array();

-		foreach($listofparentid as $id => $pid)

+		$listofidtoclean = array();

+		foreach ($listofparentid as $id => $pid)

 		{

 			// Check depth

 			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';

 

-			$cursor=$id; $arrayidparsed=array();	// We start from child $id

+			$cursor = $id; $arrayidparsed = array(); // We start from child $id

 			while ($cursor > 0)

 			{

-				$arrayidparsed[$cursor]=1;

+				$arrayidparsed[$cursor] = 1;

 				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child

 				{

 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';

 					unset($arrayidparsed);

-					$listofidtoclean[$cursor]=$id;

+					$listofidtoclean[$cursor] = $id;

 					break;

 				}

-				$cursor=$listofparentid[$cursor];

+				$cursor = $listofparentid[$cursor];

 			}

 

 			if (count($listofidtoclean)) break;

 		}

 

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

-		$sql.= " SET ".$fieldfkparent." = 0";

-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong

+		$sql .= " SET ".$fieldfkparent." = 0";

+		$sql .= " WHERE rowid IN (".join(',', $listofidtoclean).")"; // So we update only records detected wrong

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

 		if ($resql)

 		{

-			$nb=$db->affected_rows($sql);

+			$nb = $db->affected_rows($sql);

 			if ($nb > 0)

 			{

 				// Removed orphelins records

 				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';

-				print join(',',$listofidtoclean);

+				print join(',', $listofidtoclean);

 			}

 

-			$totalnb+=$nb;

+			$totalnb += $nb;

 		}

 		//else dol_print_error($db);

 

 		// Check and clean orphelins

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

-		$sql.= " SET ".$fieldfkparent." = 0";

-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent

+		$sql .= " SET ".$fieldfkparent." = 0";

+		$sql .= " WHERE ".$fieldfkparent." NOT IN (".join(',', $listofid).")"; // So we update only records linked to a non existing parent

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

 		if ($resql)

 		{

-			$nb=$db->affected_rows($sql);

+			$nb = $db->affected_rows($sql);

 			if ($nb > 0)

 			{

 				// Removed orphelins records

 				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';

-				print join(',',$listofid);

+				print join(',', $listofid);

 			}

 

-			$totalnb+=$nb;

+			$totalnb += $nb;

 		}

 		//else dol_print_error($db);

 

@@ -2030,21 +2030,21 @@ 
     $module = $element = $subelement = $element_type;

 

     // If we ask an resource form external module (instead of default path)

-    if (preg_match('/^([^@]+)@([^@]+)$/i',$element_type,$regs))

+    if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs))

     {

         $element = $subelement = $regs[1];

         $module 	= $regs[2];

     }

 

     //print '<br>1. element : '.$element.' - module : '.$module .'<br>';

-    if ( preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))

+    if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))

     {

         $module = $element = $regs[1];

         $subelement = $regs[2];

     }

 

     // For compat

-    if($element_type == "action") {

+    if ($element_type == "action") {

         $classpath = 'comm/action/class';

         $subelement = 'Actioncomm';

         $module = 'agenda';

@@ -2053,18 +2053,18 @@ 
     // To work with non standard path

     if ($element_type == 'facture' || $element_type == 'invoice') {

         $classpath = 'compta/facture/class';

-        $module='facture';

-        $subelement='facture';

+        $module = 'facture';

+        $subelement = 'facture';

     }

     if ($element_type == 'commande' || $element_type == 'order') {

         $classpath = 'commande/class';

-        $module='commande';

-        $subelement='commande';

+        $module = 'commande';

+        $subelement = 'commande';

     }

-    if ($element_type == 'propal')  {

+    if ($element_type == 'propal') {

         $classpath = 'comm/propal/class';

     }

-    if ($element_type == 'supplier_proposal')  {

+    if ($element_type == 'supplier_proposal') {

         $classpath = 'supplier_proposal/class';

     }

     if ($element_type == 'shipping') {

@@ -2079,45 +2079,45 @@ 
     }

     if ($element_type == 'contract') {

         $classpath = 'contrat/class';

-        $module='contrat';

-        $subelement='contrat';

+        $module = 'contrat';

+        $subelement = 'contrat';

     }

     if ($element_type == 'member') {

         $classpath = 'adherents/class';

-        $module='adherent';

-        $subelement='adherent';

+        $module = 'adherent';

+        $subelement = 'adherent';

     }

     if ($element_type == 'cabinetmed_cons') {

         $classpath = 'cabinetmed/class';

-        $module='cabinetmed';

-        $subelement='cabinetmedcons';

+        $module = 'cabinetmed';

+        $subelement = 'cabinetmedcons';

     }

     if ($element_type == 'fichinter') {

         $classpath = 'fichinter/class';

-        $module='ficheinter';

-        $subelement='fichinter';

+        $module = 'ficheinter';

+        $subelement = 'fichinter';

     }

     if ($element_type == 'dolresource' || $element_type == 'resource') {

         $classpath = 'resource/class';

-        $module='resource';

-        $subelement='dolresource';

+        $module = 'resource';

+        $subelement = 'dolresource';

     }

     if ($element_type == 'propaldet') {

         $classpath = 'comm/propal/class';

-        $module='propal';

-        $subelement='propaleligne';

+        $module = 'propal';

+        $subelement = 'propaleligne';

     }

-    if ($element_type == 'order_supplier')  {

+    if ($element_type == 'order_supplier') {

         $classpath = 'fourn/class';

-        $module='fournisseur';

-        $subelement='commandefournisseur';

-        $classfile='fournisseur.commande';

+        $module = 'fournisseur';

+        $subelement = 'commandefournisseur';

+        $classfile = 'fournisseur.commande';

     }

-    if ($element_type == 'invoice_supplier')  {

+    if ($element_type == 'invoice_supplier') {

         $classpath = 'fourn/class';

-        $module='fournisseur';

-        $subelement='facturefournisseur';

-        $classfile='fournisseur.facture';

+        $module = 'fournisseur';

+        $subelement = 'facturefournisseur';

+        $classfile = 'fournisseur.facture';

     }

 

     if (!isset($classfile)) $classfile = strtolower($subelement);

@@ -2144,10 +2144,10 @@ 
  * @param	ref     	$element_ref 	Element ref (Use this if element_id but not both)

  * @return 	int|object 					object || 0 || -1 if error

  */

-function fetchObjectByElement($element_id, $element_type, $element_ref='')

+function fetchObjectByElement($element_id, $element_type, $element_ref = '')

 {

     global $conf;

-	global $db,$conf;

+	global $db, $conf;

 

     $element_prop = getElementProperties($element_type);

     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)

@@ -2174,11 +2174,11 @@ 
  *  @return	string						RGB hex value (without # before). For example: 'FF00FF', '01FF02'

  *  @see	colorStringToArray

  */

-function colorArrayToHex($arraycolor,$colorifnotfound='888888')

+function colorArrayToHex($arraycolor, $colorifnotfound = '888888')

 {

-	if (! is_array($arraycolor)) return $colorifnotfound;

+	if (!is_array($arraycolor)) return $colorifnotfound;

 	if (empty($arraycolor)) return $colorifnotfound;

-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));

+	return sprintf("%02s", dechex($arraycolor[0])).sprintf("%02s", dechex($arraycolor[1])).sprintf("%02s", dechex($arraycolor[2]));

 }

 

 /**

@@ -2193,15 +2193,15 @@ 
  */

 static function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))

     {

-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is

-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);

-	if (! $tmp)

+	if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is

+	$tmp = preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/', $stringcolor, $reg);

+	if (!$tmp)

 	{

-		$tmp=explode(',',$stringcolor);

+		$tmp = explode(',', $stringcolor);

 		if (count($tmp) < 3) return $colorifnotfound;

 		return $tmp;

 	}

-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));

+	return array(hexdec($reg[1]), hexdec($reg[2]), hexdec($reg[3]));

 }

 

 /**

@@ -2221,8 +2221,8 @@ 
     foreach ($input as $key => $values) {

         $append = array();

 

-        foreach($result as $product) {

-            foreach($values as $item) {

+        foreach ($result as $product) {

+            foreach ($values as $item) {

                 $product[$key] = $item;

                 $append[] = $product;

             }

@@ -2243,8 +2243,8 @@ 
  */

 function getModuleDirForApiClass($module)

 {

-    $moduledirforclass=$module;

-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);

+    $moduledirforclass = $module;

+    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);

 

     if ($module == 'contracts') {

     	$moduledirforclass = 'contrat';

@@ -2320,9 +2320,9 @@ 
  * @param	$max	int	Between 0 and 255

  * @return String

  */

-function random_color_part($min=0,$max=255)

+function random_color_part($min = 0, $max = 255)

 {

-    return str_pad( dechex( mt_rand( $min, $max) ), 2, '0', STR_PAD_LEFT);

+    return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);

 }

 

 /*

@@ -2332,8 +2332,8 @@ 
  * @param	$max	int	Between 0 and 255

  * @return String

  */

-function random_color($min=0, $max=255)

+function random_color($min = 0, $max = 255)

 {

-    return random_color_part($min, $max) . random_color_part($min, $max) . random_color_part($min, $max);

+    return random_color_part($min, $max).random_color_part($min, $max).random_color_part($min, $max);

 }

 }

Braces +726 added lines, -379 removed lines

@@ -59,8 +59,7 @@ 
                 $entity = "&#". $unicode . ';';

                 $decodedStr .= utf8_encode($entity);

                 $pos += 4;

-            }

-            else {

+            } else {

                 // we have an escaped ascii character

                 $hexVal = substr($source, $pos, 2);

                 $decodedStr .= chr(hexdec($hexVal));

@@ -101,7 +100,10 @@ 
         {

             while (($file = readdir($handle))!==false)

             {

-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.

+                if (preg_match('/disabled/',$file)) {
+                    continue;
+                }
+                // We discard module if it contains disabled into name.

 

                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')

                 {

@@ -133,8 +135,14 @@ 
     	$outputlangs=$langs;

     }

 

-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada

-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US

+    if ($outputlangs->defaultlang == 'ca_CA') {
+        $selected='CAP4';
+    }
+    // Canada

+    if ($outputlangs->defaultlang == 'en_US') {
+        $selected='USLetter';
+    }
+    // US

     return $selected;

 }

 

@@ -159,29 +167,42 @@ 
         {

             $content=file_get_contents($formfile);

             $isutf8=utf8_check($content);

-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);

-            else print $content;

+            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                print utf8_encode($content);
+            } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                print utf8_decode($content);
+            } else {
+                print $content;
+            }
             return true;

-        }

-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);

+        } else {
+            dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+        }
 

         if ($searchalt) {

             // Test si fichier dans repertoire de la langue alternative

-            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;

-            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;

+            if ($langs->defaultlang != "en_US") {
+                $formfilealt = $searchdir."/langs/en_US/".$filename;
+            } else {
+                $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            }
             dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);

             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);

             if (is_readable($formfilealt))

             {

                 $content=file_get_contents($formfilealt);

                 $isutf8=utf8_check($content);

-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

-                elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);

-                else print $content;

+                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                    print utf8_encode($content);
+                } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                    print utf8_decode($content);
+                } else {
+                    print $content;
+                }
                 return true;

-            }

-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);

+            } else {
+                dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+            }
         }

     }

 

@@ -211,279 +232,460 @@ 
     $deltadateforuser=round($deltadateforclient-$deltadateforserver);

     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;

 

-    if ($usetable) print '<table class="border centpercent">';

+    if ($usetable) {
+        print '<table class="border centpercent">';
+    }
 

     // Import key

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ImportedWithSet");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print $object->import_key;

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User creation (old method using already loaded object and not id is kept for backward compatibility)

     if (! empty($object->user_creation) || ! empty($object->user_creation_id))

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("CreatedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_creation))

         {

-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

-        }

-        else

+        	if ($object->user_creation->id) {
+        	    print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);

-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
         }

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date creation

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateCreation");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_creation, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User change (old method using already loaded object and not id is kept for backward compatibility)

     if (! empty($object->user_modification) || ! empty($object->user_modification_id))

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ModifiedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_modification))

         {

-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

-        }

-        else

+        	if ($object->user_modification->id) {
+        	    print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);

-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
         }

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date change

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastModification");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_modification, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User validation (old method using already loaded object and not id is kept for backward compatibility)

     if (! empty($object->user_validation) || ! empty($object->user_validation_id))

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ValidatedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_validation))

         {

-            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

-        }

-        else

+            if ($object->user_validation->id) {
+                print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date validation

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateValidation");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_validation, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User approve (old method using already loaded object and not id is kept for backward compatibility)

     if (! empty($object->user_approve) || ! empty($object->user_approve_id))

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_approve))

         {

-            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

-        }

-        else

+            if ($object->user_approve->id) {
+                print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date approve

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User approve

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         $userstatic=new User($db);

         $userstatic->fetch($object->user_approve_id2);

-        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        else print $langs->trans("Unknown");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($userstatic->id) {
+            print $userstatic->getNomUrl(1, '', 0, 0, 0);
+        } else {
+            print $langs->trans("Unknown");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date approve

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove2");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve2, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User close

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ClosedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_cloture))

         {

-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

-        }

-        else

+			if ($object->user_cloture->id) {
+			    print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_cloture);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date close

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateClosing");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_cloture, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // User conciliate

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ConciliatedBy");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_rappro))

         {

-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

-        }

-        else

+			if ($object->user_rappro->id) {
+			    print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else

         {

             $userstatic=new User($db);

             $userstatic->fetch($object->user_rappro);

-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

-        	else print $langs->trans("Unknown");

+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date conciliate

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateConciliating");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_rappro, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

     // Date send

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

     {

-        if ($usetable) print '<tr><td class="titlefield">';

+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastSend");

-        if ($usetable) print '</td><td>';

-        else print ': ';

+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_envoi, 'dayhour');

-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");

-        if ($usetable) print '</td></tr>';

-        else print '<br>';

+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }

 

-    if ($usetable) print '</table>';

-}

+    if ($usetable) {
+        print '</table>';
+    }
+    }

 

 

 /**

@@ -512,8 +714,7 @@ 
     if (checkdnsrr($domain, "MX"))

     {

         return true;

-    }

-    else

+    } else

     {

         return false;

     }

@@ -538,10 +739,14 @@ 
     $urlregex = '';

 

     // SCHEME

-    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";

+    if ($http) {
+        $urlregex .= "^(http:\/\/|https:\/\/)";
+    }
 

     // USER AND PASS

-    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";

+    if ($pass) {
+        $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    }
 

     // HOSTNAME OR IP

     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)

@@ -550,13 +755,21 @@ 
     //use only one of the above

 

     // PORT

-    if ($port) $urlregex .= "(\:[0-9]{2,5})";

+    if ($port) {
+        $urlregex .= "(\:[0-9]{2,5})";
+    }
     // PATH

-    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";

+    if ($path) {
+        $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    }
     // GET Query

-    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";

+    if ($query) {
+        $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    }
     // ANCHOR

-    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";

+    if ($anchor) {
+        $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    }
 

     // check

     if (preg_match('/'.$urlregex.'/i', $url))

@@ -604,9 +817,10 @@ 
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);

 

         return $CleanUrl;

+    } else {
+        return $url;
+    }
     }

-    else return $url;

-}

 

 

 

@@ -623,7 +837,9 @@ 
  */

 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)

 {

-	if(!isValidEmail($mail))return '';

+	if(!isValidEmail($mail)) {
+	    return '';
+	}
 	$tab = explode('@', $mail);

 	$tab2 = explode('.',$tab[1]);

 	$string_replace = '';

@@ -685,7 +901,9 @@ 
 function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')

 {

     $text='' ;

-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;

+    if($tableMarkup) {
+        $text = '<table '.$tableoptions.'>' ;
+    }
     foreach($data as $key => $item){

         if(is_array($item)){

             $text.=array2tr($item,$troptions,$tdoptions);

@@ -696,7 +914,9 @@ 
             $text.= '</tr>' ;

         }

     }

-    if($tableMarkup) $text.= '</table>' ;

+    if($tableMarkup) {
+        $text.= '</table>' ;
+    }
     return $text ;

 }

 

@@ -720,15 +940,25 @@ 
 {

     global $conf,$user;

 

-    if (! is_object($objsoc)) $valueforccc=$objsoc;

-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;

-    else $valueforccc=$objsoc->code_client;

+    if (! is_object($objsoc)) {
+        $valueforccc=$objsoc;
+    } else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) {
+        $valueforccc=$objsoc->code_fournisseur;
+    } else {
+        $valueforccc=$objsoc->code_client;
+    }
 

     $sharetable = $table;

-    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function

+    if ($table == 'facture' || $table == 'invoice') {
+        $sharetable = 'invoicenumber';
+    }
+    // for getEntity function

 

     // Clean parameters

-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers

+    if ($date == '') {
+        $date=dol_now();
+    }
+    // We use local year and month of PHP server to search numbers

     // but we should use local year and month of user

 

     // For debugging

@@ -745,8 +975,7 @@ 
         $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');

         $maskcounter=$reg[1];

         $hasglobalcounter=true;

-    }

-    else

+    } else

     {

         // setting some defaults so the rest of the code won't fail if there is a third party counter

         $masktri='00000';

@@ -756,7 +985,9 @@ 
     $maskraz=-1;

     $maskoffset=0;

     $resetEveryMonth=false;

-    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';

+    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 

     // Extract value for third party mask counter

     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))

@@ -768,9 +999,12 @@ 
         $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask

         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like

-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

-    }

-    else $maskrefclient='';

+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
+    }
 

     // fail if there is neither a global nor a third party counter

     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))

@@ -784,8 +1018,7 @@ 
         $masktype=$regType[1];

         $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)

         $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

-    }

-    else

+    } else

     {

     	$masktype='';

     	$masktype_value='';

@@ -795,13 +1028,14 @@ 
     if (preg_match('/\{(u+)\}/i',$mask,$regType))

     {

     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

-    	if (is_object($objuser)) $lastname = $objuser->lastname;

+    	if (is_object($objuser)) {
+    	    $lastname = $objuser->lastname;
+    	}
 

     	$maskuser=$regType[1];

     	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)

     	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask

-    }

-    else

+    } else

     {

     	$maskuser='';

     	$maskuser_value='';

@@ -848,8 +1082,12 @@ 
     //var_dump($reg);

 

     // If an offset is asked

-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);

+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 

     // Define $sqlwhere

     $sqlwhere='';

@@ -857,14 +1095,21 @@ 
     $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

 

     // If a restore to zero after a month is asked we check if there is already a value for this year.

-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);

+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    }
 

     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;

-    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)

-        $maskraz=$yearoffsettype; // For backward compatibility

-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))

-        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;

+    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {
+            $maskraz=$yearoffsettype;
+    }
+    // For backward compatibility

+    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) {
+            $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    }
     //print "maskraz=".$maskraz;	// -1=no reset

 

     if ($maskraz > 0) {   // A reset is required

@@ -872,23 +1117,28 @@ 
             $maskraz = date('m', $date);

             $resetEveryMonth = true;

         }

-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';

+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 

         // Define posy, posm and reg

-        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask

+        if ($maskraz > 1) {
+            // if reset is not first month, we need month and year into mask

         {

-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

-

-            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';

-        }

-        else // if reset is for a specific month in year, we need year

+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2;
+        }
+        $posm=3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else {
+                return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            }
+

+            if (dol_strlen($reg[$posy]) < 2) {
+                return 'ErrorCantUseRazWithYearOnOneDigit';
+            }
+        } else // if reset is for a specific month in year, we need year

         {

-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }

-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }

-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }

-            else return 'ErrorCantUseRazIfNoYearInMask';

+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; } else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; } else {
+                return 'ErrorCantUseRazIfNoYearInMask';
+            }
         }

         // Define length

         $yearlen = $posy?dol_strlen($reg[$posy]):0;

@@ -906,9 +1156,11 @@ 
         $monthcomp=$maskraz;

         $yearcomp=0;

 

-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+            // $yearoffsettype is - or +

         {

-        	$currentyear=date("Y", $date);

+        	$currentyear=date("Y", $date);
+        }
         	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);

         	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);

         	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);

@@ -918,21 +1170,32 @@ 
         	if ($date >= $fiscaldate)

         	{

         		// If before of next new year date

-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;

+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') {
+        		    $yearoffset=1;
+        		}
         	}

         	// If after or equal of current new year date

-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;

+        	else if ($date >= $newyeardate && $yearoffsettype == '-') {
+        	    $yearoffset=-1;
+        	}
         }

         // For backward compatibility

         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year

 

-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);

-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);

-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;

-        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)

+        if ($yearlen == 4) {
+            $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
+        } elseif ($yearlen == 2) {
+            $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
+        } elseif ($yearlen == 1) {
+            $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        }
+        if ($monthcomp > 1 && empty($resetEveryMonth)) {
+            // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)

         {

-            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);

-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);

+            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
+        } elseif ($yearlen == 2) {
+                $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+            }
 

             $sqlwhere.="(";

             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

@@ -941,13 +1204,11 @@ 
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";

             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

             $sqlwhere.=')';

-        }

-		else if ($resetEveryMonth)

+        } else if ($resetEveryMonth)

 		{

 			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

-		}

-        else   // reset is done on january

+		} else   // reset is done on january

         {

             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

         }

@@ -959,12 +1220,13 @@ 
     if (function_exists('mb_strrpos'))

     	{

     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');

-	}

-	else

+	} else

 	{

     	$posnumstart=strrpos($maskwithnocode,$maskcounter);

 	}	// Pos of counter in final string (from 0 to ...)

-    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';

+    if ($posnumstart < 0) {
+        return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    }
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';

 

     // Define $maskLike

@@ -977,9 +1239,15 @@ 
     $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);

     $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);

     $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);

-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);

-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);

-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

+    if ($maskrefclient) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+    }
+    if ($masktype) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+    }
+    if ($maskuser) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    }
     foreach($maskperso as $key => $val)

     {

     	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);

@@ -991,12 +1259,18 @@ 
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;

     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

 	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";

-    if ($bentityon) // only if entity enable

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

-    else if (! empty($forceentity))

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

-    if ($where) $sql.=$where;

-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;

+    if ($bentityon) {
+        // only if entity enable

+    	$sql.= " AND entity IN (".getEntity($sharetable).")";
+    } else if (! empty($forceentity)) {
+        	$sql.= " AND entity IN (".$forceentity.")";
+    }
+    if ($where) {
+        $sql.=$where;
+    }
+    if ($sqlwhere) {
+        $sql.=' AND '.$sqlwhere;
+    }
 

     //print $sql.'<br>';

     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

@@ -1005,21 +1279,26 @@ 
     {

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

         $counter = $obj->val;

-    }

-    else dol_print_error($db);

+    } else {
+        dol_print_error($db);
+    }
 

     // Check if we must force counter to maskoffset

-    if (empty($counter)) $counter=$maskoffset;

-    else if (preg_match('/[^0-9]/i',$counter))

+    if (empty($counter)) {
+        $counter=$maskoffset;
+    } else if (preg_match('/[^0-9]/i',$counter))

     {

     	$counter=0;

     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

-    }

-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;

+    } else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+        $counter=$maskoffset;
+    }
 

-    if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.

+    if ($mode == 'last') {
+        // We found value for counter = last counter value. Now need to get corresponding ref of invoice.

     {

-        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);

+        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+    }
 

         // Define $maskLike

         $maskLike = dol_string_nospecial($mask);

@@ -1031,34 +1310,48 @@ 
         $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);

         $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);

         $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);

-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);

-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);

-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);

+        if ($maskrefclient) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+        }
+        if ($masktype) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+        }
+        if ($maskuser) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        }
 

         $ref='';

         $sql = "SELECT ".$field." as ref";

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

         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";

     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";

-    	if ($bentityon) // only if entity enable

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

-        else if (! empty($forceentity))

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

-        if ($where) $sql.=$where;

-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;

+    	if ($bentityon) {
+    	    // only if entity enable

+        	$sql.= " AND entity IN (".getEntity($sharetable).")";
+    	} else if (! empty($forceentity)) {
+                	$sql.= " AND entity IN (".$forceentity.")";
+        }
+        if ($where) {
+            $sql.=$where;
+        }
+        if ($sqlwhere) {
+            $sql.=' AND '.$sqlwhere;
+        }
 

         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

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

         if ($resql)

         {

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

-            if ($obj) $ref = $obj->ref;

-        }

-        else dol_print_error($db);

+            if ($obj) {
+                $ref = $obj->ref;
+            }
+        } else {
+            dol_print_error($db);
+        }
 

         $numFinal=$ref;

-    }

-    else if ($mode == 'next')

+    } else if ($mode == 'next')

     {

         $counter++;

 

@@ -1074,7 +1367,9 @@ 
 

             // Define $sqlstring

             $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)

-            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';

+            if ($maskrefclient_posnumstart <= 0) {
+                return 'ErrorBadMask';
+            }
             $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';

             //print "x".$sqlstring;

 

@@ -1096,12 +1391,20 @@ 
             $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;

             //$sql.= " WHERE ".$field." not like '(%'";

             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

-            if ($bentityon) // only if entity enable

-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";

-            else if (! empty($forceentity))

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

-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask

-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask

+            if ($bentityon) {
+                // only if entity enable

+            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
+            } else if (! empty($forceentity)) {
+                        	$sql.= " AND entity IN (".$forceentity.")";
+            }
+            if ($where) {
+                $maskrefclient_sql.=$where;
+            }
+            //use the same optional where as general mask

+            if ($sqlwhere) {
+                $maskrefclient_sql.=' AND '.$sqlwhere;
+            }
+            //use the same sqlwhere as general mask

             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

 

             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);

@@ -1110,10 +1413,13 @@ 
             {

                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);

                 $maskrefclient_counter = $maskrefclient_obj->val;

-            }

-            else dol_print_error($db);

+            } else {
+                dol_print_error($db);
+            }
 

-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;

+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) {
+                $maskrefclient_counter=$maskrefclient_maskoffset;
+            }
 			$maskrefclient_counter++;

         }

 

@@ -1121,13 +1427,14 @@ 
         $numFinal = $mask;

 

         // We replace special codes except refclient

-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

+		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+		    // yearoffsettype is - or +, so we don't want current year

 		{

-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);

+	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+		}
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);

         	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);

-		}

-		else	// we want yyyy to be current year

+		} else	// we want yyyy to be current year

 		{

         	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);

         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);

@@ -1184,7 +1491,9 @@ 
 {

     $string = " ".$string;

      $ini = strpos($string,$start);

-     if ($ini == 0) return "";

+     if ($ini == 0) {
+         return "";
+     }
      $ini += strlen($start);

      $len = strpos($string,$end,$ini) - $ini;

      return substr($string,$ini,$len);

@@ -1208,8 +1517,7 @@ 
         $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');

         $maskcounter=$reg[1];

         $hasglobalcounter=true;

-    }

-    else

+    } else

     {

         // setting some defaults so the rest of the code won't fail if there is a third party counter

         $masktri='00000';

@@ -1218,7 +1526,9 @@ 
 

     $maskraz=-1;

     $maskoffset=0;

-    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

+    if (dol_strlen($maskcounter) < 3) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 

     // Extract value for third party mask counter

     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))

@@ -1230,9 +1540,12 @@ 
         $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode

         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like

-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

-    }

-    else $maskrefclient='';

+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
+    }
 

     // fail if there is neither a global nor a third party counter

     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))

@@ -1254,21 +1567,35 @@ 
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

 

     // If an offset is asked

-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);

+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 

     // Define $sqlwhere

 

     // If a restore to zero after a month is asked we check if there is already a value for this year.

-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);

-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);

+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $maskraz=preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $maskraz=preg_replace('/^@/','',$reg[3]);
+    }
     if ($maskraz >= 0)

     {

-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';

+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 

         // Define reg

-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';

+        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        }
+        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazIfNoYearInMask';
+        }
         //print "x".$maskwithonlyymcode." ".$maskraz;

     }

     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

@@ -1278,7 +1605,9 @@ 
 

     // Check length

     $len=dol_strlen($maskwithnocode);

-    if (dol_strlen($value) != $len) $result=-1;

+    if (dol_strlen($value) != $len) {
+        $result=-1;
+    }
 

     // Define $maskLike

     /* seems not used

@@ -1359,29 +1688,37 @@ 
      */

 

     // Definition du Jeudi de la semaine

-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;

-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;

-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;

-    else // Jeudi

-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);

+    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) {
+        // Dimanche

+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) {
+        // du Lundi au Mercredi

+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) {
+        // du Vendredi au Samedi

+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
+    } else {
+        // Jeudi

+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    }
 

     // Definition du premier Jeudi de l'annee

-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche

+    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) {
+        // Dimanche

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;

-    }

-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi

+        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
+    }
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) {
+        // du Lundi au Mercredi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;

-    }

-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi

+        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
+    }
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) {
+        // du Vendredi au Samedi

     {

-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;

-    }

-    else // Jeudi

+        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
+    }
+    } else // Jeudi

     {

         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));

     }

@@ -1402,8 +1739,7 @@ 
         if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))

         {

             $numeroSemaine = 53;

-        }

-        else

+        } else

         {

             $numeroSemaine = 1;

         }

@@ -1462,7 +1798,9 @@ 
 function dol_set_user_param($db, $conf, &$user, $tab)

 {

     // Verification parametres

-    if (count($tab) < 1) return -1;

+    if (count($tab) < 1) {
+        return -1;
+    }
 

     $db->begin();

 

@@ -1474,7 +1812,9 @@ 
     $i=0;

     foreach ($tab as $key => $value)

     {

-        if ($i > 0) $sql.=',';

+        if ($i > 0) {
+            $sql.=',';
+        }
         $sql.="'".$db->escape($key)."'";

         $i++;

     }

@@ -1508,8 +1848,7 @@ 
             }

             $user->conf->$key = $value;

             //print "key=".$key." user->conf->key=".$user->conf->$key;

-        }

-        else

+        } else

         {

             unset($user->conf->$key);

         }

@@ -1532,8 +1871,7 @@ 
     if ($reduction == 100)

     {

         $string = $langs->transnoentities("Offered");

-    }

-    else

+    } else

     {

     	$string = vatrate($reduction,true);

     }

@@ -1620,9 +1958,11 @@ 
 

             // If this generation module needs to scan a directory, then description field is filled

             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).

-            if (! empty($obj->description))	// A list of directories to scan is defined

+            if (! empty($obj->description)) {
+                // A list of directories to scan is defined

             {

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

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            }
 

                 $const=$obj->description;

                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

@@ -1641,7 +1981,9 @@ 
                     {

 			// all type of template is allowed

 			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);

+                        if (count($tmpfiles)) {
+                            $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        }
                     }

                 }

 

@@ -1652,40 +1994,41 @@ 
                         $max=($maxfilenamelength?$maxfilenamelength:28);

                         $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');

                     }

-                }

-                else

+                } else

                 {

                     $liste[0]=$obj->label.': '.$langs->trans("None");

                 }

-            }

-            else

+            } else

             {

-                if ($type == 'member' && $obj->lib == 'standard')   // Special case, if member template, we add variant per format

+                if ($type == 'member' && $obj->lib == 'standard') {
+                    // Special case, if member template, we add variant per format

                 {

-                    global $_Avery_Labels;

+                    global $_Avery_Labels;
+                }
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';

                     foreach($_Avery_Labels as $key => $val)

                     {

                         $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];

                     }

-                }

-                else    // Common usage

+                } else    // Common usage

                 {

                     $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;

                 }

             }

             $i++;

         }

-    }

-    else

+    } else

     {

         dol_print_error($db);

         return -1;

     }

 

-    if ($found) return $liste;

-    else return 0;

-}

+    if ($found) {
+        return $liste;
+    } else {
+        return 0;
+    }
+    }

 

 /**

  * This function evaluates a string that should be a valid IPv4

@@ -1700,10 +2043,14 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {

 

 		// Then we test if it is a private range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+		    return 2;
+		}
 

 		// Then we test if it is a reserved range

-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {
+		    return 0;
+		}
 

 		return 1;

 	}

@@ -1756,8 +2103,7 @@ 
                       'proxy_password' => $proxypass,

                       'trace'		   => 1

         );

-    }

-    else

+    } else

     {

         $params=array('connection_timeout'=>$timeout,

                       'response_timeout'=>$response_timeout,

@@ -1864,14 +2210,12 @@ 
 		$classname='FactureFournisseur';

 		$classpath = 'fourn/class';

 		$module='fournisseur';

-	}

-	elseif ($objecttype == 'order_supplier')   {

+	} elseif ($objecttype == 'order_supplier')   {

 		$classfile = 'fournisseur.commande';

 		$classname='CommandeFournisseur';

 		$classpath = 'fourn/class';

 		$module='fournisseur';

-	}

-	elseif ($objecttype == 'stock')   {

+	} elseif ($objecttype == 'stock')   {

 		$classpath = 'product/stock/class';

 		$classfile='entrepot';

 		$classname='Entrepot';

@@ -1891,8 +2235,9 @@ 
 					$ret=$langs->trans('Deleted');

 				}

 				unset($object);

-			}

-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);

+			} else {
+			    dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			}
 		}

 	}

 	return $ret;

@@ -1924,11 +2269,12 @@ 
 		{

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

 			$listofid[]=$obj->rowid;

-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;

+			if ($obj->parent_id > 0) {
+			    $listofparentid[$obj->rowid]=$obj->parent_id;
+			}
 			$i++;

 		}

-	}

-	else

+	} else

 	{

 		dol_print_error($db);

 	}

@@ -1963,9 +2309,11 @@ 
 			while ($cursor > 0)

 			{

 				$arrayidparsed[$cursor]=1;

-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child

+				if ($arrayidparsed[$listofparentid[$cursor]]) {
+				    // We detect a loop. A record with a parent that was already into child

 				{

-					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';

+					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+				}
 					unset($arrayidparsed);

 					$listofidtoclean[$cursor]=$id;

 					break;

@@ -1973,7 +2321,9 @@ 
 				$cursor=$listofparentid[$cursor];

 			}

 

-			if (count($listofidtoclean)) break;

+			if (count($listofidtoclean)) {
+			    break;
+			}
 		}

 

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

@@ -2120,9 +2470,15 @@ 
         $classfile='fournisseur.facture';

     }

 

-    if (!isset($classfile)) $classfile = strtolower($subelement);

-    if (!isset($classname)) $classname = ucfirst($subelement);

-    if (!isset($classpath)) $classpath = $module.'/class';

+    if (!isset($classfile)) {
+        $classfile = strtolower($subelement);
+    }
+    if (!isset($classname)) {
+        $classname = ucfirst($subelement);
+    }
+    if (!isset($classpath)) {
+        $classpath = $module.'/class';
+    }
 

     $element_properties = array(

         'module' => $module,

@@ -2176,8 +2532,12 @@ 
  */

 function colorArrayToHex($arraycolor,$colorifnotfound='888888')

 {

-	if (! is_array($arraycolor)) return $colorifnotfound;

-	if (empty($arraycolor)) return $colorifnotfound;

+	if (! is_array($arraycolor)) {
+	    return $colorifnotfound;
+	}
+	if (empty($arraycolor)) {
+	    return $colorifnotfound;
+	}
 	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));

 }

 

@@ -2193,12 +2553,17 @@ 
  */

 static function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))

     {

-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is

+	if (is_array($stringcolor)) {
+	    return $stringcolor;
+	}
+	// If already into correct output format, we return as is

 	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);

 	if (! $tmp)

 	{

 		$tmp=explode(',',$stringcolor);

-		if (count($tmp) < 3) return $colorifnotfound;

+		if (count($tmp) < 3) {
+		    return $colorifnotfound;
+		}
 		return $tmp;

 	}

 	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));

@@ -2244,69 +2609,51 @@ 
 function getModuleDirForApiClass($module)

 {

     $moduledirforclass=$module;

-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);

+    if ($moduledirforclass != 'api') {
+        $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    }
 

     if ($module == 'contracts') {

     	$moduledirforclass = 'contrat';

-    }

-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {

+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {

         $moduledirforclass = 'api';

-    }

-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {

+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {

         $moduledirforclass = 'societe';

-    }

-    elseif ($module == 'propale' || $module == 'proposals') {

+    } elseif ($module == 'propale' || $module == 'proposals') {

         $moduledirforclass = 'comm/propal';

-    }

-    elseif ($module == 'agenda' || $module == 'agendaevents') {

+    } elseif ($module == 'agenda' || $module == 'agendaevents') {

         $moduledirforclass = 'comm/action';

-    }

-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {

+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {

         $moduledirforclass = 'adherents';

-    }

-    elseif ($module == 'banque' || $module == 'bankaccounts') {

+    } elseif ($module == 'banque' || $module == 'bankaccounts') {

         $moduledirforclass = 'compta/bank';

-    }

-    elseif ($module == 'category' || $module == 'categorie') {

+    } elseif ($module == 'category' || $module == 'categorie') {

         $moduledirforclass = 'categories';

-    }

-    elseif ($module == 'order' || $module == 'orders') {

+    } elseif ($module == 'order' || $module == 'orders') {

         $moduledirforclass = 'commande';

-    }

-    elseif ($module == 'shipments') {

+    } elseif ($module == 'shipments') {

     	$moduledirforclass = 'expedition';

-    }

-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {

+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {

         $moduledirforclass = 'compta/facture';

-    }

-    elseif ($module == 'products') {

+    } elseif ($module == 'products') {

         $moduledirforclass = 'product';

-    }

-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {

+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {

         $moduledirforclass = 'projet';

-    }

-    elseif ($module == 'task') {

+    } elseif ($module == 'task') {

         $moduledirforclass = 'projet';

-    }

-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {

+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {

         $moduledirforclass = 'product/stock';

-    }

-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {

+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {

     	$moduledirforclass = 'supplier_proposal';

-    }

-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {

+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {

         $moduledirforclass = 'fourn';

-    }

-    elseif ($module == 'expensereports') {

+    } elseif ($module == 'expensereports') {

         $moduledirforclass = 'expensereport';

-    }

-    elseif ($module == 'users') {

+    } elseif ($module == 'users') {

         $moduledirforclass = 'user';

-    }

-    elseif ($module == 'ficheinter' || $module == 'interventions') {

+    } elseif ($module == 'ficheinter' || $module == 'interventions') {

     	$moduledirforclass = 'fichinter';

-    }

-    elseif ($module == 'tickets') {

+    } elseif ($module == 'tickets') {

     	$moduledirforclass = 'ticket';

     }

 

Helpers/NoValeConfig.php

Indentation +41 added lines, -41 removed lines

@@ -57,11 +57,11 @@ 
 {

     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);

 

-	if ($db->error)

-	{

-		dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);

-		exit;

-	}

+    if ($db->error)

+    {

+        dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);

+        exit;

+    }

 }

 

 // Now database connexion is known, so we can forget password

@@ -80,19 +80,19 @@ 
 // By default conf->entity is 1, but we change this if we ask another value.

 if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session

 {

-	$conf->entity = $_SESSION["dol_entity"];

+    $conf->entity = $_SESSION["dol_entity"];

 }

 else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script

 {

-	$conf->entity = $_ENV["dol_entity"];

+    $conf->entity = $_ENV["dol_entity"];

 }

 else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page

 {

-	$conf->entity = GETPOST("entity",'int');

+    $conf->entity = GETPOST("entity",'int');

 }

 else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module

 {

-	$conf->entity = DOLENTITY;

+    $conf->entity = DOLENTITY;

 }

 

 // Sanitize entity

@@ -100,16 +100,16 @@ 
 

 if (! defined('NOREQUIREDB'))

 {

-	//print "Will work with data into entity instance number '".$conf->entity."'";

+    //print "Will work with data into entity instance number '".$conf->entity."'";

 

-	// Here we read database (llx_const table) and define $conf->global->XXX var.

-	$conf->setValues($db);

+    // Here we read database (llx_const table) and define $conf->global->XXX var.

+    $conf->setValues($db);

 }

 

 // Overwrite database value

 if (! empty($conf->file->mailing_limit_sendbyweb))

 {

-	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;

+    $conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;

 }

 if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))

 {

@@ -127,41 +127,41 @@ 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.

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

 {

-	$ok=0;

-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)

-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)

-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)

-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin

-	if (! $ok)

-	{

-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

-		{

-			print 'Sorry, your application is offline.'."\n";

-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl=DOL_URL_ROOT.'/user/logout.php';

-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

-		}

-		else

-		{

-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl=DOL_URL_ROOT.'/';

-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

-		}

-		exit;

-	}

+    $ok=0;

+    if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

+    elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)

+    elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)

+    elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)

+    elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin

+    if (! $ok)

+    {

+        if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

+        {

+            print 'Sorry, your application is offline.'."\n";

+            print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

+            $nexturl=DOL_URL_ROOT.'/user/logout.php';

+            print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

+        }

+        else

+        {

+            print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

+            $nexturl=DOL_URL_ROOT.'/';

+            print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

+        }

+        exit;

+    }

 }

 

 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.

 if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))

 {

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

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

 

-	$mysoc=new Societe($db);

-	$mysoc->setMysoc($conf);

+    $mysoc=new Societe($db);

+    $mysoc->setMysoc($conf);

 

-	// For some countries, we need to invert our address with customer address

-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;

+    // For some countries, we need to invert our address with customer address

+    if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;

 }

 

 

Spacing +34 added lines, -34 removed lines

@@ -32,7 +32,7 @@ 
  * 				This script reads the conf file, init $lang, $db and and empty $user

  */

 

-require_once 'filefunc.inc.php';	// May have been already require by main.inc.php. But may not by scripts.

+require_once 'filefunc.inc.php'; // May have been already require by main.inc.php. But may not by scripts.

 

 

 

@@ -44,29 +44,29 @@ 
 

 

 // Chargement des includes principaux de librairies communes

-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory

-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';

-if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';

+if (!defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; // Need 500ko memory

+if (!defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';

+if (!defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

 

 

 

 /*

  * Object $db

  */

-if (! defined('NOREQUIREDB'))

+if (!defined('NOREQUIREDB'))

 {

-    $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);

+    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);

 

 	if ($db->error)

 	{

-		dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);

+		dol_print_error($db, "host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);

 		exit;

 	}

 }

 

 // Now database connexion is known, so we can forget password

 //unset($dolibarr_main_db_pass); 	// We comment this because this constant is used in a lot of pages

-unset($conf->db->pass);				// This is to avoid password to be shown in memory/swap dump

+unset($conf->db->pass); // This is to avoid password to be shown in memory/swap dump

 

 /*

  * Object $user

@@ -78,17 +78,17 @@ 
  */

 

 // By default conf->entity is 1, but we change this if we ask another value.

-if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session

+if (session_id() && !empty($_SESSION["dol_entity"]))			// Entity inside an opened session

 {

 	$conf->entity = $_SESSION["dol_entity"];

 }

-else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script

+else if (!empty($_ENV["dol_entity"]))							// Entity inside a CLI script

 {

 	$conf->entity = $_ENV["dol_entity"];

 }

-else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page

+else if (isset($_POST["loginfunction"]) && GETPOST("entity", 'int'))	// Just after a login page

 {

-	$conf->entity = GETPOST("entity",'int');

+	$conf->entity = GETPOST("entity", 'int');

 }

 else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module

 {

@@ -96,9 +96,9 @@ 
 }

 

 // Sanitize entity

-if (! is_numeric($conf->entity)) $conf->entity=1;

+if (!is_numeric($conf->entity)) $conf->entity = 1;

 

-if (! defined('NOREQUIREDB'))

+if (!defined('NOREQUIREDB'))

 {

 	//print "Will work with data into entity instance number '".$conf->entity."'";

 

@@ -107,7 +107,7 @@ 
 }

 

 // Overwrite database value

-if (! empty($conf->file->mailing_limit_sendbyweb))

+if (!empty($conf->file->mailing_limit_sendbyweb))

 {

 	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;

 }

@@ -115,7 +115,7 @@ 
 {

     $conf->global->MAILING_LIMIT_SENDBYWEB = 25;

 }

-if (! empty($conf->file->mailing_limit_sendbycli))

+if (!empty($conf->file->mailing_limit_sendbycli))

 {

     $conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;

 }

@@ -125,27 +125,27 @@ 
 }

 

 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.

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

+if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))

 {

-	$ok=0;

-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)

-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)

-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)

-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin

-	if (! $ok)

+	$ok = 0;

+	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)

+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)

+	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)

+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)

+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin

+	if (!$ok)

 	{

 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

 		{

 			print 'Sorry, your application is offline.'."\n";

 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl=DOL_URL_ROOT.'/user/logout.php';

+			$nexturl = DOL_URL_ROOT.'/user/logout.php';

 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

 		}

 		else

 		{

 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl=DOL_URL_ROOT.'/';

+			$nexturl = DOL_URL_ROOT.'/';

 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

 		}

 		exit;

@@ -153,28 +153,28 @@ 
 }

 

 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.

-if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))

+if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))

 {

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

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

 

-	$mysoc=new Societe($db);

+	$mysoc = new Societe($db);

 	$mysoc->setMysoc($conf);

 

 	// For some countries, we need to invert our address with customer address

-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;

+	if ($mysoc->country_code == 'DE' && !isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;

 }

 

 

 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)

-if (! defined('NOREQUIRETRAN'))

+if (!defined('NOREQUIRETRAN'))

 {

-    $langcode=(GETPOST('lang','aZ09')?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));

-    if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');

+    $langcode = (GETPOST('lang', 'aZ09') ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));

+    if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');

     $langs->setDefaultLang($langcode);

 }

 

 

 

 

-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');

+if (!defined('MAIN_LABEL_MENTION_NPR')) define('MAIN_LABEL_MENTION_NPR', 'NPR');

 

Braces +60 added lines, -26 removed lines

@@ -44,9 +44,16 @@ 
 

 

 // Chargement des includes principaux de librairies communes

-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory

-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';

-if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';

+if (! defined('NOREQUIREUSER')) {
+    require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+}
+// Need 500ko memory

+if (! defined('NOREQUIRETRAN')) {
+    require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
+}
+if (! defined('NOREQUIRESOC')) {
+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+}
 

 

 

@@ -78,25 +85,32 @@ 
  */

 

 // By default conf->entity is 1, but we change this if we ask another value.

-if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session

+if (session_id() && ! empty($_SESSION["dol_entity"])) {
+    // Entity inside an opened session

 {

-	$conf->entity = $_SESSION["dol_entity"];

-}

-else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script

+	$conf->entity = $_SESSION["dol_entity"];
+}
+} else if (! empty($_ENV["dol_entity"])) {
+    // Entity inside a CLI script

 {

-	$conf->entity = $_ENV["dol_entity"];

-}

-else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page

+	$conf->entity = $_ENV["dol_entity"];
+}
+} else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int')) {
+    // Just after a login page

 {

-	$conf->entity = GETPOST("entity",'int');

-}

-else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module

+	$conf->entity = GETPOST("entity",'int');
+}
+} else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+    // For public page with MultiCompany module

 {

-	$conf->entity = DOLENTITY;

+	$conf->entity = DOLENTITY;
+}
 }

 

 // Sanitize entity

-if (! is_numeric($conf->entity)) $conf->entity=1;

+if (! is_numeric($conf->entity)) {
+    $conf->entity=1;
+}
 

 if (! defined('NOREQUIREDB'))

 {

@@ -128,11 +142,26 @@ 
 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))

 {

 	$ok=0;

-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)

-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)

-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)

-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin

+	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) {
+	    $ok=1;
+	}
+	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	    $ok=1;
+	}
+	// We let working pages that is a login submission (login submit, to allow login by admin)

+	elseif (defined('NOREQUIREDB')) {
+	    $ok=1;
+	}
+	// We let working pages that don't need database access (xxx.css.php)

+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+	    $ok=1;
+	}
+	// We let working pages that ask to work even if only login enabled (logout.php)

+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	    $ok=1;
+	}
+	// We let working if user is allowed admin

 	if (! $ok)

 	{

 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

@@ -141,8 +170,7 @@ 
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

 			$nexturl=DOL_URL_ROOT.'/user/logout.php';

 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

-		}

-		else

+		} else

 		{

 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

 			$nexturl=DOL_URL_ROOT.'/';

@@ -161,20 +189,26 @@ 
 	$mysoc->setMysoc($conf);

 

 	// For some countries, we need to invert our address with customer address

-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;

-}

+	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+	    $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
+	}
+	}

 

 

 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)

 if (! defined('NOREQUIRETRAN'))

 {

     $langcode=(GETPOST('lang','aZ09')?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));

-    if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');

+    if (defined('MAIN_LANG_DEFAULT')) {
+        $langcode=constant('MAIN_LANG_DEFAULT');
+    }
     $langs->setDefaultLang($langcode);

 }

 

 

 

 

-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');

+if (! defined('MAIN_LABEL_MENTION_NPR') ) {
+    define('MAIN_LABEL_MENTION_NPR','NPR');
+}
 

Helpers/login/functions_ldap.php

Indentation +195 added lines, -195 removed lines

@@ -34,190 +34,190 @@ 
  */

 function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)

 {

-	global $db,$conf,$langs;

-	global $_POST;

-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;

-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;

-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;

-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;

-	global $dolibarr_main_auth_ldap_filter;

-	global $dolibarr_main_auth_ldap_debug;

-

-	// Force master entity in transversal mode

-	$entity=$entitytotest;

-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;

-

-	$login='';

-	$resultFetchUser='';

-

-	if (! function_exists("ldap_connect"))

-	{

-		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");

-		sleep(1);

-

-		// Load translation files required by the page

+    global $db,$conf,$langs;

+    global $_POST;

+    global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;

+    global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;

+    global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;

+    global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;

+    global $dolibarr_main_auth_ldap_filter;

+    global $dolibarr_main_auth_ldap_debug;

+

+    // Force master entity in transversal mode

+    $entity=$entitytotest;

+    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;

+

+    $login='';

+    $resultFetchUser='';

+

+    if (! function_exists("ldap_connect"))

+    {

+        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");

+        sleep(1);

+

+        // Load translation files required by the page

         $langs->loadLangs(array('main', 'other'));

 

-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");

-		return;

-	}

-

-	if ($usertotest)

-	{

-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);

-

-		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko

-		$ldaphost=$dolibarr_main_auth_ldap_host;

-		$ldapport=$dolibarr_main_auth_ldap_port;

-		$ldapversion=$dolibarr_main_auth_ldap_version;

-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);

-

-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;

-		$ldapdn=$dolibarr_main_auth_ldap_dn;

-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;

-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;

-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);

-

-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";

-

-		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';

-		$ldap=new Ldap();

-		$ldap->server=explode(',',$ldaphost);

-		$ldap->serverPort=$ldapport;

-		$ldap->ldapProtocolVersion=$ldapversion;

-		$ldap->serverType=$ldapservertype;

-		$ldap->searchUser=$ldapadminlogin;

-		$ldap->searchPassword=$ldapadminpass;

-

-		if ($ldapdebug)

-		{

-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);

-			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);

-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";

-			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";

-		}

-

-		$resultFetchLdapUser=0;

-

-		// Define $userSearchFilter

-		$userSearchFilter = "";

-		if (empty($dolibarr_main_auth_ldap_filter)) {

-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";

-		} else {

-			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);

-		}

-

-		// If admin login provided

-		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)

-		if ($ldapadminlogin)

-		{

-			$result=$ldap->connect_bind();

-			if ($result > 0)

-			{

-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);

-				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);

-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset

-				{

-					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');

-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";

-					$ldap->close();

-					sleep(1);

-					$langs->load('ldap');

-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);

-					return '';

-				}

-			}

-			else

-			{

-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";

-			}

-			$ldap->close();

-		}

-

-		// Forge LDAP user and password to test with them

-		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with

-		// admin login no exectued.

-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)

-		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have

-		// dn detected into ldapUserDN.

-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;

-		$ldap->searchPassword=$passwordtotest;

-

-		// Test with this->seachUser and this->searchPassword

-		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;

-		$result=$ldap->connect_bind();

-		if ($result > 0)

-		{

-			if ($result == 2)	// Connection is ok for user/pass into LDAP

-			{

-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");

-				$login=$usertotest;

-

-				// ldap2dolibarr synchronisation

-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

-				{

-						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");

-

-						// On charge les attributs du user ldap

-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";

-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);

-

-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";

-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";

-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";

-

-						// On recherche le user dolibarr en fonction de son SID ldap

-						$sid = $ldap->getObjectSid($login);

-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";

-

-						$usertmp=new User($db);

-						$resultFetchUser=$usertmp->fetch('',$login,$sid);

-						if ($resultFetchUser > 0)

-						{

-							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);

-							// On verifie si le login a change et on met a jour les attributs dolibarr

-

-							if ($usertmp->login != $ldap->login && $ldap->login)

-							{

-								$usertmp->login = $ldap->login;

-								$usertmp->update($usertmp);

-								// TODO Que faire si update echoue car on update avec un login deja existant.

-							}

-

-							//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);

-						}

-						unset($usertmp);

-				}

-

-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

-				{

-					global $mc;

-

-					$usertmp=new User($db);

-					$usertmp->fetch('',$login);

-					$ret=$mc->checkRight($usertmp->id, $entitytotest);

-					if ($ret < 0)

-					{

-						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");

-						$login=''; // force authentication failure

-					}

-					unset($usertmp);

-				}

-			}

-			if ($result == 1)

-			{

-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");

-				sleep(1);

-

-				// Load translation files required by the page

+        $_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");

+        return;

+    }

+

+    if ($usertotest)

+    {

+        dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);

+

+        // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko

+        $ldaphost=$dolibarr_main_auth_ldap_host;

+        $ldapport=$dolibarr_main_auth_ldap_port;

+        $ldapversion=$dolibarr_main_auth_ldap_version;

+        $ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);

+

+        $ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;

+        $ldapdn=$dolibarr_main_auth_ldap_dn;

+        $ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;

+        $ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;

+        $ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);

+

+        if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";

+

+        require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';

+        $ldap=new Ldap();

+        $ldap->server=explode(',',$ldaphost);

+        $ldap->serverPort=$ldapport;

+        $ldap->ldapProtocolVersion=$ldapversion;

+        $ldap->serverType=$ldapservertype;

+        $ldap->searchUser=$ldapadminlogin;

+        $ldap->searchPassword=$ldapadminpass;

+

+        if ($ldapdebug)

+        {

+            dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);

+            dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);

+            print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";

+            print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";

+        }

+

+        $resultFetchLdapUser=0;

+

+        // Define $userSearchFilter

+        $userSearchFilter = "";

+        if (empty($dolibarr_main_auth_ldap_filter)) {

+            $userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";

+        } else {

+            $userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);

+        }

+

+        // If admin login provided

+        // Code to get user in LDAP from an admin connection (may differ from user connection, done later)

+        if ($ldapadminlogin)

+        {

+            $result=$ldap->connect_bind();

+            if ($result > 0)

+            {

+                $resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);

+                //dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);

+                if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset

+                {

+                    dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');

+                    if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";

+                    $ldap->close();

+                    sleep(1);

+                    $langs->load('ldap');

+                    $_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);

+                    return '';

+                }

+            }

+            else

+            {

+                    if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";

+            }

+            $ldap->close();

+        }

+

+        // Forge LDAP user and password to test with them

+        // If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with

+        // admin login no exectued.

+        $ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)

+        // But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have

+        // dn detected into ldapUserDN.

+        if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;

+        $ldap->searchPassword=$passwordtotest;

+

+        // Test with this->seachUser and this->searchPassword

+        //print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;

+        $result=$ldap->connect_bind();

+        if ($result > 0)

+        {

+            if ($result == 2)	// Connection is ok for user/pass into LDAP

+            {

+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");

+                $login=$usertotest;

+

+                // ldap2dolibarr synchronisation

+                if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

+                {

+                        dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");

+

+                        // On charge les attributs du user ldap

+                        if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";

+                        $resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);

+

+                        if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";

+                        if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";

+                        if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";

+

+                        // On recherche le user dolibarr en fonction de son SID ldap

+                        $sid = $ldap->getObjectSid($login);

+                        if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";

+

+                        $usertmp=new User($db);

+                        $resultFetchUser=$usertmp->fetch('',$login,$sid);

+                        if ($resultFetchUser > 0)

+                        {

+                            dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);

+                            // On verifie si le login a change et on met a jour les attributs dolibarr

+

+                            if ($usertmp->login != $ldap->login && $ldap->login)

+                            {

+                                $usertmp->login = $ldap->login;

+                                $usertmp->update($usertmp);

+                                // TODO Que faire si update echoue car on update avec un login deja existant.

+                            }

+

+                            //$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);

+                        }

+                        unset($usertmp);

+                }

+

+                if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

+                {

+                    global $mc;

+

+                    $usertmp=new User($db);

+                    $usertmp->fetch('',$login);

+                    $ret=$mc->checkRight($usertmp->id, $entitytotest);

+                    if ($ret < 0)

+                    {

+                        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");

+                        $login=''; // force authentication failure

+                    }

+                    unset($usertmp);

+                }

+            }

+            if ($result == 1)

+            {

+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");

+                sleep(1);

+

+                // Load translation files required by the page

                 $langs->loadLangs(array('main', 'other'));

 

-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

-			}

-		}

-		else

-		{

-			/* Login failed. Return false, together with the error code and text from

+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

+            }

+        }

+        else

+        {

+            /* Login failed. Return false, together with the error code and text from

              ** the LDAP server. The common error codes and reasons are listed below :

              ** (for iPlanet, other servers may differ)

              ** 19 - Account locked out (too many invalid login attempts)

@@ -225,24 +225,24 @@ 
              ** 49 - Wrong password

              ** 53 - Account inactive (manually locked out by administrator)

              */

-			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");

-			if (is_resource($ldap->connection))    // If connection ok but bind ko

-			{

-				$ldap->ldapErrorCode = ldap_errno($ldap->connection);

-				$ldap->ldapErrorText = ldap_error($ldap->connection);

-				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

-			}

-			sleep(2);      // Anti brut force protection

-

-			// Load translation files required by the page

+            dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");

+            if (is_resource($ldap->connection))    // If connection ok but bind ko

+            {

+                $ldap->ldapErrorCode = ldap_errno($ldap->connection);

+                $ldap->ldapErrorText = ldap_error($ldap->connection);

+                dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

+            }

+            sleep(2);      // Anti brut force protection

+

+            // Load translation files required by the page

             $langs->loadLangs(array('main', 'other', 'errors'));

 ;

-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));

-		}

+            $_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));

+        }

 

-		$ldap->close();

-	}

+        $ldap->close();

+    }

 

-	return $login;

+    return $login;

 }

 

Spacing +55 added lines, -55 removed lines

@@ -32,25 +32,25 @@ 
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)

  * @return	string					Login if OK, '' if KO

  */

-function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)

+function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)

 {

-	global $db,$conf,$langs;

+	global $db, $conf, $langs;

 	global $_POST;

-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;

-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;

-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;

-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;

+	global $dolibarr_main_auth_ldap_host, $dolibarr_main_auth_ldap_port;

+	global $dolibarr_main_auth_ldap_version, $dolibarr_main_auth_ldap_servertype;

+	global $dolibarr_main_auth_ldap_login_attribute, $dolibarr_main_auth_ldap_dn;

+	global $dolibarr_main_auth_ldap_admin_login, $dolibarr_main_auth_ldap_admin_pass;

 	global $dolibarr_main_auth_ldap_filter;

 	global $dolibarr_main_auth_ldap_debug;

 

 	// Force master entity in transversal mode

-	$entity=$entitytotest;

-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;

+	$entity = $entitytotest;

+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;

 

-	$login='';

-	$resultFetchUser='';

+	$login = '';

+	$resultFetchUser = '';

 

-	if (! function_exists("ldap_connect"))

+	if (!function_exists("ldap_connect"))

 	{

 		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");

 		sleep(1);

@@ -58,51 +58,51 @@ 
 		// Load translation files required by the page

         $langs->loadLangs(array('main', 'other'));

 

-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");

+		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");

 		return;

 	}

 

 	if ($usertotest)

 	{

-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);

+		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);

 

 		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko

-		$ldaphost=$dolibarr_main_auth_ldap_host;

-		$ldapport=$dolibarr_main_auth_ldap_port;

-		$ldapversion=$dolibarr_main_auth_ldap_version;

-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);

+		$ldaphost = $dolibarr_main_auth_ldap_host;

+		$ldapport = $dolibarr_main_auth_ldap_port;

+		$ldapversion = $dolibarr_main_auth_ldap_version;

+		$ldapservertype = (empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);

 

-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;

-		$ldapdn=$dolibarr_main_auth_ldap_dn;

-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;

-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;

-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);

+		$ldapuserattr = $dolibarr_main_auth_ldap_login_attribute;

+		$ldapdn = $dolibarr_main_auth_ldap_dn;

+		$ldapadminlogin = $dolibarr_main_auth_ldap_admin_login;

+		$ldapadminpass = $dolibarr_main_auth_ldap_admin_pass;

+		$ldapdebug = (empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false" ? false : true);

 

 		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";

 

 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';

-		$ldap=new Ldap();

-		$ldap->server=explode(',',$ldaphost);

-		$ldap->serverPort=$ldapport;

-		$ldap->ldapProtocolVersion=$ldapversion;

-		$ldap->serverType=$ldapservertype;

-		$ldap->searchUser=$ldapadminlogin;

-		$ldap->searchPassword=$ldapadminpass;

+		$ldap = new Ldap();

+		$ldap->server = explode(',', $ldaphost);

+		$ldap->serverPort = $ldapport;

+		$ldap->ldapProtocolVersion = $ldapversion;

+		$ldap->serverType = $ldapservertype;

+		$ldap->searchUser = $ldapadminlogin;

+		$ldap->searchPassword = $ldapadminpass;

 

 		if ($ldapdebug)

 		{

-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);

+			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);

 			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);

-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";

+			print "DEBUG: Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";

 			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";

 		}

 

-		$resultFetchLdapUser=0;

+		$resultFetchLdapUser = 0;

 

 		// Define $userSearchFilter

 		$userSearchFilter = "";

 		if (empty($dolibarr_main_auth_ldap_filter)) {

-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";

+			$userSearchFilter = "(".$ldapuserattr."=".$usertotest.")";

 		} else {

 			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);

 		}

@@ -111,10 +111,10 @@ 
 		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)

 		if ($ldapadminlogin)

 		{

-			$result=$ldap->connect_bind();

+			$result = $ldap->connect_bind();

 			if ($result > 0)

 			{

-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);

+				$resultFetchLdapUser = $ldap->fetch($usertotest, $userSearchFilter);

 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);

 				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset

 				{

@@ -123,7 +123,7 @@ 
 					$ldap->close();

 					sleep(1);

 					$langs->load('ldap');

-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);

+					$_SESSION["dol_loginmesg"] = $langs->trans("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);

 					return '';

 				}

 			}

@@ -137,41 +137,41 @@ 
 		// Forge LDAP user and password to test with them

 		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with

 		// admin login no exectued.

-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)

+		$ldap->searchUser = $ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)

 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have

 		// dn detected into ldapUserDN.

 		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;

-		$ldap->searchPassword=$passwordtotest;

+		$ldap->searchPassword = $passwordtotest;

 

 		// Test with this->seachUser and this->searchPassword

 		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;

-		$result=$ldap->connect_bind();

+		$result = $ldap->connect_bind();

 		if ($result > 0)

 		{

 			if ($result == 2)	// Connection is ok for user/pass into LDAP

 			{

 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");

-				$login=$usertotest;

+				$login = $usertotest;

 

 				// ldap2dolibarr synchronisation

-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

+				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

 				{

 						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");

 

 						// On charge les attributs du user ldap

 						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";

-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);

+						$resultFetchLdapUser = $ldap->fetch($login, $userSearchFilter);

 

-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";

-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";

-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";

+						if ($ldapdebug) print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";

+						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";

+						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";

 

 						// On recherche le user dolibarr en fonction de son SID ldap

 						$sid = $ldap->getObjectSid($login);

 						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";

 

-						$usertmp=new User($db);

-						$resultFetchUser=$usertmp->fetch('',$login,$sid);

+						$usertmp = new User($db);

+						$resultFetchUser = $usertmp->fetch('', $login, $sid);

 						if ($resultFetchUser > 0)

 						{

 							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);

@@ -189,17 +189,17 @@ 
 						unset($usertmp);

 				}

 

-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

+				if (!empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

 				{

 					global $mc;

 

-					$usertmp=new User($db);

-					$usertmp->fetch('',$login);

-					$ret=$mc->checkRight($usertmp->id, $entitytotest);

+					$usertmp = new User($db);

+					$usertmp->fetch('', $login);

+					$ret = $mc->checkRight($usertmp->id, $entitytotest);

 					if ($ret < 0)

 					{

 						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");

-						$login=''; // force authentication failure

+						$login = ''; // force authentication failure

 					}

 					unset($usertmp);

 				}

@@ -212,7 +212,7 @@ 
 				// Load translation files required by the page

                 $langs->loadLangs(array('main', 'other'));

 

-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");

 			}

 		}

 		else

@@ -232,12 +232,12 @@ 
 				$ldap->ldapErrorText = ldap_error($ldap->connection);

 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

 			}

-			sleep(2);      // Anti brut force protection

+			sleep(2); // Anti brut force protection

 

 			// Load translation files required by the page

             $langs->loadLangs(array('main', 'other', 'errors'));

 ;

-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));

+			$_SESSION["dol_loginmesg"] = ($ldap->error ? $ldap->error : $langs->trans("ErrorBadLoginPassword"));

 		}

 

 		$ldap->close();

Braces +52 added lines, -24 removed lines

@@ -45,7 +45,9 @@ 
 

 	// Force master entity in transversal mode

 	$entity=$entitytotest;

-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;

+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	    $entity=1;
+	}
 

 	$login='';

 	$resultFetchUser='';

@@ -78,7 +80,9 @@ 
 		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;

 		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);

 

-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";

+		if ($ldapdebug) {
+		    print "DEBUG: Logging LDAP steps<br>\n";
+		}
 

 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';

 		$ldap=new Ldap();

@@ -116,20 +120,25 @@ 
 			{

 				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);

 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);

-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset

+				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) {
+				    // If ok but password need to be reset

 				{

-					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');

-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";

+					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
+				}
+					if ($ldapdebug) {
+					    print "DEBUG: User ".$usertotest." must change password<br>\n";
+					}
 					$ldap->close();

 					sleep(1);

 					$langs->load('ldap');

 					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);

 					return '';

 				}

-			}

-			else

+			} else

 			{

-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";

+				 if ($ldapdebug) {
+				     print "DEBUG: ".$ldap->error."<br>\n";
+				 }
 			}

 			$ldap->close();

 		}

@@ -140,7 +149,9 @@ 
 		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)

 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have

 		// dn detected into ldapUserDN.

-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;

+		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) {
+		    $ldap->searchUser = $ldap->ldapUserDN;
+		}
 		$ldap->searchPassword=$passwordtotest;

 

 		// Test with this->seachUser and this->searchPassword

@@ -148,27 +159,41 @@ 
 		$result=$ldap->connect_bind();

 		if ($result > 0)

 		{

-			if ($result == 2)	// Connection is ok for user/pass into LDAP

+			if ($result == 2) {
+			    // Connection is ok for user/pass into LDAP

 			{

-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");

+				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
+			}
 				$login=$usertotest;

 

 				// ldap2dolibarr synchronisation

-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

+				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+				    // ldap2dolibarr synchronisation

 				{

-						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");

+						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+				}
 

 						// On charge les attributs du user ldap

-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";

+						if ($ldapdebug) {
+						    print "DEBUG: login ldap = ".$login."<br>\n";
+						}
 						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);

 

-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";

-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";

-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";

+						if ($ldapdebug) {
+						    print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";
+						}
+						if ($ldapdebug) {
+						    print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";
+						}
+						if ($ldapdebug) {
+						    print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";
+						}
 

 						// On recherche le user dolibarr en fonction de son SID ldap

 						$sid = $ldap->getObjectSid($login);

-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";

+						if ($ldapdebug) {
+						    print "DEBUG: sid = ".$sid."<br>\n";
+						}
 

 						$usertmp=new User($db);

 						$resultFetchUser=$usertmp->fetch('',$login,$sid);

@@ -189,9 +214,11 @@ 
 						unset($usertmp);

 				}

 

-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

+				if (! empty($conf->multicompany->enabled)) {
+				    // We must check entity (even if sync is not active)

 				{

-					global $mc;

+					global $mc;
+				}
 

 					$usertmp=new User($db);

 					$usertmp->fetch('',$login);

@@ -214,8 +241,7 @@ 
 

 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

 			}

-		}

-		else

+		} else

 		{

 			/* Login failed. Return false, together with the error code and text from

              ** the LDAP server. The common error codes and reasons are listed below :

@@ -226,9 +252,11 @@ 
              ** 53 - Account inactive (manually locked out by administrator)

              */

 			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");

-			if (is_resource($ldap->connection))    // If connection ok but bind ko

+			if (is_resource($ldap->connection)) {
+			    // If connection ok but bind ko

 			{

-				$ldap->ldapErrorCode = ldap_errno($ldap->connection);

+				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
+			}
 				$ldap->ldapErrorText = ldap_error($ldap->connection);

 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

 			}

Helpers/login/functions_forceuser.php

Indentation +8 added lines, -8 removed lines

@@ -34,16 +34,16 @@
  */

 function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest)

 {

-	// Variable dolibarr_auto_user must be defined in conf.php file

-	global $dolibarr_auto_user;

+    // Variable dolibarr_auto_user must be defined in conf.php file

+    global $dolibarr_auto_user;

 

-	dol_syslog("functions_forceuser::check_user_password_forceuser");

+    dol_syslog("functions_forceuser::check_user_password_forceuser");

 

-	$login=$dolibarr_auto_user;

-	if (empty($login)) $login='auto';

+    $login=$dolibarr_auto_user;

+    if (empty($login)) $login='auto';

 

-	if ($_SESSION["dol_loginmesg"]) $login='';

+    if ($_SESSION["dol_loginmesg"]) $login='';

 

-	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);

-	return $login;

+    dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);

+    return $login;

 }

Spacing +4 added lines, -4 removed lines

@@ -32,17 +32,17 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)

  * @return	string					Login if OK, '' if KO

  */

-function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest)

+function check_user_password_forceuser($usertotest, $passwordtotest, $entitytotest)

 {

 	// Variable dolibarr_auto_user must be defined in conf.php file

 	global $dolibarr_auto_user;

 

 	dol_syslog("functions_forceuser::check_user_password_forceuser");

 

-	$login=$dolibarr_auto_user;

-	if (empty($login)) $login='auto';

+	$login = $dolibarr_auto_user;

+	if (empty($login)) $login = 'auto';

 

-	if ($_SESSION["dol_loginmesg"]) $login='';

+	if ($_SESSION["dol_loginmesg"]) $login = '';

 

 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);

 	return $login;

Braces +6 added lines, -2 removed lines

@@ -40,9 +40,13 @@
 	dol_syslog("functions_forceuser::check_user_password_forceuser");

 

 	$login=$dolibarr_auto_user;

-	if (empty($login)) $login='auto';

+	if (empty($login)) {
+	    $login='auto';
+	}
 

-	if ($_SESSION["dol_loginmesg"]) $login='';

+	if ($_SESSION["dol_loginmesg"]) {
+	    $login='';
+	}
 

 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);

 	return $login;

Helpers/login/functions_http.php

Indentation +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@
 */

 function check_user_password_http($usertotest,$passwordtotest,$entitytotest)

 {

-	DolUtils::dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=" . (empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));

+    DolUtils::dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=" . (empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));

 

     $login='';

-	if (! empty($_SERVER["REMOTE_USER"]))

-	{

-		$login=$_SERVER["REMOTE_USER"];

-	}

+    if (! empty($_SERVER["REMOTE_USER"]))

+    {

+        $login=$_SERVER["REMOTE_USER"];

+    }

 

-	return $login;

+    return $login;

 }

Spacing +5 added lines, -5 removed lines

@@ -10,14 +10,14 @@
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)

  * @return	string					Login if OK, '' if KO

 */

-function check_user_password_http($usertotest,$passwordtotest,$entitytotest)

+function check_user_password_http($usertotest, $passwordtotest, $entitytotest)

 {

-	DolUtils::dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=" . (empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));

+	DolUtils::dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));

 

-    $login='';

-	if (! empty($_SERVER["REMOTE_USER"]))

+    $login = '';

+	if (!empty($_SERVER["REMOTE_USER"]))

 	{

-		$login=$_SERVER["REMOTE_USER"];

+		$login = $_SERVER["REMOTE_USER"];

 	}

 

 	return $login;