--- /tmp/dsg/dolibarr/htdocs/github_document.php
+++ /tmp/dsg/dolibarr/htdocs/client_document.php
@@ -76,7 +76,7 @@
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

 

 $encoding = '';

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).

 $hashp = GETPOST('hashp', 'aZ09');

 $modulepart = GETPOST('modulepart', 'alpha');

@@ -133,14 +133,20 @@
 				// We remove first level of directory

 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir

 				//var_dump($original_file); exit;

-			} else {

+			}

+			else

+			{

 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);

 			}

-		} else {

+		}

+		else

+		{

 			$modulepart = $moduleparttocheck;

 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir

 		}

-	} else {

+	}

+	else

+	{

 		$langs->load("errors");

 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);

 	}

@@ -153,15 +159,11 @@
 if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;

 

 // Define mime type

-$type = 'application/octet-stream'; // By default

+$type = 'application/octet-stream';

 if (GETPOST('type', 'alpha')) $type = GETPOST('type', 'alpha');

 else $type = dol_mimetype($original_file);

-// Security: Force to octet-stream if file is a dangerous file. For example when it is a .noexe file

-// We do not force if file is a javascript to be able to get js from website module with <script src="

-// Note: Force whatever is $modulepart seems ok.

-if (!in_array($type, array('text/x-javascript')) && !dolIsAllowedForPreview($original_file)) {

-	$type = 'application/octet-stream';

-}

+// Security: Force to octet-stream if file is a dangerous file

+if (preg_match('/\.noexe$/i', $original_file)) $type = 'application/octet-stream';

 

 // Security: Delete string ../ into $original_file

 $original_file = str_replace("../", "/", $original_file);

@@ -173,17 +175,18 @@
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');

 

 // Check security and set return info with full path of file

-$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, $refname);

+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);

 $accessallowed              = $check_access['accessallowed'];

 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];

 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name

-//var_dump($fullpath_original_file);exit;

 

 if (!empty($hashp))

 {

 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed

 	$sqlprotectagainstexternals = '';

-} else {

+}

+else

+{

 	// Basic protection (against external users only)

 	if ($user->socid > 0)

 	{

@@ -221,7 +224,7 @@
 if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file))

 {

 	dol_syslog("Refused to deliver file ".$fullpath_original_file);

-	print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);

+	print "ErrorFileNameInvalid: ".$original_file;

 	exit;

 }

 

@@ -240,23 +243,6 @@
 {

 	dol_syslog("ErrorFileDoesNotExists: ".$fullpath_original_file);

 	print "ErrorFileDoesNotExists: ".$original_file;

-	exit;

-}

-

-// Hooks

-if (!is_object($hookmanager)) {

-	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

-	$hookmanager = new HookManager($this->db);

-}

-$hookmanager->initHooks(array('document'));

-$parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,

-	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,

-	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);

-$reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been

-if ($reshook < 0) {

-	$errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join($separator, $hookmanager->errors) : '');

-	dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);

-	print "ErrorDownloadDocumentHooks: ".$errors;

 	exit;

 }

 

@@ -278,11 +264,9 @@
 	$readfile = !$imgres;

 }

 

-if (is_object($db)) $db->close();

-

-// Send file now

 if ($readfile) {

 	header('Content-Length: '.dol_filesize($fullpath_original_file));

-

-	readfileLowMemory($fullpath_original_file_osencoded);

-}

+	readfile($fullpath_original_file_osencoded);

+}

+

+if (is_object($db)) $db->close();

--- /tmp/dsg/dolibarr/htdocs/github_filefunc.inc.php
+++ /tmp/dsg/dolibarr/htdocs/client_filefunc.inc.php
@@ -31,7 +31,7 @@
  */

 

 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');

-if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.2'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c

+if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.1'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c

 

 if (!defined('EURO')) define('EURO', chr(128));

 

@@ -75,34 +75,36 @@
 

 if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done and we are in a web session

 {

-	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 .= '/';

-	}

-	elseif (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,

-		// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.

-		$path = '';

-	} else {

-		// If what we look is not index.php, we can try to guess location of root. May not work all the time.

-		// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.

-		// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php

-		$TDir = explode('/', $_SERVER['PHP_SELF']);

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

-

-			$path .= '../';

-		}

-	}

+    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 .= '/';

+    }

+    elseif (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,

+    	// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.

+        $path = '';

+    }

+    else

+    {

+        // If what we look is not index.php, we can try to guess location of root. May not work all the time.

+    	// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.

+    	// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php

+        $TDir = explode('/', $_SERVER['PHP_SELF']);

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

+

+    		$path .= '../';

+    	}

+    }

 

 	header("Location: ".$path."install/index.php");

 	exit;

@@ -112,7 +114,9 @@
 if (!empty($dolibarr_strict_mode))

 {

 	error_reporting(E_ALL | E_STRICT);

-} else {

+}

+else

+{

 	error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));

 }

 

@@ -149,24 +153,25 @@
 if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))

 {

 	if (!empty($_SERVER['REQUEST_METHOD']) && !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')) && !empty($_SERVER['HTTP_HOST']))

-	{

-		$csrfattack = false;

-		if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used

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

-		{

-			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];

-			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.

-			print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";

-			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";

-			die;

-		}

-	}

-	// Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.

+    {

+    	$csrfattack = false;

+    	if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used

+    	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 ($csrfattack)

+    	{

+    		//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];

+    		// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.

+    		print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";

+        	print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";

+    		die;

+    	}

+    }

+    // Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.

 }

 if (empty($dolibarr_main_db_host))

 {

@@ -197,27 +202,27 @@
 $found = 0;

 $real_dolibarr_main_document_root = str_replace('\\', '/', realpath($dolibarr_main_document_root)); // A) Value found into config file, to say where are store htdocs files. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs

 if (!empty($_SERVER["DOCUMENT_ROOT"])) {

-	$pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs

+    $pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs

 } else {

-	$pathroot = 'NOTDEFINED';

+    $pathroot = 'NOTDEFINED';

 }

 $paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php

 // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part.

 $concatpath = '';

 foreach ($paths as $tmppath)	// We check to find (B+start of C)=A

 {

-	if (empty($tmppath)) continue;

-	$concatpath .= '/'.$tmppath;

-	//if ($tmppath) $concatpath.='/'.$tmppath;

-	//print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';

-	if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.

-	{

-		//print "Found relative url = ".$concatpath;

-		$tmp3 = $concatpath;

-		$found = 1;

-		break;

-	}

-	//else print "Not found yet for concatpath=".$concatpath."<br>\n";

+    if (empty($tmppath)) continue;

+    $concatpath .= '/'.$tmppath;

+    //if ($tmppath) $concatpath.='/'.$tmppath;

+    //print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';

+    if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.

+    {

+        //print "Found relative url = ".$concatpath;

+    	$tmp3 = $concatpath;

+        $found = 1;

+        break;

+    }

+    //else print "Not found yet for concatpath=".$concatpath."<br>\n";

 }

 //print "found=".$found." dolibarr_main_url_root=".$dolibarr_main_url_root."\n";

 if (!$found) $tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).

@@ -242,15 +247,20 @@
  */

 // Path to root libraries

 if (!defined('ADODB_PATH')) { define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH.'/')); }

+if (!defined('FPDF_PATH')) { define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/fpdf/' : $dolibarr_lib_FPDF_PATH.'/'); }	// Used only for package that can't include tcpdf

 if (!defined('TCPDF_PATH')) { define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/'); }

+if (!defined('FPDI_PATH')) { define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/fpdfi/' : $dolibarr_lib_FPDI_PATH.'/'); }

 if (!defined('TCPDI_PATH')) { define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/'); }

 if (!defined('NUSOAP_PATH')) { define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/')); }

+if (!defined('PHPEXCEL_PATH')) { define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH.'/')); }

 if (!defined('PHPEXCELNEW_PATH')) { define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/')); }

+if (!defined('GEOIP_PATH')) { define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/geoip/' : (empty($dolibarr_lib_GEOIP_PATH) ? '' : $dolibarr_lib_GEOIP_PATH.'/')); }

 if (!defined('ODTPHP_PATH')) { define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/')); }

 if (!defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/')); }

 if (!defined('JS_CKEDITOR')) { define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/')); }

 if (!defined('JS_JQUERY')) { define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY.'/')); }

 if (!defined('JS_JQUERY_UI')) { define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI.'/')); }

+if (!defined('JS_JQUERY_FLOT')) { define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT)) ? '' : (empty($dolibarr_js_JQUERY_FLOT) ? '' : $dolibarr_js_JQUERY_FLOT.'/')); }

 // Other required path

 if (!defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF) ? '' : $dolibarr_font_DOL_DEFAULT_TTF)); }

 if (!defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD) ? '' : $dolibarr_font_DOL_DEFAULT_TTF_BOLD)); }

@@ -275,13 +285,14 @@
 include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';

 //print memory_get_usage();

 

-// If password is encoded, we decode it. Note: When page is called for install, $dolibarr_main_db_pass may not be defined yet.

-if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) || !empty($dolibarr_main_db_encrypted_pass)) {

-	if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) {

+// If password is encoded, we decode it

+if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))

+{

+	if (preg_match('/crypted:/i', $dolibarr_main_db_pass))

+	{

 		$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

 		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);

 		$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted

-	} else {

-		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);

 	}

-}

+	else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);

+}

--- /tmp/dsg/dolibarr/htdocs/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/client_index.php
@@ -43,13 +43,13 @@
 // Check if company name is defined (first install)

 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))

 {

-	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");

-	exit;

+    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");

+    exit;

 }

 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled

 {

-	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");

-	exit;

+    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");

+    exit;

 }

 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)

 {

@@ -68,7 +68,7 @@
  * View

  */

 

-if (!isset($form) || !is_object($form)) $form = new Form($db);

+if (!is_object($form)) $form = new Form($db);

 

 // Title

 $title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;

@@ -84,20 +84,22 @@
 

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

 {

-	$conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);

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

-	{

-		$substitutionarray = getCommonSubstitutionArray($langs);

-		complete_substitutions_array($substitutionarray, $langs);

-		$texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);

-

-		print "\n<!-- Start of welcome text -->\n";

-		print '<table width="100%" class="notopnoleftnoright"><tr><td>';

-		print dol_htmlentitiesbr($texttoshow);

-		print '</td></tr></table><br>';

-		print "\n<!-- End of welcome text -->\n";

-	}

+    $conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);

+    if (!empty($conf->global->MAIN_MOTD))

+    {

+        $substitutionarray = getCommonSubstitutionArray($langs);

+        complete_substitutions_array($substitutionarray, $langs);

+        $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);

+

+        print "\n<!-- Start of welcome text -->\n";

+        print '<table width="100%" class="notopnoleftnoright"><tr><td>';

+        print dol_htmlentitiesbr($texttoshow);

+        print '</td></tr></table><br>';

+        print "\n<!-- End of welcome text -->\n";

+    }

 }

+

+

 

 

 

@@ -115,211 +117,210 @@
 // Load global statistics of objects

 if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))

 {

-	$object = new stdClass();

-	$parameters = array();

-	$action = '';

-	$reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

-	$boxstatFromHook = $hookmanager->resPrint;

-

-	if (empty($reshook))

-	{

-		// Cle array returned by the method load_state_board for each line

-		$keys = array(

-			'users',

-			'members',

-			'expensereports',

-			'holidays',

-			'customers',

-			'prospects',

-			'suppliers',

-			'contacts',

-			'products',

-			'services',

-			'projects',

-			'proposals',

-			'orders',

-			'invoices',

-			'donations',

-			'supplier_proposals',

-			'supplier_orders',

-			'supplier_invoices',

-			'contracts',

-			'interventions',

-			'ticket'

-		);

-

-		// Condition to be checked for each display line dashboard

-		$conditions = array(

-			'users' => $user->rights->user->user->lire,

-			'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,

-			'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),

-			'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),

-			'suppliers' => !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),

-			'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,

-			'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,

-			'services' => !empty($conf->service->enabled) && $user->rights->service->lire,

-			'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,

-			'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,

-			'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,

-			'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,

-			'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,

-			'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,

+    $object = new stdClass();

+    $parameters = array();

+    $action = '';

+    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

+    $boxstatFromHook = $hookmanager->resPrint;

+

+    if (empty($reshook))

+    {

+    	// Cle array returned by the method load_state_board for each line

+    	$keys = array(

+    		'users',

+    		'members',

+    		'expensereports',

+    		'holidays',

+    		'customers',

+    		'prospects',

+    		'suppliers',

+    		'contacts',

+    		'products',

+    		'services',

+    		'projects',

+    		'proposals',

+    		'orders',

+    		'invoices',

+    		'donations',

+    		'supplier_proposals',

+    		'supplier_orders',

+    		'supplier_invoices',

+    		'contracts',

+    		'interventions',

+    		'ticket'

+    	);

+

+	    // Condition to be checked for each display line dashboard

+	    $conditions = array(

+	    	'users' => $user->rights->user->user->lire,

+	    	'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,

+	    	'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),

+	    	'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),

+	    	'suppliers' => !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),

+		    'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,

+		    'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,

+		    'services' => !empty($conf->service->enabled) && $user->rights->service->lire,

+		    'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,

+		    'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,

+		    'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,

+	    	'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,

+	    	'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,

+		    'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,

 			'supplier_orders' => !empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),

 			'supplier_invoices' => !empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),

 			'supplier_proposals' => !empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),

-			'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,

-			'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,

-			'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,

-			'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read

-		);

-		// Class file containing the method load_state_board for each line

-		$includes = array(

-			'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",

-			'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",

-			'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",

-			'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",

-			'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",

-			'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",

-			'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",

-			'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",

-			'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",

-			'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",

-			'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",

-			'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",

-			'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",

-			'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",

-			'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",

-			'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",

-			'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",

-			'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",

-			'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",

-			'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",

-			'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php"

-		);

-		// Name class containing the method load_state_board for each line

-		$classes = array(

-			'users' => 'User',

-			'members' => 'Adherent',

-			'customers' => 'Client',

-			'prospects' => 'Client',

-			'suppliers' => 'Fournisseur',

-			'contacts' => 'Contact',

-			'products' => 'Product',

-			'services' => 'ProductService',

-			'proposals' => 'Propal',

-			'orders' => 'Commande',

-			'invoices' => 'Facture',

-			'donations' => 'Don',

-			'contracts' => 'Contrat',

-			'interventions' => 'Fichinter',

-			'supplier_orders' => 'CommandeFournisseur',

-			'supplier_invoices' => 'FactureFournisseur',

-			'supplier_proposals' => 'SupplierProposal',

-			'projects' => 'Project',

-			'expensereports' => 'ExpenseReport',

-			'holidays' => 'Holiday',

-			'ticket' => 'Ticket',

-		);

-		// Translation keyword

-		$titres = array(

-			'users' => "Users",

-			'members' => "Members",

-			'customers' => "ThirdPartyCustomersStats",

-			'prospects' => "ThirdPartyProspectsStats",

-			'suppliers' => "Suppliers",

-			'contacts' => "Contacts",

-			'products' => "Products",

-			'services' => "Services",

-			'proposals' => "CommercialProposalsShort",

-			'orders' => "CustomersOrders",

-			'invoices' => "BillsCustomers",

-			'donations' => "Donations",

-			'contracts' => "Contracts",

-			'interventions' => "Interventions",

-			'supplier_orders' => "SuppliersOrders",

-			'supplier_invoices' => "SuppliersInvoices",

-			'supplier_proposals' => "SupplierProposalShort",

-			'projects' => "Projects",

-			'expensereports' => "ExpenseReports",

-			'holidays' => "Holidays",

-			'ticket' => "Ticket",

-		);

-		// Dashboard Link lines

