alxarafe / alixar

dolibarr/htdocs/filefunc.inc.php

Braces +16 added lines, -12 removed lines

@@ -83,10 +83,10 @@ 
 
     if (!empty($_SERVER["CONTEXT_PREFIX"])) {    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
         $path = $_SERVER["CONTEXT_PREFIX"];       // example '/dolibarr/' when using an apache alias.
-        if (!preg_match('/\/$/', $path))
-            $path .= '/';
-    }
-    else if (preg_match('/index\.php/', $_SERVER['PHP_SELF'])) {
+        if (!preg_match('/\/$/', $path)) {
+                    $path .= '/';
+        }
+    } else if (preg_match('/index\.php/', $_SERVER['PHP_SELF'])) {
         // When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
         // when using apache alias like '/dolibarr/' that point to htdocs.
         // Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
@@ -100,12 +100,15 @@ 
         $path = '';
         $i = count($TDir);
         while ($i--) {
-            if (empty($TDir[$i]) || $TDir[$i] == 'htdocs')
-                break;
-            if ($TDir[$i] == 'dolibarr')
-                break;
-            if (substr($TDir[$i], -4, 4) == '.php')
-                continue;
+            if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') {
+                            break;
+            }
+            if ($TDir[$i] == 'dolibarr') {
+                            break;
+            }
+            if (substr($TDir[$i], -4, 4) == '.php') {
+                            continue;
+            }
 
             $path .= '../';
         }
@@ -186,8 +189,9 @@ 
         } else {
             $tmpa = parse_url($_SERVER['HTTP_HOST']);
             $tmpb = parse_url($_SERVER['HTTP_REFERER']);
-            if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host']))
-                $csrfattack = true;
+            if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) {
+                            $csrfattack = true;
+            }
         }
         if ($csrfattack) {
             //print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];

dolibarr/htdocs/core/lib/security2.lib.php

Indentation +361 added lines, -361 removed lines

@@ -51,70 +51,70 @@ 
  */
 function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode)
 {
-	global $conf,$langs;
+    global $conf,$langs;
     //global $dolauthmode;    // To return authentication finally used
 
-	// Check parameters
-	if ($entitytotest == '') $entitytotest=1;
+    // Check parameters
+    if ($entitytotest == '') $entitytotest=1;
 
     dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',',$authmode));
-	$login = '';
-
-	// Validation of login/pass/entity with standard modules
-	if (empty($login))
-	{
-	    $test=true;
-    	foreach($authmode as $mode)
-    	{
-    		if ($test && $mode && ! $login)
-    		{
-    		    // Validation of login/pass/entity for mode $mode
-    		    $mode=trim($mode);
-        		$authfile='functions_'.$mode.'.php';
-        		$fullauthfile='';
-
-    		    $dirlogin=array_merge(array("/core/login"),(array) $conf->modules_parts['login']);
-    		    foreach($dirlogin as $reldir)
-    		    {
-    		        $dir=dol_buildpath($reldir,0);
-    		        $newdir=dol_osencode($dir);
-
-    		        // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
-    		        $tmpnewauthfile = $newdir.(preg_match('/\/$/',$newdir)?'':'/').$authfile;
-    		        if (is_file($tmpnewauthfile)) $fullauthfile=$tmpnewauthfile;
-    		    }
-
-    		    $result=false;
-    		    if ($fullauthfile) $result=include_once $fullauthfile;
-    			if ($fullauthfile && $result)
-    			{
-    				// Call function to check user/password
-    				$function='check_user_password_'.$mode;
-    				$login=call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
-    				if ($login)	// Login is successfull
-    				{
-    					$test=false;            // To stop once at first login success
-    					$conf->authmode=$mode;	// This properties is defined only when logged to say what mode was successfully used
-    					$dol_tz=GETPOST('tz');
-    					$dol_dst=GETPOST('dst');
-    					$dol_screenwidth=GETPOST('screenwidth');
-    					$dol_screenheight=GETPOST('screenheight');
-    				}
-    			}
-    			else
-    			{
-    				dol_syslog("Authentification ko - failed to load file '".$authfile."'", LOG_ERR);
-    				sleep(1);
-    				// Load translation files required by the page
+    $login = '';
+
+    // Validation of login/pass/entity with standard modules
+    if (empty($login))
+    {
+        $test=true;
+        foreach($authmode as $mode)
+        {
+            if ($test && $mode && ! $login)
+            {
+                // Validation of login/pass/entity for mode $mode
+                $mode=trim($mode);
+                $authfile='functions_'.$mode.'.php';
+                $fullauthfile='';
+
+                $dirlogin=array_merge(array("/core/login"),(array) $conf->modules_parts['login']);
+                foreach($dirlogin as $reldir)
+                {
+                    $dir=dol_buildpath($reldir,0);
+                    $newdir=dol_osencode($dir);
+
+                    // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
+                    $tmpnewauthfile = $newdir.(preg_match('/\/$/',$newdir)?'':'/').$authfile;
+                    if (is_file($tmpnewauthfile)) $fullauthfile=$tmpnewauthfile;
+                }
+
+                $result=false;
+                if ($fullauthfile) $result=include_once $fullauthfile;
+                if ($fullauthfile && $result)
+                {
+                    // Call function to check user/password
+                    $function='check_user_password_'.$mode;
+                    $login=call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
+                    if ($login)	// Login is successfull
+                    {
+                        $test=false;            // To stop once at first login success
+                        $conf->authmode=$mode;	// This properties is defined only when logged to say what mode was successfully used
+                        $dol_tz=GETPOST('tz');
+                        $dol_dst=GETPOST('dst');
+                        $dol_screenwidth=GETPOST('screenwidth');
+                        $dol_screenheight=GETPOST('screenheight');
+                    }
+                }
+                else
+                {
+                    dol_syslog("Authentification ko - failed to load file '".$authfile."'", LOG_ERR);
+                    sleep(1);
+                    // Load translation files required by the page
                     $langs->loadLangs(array('other', 'main', 'errors'));
 
-    				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
-    			}
-    		}
-    	}
-	}
+                    $_SESSION["dol_loginmesg"]=$langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
+                }
+            }
+        }
+    }
 
-	return $login;
+    return $login;
 }
 
 
@@ -130,29 +130,29 @@ 
      * @return      void
      */
     function dol_loginfunction($langs,$conf,$mysoc)