-		$links = array(

-			'users' => DOL_URL_ROOT.'/user/list.php',

-			'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',

-			'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',

-			'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',

-			'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',

-			'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',

-			'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',

-			'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',

-			'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',

-			'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',

-			'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',

-			'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',

-			'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',

-			'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',

-			'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',

-			'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',

-			'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',

-			'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',

-			'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',

-			'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',

-			'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket'

-		);

-		// Translation lang files

-		$langfile = array(

-			'customers' => "companies",

-			'contacts' => "companies",

-			'services' => "products",

-			'proposals' => "propal",

-			'invoices' => "bills",

-			'supplier_orders' => "orders",

-			'supplier_invoices' => "bills",

-			'supplier_proposals' => 'supplier_proposal',

-			'expensereports' => "trips",

-			'holidays' => "holiday",

-		);

-

-

-		// Loop and displays each line of table

+		    'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,

+		    'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,

+	        'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,

+		    'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read

+	    );

+	    // Class file containing the method load_state_board for each line

+	    $includes = array(

+	    	'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",

+	    	'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",

+	    	'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",

+	    	'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",

+	    	'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",

+	    	'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",

+	    	'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",

+	    	'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",

+	    	'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",

+	    	'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",

+	    	'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",

+	    	'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",

+	    	'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",

+	    	'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",

+	    	'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",

+	    	'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",

+	    	'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",

+	    	'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",

+	    	'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",

+	    	'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",

+	    	'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php"

+	    );

+	    // Name class containing the method load_state_board for each line

+	    $classes = array(

+	    	'users' => 'User',

+	    	'members' => 'Adherent',

+	    	'customers' => 'Client',

+	    	'prospects' => 'Client',

+	    	'suppliers' => 'Fournisseur',

+	    	'contacts' => 'Contact',

+	    	'products' => 'Product',

+	    	'services' => 'ProductService',

+	    	'proposals' => 'Propal',

+	    	'orders' => 'Commande',

+	    	'invoices' => 'Facture',

+	    	'donations' => 'Don',

+	    	'contracts' => 'Contrat',

+	    	'interventions' => 'Fichinter',

+	    	'supplier_orders' => 'CommandeFournisseur',

+	    	'supplier_invoices' => 'FactureFournisseur',

+	    	'supplier_proposals' => 'SupplierProposal',

+	    	'projects' => 'Project',

+	    	'expensereports' => 'ExpenseReport',

+	    	'holidays' => 'Holiday',

+	    	'ticket' => 'Ticket',

+	    );

+	    // Translation keyword

+	    $titres = array(

+	    	'users' => "Users",

+	    	'members' => "Members",

+	    	'customers' => "ThirdPartyCustomersStats",

+	    	'prospects' => "ThirdPartyProspectsStats",

+	    	'suppliers' => "Suppliers",

+	    	'contacts' => "Contacts",

+	    	'products' => "Products",

+	    	'services' => "Services",

+	    	'proposals' => "CommercialProposalsShort",

+	    	'orders' => "CustomersOrders",

+	    	'invoices' => "BillsCustomers",

+	    	'donations' => "Donations",

+	    	'contracts' => "Contracts",

+	    	'interventions' => "Interventions",

+	    	'supplier_orders' => "SuppliersOrders",

+	    	'supplier_invoices' => "SuppliersInvoices",

+	    	'supplier_proposals' => "SupplierProposalShort",

+	    	'projects' => "Projects",

+	    	'expensereports' => "ExpenseReports",

+	    	'holidays' => "Holidays",

+	    	'ticket' => "Ticket",

+	    );

+	    // Dashboard Link lines

+	    $links = array(

+	    	'users' => DOL_URL_ROOT.'/user/list.php',

+	    	'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',

+	    	'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',

+	    	'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',

+	    	'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',

+	    	'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',

+	    	'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',

+	    	'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',

+	    	'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',

+	    	'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',

+	    	'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',

+	    	'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',

+	    	'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',

+	    	'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',

+	    	'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',

+	    	'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',

+	    	'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',

+	    	'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',

+	    	'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',

+	    	'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',

+	    	'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket'

+	    );

+	    // Translation lang files

+	    $langfile = array(

+	    	'customers' => "companies",

+	    	'contacts' => "companies",

+	    	'services' => "products",

+	    	'proposals' => "propal",

+	    	'invoices' => "bills",

+	    	'supplier_orders' => "orders",

+	    	'supplier_invoices' => "bills",

+	    	'supplier_proposals' => 'supplier_proposal',

+	    	'expensereports' => "trips",

+	    	'holidays' => "holiday",

+	    );

+

+

+	    // Loop and displays each line of table

 		$boardloaded = array();

-		foreach ($keys as $val)

-		{

-			if ($conditions[$val])

-			{

-				$boxstatItem = '';

-				$class = $classes[$val];

-				// Search in cache if load_state_board is already realized

-				$classkeyforcache = $class;

-				if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product'; // ProductService use same load_state_board than Product

-

-				if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache]))

-				{

-					include_once $includes[$val]; // Loading a class cost around 1Mb

-

-					$board = new $class($db);

-					$board->load_state_board();

-					$boardloaded[$class] = $board;

-				} else {

-					$board = $boardloaded[$classkeyforcache];

-				}

-

-				$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);

-

-				$text = $langs->trans($titres[$val]);

-				$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';

-				$boxstatItem .= '<div class="boxstats">';

-				$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';

-				$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';

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

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

-

-				$boxstatItems[$val] = $boxstatItem;

-			}

-		}

-	}

+	    foreach ($keys as $val)

+	    {

+	        if ($conditions[$val])

+	        {

+                $boxstatItem = '';

+	            $class = $classes[$val];

+	            // Search in cache if load_state_board is already realized

+	            if (!isset($boardloaded[$class]) || !is_object($boardloaded[$class]))

+	            {

+	            	include_once $includes[$val]; // Loading a class cost around 1Mb

+

+	                $board = new $class($db);

+	                $board->load_state_board();

+	                $boardloaded[$class] = $board;

+	            }

+	            else

+	            {

+	                $board = $boardloaded[$class];

+	            }

+

+            	$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);

+

+	            $text = $langs->trans($titres[$val]);

+	            $boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';

+	            $boxstatItem .= '<div class="boxstats">';

+	            $boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';

+	            $boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';

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

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

+

+                $boxstatItems[$val] = $boxstatItem;

+	        }

+	    }

+    }

 }

 

 

@@ -328,555 +329,535 @@
 // Dolibarr Working Board with weather

 

 if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {

-	$showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;

-

-	//Array that contains all WorkboardResponse classes to process them

-	$dashboardlines = array();

-

-	// Do not include sections without management permission

-	require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';

-

-	// Number of actions to do (late)

-	if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {

-		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-		$board = new ActionComm($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of project opened

-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {

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

-		$board = new Project($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of tasks to do (late)

-	if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

-		$board = new Task($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of commercial proposals open (expired)

-	if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';

-		$board = new Propal($db);

-		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

-		// Number of commercial proposals CLOSED signed (billed)

-		$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");

-	}

-

-	// Number of commercial proposals open (expired)

-	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';

-		$board = new SupplierProposal($db);

-		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

-		// Number of commercial proposals CLOSED signed (billed)

-		$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");

-	}

-

-	// Number of customer orders a deal

-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

-		$board = new Commande($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of suppliers orders a deal

-	if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';

-		$board = new CommandeFournisseur($db);

-		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

-		$dashboardlines[$board->element.'_awaiting'] = $board->load_board($user, 'awaiting');

-	}

-

-	// Number of contract / services enabled (delayed)

-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';

-		$board = new Contrat($db);

-		$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");

-		// Number of active services (expired)

-		$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");

-	}

-

-	// Number of tickets open

-	if (!empty($conf->ticket->enabled) && $user->rights->ticket->read) {

-		include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';

-		$board = new Ticket($db);

-		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

-		// Number of active services (expired)

-		//$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");

-	}

-

-	// Number of invoices customers (paid)

-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {

-		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

-		$board = new Facture($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of supplier invoices (paid)

-	if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {

-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';

-		$board = new FactureFournisseur($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of transactions to conciliate

-	if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid) {

-		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

-		$board = new Account($db);

-		$nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate

-		if ($nb > 0) {

-			$dashboardlines[$board->element] = $board->load_board($user);

-		}

-	}

-

-	// Number of cheque to send

-	if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {

-		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';

-		$board = new RemiseCheque($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	// Number of foundation members

-	if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {

-		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

-		$board = new Adherent($db);

-		$dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');

-		$dashboardlines[$board->element.'_expired'] = $board->load_board($user, 'expired');

-	}

-

-	// Number of expense reports to approve

-	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {

-		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';

-		$board = new ExpenseReport($db);

-		$dashboardlines[$board->element.'_toapprove'] = $board->load_board($user, 'toapprove');

-	}

-

-	// Number of expense reports to pay

-	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {

-		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';

-		$board = new ExpenseReport($db);

-		$dashboardlines[$board->element.'_topay'] = $board->load_board($user, 'topay');

-	}

-

-	// Number of holidays to approve

-	if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {

-		include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';

-		$board = new Holiday($db);

-		$dashboardlines[$board->element] = $board->load_board($user);

-	}

-

-	$object = new stdClass();

-	$parameters = array();

-	$action = '';

-	$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object,

-		$action); // Note that $action and $object may have been modified by some hooks

-	if ($reshook == 0) {

-		$dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);

-	}

-

-	/* Open object dashboard */

-	$dashboardgroup = array(

-		'action' =>

-			array(

-				'groupName' => 'Agenda',

-				'stats' => array('action'),

-			),

-		'project' =>

-			array(

-				'groupName' => 'Projects',

-				'globalStatsKey' => 'projects',

-				'stats' => array('project', 'project_task'),

-			),

-		'propal' =>

-			array(

-				'groupName' => 'Proposals',

-				'globalStatsKey' => 'proposals',

-				'stats' =>

-					array('propal_opened', 'propal_signed'),

-			),

-		'commande' =>

-			array(

-				'groupName' => 'Orders',

-				'globalStatsKey' => 'orders',

-				'stats' =>

-					array('commande'),

-			),

-		'facture' =>

-			array(

-				'groupName' => 'Invoices',

-				'globalStatsKey' => 'invoices',

-				'stats' =>

-					array('facture'),

-			),

-		'supplier_proposal' =>

-			array(

-				'groupName' => 'SupplierProposals',

-				'globalStatsKey' => 'askprice',

-				'stats' =>

-					array('supplier_proposal_opened', 'supplier_proposal_signed'),

-			),

-		'order_supplier' =>

-			array(

-				'groupName' => 'SuppliersOrders',

-				'globalStatsKey' => 'supplier_orders',

-				'stats' =>

-					array('order_supplier_opened', 'order_supplier_awaiting'),

-			),

-		'invoice_supplier' =>

-			array(

-				'groupName' => 'BillsSuppliers',

-				'globalStatsKey' => 'supplier_invoices',

-				'stats' =>

-					array('invoice_supplier'),

-			),

-		'contrat' =>

-			array(

-				'groupName' => 'Contracts',

-				'globalStatsKey' => 'Contracts',

-				'stats' =>

-				array('contrat_inactive', 'contrat_active'),

-			),

-		'ticket' =>

-			array(

-				'groupName' => 'Tickets',

-				'globalStatsKey' => 'ticket',

-				'stats' =>

-					array('ticket_opened'),

-			),

-		'bank_account' =>

-			array(

-				'groupName' => 'BankAccount',

-				'stats' =>

-					array('bank_account', 'chequereceipt'),

-			),

-		'member' =>

-			array(

-				'groupName' => 'Members',

-				'globalStatsKey' => 'members',

-				'stats' =>

-					array('member_shift', 'member_expired'),

-			),

-		'expensereport' =>

-			array(

-				'groupName' => 'ExpenseReport',

-				'globalStatsKey' => 'expensereports',

-				'stats' =>

-					array('expensereport_toapprove', 'expensereport_topay'),

-			),

-		'holiday' =>

-			array(

-				'groupName' => 'Holidays',

-				'globalStatsKey' => 'holidays',

-				'stats' =>

-					array('holiday'),

-			),

-	);

-

-	$object = new stdClass();

-	$parameters = array(

-		'dashboardgroup' => $dashboardgroup

-	);

-	$reshook = $hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

-	if ($reshook == 0) {

-		$dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);

-	}

-

-

-	// Calculate total nb of late

-	$totallate = $totaltodo = 0;

-

-	//Remove any invalid response

-	//load_board can return an integer if failed or WorkboardResponse if OK

-	$valid_dashboardlines = array();

-	foreach ($dashboardlines as $workboardid => $tmp) {

-		if ($tmp instanceof WorkboardResponse) {

-			$tmp->id = $workboardid; // Complete the object to add its id into its name

-			$valid_dashboardlines[$workboardid] = $tmp;

-		}

-	}

-

-	// We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop

-	foreach ($valid_dashboardlines as $board) {

-		if ($board->nbtodolate > 0) {

-			$totaltodo += $board->nbtodo;

-			$totallate += $board->nbtodolate;

-		}

-	}

-

-	$openedDashBoardSize = 'info-box-sm'; // use sm by default

-	foreach ($dashboardgroup as $dashbordelement) {

-		if (is_array($dashbordelement['stats']) && count($dashbordelement['stats']) > 2) {

-			$openedDashBoardSize = ''; // use default info box size : big

-			break;

-		}

-	}

-

-	$totalLateNumber = $totallate;

-	$totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);

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

-		$totallate = $totallatePercentage;

-	}

-

-	$boxwork = '';

-	$boxwork .= '<div class="box">';

-	$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";

-	$boxwork .= '<tr class="liste_titre">';

-	$boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">'.$langs->trans("DolibarrWorkBoard").'</div>';

-	if ($showweather) {

-		if ($totallate > 0) {

-			$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",

-					$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';

-		} else {

-			$text = $langs->transnoentitiesnoconv("NoItemLate");

-		}

-		$text .= '. '.$langs->transnoentitiesnoconv("LateDesc");

-		//$text.=$form->textwithpicto('',$langs->trans("LateDesc"));

-		$options = 'height="24px" style="float: right"';

-		$boxwork .= showWeather($totallate, $text, $options, 'inline-block valignmiddle');

-	}

-	$boxwork .= '</th>';

-	$boxwork .= '</tr>'."\n";

-

-	// Show dashboard

-	$nbworkboardempty = 0;

-	$isIntopOpenedDashBoard = $globalStatInTopOpenedDashBoard = array();

-	if (!empty($valid_dashboardlines)) {

-		$openedDashBoard = '';

-

-		$boxwork .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">';

-

-		foreach ($dashboardgroup as $groupKey => $groupElement) {

-			$boards = array();

-			if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {

-				foreach ($groupElement['stats'] as $infoKey) {

-					if (!empty($valid_dashboardlines[$infoKey])) {

-						$boards[] = $valid_dashboardlines[$infoKey];

-						$isIntopOpenedDashBoard[] = $infoKey;

-					}

-				}

-			}

-

-			if (!empty($boards)) {

-				$groupName = $langs->trans($groupElement['groupName']);

-				$groupKeyLowerCase = strtolower($groupKey);

-				$nbTotalForGroup = 0;

-

-				// global stats

-				$globalStatsKey = false;

-				if (!empty($groupElement['globalStatsKey']) && empty($groupElement['globalStats'])) { // can be filled by hook

-					$globalStatsKey = $groupElement['globalStatsKey'];

-					$groupElement['globalStats'] = array();

-

-					if (is_array($keys) && in_array($globalStatsKey, $keys))

-					{

-						// get key index of stats used in $includes, $classes, $keys, $icons, $titres, $links

-						$keyIndex = array_search($globalStatsKey, $keys);

-

-						$classe = $classes[$keyIndex];

-						if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe]))

-						{

-							$groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;

-							$nbTotal = doubleval($groupElement['globalStats']['total']);

-							if ($nbTotal >= 10000) { $nbTotal = round($nbTotal / 1000, 2).'k'; }

-							$groupElement['globalStats']['text'] = $langs->trans('Total').' : '.$langs->trans($titres[$keyIndex]).' ('.$groupElement['globalStats']['total'].')';

-							$groupElement['globalStats']['total'] = $nbTotal;

-							$groupElement['globalStats']['link'] = $links[$keyIndex];

-						}

-					}

-				}

-

-				$openedDashBoard .= '<div class="box-flex-item"><div class="box-flex-item-with-margin">'."\n";

-				$openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";

-				$openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";

-				$openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";

-

-				// Show the span for the total of record

-				if (!empty($groupElement['globalStats'])) {

-					$globalStatInTopOpenedDashBoard[] = $globalStatsKey;

-					$openedDashBoard .= '<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>';

-				}

-

-				$openedDashBoard .= '</span>'."\n";

-				$openedDashBoard .= '<div class="info-box-content">'."\n";

-

-				$openedDashBoard .= '<div class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</div>'."\n";

-				$openedDashBoard .= '<div class="info-box-lines">'."\n";

-

-				foreach ($boards as $board) {

-					$openedDashBoard .= '<div class="info-box-line">';

-

-					if (!empty($board->labelShort)) {

-						$infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';

-					} else {

-						$infoName = $board->label;

-					}

-

-					$textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);

-					$textLateTitle .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';

-

-					if ($board->id == 'bank_account') {

-						$textLateTitle .= '<br><span class="opacitymedium">'.$langs->trans("IfYouDontReconcileDisableProperty", $langs->transnoentitiesnoconv("Conciliable")).'</span>';

-					}

-

-					$textLate = '';

-					if ($board->nbtodolate > 0) {

-						$textLate .= '<span title="'.dol_escape_htmltag($textLateTitle).'" class="classfortooltip badge badge-warning">';

-						$textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;

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

-					}

-

-					$nbtodClass = '';

-					if ($board->nbtodo > 0) {

-						$nbtodClass = 'badge badge-info';

-					}

-

-					$openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text info-box-text-a">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>';

-					if ($textLate) {

-						if ($board->url_late) {

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

-							$openedDashBoard .= ' <a href="'.$board->url_late.'" class="info-box-text info-box-text-a paddingleft">';

-						} else {

-							$openedDashBoard .= ' ';

-						}

-						$openedDashBoard .= $textLate;

-					}

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

-

-					if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {

-						$openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total).'</a>';

-					}

-					$openedDashBoard .= '</div>'."\n";

-				}

-

-				// TODO Add hook here to add more "info-box-line"

-

-				$openedDashBoard .= '		</div><!-- /.info-box-lines --></div><!-- /.info-box-content -->'."\n";

-				$openedDashBoard .= '	</div><!-- /.info-box -->'."\n";

-				$openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";

-				$openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";

-				$openedDashBoard .= "\n";

-			}