-	{
-		global $dolibarr_main_demo,$db;
-		global $smartphone,$hookmanager;
+    {
+        global $dolibarr_main_demo,$db;
+        global $smartphone,$hookmanager;
 
-		$langs->loadLangs(array("main","other","help","admin"));
+        $langs->loadLangs(array("main","other","help","admin"));
 
-		// Instantiate hooks of thirdparty module only if not already define
+        // Instantiate hooks of thirdparty module only if not already define
         $hookmanager->initHooks(array('mainloginpage'));
 
         $main_authentication = $conf->file->main_authentication;
 
         $session_name=session_name();	// Get current session name
 
-		$dol_url_root = DOL_URL_ROOT;
+        $dol_url_root = DOL_URL_ROOT;
 
-		// Title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		$title=$appli.' '.constant('DOL_VERSION');
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-		$titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
+        // Title
+        $appli=constant('DOL_APPLICATION_TITLE');
+        $title=$appli.' '.constant('DOL_VERSION');
+        if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
+        $titletruedolibarrversion=constant('DOL_VERSION');	// $title used by login template after the @ to inform of true Dolibarr version
 
-		// Note: $conf->css looks like '/theme/eldy/style.css.php'
-		/*
+        // Note: $conf->css looks like '/theme/eldy/style.css.php'
+        /*
 		$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
 		$themepath=dol_buildpath($conf->css,1);
 		if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
@@ -169,138 +169,138 @@ 
 		$conf_css = $themepath."?lang=".$langs->defaultlang;
 		*/
 
-		// Select templates dir
-		if (! empty($conf->modules_parts['tpl']))	// Using this feature slow down application
-		{
-			$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
-			foreach($dirtpls as $reldir)
-			{
-				$tmp=dol_buildpath($reldir.'login.tpl.php');
-				if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
-			}
-		}
-		else
-		{
-			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
-		}
+        // Select templates dir
+        if (! empty($conf->modules_parts['tpl']))	// Using this feature slow down application
+        {
+            $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
+            foreach($dirtpls as $reldir)
+            {
+                $tmp=dol_buildpath($reldir.'login.tpl.php');
+                if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+            }
+        }
+        else
+        {
+            $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
+        }
 
-		// Set cookie for timeout management
-		$prefix=dol_getprefix('');
-		$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-		if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
+        // Set cookie for timeout management
+        $prefix=dol_getprefix('');
+        $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
+        if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
 
-		if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
-		else unset($_SESSION["urlfrom"]);
+        if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
+        else unset($_SESSION["urlfrom"]);
 
-		if (! GETPOST("username",'alpha')) $focus_element='username';
-		else $focus_element='password';
+        if (! GETPOST("username",'alpha')) $focus_element='username';
+        else $focus_element='password';
 
-		$demologin='';
-		$demopassword='';
-		if (! empty($dolibarr_main_demo))
-		{
-			$tab=explode(',',$dolibarr_main_demo);
-			$demologin=$tab[0];
-			$demopassword=$tab[1];
-		}
+        $demologin='';
+        $demopassword='';
+        if (! empty($dolibarr_main_demo))
+        {
+            $tab=explode(',',$dolibarr_main_demo);
+            $demologin=$tab[0];
+            $demopassword=$tab[1];
+        }
 
-		// Execute hook getLoginPageOptions (for table)
-		$parameters=array('entity' => GETPOST('entity','int'));
-		$reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
-		if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
-			$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
-		} else {
-			$morelogincontent = $hookmanager->resPrint;
-		}
+        // Execute hook getLoginPageOptions (for table)
+        $parameters=array('entity' => GETPOST('entity','int'));
+        $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
+        if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
+            $morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
+        } else {
+            $morelogincontent = $hookmanager->resPrint;
+        }
 
-		// Execute hook getLoginPageExtraOptions (eg for js)
-		$parameters=array('entity' => GETPOST('entity','int'));
-		$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
-		$moreloginextracontent = $hookmanager->resPrint;
+        // Execute hook getLoginPageExtraOptions (eg for js)
+        $parameters=array('entity' => GETPOST('entity','int'));
+        $reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters);    // Note that $action and $object may have been modified by some hooks.
+        $moreloginextracontent = $hookmanager->resPrint;
 
-		// Login
-		$login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
-		$password = $demopassword;
+        // Login
+        $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
+        $password = $demopassword;
 
-		// Show logo (search in order: small company logo, large company logo, theme logo, common logo)
-		$width=0;
-		$urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+        // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
+        $width=0;
+        $urllogo = DOL_BASE_URI . '/theme/login_logo.png';
 
         if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-		}