-		}

-

-		if ($showweather && !empty($isIntopOpenedDashBoard)) {

-			$appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';

-			$weather = getWeatherStatus($totallate);

-

-			$text = '';

-			if ($totallate > 0) {

-				$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",

-						$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';

-			} else {

-				$text = $langs->transnoentitiesnoconv("NoItemLate");

-			}

-			$text .= '. '.$langs->transnoentitiesnoconv("LateDesc");

-

-			$weatherDashBoard = '<div class="box-flex-item '.$appendClass.'"><div class="box-flex-item-with-margin">'."\n";

-			$weatherDashBoard .= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";

-			$weatherDashBoard .= '		<span class="info-box-icon">';

-			$weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');

-			$weatherDashBoard .= '       </span>'."\n";

-			$weatherDashBoard .= '		<div class="info-box-content">'."\n";

-			$weatherDashBoard .= '			<div class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</div>'."\n";

-

-			if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {

-				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",

-						price($totallatePercentage).'%').'</span>'."\n";

-				$weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',

-						$totalLateNumber).'</span>'."\n";

-			} else {

-				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",

-						$totalLateNumber).'</span>'."\n";

-				if ($totallatePercentage > 0) {

-					$weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',

-							price($totallatePercentage).'%').'</span>'."\n";

-				}

-			}

-

-			$weatherDashBoard .= '		</div><!-- /.info-box-content -->'."\n";

-			$weatherDashBoard .= '	</div><!-- /.info-box -->'."\n";

-			$weatherDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";

-			$weatherDashBoard .= '</div><!-- /.box-flex-item -->'."\n";

-			$weatherDashBoard .= "\n";

-

-			$openedDashBoard = $weatherDashBoard.$openedDashBoard;

-		}

-

-		if (!empty($isIntopOpenedDashBoard)) {

-			for ($i = 1; $i <= 10; $i++) {

-				$openedDashBoard .= '<div class="box-flex-item filler"></div>';

-			}

-		}

-

-		$nbworkboardcount = 0;

-		foreach ($valid_dashboardlines as $infoKey => $board) {

-			if (in_array($infoKey, $isIntopOpenedDashBoard)) {

-				// skip if info is present on top

-				continue;

-			}

-

-			if (empty($board->nbtodo)) {

-				$nbworkboardempty++;

-			}

-			$nbworkboardcount++;

-

-

-			$textlate = $langs->trans("NActionsLate", $board->nbtodolate);

-			$textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';

-

-

-			$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';

-			$boxwork .= '<div class="boxstatscontent">';

-			$boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' <span>'.$board->label.'</span></span><br>';

-			$boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';

-			if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {

-				$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';

-			}

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

-			if ($board->nbtodolate > 0) {

-				$boxwork .= '<div class="dashboardlinelatecoin nowrap">';

-				$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';

-				//$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';

-				$boxwork .= img_picto($textlate, "warning_white",

-						'class="inline-block hideonsmartphone valigntextbottom"').'';

-				$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';

-				$boxwork .= $board->nbtodolate;

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

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

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

-			}

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

-			$boxwork .= "\n";

-		}

-

-		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

-		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

-		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

-		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

-

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

-		$boxwork .= '</td></tr>';

-	} else {

-		$boxwork .= '<tr class="nohover">';

-		$boxwork .= '<td class="nohover valignmiddle opacitymedium">';

-		$boxwork .= $langs->trans("NoOpenedElementToProcess");

-		$boxwork .= '</td>';

-		$boxwork .= '</tr>';

-	}

-

-	$boxwork .= '</td></tr>';

-

-	$boxwork .= '</table>'; // End table array of working board

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

-

-	if (!empty($isIntopOpenedDashBoard)) {

-		print '<div class="fichecenter">';

-		print '<div class="opened-dash-board-wrap"><div class="box-flex-container">'.$openedDashBoard.'</div></div>';

-		print '</div>';

-	}

+    $showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;

+

+    //Array that contains all WorkboardResponse classes to process them

+    $dashboardlines = array();

+

+    // Do not include sections without management permission

+    require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';

+

+    // Number of actions to do (late)

+    if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {

+        include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

+        $board = new ActionComm($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of project opened

+    if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {

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

+        $board = new Project($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of tasks to do (late)

+    if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

+        $board = new Task($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of commercial proposals opened (expired)

+    if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';

+        $board = new Propal($db);

+        $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

+        // Number of commercial proposals CLOSED signed (billed)

+        $dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");

+    }

+

+    // Number of commercial proposals opened (expired)

+    if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';

+        $board = new SupplierProposal($db);

+        $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

+        // Number of commercial proposals CLOSED signed (billed)

+        $dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");

+    }

+

+    // Number of customer orders a deal

+    if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

+        $board = new Commande($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of suppliers orders a deal

+    if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';

+        $board = new CommandeFournisseur($db);

+        $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

+        $dashboardlines[$board->element.'_awaiting'] = $board->load_board($user, 'awaiting');

+    }

+

+    // Number of contract / services enabled (delayed)

+    if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';

+        $board = new Contrat($db);

+        $dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");

+        // Number of active services (expired)

+        $dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");

+    }

+

+    // Number of tickets open

+    if (!empty($conf->ticket->enabled) && $user->rights->ticket->read) {

+    	include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';

+    	$board = new Ticket($db);

+    	$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");

+    	// Number of active services (expired)

+    	//$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");

+    }

+

+    // Number of invoices customers (has paid)

+    if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {

+        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

+        $board = new Facture($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of supplier invoices (has paid)

+    if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {

+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';

+        $board = new FactureFournisseur($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of transactions to conciliate

+    if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid) {

+        include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

+        $board = new Account($db);

+        $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate

+        if ($nb > 0) {

+            $dashboardlines[$board->element] = $board->load_board($user);

+        }

+    }

+

+    // Number of cheque to send

+    if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {

+        include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';

+        $board = new RemiseCheque($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    // Number of foundation members

+    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {

+        include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

+        $board = new Adherent($db);

+        $dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');

+        $dashboardlines[$board->element.'_expired'] = $board->load_board($user, 'expired');

+    }

+

+    // Number of expense reports to approve

+    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {

+        include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';

+        $board = new ExpenseReport($db);

+        $dashboardlines[$board->element . '_toapprove'] = $board->load_board($user, 'toapprove');

+    }

+

+    // Number of expense reports to pay

+    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {

+        include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';

+        $board = new ExpenseReport($db);

+        $dashboardlines[$board->element . '_topay'] = $board->load_board($user, 'topay');

+    }

+

+    // Number of holidays to approve

+    if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {

+        include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';

+        $board = new Holiday($db);

+        $dashboardlines[$board->element] = $board->load_board($user);

+    }

+

+    $object = new stdClass();

+    $parameters = array();

+    $action = '';

+    $reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object,

+        $action); // Note that $action and $object may have been modified by some hooks

+    if ($reshook == 0) {

+        $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);

+    }

+

+    /* Open object dashboard */

+    $dashboardgroup = array(

+        'action' =>

+            array(

+                'groupName' => 'Agenda',

+                'stats' => array('action'),

+            ),

+        'project' =>

+            array(

+                'groupName' => 'Projects',

+                'globalStatsKey' => 'projects',

+                'stats' => array('project', 'project_task'),

+            ),

+        'propal' =>

+            array(

+                'groupName' => 'Proposals',

+                'globalStatsKey' => 'proposals',

+                'stats' =>

+                    array('propal_opened', 'propal_signed'),

+            ),

+        'commande' =>

+            array(

+                'groupName' => 'Orders',

+                'globalStatsKey' => 'orders',

+                'stats' =>

+                    array('commande'),

+            ),

+        'facture' =>

+            array(

+                'groupName' => 'Invoices',

+                'globalStatsKey' => 'invoices',

+                'stats' =>

+                    array('facture'),

+            ),

+        'supplier_proposal' =>

+            array(

+                'groupName' => 'SupplierProposals',

+                'globalStatsKey' => 'askprice',

+                'stats' =>

+                    array('supplier_proposal_opened', 'supplier_proposal_signed'),

+            ),

+        'order_supplier' =>

+            array(

+                'groupName' => 'SuppliersOrders',

+                'globalStatsKey' => 'supplier_orders',

+                'stats' =>

+                    array('order_supplier_opened', 'order_supplier_awaiting'),

+            ),

+        'invoice_supplier' =>

+            array(

+                'groupName' => 'BillsSuppliers',

+                'globalStatsKey' => 'supplier_invoices',

+                'stats' =>

+                    array('invoice_supplier'),

+            ),

+    	'contrat' =>

+	    	array(

+	    		'groupName' => 'Contracts',

+	    		'globalStatsKey' => 'Contracts',

+	    		'stats' =>

+	    		array('contrat_inactive', 'contrat_active'),

+	    	),

+    	'ticket' =>

+	    	array(

+	    		'groupName' => 'Tickets',

+	    		'globalStatsKey' => 'ticket',

+	    		'stats' =>

+	    			array('ticket_opened'),

+	    	),

+    	'bank_account' =>

+            array(

+                'groupName' => 'BankAccount',

+                'stats' =>

+                    array('bank_account', 'chequereceipt'),

+            ),

+        'member' =>

+            array(

+                'groupName' => 'Members',

+                'globalStatsKey' => 'members',

+                'stats' =>

+                    array('member_shift', 'member_expired'),

+            ),

+        'expensereport' =>

+            array(

+                'groupName' => 'ExpenseReport',

+                'globalStatsKey' => 'expensereports',

+                'stats' =>

+                    array('expensereport_toapprove', 'expensereport_topay'),

+            ),

+        'holiday' =>

+            array(

+                'groupName' => 'Holidays',

+                'globalStatsKey' => 'holidays',

+                'stats' =>

+                    array('holiday'),

+            ),

+    );

+

+    $object = new stdClass();

+    $parameters = array(

+        'dashboardgroup' => $dashboardgroup

+    );

+    $reshook = $hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

+    if ($reshook == 0) {

+        $dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);

+    }

+

+

+    // Calculate total nb of late

+    $totallate = $totaltodo = 0;

+

+    //Remove any invalid response

+    //load_board can return an integer if failed or WorkboardResponse if OK

+    $valid_dashboardlines = array();

+    foreach ($dashboardlines as $infoKey => $tmp) {

+        if ($tmp instanceof WorkboardResponse) {

+            $valid_dashboardlines[$infoKey] = $tmp;

+        }

+    }

+

+    // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop

+    foreach ($valid_dashboardlines as $board) {

+        if ($board->nbtodolate > 0) {

+            $totaltodo += $board->nbtodo;

+            $totallate += $board->nbtodolate;

+        }

+    }

+

+    $openedDashBoardSize = 'info-box-sm'; // use sm by default

+    foreach ($dashboardgroup as $dashbordelement) {

+        if (is_array($dashbordelement['stats']) && count($dashbordelement['stats']) > 2) {

+            $openedDashBoardSize = ''; // use default info box size : big

+            break;

+        }

+    }

+

+    $totalLateNumber = $totallate;

+    $totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);

+    if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {

+        $totallate = $totallatePercentage;

+    }

+

+    $boxwork = '';

+    $boxwork .= '<div class="box">';

+    $boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";

+    $boxwork .= '<tr class="liste_titre">';

+    $boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">'.$langs->trans("DolibarrWorkBoard").'</div>';

+    if ($showweather) {

+        if ($totallate > 0) {

+            $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",

+                    $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';

+        } else {

+            $text = $langs->transnoentitiesnoconv("NoItemLate");

+        }

+        $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");

+        //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));

+        $options = 'height="24px" style="float: right"';

+        $boxwork .= showWeather($totallate, $text, $options, 'inline-block valignmiddle');

+    }

+    $boxwork .= '</th>';

+    $boxwork .= '</tr>'."\n";

+

+    // Show dashboard

+    $nbworkboardempty = 0;

+    $isIntopOpenedDashBoard = $globalStatInTopOpenedDashBoard = array();

+    if (!empty($valid_dashboardlines)) {

+        $openedDashBoard = '';

+

+        $boxwork .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">';

+

+        foreach ($dashboardgroup as $groupKey => $groupElement) {

+            $boards = array();

+

+            if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {

+                foreach ($groupElement['stats'] as $infoKey) {

+                    if (!empty($valid_dashboardlines[$infoKey])) {

+                        $boards[] = $valid_dashboardlines[$infoKey];

+                        $isIntopOpenedDashBoard[] = $infoKey;

+                    }

+                }

+            }

+

+            if (!empty($boards)) {

+                $groupName = $langs->trans($groupElement['groupName']);

+                $groupKeyLowerCase = strtolower($groupKey);

+                $nbTotalForGroup = 0;

+

+                // global stats

+                $globalStatsKey = false;

+                if (!empty($groupElement['globalStatsKey']) && empty($groupElement['globalStats'])) { // can be filled by hook

+                    $globalStatsKey = $groupElement['globalStatsKey'];

+                    $groupElement['globalStats'] = array();

+

+                    if (is_array($keys) && in_array($globalStatsKey, $keys))

+                    {

+                        // get key index of stats used in $includes, $classes, $keys, $icons, $titres, $links

+                        $keyIndex = array_search($globalStatsKey, $keys);

+

+                        $classe = $classes[$keyIndex];

+                        if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe]))

+                        {

+                            $groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;

+                            $nbTotal = doubleval($groupElement['globalStats']['total']);

+                            if ($nbTotal >= 10000) { $nbTotal = round($nbTotal / 1000, 2).'k'; }

+                            $groupElement['globalStats']['text'] = $langs->trans('Total').' : '.$langs->trans($titres[$keyIndex]).' ('.$groupElement['globalStats']['total'].')';

+                            $groupElement['globalStats']['total'] = $nbTotal;

+                            $groupElement['globalStats']['link'] = $links[$keyIndex];

+                        }

+                    }

+                }

+

+                $openedDashBoard .= '<div class="box-flex-item"><div class="box-flex-item-with-margin">'."\n";

+                $openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";

+                $openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";

+                $openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";

+

+                // Show the span for the total of record

+                if (!empty($groupElement['globalStats'])) {

+                    $globalStatInTopOpenedDashBoard[] = $globalStatsKey;

+                    $openedDashBoard .= '		<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>'."\n";

+                }

+

+                $openedDashBoard .= '		</span>'."\n";

+                $openedDashBoard .= '		<div class="info-box-content">'."\n";

+

+                $openedDashBoard .= '			<span class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</span>'."\n";

+

+                foreach ($boards as $board) {

+                    if (!empty($board->labelShort)) {

+                        $infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';

+                    } else {

+                        $infoName = $board->label;

+                    }

+

+                    $textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);

+                    $textLateTitle .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';

+

+                    $textLate = '';

+                    if ($board->nbtodolate > 0) {

+                        $textLate .= ' <span title="'.dol_htmlentities($textLateTitle).'" class="classfortooltip badge badge-warning">';

+                        $textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;

+                        $textLate .= '</span>';

+                    }

+

+                    $nbtodClass = '';

+                    if ($board->nbtodo > 0) {

+                        $nbtodClass = 'badge badge-info';

+                    }

+

+                    $openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>'.$textLate.'</a>'."\n";

+

+                    if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {

+                        $openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total).'</a>';

+                    }

+                }

+

+                $openedDashBoard .= '		</div><!-- /.info-box-content -->'."\n";

+                $openedDashBoard .= '	</div><!-- /.info-box -->'."\n";

+                $openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";

+                $openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";

+                $openedDashBoard .= "\n";

+            }

+        }

+

+        if ($showweather && !empty($isIntopOpenedDashBoard)) {

+            $appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';

+            $weather = getWeatherStatus($totallate);

+

+            $text = '';

+            if ($totallate > 0) {

+                $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",

+                        $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';

+            } else {

+                $text = $langs->transnoentitiesnoconv("NoItemLate");

+            }

+            $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");

+

+            $weatherDashBoard = '<div class="box-flex-item '.$appendClass.'"><div class="box-flex-item-with-margin">'."\n";

+            $weatherDashBoard .= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";

+            $weatherDashBoard .= '		<span class="info-box-icon">';

+            $weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');

+            $weatherDashBoard .= '       </span>'."\n";

+            $weatherDashBoard .= '		<div class="info-box-content">'."\n";

+            $weatherDashBoard .= '			<span class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</span>'."\n";

+

+            if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {

+                $weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",

+                        price($totallatePercentage).'%').'</span>'."\n";

+                $weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',

+                        $totalLateNumber).'</span>'."\n";

+            } else {

+                $weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",

+                        $totalLateNumber).'</span>'."\n";

+                if ($totallatePercentage > 0) {

+                    $weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',

+                            price($totallatePercentage).'%').'</span>'."\n";

+                }

+            }

+

+            $weatherDashBoard .= '		</div><!-- /.info-box-content -->'."\n";

+            $weatherDashBoard .= '	</div><!-- /.info-box -->'."\n";

+            $weatherDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";

+            $weatherDashBoard .= '</div><!-- /.box-flex-item -->'."\n";

+            $weatherDashBoard .= "\n";

+

+            $openedDashBoard = $weatherDashBoard.$openedDashBoard;

+        }

+

+        if (!empty($isIntopOpenedDashBoard)) {

+            for ($i = 1; $i <= 10; $i++) {

+                $openedDashBoard .= '<div class="box-flex-item filler"></div>';

+            }

+        }

+

+        $nbworkboardcount = 0;

+        foreach ($valid_dashboardlines as $infoKey => $board) {

+            if (in_array($infoKey, $isIntopOpenedDashBoard)) {

+                // skip if info is present on top

+                continue;

+            }

+

+            if (empty($board->nbtodo)) {

+                $nbworkboardempty++;

+            }

+            $nbworkboardcount++;

+

+

+            $textlate = $langs->trans("NActionsLate", $board->nbtodolate);

+            $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';

+

+

+            $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';

+            $boxwork .= '<div class="boxstatscontent">';

+            $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';

+            $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';

+            if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {

+                $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';

+            }

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

+            if ($board->nbtodolate > 0) {

+                $boxwork .= '<div class="dashboardlinelatecoin nowrap">';

+                $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';

+                //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';

+                $boxwork .= img_picto($textlate, "warning_white",

+                        'class="inline-block hideonsmartphone valigntextbottom"').'';

+                $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';

+                $boxwork .= $board->nbtodolate;

+                $boxwork .= '</span>';

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

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

+            }

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

+            $boxwork .= "\n";

+        }

+

+        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

+        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

+        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

+        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';

+

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

+        $boxwork .= '</td></tr>';

+    } else {

+        $boxwork .= '<tr class="nohover">';

+        $boxwork .= '<td class="nohover valignmiddle opacitymedium">';

+        $boxwork .= $langs->trans("NoOpenedElementToProcess");

+        $boxwork .= '</td>';

+        $boxwork .= '</tr>';

+    }

+

+    $boxwork .= '</td></tr>';

+

+    $boxwork .= '</table>'; // End table array of working board

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

+

+    if (!empty($isIntopOpenedDashBoard)) {

+        print '<div class="fichecenter">';

+        print '<div class="opened-dash-board-wrap"><div class="box-flex-container">'.$openedDashBoard.'</div></div>';

+        print '</div>';

+    }

 }

 

 

@@ -886,7 +867,7 @@
 

 

 /*

- * Show widgets (boxes)

+ * Show boxes

  */

 

 $boxlist .= '<div class="twocolumns">';

@@ -904,46 +885,46 @@
 

 if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))

 {

-	// Remove allready present info in new dash board

-	if (!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0) {

-		foreach ($boxstatItems as $boxstatItemKey => $boxstatItemHtml) {

-			if (in_array($boxstatItemKey, $globalStatInTopOpenedDashBoard)) {

-				unset($boxstatItems[$boxstatItemKey]);

-			}

-		}

-	}

-

-	if (!empty($boxstatFromHook) || !empty($boxstatItems)) {

-		$boxstat .= '<!-- Database statistics -->'."\n";

-		$boxstat .= '<div class="box">';

-		$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';

-		$boxstat .= '<tr class="liste_titre box_titre">';

-		$boxstat .= '<td>';

-		$boxstat .= '<div class="inline-block valignmiddle">'.$langs->trans("DolibarrStateBoard").'</div>';

-		$boxstat .= '</td>';

-		$boxstat .= '</tr>';

-		$boxstat .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer">';

-

-		$boxstat .= $boxstatFromHook;

-

-		if (is_array($boxstatItems) && count($boxstatItems) > 0)

-		{

-			$boxstat .= implode('', $boxstatItems);

-		}

-

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

-

-		$boxstat .= '</td></tr>';

-		$boxstat .= '</table>';

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

-	}

+    // Remove allready present info in new dash board

+    if (!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0) {

+        foreach ($boxstatItems as $boxstatItemKey => $boxstatItemHtml) {

+            if (in_array($boxstatItemKey, $globalStatInTopOpenedDashBoard)) {

+                unset($boxstatItems[$boxstatItemKey]);

+            }

+        }

+    }

+

+    if (!empty($boxstatFromHook) || !empty($boxstatItems)) {

+    	$boxstat .= '<!-- Database statistics -->'."\n";

+        $boxstat .= '<div class="box">';

+        $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';

+        $boxstat .= '<tr class="liste_titre box_titre">';

+        $boxstat .= '<td class="liste_titre">';

+        $boxstat .= '<div class="inline-block valignmiddle">'.$langs->trans("DolibarrStateBoard").'</div>';

+        $boxstat .= '</td>';

+        $boxstat .= '</tr>';

+        $boxstat .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer">';

+

+        $boxstat .= $boxstatFromHook;

+

+        if (is_array($boxstatItems) && count($boxstatItems) > 0)

+        {

+            $boxstat .= implode('', $boxstatItems);

+        }

+

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';

+

+        $boxstat .= '</td></tr>';

+        $boxstat .= '</table>';

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

+    }

 }

 

 $boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';

@@ -969,32 +950,32 @@
 // Security warning repertoire install existe (si utilisateur admin)

 if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))

 {

-	$message = '';

-

-	// Check if install lock file is present

-	$lockfile = DOL_DATA_ROOT.'/install.lock';

-	if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))

-	{

-		$langs->load("errors");

-		//if (! empty($message)) $message.='<br>';

-		$message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');

-	}

-

-	// Conf files must be in read only mode

-	if (is_writable($conffile))

-	{

-		$langs->load("errors");

-		//$langs->load("other");

-		//if (! empty($message)) $message.='<br>';

-		$message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');

-	}

-

-	if ($message)

-	{

-		print $message;

-		//$message.='<br>';

-		//print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));

-	}

+    $message = '';

+

+    // Check if install lock file is present

+    $lockfile = DOL_DATA_ROOT.'/install.lock';

+    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))

+    {

+        $langs->load("errors");

+        //if (! empty($message)) $message.='<br>';

+        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');

+    }

+

+    // Conf files must be in read only mode

+    if (is_writable($conffile))

+    {

+        $langs->load("errors");

+        //$langs->load("other");

+        //if (! empty($message)) $message.='<br>';

+        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');

+    }

+

+    if ($message)

+    {

+        print $message;

+        //$message.='<br>';

+        //print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));

+    }

 }

 

 //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();

@@ -1016,10 +997,10 @@
  */

 function showWeather($totallate, $text, $options, $morecss = '')

 {

-	global $conf;

-

-	$weather = getWeatherStatus($totallate);

-	return img_weather($text, $weather->picto, $options, 0, $morecss);

+    global $conf;

+

+    $weather = getWeatherStatus($totallate);

+    return img_weather($text, $weather->picto, $options, 0, $morecss);

 }

 

 

--- /tmp/dsg/dolibarr/htdocs/github_main.inc.php
+++ /tmp/dsg/dolibarr/htdocs/client_main.inc.php
@@ -12,7 +12,6 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>

  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>

  * Copyright (C) 2020       Demarest Maxime         <maxime@indelog.fr>

- * Copyright (C) 2020       Charlene Benke         <charlie@patas-monkey.com>

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -50,29 +49,14 @@
 }

 

 /**

- * Security: WAF layer for SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).

- * Warning: Such a protection can't be enough. It is not reliable as it will alwyas be possible to bypass this. Good protection can

- * only be guaranted by escaping data during output.

+ * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).

  *

- * @param		string		$val		Value brut found int $_GET, $_POST or PHP_SELF

+ * @param		string		$val		Value

  * @param		string		$type		1=GET, 0=POST, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test)

  * @return		int						>0 if there is an injection, 0 if none

  */

 function testSqlAndScriptInject($val, $type)

 {

-	// Decode string first

-	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'

-	// So "&colon;&apos;" become ":'" (due to ENT_HTML5)

-	$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);

-

-	// TODO loop to decode until no more thing to decode ?

-

-	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)

-	// We should use dol_string_nounprintableascii but function is not yet loaded/available

-	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace

-	// We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: on<!-- -->error=alert(1)

-	$val = preg_replace('/<!--[^>]*-->/', '', $val);

-

 	$inj = 0;

 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)

 	if ($type == 1 || $type == 3)

@@ -84,7 +68,6 @@
 		$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);

 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login

 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database

-		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST

 	}

 	if ($type == 3)

 	{

@@ -97,22 +80,19 @@
 		$inj += preg_match('/union.+select/i', $val);

 		$inj += preg_match('/(\.\.%2f)+/i', $val);

 	}

-	// For XSS Injection done by closing textarea to execute content into a textarea field

+	// For XSS Injection done by closing textarea to exucute content into a textarea field

 	$inj += preg_match('/<\/textarea/i', $val);

 	// For XSS Injection done by adding javascript with script

 	// This is all cases a browser consider text is javascript:

 	// When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers

 	// All examples on page: http://ha.ckers.org/xss.html#XSScalc

 	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet

+	$inj += preg_match('/<script/i', $val);

+	$inj += preg_match('/<iframe/i', $val);

 	$inj += preg_match('/<audio/i', $val);

-	$inj += preg_match('/<embed/i', $val);

-	$inj += preg_match('/<iframe/i', $val);

-	$inj += preg_match('/<object/i', $val);

-	$inj += preg_match('/<script/i', $val);

 	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6

 	if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);

-	$inj += preg_match('/base\s+href/si', $val);

-	$inj += preg_match('/=data:/si', $val);

+	$inj += preg_match('/base[\s]+href/si', $val);

 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp

 	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>

 	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val); //

@@ -122,28 +102,15 @@
 	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);

 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);

 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);

-

-	// We refuse html into html because some hacks try to obfuscate evil strings by inserting HTML into HTML. Example: <img on<a>error=alert(1) to bypass test on onerror

-	$tmpval = preg_replace('/<[^<]+>/', '', $val);

-	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp

-	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $tmpval); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>

-	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $tmpval); //

-	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $tmpval); //

-	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $tmpval);

-	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $tmpval);

-	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $tmpval);

-	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $tmpval);

-	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $tmpval);

-

 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...

 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'

-	$inj += preg_match('/javascript\s*:/i', $val);

-	$inj += preg_match('/vbscript\s*:/i', $val);

+	//if ($type == 1)

+	//{

+		$inj += preg_match('/javascript:/i', $val);

+		$inj += preg_match('/vbscript:/i', $val);

+	//}

 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)

-	if ($type == 1) {

-		$val = str_replace('enclosure="', 'enclosure=X', $val); // We accept enclosure="

-		$inj += preg_match('/"/i', $val); // We refused " in GET parameters value.

-	}

+	if ($type == 1) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value

 	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.

 	return $inj;

 }

@@ -164,21 +131,17 @@
 			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))

 			{

 				//$var[$key] = $value;	// This is useless

-			} else {

-				// Get remote IP: PS: We do not use getRemoteIP(), function is not yet loaded and we need a value that can't be spoofed

-				$ip = (empty($_SERVER['REMOTE_ADDR']) ? 'unknown' : $_SERVER['REMOTE_ADDR']);

-				$errormessage = 'Access refused to '.$ip.' by SQL or Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';

-				print $errormessage;

-				// Add entry into error log

-				if (function_exists('error_log')) {

-					error_log($errormessage);

-				}

-				// TODO Add entry into security audit table

+			}

+			else

+			{

+				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';

 				exit;

 			}

 		}

 		return true;

-	} else {

+	}

+	else

+	{

 		return (testSqlAndScriptInject($var, $type) <= 0);

 	}

 }