-		elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
-			$width=128;
-		}
-		elseif (is_readable(DOL_BASE_URI . '/theme/' . $conf->theme . '/img/dolibarr_logo.png')) {
-			$urllogo = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/dolibarr_logo.png';
+        {
+            $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
         }
-		elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
-			$urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
+        elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+        {
+            $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
+            $width=128;
+        }
+        elseif (is_readable(DOL_BASE_URI . '/theme/' . $conf->theme . '/img/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/dolibarr_logo.png';
+        }
+        elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
         }
 
-		// Security graphical code
-		$captcha=0;
-		$captcha_refresh='';
-		if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-		{
-			$captcha=1;
-			$captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
-		}
-
-		// Extra link
-		$forgetpasslink=0;
-		$helpcenterlink=0;
-		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
-		{
-			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
-			{
-				$forgetpasslink=1;
-			}
+        // Security graphical code
+        $captcha=0;
+        $captcha_refresh='';
+        if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+        {
+            $captcha=1;
+            $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
+        }
 
-			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
-			{
-				$helpcenterlink=1;
-			}
-		}
+        // Extra link
+        $forgetpasslink=0;
+        $helpcenterlink=0;
+        if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+        {
+            if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+            {
+                $forgetpasslink=1;
+            }
+
+            if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+            {
+                $helpcenterlink=1;
+            }
+        }
 
-		// Home message
-		$main_home='';
-		if (! empty($conf->global->MAIN_HOME))
-		{
-		    $substitutionarray=getCommonSubstitutionArray($langs);
-		    complete_substitutions_array($substitutionarray, $langs);
-		    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+        // Home message
+        $main_home='';
+        if (! empty($conf->global->MAIN_HOME))
+        {
+            $substitutionarray=getCommonSubstitutionArray($langs);
+            complete_substitutions_array($substitutionarray, $langs);
+            $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
 
-			$main_home=dol_htmlcleanlastbr($texttoshow);
-		}
+            $main_home=dol_htmlcleanlastbr($texttoshow);
+        }
 
-		// Google AD
-		$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
+        // Google AD
+        $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
 
-		// Set jquery theme
-		$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		$jquerytheme = 'base';
-		if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+        // Set jquery theme
+        $dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
+        $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
+        if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+        $jquerytheme = 'base';
+        if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 
-		// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
-		$dol_use_jmobile=GETPOST('dol_use_jmobile','int');
+        // Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
+        $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
+        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
+        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
+        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
+        $dol_use_jmobile=GETPOST('dol_use_jmobile','int');
 
-		// Include login page template
-		include $template_dir.'login.tpl.php';
+        // Include login page template
+        include $template_dir.'login.tpl.php';
 
 
-		$_SESSION["dol_loginmesg"] = '';
-	}
+        $_SESSION["dol_loginmesg"] = '';
+    }
 }
 
 /**
@@ -313,23 +313,23 @@ 
  */
 function makesalt($type=CRYPT_SALT_LENGTH)
 {
-	dol_syslog("makesalt type=".$type);
-	switch($type)
-	{
-		case 12:	// 8 + 4
-			$saltlen=8; $saltprefix='$1$'; $saltsuffix='$'; break;
-		case 8:		// 8 (Pour compatibilite, ne devrait pas etre utilise)
-			$saltlen=8; $saltprefix='$1$'; $saltsuffix='$'; break;
-		case 2:		// 2
-		default: 	// by default, fall back on Standard DES (should work everywhere)
-			$saltlen=2; $saltprefix=''; $saltsuffix=''; break;
-	}
-	$salt='';
-	while(dol_strlen($salt) < $saltlen) $salt.=chr(mt_rand(64,126));
-
-	$result=$saltprefix.$salt.$saltsuffix;
-	dol_syslog("makesalt return=".$result);
-	return $result;
+    dol_syslog("makesalt type=".$type);
+    switch($type)
+    {
+        case 12:	// 8 + 4
+            $saltlen=8; $saltprefix='$1$'; $saltsuffix='$'; break;
+        case 8:		// 8 (Pour compatibilite, ne devrait pas etre utilise)
+            $saltlen=8; $saltprefix='$1$'; $saltsuffix='$'; break;
+        case 2:		// 2
+        default: 	// by default, fall back on Standard DES (should work everywhere)
+            $saltlen=2; $saltprefix=''; $saltsuffix=''; break;
+    }
+    $salt='';
+    while(dol_strlen($salt) < $saltlen) $salt.=chr(mt_rand(64,126));
+
+    $result=$saltprefix.$salt.$saltsuffix;
+    dol_syslog("makesalt return=".$result);
+    return $result;
 }
 
 /**
@@ -340,102 +340,102 @@ 
  */
 function encodedecode_dbpassconf($level=0)
 {
-	dol_syslog("encodedecode_dbpassconf level=".$level, LOG_DEBUG);
-	$config = '';
-	$passwd='';
-	$passwd_crypted='';
-
-	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php','r'))
-	{
-		while(!feof($fp))
-		{
-			$buffer = fgets($fp,4096);
-
-			$lineofpass=0;
-
-			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))	// Old way to save crypted value
-			{
-				$val = trim($reg[1]);	// This also remove CR/LF
-				$val=preg_replace('/^["\']/','',$val);
-				$val=preg_replace('/["\'][\s;]*$/','',$val);
-				if (! empty($val))
-				{
-					$passwd_crypted = $val;
-					$val = dol_decode($val);
-					$passwd = $val;
-					$lineofpass=1;
-				}
-			}
-			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))
-			{
-				$val = trim($reg[1]);	// This also remove CR/LF
-				$val=preg_replace('/^["\']/','',$val);
-				$val=preg_replace('/["\'][\s;]*$/','',$val);
-				if (preg_match('/crypted:/i',$buffer))
-				{
-					$val = preg_replace('/crypted:/i','',$val);
-					$passwd_crypted = $val;
-					$val = dol_decode($val);
-					$passwd = $val;
-				}
-				else
-				{
-					$passwd = $val;
-					$val = dol_encode($val);
-					$passwd_crypted = $val;
-				}
-				$lineofpass=1;
-			}
-
-			// Output line
-			if ($lineofpass)
-			{
-				// Add value at end of file
-				if ($level == 0)
-				{
-					$config .= '$dolibarr_main_db_pass=\''.$passwd.'\';'."\n";
-				}
-				if ($level == 1)
-				{
-					$config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";
-				}
-
-				//print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
-				//exit;
-			}
-			else
-			{
-				$config .= $buffer;
-			}
-		}
-		fclose($fp);
-
-		// Write new conf file
-		$file=DOL_DOCUMENT_ROOT.'/conf/conf.php';
-		if ($fp = @fopen($file,'w'))
-		{
-			fputs($fp, $config);
-			fflush($fp);
-			fclose($fp);
-			clearstatcache();
-
-			// It's config file, so we set read permission for creator only.
-			// Should set permission to web user and groups for users used by batch
-			//@chmod($file, octdec('0600'));
-
-			return 1;
-		}
-		else
-		{
-			dol_syslog("encodedecode_dbpassconf Failed to open conf.php file for writing", LOG_WARNING);
-			return -1;
-		}
-	}
-	else
-	{
-		dol_syslog("encodedecode_dbpassconf Failed to read conf.php", LOG_ERR);
-		return -2;
-	}
+    dol_syslog("encodedecode_dbpassconf level=".$level, LOG_DEBUG);
+    $config = '';
+    $passwd='';
+    $passwd_crypted='';
+
+    if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php','r'))
+    {
+        while(!feof($fp))
+        {
+            $buffer = fgets($fp,4096);
+
+            $lineofpass=0;
+
+            if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))	// Old way to save crypted value
+            {
+                $val = trim($reg[1]);	// This also remove CR/LF
+                $val=preg_replace('/^["\']/','',$val);
+                $val=preg_replace('/["\'][\s;]*$/','',$val);
+                if (! empty($val))
+                {
+                    $passwd_crypted = $val;
+                    $val = dol_decode($val);
+                    $passwd = $val;
+                    $lineofpass=1;
+                }
+            }
+            elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))
+            {
+                $val = trim($reg[1]);	// This also remove CR/LF
+                $val=preg_replace('/^["\']/','',$val);
+                $val=preg_replace('/["\'][\s;]*$/','',$val);
+                if (preg_match('/crypted:/i',$buffer))
+                {
+                    $val = preg_replace('/crypted:/i','',$val);
+                    $passwd_crypted = $val;
+                    $val = dol_decode($val);
+                    $passwd = $val;
+                }
+                else
+                {
+                    $passwd = $val;
+                    $val = dol_encode($val);
+                    $passwd_crypted = $val;
+                }
+                $lineofpass=1;
+            }
+
+            // Output line
+            if ($lineofpass)
+            {
+                // Add value at end of file
+                if ($level == 0)
+                {
+                    $config .= '$dolibarr_main_db_pass=\''.$passwd.'\';'."\n";
+                }
+                if ($level == 1)
+                {
+                    $config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";
+                }
+
+                //print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
+                //exit;
+            }
+            else
+            {
+                $config .= $buffer;
+            }
+        }
+        fclose($fp);
+
+        // Write new conf file
+        $file=DOL_DOCUMENT_ROOT.'/conf/conf.php';
+        if ($fp = @fopen($file,'w'))
+        {
+            fputs($fp, $config);
+            fflush($fp);
+            fclose($fp);
+            clearstatcache();
+
+            // It's config file, so we set read permission for creator only.
+            // Should set permission to web user and groups for users used by batch
+            //@chmod($file, octdec('0600'));
+
+            return 1;
+        }
+        else
+        {
+            dol_syslog("encodedecode_dbpassconf Failed to open conf.php file for writing", LOG_WARNING);
+            return -1;
+        }
+    }
+    else
+    {
+        dol_syslog("encodedecode_dbpassconf Failed to read conf.php", LOG_ERR);
+        return -2;
+    }
 }
 
 /**
@@ -448,72 +448,72 @@ 
  */
 function getRandomPassword($generic=false, $replaceambiguouschars=null)
 {
-	global $db,$conf,$langs,$user;
-
-	$generated_password='';
-	if ($generic)
-	{
-		$length = 32;
-		$lowercase = "qwertyuiopasdfghjklzxcvbnm";
-		$uppercase = "ASDFGHJKLZXCVBNMQWERTYUIOP";
-		$numbers = "1234567890";
-		$randomCode = "";
-		$nbofchar = round($length/3);
-		$nbofcharlast = ($length - 2*$nbofchar);
-		//var_dump($nbofchar.'-'.$nbofcharlast);
-		if (function_exists('random_int'))	// Cryptographic random
-		{
-			$max = strlen($lowercase) - 1;
-			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{random_int(0, $max)};
-			}
-			$max = strlen($uppercase) - 1;
-			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{random_int(0, $max)};
-			}
-			$max = strlen($numbers) - 1;
-			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{random_int(0, $max)};
-			}
-
-			$generated_password=str_shuffle($randomCode);
-		}
-		else	// Old platform, non cryptographic random
-		{
-			$max = strlen($lowercase) - 1;
-			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{mt_rand(0, $max)};
-			}
-			$max = strlen($uppercase) - 1;
-			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{mt_rand(0, $max)};
-			}
-			$max = strlen($numbers) - 1;
-			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{mt_rand(0, $max)};
-			}
-
-			$generated_password=str_shuffle($randomCode);
-		}
-	}
-	else if (! empty($conf->global->USER_PASSWORD_GENERATED))
-	{
-		$nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
-		$nomfichier=$nomclass.".class.php";
-		//print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
-		require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier;
-		$genhandler=new $nomclass($db,$conf,$langs,$user);
-		$generated_password=$genhandler->getNewGeneratedPassword();
-		unset($genhandler);
-	}
-
-	// Do we have to discard some alphabetic characters ?
-	if (is_array($replaceambiguouschars) && count($replaceambiguouschars) > 0)
-	{
-		$numbers = "ABCDEF";
-		$max = strlen($numbers) - 1;
-		$generated_password=str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
-	}
-
-	return $generated_password;
+    global $db,$conf,$langs,$user;
+
+    $generated_password='';
+    if ($generic)
+    {
+        $length = 32;
+        $lowercase = "qwertyuiopasdfghjklzxcvbnm";
+        $uppercase = "ASDFGHJKLZXCVBNMQWERTYUIOP";
+        $numbers = "1234567890";
+        $randomCode = "";
+        $nbofchar = round($length/3);
+        $nbofcharlast = ($length - 2*$nbofchar);
+        //var_dump($nbofchar.'-'.$nbofcharlast);
+        if (function_exists('random_int'))	// Cryptographic random
+        {
+            $max = strlen($lowercase) - 1;
+            for ($x = 0; $x < $nbofchar; $x++) {
+                $randomCode .= $lowercase{random_int(0, $max)};
+            }
+            $max = strlen($uppercase) - 1;
+            for ($x = 0; $x < $nbofchar; $x++) {
+                $randomCode .= $uppercase{random_int(0, $max)};
+            }
+            $max = strlen($numbers) - 1;
+            for ($x = 0; $x < $nbofcharlast; $x++) {
+                $randomCode .= $numbers{random_int(0, $max)};
+            }
+
+            $generated_password=str_shuffle($randomCode);
+        }
+        else	// Old platform, non cryptographic random
+        {
+            $max = strlen($lowercase) - 1;
+            for ($x = 0; $x < $nbofchar; $x++) {
+                $randomCode .= $lowercase{mt_rand(0, $max)};
+            }
+            $max = strlen($uppercase) - 1;
+            for ($x = 0; $x < $nbofchar; $x++) {
+                $randomCode .= $uppercase{mt_rand(0, $max)};
+            }
+            $max = strlen($numbers) - 1;
+            for ($x = 0; $x < $nbofcharlast; $x++) {
+                $randomCode .= $numbers{mt_rand(0, $max)};
+            }
+
+            $generated_password=str_shuffle($randomCode);
+        }
+    }
+    else if (! empty($conf->global->USER_PASSWORD_GENERATED))
+    {
+        $nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
+        $nomfichier=$nomclass.".class.php";
+        //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
+        require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier;
+        $genhandler=new $nomclass($db,$conf,$langs,$user);
+        $generated_password=$genhandler->getNewGeneratedPassword();
+        unset($genhandler);
+    }
+
+    // Do we have to discard some alphabetic characters ?
+    if (is_array($replaceambiguouschars) && count($replaceambiguouschars) > 0)
+    {
+        $numbers = "ABCDEF";
+        $max = strlen($numbers) - 1;
+        $generated_password=str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
+    }
+
+    return $generated_password;
 }