@@ -200,10 +163,7 @@
 // Sanity check on GET parameters

 if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))

 {

-	// Note: QUERY_STRING is url encoded, but $_GET and $_POST are already decoded

-	// Because the analyseVarsForSqlAndScriptsInjection is designed for already url decoded value, we must decode QUERY_STRING

-	// Another solution is to provide $_GET as parameter

-	$morevaltochecklikeget = array(urldecode($_SERVER["QUERY_STRING"]));

+	$morevaltochecklikeget = array($_SERVER["QUERY_STRING"]);

 	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget, 1);

 }

 // Sanity check on POST

@@ -243,73 +203,38 @@
 }

 

 

-// Set the handler of session

-if (ini_get('session.save_handler') == 'user') {

-	require_once 'core/lib/phpsessionindb.lib.php';

-}

-

 // Init session. Name of session is specific to Dolibarr instance.

-// Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).

-// Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.

+// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.

 $prefix = dol_getprefix('');

+

 $sessionname = 'DOLSESSID_'.$prefix;

 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;

 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);

-// This create lock, released by session_write_close() or end of page.

+session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.

+session_name($sessionname);

+// This create lock, released when session_write_close() or end of page.

 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.

 if (!defined('NOSESSION'))

 {

-	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.

-	session_name($sessionname);

 	session_start();

 }

-

 

 // Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc

 require_once 'master.inc.php';

 

-

-// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.

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

-{

-	$ok = 0;

-	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)

-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)

-	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)

-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)

-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin

-	if (!$ok)

-	{

-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

-		{

-			print 'Sorry, your application is offline.'."\n";

-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl = DOL_URL_ROOT.'/user/logout.php';

-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

-		} else {

-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl = DOL_URL_ROOT.'/';

-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

-		}

-		exit;

-	}

-}

-

-

 // Activate end of page function

 register_shutdown_function('dol_shutdown');

 

 // Load debugbar

 if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))

 {

-	global $debugbar;

-	include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';

-	$debugbar = new DolibarrDebugBar();

-	$renderer = $debugbar->getRenderer();

-	if (empty($conf->global->MAIN_HTML_HEADER)) $conf->global->MAIN_HTML_HEADER = '';

-	$conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();

-

-	$debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');

+    global $debugbar;

+    include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';

+    $debugbar = new DolibarrDebugBar();

+    $renderer = $debugbar->getRenderer();

+    $conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();

+

+    $debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');

 }

 

 // Detection browser

@@ -344,11 +269,14 @@
 			{

 				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);

 			}

-		} else {

-			// Check HTTPS environment variable (Apache/mod_ssl only)

+		}

+		else	// Check HTTPS environment variable (Apache/mod_ssl only)

+		{

 			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];

 		}

-	} else {

+	}

+	else

+	{

 		// Check HTTPS environment variable (Apache/mod_ssl only)

 		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];

 	}

@@ -359,7 +287,9 @@
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);

 		header("Location: ".$newurl);

 		exit;

-	} else {

+	}

+	else

+	{

 		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);

 	}

 }

@@ -421,55 +351,30 @@
 	// 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

 	$_SESSION['newtoken'] = $token;

-	dol_syslog("NEW TOKEN reclaimed by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);

-}

-

-//dol_syslog("aaaa - ".defined('NOCSRFCHECK')." - ".$dolibarr_nocsrfcheck." - ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN." - ".$_SERVER['REQUEST_METHOD']." - ".GETPOST('token', 'alpha').' '.$_SESSION['token']);

+}

+

+//var_dump(GETPOST('token').' '.$_SESSION['token'].' - '.newToken().' '.$_SERVER['SCRIPT_FILENAME']);

 //$dolibarr_nocsrfcheck=1;

 // Check token

+//var_dump((! defined('NOCSRFCHECK')).' '.empty($dolibarr_nocsrfcheck).' '.(! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)).' '.$_SERVER['REQUEST_METHOD'].' '.(! GETPOSTISSET('token')));

 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))

-	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set into page

-{

-	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)

-	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||

-		((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) ||

-		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check')))

-	{

-		if (!GETPOSTISSET('token')) {

-			if (GETPOST('uploadform', 'int')) {

-				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused. File size too large.");

-				$langs->loadLangs(array("errors", "install"));

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

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

-				die;

-			} else {

-				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");

-				if (defined('CSRFCHECK_WITH_TOKEN')) {

-					print "Access to a page that needs a token (constant CSRFCHECK_WITH_TOKEN is defined) is refused by CSRF protection in main.inc.php. Token not provided.\n";

-				} else {

-					print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";

-					print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";

-				}

-				die;

-			}

-		}

+	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set

+{

+	if ($_SERVER['REQUEST_METHOD'] == 'POST' && !GETPOSTISSET('token')) // Note: offender can still send request by GET

+	{

+		dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");

+		print "Access by POST method refused by CSRF protection in main.inc.php. Token not provided.\n";

+		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";

+		die;

 	}

 

 	if (GETPOSTISSET('token') && GETPOST('token', 'alpha') != $_SESSION['token'])

 	{

 		dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused due to invalid token, so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);

 		//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.

-		setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');

-		//if ($conf->global->MAIN_FEATURES_LEVEL >= 1) setEventMessages('Unset POST and GET params by CSRF protection in main.inc.php (Token provided was not generated by the previous page).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');

-		$savid = ((int) $_POST['id']);

+		if ($conf->global->MAIN_FEATURES_LEVEL > 1) setEventMessages('Unset POST by CSRF protection in main.inc.php (POST for this token was already done or was done by a not allowed web page with a wrong token).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');

 		unset($_POST);

-		//unset($_POST['action']); unset($_POST['massaction']);

-		//unset($_POST['confirm']); unset($_POST['confirmmassaction']);

 		unset($_GET['confirm']);

-		unset($_GET['action']);

-		unset($_GET['confirmmassaction']);

-		unset($_GET['massaction']);

-		$_POST['id'] = ((int) $savid);

 	}

 }

 

@@ -477,7 +382,7 @@
 if (GETPOSTISSET('disablemodules'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');

 if (!empty($_SESSION["disablemodules"]))

 {

-	$modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');

+    $modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');

 

 	$disabled_modules = explode(',', $_SESSION["disablemodules"]);

 	foreach ($disabled_modules as $module)

@@ -488,7 +393,7 @@
 			$conf->$module->enabled = false;

 			foreach ($modulepartkeys as $modulepartkey)

 			{

-				unset($conf->modules_parts[$modulepartkey][$module]);

+			    unset($conf->modules_parts[$modulepartkey][$module]);

 			}

 			if ($module == 'fournisseur')		// Special case

 			{

@@ -508,7 +413,7 @@
 		if (in_array($module, $modulepart))

 		{

 			$conf->modulepart = $module;

-			break;

+            break;

 		}

 	}

 }

@@ -525,7 +430,9 @@
 	if (defined('MAIN_AUTHENTICATION_MODE'))

 	{

 		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');

-	} else {

+	}

+	else

+	{

 		// Authentication mode

 		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';

 		// Authentication mode: forceuser

@@ -582,18 +489,8 @@
 			}

 		}

 

-		// Hooks for security access

-		$action = '';

-		$hookmanager->initHooks(array('login'));

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('beforeLoginAuthentication', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook < 0) {

-		    $test = false;

-		    $error++;

-		}

-

 		// Verification security graphic code

-		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))

+		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))

 		{

 			$sessionkey = 'dol_antispam_value';

 			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));

@@ -629,7 +526,7 @@
 

 		$allowedmethodtopostusername = 2;

 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');

-		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));

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

 

@@ -654,10 +551,6 @@
 		if ($test && $goontestloop && (GETPOST('actionlogin', 'aZ09') == 'login' || $dolibarr_main_authentication != 'dolibarr'))

 		{

 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);

-			if ($login === '--bad-login-validity--') {

-				$login = '';

-			}

-

 			if ($login)

 			{

 				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used

@@ -714,16 +607,11 @@
 			// No data to test login, so we show the login page.

 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit");

 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';

-			else {

-				if ($_SERVER["HTTP_USER_AGENT"] == 'securitytest') {

-					http_response_code(401); // It makes easier to understand if session was broken during security tests

-				}

-				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));

-			}

+			else dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));

 			exit;

 		}

 

-		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.

+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));

 		if ($resultFetchUser <= 0)

 		{

 			dol_syslog('User not found, connexion refused');

@@ -767,13 +655,10 @@
 			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');

 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));

 			exit;

-		} else {

-			// User is loaded, we may need to change language for him according to its choice

-			if (!empty($user->conf->MAIN_LANG_DEFAULT)) {

-				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);

-			}

-		}

-	} else {

+		}

+	}

+	else

+	{

 		// We are already into an authenticated session

 		$login = $_SESSION["dol_login"];

 		$entity = $_SESSION["dol_entity"];

@@ -823,49 +708,51 @@
 			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');

 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));

 			exit;

-		} else {

-			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

-			$hookmanager->initHooks(array('main'));

-

-			// Code for search criteria persistence.

-			if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here

-			{

-				$relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);

-				$relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server

-				// Clean $relativepathstring

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

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

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

-				//var_dump($relativepathstring);

-

-				// We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp

-				if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))

-				{

-					$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];

-					unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);

-				}

-				if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))

-				{

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

-					unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);

-				}

-				if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)

-				{

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

-					unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);

-				}

-				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)

-				{

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

-					unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);

-				}

-			}

-

-			$action = '';

-			$reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);

-			if ($reshook < 0) {

-				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-			}

+		}

+		else

+		{

+		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

+		    $hookmanager->initHooks(array('main'));

+

+		    // Code for search criteria persistence.

+		    if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here

+		    {

+			    $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);

+			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server

+			    // Clean $relativepathstring

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

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

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

+			    //var_dump($relativepathstring);

+

+			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp

+			    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))

+			    {

+			    	$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];

+				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);

+			    }

+			    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))

+			    {

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

+			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);

+			    }

+			    if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)

+			    {

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

+			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);

+			    }

+			    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)

+			    {

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

+			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);

+			    }

+		    }

+

+		    $action = '';

+		    $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);

+		    if ($reshook < 0) {

+			    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+		    }

 		}

 	}

 

@@ -925,7 +812,9 @@
 			session_destroy();

 			dol_print_error($db, 'Error in some triggers USER_LOGIN or in some hooks afterLogin');

 			exit;

-		} else {

+		}

+		else

+		{

 			$db->commit();

 		}

 

@@ -978,13 +867,13 @@
 }

 

 // Set javascript option

-if (GETPOST('nojs', 'int')) {  // If javascript was not disabled on URL

-	$conf->use_javascript_ajax = 0;

-} else {

-	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {

+if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL

+{

+	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT))

+	{

 		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;

 	}

-}

+} else $conf->use_javascript_ajax = 0;

 

 // Set MAIN_OPTIMIZEFORTEXTBROWSER for user (must be after login part)

 if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {

@@ -992,7 +881,7 @@
 }

 

 // set MAIN_OPTIMIZEFORCOLORBLIND for user

-$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = empty($user->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? '' : $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;

+$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;

 

 // Set terminal output option according to conf->browser.

 if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;

@@ -1054,7 +943,8 @@
 	$user->getrights();

 }

 

-dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').' NOTOKENRENEWAL='.(defined('NOTOKENRENEWAL') ?constant('NOTOKENRENEWAL') : ''));

+

+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09'));

 //Another call for easy debugg

 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));

 

@@ -1088,7 +978,9 @@
 	define('ROWS_7', 7);

 	define('ROWS_8', 8);

 	define('ROWS_9', 9);

-} else {

+}

+else

+{

 	define('ROWS_1', 0);

 	define('ROWS_2', 1);

 	define('ROWS_3', 2);

@@ -1108,8 +1000,9 @@
 	if (empty($user->socid))    // If internal user or not defined

 	{

 		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);

-	} else {

-		// If external user

+	}

+	else                        // If external user

+	{

 		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);

 	}

 

@@ -1145,35 +1038,34 @@
 	/**

 	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV

 	 *

-	 * @param 	string 			$head				Optionnal head lines

-	 * @param 	string 			$title				HTML title

-	 * @param	string			$help_url			Url links to help page

-	 * 		                            			Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage

-	 *                                  			For other external page: http://server/url

-	 * @param	string			$target				Target to use on links

-	 * @param 	int    			$disablejs			More content into html header

-	 * @param 	int    			$disablehead		More content into html header

-	 * @param 	array|string  	$arrayofjs			Array of complementary js files

-	 * @param 	array|string  	$arrayofcss			Array of complementary css files

-	 * @param	string			$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)

-	 * @param   string  		$morecssonbody      More CSS on body tag. For example 'classforhorizontalscrolloftabs'.

-	 * @param	string			$replacemainareaby	Replace call to main_area() by a print of this string

-	 * @param	int				$disablenofollow	Disable the "nofollow" on page

+	 * @param 	string 	$head				Optionnal head lines

+	 * @param 	string 	$title				HTML title

+	 * @param	string	$help_url			Url links to help page

+	 * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage

+	 *                                  	For other external page: http://server/url

+	 * @param	string	$target				Target to use on links

+	 * @param 	int    	$disablejs			More content into html header

+	 * @param 	int    	$disablehead		More content into html header

+	 * @param 	array  	$arrayofjs			Array of complementary js files

+	 * @param 	array  	$arrayofcss			Array of complementary css files

+	 * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)

+	 * @param   string  $morecssonbody      More CSS on body tag.

+	 * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string

 	 * @return	void

 	 */

-	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0)

+	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '')

 	{

 		global $conf;

 

 		// html header

-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);

+		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);

 

 		$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');

 		// If theme MD and classic layer, we open the menulayer by default.

 		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

 		{

-			global $mainmenu;

-			if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.

+		    global $mainmenu;

+		    if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.

 		}

 

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

@@ -1190,7 +1082,7 @@
 

 		if (empty($conf->dol_hide_leftmenu))

 		{

-			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function

+			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function

 		}

 

 		// main area

@@ -1230,8 +1122,8 @@
 		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working

 		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";

 		//}

-		//else

-		$contentsecuritypolicy = empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY) ? '' : $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;

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

 		$hookmanager->initHooks(array("main"));

@@ -1253,7 +1145,8 @@
 			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'

 			header("Content-Security-Policy: ".$contentsecuritypolicy);

 		}

-	} elseif (constant('FORCECSP'))

+	}

+	elseif (constant('FORCECSP'))

 	{

 		header("Content-Security-Policy: ".constant('FORCECSP'));

 	}

@@ -1292,10 +1185,10 @@
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";

 	if (empty($disablehead))

 	{

-		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);

-		$hookmanager->initHooks(array("main"));

-

-		$ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);

+	    if (!is_object($hookmanager)) $hookmanager = new HookManager($db);

+	    $hookmanager->initHooks(array("main"));

+

+	    $ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);

 

 		print "<head>\n";

 

@@ -1317,16 +1210,16 @@
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://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";

 

-		// Mobile appli like icon

-		$manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';

-		if (!empty($manifest)) {

-			print '<link rel="manifest" href="'.$manifest.'" />'."\n";

-		}

-

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

-			// TODO: use auto theme color switch

-			print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";

-		}

+        // Mobile appli like icon

+        $manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';

+        if (!empty($manifest)) {

+            print '<link rel="manifest" href="'.$manifest.'" />'."\n";

+        }

+

+        if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {

+            // TODO: use auto theme color switch

+            print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";

+        }

 

 		// Auto refresh page

 		if (GETPOST('autorefresh', 'int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';

@@ -1361,13 +1254,7 @@
 		if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }

 		if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }

 		if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }

-		if (GETPOSTISSET('THEME_DARKMODEENABLED')) { $themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int'); }

 		if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }

-

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

-			print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n";

-			print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@200;300;400;500;600&display=swap" rel="stylesheet">'."\n";

-		}

 

 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)

 		{

@@ -1387,8 +1274,8 @@
 		if (!defined('DISABLE_FONT_AWSOME'))

 		{

 			print '<!-- Includes CSS for font awesome -->'."\n";

-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";

-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";

+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";

+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";

 		}

 

 		print '<!-- Includes CSS for Dolibarr theme -->'."\n";

@@ -1435,12 +1322,14 @@
 		{

 			foreach ($arrayofcss as $cssfile)

 			{

-				if (preg_match('/^(http|\/\/)/i', $cssfile))

-				{

-					$urltofile = $cssfile;

-				} else {

-					$urltofile = dol_buildpath($cssfile, 1);

-				}

+			    if (preg_match('/^(http|\/\/)/i', $cssfile))

+			    {

+			        $urltofile = $cssfile;

+			    }

+			    else

+			    {

+			        $urltofile = dol_buildpath($cssfile, 1);

+			    }

 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;

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

@@ -1464,16 +1353,49 @@
 			else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

 			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script src="'.DOL_URL_ROOT.'/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')) {

+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))

+			{

 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

 			}

+			// Flot

+			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'jflot')

+			{

+				if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))

+				{

+					if (constant('JS_JQUERY_FLOT'))

+					{

+						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+					}

+					else

+					{

+						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+						/* Test for jflot 4.2 -> not better than current

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.canvaswrapper.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.colorhelpers.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.saturated.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.browser.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.drawSeries.js"></script>'."\n";

+						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.uiConstants.js"></script>'."\n";

+						*/

+					}

+				}

+			}

 			// Chart

-			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') {

+			if ($conf->global->MAIN_JS_GRAPH == 'chart')

+			{

 				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/Chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

 			}

 

 			// jQuery jeditable for Edit In Place features

-			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) {

+			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))

+			{

 				print '<!-- JS to manage editInPlace feature -->'."\n";

 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

@@ -1483,7 +1405,7 @@
 				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";

 				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n"; // Added in title attribute of span

 				print 'var placeholderInPlace = \'&nbsp;\';'."\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?

-				print 'var cancelInPlace = \''.$langs->trans("Cancel").'\';'."\n";

+				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";

 				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";

 				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";

 				print 'var withInPlace = 300;'; // width in pixel for default string edit

@@ -1491,108 +1413,110 @@
 				print '<script src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

 			}

-			// jQuery Timepicker

-			if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {

-				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

-				print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";

-			}

-			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 '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass

-			}

-			if (!defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool

-			{

-				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

-			}

-		}

-

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

-			// CKEditor

-			if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))

-			{

-				print '<!-- Includes JS for CKEditor -->'."\n";

-				$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';

-				$jsckeditor = 'ckeditor.js';

-				if (constant('JS_CKEDITOR')) {

-					// To use external ckeditor 4 js lib

-					$pathckeditor = constant('JS_CKEDITOR');

-				}

-				print '<script>';

-                print '/* enable ckeditor by main.inc.php */';

-				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";

-				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage

-				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";

-				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";

-				print '</script>'."\n";

-				print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";

-				print '<script>';

-				if (GETPOST('mode', 'aZ09') == 'Full_inline') {

-					print 'CKEDITOR.disableAutoInline = false;'."\n";

-				} else {

-					print 'CKEDITOR.disableAutoInline = true;'."\n";

-				}

-				print '</script>'."\n";

-			}

-

-			// Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).

-			if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN'))

-			{

-				$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 (browser layout = '.$conf->browser->layout.')-->'."\n";

-					print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";

-				}

-			}

-

-			// Global js function

-			print '<!-- Includes JS of Dolibarr -->'."\n";

-			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";

-

-			// JS forced by modules (relative url starting with /)

-			if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))

-			{

-				$arrayjs = (array) $conf->modules_parts['js'];

-				foreach ($arrayjs as $modjs => $filesjs)

-				{

-					$filesjs = (array) $filesjs; // To be sure filejs is an array

-					foreach ($filesjs as $jsfile)

-					{

-						// jsfile is a relative path

-						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";

-					}

-				}

-			}

-			// JS forced by page in top_htmlhead (relative url starting with /)

-			if (is_array($arrayofjs))

-			{

-				print '<!-- Includes JS added by page -->'."\n";

-				foreach ($arrayofjs as $jsfile)

-				{

-					if (preg_match('/^(http|\/\/)/i', $jsfile))

-					{

-						print '<script src="'.$jsfile.'"></script>'."\n";

-					} else {

-						print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";

-					}

-				}

-			}

-		}

-

-		if (!empty($head)) print $head."\n";

-		if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";

-

-		$parameters = array();

-		$result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks

-		print $hookmanager->resPrint; // Replace Title to show

-

-		print "</head>\n\n";

-	}

-

-	$conf->headerdone = 1; // To tell header was output

+            // jQuery Timepicker

+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))

+            {

+            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

+            	print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";

+            }

+            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 '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass

+            }

+		}

+

+        if (!$disablejs && !empty($conf->use_javascript_ajax))

+        {

+            // CKEditor

+        	if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))

+            {

+                print '<!-- Includes JS for CKEditor -->'."\n";

+                $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';

+                $jsckeditor = 'ckeditor.js';

+                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib

+                {

+                	$pathckeditor = constant('JS_CKEDITOR');

+                }

+                print '<script><!-- enable ckeditor by main.inc.php -->';

+                print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";

+                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage

+                print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";

+                print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";

+                print '</script>'."\n";

+                print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";

+                print '<script>';

+                if (GETPOST('mode', 'aZ09') == 'Full_inline')

+                {

+                	print 'CKEDITOR.disableAutoInline = false;'."\n";

+                }

+                else

+                {

+                	print 'CKEDITOR.disableAutoInline = true;'."\n";

+                }

+                print '</script>'."\n";

+            }

+

+            // 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 ($enablebrowsernotif)

+                {

+                    print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";

+                    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";

+                }

+            }

+

+            // Global js function

+            print '<!-- Includes JS of Dolibarr -->'."\n";

+            print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";

+

+            // JS forced by modules (relative url starting with /)

+            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))

+        	{

+        		$arrayjs = (array) $conf->modules_parts['js'];

+	            foreach ($arrayjs as $modjs => $filesjs)

+	            {

+        			$filesjs = (array) $filesjs; // To be sure filejs is an array

+		            foreach ($filesjs as $jsfile)

+		            {

+	    	    		// jsfile is a relative path

+	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";

+		            }

+	            }

+        	}

+            // JS forced by page in top_htmlhead (relative url starting with /)

+            if (is_array($arrayofjs))

+            {

+                print '<!-- Includes JS added by page -->'."\n";

+                foreach ($arrayofjs as $jsfile)

+                {

+                    if (preg_match('/^(http|\/\/)/i', $jsfile))

+                    {

+                        print '<script src="'.$jsfile.'"></script>'."\n";

+                    }

+                    else

+                    {

+                        print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";

+                    }

+                }

+            }

+        }

+

+        if (!empty($head)) print $head."\n";

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

+

+        $parameters = array();

+        $result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks

+        print $hookmanager->resPrint; // Replace Title to show

+

+        print "</head>\n\n";

+    }

+

+    $conf->headerdone = 1; // To tell header was output

 }

 

 

@@ -1621,7 +1545,7 @@
 	$searchform = '';

 	$bookmarks = '';

 

-	// Instantiate hooks for external modules

+	// Instantiate hooks of thirdparty module

 	$hookmanager->initHooks(array('toprightmenu'));

 

 	$toprightmenu = '';

@@ -1629,8 +1553,7 @@
 	// For backward compatibility with old modules

 	if (empty($conf->headerdone))

 	{

-		$disablenofollow = 0;

-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);

+		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);

 		print '<body id="mainbody">';

 	}

 

@@ -1639,11 +1562,6 @@
      */

 	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))

 	{

-		if (!isset($form) || !is_object($form)) {

-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-			$form = new Form($db);

-		}

-

 		print "\n".'<!-- Start top horizontal -->'."\n";

 

 		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.

@@ -1662,13 +1580,14 @@
 			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;

+			}

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

 

 		$logouttext = '';

-		$logouthtmltext = '';

 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

 		{

 			//$logouthtmltext=$appli.'<br>';

@@ -1679,7 +1598,9 @@
 				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';

 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin');

 				$logouttext .= '</a>';

-			} else {

+			}

+			else

+			{

 				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);

 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin opacitymedium');

 			}

@@ -1696,10 +1617,11 @@
 		{

 			if ($result == 0)

 				$toprightmenu .= $hookmanager->resPrint; // add

-			else {

+			else

 				$toprightmenu = $hookmanager->resPrint; // replace

-			}

-		} else {

+		}

+		else

+		{

 			$toprightmenu .= $result; // For backward compatibility

 		}

 

@@ -1710,7 +1632,7 @@
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');

 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';

 			$text .= '</a>';

-			$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);

+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);

 		}

 

 		// Link to print main content area

@@ -1729,7 +1651,7 @@
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');

 			$text .= '<span class="fa fa-print atoplogin valignmiddle"></span>';

 			$text .= '</a>';

-			$toprightmenu .= $form->textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);

+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);

 		}

 

 		// Link to Dolibarr wiki pages

@@ -1740,13 +1662,8 @@
 			$helpbaseurl = '';

 			$helppage = '';

 			$mode = '';

-			$helppresent = '';

-

-			if (empty($helppagename)) {

-				$helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';

-			} else {

-				$helppresent = 'helppresent';

-			}

+

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

@@ -1758,20 +1675,15 @@
 			if ($helpbaseurl && $helppage)

 			{

 				$text = '';

-				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').'...';

-				if ($mode == 'wiki') {

-					$title .= '<br>'.$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"');

-					if ($helppresent) $title .= ' <span class="opacitymedium">('.$langs->trans("DedicatedPageAvailable").')</span>';

-					else $title .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';

-				}

+				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');

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

 				$text .= '">';

-				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';

-				if ($helppresent) $text .= '<span class="fa fa-circle helppresentcircle"></span>';

+				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle"></span>';

 				$text .= '</a>';

-				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);

+				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);

 			}

 

 			// Version

@@ -1781,13 +1693,12 @@
 			}

 		}

 

-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-			$text = '<span class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';

-			$toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);

-		}

+		$text = '<span href="#" class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';

+		$toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);

+

 

 		// Logout link

-		$toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);

+		$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);

 

 		$toprightmenu .= '</div>'; // end div class="login_block_other"

 

@@ -1804,11 +1715,6 @@
 			$toprightmenu .= top_menu_search();

 		}

 

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

-			// Add search dropdown

-			$toprightmenu .= top_menu_quickadd();

-		}

-

 		// Add bookmark dropdown

 		$toprightmenu .= top_menu_bookmark();

 

@@ -1830,7 +1736,7 @@
 		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">';

+	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 : '').'">';

 }

 

 

@@ -1843,107 +1749,103 @@
  */

 function top_menu_user($hideloginname = 0, $urllogout = '')

 {

-	global $langs, $conf, $db, $hookmanager, $user;

-	global $dolibarr_main_authentication, $dolibarr_main_demo;

-	global $menumanager;

-

-	$userImage = $userDropDownImage = '';

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

-	{

-		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);

-		$userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);

-	} else {

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

-		if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';

-		if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';

-

-		$userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';

-		$userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';

-	}

-

-	$dropdownBody = '';

-	$dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';

-	$dropdownBody .= '<div id="topmenuloginmoreinfo" >';

-

-	// login infos

-	if (!empty($user->admin)) {

-		$dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);

-	}

-	if (!empty($user->socid))	// Add thirdparty for external users

-	{

-		$thirdpartystatic = new Societe($db);

-		$thirdpartystatic->fetch($user->socid);

-		$companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company

-		$company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';

-	}

-	$type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));

-	$dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;

-	$dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);

-	$dropdownBody .= '<br>';

-

-	$dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';

-	$dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);

-	if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';

-	$dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');

-	$dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');

-	$dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');

-	$dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;

-	$dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;

-	$langFlag = picto_from_langcode($langs->getDefaultLang());

-	$dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();

-

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

-	$dropdownBody .= '<br><b>'.$langs->trans("ClientTZ").':</b> '.($tz ? ($tz >= 0 ? '+' : '').$tz : '');

-	$dropdownBody .= ' ('.$_SESSION['dol_tz_string'].')';

-	//$dropdownBody .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': ';

-	//if ($_SESSION['dol_dst'] > 0) $dropdownBody .= yn(1);

-	//else $dropdownBody .= yn(0);

-

-	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';

-	$dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;

-	$dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];

-	if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");

-	if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));

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

-

-	// Execute hook

-	$parameters = array('user'=>$user, 'langs' => $langs);

-	$result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks

-	if (is_numeric($result))

-	{

-		if ($result == 0) {

-			$dropdownBody .= $hookmanager->resPrint; // add

-		} else {

-			$dropdownBody = $hookmanager->resPrint; // replace

-		}

-	}

-

-	if (empty($urllogout)) {

-		$urllogout = DOL_URL_ROOT.'/user/logout.php';

-	}

-	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';

-	$profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';

-

-

-	$profilName = $user->getFullName($langs).' ('.$user->login.')';

-

-	if (!empty($user->admin)) {

-		$profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;

-	}

-

-	// Define version to show

-	$appli = constant('DOL_APPLICATION_TITLE');

-	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 (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-		$btnUser = '<!-- div for user link -->

+    global $langs, $conf, $db, $hookmanager, $user;

+    global $dolibarr_main_authentication, $dolibarr_main_demo;

+    global $menumanager;

+

+    $userImage = $userDropDownImage = '';

+    if (!empty($user->photo))

+    {

+        $userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);

+        $userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);

+    }

+    else {

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

+        if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';

+        if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';

+

+        $userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';

+        $userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';

+    }

+

+    $dropdownBody = '';

+    $dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';

+    $dropdownBody .= '<div id="topmenuloginmoreinfo" >';

+

+    // login infos

+    if (!empty($user->admin)) {

+        $dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);

+    }

+    if (!empty($user->socid))	// Add thirdparty for external users

+    {

+        $thirdpartystatic = new Societe($db);

+        $thirdpartystatic->fetch($user->socid);

+        $companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company

+        $company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';

+    }

+    $type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));

+    $dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;

+    $dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);

+    $dropdownBody .= '<br>';

+

+    $dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';

+    $dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);

+    if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';

+    $dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');

+    $dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');

+    $dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');

+    $dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;

+    $dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;

+    $langFlag = picto_from_langcode($langs->getDefaultLang());

+    $dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();

+    $dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';

+    $dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;

+    $dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];

+    if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");

+    if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));

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

+

+    // Execute hook

+    $parameters = array('user'=>$user, 'langs' => $langs);

+    $result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks

+    if (is_numeric($result))

+    {

+        if ($result == 0) {

+            $dropdownBody .= $hookmanager->resPrint; // add

+        }

+        else {

+            $dropdownBody = $hookmanager->resPrint; // replace

+        }

+    }

+

+    if (empty($urllogout)) {

+    	$urllogout = DOL_URL_ROOT.'/user/logout.php';

+    }

+    $logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';

+    $profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';

+

+

+    $profilName = $user->getFullName($langs).' ('.$user->login.')';

+

+    if (!empty($user->admin)) {

+        $profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;

+    }

+

+    // Define version to show

+    $appli = constant('DOL_APPLICATION_TITLE');