dolibarr/htdocs/core/class/hookmanager.class.php

Braces +27 added lines, -18 removed lines

@@ -138,8 +138,9 @@ 
      */
     function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
     {
-        if (!is_array($this->hooks) || empty($this->hooks))
-            return '';
+        if (!is_array($this->hooks) || empty($this->hooks)) {
+                    return '';
+        }
 
         $parameters['context'] = join(':', $this->contextarray);
         //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
@@ -199,8 +200,9 @@ 
                 'setContentSecurityPolicy',
                 'setHtmlTitle'
                 )
-            ))
-            $hooktype = 'addreplace';
+            )) {
+                    $hooktype = 'addreplace';
+        }
 
         if ($method == 'insertExtraFields') {
             $hooktype = 'returnvalue'; // @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
@@ -222,12 +224,14 @@ 
                 foreach ($modules as $module => $actionclassinstance) {
                     //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
                     // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module, $modulealreadyexecuted))
-                        continue;
+                    if (in_array($module, $modulealreadyexecuted)) {
+                                            continue;
+                    }
 
                     // jump to next module/class if method does not exist
-                    if (!method_exists($actionclassinstance, $method))
-                        continue;
+                    if (!method_exists($actionclassinstance, $method)) {
+                                            continue;
+                    }
 
                     $this->resNbOfHooks++;
 
@@ -250,24 +254,29 @@ 
                             dol_syslog("Error on hook module=" . $module . ", method " . $method . ", class " . get_class($actionclassinstance) . ", hooktype=" . $hooktype . (empty($this->error) ? '' : " " . $this->error) . (empty($this->errors) ? '' : " " . join(",", $this->errors)), LOG_ERR);
                         }
 
-                        if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))
-                            $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                        if (!empty($actionclassinstance->resprints))
-                            $this->resPrint .= $actionclassinstance->resprints;
+                        if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+                                                    $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+                        }
+                        if (!empty($actionclassinstance->resprints)) {
+                                                    $this->resPrint .= $actionclassinstance->resprints;
+                        }
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else {
                         // TODO. this test should be done into the method of hook by returning nothing
-                        if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number)
-                            continue;
+                        if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {
+                                                    continue;
+                        }
 
                         //dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                         $resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                        if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results))
-                            $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                        if (!empty($actionclassinstance->resprints))
-                            $this->resPrint .= $actionclassinstance->resprints;
+                        if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+                                                    $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+                        }
+                        if (!empty($actionclassinstance->resprints)) {
+                                                    $this->resPrint .= $actionclassinstance->resprints;
+                        }
                         // TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
                         if (!is_array($resaction) && !is_numeric($resaction)) {
                             dol_syslog('Error: Bug into hook ' . $method . ' of module class ' . get_class($actionclassinstance) . '. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);

dolibarr/htdocs/main.inc.php

Braces +415 added lines, -273 removed lines

@@ -213,16 +213,18 @@ 
     foreach ($tmplist as $tmpkey) {
         $postkey = $tmpautoset[0] . '_' . $tmpkey;
         //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-        if (!empty($_POST[$postkey]))
-            $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        if (!empty($_POST[$postkey])) {
+                    $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+        }
     }
     $cookiename = $tmpautoset[0];
     $cookievalue = json_encode($cookiearrayvalue);
     //var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
     setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
-    if (empty($cookievalue))
-        unset($_COOKIE[$cookiename]);
-}
+    if (empty($cookievalue)) {
+            unset($_COOKIE[$cookiename]);
+    }
+    }
 
 
 // Init session. Name of session is specific to Dolibarr instance.
@@ -231,8 +233,9 @@ 
 
 $sessionname = 'DOLSESSID_' . $prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
-if (!empty($_COOKIE[$sessiontimeout]))
+if (!empty($_COOKIE[$sessiontimeout])) {
     ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
@@ -263,11 +266,13 @@ 
     $conf->browser->layout = $tmp['layout'];     // 'classic', 'phone', 'tablet'
     //var_dump($conf->browser);
 
-    if ($conf->browser->layout == 'phone')
-        $conf->dol_no_mouse_hover = 1;
-    if ($conf->browser->layout == 'phone')
-        $conf->global->MAIN_TESTMENUHIDER = 1;
-}
+    if ($conf->browser->layout == 'phone') {
+            $conf->dol_no_mouse_hover = 1;
+    }
+    if ($conf->browser->layout == 'phone') {
+            $conf->global->MAIN_TESTMENUHIDER = 1;
+    }
+    }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -312,10 +317,14 @@ 
 }
 
 // Loading of additional presentation includes