+    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 (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

+	    $btnUser = '<!-- div for user link -->

 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">

 	        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">

 	            '.$userImage.'

@@ -1958,8 +1860,7 @@
 		if ($user->datepreviouslogin) {

 			$btnUser .= '<small class="classfortooltip" title="'.$langs->trans("PreviousConnexion").'" ><i class="fa fa-user-clock"></i> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'</small><br>';

 		}

-		//$btnUser .= '<small class="classfortooltip"><i class="fa fa-cog"></i> '.$langs->trans("Version").' '.$appli.'</small>';

-		$btnUser .= '

+		$btnUser .= '<small class="classfortooltip"><i class="fa fa-cog"></i> '.$langs->trans("Version").' '.$appli.'</small>

 	                </p>

 	            </div>

 

@@ -1979,19 +1880,19 @@
 

 	        </div>

 	    </div>';

-	} else {

-		$btnUser = '<!-- div for user link -->

+    } else {

+    	$btnUser = '<!-- div for user link -->

 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu  inline-block">

 	    	<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'">

 	    	'.$userImage.'

 	    		<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>

 	    		</a>

 		</div>';

-	}

-

-	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors

-	{

-		$btnUser .= '

+    }

+

+    if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors

+    {

+        $btnUser .= '

         <!-- Code to show/hide the user drop-down -->

         <script>

         $( document ).ready(function() {

@@ -2004,8 +1905,8 @@
             });

 			';

 

-		if ($conf->theme != 'md') {

-			$btnUser .= '

+        if ($conf->theme != 'md') {

+	        $btnUser .= '

 	            $("#topmenu-login-dropdown .dropdown-toggle").on("click", function(event) {

 					console.log("toggle login dropdown");

 					event.preventDefault();

@@ -2015,235 +1916,17 @@
 	            $("#topmenuloginmoreinfo-btn").on("click", function() {

 	                $("#topmenuloginmoreinfo").slideToggle();

 	            });';

-		}

-

-		$btnUser .= '

+        }

+

+        $btnUser .= '

         });

         </script>

         ';

-	}

-

-	return $btnUser;

-}

-

-/**

- * Build the tooltip on top menu quick add

- *

- * @return  string                  HTML content

- */

-function top_menu_quickadd()

-{

-	global $langs, $conf, $db, $hookmanager, $user;

-	global $menumanager;

-	$html = '';

-	// Define $dropDownQuickAddHtml

-	$dropDownQuickAddHtml = '<div class="dropdown-header bookmark-header center">';

-	$dropDownQuickAddHtml .= $langs->trans('QuickAdd');

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

-

-	$dropDownQuickAddHtml .= '<div class="quickadd-body dropdown-body">';

-	$dropDownQuickAddHtml .= '<div class="quickadd">';

-	if (!empty($conf->societe->enabled) && $user->rights->societe->creer) {

-		$langs->load("companies");

-		$dropDownQuickAddHtml .= '

-                <!-- Thirdparty link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/societe/card.php?action=create" title="'.$langs->trans("MenuNewThirdParty").'">

-                        <i class="fa fa-building"></i><br>

-                        '.$langs->trans("ThirdParty").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->societe->enabled) && $user->rights->societe->contact->creer) {

-		$langs->load("companies");

-		$dropDownQuickAddHtml .= '

-                <!-- Contact link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/contact/card.php?action=create" title="'.$langs->trans("NewContactAddress").'">

-                        <i class="fa fa-address-book"></i><br>

-                        '.$langs->trans("Contact").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->propal->enabled) && $user->rights->propale->creer) {

-		$langs->load("propal");

-		$dropDownQuickAddHtml .= '

-                <!-- Propal link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create" title="'.$langs->trans("NewPropal").'">

-                        <i class="fa fa-suitcase"></i><br>

-                        '.$langs->trans("Proposal").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {

-		$langs->load("orders");

-		$dropDownQuickAddHtml .= '

-                <!-- Order link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">

-                        <i class="fa fa-file-alt"></i><br>

-                        '.$langs->trans("Order").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->facture->enabled) && $user->rights->facture->creer) {

-		$langs->load("bills");

-		$dropDownQuickAddHtml .= '

-                <!-- Invoice link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">

-                        <i class="fa fa-coins"></i><br>

-                        '.$langs->trans("Bill").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) {

-		$langs->load("contracts");

-		$dropDownQuickAddHtml .= '

-                <!-- Contract link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewContractSubscription").'">

-                        <i class="fa fa-file-contract"></i><br>

-                        '.$langs->trans("Contract").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {

-		$langs->load("supplier_proposal");

-		$dropDownQuickAddHtml .= '

-                <!-- Supplier proposal link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create" title="'.$langs->trans("NewAskPrice").'">

-                        <i class="fa fa-suitcase"></i><br>

-                        '.$langs->trans("AskPrice").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer) {

-		$langs->load("orders");

-		$dropDownQuickAddHtml .= '

-                <!-- Supplier order link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">

-                        <i class="fa fa-file-alt"></i><br>

-                        '.$langs->trans("SupplierOrder").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer) {

-		$langs->load("bills");

-		$dropDownQuickAddHtml .= '

-                <!-- Supplier invoice link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">

-                        <i class="fa fa-coins"></i><br>

-                        '.$langs->trans("SupplierBill").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->product->enabled) && $user->rights->produit->creer) {

-		$langs->load("products");

-		$dropDownQuickAddHtml .= '

-                <!-- Product link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0" title="'.$langs->trans("NewProduct").'">

-                        <i class="fa fa-cube"></i><br>

-                        '.$langs->trans("Product").'

-                    </a>

-                </div>

-                ';

-	}

-

-	if (!empty($conf->service->enabled) && $user->rights->service->creer) {

-		$langs->load("products");

-		$dropDownQuickAddHtml .= '

-                <!-- Service link -->

-                <div class="quickaddblock center">

-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">

-                        <i class="fa fa-concierge-bell"></i><br>

-                        '.$langs->trans("Service").'

-                    </a>

-                </div>

-                ';

-	}

-

-	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')

-	$parameters = array();

-	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks

-	if (is_numeric($result)) {

-		if ($result == 0) {

-			$dropDownQuickAddHtml .= $hookmanager->resPrint; // add

-		} else {

-			$dropDownQuickAddHtml = $hookmanager->resPrint; // replace

-		}

-	} else {

-		$dropDownQuickAddHtml .= $result; // For backward compatibility

-	}

-

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

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

-

-	$html .= '<!-- div for quick add link -->

-    <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">

-        <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')">

-            <i class="fa fa-plus-circle" ></i>

-        </a>

-

-        <div class="dropdown-menu">

-            '.$dropDownQuickAddHtml.'

-        </div>

-    </div>';

-	$html .= '

-        <!-- Code to show/hide the user drop-down -->

-        <script>

-        $( document ).ready(function() {

-            $(document).on("click", function(event) {

-                if (!$(event.target).closest("#topmenu-quickadd-dropdown").length) {

-                    // Hide the menus.

-                    $("#topmenu-quickadd-dropdown").removeClass("open");

-                }

-            });

-            $("#topmenu-quickadd-dropdown .dropdown-toggle").on("click", function(event) {

-                openQuickAddDropDown();

-            });

-            // Key map shortcut

-            $(document).keydown(function(e){

-                  if( e.which === 76 && e.ctrlKey && e.shiftKey ){

-                     console.log(\'control + shift + l : trigger open quick add dropdown\');

-                     openQuickAddDropDown();

-                  }

-            });

-

-

-            var openQuickAddDropDown = function() {

-                event.preventDefault();

-                $("#topmenu-quickadd-dropdown").toggleClass("open");

-                //$("#top-quickadd-search-input").focus();

-            }

-        });

-        </script>

-        ';

-	return $html;

-}

+    }

+

+    return $btnUser;

+}

+

 

 /**

  * Build the tooltip on top menu bookmark

@@ -2252,24 +1935,24 @@
  */

 function top_menu_bookmark()

 {

-	global $langs, $conf, $db, $user;

+    global $langs, $conf, $db, $user;

 

 	$html = '';

 

-	// Define $bookmarks

+    // Define $bookmarks

 	if (empty($conf->bookmark->enabled) || empty($user->rights->bookmark->lire)) return $html;

 

 	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))	    // This may be set by some pages that use different jquery version to avoid errors

-	{

-		include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';

-		$langs->load("bookmarks");

-

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

-			$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';

-			$html .= printDropdownBookmarksList();

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

-		} else {

-			$html .= '<!-- div for bookmark link -->

+    {

+        include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';

+        $langs->load("bookmarks");

+

+        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

+        	$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';

+        	$html .= printDropdownBookmarksList();

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

+        } else {

+	        $html .= '<!-- div for bookmark link -->

 	        <div id="topmenu-bookmark-dropdown" class="dropdown inline-block">

 	            <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">

 	                <i class="fa fa-star" ></i>

@@ -2279,7 +1962,7 @@
 	            </div>

 	        </div>';

 

-			$html .= '

+	        $html .= '

 	        <!-- Code to show/hide the bookmark drop-down -->

 	        <script>

 	        $( document ).ready(function() {

@@ -2314,9 +1997,9 @@
 	        });

 	        </script>

 	        ';

-		}

-	}

-	return $html;

+        }

+    }