-if (!defined('NOREQUIREHTML'))
-    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';     // Need 660ko memory (800ko in 2.2)
-if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax)
-    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php'; // Need 22ko memory
+if (!defined('NOREQUIREHTML')) {
+    require_once DOL_BASE_PATH . '/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+    require_once DOL_BASE_PATH . '/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 
 
@@ -344,8 +353,9 @@ 
 // Creation of a token against CSRF vulnerabilities
 if (!defined('NOTOKENRENEWAL')) {
     // roulement des jetons car cree a chaque appel
-    if (isset($_SESSION['newtoken']))
-        $_SESSION['token'] = $_SESSION['newtoken'];
+    if (isset($_SESSION['newtoken'])) {
+            $_SESSION['token'] = $_SESSION['newtoken'];
+    }
 
     // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
     $token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
@@ -367,14 +377,16 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules', 'alpha'))
+if (GETPOST('disablemodules', 'alpha')) {
     $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+}
 if (!empty($_SESSION["disablemodules"])) {
     $disabled_modules = explode(',', $_SESSION["disablemodules"]);
     foreach ($disabled_modules as $module) {
         if ($module) {
-            if (empty($conf->$module))
-                $conf->$module = new stdClass();
+            if (empty($conf->$module)) {
+                            $conf->$module = new stdClass();
+            }
             $conf->$module->enabled = false;
             if ($module == 'fournisseur') {  // Special case
                 $conf->supplier_order->enabled = 0;
@@ -396,11 +408,13 @@ 
         $dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
     } else {
         // Authentication mode
-        if (empty($dolibarr_main_authentication))
-            $dolibarr_main_authentication = 'http,dolibarr';
+        if (empty($dolibarr_main_authentication)) {
+                    $dolibarr_main_authentication = 'http,dolibarr';
+        }
         // Authentication mode: forceuser
-        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user))
-            $dolibarr_auto_user = 'auto';
+        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+                    $dolibarr_auto_user = 'auto';
+        }
     }
     // Set authmode
     $authmode = explode(',', $dolibarr_main_authentication);
@@ -477,35 +491,41 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done later
             }
         }
 
         $allowedmethodtopostusername = 2;
-        if (defined('MAIN_AUTHENTICATION_POST_METHOD'))
-            $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
+                    $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        }
         $usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", $allowedmethodtopostusername));
         $passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
         $entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
         // Define if we received data to test the login.
         $goontestloop = false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode))
-            $goontestloop = true;
-        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user))
-            $goontestloop = true;
-        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1))
-            $goontestloop = true;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) {
+                    $goontestloop = true;
+        }
+        if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) {
+                    $goontestloop = true;
+        }
+        if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) {
+                    $goontestloop = true;
+        }
 
         if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
             include_once DOL_BASE_PATH . '/core/class/translate.class.php';
             $langs = new Translate("", $conf);
             $langcode = (GETPOST('lang', 'aZ09', 1) ? 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);
         }
 
@@ -527,8 +547,9 @@ 
                     $datenow = dol_now();
                     $datefirst = dol_stringtotime($_POST["dst_first"]);
                     $datesecond = dol_stringtotime($_POST["dst_second"]);
-                    if ($datenow >= $datefirst && $datenow < $datesecond)
-                        $dol_dst = 1;
+                    if ($datenow >= $datefirst && $datenow < $datesecond) {
+                                            $dol_dst = 1;
+                    }
                 }
                 //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
@@ -540,8 +561,9 @@ 
 
                 // Bad password. No authmode has found a good password.
                 // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-                if (empty($_SESSION["dol_loginmesg"]))
-                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                if (empty($_SESSION["dol_loginmesg"])) {
+                                    $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+                }
 
                 // Call trigger for the "security events" log
                 $user->trigger_mesg = $langs->trans("ErrorBadLoginPassword") . ' - login=' . GETPOST("username", "alpha", 2);
@@ -558,8 +580,9 @@ 
                 $hookmanager->initHooks(array('login'));
                 $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                 $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0)
-                    $error++;
+                if ($reshook < 0) {
+                                    $error++;
+                }
 
                 // Note: exit is done in next chapter
             }
@@ -569,10 +592,11 @@ 
         if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
             // No data to test login, so we show the login page
             dol_syslog("--- Access to " . $_SERVER["PHP_SELF"] . " showing the login form and exit");
-            if (defined('NOREDIRECTBYMAINTOLOGIN'))
-                return 'ERROR_NOT_LOGGED';
-            else
-                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+                            return 'ERROR_NOT_LOGGED';
+            } else {
+                            dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+            }
             exit;
         }
 
@@ -611,21 +635,24 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
         }
-    }
-    else {
+    } else {
         // We are already into an authenticated session
         $login = $_SESSION["dol_login"];
         $entity = $_SESSION["dol_entity"];
@@ -667,20 +694,23 @@ 
             $hookmanager->initHooks(array('login'));
             $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
             $reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-            if ($reshook < 0)
-                $error++;
+            if ($reshook < 0) {
+                            $error++;
+            }
 
             $paramsurl = array();
-            if (GETPOST('textbrowser', 'int'))
-                $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
-            if (GETPOST('nojs', 'int'))
-                $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
-            if (GETPOST('lang', 'aZ09'))
-                $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            if (GETPOST('textbrowser', 'int')) {
+                            $paramsurl[] = 'textbrowser=' . GETPOST('textbrowser', 'int');
+            }
+            if (GETPOST('nojs', 'int')) {
+                            $paramsurl[] = 'nojs=' . GETPOST('nojs', 'int');
+            }
+            if (GETPOST('lang', 'aZ09')) {
+                            $paramsurl[] = 'lang=' . GETPOST('lang', 'aZ09');
+            }
             header('Location: ' . DOL_BASE_URI . '/index.php' . (count($paramsurl) ? '?' . implode('&', $paramsurl) : ''));
             exit;
-        }
-        else {
+        } else {
             // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
             $hookmanager->initHooks(array('main'));
 
@@ -689,8 +719,9 @@ 
                 $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
                 $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring);     // Get full path except host server
                 // Clean $relativepathstring
-                if (constant('DOL_BASE_URI'))
-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                if (constant('DOL_BASE_URI')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                 //var_dump($relativepathstring);
@@ -741,16 +772,21 @@ 
         $_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
         $_SESSION["dol_entity"] = $conf->entity;
         // Store value into session (values stored only if defined)
-        if (!empty($dol_hide_topmenu))
-            $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
-        if (!empty($dol_hide_leftmenu))
-            $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
-        if (!empty($dol_optimize_smallscreen))
-            $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
-        if (!empty($dol_no_mouse_hover))
-            $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
-        if (!empty($dol_use_jmobile))
-            $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        if (!empty($dol_hide_topmenu)) {
+                    $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+        }
+        if (!empty($dol_hide_leftmenu)) {
+                    $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+        }
+        if (!empty($dol_optimize_smallscreen)) {
+                    $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+        }
+        if (!empty($dol_no_mouse_hover)) {
+                    $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+        }
+        if (!empty($dol_use_jmobile)) {
+                    $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+        }
 
         dol_syslog("This is a new started user session. _SESSION['dol_login']=" . $_SESSION["dol_login"] . " Session id=" . session_id());
 
@@ -775,8 +811,9 @@ 
         $hookmanager->initHooks(array('login'));
         $parameters = array('dol_authmode' => $dol_authmode, 'dol_loginfo' => $loginfo);
         $reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
-        if ($reshook < 0)
-            $error++;
+        if ($reshook < 0) {
+                    $error++;
+        }
 
         if ($error) {
             $db->rollback();
@@ -814,10 +851,14 @@ 
      */
 
     // Set liste_limit
-    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))
-        $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
-    if (isset($user->conf->PRODUIT_LIMIT_SIZE))
-        $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+            $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+    }
+    // Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+            $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+    }
+    // Can be 0
 
 
 
@@ -844,8 +885,9 @@ 
     if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {
         $conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
     }
-} else
+} else {
     $conf->use_javascript_ajax = 0;
+}
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {   // If we must enable text browser
     $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
@@ -854,25 +896,32 @@ 
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu'])) {
     $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))
+}
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu'])) {
     $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen']))
+}
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) {
     $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))
+}
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover'])) {
     $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))
+}
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile'])) {
     $conf->dol_use_jmobile = 1;
-if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic')
+}
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
     $conf->dol_no_mouse_hover = 1;
+}
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') || (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 ) {
     $conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (!empty($conf->dol_use_jmobile))
+if (!empty($conf->dol_use_jmobile)) {
     $conf->use_javascript_ajax = 1;
+}
 // Replace themes bugged with jmobile with eldy
 if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
     $conf->theme = 'eldy';
@@ -896,8 +945,9 @@ 
 if (!defined('NOLOGIN')) {
     // If the login is not recovered, it is identified with an account that does not exist.
     // Hacking attempt?
-    if (!$user->login)
-        accessforbidden();
+    if (!$user->login) {
+            accessforbidden();
+    }
 
     // Check if user is active
     if ($user->statut < 1) {
@@ -972,15 +1022,18 @@ 
 
     // Load the menu manager (only if not already done)
     $file_menu = $conf->standard_menu;
-    if (GETPOST('menu', 'alpha'))
-        $file_menu = GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
+    if (GETPOST('menu', 'alpha')) {
+            $file_menu = GETPOST('menu', 'alpha');
+    }
+    // example: menu=eldy_menu.php
     if (!class_exists('MenuManager')) {
         $menufound = 0;
         $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
             $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
-            if (class_exists('MenuManager'))
-                break;
+            if (class_exists('MenuManager')) {
+                            break;
+            }
         }
         if (!class_exists('MenuManager')) { // If failed to include, we try with standard eldy_menu.php
             dol_syslog("You define a menu manager '" . $file_menu . "' that can not be loaded.", LOG_WARNING);
@@ -1054,10 +1107,11 @@ 
 {
     global $db, $conf, $hookmanager;
 
-    if ($contenttype == 'text/html')
-        header("Content-Type: text/html; charset=" . $conf->file->character_set_client);
-    else
-        header("Content-Type: " . $contenttype);
+    if ($contenttype == 'text/html') {
+            header("Content-Type: text/html; charset=" . $conf->file->character_set_client);
+    } else {
+            header("Content-Type: " . $contenttype);
+    }
     // Security options
     header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
     header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
@@ -1071,16 +1125,21 @@ 
         //else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
         $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
-        if (!is_object($hookmanager))
-            $hookmanager = new HookManager($db);
+        if (!is_object($hookmanager)) {
+                    $hookmanager = new HookManager($db);
+        }
         $hookmanager->initHooks("main");
 
         $parameters = array('contentsecuritypolicy' => $contentsecuritypolicy);
         $result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters);    // Note that $action and $object may have been modified by some hooks
-        if ($result > 0)
-            $contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
-        else
-            $contentsecuritypolicy .= $hookmanager->resPrint;    // Concat CSP
+        if ($result > 0) {
+                    $contentsecuritypolicy = $hookmanager->resPrint;
+        }
+        // Replace CSP
+        else {
+                    $contentsecuritypolicy .= $hookmanager->resPrint;
+        }
+        // Concat CSP
 
         if (!empty($contentsecuritypolicy)) {
             // For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
@@ -1127,18 +1186,20 @@ 
     }
     print '<!doctype html>' . "\n";
 
-    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST))
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
-    else
-        print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '" manifest="' . DOL_BASE_URI . '/cache.manifest">' . "\n";
+    } else {
+            print '<html lang="' . substr($langs->defaultlang, 0, 2) . '">' . "\n";
+    }
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead)) {
         $ext = 'layout=' . $conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
 
         print "<head>\n";
 
-        if (GETPOST('dol_basehref', 'alpha'))
-            print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        if (GETPOST('dol_basehref', 'alpha')) {
+                    print '<base href="' . dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')) . '">' . "\n";
+        }
 
         // Displays meta
         print '<meta charset="UTF-8">' . "\n";
@@ -1148,10 +1209,13 @@ 
 
         // Favicon
         $favicon = dol_buildpath('/theme/' . $conf->theme . '/img/favicon.ico', 1);
-        if (!empty($conf->global->MAIN_FAVICON_URL))
-            $favicon = $conf->global->MAIN_FAVICON_URL;
-        if (empty($conf->dol_use_jmobile))
-            print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n"; // Not required into an Android webview
+        if (!empty($conf->global->MAIN_FAVICON_URL)) {
+                    $favicon = $conf->global->MAIN_FAVICON_URL;
+        }
+        if (empty($conf->dol_use_jmobile)) {
+                    print '<link rel="shortcut icon" type="image/x-icon" href="' . $favicon . '"/>' . "\n";
+        }
+        // Not required into an Android webview
 
 
 
@@ -1161,47 +1225,59 @@ 
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
         //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
         // Auto refresh page
-        if (GETPOST('autorefresh', 'int') > 0)
-            print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        if (GETPOST('autorefresh', 'int') > 0) {
+                    print '<meta http-equiv="refresh" content="' . GETPOST('autorefresh', 'int') . '">';
+        }
 
         // Displays title
         $appli = constant('DOL_APPLICATION_TITLE');
-        if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-            $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+                    $appli = $conf->global->MAIN_APPLICATION_TITLE;
+        }
 
         print '<title>';
         $titletoshow = '';
-        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE))
-            $titletoshow = dol_htmlentities($title);
-        else if ($title)
-            $titletoshow = dol_htmlentities($appli . ' - ' . $title);
-        else
-            $titletoshow = dol_htmlentities($appli);
-
-        if (!is_object($hookmanager))
-            $hookmanager = new HookManager($db);
+        if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
+                    $titletoshow = dol_htmlentities($title);
+        } else if ($title) {
+                    $titletoshow = dol_htmlentities($appli . ' - ' . $title);
+        } else {
+                    $titletoshow = dol_htmlentities($appli);
+        }
+
+        if (!is_object($hookmanager)) {
+                    $hookmanager = new HookManager($db);
+        }
         $hookmanager->initHooks("main");
         $parameters = array('title' => $titletoshow);
         $result = $hookmanager->executeHooks('setHtmlTitle', $parameters);  // Note that $action and $object may have been modified by some hooks
-        if ($result > 0)
-            $titletoshow = $hookmanager->resPrint;    // Replace Title to show
-        else
-            $titletoshow .= $hookmanager->resPrint;      // Concat to Title to show
+        if ($result > 0) {
+                    $titletoshow = $hookmanager->resPrint;
+        }
+        // Replace Title to show
+        else {
+                    $titletoshow .= $hookmanager->resPrint;
+        }
+        // Concat to Title to show
 
         print $titletoshow;
         print '</title>';
 
         print "\n";
 