+    return $html;

 }

 

 /**

@@ -2326,51 +2009,51 @@
  */

 function top_menu_search()

 {

-	global $langs, $conf, $db, $user, $hookmanager;

+    global $langs, $conf, $db, $user, $hookmanager;

 

 	$html = '';

 

-	$usedbyinclude = 1;

-	$arrayresult = null;

-	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult

-

-	$defaultAction = '';

-	$buttonList = '<div class="dropdown-global-search-button-list" >';

-	// Menu with all searchable items

-	foreach ($arrayresult as $keyItem => $item)

-	{

-		if (empty($defaultAction)) {

-			$defaultAction = $item['url'];

-		}

-		$buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';

-		$buttonList .= $item['text'];

-		$buttonList .= '</button>';

-	}

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

-

-

-	$searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';

-

-	$dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';

-

-	$dropDownHtml .= '

+    $usedbyinclude = 1;

+    $arrayresult = null;

+    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult

+

+    $defaultAction = '';

+    $buttonList = '<div class="dropdown-global-search-button-list" >';

+    // Menu with all searchable items

+    foreach ($arrayresult as $keyItem => $item)

+    {

+        if (empty($defaultAction)) {

+            $defaultAction = $item['url'];

+        }

+        $buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';

+        $buttonList .= $item['text'];

+        $buttonList .= '</button>';

+    }

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

+

+

+    $searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';

+

+    $dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';

+

+    $dropDownHtml .= '

         <!-- search input -->

         <div class="dropdown-header search-dropdown-header">

             ' . $searchInput.'

         </div>

     ';

 

-	$dropDownHtml .= '

+    $dropDownHtml .= '

         <!-- Menu Body -->

         <div class="dropdown-body search-dropdown-body">

         '.$buttonList.'

         </div>

         ';

 

-	$dropDownHtml .= '</form>';

-

-

-	$html .= '<!-- div for Global Search -->

+    $dropDownHtml .= '</form>';

+

+

+    $html .= '<!-- div for Global Search -->

     <div id="topmenu-global-search-dropdown" class="atoplogin dropdown inline-block">

         <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">

             <i class="fa fa-search" ></i>

@@ -2380,7 +2063,7 @@
         </div>

     </div>';

 

-	$html .= '

+    $html .= '

     <!-- Code to show/hide the user drop-down -->

     <script>

     $( document ).ready(function() {

@@ -2438,7 +2121,7 @@
     </script>

     ';

 

-	return $html;

+    return $html;

 }

 

 /**

@@ -2467,7 +2150,7 @@
 

 	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))

 	{

-		// Instantiate hooks for external modules

+		// Instantiate hooks of thirdparty module

 		$hookmanager->initHooks(array('searchform', 'leftblock'));

 

 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";

@@ -2478,44 +2161,44 @@
 

 		if (!is_object($form)) $form = new Form($db);

 		$selected = -1;

-		if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {

-			$usedbyinclude = 1;

-			$arrayresult = null;

-			include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult

-

-			if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {

-				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);

-			} else {

-				if (is_array($arrayresult)) {

-					foreach ($arrayresult as $key => $val) {

-						$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);

-					}

-				}

-			}

-

-			// Execute hook printSearchForm

-			$parameters = array('searchform' => $searchform);

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

-

-			// Force special value for $searchform

-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {

-				$urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';

-				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';

-			} elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {

-				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';

-				$searchform .= '<script>

+        if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {

+            $usedbyinclude = 1;

+            $arrayresult = null;

+            include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult

+

+            if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {

+                $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);

+            } else {

+                if (is_array($arrayresult)) {

+                    foreach ($arrayresult as $key => $val) {

+                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);

+                    }

+                }

+            }

+

+            // Execute hook printSearchForm

+            $parameters = array('searchform' => $searchform);

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

+

+            // Force special value for $searchform

+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {

+                $urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';

+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';

+            } elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {

+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';

+                $searchform .= '<script>

             	jQuery(document).ready(function () {

             		jQuery("#divsearchforms1").click(function(){

 	                   jQuery("#divsearchforms2").toggle();

 	               });

             	});

                 </script>' . "\n";

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

-			}

-		}

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

+            }

+        }

 

 		// Left column

 		print '<!-- Begin left menu -->'."\n";

@@ -2550,8 +2233,10 @@
 				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;

+				}

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

@@ -2566,37 +2251,37 @@
 		{

 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

 

-			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';

+            $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';

 			$bugbaseurl .= '&title=';

 			$bugbaseurl .= urlencode("Bug: ");

-			$bugbaseurl .= '&body=';

-			$bugbaseurl .= urlencode("# Instructions\n");

-			$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");

-			$bugbaseurl .= urlencode("*Please:*\n");

-			$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");

-			$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");

-			$bugbaseurl .= urlencode("\n");

-			$bugbaseurl .= urlencode("\n");

-			$bugbaseurl .= urlencode("# Bug\n");

-			$bugbaseurl .= urlencode("[*Short description*]\n");

-			$bugbaseurl .= urlencode("\n");

-			$bugbaseurl .= urlencode("## Environment\n");

-			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");

-			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");

-			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");

-			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");

-			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");

-			$bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");

-			$bugbaseurl .= urlencode("\n");

-			$bugbaseurl .= urlencode("## Expected and actual behavior\n");

-			$bugbaseurl .= urlencode("[*Verbose description*]\n");

-			$bugbaseurl .= urlencode("\n");

-			$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");

-			$bugbaseurl .= urlencode("[*Verbose description*]\n");

-			$bugbaseurl .= urlencode("\n");

-			$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");

-			$bugbaseurl .= urlencode("[*Files*]\n");

-			$bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= '&body=';

+            $bugbaseurl .= urlencode("# Instructions\n");

+            $bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");

+            $bugbaseurl .= urlencode("*Please:*\n");

+            $bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");

+            $bugbaseurl .= urlencode("- *remove any unused sub-section*\n");

+            $bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= urlencode("# Bug\n");

+            $bugbaseurl .= urlencode("[*Short description*]\n");

+            $bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= urlencode("## Environment\n");

+            $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");

+            $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");

+            $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");

+            $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");

+            $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");

+            $bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");

+            $bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= urlencode("## Expected and actual behavior\n");

+            $bugbaseurl .= urlencode("[*Verbose description*]\n");

+            $bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");

+            $bugbaseurl .= urlencode("[*Verbose description*]\n");

+            $bugbaseurl .= urlencode("\n");

+            $bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");

+            $bugbaseurl .= urlencode("[*Files*]\n");

+            $bugbaseurl .= urlencode("\n");

 

 

 			// Execute hook printBugtrackInfo

@@ -2605,7 +2290,8 @@
 			if (empty($reshook))

 			{

 				$bugbaseurl .= $hookmanager->resPrint;

-			} else $bugbaseurl = $hookmanager->resPrint;

+			}

+			else $bugbaseurl = $hookmanager->resPrint;

 

 			$bugbaseurl .= urlencode("\n");

 			$bugbaseurl .= urlencode("## Report\n");

@@ -2653,37 +2339,36 @@
 

 	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), 0, 0, 1, 'warning maintenancemode');

-

-	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT

-	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))

-	{

-		global $hookmanager;

-		$hookmanager->initHooks(array('main'));

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);

-		if (empty($reshook))

-		{

-			print '<!-- Begin show mysoc info header -->'."\n";

-			print '<div id="mysoc-info-header">'."\n";

-			print '<table class="centpercent div-table-responsive">'."\n";

-			print '<tbody>';

-			print '<tr><td rowspan="0" class="width20p">';

-			if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {

-				print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';

-			}

-			print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";

-			print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";

-			print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";

-			if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';

-			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';

-			if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';

-			print '</tbody>';

-			print '</table>'."\n";

-			print '</div>'."\n";

-			print '<!-- End show mysoc info header -->'."\n";

-		}

-	}

+	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));

+

+    // Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT

+    if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))

+    {

+        global $hookmanager;

+        $hookmanager->initHooks(array('showsocinfoonprint'));

+        $parameters = array();

+        $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);

+        if (empty($reshook))

+        {

+            print '<!-- Begin show mysoc info header -->'."\n";

+            print '<div id="mysoc-info-header">'."\n";

+            print '<table class="centpercent div-table-responsive">'."\n";

+            print '<tbody>';

+            print '<tr><td rowspan="0" class="width20p">';

+            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO))

+                print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';

+            print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";

+            print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";

+            print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";

+            if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';

+            if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';

+            if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';

+            print '</tbody>';

+            print '</table>'."\n";

+            print '</div>'."\n";

+            print '<!-- End show mysoc info header -->'."\n";

+        }

+    }

 }

 

 

@@ -2706,7 +2391,9 @@
 		$helpbaseurl = '%s';

 		$helppage = $helppagename;

 		$mode = 'local';

-	} else {

+	}

+	else

+	{

 		// If WIKI URL

 		$reg = array();

 		if (preg_match('/^es/i', $langs->defaultlang))

@@ -2790,7 +2477,6 @@
 		global $conf, $db, $langs, $user, $mysoc, $object;

 		global $delayedhtmlcontent;

 		global $contextpage, $page, $limit;

-		global $dolibarr_distrib;

 

 		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);

 

@@ -2830,7 +2516,7 @@
 

 			if (!empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;

 			if (!empty($page) && $page > 0)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;

-			if (!empty($limit) && $limit != $conf->liste_limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;

+			if (!empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;

 

 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);

 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);

@@ -2845,8 +2531,10 @@
 			{

 				$title = img_warning().' '.$langs->trans('CoreErrorTitle');

 				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));

-			} else {

-				// html version

+			}

+			// html version

+			else

+			{

 				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');

 				print '<div class="error">'.$msg.'</div>';

 			}

@@ -2926,7 +2614,8 @@
 				// No ping done if we are into an alpha version

 				if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {

 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It is an alpha version -->\n";

-				} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.

+				}

+				elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.

 				{

 					// MAIN_LAST_PING_KO_DATE

 					// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent

@@ -2951,35 +2640,35 @@
 			    					  timeout: 500,     // timeout milliseconds

 			    					  cache: false,

 			    					  data: {

-				    					  hash_algo: 'md5',

-				    					  hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',

-				    					  action: 'dolibarrping',

-				    					  version: '<?php echo (float) DOL_VERSION; ?>',

-				    					  entity: '<?php echo (int) $conf->entity; ?>',

-				    					  dbtype: '<?php echo dol_escape_js($db->type); ?>',

-				    					  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',

-				    					  php_version: '<?php echo dol_escape_js(phpversion()); ?>',

-				    					  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',

-				    					  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'

+				    					  hash_algo: "md5",

+				    					  hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>",

+				    					  action: "dolibarrping",

+				    					  version: "<?php echo (float) DOL_VERSION; ?>",

+				    					  entity: "<?php echo (int) $conf->entity; ?>",

+				    					  dbtype: "<?php echo dol_escape_js($db->type); ?>",

+				    					  country_code: "<?php echo dol_escape_js($mysoc->country_code); ?>",

+				    					  php_version: "<?php echo phpversion(); ?>",

+				    					  os_version: "<?php echo version_os('smr'); ?>",

+				    					  distrib: "<?php echo $distrib ? $distrib : 'unknown'; ?>"

 				    				  },

 			    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)

 			      					    	console.log("Ping ok");

 			        	    				$.ajax({

-			      	    					  method: 'GET',

-			      	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',

+			      	    					  method: "GET",

+			      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",

 			      	    					  timeout: 500,     // timeout milliseconds

 			      	    					  cache: false,

-			      	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' },	// for update

+			      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingok" },	// to update

 			    					  		});

 			    					  },

 			    					  error: function (data,status,xhr) {   // error callback function

 			        					    console.log("Ping ko: " + data);

 			        	    				$.ajax({

-			        	    					  method: 'GET',

-			        	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',

+			        	    					  method: "GET",

+			        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",

 			        	    					  timeout: 500,     // timeout milliseconds

 			        	    					  cache: false,

-			        	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },

+			        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingko" },

 			      					  		});

 			    					  }

 			    				});

@@ -2987,7 +2676,9 @@
 			    			</script>

 						<?php

 					}

-				} else {

+				}

+				else

+				{

 					$now = dol_now();

 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It was disabled -->\n";

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

@@ -2999,5 +2690,5 @@
 

 		print "</body>\n";

 		print "</html>\n";

-	}

-}

+    }

+}

--- /tmp/dsg/dolibarr/htdocs/github_master.inc.php
+++ /tmp/dsg/dolibarr/htdocs/client_master.inc.php
@@ -49,7 +49,7 @@
 $conf->db->port							= $dolibarr_main_db_port;

 $conf->db->name							= $dolibarr_main_db_name;

 $conf->db->user							= $dolibarr_main_db_user;

-$conf->db->pass							= empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;

+$conf->db->pass							= empty($dolibarr_main_db_pass)?'':$dolibarr_main_db_pass;

 $conf->db->type							= $dolibarr_main_db_type;

 $conf->db->prefix = $dolibarr_main_db_prefix;

 $conf->db->character_set = $dolibarr_main_db_character_set;

@@ -60,14 +60,14 @@
 

 // Set properties specific to conf file

 $conf->file->main_limit_users = $dolibarr_main_limit_users;

-$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb;

-$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli;

+$conf->file->mailing_limit_sendbyweb	= $dolibarr_mailing_limit_sendbyweb;

+$conf->file->mailing_limit_sendbycli	= $dolibarr_mailing_limit_sendbycli;

 $conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode

 $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https

-$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)

+$conf->file->strict_mode 				= empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)

 $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance

 $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')

-$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')

+$conf->file->dol_url_root				= array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')

 if (!empty($dolibarr_main_document_root_alt))

 {

 	// dolibarr_main_document_root_alt can contains several directories

@@ -117,7 +117,7 @@
  */

 if (!defined('NOREQUIREDB'))

 {

-	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);

+    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);

 

 	if ($db->error)

 	{

@@ -132,7 +132,9 @@
 				$langs->setDefaultLang('auto');

 				$langs->load("website");

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

-			} else {

+			}

+			else

+			{

 				print "SorryWebsiteIsCurrentlyOffLine";

 			}

 			print '</div>';

@@ -160,18 +162,21 @@
  */

 

 // By default conf->entity is 1, but we change this if we ask another value.

-if (session_id() && !empty($_SESSION["dol_entity"])) {

-	// Entity inside an opened session

+if (session_id() && !empty($_SESSION["dol_entity"]))			// Entity inside an opened session

+{

 	$conf->entity = $_SESSION["dol_entity"];

-} elseif (!empty($_ENV["dol_entity"])) {

-	// Entity inside a CLI script

+}

+elseif (!empty($_ENV["dol_entity"]))							// Entity inside a CLI script

+{

 	$conf->entity = $_ENV["dol_entity"];

-} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {

-	// Just after a login page

+}

+elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int'))	// Just after a login page

+{

 	$conf->entity = GETPOST("entity", 'int');

-} elseif (defined('DOLENTITY') && is_numeric(constant('DOLENTITY'))) {

-	// For public page with MultiCompany module

-	$conf->entity = constant('DOLENTITY');

+}

+elseif (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module

+{

+	$conf->entity = DOLENTITY;

 }

 

 // Sanitize entity

@@ -186,14 +191,49 @@
 }

 

 // Overwrite database value

-if (!empty($conf->file->mailing_limit_sendbyweb)) {

+if (!empty($conf->file->mailing_limit_sendbyweb))

+{

 	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;

 }

-if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {

-	$conf->global->MAILING_LIMIT_SENDBYWEB = 25;

-}

-if (!empty($conf->file->mailing_limit_sendbycli)) {

-	$conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;

+if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))

+{

+    $conf->global->MAILING_LIMIT_SENDBYWEB = 25;

+}

+if (!empty($conf->file->mailing_limit_sendbycli))

+{

+    $conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;

+}

+if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))

+{

+    $conf->global->MAILING_LIMIT_SENDBYCLI = 0;

+}

+

+// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.

+if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))

+{

+	$ok = 0;

+	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)

+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)

+	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)

+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)

+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin

+	if (!$ok)

+	{

+		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

+		{

+			print 'Sorry, your application is offline.'."\n";

+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

+			$nexturl = DOL_URL_ROOT.'/user/logout.php';

+			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

+		}

+		else

+		{

+			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

+			$nexturl = DOL_URL_ROOT.'/';

+			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

+		}

+		exit;

+	}

 }

 

 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.

@@ -212,9 +252,9 @@
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)

 if (!defined('NOREQUIRETRAN'))

 {

-	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));

-	if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');

-	$langs->setDefaultLang($langcode);

+    $langcode = (GETPOST('lang', 'aZ09') ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));

+    if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');

+    $langs->setDefaultLang($langcode);

 }

 

 

--- /tmp/dsg/dolibarr/htdocs/github_viewimage.php
+++ /tmp/dsg/dolibarr/htdocs/client_viewimage.php
@@ -52,21 +52,13 @@
 	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // Some value of modulepart can be used to get resources that are public so no login are required.

-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias')

+if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))

 {

 	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);

 	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.

 	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 

-// Used by TakePOS Auto Order

-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'product' && isset($_GET["publictakepos"]))

-{

-	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);

-	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.

-	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip

-}

-

 // For multicompany

 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));

 if (is_numeric($entity)) define("DOLENTITY", $entity);

@@ -93,7 +85,7 @@
 require 'main.inc.php'; // Load $user and permissions

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

 

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).

 $hashp = GETPOST('hashp', 'aZ09');

 $modulepart = GETPOST('modulepart', 'alpha');

@@ -121,14 +113,15 @@
 

 if (GETPOST("cache", 'alpha'))

 {

-	// Important: Following code is to avoid page request by browser and PHP CPU at

-	// each Dolibarr page access.

-	if (empty($dolibarr_nocache))

-	{

-		header('Cache-Control: max-age=3600, public, must-revalidate');

-		header('Pragma: cache'); // This is to avoid having Pragma: no-cache

-	} else header('Cache-Control: no-cache');

-	//print $dolibarr_nocache; exit;

+    // Important: Following code is to avoid page request by browser and PHP CPU at

+    // each Dolibarr page access.

+    if (empty($dolibarr_nocache))

+    {

+        header('Cache-Control: max-age=3600, public, must-revalidate');

+        header('Pragma: cache'); // This is to avoid having Pragma: no-cache

+    }

+    else header('Cache-Control: no-cache');

+    //print $dolibarr_nocache; exit;

 }

 

 // If we have a hash public (hashp), we guess the original_file.

@@ -154,14 +147,20 @@
 				// We remove first level of directory

 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir

 				//var_dump($original_file); exit;

-			} else {

+			}

+			else

+			{

 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);

 			}

-		} else {

+		}

+		else

+		{

 			$modulepart = $moduleparttocheck;

 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir

 		}

-	} else {

+	}

+	else

+	{

 		$langs->load("errors");

 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);

 	}

@@ -191,14 +190,13 @@
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];

 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name

 

-if (!empty($hashp)) {

+if (!empty($hashp))

+{

 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed

 	$sqlprotectagainstexternals = '';

-} elseif (isset($_GET["publictakepos"])) {

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

-		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable

-	}

-} else {

+}

+else

+{

 	// Basic protection (against external users only)

 	if ($user->socid > 0)

 	{

@@ -236,7 +234,7 @@
 if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file))

 {

 	dol_syslog("Refused to deliver file ".$fullpath_original_file);

-	print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);

+	print "ErrorFileNameInvalid: ".$original_file;

 	exit;

 }

 

@@ -244,71 +242,74 @@
 

 if ($modulepart == 'barcode')

 {

-	$generator = GETPOST("generator", "alpha");

-	$code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)

-	$encoding = GETPOST("encoding", "alpha");

-	$readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";

-

-	if (empty($generator) || empty($encoding))

-	{

-		print 'Error: Parameter "generator" or "encoding" not defined';

-		exit;

-	}

-

-	$dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);

-

-	$result = 0;

-

-	foreach ($dirbarcode as $reldir)

-	{

-		$dir = dol_buildpath($reldir, 0);

-		$newdir = dol_osencode($dir);

-

-		// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)

-		if (!is_dir($newdir)) continue;

-

-		$result = @include_once $newdir.$generator.'.modules.php';

-		if ($result) break;

-	}

-

-	// Load barcode class

-	$classname = "mod".ucfirst($generator);

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

-	if ($module->encodingIsSupported($encoding))

-	{

-		$result = $module->buildBarCode($code, $encoding, $readable);

-	}

-} else {

-	// Open and return file

-	clearstatcache();

-

-	$filename = basename($fullpath_original_file);

-

-	// Output files on browser

-	dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");

-

-	// This test is to avoid error images when image is not available (for example thumbs).

-	if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))

-	{

-		$fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';

-		/*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';

+    $generator = GETPOST("generator", "alpha");

+    $code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)

+    $encoding = GETPOST("encoding", "alpha");

+    $readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";

+

+    if (empty($generator) || empty($encoding))

+    {

+        print 'Error: Parameter "generator" or "encoding" not defined';

+        exit;

+    }

+

+    $dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);

+

+    $result = 0;

+

+    foreach ($dirbarcode as $reldir)

+    {

+        $dir = dol_buildpath($reldir, 0);

+        $newdir = dol_osencode($dir);

+

+        // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)

+        if (!is_dir($newdir)) continue;

+

+        $result = @include_once $newdir.$generator.'.modules.php';

+        if ($result) break;

+    }

+

+    // Load barcode class

+    $classname = "mod".ucfirst($generator);

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

+    if ($module->encodingIsSupported($encoding))

+    {

+        $result = $module->buildBarCode($code, $encoding, $readable);

+    }

+}

+else					// Open and return file

+{

+    clearstatcache();

+

+    $filename = basename($fullpath_original_file);

+

+    // Output files on browser

+    dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");

+

+    // This test is to avoid error images when image is not available (for example thumbs).

+    if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))

+    {

+        $fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';

+        /*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';

         print $error;

         exit;*/

-	}

-

-	// Permissions are ok and file found, so we return it

-	if ($type)

-	{

-		top_httphead($type);

-		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

-	} else {

-		top_httphead('image/png');

-		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

-	}

-

-	$fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);

-

-	readfile($fullpath_original_file_osencoded);

+    }

+

+    // Permissions are ok and file found, so we return it

+    if ($type)

+    {

+        top_httphead($type);

+        header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

+    }

+    else

+    {

+        top_httphead('image/png');

+        header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

+    }

+

+    $fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);

+

+    readfile($fullpath_original_file_osencoded);

 }