-        if (GETPOST('version', 'int'))
-            $ext = 'version=' . GETPOST('version', 'int'); // usefull to force no cache on css/js
-        if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER))
-            $ext .= '&testmenuhider=' . (GETPOST('testmenuhider', 'int') ? GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
+        if (GETPOST('version', 'int')) {
+                    $ext = 'version=' . GETPOST('version', 'int');
+        }
+        // usefull to force no cache on css/js
+        if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) {
+                    $ext .= '&testmenuhider=' . (GETPOST('testmenuhider', 'int') ? GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
+        }
 
         $themeparam = '&lang=' . $langs->defaultlang . '&amp;theme=' . $conf->theme . (GETPOST('optioncss', 'aZ09') ? '&amp;optioncss=' . GETPOST('optioncss', 'aZ09', 1) : '') . '&amp;userid=' . $user->id . '&amp;entity=' . $conf->entity;
         $themeparam .= ($ext ? '&amp;' . $ext : '');
-        if (!empty($_SESSION['dol_resetcache']))
-            $themeparam .= '&amp;dol_resetcache=' . $_SESSION['dol_resetcache'];
+        if (!empty($_SESSION['dol_resetcache'])) {
+                    $themeparam .= '&amp;dol_resetcache=' . $_SESSION['dol_resetcache'];
+        }
         if (GETPOST('dol_hide_topmenu', 'int')) {
             $themeparam .= '&amp;dol_hide_topmenu=' . GETPOST('dol_hide_topmenu', 'int');
         }
@@ -1222,14 +1298,21 @@ 
         if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
             print '<!-- Includes CSS for JQuery (Ajax library) -->' . "\n";
             $jquerytheme = 'base';
-            if (!empty($conf->global->MAIN_USE_JQUERY_THEME))
-                $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-            if (constant('JS_JQUERY_UI'))
-                print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";  // JQuery
-            else
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n";    // JQuery
-            if (!defined('DISABLE_JQUERY_JNOTIFY'))
-                print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";          // JNotify
+            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+                            $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+            }
+            if (constant('JS_JQUERY_UI')) {
+                            print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            }
+            // JQuery
+            else {
+                            print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            }
+            // JQuery
+            if (!defined('DISABLE_JQUERY_JNOTIFY')) {
+                            print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
+            }
+            // JNotify
             if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2"...
                 $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
                 print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/plugins/' . $tmpplugin . '/dist/css/' . $tmpplugin . '.css' . ($ext ? '?' . $ext : '') . '">' . "\n";
@@ -1257,8 +1340,9 @@ 
 
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
-        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME))
-            print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+                    print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->' . "\n" . '<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">' . "\n";
+        }
 
         // CSS forced by modules (relative url starting with /)
         if (!empty($conf->modules_parts['css'])) {
@@ -1266,13 +1350,15 @@ 
             foreach ($arraycss as $modcss => $filescss) {
                 $filescss = (array) $filescss; // To be sure filecss is an array
                 foreach ($filescss as $cssfile) {
-                    if (empty($cssfile))
-                        dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    if (empty($cssfile)) {
+                                            dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    }
                     // cssfile is a relative path
                     print '<!-- Includes CSS added by module ' . $modcss . ' -->' . "\n" . '<link rel="stylesheet" type="text/css" href="' . dol_buildpath($cssfile, 1);
                     // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-                    if (!preg_match('/\.css$/i', $cssfile))
-                        print $themeparam;
+                    if (!preg_match('/\.css$/i', $cssfile)) {
+                                            print $themeparam;
+                    }
                     print '">' . "\n";
                 }
             }
@@ -1282,8 +1368,9 @@ 
             foreach ($arrayofcss as $cssfile) {
                 print '<!-- Includes CSS added by page -->' . "\n" . '<link rel="stylesheet" type="text/css" title="default" href="' . dol_buildpath($cssfile, 1);
                 // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-                if (!preg_match('/\.css$/i', $cssfile))
-                    print $themeparam;
+                if (!preg_match('/\.css$/i', $cssfile)) {
+                                    print $themeparam;
+                }
                 print '">' . "\n";
             }
         }
@@ -1292,22 +1379,26 @@ 
         if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax)) {
             // JQuery. Must be before other includes
             print '<!-- Includes JS for JQuery -->' . "\n";
-            if (defined('JS_JQUERY') && constant('JS_JQUERY'))
-                print '<script type="text/javascript" src="' . JS_JQUERY . 'jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            else
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
+                            print '<script type="text/javascript" src="' . JS_JQUERY . 'jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            } else {
+                            print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            }
             if (!empty($conf->global->MAIN_FEATURES_LEVEL) && !defined('JS_JQUERY_MIGRATE_DISABLED')) {
-                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE'))
-                    print '<script type="text/javascript" src="' . JS_JQUERY_MIGRATE . 'jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-                else
-                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            }
-            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI'))
-                print '<script type="text/javascript" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            else
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
-            if (!defined('DISABLE_JQUERY_TABLEDND'))
-                print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/tablednd/jquery.tablednd.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) {
+                                    print '<script type="text/javascript" src="' . JS_JQUERY_MIGRATE . 'jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                } else {
+                                    print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-migrate.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+                }
+            }
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+                            print '<script type="text/javascript" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            } else {
+                            print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            }
+            if (!defined('DISABLE_JQUERY_TABLEDND')) {
+                            print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/tablednd/jquery.tablednd.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+            }
             // jQuery jnotify
             if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
                 print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/plugins/jnotify/jquery.jnotify.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
@@ -1378,10 +1469,12 @@ 
             // Browser notifications
             if (!defined('DISABLE_BROWSER_NOTIF')) {
                 $enablebrowsernotif = false;
-                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER))
-                    $enablebrowsernotif = true;
-                if ($conf->browser->layout == 'phone')
-                    $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                                    $enablebrowsernotif = true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                                    $enablebrowsernotif = false;
+                }
                 if ($enablebrowsernotif) {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = ' . $conf->browser->layout . ')-->' . "\n";
                     //print '<script type="text/javascript" src="' . DOL_BASE_URI . '/core/js/lib_notification.js.php' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
@@ -1418,10 +1511,12 @@ 
             }
         }
 
-        if (!empty($head))
-            print $head . "\n";
-        if (!empty($conf->global->MAIN_HTML_HEADER))
-            print $conf->global->MAIN_HTML_HEADER . "\n";
+        if (!empty($head)) {
+                    print $head . "\n";
+        }
+        if (!empty($conf->global->MAIN_HTML_HEADER)) {
+                    print $conf->global->MAIN_HTML_HEADER . "\n";
+        }
 
         print "<!-- Alixar debugBar header -->";
         print Debug::getRenderHeader(); // Includes Alixar debugBar header
@@ -1486,15 +1581,20 @@ 
         if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
             $appli = $conf->global->MAIN_APPLICATION_TITLE;
             if (preg_match('/\d\.\d/', $appli)) {
-                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                    $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-            } else
-                $appli .= " " . DOL_VERSION;
-        } else
-            $appli .= " " . DOL_VERSION;
+                if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                    $appli .= " (" . DOL_VERSION . ")";
+                }
+                // If new title contains a version that is different than core
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
+        } else {
+                    $appli .= " " . DOL_VERSION;
+        }
 
-        if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $appli .= "<br>" . $langs->trans("LevelOfFeature") . ': ' . $conf->global->MAIN_FEATURES_LEVEL;
+        }
 
         $logouttext = '';
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -1532,12 +1632,15 @@ 
         $parameters = array();
         $result = $hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (is_numeric($result)) {
-            if ($result == 0)
-                $toprightmenu .= $hookmanager->resPrint;  // add
-            else
-                $toprightmenu = $hookmanager->resPrint;      // replace
-        }
-        else {
+            if ($result == 0) {
+                            $toprightmenu .= $hookmanager->resPrint;
+            }
+            // add
+            else {
+                            $toprightmenu = $hookmanager->resPrint;
+            }
+            // replace
+        } else {
             $toprightmenu .= $result; // For backward compatibility
         }
 
@@ -1557,8 +1660,9 @@ 
 
             if (is_array($_POST)) {
                 foreach ($_POST as $key => $value) {
-                    if ($key !== 'action' && $key !== 'password' && !is_array($value))
-                        $qs .= '&' . $key . '=' . urlencode($value);
+                    if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
+                                            $qs .= '&' . $key . '=' . urlencode($value);
+                    }
                 }
             }
             $qs .= (($qs && $morequerystring) ? '&' : '') . $morequerystring;
@@ -1577,8 +1681,9 @@ 
             $helppage = '';
             $mode = '';
 
-            if (empty($helppagename))
-                $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+            if (empty($helppagename)) {
+                            $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+            }
 
             // Get helpbaseurl, helppage and mode from helppagename and langs
             $arrayres = getHelpParamFor($helppagename, $langs);
@@ -1595,13 +1700,15 @@ 
                 }
                 $title = $appli . '<br>';
                 $title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
-                if ($mode == 'wiki')
-                    $title .= ' - ' . $langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                if ($mode == 'wiki') {
+                                    $title .= ' - ' . $langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                }
                 $text .= '<a class="help" target="_blank" rel="noopener" href="';
-                if ($mode == 'wiki')
-                    $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
-                else
-                    $text .= sprintf($helpbaseurl, $helppage);
+                if ($mode == 'wiki') {
+                                    $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+                } else {
+                                    $text .= sprintf($helpbaseurl, $helppage);
+                }
                 $text .= '">';
                 //$text.=img_picto('', 'helpdoc_top').' ';
                 $text .= '<span class="fa fa-question-circle atoplogin"></span>';
@@ -1628,9 +1735,10 @@ 
         print "<!-- End top horizontal menu -->\n\n";
     }
 
-    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-        print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
-}
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+    }
+    }
 
 /**
  *  Show left menu bar
@@ -1654,8 +1762,9 @@ 
     $searchform = '';
     $bookmarks = '';
 
-    if (!empty($menu_array_before))
-        dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (!empty($menu_array_before)) {
+            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    }
 
     if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
         // Instantiate hooks of thirdparty module
@@ -1663,8 +1772,10 @@ 
 
         print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
 
-        if ($conf->browser->layout == 'phone')
-            $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+        if ($conf->browser->layout == 'phone') {
+                    $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
+        }
+        // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
         print "\n";
 
@@ -1691,8 +1802,9 @@ 
         $reshook = $hookmanager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
             $searchform .= $hookmanager->resPrint;
-        } else
-            $searchform = $hookmanager->resPrint;
+        } else {
+                    $searchform = $hookmanager->resPrint;
+        }
 
         // Force special value for $searchform
         if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
@@ -1736,38 +1848,49 @@ 
         if (empty($conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
             $doliurl = 'https://www.dolibarr.org';
             //local communities
-            if (preg_match('/fr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.fr';
-            if (preg_match('/es/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.es';
-            if (preg_match('/de/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.de';
-            if (preg_match('/it/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.it';
-            if (preg_match('/gr/i', $langs->defaultlang))
-                $doliurl = 'https://www.dolibarr.gr';
+            if (preg_match('/fr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.fr';
+            }
+            if (preg_match('/es/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.es';
+            }
+            if (preg_match('/de/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.de';
+            }
+            if (preg_match('/it/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.it';
+            }
+            if (preg_match('/gr/i', $langs->defaultlang)) {
+                            $doliurl = 'https://www.dolibarr.gr';
+            }
 
             $appli = constant('DOL_APPLICATION_TITLE');
             if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = $conf->global->MAIN_APPLICATION_TITLE;
                 $doliurl = '';
                 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli)) {
+                                            $appli .= " (" . DOL_VERSION . ")";
+                    }
+                    // If new title contains a version that is different than core
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
             print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-            if ($doliurl)
-                print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-            else
-                print '<span class="help">';
+            if ($doliurl) {
+                            print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+            } else {
+                            print '<span class="help">';
+            }
             print $appli;
-            if ($doliurl)
-                print '</a>';
-            else
-                print '</span>';
+            if ($doliurl) {
+                            print '</a>';
+            } else {
+                            print '</span>';
+            }
             print '</div>' . "\n";
         }
 
@@ -1814,9 +1937,10 @@ 
     print "\n";
     print '<!-- Begin right area -->' . "\n";
 
-    if (empty($leftmenuwithoutmainarea))
-        main_area($title);
-}
+    if (empty($leftmenuwithoutmainarea)) {
+            main_area($title);
+    }
+    }
 
 /**
  *  Begin main area
@@ -1828,16 +1952,18 @@ 
 {
     global $conf, $langs;
 
-    if (empty($conf->dol_hide_leftmenu))
-        print '<div id="id-right">';
+    if (empty($conf->dol_hide_leftmenu)) {
+            print '<div id="id-right">';
+    }
 
     print "\n";
 
     print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
 
-    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-        print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+    if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+            print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    }
+    }
 
 /**
  *  Return helpbaseurl, helppage and mode
@@ -1861,18 +1987,21 @@ 
         // If WIKI URL
         if (preg_match('/^es/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (preg_match('/^fr/i', $langs->defaultlang)) {
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         if (empty($helppage)) { // If help page not already found
             $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                $helppage = $reg[1];
+            if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                            $helppage = $reg[1];
+            }
         }
         $mode = 'wiki';
     }
@@ -1903,8 +2032,9 @@ 
     $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
     $ret .= '<input type="hidden" name="mode" value="search">';
     $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag($user->login) . '">';
-    if ($showtitlebefore)
-        $ret .= $title . ' ';
+    if ($showtitlebefore) {
+            $ret .= $title . ' ';
+    }
     $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
     $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
     $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
@@ -1947,10 +2077,12 @@ 
             foreach ($user->lastsearch_values_tmp as $key => $val) {
                 unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
-                    if (empty($val['sortfield']))
-                        unset($val['sortfield']);
-                    if (empty($val['sortorder']))
-                        unset($val['sortorder']);
+                    if (empty($val['sortfield'])) {
+                                            unset($val['sortfield']);
+                    }
+                    if (empty($val['sortorder'])) {
+                                            unset($val['sortorder']);
+                    }
                     dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
                     $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
                     unset($_SESSION['lastsearch_values_' . $key]);
@@ -1961,8 +2093,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
         // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
@@ -1970,12 +2103,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != $conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != $conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -2002,20 +2138,26 @@ 
 
         print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
 
-        if (empty($conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+        if (empty($conf->dol_hide_leftmenu)) {
+                    print '</div> <!-- End div id-right -->' . "\n";
+        }
+        // End div id-right
 
-        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty($conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";