Dolibarr / dolibarr

htdocs/website/index.php

Indentation +247 added lines, -247 removed lines

@@ -125,10 +125,10 @@ 
 if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
-    if ($res == 0)
-    {
-        $res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
-    }
+	if ($res == 0)
+	{
+		$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
+	}
 
 	// Check if pageid is inside the new website, if not we reset param pageid
 	if ($res >= 0 && $object->id > 0)
@@ -268,28 +268,28 @@ 
 // Protections
 if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') ||  GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 {
-    $action = 'preview';    // To avoid to make an action on another page or another site when we click on button to select another site or page.
+	$action = 'preview';    // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
 if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
 {
-    if ($action == 'addsite') $action = 'preview';
-    if ($action == 'updatesource') $action = 'preview';
-
-    $pageid = $object->fk_default_home;
-    if (empty($pageid))
-    {
-    	$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-    	if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-    	$atleastonepage=(is_array($array) && count($array) > 0);
-
-    	$firstpageid=0; $homepageid=0;
-    	foreach($array as $key => $valpage)
-    	{
-    		if (empty($firstpageid)) $firstpageid=$valpage->id;
-    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
-    	}
-    	$pageid=($homepageid?$homepageid:$firstpageid);   // We choose home page and if not defined yet, we take first page
-    }
+	if ($action == 'addsite') $action = 'preview';
+	if ($action == 'updatesource') $action = 'preview';
+
+	$pageid = $object->fk_default_home;
+	if (empty($pageid))
+	{
+		$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		$atleastonepage=(is_array($array) && count($array) > 0);
+
+		$firstpageid=0; $homepageid=0;
+		foreach($array as $key => $valpage)
+		{
+			if (empty($firstpageid)) $firstpageid=$valpage->id;
+			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+		}
+		$pageid=($homepageid?$homepageid:$firstpageid);   // We choose home page and if not defined yet, we take first page
+	}
 }
 if (GETPOST('refreshpage', 'alpha') && ! in_array($action, array('updatecss'))) $action='preview';
 
@@ -375,9 +375,9 @@ 
 	$db->begin();
 
 	if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
-    {
-        $error++;
-        setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+	{
+		$error++;
+		setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 	}
 
 	if (! $error && ! GETPOST('WEBSITE_REF', 'alpha'))
@@ -1037,49 +1037,49 @@ 
 
 		if (GETPOSTISSET('virtualhost'))
 		{
-		    if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
-    		{
-    		    $error++;
-    		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
-    		    $action='editcss';
-    		}
+			if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+				$action='editcss';
+			}
 
-    		if (! $error)
-    		{
-    		    $object->virtualhost = GETPOST('virtualhost', 'alpha');
+			if (! $error)
+			{
+				$object->virtualhost = GETPOST('virtualhost', 'alpha');
 
-    		    $result = $object->update($user);
-        		if ($result < 0)
-        		{
-        		    $error++;
-        		    setEventMessages($object->error, $object->errors, 'errors');
-        		    $action='editcss';
-        		}
-    		}
+				$result = $object->update($user);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action='editcss';
+				}
+			}
 		}
 
 		if (! $error)
 		{
-    		// Save master.inc.php file
-    		$filemaster=$pathofwebsite.'/master.inc.php';
+			// Save master.inc.php file
+			$filemaster=$pathofwebsite.'/master.inc.php';
 
-    		dol_syslog("Save master file ".$filemaster);
+			dol_syslog("Save master file ".$filemaster);
 
-    		dol_mkdir($pathofwebsite);
+			dol_mkdir($pathofwebsite);
 
-    		// Now generate the master.inc.php page
-    		$result = dolSaveMasterFile($filemaster);
-    		if (! $result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-    		}
+			// Now generate the master.inc.php page
+			$result = dolSaveMasterFile($filemaster);
+			if (! $result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+			}
 
 
-    		// Html header file
-    		$htmlheadercontent ='';
+			// Html header file
+			$htmlheadercontent ='';
 
-    		/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
+			/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
     	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
     	    $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
@@ -1089,84 +1089,84 @@ 
     	    // $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
     	    $htmlheadercontent.= "// END PHP ?>\n";*/
 
-    		$htmlheadercontent.= preg_replace(array('/<html>\n*/ims','/<\/html>\n*/ims'), array('',''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
+			$htmlheadercontent.= preg_replace(array('/<html>\n*/ims','/<\/html>\n*/ims'), array('',''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
 
-    		/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
     	    $htmlheadercontent.= "// END PHP ?>"."\n";*/
 
-    		$htmlheadercontent = trim($htmlheadercontent)."\n";
+			$htmlheadercontent = trim($htmlheadercontent)."\n";
 
-    		$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-    		if (! $result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-    		}
+			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+			if (! $result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+			}
 
 
-    		// Css file
-    		$csscontent ='';
+			// Css file
+			$csscontent ='';
 
-    		$csscontent.= "<?php // BEGIN PHP\n";
-    		$csscontent.= '$websitekey=basename(__DIR__);'."\n";
-    		$csscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-    		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$csscontent.= "ob_start();\n";
-    		$csscontent.= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
-    		$csscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$csscontent.= "header('Content-type: text/css');\n";
-    		$csscontent.= "}\n";
-    		$csscontent.= "// END PHP ?>\n";
+			$csscontent.= "<?php // BEGIN PHP\n";
+			$csscontent.= '$websitekey=basename(__DIR__);'."\n";
+			$csscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+			$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$csscontent.= "ob_start();\n";
+			$csscontent.= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
+			$csscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$csscontent.= "header('Content-type: text/css');\n";
+			$csscontent.= "}\n";
+			$csscontent.= "// END PHP ?>\n";
 
-    		$csscontent.= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
+			$csscontent.= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
 
-    		$csscontent.= '<?php // BEGIN PHP'."\n";
-    		$csscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
-    		$csscontent.= "// END PHP ?>"."\n";
+			$csscontent.= '<?php // BEGIN PHP'."\n";
+			$csscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
+			$csscontent.= "// END PHP ?>"."\n";
 
-    		dol_syslog("Save css content into ".$filecss);
+			dol_syslog("Save css content into ".$filecss);
 
-    		$result = dolSaveCssFile($filecss, $csscontent);
-    		if (! $result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-    		}
+			$result = dolSaveCssFile($filecss, $csscontent);
+			if (! $result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filecss, null, 'errors');
+			}
 
 
-    		// Js file
-    		$jscontent ='';
+			// Js file
+			$jscontent ='';
 
-    		$jscontent.= "<?php // BEGIN PHP\n";
-    		$jscontent.= '$websitekey=basename(__DIR__);'."\n";
-    		$jscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-    		$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$jscontent.= "ob_start();\n";
-    		$jscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$jscontent.= "header('Content-type: application/javascript');\n";
-    		$jscontent.= "// END PHP ?>\n";
+			$jscontent.= "<?php // BEGIN PHP\n";
+			$jscontent.= '$websitekey=basename(__DIR__);'."\n";
+			$jscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+			$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$jscontent.= "ob_start();\n";
+			$jscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$jscontent.= "header('Content-type: application/javascript');\n";
+			$jscontent.= "// END PHP ?>\n";
 
-    		$jscontent.= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
+			$jscontent.= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
 
-    		$jscontent.= '<?php // BEGIN PHP'."\n";
-    		$jscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
-    		$jscontent.= "// END PHP ?>"."\n";
+			$jscontent.= '<?php // BEGIN PHP'."\n";
+			$jscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
+			$jscontent.= "// END PHP ?>"."\n";
 
-    		$result = dolSaveJsFile($filejs, $jscontent);
-    		if (! $result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-    		}
+			$result = dolSaveJsFile($filejs, $jscontent);
+			if (! $result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filejs, null, 'errors');
+			}
 
 
-    		// Robot file
-    		$robotcontent ='';
+			// Robot file
+			$robotcontent ='';
 
-    		/*$robotcontent.= "<?php // BEGIN PHP\n";
+			/*$robotcontent.= "<?php // BEGIN PHP\n";
     	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
     	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1176,63 +1176,63 @@ 
     	    $robotcontent.= "header('Content-type: text/css');\n";
     	    $robotcontent.= "// END PHP ?>\n";*/
 
-    		$robotcontent.= trim(GETPOST('WEBSITE_ROBOT', 'none'))."\n";
+			$robotcontent.= trim(GETPOST('WEBSITE_ROBOT', 'none'))."\n";
 
-    		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
-    		$result = dolSaveRobotFile($filerobot, $robotcontent);
-    		if (! $result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-    		}
+			$result = dolSaveRobotFile($filerobot, $robotcontent);
+			if (! $result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+			}
 
 
-    		// Htaccess file
-    		$htaccesscontent ='';
-    		$htaccesscontent.= trim(GETPOST('WEBSITE_HTACCESS', 'none'))."\n";
+			// Htaccess file
+			$htaccesscontent ='';
+			$htaccesscontent.= trim(GETPOST('WEBSITE_HTACCESS', 'none'))."\n";
 
-    		$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-    		if (! $result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-    		}
+			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+			if (! $result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+			}
 
 
-       		// manifest.json file
-       		$manifestjsoncontent ='';
+	   		// manifest.json file
+	   		$manifestjsoncontent ='';
 
-       		$manifestjsoncontent.= "<?php // BEGIN PHP\n";
-       		$manifestjsoncontent.= '$websitekey=basename(__DIR__);'."\n";
-       		$manifestjsoncontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-       		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-       		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-       		$manifestjsoncontent.= "ob_start();\n";
-       		$manifestjsoncontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-       		$manifestjsoncontent.= "header('Content-type: application/manifest+json');\n";
-       		$manifestjsoncontent.= "// END PHP ?>\n";
+	   		$manifestjsoncontent.= "<?php // BEGIN PHP\n";
+	   		$manifestjsoncontent.= '$websitekey=basename(__DIR__);'."\n";
+	   		$manifestjsoncontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+	   		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	   		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	   		$manifestjsoncontent.= "ob_start();\n";
+	   		$manifestjsoncontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+	   		$manifestjsoncontent.= "header('Content-type: application/manifest+json');\n";
+	   		$manifestjsoncontent.= "// END PHP ?>\n";
 
-       		$manifestjsoncontent.= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+	   		$manifestjsoncontent.= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-       		$manifestjsoncontent.= '<?php // BEGIN PHP'."\n";
-       		$manifestjsoncontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-       		$manifestjsoncontent.= "// END PHP ?>"."\n";
+	   		$manifestjsoncontent.= '<?php // BEGIN PHP'."\n";
+	   		$manifestjsoncontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+	   		$manifestjsoncontent.= "// END PHP ?>"."\n";
 
-       		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-       		if (! $result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
-       		}
+	   		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+	   		if (! $result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+	   		}
 
 
-       		// README.md file
-       		$readmecontent ='';
+	   		// README.md file
+	   		$readmecontent ='';
 
-       		/*$readmecontent.= "<?php // BEGIN PHP\n";
+	   		/*$readmecontent.= "<?php // BEGIN PHP\n";
        		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
        		$readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
        		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1242,39 +1242,39 @@ 
        		$readmecontent.= "header('Content-type: application/manifest+json');\n";
        		$readmecontent.= "// END PHP ?>\n";*/
 
-       		$readmecontent.= trim(GETPOST('WEBSITE_README', 'none'))."\n";
+	   		$readmecontent.= trim(GETPOST('WEBSITE_README', 'none'))."\n";
 
-       		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+	   		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
        		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
        		$readmecontent.= "// END PHP ?>"."\n";*/
 
-       		$result = dolSaveReadme($filereadme, $readmecontent);
-       		if (! $result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
-       		}
-
-
-    		// Message if no error
-    		if (! $error)
-    		{
-    			setEventMessages($langs->trans("Saved"), null, 'mesgs');
-    		}
-
-    		if (! GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
-    		{
-    			$action='preview';
-    			if ($backtopage)
-	    		{
-	    			header("Location: ".$backtopage);
-	    			exit;
-	    		}
-    		}
-    		else
-    		{
-    			$action = 'editcss';
-    		}
+	   		$result = dolSaveReadme($filereadme, $readmecontent);
+	   		if (! $result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+	   		}
+
+
+			// Message if no error
+			if (! $error)
+			{
+				setEventMessages($langs->trans("Saved"), null, 'mesgs');
+			}
+
+			if (! GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
+			{
+				$action='preview';
+				if ($backtopage)
+				{
+					header("Location: ".$backtopage);
+					exit;
+				}
+			}
+			else
+			{
+				$action = 'editcss';
+			}
 		}
 	}
 }
@@ -1652,35 +1652,35 @@ 
 
 			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');
 
-            // Security analysis
+			// Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
-            $forbiddenphpcommands=array("exec", "passthru", "system", "shell_exec", "proc_open");
-            if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
-            {
-                $forbiddenphpcommands=array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
-            }
-            foreach($forbiddenphpcommands as $forbiddenphpcommand)
-            {
-                if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
-                {
-                    $error++;
-                    setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
-
-            if (empty($user->rights->website->writephp))
-            {
-                if ($phpfullcodestringold != $phpfullcodestring)
-                {
-                    $error++;
-                    setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			$forbiddenphpcommands=array("exec", "passthru", "system", "shell_exec", "proc_open");
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
+			{
+				$forbiddenphpcommands=array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+			}
+			foreach($forbiddenphpcommands as $forbiddenphpcommand)
+			{
+				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
+				{
+					$error++;
+					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
+
+			if (empty($user->rights->website->writephp))
+			{
+				if ($phpfullcodestringold != $phpfullcodestring)
+				{
+					$error++;
+					setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
 			// Clean data. We remove all the head section.
 			$objectpage->content = preg_replace('/<head>.*<\/head>/ims', '', $objectpage->content);
@@ -2108,32 +2108,32 @@ 
 		$htmltext = '';
 		if (empty($object->fk_default_home))
 		{
-		    $htmltext.= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
+			$htmltext.= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
 		}
 		elseif (empty($virtualurl))
 		{
-		    $htmltext.= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+			$htmltext.= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
 		else
 		{
-		    $htmltext.= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
+			$htmltext.= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (! empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
-		    $htmltext.= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
+			$htmltext.= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
 		else
 		{
-    		$htmltext.=$langs->trans("SetHereVirtualHost", $dataroot);
-    		$htmltext.='<br>';
-    		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-    		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
-    		$htmltext.='<br>';
-    		$htmltext.='<br>';
-    		$htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
-    		$htmltext.='<br>';
-    		$htmltext.='<br>';
-    		$htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP");
+			$htmltext.=$langs->trans("SetHereVirtualHost", $dataroot);
+			$htmltext.='<br>';
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+			$htmltext.='<br>';
+			$htmltext.='<br>';
+			$htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
+			$htmltext.='<br>';
+			$htmltext.='<br>';
+			$htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP");
 		}
 		print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
 		print '</span>';
@@ -2441,15 +2441,15 @@ 
 		if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
 		{
 			$htmltext=$langs->transnoentitiesnoconv("YouCanEditHtmlSource").'<br>';
-            if ($conf->browser->layout == 'phone')
-            {
-                print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
-            else
-            {
-            	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
-            	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
+			if ($conf->browser->layout == 'phone')
+			{
+				print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
+			else
+			{
+				//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
+				print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
 		}
 		print '</span>';	// end websitehelp
 
@@ -3080,8 +3080,8 @@ 
 	print '</td><td>';
 	if ($pageauthorid > 0)
 	{
-	    $fuser->fetch($pageauthorid);
-	    print $fuser->getNomUrl(1);
+		$fuser->fetch($pageauthorid);
+		print $fuser->getNomUrl(1);
 	}
 	print '</td></tr>';
 
@@ -3094,17 +3094,17 @@ 
 
 	if ($action != 'createcontainer')
 	{
-	    print '<tr><td>';
-	    print $langs->trans('UserModif');
-	    print '</td><td>';
-	    if ($pageusermodifid > 0)
-	    {
-	        $fuser->fetch($pageusermodifid);
-	        print $fuser->getNomUrl(1);
-	    }
-	    print '</td></tr>';
+		print '<tr><td>';
+		print $langs->trans('UserModif');
+		print '</td><td>';
+		if ($pageusermodifid > 0)
+		{
+			$fuser->fetch($pageusermodifid);
+			print $fuser->getNomUrl(1);
+		}
+		print '</td></tr>';
 
-	    print '<tr><td>';
+		print '<tr><td>';
 		print $langs->trans('DateModification');
 		print '</td><td>';
 		print dol_print_date($pagedatemodification, 'dayhour', 'tzuser');
@@ -3462,7 +3462,7 @@ 
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
 		if (empty($conf->global->WEBSITE_EDITINLINE))
 		{
-		    // Remove the contenteditable="true"
+			// Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		}
 		else

Spacing +550 added lines, -550 removed lines

@@ -39,53 +39,53 @@ 
 require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
-$langs->loadLangs(array("admin","other","website","errors"));
+$langs->loadLangs(array("admin", "other", "website", "errors"));
 
-if (! $user->rights->website->read) accessforbidden();
+if (!$user->rights->website->read) accessforbidden();
 
-$conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
+$conf->dol_hide_leftmenu = 1; // Force hide of left menu.
 
-$error=0;
-$websiteid=GETPOST('websiteid', 'int');
-$websitekey=GETPOST('website', 'alpha');
-$page=GETPOST('page', 'alpha');
-$pageid=GETPOST('pageid', 'int');
-$pageref=GETPOST('pageref', 'aZ09');
-$action=GETPOST('action', 'aZ09');
-$confirm=GETPOST('confirm', 'alpha');
-$cancel=GETPOST('cancel', 'alpha');
-$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'bomlist';   // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha');											// Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ');												// Option for the css output (always '' except when 'print')
+$error = 0;
+$websiteid = GETPOST('websiteid', 'int');
+$websitekey = GETPOST('website', 'alpha');
+$page = GETPOST('page', 'alpha');
+$pageid = GETPOST('pageid', 'int');
+$pageref = GETPOST('pageref', 'aZ09');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$type_container=GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
+$type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
 
 $section_dir = GETPOST('section_dir', 'alpha');
 $file_manager = GETPOST('file_manager', 'alpha');
 $replacesite = GETPOST('replacesite', 'alpha');
 
-if (GETPOST('deletesite', 'alpha')) { $action='deletesite'; }
-if (GETPOST('delete', 'alpha')) { $action='delete'; }
-if (GETPOST('preview', 'alpha')) $action='preview';
-if (GETPOST('createsite', 'alpha')) { $action='createsite'; }
-if (GETPOST('createcontainer', 'alpha')) { $action='createcontainer'; }
-if (GETPOST('editcss', 'alpha')) { $action='editcss'; }
-if (GETPOST('editmenu', 'alpha')) { $action='editmenu'; }
-if (GETPOST('setashome', 'alpha')) { $action='setashome'; }
-if (GETPOST('editmeta', 'alpha')) { $action='editmeta'; }
-if (GETPOST('editsource', 'alpha')) { $action='editsource'; }
-if (GETPOST('editcontent', 'alpha')) { $action='editcontent'; }
-if (GETPOST('exportsite', 'alpha')) { $action='exportsite'; }
-if (GETPOST('importsite', 'alpha')) { $action='importsite'; }
-if (GETPOST('createfromclone', 'alpha')) { $action='createfromclone'; }
-if (GETPOST('createpagefromclone', 'alpha')) { $action='createpagefromclone'; }
-if (empty($action) && $file_manager) $action='file_manager';
-if (empty($action) && $replacesite) $action='replacesite';
+if (GETPOST('deletesite', 'alpha')) { $action = 'deletesite'; }
+if (GETPOST('delete', 'alpha')) { $action = 'delete'; }
+if (GETPOST('preview', 'alpha')) $action = 'preview';
+if (GETPOST('createsite', 'alpha')) { $action = 'createsite'; }
+if (GETPOST('createcontainer', 'alpha')) { $action = 'createcontainer'; }
+if (GETPOST('editcss', 'alpha')) { $action = 'editcss'; }
+if (GETPOST('editmenu', 'alpha')) { $action = 'editmenu'; }
+if (GETPOST('setashome', 'alpha')) { $action = 'setashome'; }
+if (GETPOST('editmeta', 'alpha')) { $action = 'editmeta'; }
+if (GETPOST('editsource', 'alpha')) { $action = 'editsource'; }
+if (GETPOST('editcontent', 'alpha')) { $action = 'editcontent'; }
+if (GETPOST('exportsite', 'alpha')) { $action = 'exportsite'; }
+if (GETPOST('importsite', 'alpha')) { $action = 'importsite'; }
+if (GETPOST('createfromclone', 'alpha')) { $action = 'createfromclone'; }
+if (GETPOST('createpagefromclone', 'alpha')) { $action = 'createpagefromclone'; }
+if (empty($action) && $file_manager) $action = 'file_manager';
+if (empty($action) && $replacesite) $action = 'replacesite';
 
 if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) $pageid = 0;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
@@ -96,19 +96,19 @@ 
 //if (! $sortfield) $sortfield='name';
 //if (! $sortorder) $sortorder='ASC';
 
-if (empty($action)) $action='preview';
+if (empty($action)) $action = 'preview';
 
-$object=new Website($db);
-$objectpage=new WebsitePage($db);
+$object = new Website($db);
+$objectpage = new WebsitePage($db);
 
-$object->fetchAll();    // Init $object->records with list of websites
+$object->fetchAll(); // Init $object->records with list of websites
 
 // If website not defined, we take first found
-if (! ($websiteid > 0) && empty($websitekey))
+if (!($websiteid > 0) && empty($websitekey))
 {
-	foreach($object->records as $key => $valwebsite)
+	foreach ($object->records as $key => $valwebsite)
 	{
-		$websitekey=$valwebsite->ref;
+		$websitekey = $valwebsite->ref;
 		break;
 	}
 }
@@ -137,15 +137,15 @@ 
 		{
 			if ($object->fk_default_home > 0)
 			{
-				$res = $objectpage->fetch($object->fk_default_home, $object->id, '');	// We search first page of web site
+				$res = $objectpage->fetch($object->fk_default_home, $object->id, ''); // We search first page of web site
 				if ($res > 0) $pageid = $object->fk_default_home;
 			}
 			else
 			{
-				$res = $objectpage->fetch(0, $object->id, '');	// We search first page of web site
+				$res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
 				if ($res == 0)	// Page was not found, we reset it
 				{
-					$objectpage=new WebsitePage($db);
+					$objectpage = new WebsitePage($db);
 				}
 				else			// We found a page, we set pageid to it.
 				{
@@ -166,61 +166,61 @@ 
 	$pageid = $object->fk_default_home;
 	if (empty($pageid))
 	{
-		$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-		if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-		$atleastonepage=(is_array($array) && count($array) > 0);
+		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		$atleastonepage = (is_array($array) && count($array) > 0);
 
-		$firstpageid=0;$homepageid=0;
-		foreach($array as $key => $valpage)
+		$firstpageid = 0; $homepageid = 0;
+		foreach ($array as $key => $valpage)
 		{
-			if (empty($firstpageid)) $firstpageid=$valpage->id;
-			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+			if (empty($firstpageid)) $firstpageid = $valpage->id;
+			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
 		}
-		$pageid=($homepageid?$homepageid:$firstpageid);   // We choose home page and if not defined yet, we take first page
+		$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
 	}
 }
 
 
 global $dolibarr_main_data_root;
-$pathofwebsite=$dolibarr_main_data_root.'/website/'.$websitekey;
-$filehtmlheader=$pathofwebsite.'/htmlheader.html';
-$filecss=$pathofwebsite.'/styles.css.php';
-$filejs=$pathofwebsite.'/javascript.js.php';
-$filerobot=$pathofwebsite.'/robots.txt';
-$filehtaccess=$pathofwebsite.'/.htaccess';
-$filetpl=$pathofwebsite.'/page'.$pageid.'.tpl.php';
-$fileindex=$pathofwebsite.'/index.php';
-$filewrapper=$pathofwebsite.'/wrapper.php';
-$filemanifestjson=$pathofwebsite.'/manifest.json.php';
-$filereadme=$pathofwebsite.'/README.md';
+$pathofwebsite = $dolibarr_main_data_root.'/website/'.$websitekey;
+$filehtmlheader = $pathofwebsite.'/htmlheader.html';
+$filecss = $pathofwebsite.'/styles.css.php';
+$filejs = $pathofwebsite.'/javascript.js.php';
+$filerobot = $pathofwebsite.'/robots.txt';
+$filehtaccess = $pathofwebsite.'/.htaccess';
+$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
+$fileindex = $pathofwebsite.'/index.php';
+$filewrapper = $pathofwebsite.'/wrapper.php';
+$filemanifestjson = $pathofwebsite.'/manifest.json.php';
+$filereadme = $pathofwebsite.'/README.md';
 
 // Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 
 $permtouploadfile = $user->rights->website->write;
 $diroutput = $conf->medias->multidir_output[$conf->entity];
 
-$relativepath=$section_dir;
+$relativepath = $section_dir;
 $upload_dir = $diroutput.'/'.$relativepath;
 
 $htmlheadercontentdefault = '';
-$htmlheadercontentdefault.='<link rel="stylesheet" id="google-fonts-css"  href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" />'."\n";
-$htmlheadercontentdefault.='<link rel="stylesheet" id="font-wasesome-css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />'."\n";
-$htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>'."\n";
-$htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>'."\n";
-$htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>'."\n";
-$htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js"></script>'."\n";
-$htmlheadercontentdefault.='<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta.2/js/bootstrap.min.js"></script>'."\n";
-$htmlheadercontentdefault.='<!--'."\n";
-$htmlheadercontentdefault.='<script src="/document.php?modulepart=medias&file=css/myfile.css"></script>'."\n";
-$htmlheadercontentdefault.='<script src="/document.php?modulepart=medias&file=js/myfile.js"></script>'."\n";
-$htmlheadercontentdefault.='-->'."\n";
+$htmlheadercontentdefault .= '<link rel="stylesheet" id="google-fonts-css"  href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" />'."\n";
+$htmlheadercontentdefault .= '<link rel="stylesheet" id="font-wasesome-css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />'."\n";
+$htmlheadercontentdefault .= '<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>'."\n";
+$htmlheadercontentdefault .= '<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>'."\n";
+$htmlheadercontentdefault .= '<script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>'."\n";
+$htmlheadercontentdefault .= '<script src="//cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js"></script>'."\n";
+$htmlheadercontentdefault .= '<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta.2/js/bootstrap.min.js"></script>'."\n";
+$htmlheadercontentdefault .= '<!--'."\n";
+$htmlheadercontentdefault .= '<script src="/document.php?modulepart=medias&file=css/myfile.css"></script>'."\n";
+$htmlheadercontentdefault .= '<script src="/document.php?modulepart=medias&file=js/myfile.js"></script>'."\n";
+$htmlheadercontentdefault .= '-->'."\n";
 
 $manifestjsoncontentdefault = '';
-$manifestjsoncontentdefault.= '{
+$manifestjsoncontentdefault .= '{
 	"name": "MyWebsite",
 	"short_name": "MyWebsite",
 	"start_url": "/",
@@ -266,9 +266,9 @@ 
  */
 
 // Protections
-if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') ||  GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
+if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 {
-    $action = 'preview';    // To avoid to make an action on another page or another site when we click on button to select another site or page.
+    $action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
 if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
 {
@@ -278,20 +278,20 @@ 
     $pageid = $object->fk_default_home;
     if (empty($pageid))
     {
-    	$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-    	if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-    	$atleastonepage=(is_array($array) && count($array) > 0);
+    	$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+    	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+    	$atleastonepage = (is_array($array) && count($array) > 0);
 
-    	$firstpageid=0; $homepageid=0;
-    	foreach($array as $key => $valpage)
+    	$firstpageid = 0; $homepageid = 0;
+    	foreach ($array as $key => $valpage)
     	{
-    		if (empty($firstpageid)) $firstpageid=$valpage->id;
-    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+    		if (empty($firstpageid)) $firstpageid = $valpage->id;
+    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
     	}
-    	$pageid=($homepageid?$homepageid:$firstpageid);   // We choose home page and if not defined yet, we take first page
+    	$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
     }
 }
-if (GETPOST('refreshpage', 'alpha') && ! in_array($action, array('updatecss'))) $action='preview';
+if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) $action = 'preview';
 
 // Cancel
 if ($cancel)
@@ -305,17 +305,17 @@ 
 }
 
 $savbacktopage = $backtopage;
-$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid.(GETPOST('section_dir', 'alpha')?'&section_dir='.urlencode(GETPOST('section_dir', 'alpha')):'');	// used after a confirm_deletefile into actions_linkedfiles.inc.php
+$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $backtopage = $savbacktopage;
 
-if ($action == 'renamefile') $action='file_manager';		// After actions_linkedfiles, if action were renamefile, we set it to 'file_manager'
+if ($action == 'renamefile') $action = 'file_manager'; // After actions_linkedfiles, if action were renamefile, we set it to 'file_manager'
 
 if ($action == 'seteditinline')
 {
 	dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 1);
 	setEventMessages($langs->trans("FeatureNotYetAvailable"), null, 'warnings');
-	dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 0);	// Force disable of 'Include dynamic content'
+	dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 0); // Force disable of 'Include dynamic content'
 	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
 	exit;
 }
@@ -328,7 +328,7 @@ 
 if ($action == 'setshowsubcontainers')
 {
 	dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1);
-	dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 0);	// Force disable of edit inline
+	dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 0); // Force disable of edit inline
 	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
 	exit;
 }
@@ -374,28 +374,28 @@ 
 {
 	$db->begin();
 
-	if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
+	if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
     {
         $error++;
         setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 	}
 
-	if (! $error && ! GETPOST('WEBSITE_REF', 'alpha'))
+	if (!$error && !GETPOST('WEBSITE_REF', 'alpha'))
 	{
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 	}
-	if (! $error && ! preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha')))
+	if (!$error && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha')))
 	{
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("Ref")), null, 'errors');
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$tmpobject=new Website($db);
+		$tmpobject = new Website($db);
 		$tmpobject->ref = GETPOST('WEBSITE_REF', 'alpha');
 		$tmpobject->description = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
 		$tmpobject->virtualhost = GETPOST('virtualhost', 'alpha');
@@ -408,11 +408,11 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SiteAdded", $object->ref), null, 'mesgs');
-		$action='';
+		$action = '';
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
 		exit;
@@ -420,10 +420,10 @@ 
 	else
 	{
 		$db->rollback();
-		$action='createsite';
+		$action = 'createsite';
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$action = 'preview';
 		$id = $object->id;
@@ -440,9 +440,9 @@ 
 	$objectpage->fk_website = $object->id;
 	if (GETPOSTISSET('fetchexternalurl'))
 	{
-		$urltograb=GETPOST('externalurl', 'alpha');
-		$grabimages=GETPOST('grabimages', 'alpha');
-		$grabimagesinto=GETPOST('grabimagesinto', 'alpha');
+		$urltograb = GETPOST('externalurl', 'alpha');
+		$grabimages = GETPOST('grabimages', 'alpha');
+		$grabimagesinto = GETPOST('grabimagesinto', 'alpha');
 		//var_dump($grabimages);exit;
 	}
 
@@ -457,7 +457,7 @@ 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
 			$action = 'createcontainer';
 		}
-		elseif (! preg_match('/^http/', $urltograb))
+		elseif (!preg_match('/^http/', $urltograb))
 		{
 			$error++;
 			$langs->load("errors");
@@ -465,16 +465,16 @@ 
 			$action = 'createcontainer';
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Clean url to grab, so url can be
 			// http://www.example.com/ or http://www.example.com/dir1/ or http://www.example.com/dir1/aaa
 			$urltograbwithoutdomainandparam = preg_replace('/^https?:\/\/[^\/]+\/?/i', '', $urltograb);
 			//$urltograbwithoutdomainandparam = preg_replace('/^file:\/\/[^\/]+\/?/i', '', $urltograb);
 			$urltograbwithoutdomainandparam = preg_replace('/\?.*$/', '', $urltograbwithoutdomainandparam);
-			if (empty($urltograbwithoutdomainandparam) && ! preg_match('/\/$/', $urltograb))
+			if (empty($urltograbwithoutdomainandparam) && !preg_match('/\/$/', $urltograb))
 			{
-				$urltograb.='/';
+				$urltograb .= '/';
 			}
 			$pageurl = dol_sanitizeFileName(preg_replace('/[\/\.]/', '-', preg_replace('/\/+$/', '', $urltograbwithoutdomainandparam)));
 
@@ -493,31 +493,31 @@ 
 			{
 				setEventMessages($langs->trans("AliasPageAlreadyExists", $pageurl), null, 'errors');
 				$error++;
-				$action='createcontainer';
+				$action = 'createcontainer';
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$tmp = getURLContent($urltograb);
 			if ($tmp['curl_error_no'])
 			{
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
-				$action='createcontainer';
+				$action = 'createcontainer';
 			}
 			elseif ($tmp['http_code'] != '200')
 			{
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
-				$action='createcontainer';
+				$action = 'createcontainer';
 			}
 			else
 			{
 				// Remove comments
 				$tmp['content'] = removeHtmlComment($tmp['content']);
 
-				$regs=array();
+				$regs = array();
 
 				preg_match('/<head>(.*)<\/head>/ims', $tmp['content'], $regs);
 				$head = $regs[1];
@@ -527,21 +527,21 @@ 
 	   			if (empty($objectpage->pageurl))
 	   			{
 	   				$tmpdomain = getDomainFromURL($urltograb);
-	   				$objectpage->pageurl=$tmpdomain.'-home';
+	   				$objectpage->pageurl = $tmpdomain.'-home';
 	   			}
 
 	   			$objectpage->aliasalt = '';
 
 	   			if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) $objectpage->aliasalt = $regs[1];
 
-	   			$regtmp=array();
+	   			$regtmp = array();
 				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
 				{
 					$objectpage->title = $regtmp[1];
 				}
 				if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp))
 				{
-					if (empty($objectpage->title)) $objectpage->title = $regtmp[1];		// If title not found into <title>, we get it from <meta title>
+					if (empty($objectpage->title)) $objectpage->title = $regtmp[1]; // If title not found into <title>, we get it from <meta title>
 				}
 				if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
 				{
@@ -553,7 +553,7 @@ 
 				}
 				if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp))
 				{
-					$tmplang=explode('-', $regtmp[1]);
+					$tmplang = explode('-', $regtmp[1]);
 					$objectpage->lang = $tmplang[0].($tmplang[1] ? '_'.strtoupper($tmplang[1]) : '');
 				}
 
@@ -563,7 +563,7 @@ 
 				$objectpage->content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $objectpage->content);
 				$objectpage->content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $objectpage->content);
 
-				$absoluteurlinaction=$urltograbdirwithoutslash;
+				$absoluteurlinaction = $urltograbdirwithoutslash;
 				// TODO Replace 'action="$urltograbdirwithoutslash' into action="/"
 				// TODO Replace 'action="$urltograbdirwithoutslash..."' into   action="..."
 				// TODO Replace 'a href="$urltograbdirwithoutslash' into a href="/"
@@ -598,11 +598,11 @@ 
 					$linkwithoutdomain = $regs[2][$key];
 					if (preg_match('/^\//', $regs[2][$key]))
 					{
-						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
 					else
 					{
-						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
+						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
 					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
@@ -667,11 +667,11 @@ 
 					$linkwithoutdomain = $regs[2][$key];
 					if (preg_match('/^\//', $regs[2][$key]))
 					{
-						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
 					else
 					{
-						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
+						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
 					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
@@ -696,14 +696,14 @@ 
 						$errorforsubresource++;
 						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
-						$action='createcontainer';
+						$action = 'createcontainer';
 					}
 					elseif ($tmpgeturl['http_code'] != '200')
 					{
 						$errorforsubresource++;
 						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
-						$action='createcontainer';
+						$action = 'createcontainer';
 					}
 					else
 					{
@@ -726,7 +726,7 @@ 
 						//	@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 						//	$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-						$pagecsscontent.='/* Content of file '.$urltograbbis.' */'."\n";
+						$pagecsscontent .= '/* Content of file '.$urltograbbis.' */'."\n";
 
 						getAllImages($object, $objectpage, $urltograbbis, $tmpgeturl['content'], $action, 1, $grabimages, $grabimagesinto);
 
@@ -738,19 +738,19 @@ 
 							$contentforlessc = $lesscobj->compile($contentforlessc);
 							//var_dump($contentforlessc); exit;
 
-							$pagecsscontent.=$contentforlessc."\n";
+							$pagecsscontent .= $contentforlessc."\n";
 							//$pagecsscontent.=$tmpgeturl['content']."\n";
 						} catch (exception $e) {
 							//echo "failed to compile lessc";
 							dol_syslog("Failed to compile the CSS from URL ".$urltograbbis." with lessc: ".$e->getMessage(), LOG_WARNING);
-							$pagecsscontent.=$tmpgeturl['content']."\n";
+							$pagecsscontent .= $tmpgeturl['content']."\n";
 						}
 
 						$objectpage->htmlheader = preg_replace('/'.preg_quote($regs[0][$key], '/').'\n*/ims', '', $objectpage->htmlheader);
 					}
 				}
 
-				$pagecsscontent.='</style>';
+				$pagecsscontent .= '</style>';
 				//var_dump($pagecsscontent);
 
 				//print dol_escape_htmltag($tmp);exit;
@@ -786,11 +786,11 @@ 
 		$objectpage->lang = GETPOST('WEBSITE_LANG', 'aZ09');
 		$objectpage->htmlheader = GETPOST('htmlheader', 'none');
 
-		$substitutionarray=array();
-		$substitutionarray['__WEBSITE_CREATE_BY__']=$user->getFullName($langs);
+		$substitutionarray = array();
+		$substitutionarray['__WEBSITE_CREATE_BY__'] = $user->getFullName($langs);
 
 		$sample = GETPOST('sample', 'alpha');
-		if (empty($sample)) $sample='empty';
+		if (empty($sample)) $sample = 'empty';
 
 		$pathtosample = DOL_DOCUMENT_ROOT.'/website/samples/page-sample-'.$sample.'.html';
 
@@ -798,57 +798,57 @@ 
 		$objectpage->content = make_substitutions(@file_get_contents($pathtosample), $substitutionarray);
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		if (empty($objectpage->pageurl))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
 			$error++;
-			$action='createcontainer';
+			$action = 'createcontainer';
 		}
-		elseif (! preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
+		elseif (!preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
 			$error++;
-			$action='createcontainer';
+			$action = 'createcontainer';
 		}
 		if (empty($objectpage->title))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_TITLE")), null, 'errors');
 			$error++;
-			$action='createcontainer';
+			$action = 'createcontainer';
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$res = $objectpage->create($user);
 		if ($res <= 0)
 		{
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
-			$action='createcontainer';
+			$action = 'createcontainer';
 		}
 	}
-	if (! $error)
+	if (!$error)
 	{
-		if (! empty($objectpage->content))
+		if (!empty($objectpage->content))
 		{
-			$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
-			$filetpl=$pathofwebsite.'/page'.$objectpage->id.'.tpl.php';
+			$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
+			$filetpl = $pathofwebsite.'/page'.$objectpage->id.'.tpl.php';
 
 			// Save page alias
-			$result=dolSavePageAlias($filealias, $object, $objectpage);
-			if (! $result)
+			$result = dolSavePageAlias($filealias, $object, $objectpage);
+			if (!$result)
 			{
 				setEventMessages('Failed to write file '.$filealias, null, 'errors');
 			}
 
 			// Save page of content
-			$result=dolSavePageContent($filetpl, $object, $objectpage);
+			$result = dolSavePageContent($filetpl, $object, $objectpage);
 			if ($result)
 			{
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
@@ -860,75 +860,75 @@ 
 			}
 		}
 	}
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
-		$action='';
+		$action = '';
 	}
 	else
 	{
 		$db->rollback();
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$pageid = $objectpage->id;
 
 		// To generate the CSS, robot and htmlheader file.
 
 		// Check symlink to medias and restore it if ko
-		$pathtomedias=DOL_DATA_ROOT.'/medias';
-		$pathtomediasinwebsite=$pathofwebsite.'/medias';
-		if (! is_link(dol_osencode($pathtomediasinwebsite)))
+		$pathtomedias = DOL_DATA_ROOT.'/medias';
+		$pathtomediasinwebsite = $pathofwebsite.'/medias';
+		if (!is_link(dol_osencode($pathtomediasinwebsite)))
 		{
 			dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
-			dol_mkdir(dirname($pathtomediasinwebsite));     // To be sure dir for website exists
+			dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 			$result = symlink($pathtomedias, $pathtomediasinwebsite);
 		}
 
-		if (! dol_is_file($filehtmlheader))
+		if (!dol_is_file($filehtmlheader))
 		{
-			$htmlheadercontent ="<html>\n";
-			$htmlheadercontent.=$htmlheadercontentdefault;
-			$htmlheadercontent.="</html>";
-			$result=dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+			$htmlheadercontent = "<html>\n";
+			$htmlheadercontent .= $htmlheadercontentdefault;
+			$htmlheadercontent .= "</html>";
+			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
 		}
 
-		if (! dol_is_file($filecss))
+		if (!dol_is_file($filecss))
 		{
 			$csscontent = "/* CSS content (all pages) */\nbody.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
-			$result=dolSaveCssFile($filecss, $csscontent);
+			$result = dolSaveCssFile($filecss, $csscontent);
 		}
 
-		if (! dol_is_file($filejs))
+		if (!dol_is_file($filejs))
 		{
 			$jscontent = "/* JS content (all pages) */\n";
-			$result=dolSaveJsFile($filejs, $jscontent);
+			$result = dolSaveJsFile($filejs, $jscontent);
 		}
 
-		if (! dol_is_file($filerobot))
+		if (!dol_is_file($filerobot))
 		{
 			$robotcontent = "# Robot file. Generated with Dolibarr\nUser-agent: *\nAllow: /public/\nDisallow: /administrator/";
-			$result=dolSaveRobotFile($filerobot, $robotcontent);
+			$result = dolSaveRobotFile($filerobot, $robotcontent);
 		}
 
-		if (! dol_is_file($filehtaccess))
+		if (!dol_is_file($filehtaccess))
 		{
 			$htaccesscontent = "# Order allow,deny\n# Deny from all";
-			$result=dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
 		}
 
-		if (! dol_is_file($filemanifestjson))
+		if (!dol_is_file($filemanifestjson))
 		{
 			$manifestjsoncontent = "";
-			$result=dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+			$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
 		}
 
-		if (! dol_is_file($filereadme))
+		if (!dol_is_file($filereadme))
 		{
 			$readmecontent = "Website generated by Dolibarr ERP CRM";
-			$result=dolSaveReadme($filereadme, $readmecontent);
+			$result = dolSaveReadme($filereadme, $readmecontent);
 		}
 
 		$action = 'preview';
@@ -954,23 +954,23 @@ 
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	if (! $error)
+	if (!$error)
 	{
 		if (GETPOST('delete_also_js', 'alpha') == 'on')
 		{
-			$pathofwebsitejs=DOL_DATA_ROOT.'/medias/js/'.$object->ref;
+			$pathofwebsitejs = DOL_DATA_ROOT.'/medias/js/'.$object->ref;
 
 			dol_delete_dir_recursive($pathofwebsitejs);
 		}
 		if (GETPOST('delete_also_medias', 'alpha') == 'on')
 		{
-			$pathofwebsitemedias=DOL_DATA_ROOT.'/medias/image/'.$object->ref;
+			$pathofwebsitemedias = DOL_DATA_ROOT.'/medias/image/'.$object->ref;
 
 			dol_delete_dir_recursive($pathofwebsitemedias);
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SiteDeleted", $object->ref), null, 'mesgs');
@@ -1007,7 +1007,7 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $websitekey), null, 'mesgs');
@@ -1026,9 +1026,9 @@ 
 if ($action == 'updatecss')
 {
 	// If we tried to reload another site/page, we stay on editcss mode.
-	if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') ||  GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
+	if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 	{
-		$action='editcss';
+		$action = 'editcss';
 	}
 	else
 	{
@@ -1037,14 +1037,14 @@ 
 
 		if (GETPOSTISSET('virtualhost'))
 		{
-		    if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
+		    if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
     		{
     		    $error++;
     		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
-    		    $action='editcss';
+    		    $action = 'editcss';
     		}
 
-    		if (! $error)
+    		if (!$error)
     		{
     		    $object->virtualhost = GETPOST('virtualhost', 'alpha');
 
@@ -1053,15 +1053,15 @@ 
         		{
         		    $error++;
         		    setEventMessages($object->error, $object->errors, 'errors');
-        		    $action='editcss';
+        		    $action = 'editcss';
         		}
     		}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
     		// Save master.inc.php file
-    		$filemaster=$pathofwebsite.'/master.inc.php';
+    		$filemaster = $pathofwebsite.'/master.inc.php';
 
     		dol_syslog("Save master file ".$filemaster);
 
@@ -1069,7 +1069,7 @@ 
 
     		// Now generate the master.inc.php page
     		$result = dolSaveMasterFile($filemaster);
-    		if (! $result)
+    		if (!$result)
     		{
     			$error++;
     			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
@@ -1077,7 +1077,7 @@ 
 
 
     		// Html header file
-    		$htmlheadercontent ='';
+    		$htmlheadercontent = '';
 
     		/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
     	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
@@ -1089,7 +1089,7 @@ 
     	    // $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
     	    $htmlheadercontent.= "// END PHP ?>\n";*/
 
-    		$htmlheadercontent.= preg_replace(array('/<html>\n*/ims','/<\/html>\n*/ims'), array('',''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
+    		$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
 
     		/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
@@ -1098,7 +1098,7 @@ 
     		$htmlheadercontent = trim($htmlheadercontent)."\n";
 
     		$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-    		if (! $result)
+    		if (!$result)
     		{
     			$error++;
     			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
@@ -1106,30 +1106,30 @@ 
 
 
     		// Css file
-    		$csscontent ='';
-
-    		$csscontent.= "<?php // BEGIN PHP\n";
-    		$csscontent.= '$websitekey=basename(__DIR__);'."\n";
-    		$csscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-    		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$csscontent.= "ob_start();\n";
-    		$csscontent.= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
-    		$csscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$csscontent.= "header('Content-type: text/css');\n";
-    		$csscontent.= "}\n";
-    		$csscontent.= "// END PHP ?>\n";
-
-    		$csscontent.= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
-
-    		$csscontent.= '<?php // BEGIN PHP'."\n";
-    		$csscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
-    		$csscontent.= "// END PHP ?>"."\n";
+    		$csscontent = '';
+
+    		$csscontent .= "<?php // BEGIN PHP\n";
+    		$csscontent .= '$websitekey=basename(__DIR__);'."\n";
+    		$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n"; // For the css, we need to set path of master using the dirname of css file.
+    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+    		$csscontent .= "ob_start();\n";
+    		$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
+    		$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+    		$csscontent .= "header('Content-type: text/css');\n";
+    		$csscontent .= "}\n";
+    		$csscontent .= "// END PHP ?>\n";
+
+    		$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
+
+    		$csscontent .= '<?php // BEGIN PHP'."\n";
+    		$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
+    		$csscontent .= "// END PHP ?>"."\n";
 
     		dol_syslog("Save css content into ".$filecss);
 
     		$result = dolSaveCssFile($filecss, $csscontent);
-    		if (! $result)
+    		if (!$result)
     		{
     			$error++;
     			setEventMessages('Failed to write file '.$filecss, null, 'errors');
@@ -1137,26 +1137,26 @@ 
 
 
     		// Js file
-    		$jscontent ='';
+    		$jscontent = '';
 
-    		$jscontent.= "<?php // BEGIN PHP\n";
-    		$jscontent.= '$websitekey=basename(__DIR__);'."\n";
-    		$jscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-    		$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$jscontent.= "ob_start();\n";
-    		$jscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$jscontent.= "header('Content-type: application/javascript');\n";
-    		$jscontent.= "// END PHP ?>\n";
+    		$jscontent .= "<?php // BEGIN PHP\n";
+    		$jscontent .= '$websitekey=basename(__DIR__);'."\n";
+    		$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n"; // For the css, we need to set path of master using the dirname of css file.
+    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+    		$jscontent .= "ob_start();\n";
+    		$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+    		$jscontent .= "header('Content-type: application/javascript');\n";
+    		$jscontent .= "// END PHP ?>\n";
 
-    		$jscontent.= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
+    		$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
 
-    		$jscontent.= '<?php // BEGIN PHP'."\n";
-    		$jscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
-    		$jscontent.= "// END PHP ?>"."\n";
+    		$jscontent .= '<?php // BEGIN PHP'."\n";
+    		$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
+    		$jscontent .= "// END PHP ?>"."\n";
 
     		$result = dolSaveJsFile($filejs, $jscontent);
-    		if (! $result)
+    		if (!$result)
     		{
     			$error++;
     			setEventMessages('Failed to write file '.$filejs, null, 'errors');
@@ -1164,7 +1164,7 @@ 
 
 
     		// Robot file
-    		$robotcontent ='';
+    		$robotcontent = '';
 
     		/*$robotcontent.= "<?php // BEGIN PHP\n";
     	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
@@ -1176,14 +1176,14 @@ 
     	    $robotcontent.= "header('Content-type: text/css');\n";
     	    $robotcontent.= "// END PHP ?>\n";*/
 
-    		$robotcontent.= trim(GETPOST('WEBSITE_ROBOT', 'none'))."\n";
+    		$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'none'))."\n";
 
     		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
     		$result = dolSaveRobotFile($filerobot, $robotcontent);
-    		if (! $result)
+    		if (!$result)
     		{
     			$error++;
     			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
@@ -1191,11 +1191,11 @@ 
 
 
     		// Htaccess file
-    		$htaccesscontent ='';
-    		$htaccesscontent.= trim(GETPOST('WEBSITE_HTACCESS', 'none'))."\n";
+    		$htaccesscontent = '';
+    		$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'none'))."\n";
 
     		$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-    		if (! $result)
+    		if (!$result)
     		{
     			$error++;
     			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
@@ -1203,26 +1203,26 @@ 
 
 
        		// manifest.json file
-       		$manifestjsoncontent ='';
+       		$manifestjsoncontent = '';
 
-       		$manifestjsoncontent.= "<?php // BEGIN PHP\n";
-       		$manifestjsoncontent.= '$websitekey=basename(__DIR__);'."\n";
-       		$manifestjsoncontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-       		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-       		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-       		$manifestjsoncontent.= "ob_start();\n";
-       		$manifestjsoncontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-       		$manifestjsoncontent.= "header('Content-type: application/manifest+json');\n";
-       		$manifestjsoncontent.= "// END PHP ?>\n";
+       		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
+       		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+       		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n"; // For the css, we need to set path of master using the dirname of css file.
+       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+       		$manifestjsoncontent .= "ob_start();\n";
+       		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+       		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+       		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$manifestjsoncontent.= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+       		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-       		$manifestjsoncontent.= '<?php // BEGIN PHP'."\n";
-       		$manifestjsoncontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-       		$manifestjsoncontent.= "// END PHP ?>"."\n";
+       		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+       		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+       		$manifestjsoncontent .= "// END PHP ?>"."\n";
 
        		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-       		if (! $result)
+       		if (!$result)
        		{
        			$error++;
        			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
@@ -1230,7 +1230,7 @@ 
 
 
        		// README.md file
-       		$readmecontent ='';
+       		$readmecontent = '';
 
        		/*$readmecontent.= "<?php // BEGIN PHP\n";
        		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
@@ -1242,14 +1242,14 @@ 
        		$readmecontent.= "header('Content-type: application/manifest+json');\n";
        		$readmecontent.= "// END PHP ?>\n";*/
 
-       		$readmecontent.= trim(GETPOST('WEBSITE_README', 'none'))."\n";
+       		$readmecontent .= trim(GETPOST('WEBSITE_README', 'none'))."\n";
 
        		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
        		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
        		$readmecontent.= "// END PHP ?>"."\n";*/
 
        		$result = dolSaveReadme($filereadme, $readmecontent);
-       		if (! $result)
+       		if (!$result)
        		{
        			$error++;
        			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
@@ -1257,14 +1257,14 @@ 
 
 
     		// Message if no error
-    		if (! $error)
+    		if (!$error)
     		{
     			setEventMessages($langs->trans("Saved"), null, 'mesgs');
     		}
 
-    		if (! GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
+    		if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
     		{
-    			$action='preview';
+    			$action = 'preview';
     			if ($backtopage)
 	    		{
 	    			header("Location: ".$backtopage);
@@ -1288,13 +1288,13 @@ 
 
 	$object->fk_default_home = $pageid;
 	$res = $object->update($user);
-	if (! $res > 0)
+	if (!$res > 0)
 	{
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 
@@ -1305,7 +1305,7 @@ 
 		if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');
 		else setEventMessages('Failed to write file '.$fileindex, null, 'errors');
 
-		$action='preview';
+		$action = 'preview';
 	}
 	else
 	{
@@ -1324,12 +1324,12 @@ 
 	$objectpage->fk_website = $object->id;
 
 	// Check parameters
-	if (! preg_match('/^[a-z0-9\-\_]+$/i', GETPOST('WEBSITE_PAGENAME', 'alpha')))
+	if (!preg_match('/^[a-z0-9\-\_]+$/i', GETPOST('WEBSITE_PAGENAME', 'alpha')))
 	{
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
-		$action='editmeta';
+		$action = 'editmeta';
 	}
 
 	$res = $objectpage->fetch($pageid, $object->id);
@@ -1340,9 +1340,9 @@ 
 	}
 
 	// Check alias not exists
-	if (! $error && GETPOST('WEBSITE_PAGENAME', 'alpha'))
+	if (!$error && GETPOST('WEBSITE_PAGENAME', 'alpha'))
 	{
-		$websitepagetemp=new WebsitePage($db);
+		$websitepagetemp = new WebsitePage($db);
 		$result = $websitepagetemp->fetch(-1 * $objectpage->id, $object->id, GETPOST('WEBSITE_PAGENAME', 'alpha'));
 		if ($result < 0)
 		{
@@ -1359,11 +1359,11 @@ 
 			$action = 'editmeta';
 		}
 	}
-	if (! $error && GETPOST('WEBSITE_ALIASALT', 'alpha'))
+	if (!$error && GETPOST('WEBSITE_ALIASALT', 'alpha'))
 	{
-		$arrayofaliastotest=explode(',', GETPOST('WEBSITE_ALIASALT', 'alpha'));
-		$websitepagetemp=new WebsitePage($db);
-		foreach($arrayofaliastotest as $aliastotest)
+		$arrayofaliastotest = explode(',', GETPOST('WEBSITE_ALIASALT', 'alpha'));
+		$websitepagetemp = new WebsitePage($db);
+		foreach ($arrayofaliastotest as $aliastotest)
 		{
 			$result = $websitepagetemp->fetch(-1 * $objectpage->id, $object->id, $aliastotest);
 			if ($result < 0)
@@ -1385,7 +1385,7 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$objectpage->old_object = clone $objectpage;
 
@@ -1400,11 +1400,11 @@ 
 		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
 		$objectpage->fk_page = GETPOST('pageidfortranslation', 'int');
 
-		$newdatecreation=dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
+		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
 		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
 
 		$res = $objectpage->update($user);
-		if (! ($res > 0))
+		if (!($res > 0))
 		{
 			$langs->load("errors");
 			if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
@@ -1424,7 +1424,7 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 	}
@@ -1433,32 +1433,32 @@ 
 		$db->rollback();
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$filemaster=$pathofwebsite.'/master.inc.php';
-		$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
-		$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+		$filemaster = $pathofwebsite.'/master.inc.php';
+		$fileoldalias = $pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
+		$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
 
 		dol_mkdir($pathofwebsite);
 
 
 		// Now generate the master.inc.php page
 		$result = dolSaveMasterFile($filemaster);
-		if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+		if (!$result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
 
 		// Now delete the alias.php page
-		if (! empty($fileoldalias))
+		if (!empty($fileoldalias))
 		{
 			dol_syslog("We delete old alias page name=".$fileoldalias." to build a new alias page=".$filealias);
 			dol_delete_file($fileoldalias);
 		}
 		// Now delete the alternative alias.php pages
-		if (! empty($objectpage->old_object->aliasalt))
+		if (!empty($objectpage->old_object->aliasalt))
 		{
-			$tmpaltaliases=explode(',', $objectpage->old_object->aliasalt);
+			$tmpaltaliases = explode(',', $objectpage->old_object->aliasalt);
 			if (is_array($tmpaltaliases))
 			{
-				foreach($tmpaltaliases as $tmpaliasalt)
+				foreach ($tmpaltaliases as $tmpaliasalt)
 				{
 					dol_syslog("We delete old alt alias pages name=".trim($tmpaliasalt));
 					dol_delete_file($pathofwebsite.'/'.trim($tmpaliasalt).'.php');
@@ -1467,20 +1467,20 @@ 
 		}
 
 		// Save page alias
-		$result=dolSavePageAlias($filealias, $object, $objectpage);
-		if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+		$result = dolSavePageAlias($filealias, $object, $objectpage);
+		if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
 		// Save alt aliases
-		if (! empty($objectpage->aliasalt))
+		if (!empty($objectpage->aliasalt))
 		{
-			$tmpaltaliases=explode(',', $objectpage->aliasalt);
+			$tmpaltaliases = explode(',', $objectpage->aliasalt);
 			if (is_array($tmpaltaliases))
 			{
-				foreach($tmpaltaliases as $tmpaliasalt)
+				foreach ($tmpaltaliases as $tmpaliasalt)
 				{
 					if (trim($tmpaliasalt))
 					{
-						$result=dolSavePageAlias($pathofwebsite.'/'.trim($tmpaliasalt).'.php', $object, $objectpage);
-						if (! $result) setEventMessages('Failed to write file '.$pathofwebsite.'/'.trim($tmpaliasalt).'.php', null, 'errors');
+						$result = dolSavePageAlias($pathofwebsite.'/'.trim($tmpaliasalt).'.php', $object, $objectpage);
+						if (!$result) setEventMessages('Failed to write file '.$pathofwebsite.'/'.trim($tmpaliasalt).'.php', null, 'errors');
 					}
 				}
 			}
@@ -1488,7 +1488,7 @@ 
 
 
 		// Save page of content
-		$result=dolSavePageContent($filetpl, $object, $objectpage);
+		$result = dolSavePageContent($filetpl, $object, $objectpage);
 		if ($result)
 		{
 			setEventMessages($langs->trans("Saved"), null, 'mesgs');
@@ -1502,7 +1502,7 @@ 
    			//exit;
 		}
 
-		$action='preview';
+		$action = 'preview';
 	}
 }
 
@@ -1518,12 +1518,12 @@ 
 		$db->begin();
 
 		$objectnew = new Website($db);
-		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09')?GETPOST('newlang', 'aZ09'):''));
+		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ?GETPOST('newlang', 'aZ09') : ''));
 		if ($result < 0)
 		{
 			$error++;
 			setEventMessages($objectnew->error, $objectnew->errors, 'errors');
-			$action='preview';
+			$action = 'preview';
 
 			$db->rollback();
 		}
@@ -1540,25 +1540,25 @@ 
 
 	if ($action == 'confirm_createpagefromclone')
 	{
-		$istranslation=(GETPOST('is_a_translation', 'aZ09')=='on'?1:0);
+		$istranslation = (GETPOST('is_a_translation', 'aZ09') == 'on' ? 1 : 0);
 		if ($istranslation)
 		{
 			if (GETPOST('newlang', 'aZ09') == $objectpage->lang)
 			{
 				$error++;
 				setEventMessages($langs->trans("LanguageMustNotBeSameThanClonedPage"), null, 'errors');
-				$action='preview';
+				$action = 'preview';
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$db->begin();
 
 			$newwebsiteid = GETPOST('newwebsite', 'int');
 			$pathofwebsitenew = $pathofwebsite;
 
-			$tmpwebsite=new Website($db);
+			$tmpwebsite = new Website($db);
 			if ($newwebsiteid > 0 && $newwebsiteid != $object->id)
 			{
 				$tmpwebsite->fetch($newwebsiteid);
@@ -1570,20 +1570,20 @@ 
 			}
 
 			$objectpage = new WebsitePage($db);
-			$resultpage = $objectpage->createFromClone($user, $pageid, GETPOST('pageurl', 'aZ09'), (GETPOST('newlang', 'aZ09')?GETPOST('newlang', 'aZ09'):''), $istranslation, $newwebsiteid);
+			$resultpage = $objectpage->createFromClone($user, $pageid, GETPOST('pageurl', 'aZ09'), (GETPOST('newlang', 'aZ09') ?GETPOST('newlang', 'aZ09') : ''), $istranslation, $newwebsiteid);
 			if ($resultpage < 0)
 			{
 				$error++;
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
-				$action='createpagefromclone';
+				$action = 'createpagefromclone';
 
 				$db->rollback();
 			}
 			else
 			{
-				$fileindex=$pathofwebsitenew.'/index.php';
-				$filetpl=$pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
-				$filewrapper=$pathofwebsitenew.'/wrapper.php';
+				$fileindex = $pathofwebsitenew.'/index.php';
+				$filetpl = $pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
+				$filewrapper = $pathofwebsitenew.'/wrapper.php';
 
 				//var_dump($pathofwebsitenew);
 				//var_dump($filetpl);
@@ -1604,15 +1604,15 @@ 
 
 	$res = 0;
 
-	if (! $error)
+	if (!$error)
 	{
 		// Check symlink to medias and restore it if ko
-		$pathtomedias=DOL_DATA_ROOT.'/medias';
-		$pathtomediasinwebsite=$pathofwebsite.'/medias';
-		if (! is_link(dol_osencode($pathtomediasinwebsite)))
+		$pathtomedias = DOL_DATA_ROOT.'/medias';
+		$pathtomediasinwebsite = $pathofwebsite.'/medias';
+		if (!is_link(dol_osencode($pathtomediasinwebsite)))
 		{
 			dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
-			dol_mkdir(dirname($pathtomediasinwebsite));     // To be sure dir for website exists
+			dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 			$result = symlink($pathtomedias, $pathtomediasinwebsite);
 		}
 
@@ -1630,19 +1630,19 @@ 
 		}
 		else
 		{
-			$res=0;
+			$res = 0;
 			if ($object->fk_default_home > 0)
 			{
 				$res = $objectpage->fetch($object->fk_default_home);
 			}
-			if (! ($res > 0))
+			if (!($res > 0))
 			{
 				$res = $objectpage->fetch(0, $object->id);
 			}
 		}
 	}
 
-	if (! $error && $res > 0)
+	if (!$error && $res > 0)
 	{
 		if ($action == 'updatesource' || $action == 'updatecontent')
 		{
@@ -1655,12 +1655,12 @@ 
             // Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
-            $forbiddenphpcommands=array("exec", "passthru", "system", "shell_exec", "proc_open");
+            $forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
             if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
             {
-                $forbiddenphpcommands=array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+                $forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
             }
-            foreach($forbiddenphpcommands as $forbiddenphpcommand)
+            foreach ($forbiddenphpcommands as $forbiddenphpcommand)
             {
                 if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
                 {
@@ -1696,13 +1696,13 @@ 
 				if ($action == 'updatecontent') $action = 'editcontent';
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$db->commit();
 
-				$filemaster=$pathofwebsite.'/master.inc.php';
+				$filemaster = $pathofwebsite.'/master.inc.php';
 				//$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
-				$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
+				$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
 
 				dol_mkdir($pathofwebsite);
 
@@ -1710,22 +1710,22 @@ 
 				// Now generate the master.inc.php page
 				$result = dolSaveMasterFile($filemaster);
 
-				if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+				if (!$result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
 
 
 				// Now generate the alias.php page
-				if (! empty($fileoldalias))
+				if (!empty($fileoldalias))
 				{
 					dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
 					dol_delete_file($fileoldalias);
 				}
 
 				// Save page alias
-				$result=dolSavePageAlias($filealias, $object, $objectpage);
-				if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+				$result = dolSavePageAlias($filealias, $object, $objectpage);
+				if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
 
 				// Save page content
-				$result=dolSavePageContent($filetpl, $object, $objectpage);
+				$result = dolSavePageContent($filetpl, $object, $objectpage);
 				if ($result)
 				{
 					setEventMessages($langs->trans("Saved"), null, 'mesgs');
@@ -1752,7 +1752,7 @@ 
 	}
 	else
 	{
-		if (! $error)
+		if (!$error)
 		{
 			if (empty($websitekey) || $websitekey == '-1')
 			{
@@ -1778,7 +1778,7 @@ 
 
 		header("Content-Type: application/zip");
 		header("Content-Disposition: attachment; filename=".$file_name);
-		header("Content-Length: " . filesize($fileofzip));
+		header("Content-Length: ".filesize($fileofzip));
 
 		readfile($fileofzip);
 		exit;
@@ -1793,24 +1793,24 @@ 
 // Import site
 if ($action == 'importsiteconfirm')
 {
-	if (empty($_FILES) && ! GETPOSTISSET('templateuserfile'))
+	if (empty($_FILES) && !GETPOSTISSET('templateuserfile'))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
 	}
 	else
 	{
-		if (! empty($_FILES) || GETPOSTISSET('templateuserfile'))
+		if (!empty($_FILES) || GETPOSTISSET('templateuserfile'))
 		{
 			// Check symlink to medias and restore it if ko
-			$pathtomedias=DOL_DATA_ROOT.'/medias';
-			$pathtomediasinwebsite=$pathofwebsite.'/medias';
-			if (! is_link(dol_osencode($pathtomediasinwebsite)))
+			$pathtomedias = DOL_DATA_ROOT.'/medias';
+			$pathtomediasinwebsite = $pathofwebsite.'/medias';
+			if (!is_link(dol_osencode($pathtomediasinwebsite)))
 			{
 				dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
-				dol_mkdir(dirname($pathtomediasinwebsite));     // To be sure dir for website exists
+				dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 				$result = symlink($pathtomedias, $pathtomediasinwebsite);
-				if (! $result)
+				if (!$result)
 				{
 					setEventMessages($langs->trans("ErrorFieldToCreateSymLinkToMedias", $pathtomediasinwebsite, $pathtomedias), null, 'errors');
 					$action = 'importsite';
@@ -1822,17 +1822,17 @@ 
 			{
 				$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');
 			}
-			elseif (! empty($_FILES))
+			elseif (!empty($_FILES))
 			{
-				if (is_array($_FILES['userfile']['tmp_name'])) $userfiles=$_FILES['userfile']['tmp_name'];
-				else $userfiles=array($_FILES['userfile']['tmp_name']);
+				if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
+				else $userfiles = array($_FILES['userfile']['tmp_name']);
 
-				foreach($userfiles as $key => $userfile)
+				foreach ($userfiles as $key => $userfile)
 				{
 					if (empty($_FILES['userfile']['tmp_name'][$key]))
 					{
 						$error++;
-						if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2){
+						if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 							setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
 							$action = 'importsite';
 						}
@@ -1843,7 +1843,7 @@ 
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					$upload_dir = $conf->website->dir_temp;
 					$result = dol_add_file_process($upload_dir, 1, -1, 'userfile', '');
@@ -1851,16 +1851,16 @@ 
 
 				// Get name of file (take last one if several name provided)
 				$fileofzip = $upload_dir.'/unknown';
-				foreach($_FILES as $key => $ifile)
+				foreach ($_FILES as $key => $ifile)
 				{
-					foreach($ifile['name'] as $key2 => $ifile2)
+					foreach ($ifile['name'] as $key2 => $ifile2)
 					{
-						$fileofzip = $upload_dir . '/' .$ifile2;
+						$fileofzip = $upload_dir.'/'.$ifile2;
 					}
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$result = $object->importWebSite($fileofzip);
 				if ($result < 0)
@@ -1893,7 +1893,7 @@ 
 $formwebsite = new FormWebsite($db);
 $formother = new FormOther($db);
 
-$help_url='';
+$help_url = '';
 
 $arrayofjs = array(
 	'/includes/ace/src/ace.js',
@@ -1904,16 +1904,16 @@ 
 );
 $arrayofcss = array();
 
-$moreheadcss='';
-$moreheadjs='';
+$moreheadcss = '';
+$moreheadjs = '';
 
-$arrayofjs[]='includes/jquery/plugins/blockUI/jquery.blockUI.js';
-$arrayofjs[]='core/js/blockUI.js';	// Used by ecm/tpl/enabledfiletreeajax.tpl.php
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $arrayofjs[]="includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+$arrayofjs[] = 'includes/jquery/plugins/blockUI/jquery.blockUI.js';
+$arrayofjs[] = 'core/js/blockUI.js'; // Used by ecm/tpl/enabledfiletreeajax.tpl.php
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $arrayofjs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 
-$moreheadjs.='<script type="text/javascript">'."\n";
-$moreheadjs.='var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
-$moreheadjs.='</script>'."\n";
+$moreheadjs .= '<script type="text/javascript">'."\n";
+$moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
+$moreheadjs .= '</script>'."\n";
 
 llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', '', '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">');
 
@@ -1978,14 +1978,14 @@ 
 print '<div>';
 
 // Add a margin under toolbar ?
-$style='';
-if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource') $style=' margin-bottom: 5px;';
+$style = '';
+if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource') $style = ' margin-bottom: 5px;';
 
 
-if (! GETPOST('hide_websitemenu'))
+if (!GETPOST('hide_websitemenu'))
 {
-	$disabled='';
-	if (empty($user->rights->website->write)) $disabled=' disabled="disabled"';
+	$disabled = '';
+	if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
 
 	//var_dump($objectpage);exit;
 	print '<div class="centpercent websitebar">';
@@ -2004,24 +2004,24 @@ 
 
 	// List of website
 	print '<span class="websiteselection">';
-	$out='';
-	$out.='<select name="website" class="minwidth100 maxwidth300" id="website">';
-	if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
+	$out = '';
+	$out .= '<select name="website" class="minwidth100 maxwidth300" id="website">';
+	if (empty($object->records)) $out .= '<option value="-1">&nbsp;</option>';
 	// Loop on each sites
-	$i=0;
-	foreach($object->records as $key => $valwebsite)
+	$i = 0;
+	foreach ($object->records as $key => $valwebsite)
 	{
-		if (empty($websitekey)) $websitekey=$valwebsite->ref;
+		if (empty($websitekey)) $websitekey = $valwebsite->ref;
 
-		$out.='<option value="'.$valwebsite->ref.'"';
-		if ($websitekey == $valwebsite->ref) $out.=' selected';		// To preselect a value
-		$out.='>';
-		$out.=$valwebsite->ref;
-		$out.='</option>';
+		$out .= '<option value="'.$valwebsite->ref.'"';
+		if ($websitekey == $valwebsite->ref) $out .= ' selected'; // To preselect a value
+		$out .= '>';
+		$out .= $valwebsite->ref;
+		$out .= '</option>';
 		$i++;
 	}
-	$out.='</select>';
-	$out.=ajax_combobox('website');
+	$out .= '</select>';
+	$out .= ajax_combobox('website');
 	print $out;
 	//print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Load").'">';
 	print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshsite" value="'.$langs->trans("Load").'">';
@@ -2029,19 +2029,19 @@ 
 
 	if ($websitekey)
 	{
-		$virtualurl='';
-		$dataroot=DOL_DATA_ROOT.'/website/'.$websitekey;
-		if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
+		$virtualurl = '';
+		$dataroot = DOL_DATA_ROOT.'/website/'.$websitekey;
+		if (!empty($object->virtualhost)) $virtualurl = $object->virtualhost;
 	}
 
-	$array=array();
+	$array = array();
 	if ($object->id > 0)
 	{
-		$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
 		$object->lines = $array;
 	}
-	if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-	$atleastonepage=(is_array($array) && count($array) > 0);
+	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+	$atleastonepage = (is_array($array) && count($array) > 0);
 
 	if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
 	{
@@ -2062,7 +2062,7 @@ 
 		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ExportSite")).'" name="exportsite">';
 		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
 
-		print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage?' disabled="disabled"':'').'>';
+		print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
 
 		print ' &nbsp; ';
 
@@ -2098,48 +2098,48 @@ 
 
 	if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
 	{
-		$urlext=$virtualurl;
-		$urlint=$urlwithroot.'/public/website/index.php?website='.$websitekey;
+		$urlext = $virtualurl;
+		$urlint = $urlwithroot.'/public/website/index.php?website='.$websitekey;
 
 		print '<span class="websiteinputurl valignmiddle" id="websiteinputurl">';
-		$linktotestonwebserver = '<a href="'.($virtualurl?$virtualurl:'#').'" class="valignmiddle">';
-		$linktotestonwebserver.= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'globe');
-		$linktotestonwebserver.= '</a>';
+		$linktotestonwebserver = '<a href="'.($virtualurl ? $virtualurl : '#').'" class="valignmiddle">';
+		$linktotestonwebserver .= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'globe');
+		$linktotestonwebserver .= '</a>';
 		$htmltext = '';
 		if (empty($object->fk_default_home))
 		{
-		    $htmltext.= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
+		    $htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
 		}
 		elseif (empty($virtualurl))
 		{
-		    $htmltext.= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+		    $htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
 		else
 		{
-		    $htmltext.= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
+		    $htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
-		if (! empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
+		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
-		    $htmltext.= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
+		    $htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
 		else
 		{
-    		$htmltext.=$langs->trans("SetHereVirtualHost", $dataroot);
-    		$htmltext.='<br>';
-    		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-    		$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
-    		$htmltext.='<br>';
-    		$htmltext.='<br>';
-    		$htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
-    		$htmltext.='<br>';
-    		$htmltext.='<br>';
-    		$htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP");
+    		$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
+    		$htmltext .= '<br>';
+    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+    		$htmltext .= '<br>';
+    		$htmltext .= '<br>';
+    		$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
+    		$htmltext .= '<br>';
+    		$htmltext .= '<br>';
+    		$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
 		}
 		print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
 		print '</span>';
 	}
 
-	if (in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm')))
+	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm')))
 	{
 		if ($action == 'editcss' && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
@@ -2152,12 +2152,12 @@ 
 
 	// Toolbar for pages
 
-	if ($websitekey && $websitekey != '-1' && ! in_array($action, array('editcss','editmenu','importsite')))
+	if ($websitekey && $websitekey != '-1' && !in_array($action, array('editcss', 'editmenu', 'importsite')))
 	{
-		print '</div>';	// Close current websitebar to open a new one
+		print '</div>'; // Close current websitebar to open a new one
 
 		print '<!-- Bar for websitepage -->';
-		print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
+		print '<div class="centpercent websitebar"'.($style ? ' style="'.$style.'"' : '').'">';
 
 		print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
 		print $langs->trans("PageContainer").': ';
@@ -2180,12 +2180,12 @@ 
 		}
 
 		//print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
-		print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($atleastonepage && $action != 'editsource')?'':' disabled="disabled"').'>';
+		print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($atleastonepage && $action != 'editsource') ? '' : ' disabled="disabled"').'>';
 
 
 		// Print nav arrows
-		$pagepreviousid=0;
-		$pagenextid=0;
+		$pagepreviousid = 0;
+		$pagenextid = 0;
 		if ($pageid)
 		{
 			$sql = 'SELECT MAX(rowid) as pagepreviousid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid < '.$pageid.' AND fk_website = '.$object->id;
@@ -2225,8 +2225,8 @@ 
 
 		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
 		{
-			$disabled='';
-			if (empty($user->rights->website->write)) $disabled=' disabled="disabled"';
+			$disabled = '';
+			if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
 
 			// Confirmation delete site
 			if ($action == 'deletesite') {
@@ -2238,7 +2238,7 @@ 
 					//array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0))
 				);
 
-				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id='.$object->id, $langs->trans('DeleteWebsite'), '', 'confirm_deletesite', $formquestion, 0, 1, 200);
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsite'), '', 'confirm_deletesite', $formquestion, 0, 1, 200);
 
 				print $formconfirm;
 			}
@@ -2247,13 +2247,13 @@ 
 			if ($action == 'createfromclone') {
 				// Create an array for form
 				$formquestion = array(
-				array('type' => 'text', 'name' => 'siteref', 'label'=> $langs->trans("WebSite")  ,'value'=> 'copy_of_'.$object->ref),
+				array('type' => 'text', 'name' => 'siteref', 'label'=> $langs->trans("WebSite"), 'value'=> 'copy_of_'.$object->ref),
 				//array('type' => 'checkbox', 'name' => 'is_a_translation', 'label' => $langs->trans("SiteIsANewTranslation"), 'value' => 0),
 				//array('type' => 'other','name' => 'newlang','label' => $langs->trans("Language"), 'value' => $formadmin->select_language(GETPOST('newlang', 'aZ09')?GETPOST('newlang', 'aZ09'):$langs->defaultlang, 'newlang', 0, null, '', 0, 0, 'minwidth200')),
 				//array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0))
 				);
 
-				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id='.$object->id, $langs->trans('CloneSite'), '', 'confirm_createfromclone', $formquestion, 0, 1, 200);
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneSite'), '', 'confirm_createfromclone', $formquestion, 0, 1, 200);
 
 				print $formconfirm;
 			}
@@ -2267,12 +2267,12 @@ 
 					$formquestion = array(
 						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
 						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0),
-						array('type' => 'other','name' => 'newlang', 'label' => $langs->trans("Language"), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, 1, 0, 0, 'minwidth200', 0, 1)),
-						array('type' => 'other','name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
+						array('type' => 'other', 'name' => 'newlang', 'label' => $langs->trans("Language"), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, 1, 0, 0, 'minwidth200', 0, 1)),
+						array('type' => 'other', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
 						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'pageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> 'copy_of_'.$objectpage->pageurl),
 					);
 
-				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?website='.$object->ref.'&pageid=' . $pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
+				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
 
 					print $formconfirm;
 				}
@@ -2291,7 +2291,7 @@ 
 				print '<!-- Code to enabled edit inline ckeditor -->'."\n";
 				print '<script type="text/javascript">
 						$(document).ready(function() {
-							var isEditingEnabled = '.($conf->global->WEBSITE_EDITINLINE?'true':'false').';
+							var isEditingEnabled = '.($conf->global->WEBSITE_EDITINLINE ? 'true' : 'false').';
 							if (isEditingEnabled)
 							{
 								switchEditorOnline(true);
@@ -2389,7 +2389,7 @@ 
 					print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
 				}
 				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
-				print '<input type="submit" class="buttonDelete bordertransp" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+				print '<input type="submit" class="buttonDelete bordertransp" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage ? '' : ' disabled="disabled"').'>';
 			}
 		}
 
@@ -2399,48 +2399,48 @@ 
 
 		if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
 		{
-			$realpage=$urlwithroot.'/public/website/index.php?website='.$websitekey.'&pageref='.$websitepage->pageurl;
+			$realpage = $urlwithroot.'/public/website/index.php?website='.$websitekey.'&pageref='.$websitepage->pageurl;
 			$pagealias = $websitepage->pageurl;
 
 			$htmltext = $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot);
-			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-			$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 			print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$websitekey.'" alt="'.dol_escape_htmltag($htmltext).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview');
-			print '</a>';       // View page in new Tab
+			print '</a>'; // View page in new Tab
 
 			print '<div class="websiteinputurl" id="websiteinputpage">';
 			print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
-			$htmltext=$langs->trans("PageNameAliasHelp", $langs->transnoentitiesnoconv("EditPageMeta"));
+			$htmltext = $langs->trans("PageNameAliasHelp", $langs->transnoentitiesnoconv("EditPageMeta"));
 			print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helppagealias');
 			print '</div>';
 
-			$urlext=$virtualurl.'/'.$pagealias.'.php';
-			$urlint=$urlwithroot.'/public/website/index.php?website='.$websitekey;
+			$urlext = $virtualurl.'/'.$pagealias.'.php';
+			$urlint = $urlwithroot.'/public/website/index.php?website='.$websitekey;
 
-			$htmltext = $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $virtualurl?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
+			$htmltext = $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $virtualurl ? $urlext : '<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>');
 
-			print '<a class="websitebuttonsitepreview'.($virtualurl?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewpageext" href="'.$urlext.'" target="tab'.$websitekey.'ext" alt="'.dol_escape_htmltag($htmltext).'">';
+			print '<a class="websitebuttonsitepreview'.($virtualurl ? '' : ' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewpageext" href="'.$urlext.'" target="tab'.$websitekey.'ext" alt="'.dol_escape_htmltag($htmltext).'">';
 			print $form->textwithpicto('', $htmltext, 1, 'preview_ext');
 			print '</a>';
 			//print '<input type="submit" class="button" name="previewpage" target="tab'.$websitekey.'"value="'.$langs->trans("ViewPageInNewTab").'">';
 
 			// TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
 		}
-		if (! in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm','createsite','createcontainer','createfromclone','createpagefromclone','deletesite')))
+		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite')))
 		{
 			if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 			if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 			if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
 		}
 
-		print '</span>';	// end websitetools
+		print '</span>'; // end websitetools
 
 		print '<span class="websitehelp">';
 		if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
 		{
-			$htmltext=$langs->transnoentitiesnoconv("YouCanEditHtmlSource").'<br>';
+			$htmltext = $langs->transnoentitiesnoconv("YouCanEditHtmlSource").'<br>';
             if ($conf->browser->layout == 'phone')
             {
                 print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
@@ -2451,14 +2451,14 @@ 
             	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
             }
 		}
-		print '</span>';	// end websitehelp
+		print '</span>'; // end websitehelp
 
 
 
 		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
 		{
 			// Adding jquery code to change on the fly url of preview ext
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
 				print '<script type="text/javascript" language="javascript">
                     jQuery(document).ready(function() {
@@ -2506,7 +2506,7 @@ 
 		}
 	}
 
-	print '</div>';	// end current websitebar
+	print '</div>'; // end current websitebar
 }
 
 
@@ -2524,7 +2524,7 @@ 
 
 	print '<br>';
 
-	if (! GETPOSTISSET('WEBSITE_CSS_INLINE'))
+	if (!GETPOSTISSET('WEBSITE_CSS_INLINE'))
 	{
 		$csscontent = @file_get_contents($filecss);
 		// Clean the php css file to remove php code and get only css part
@@ -2534,9 +2534,9 @@ 
 	{
 		$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
 	}
-	if (! trim($csscontent)) $csscontent='/* CSS content (all pages) */'."\n"."body.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
+	if (!trim($csscontent)) $csscontent = '/* CSS content (all pages) */'."\n"."body.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
 
-	if (! GETPOSTISSET('WEBSITE_JS_INLINE'))
+	if (!GETPOSTISSET('WEBSITE_JS_INLINE'))
 	{
 		$jscontent = @file_get_contents($filejs);
 		// Clean the php js file to remove php code and get only js part
@@ -2546,9 +2546,9 @@ 
 	{
 		$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
 	}
-	if (! trim($jscontent)) $jscontent='/* JS content (all pages) */'."\n";
+	if (!trim($jscontent)) $jscontent = '/* JS content (all pages) */'."\n";
 
-	if (! GETPOSTISSET('WEBSITE_HTML_HEADER'))
+	if (!GETPOSTISSET('WEBSITE_HTML_HEADER'))
 	{
 		$htmlheadercontent = @file_get_contents($filehtmlheader);
 		// Clean the php htmlheader file to remove php code and get only html part
@@ -2558,20 +2558,20 @@ 
 	{
 		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
 	}
-	if (! trim($htmlheadercontent))
+	if (!trim($htmlheadercontent))
 	{
-		$htmlheadercontent ="<html>\n";
-		$htmlheadercontent.=$htmlheadercontentdefault;
-		$htmlheadercontent.="</html>";
+		$htmlheadercontent = "<html>\n";
+		$htmlheadercontent .= $htmlheadercontentdefault;
+		$htmlheadercontent .= "</html>";
 	}
 	else
 	{
 		$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
 		$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
-		$htmlheadercontent='<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
+		$htmlheadercontent = '<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
 	}
 
-	if (! GETPOSTISSET('WEBSITE_ROBOT'))
+	if (!GETPOSTISSET('WEBSITE_ROBOT'))
 	{
 		$robotcontent = @file_get_contents($filerobot);
 		// Clean the php htmlheader file to remove php code and get only html part
@@ -2581,15 +2581,15 @@ 
 	{
 		$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
 	}
-	if (! trim($robotcontent))
+	if (!trim($robotcontent))
 	{
-		$robotcontent.="# Robot file. Generated with ".DOL_APPLICATION_TITLE."\n";
-		$robotcontent.="User-agent: *\n";
-		$robotcontent.="Allow: /public/\n";
-		$robotcontent.="Disallow: /administrator/\n";
+		$robotcontent .= "# Robot file. Generated with ".DOL_APPLICATION_TITLE."\n";
+		$robotcontent .= "User-agent: *\n";
+		$robotcontent .= "Allow: /public/\n";
+		$robotcontent .= "Disallow: /administrator/\n";
 	}
 
-	if (! GETPOSTISSET('WEBSITE_HTACCESS'))
+	if (!GETPOSTISSET('WEBSITE_HTACCESS'))
 	{
 		$htaccesscontent = @file_get_contents($filehtaccess);
 		// Clean the php htaccesscontent file to remove php code and get only html part
@@ -2599,14 +2599,14 @@ 
 	{
 		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
 	}
-	if (! trim($htaccesscontent))
+	if (!trim($htaccesscontent))
 	{
-		$htaccesscontent.="# Order allow,deny\n";
-		$htaccesscontent.="# Deny from all\n";
+		$htaccesscontent .= "# Order allow,deny\n";
+		$htaccesscontent .= "# Deny from all\n";
 	}
 
 
-	if (! GETPOSTISSET('WEBSITE_MANIFEST_JSON'))
+	if (!GETPOSTISSET('WEBSITE_MANIFEST_JSON'))
 	{
 		$manifestjsoncontent = @file_get_contents($filemanifestjson);
 		// Clean the manifestjson file to remove php code and get only html part
@@ -2616,12 +2616,12 @@ 
 	{
 		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'none');
 	}
-	if (! trim($manifestjsoncontent))
+	if (!trim($manifestjsoncontent))
 	{
 		//$manifestjsoncontent.="";
 	}
 
-	if (! GETPOSTISSET('WEBSITE_README'))
+	if (!GETPOSTISSET('WEBSITE_README'))
 	{
 		$readmecontent = @file_get_contents($filereadme);
 		// Clean the readme file to remove php code and get only html part
@@ -2631,7 +2631,7 @@ 
 	{
 		$readmecontent = GETPOST('WEBSITE_README', 'none');
 	}
-	if (! trim($readmecontent))
+	if (!trim($readmecontent))
 	{
 		//$readmecontent.="";
 	}
@@ -2652,9 +2652,9 @@ 
 	print '<tr><td class="tdtop">';
 
 	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>'.$websitekey.'</i>');
-	$htmltext.='<br>';
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+	$htmltext .= '<br>';
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';
@@ -2664,11 +2664,11 @@ 
 
 	// CSS file
 	print '<tr><td class="tdtop">';
-	$htmlhelp=$langs->trans("CSSContentTooltipHelp");
+	$htmlhelp = $langs->trans("CSSContentTooltipHelp");
 	print $form->textwithpicto($langs->trans('WEBSITE_CSS_INLINE'), $htmlhelp, 1, 'help', '', 0, 2, 'csstooltip');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_CSS_INLINE', $csscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_CSS_INLINE', $csscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, 'CSS', 'css');
 
 	print '</td></tr>';
@@ -2678,7 +2678,7 @@ 
 	print $langs->trans('WEBSITE_JS_INLINE');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_JS_INLINE', $jscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_JS_INLINE', $jscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, 'JS', 'javascript');
 
 	print '</td></tr>';
@@ -2686,14 +2686,14 @@ 
 	// Common HTML header
 	print '<tr><td class="tdtop">';
 	print $langs->trans('WEBSITE_HTML_HEADER');
-	$htmlhelp=$langs->trans("Example").' :<br>';
-	$htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault);
+	$htmlhelp = $langs->trans("Example").' :<br>';
+	$htmlhelp .= dol_htmlentitiesbr($htmlheadercontentdefault);
 	$textwithhelp = $form->textwithpicto('', $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
-	$htmlhelp2=$langs->trans("LinkAndScriptsHereAreNotLoadedInEditor").'<br>';
+	$htmlhelp2 = $langs->trans("LinkAndScriptsHereAreNotLoadedInEditor").'<br>';
 	print $form->textwithpicto($textwithhelp, $htmlhelp2, 1, 'warning', '', 0, 2, 'htmlheadertooltip2');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_HTML_HEADER', $htmlheadercontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_HTML_HEADER', $htmlheadercontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 
 	print '</td></tr>';
@@ -2703,7 +2703,7 @@ 
 	print $langs->trans('WEBSITE_ROBOT');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_ROBOT', $robotcontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_ROBOT', $robotcontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, 'Robot file', 'text');
 
 	print '</td></tr>';
@@ -2713,30 +2713,30 @@ 
 	print $langs->trans('WEBSITE_HTACCESS');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_HTACCESS', $htaccesscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_HTACCESS', $htaccesscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, $langs->trans("File").' .htaccess', 'text');
 
 	print '</td></tr>';
 
 	// Manifest.json
 	print '<tr><td class="tdtop">';
-	$htmlhelp=$langs->trans("Example").' :<br>';
-	$htmlhelp.=dol_htmlentitiesbr($manifestjsoncontentdefault);
+	$htmlhelp = $langs->trans("Example").' :<br>';
+	$htmlhelp .= dol_htmlentitiesbr($manifestjsoncontentdefault);
 	print $form->textwithpicto($langs->trans('WEBSITE_MANIFEST_JSON'), $htmlhelp, 1, 'help', '', 0, 2, 'manifestjsontooltip');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_MANIFEST_JSON', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_MANIFEST_JSON', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
 
 	print '</td></tr>';
 
 	// README.md
 	print '<tr><td class="tdtop">';
-	$htmlhelp=$langs->trans("EnterHereLicenseInformation");
+	$htmlhelp = $langs->trans("EnterHereLicenseInformation");
 	print $form->textwithpicto($langs->trans('WEBSITE_README'), $htmlhelp, 1, 'help', '', 0, 2, 'readmetooltip');
 	print '</td><td>';
 
-	$doleditor=new DolEditor('WEBSITE_README', $readmecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$doleditor = new DolEditor('WEBSITE_README', $readmecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
 	print $doleditor->Create(1, '', true, $langs->trans("File").' README.md', 'text');
 
 	print '</td></tr>';
@@ -2774,8 +2774,8 @@ 
 
 	print '<table class="border centpercent">';
 
-	if (GETPOST('WEBSITE_REF'))         $siteref=GETPOST('WEBSITE_REF', 'alpha');
-	if (GETPOST('WEBSITE_DESCRIPTION')) $sitedesc=GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+	if (GETPOST('WEBSITE_REF'))         $siteref = GETPOST('WEBSITE_REF', 'alpha');
+	if (GETPOST('WEBSITE_DESCRIPTION')) $sitedesc = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
 
 	print '<tr><td class="titlefieldcreate fieldrequired">';
 	print $langs->trans('Ref');
@@ -2792,9 +2792,9 @@ 
 	print '<tr><td>';
 
 	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>');
-	$htmltext.='<br>';
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+	$htmltext .= '<br>';
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';
@@ -2882,15 +2882,15 @@ 
 	if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') $hiddenmanuallyafterload = '';
 
 	if ($action == 'editmeta' || empty($conf->use_javascript_ajax)) {	// No autohide/show in such case
-		$hiddenfromfetchingafterload='';
-		$hiddenmanuallyafterload='';
+		$hiddenfromfetchingafterload = '';
+		$hiddenmanuallyafterload = '';
 	}
 
 	if ($action == 'createcontainer')
 	{
 		print '<br>';
 
-		if (! empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
 		print '<label for="checkboxcreatefromfetching"><span class="opacitymedium">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
 		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
@@ -2902,8 +2902,8 @@ 
 		print '<br><input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto");
 		print ' ';
 		print $langs->trans("ImagesShouldBeSavedInto").' ';
-		$arraygrabimagesinto=array('root'=>$langs->trans("WebsiteRootOfImages"), 'subpage'=>$langs->trans("SubdirOfPage"));
-		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto')?GETPOST('grabimagesinto'):'root');
+		$arraygrabimagesinto = array('root'=>$langs->trans("WebsiteRootOfImages"), 'subpage'=>$langs->trans("SubdirOfPage"));
+		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto') ?GETPOST('grabimagesinto') : 'root');
 		print '<br>';
 		print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
 		print '</td></tr>';
@@ -2911,7 +2911,7 @@ 
 
 		print '<br>';
 
-		if (! empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+		if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
 		print '<label for="checkboxcreatemanually"><span class="opacitymedium">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 	}
@@ -2933,35 +2933,35 @@ 
 		//if ($objectpage->grabbed_from) print ' - <span class="opacitymedium">'.$langs->trans('InitiallyGrabbedFrom').' '.$objectpage->grabbed_from.'</span>';
 		print '</td></tr>';
 
-		$type_container=$objectpage->type_container;
-		$pageurl=$objectpage->pageurl;
-		$pagealiasalt=$objectpage->aliasalt;
-		$pagetitle=$objectpage->title;
-		$pagedescription=$objectpage->description;
-		$pageimage=$objectpage->image;
-		$pagekeywords=$objectpage->keywords;
-		$pagelang=$objectpage->lang;
-		$pagehtmlheader=$objectpage->htmlheader;
-		$pagedatecreation=$objectpage->date_creation;
-		$pagedatemodification=$objectpage->date_modification;
-		$pageauthorid=$objectpage->fk_user_creat;
-		$pageusermodifid=$objectpage->fk_user_modif;
+		$type_container = $objectpage->type_container;
+		$pageurl = $objectpage->pageurl;
+		$pagealiasalt = $objectpage->aliasalt;
+		$pagetitle = $objectpage->title;
+		$pagedescription = $objectpage->description;
+		$pageimage = $objectpage->image;
+		$pagekeywords = $objectpage->keywords;
+		$pagelang = $objectpage->lang;
+		$pagehtmlheader = $objectpage->htmlheader;
+		$pagedatecreation = $objectpage->date_creation;
+		$pagedatemodification = $objectpage->date_modification;
+		$pageauthorid = $objectpage->fk_user_creat;
+		$pageusermodifid = $objectpage->fk_user_modif;
 	}
 	else
 	{
 		$type_container = 'page';
-		$pagedatecreation=dol_now();
-		$pageauthorid=$user->id;
-		$pageusermodifid=0;
-	}
-	if (GETPOST('WEBSITE_TITLE', 'alpha'))       $pagetitle=GETPOST('WEBSITE_TITLE', 'alpha');
-	if (GETPOST('WEBSITE_PAGENAME', 'alpha'))    $pageurl=GETPOST('WEBSITE_PAGENAME', 'alpha');
-	if (GETPOST('WEBSITE_ALIASALT', 'alpha'))    $pagealiasalt=GETPOST('WEBSITE_ALIASALT', 'alpha');
-	if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) $pagedescription=GETPOST('WEBSITE_DESCRIPTION', 'alpha');
-	if (GETPOST('WEBSITE_IMAGE', 'alpha'))       $pageimage=GETPOST('WEBSITE_IMAGE', 'alpha');
-	if (GETPOST('WEBSITE_KEYWORDS', 'alpha'))    $pagekeywords=GETPOST('WEBSITE_KEYWORDS', 'alpha');
-	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang=GETPOST('WEBSITE_LANG', 'aZ09');
-	if (GETPOST('htmlheader', 'none'))			$pagehtmlheader=GETPOST('htmlheader', 'none');
+		$pagedatecreation = dol_now();
+		$pageauthorid = $user->id;
+		$pageusermodifid = 0;
+	}
+	if (GETPOST('WEBSITE_TITLE', 'alpha'))       $pagetitle = GETPOST('WEBSITE_TITLE', 'alpha');
+	if (GETPOST('WEBSITE_PAGENAME', 'alpha'))    $pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
+	if (GETPOST('WEBSITE_ALIASALT', 'alpha'))    $pagealiasalt = GETPOST('WEBSITE_ALIASALT', 'alpha');
+	if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) $pagedescription = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+	if (GETPOST('WEBSITE_IMAGE', 'alpha'))       $pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
+	if (GETPOST('WEBSITE_KEYWORDS', 'alpha'))    $pagekeywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
+	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
+	if (GETPOST('htmlheader', 'none'))			$pagehtmlheader = GETPOST('htmlheader', 'none');
 
 	// Title
 	print '<tr><td class="fieldrequired">';
@@ -2981,7 +2981,7 @@ 
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
 	print '</td><td>';
-	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha')?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha'):$type_container));
+	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container));
 	print '</td></tr>';
 
 	if ($action == 'createcontainer')
@@ -2989,7 +2989,7 @@ 
 		print '<tr><td class="titlefield fieldrequired">';
 		print $langs->trans('WEBSITE_PAGE_EXAMPLE');
 		print '</td><td>';
-		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample')?GETPOST('sample', 'alpha'):'empty'));
+		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample') ?GETPOST('sample', 'alpha') : 'empty'));
 		print '</td></tr>';
 	}
 
@@ -3000,7 +3000,7 @@ 
 	print '</td></tr>';
 
 	print '<tr><td>';
-	$htmlhelp=$langs->trans("WEBSITE_IMAGEDesc");
+	$htmlhelp = $langs->trans("WEBSITE_IMAGEDesc");
 	print $form->textwithpicto($langs->trans('WEBSITE_IMAGE'), $htmlhelp, 1, 'help', '', 0, 2, 'imagetooltip');
 	print '</td><td>';
 	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_IMAGE" value="'.dol_escape_htmltag($pageimage).'">';
@@ -3015,19 +3015,19 @@ 
 	print '<tr><td>';
 	print $langs->trans('Language');
 	print '</td><td>';
-	print $formadmin->select_language($pagelang?$pagelang:$langs->defaultlang, 'WEBSITE_LANG', 0, null, '1');
+	print $formadmin->select_language($pagelang ? $pagelang : $langs->defaultlang, 'WEBSITE_LANG', 0, null, '1');
 	print '</td></tr>';
 
 	// Translation of
-	$translationof=0;
-	$translatedby=0;
+	$translationof = 0;
+	$translatedby = 0;
 	print '<!-- Translation of --><tr><td>';
 	print $langs->trans('TranslationLinks');
 	print '</td><td>';
 	if ($action != 'createcontainer')
 	{
 		// Has translation pages
-		$sql='SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
+		$sql = 'SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -3035,10 +3035,10 @@ 
 			if ($num_rows > 0)
 			{
 				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span><br>';
-				$i=0;
+				$i = 0;
 				while ($obj = $db->fetch_object($resql))
 				{
-					$tmppage=new WebsitePage($db);
+					$tmppage = new WebsitePage($db);
 					$tmppage->fetch($obj->rowid);
 					if ($i > 0) print ' - ';
 					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')<br>';
@@ -3051,7 +3051,7 @@ 
 	}
 	if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0))
 	{
-		$sourcepage=new WebsitePage($db);
+		$sourcepage = new WebsitePage($db);
 		$result = $sourcepage->fetch($objectpage->fk_page);
 		if ($result == 0)
 		{
@@ -3067,13 +3067,13 @@ 
 	print '</td></tr>';
 
 	print '<tr><td class="titlefieldcreate">';
-	$htmlhelp=$langs->trans("WEBSITE_ALIASALTDesc");
+	$htmlhelp = $langs->trans("WEBSITE_ALIASALTDesc");
 	print $form->textwithpicto($langs->trans('WEBSITE_ALIASALT'), $htmlhelp, 1, 'help', '', 0, 2, 'aliastooltip');
 	print '</td><td>';
 	print '<input type="text" class="flat minwidth300" name="WEBSITE_ALIASALT" value="'.dol_escape_htmltag($pagealiasalt).'">';
 	print '</td></tr>';
 
-	$fuser=new User($db);
+	$fuser = new User($db);
 
 	print '<tr><td>';
 	print $langs->trans('Author');
@@ -3112,12 +3112,12 @@ 
 	}
 
 	print '<tr><td class="tdhtmlheader tdtop">';
-	$htmlhelp =$langs->trans("EditTheWebSiteForACommonHeader").'<br><br>';
-	$htmlhelp.=$langs->trans("Example").' :<br>';
-	$htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault);
+	$htmlhelp = $langs->trans("EditTheWebSiteForACommonHeader").'<br><br>';
+	$htmlhelp .= $langs->trans("Example").' :<br>';
+	$htmlhelp .= dol_htmlentitiesbr($htmlheadercontentdefault);
 	print $form->textwithpicto($langs->trans('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
 	print '</td><td>';
-	$doleditor=new DolEditor('htmlheader', $pagehtmlheader, '', '120', 'ace', 'In', true, false, 'ace', ROWS_3, '100%', '');
+	$doleditor = new DolEditor('htmlheader', $pagehtmlheader, '', '120', 'ace', 'In', true, false, 'ace', ROWS_3, '100%', '');
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 	print '</td></tr>';
 
@@ -3185,7 +3185,7 @@ 
 	//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
 
 	$module = 'medias';
-	if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php';	// Must be an url without param
+	if (empty($url)) $url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
 	include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
 
 	print '</div>';
@@ -3207,15 +3207,15 @@ 
 	//$contentforedit.='</style>'."\n";
 	$contentforedit .= $objectpage->content;
 	//var_dump($_SESSION["dol_screenheight"]);
-	$maxheightwin=480;
+	$maxheightwin = 480;
 	if (isset($_SESSION["dol_screenheight"]))
 	{
-		if ($_SESSION["dol_screenheight"] > 680) $maxheightwin = $_SESSION["dol_screenheight"]-400;
-		if ($_SESSION["dol_screenheight"] > 800) $maxheightwin = $_SESSION["dol_screenheight"]-490;
+		if ($_SESSION["dol_screenheight"] > 680) $maxheightwin = $_SESSION["dol_screenheight"] - 400;
+		if ($_SESSION["dol_screenheight"] > 800) $maxheightwin = $_SESSION["dol_screenheight"] - 490;
 	}
 	//var_dump($_SESSION["dol_screenheight"]);
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('PAGE_CONTENT', $contentforedit, '', $maxheightwin, 'Full', '', true, true, 'ace', ROWS_5, '40%');
+	$doleditor = new DolEditor('PAGE_CONTENT', $contentforedit, '', $maxheightwin, 'Full', '', true, true, 'ace', ROWS_5, '40%');
 	$doleditor->Create(0, '', false, 'HTML Source', 'php');
 }
 
@@ -3262,9 +3262,9 @@ 
 	print $langs->trans("SearchReplaceInto");
 	print '</div>';
 	print '<div class="tagtd">';
-	print '<input type="checkbox" name="optioncontent" value="content"'.((! GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09'))?' checked':'').'> '.$langs->trans("Content");
-	print '<input type="checkbox" class="marginleftonly" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09')?' checked':'').'> '.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords");
-	print '<input type="checkbox" class="marginleftonly" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09')?' checked':'').'> '.$langs->trans("GlobalCSSorJS");
+	print '<input type="checkbox" name="optioncontent" value="content"'.((!GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09')) ? ' checked' : '').'> '.$langs->trans("Content");
+	print '<input type="checkbox" class="marginleftonly" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09') ? ' checked' : '').'> '.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords");
+	print '<input type="checkbox" class="marginleftonly" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09') ? ' checked' : '').'> '.$langs->trans("GlobalCSSorJS");
 	print '</div>';
 	print '</div>';
 
@@ -3286,9 +3286,9 @@ 
 	if ($action == 'replacesiteconfirm')
 	{
 		$algo = '';
-		if (GETPOST('optionmeta')) $algo.='meta';
-		if (GETPOST('optioncontent')) $algo.='content';
-		if (GETPOST('optionsitefiles')) $algo.='sitefiles';
+		if (GETPOST('optionmeta')) $algo .= 'meta';
+		if (GETPOST('optioncontent')) $algo .= 'content';
+		if (GETPOST('optionsitefiles')) $algo .= 'sitefiles';
 
 		$listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000);
 
@@ -3322,7 +3322,7 @@ 
 			print '<th>'.$langs->trans("Description").'</th>';
 			print '</tr>';
 
-			foreach($listofpages['list'] as $answerrecord)
+			foreach ($listofpages['list'] as $answerrecord)
 			{
 				if (get_class($answerrecord) == 'WebsitePage')
 				{
@@ -3383,11 +3383,11 @@ 
 		{
 			$out .= "<iframe><body></html>";
 		}*/
-		$out.="\n<html><head>\n";
-		$out.="<!-- htmlheader/style of page from database -->\n";
-		$out.=dolWebsiteReplacementOfLinks($object, $objectpage->htmlheader, 1, 'htmlheader');
+		$out .= "\n<html><head>\n";
+		$out .= "<!-- htmlheader/style of page from database -->\n";
+		$out .= dolWebsiteReplacementOfLinks($object, $objectpage->htmlheader, 1, 'htmlheader');
 
-		$out.="<!-- htmlheader/style of website from files -->\n";
+		$out .= "<!-- htmlheader/style of website from files -->\n";
 		// TODO Keep only the <link> or the <script> tags
 		/*
 		$htmlheadercontent = @file_get_contents($filehtmlheader);
@@ -3405,51 +3405,51 @@ 
 		}
 		*/
 
-		$out.="</head>\n";
-		$out.="\n<body>";
+		$out .= "</head>\n";
+		$out .= "\n<body>";
 
 
-		$out.='<div id="websitecontentundertopmenu" class="websitecontentundertopmenu boostrap-iso">'."\n";
+		$out .= '<div id="websitecontentundertopmenu" class="websitecontentundertopmenu boostrap-iso">'."\n";
 
 		// REPLACEMENT OF LINKS When page called by website editor
 
-		$out.='<!-- style of website from file -->'."\n";
-		$out.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". No more supported by browsers, snif !
-		$tmpout='';
-		$tmpout.= '/* Include website CSS file */'."\n";
+		$out .= '<!-- style of website from file -->'."\n";
+		$out .= '<style scoped>'."\n"; // "scoped" means "apply to parent element only". No more supported by browsers, snif !
+		$tmpout = '';
+		$tmpout .= '/* Include website CSS file */'."\n";
 		//$csscontent = @file_get_contents($filecss);
 		ob_start();
 		include $filecss;
 		$csscontent = ob_get_contents();
 		ob_end_clean();
-		$tmpout.= dolWebsiteReplacementOfLinks($object, $csscontent, 1, 'css');
-		$tmpout.= '/* Include style from the HTML header of page */'."\n";
+		$tmpout .= dolWebsiteReplacementOfLinks($object, $csscontent, 1, 'css');
+		$tmpout .= '/* Include style from the HTML header of page */'."\n";
 		// Clean the html header of page to get only <style> content
 		$tmp = preg_split('(<style[^>]*>|</style>)', $objectpage->htmlheader);
-		$tmpstyleinheader ='';
-		$i=0;
-		foreach($tmp as $valtmp)
+		$tmpstyleinheader = '';
+		$i = 0;
+		foreach ($tmp as $valtmp)
 		{
 			$i++;
-			if ($i % 2 == 0) $tmpstyleinheader.=$valtmp."\n";
+			if ($i % 2 == 0) $tmpstyleinheader .= $valtmp."\n";
 		}
-		$tmpout.= $tmpstyleinheader."\n";
+		$tmpout .= $tmpstyleinheader."\n";
 		// Clean style that may affect global style of Dolibarr
-		$tmpout=preg_replace('/}[\s\n]*body\s*{[^}]+}/ims', '}', $tmpout);
-		$out.=$tmpout;
-		$out.='</style>'."\n";
+		$tmpout = preg_replace('/}[\s\n]*body\s*{[^}]+}/ims', '}', $tmpout);
+		$out .= $tmpout;
+		$out .= '</style>'."\n";
 
 		// Note: <div> or <section> with contenteditable="true" inside this can be edited with inline ckeditor
 
 		// Do not enable the contenteditable when page was grabbed, ckeditor is removing span and adding borders,
 		// so editable will be available only from container created from scratch
 		//$out.='<div id="bodywebsite" class="bodywebsite"'.($objectpage->grabbed_from ? ' contenteditable="true"' : '').'>'."\n";
-		$out.='<div id="divbodywebsite" class="bodywebsite bodywebpage-'.$objectpage->ref.'">'."\n";
+		$out .= '<div id="divbodywebsite" class="bodywebsite bodywebpage-'.$objectpage->ref.'">'."\n";
 
 		$newcontent = $objectpage->content;
 
 		// If mode WEBSITE_SUBCONTAINERSINLINE is on
-		if (! empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
+		if (!empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
 		{
 			//var_dump($filetpl);
 			$filephp = $filetpl;
@@ -3469,12 +3469,12 @@ 
 		{
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
-		$out.=dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
+		$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
 		//$out.=$newcontent;
 
-		$out.='</div>';
+		$out .= '</div>';
 
-		$out.='</div> <!-- End div id=websitecontentundertopmenu -->';
+		$out .= '</div> <!-- End div id=websitecontentundertopmenu -->';
 
 		/*if ($includepageintoaframeoradiv == 'iframe')
 		{
@@ -3482,7 +3482,7 @@ 
 		}*/
 		$out .= "\n</body></html>\n";
 
-		$out.= "\n".'<!-- End page content '.$filetpl.' -->'."\n\n";
+		$out .= "\n".'<!-- End page content '.$filetpl.' -->'."\n\n";
 
 		print $out;
 

Braces +339 added lines, -217 removed lines

@@ -41,7 +41,9 @@ 
 
 $langs->loadLangs(array("admin","other","website","errors"));
 
-if (! $user->rights->website->read) accessforbidden();
+if (! $user->rights->website->read) {
+	accessforbidden();
+}
 
 $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
 
@@ -66,7 +68,9 @@ 
 
 if (GETPOST('deletesite', 'alpha')) { $action='deletesite'; }
 if (GETPOST('delete', 'alpha')) { $action='delete'; }
-if (GETPOST('preview', 'alpha')) $action='preview';
+if (GETPOST('preview', 'alpha')) {
+	$action='preview';
+}
 if (GETPOST('createsite', 'alpha')) { $action='createsite'; }
 if (GETPOST('createcontainer', 'alpha')) { $action='createcontainer'; }
 if (GETPOST('editcss', 'alpha')) { $action='editcss'; }
@@ -79,10 +83,16 @@ 
 if (GETPOST('importsite', 'alpha')) { $action='importsite'; }
 if (GETPOST('createfromclone', 'alpha')) { $action='createfromclone'; }
 if (GETPOST('createpagefromclone', 'alpha')) { $action='createpagefromclone'; }
-if (empty($action) && $file_manager) $action='file_manager';
-if (empty($action) && $replacesite) $action='replacesite';
+if (empty($action) && $file_manager) {
+	$action='file_manager';
+}
+if (empty($action) && $replacesite) {
+	$action='replacesite';
+}
 
-if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) $pageid = 0;
+if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) {
+	$pageid = 0;
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
@@ -96,7 +106,9 @@ 
 //if (! $sortfield) $sortfield='name';
 //if (! $sortorder) $sortorder='ASC';
 
-if (empty($action)) $action='preview';
+if (empty($action)) {
+	$action='preview';
+}
 
 $object=new Website($db);
 $objectpage=new WebsitePage($db);
@@ -121,7 +133,9 @@ 
 $website = $object;
 
 // Check pageid received as aprameter
-if ($pageid < 0) $pageid = 0;
+if ($pageid < 0) {
+	$pageid = 0;
+}
 if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
@@ -133,27 +147,31 @@ 
 	// Check if pageid is inside the new website, if not we reset param pageid
 	if ($res >= 0 && $object->id > 0)
 	{
-		if ($objectpage->fk_website != $object->id)	// We have a bad page that does not belong to web site
+		if ($objectpage->fk_website != $object->id) {
+			// We have a bad page that does not belong to web site
 		{
 			if ($object->fk_default_home > 0)
 			{
-				$res = $objectpage->fetch($object->fk_default_home, $object->id, '');	// We search first page of web site
-				if ($res > 0) $pageid = $object->fk_default_home;
-			}
-			else
+				$res = $objectpage->fetch($object->fk_default_home, $object->id, '');
+		}
+		// We search first page of web site
+				if ($res > 0) {
+					$pageid = $object->fk_default_home;
+				}
+			} else
 			{
 				$res = $objectpage->fetch(0, $object->id, '');	// We search first page of web site
-				if ($res == 0)	// Page was not found, we reset it
+				if ($res == 0) {
+					// Page was not found, we reset it
 				{
 					$objectpage=new WebsitePage($db);
 				}
-				else			// We found a page, we set pageid to it.
+				} else			// We found a page, we set pageid to it.
 				{
 					$pageid = $objectpage->id;
 				}
 			}
-		}
-		else	// We have a valid page. We force pageid for the case we got the page with a fetch on ref.
+		} else	// We have a valid page. We force pageid for the case we got the page with a fetch on ref.
 		{
 			$pageid = $objectpage->id;
 		}
@@ -167,14 +185,20 @@ 
 	if (empty($pageid))
 	{
 		$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-		if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		if (! is_array($array) && $array < 0) {
+			dol_print_error('', $objectpage->error, $objectpage->errors);
+		}
 		$atleastonepage=(is_array($array) && count($array) > 0);
 
 		$firstpageid=0;$homepageid=0;
 		foreach($array as $key => $valpage)
 		{
-			if (empty($firstpageid)) $firstpageid=$valpage->id;
-			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+			if (empty($firstpageid)) {
+				$firstpageid=$valpage->id;
+			}
+			if ($object->fk_default_home && $key == $object->fk_default_home) {
+				$homepageid=$valpage->id;
+			}
 		}
 		$pageid=($homepageid?$homepageid:$firstpageid);   // We choose home page and if not defined yet, we take first page
 	}
@@ -270,28 +294,40 @@ 
 {
     $action = 'preview';    // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
-if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
+if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha')) {
+	// If we change the site, we reset the pageid and cancel addsite action.
 {
     if ($action == 'addsite') $action = 'preview';
-    if ($action == 'updatesource') $action = 'preview';
+}
+    if ($action == 'updatesource') {
+    	$action = 'preview';
+    }
 
     $pageid = $object->fk_default_home;
     if (empty($pageid))
     {
     	$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-    	if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+    	if (! is_array($array) && $array < 0) {
+    		dol_print_error('', $objectpage->error, $objectpage->errors);
+    	}
     	$atleastonepage=(is_array($array) && count($array) > 0);
 
     	$firstpageid=0; $homepageid=0;
     	foreach($array as $key => $valpage)
     	{
-    		if (empty($firstpageid)) $firstpageid=$valpage->id;
-    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
+    		if (empty($firstpageid)) {
+    			$firstpageid=$valpage->id;
+    		}
+    		if ($object->fk_default_home && $key == $object->fk_default_home) {
+    			$homepageid=$valpage->id;
+    		}
     	}
     	$pageid=($homepageid?$homepageid:$firstpageid);   // We choose home page and if not defined yet, we take first page
     }
 }
-if (GETPOST('refreshpage', 'alpha') && ! in_array($action, array('updatecss'))) $action='preview';
+if (GETPOST('refreshpage', 'alpha') && ! in_array($action, array('updatecss'))) {
+	$action='preview';
+}
 
 // Cancel
 if ($cancel)
@@ -309,7 +345,10 @@ 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $backtopage = $savbacktopage;
 
-if ($action == 'renamefile') $action='file_manager';		// After actions_linkedfiles, if action were renamefile, we set it to 'file_manager'
+if ($action == 'renamefile') {
+	$action='file_manager';
+}
+// After actions_linkedfiles, if action were renamefile, we set it to 'file_manager'
 
 if ($action == 'seteditinline')
 {
@@ -416,8 +455,7 @@ 
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
 		exit;
-	}
-	else
+	} else
 	{
 		$db->rollback();
 		$action='createsite';
@@ -456,8 +494,7 @@ 
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
 			$action = 'createcontainer';
-		}
-		elseif (! preg_match('/^http/', $urltograb))
+		} elseif (! preg_match('/^http/', $urltograb))
 		{
 			$error++;
 			$langs->load("errors");
@@ -505,14 +542,12 @@ 
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
 				$action='createcontainer';
-			}
-			elseif ($tmp['http_code'] != '200')
+			} elseif ($tmp['http_code'] != '200')
 			{
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
 				$action='createcontainer';
-			}
-			else
+			} else
 			{
 				// Remove comments
 				$tmp['content'] = removeHtmlComment($tmp['content']);
@@ -532,7 +567,9 @@ 
 
 	   			$objectpage->aliasalt = '';
 
-	   			if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) $objectpage->aliasalt = $regs[1];
+	   			if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) {
+	   				$objectpage->aliasalt = $regs[1];
+	   			}
 
 	   			$regtmp=array();
 				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
@@ -541,7 +578,10 @@ 
 				}
 				if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp))
 				{
-					if (empty($objectpage->title)) $objectpage->title = $regtmp[1];		// If title not found into <title>, we get it from <meta title>
+					if (empty($objectpage->title)) {
+						$objectpage->title = $regtmp[1];
+					}
+					// If title not found into <title>, we get it from <meta title>
 				}
 				if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
 				{
@@ -599,8 +639,7 @@ 
 					if (preg_match('/^\//', $regs[2][$key]))
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-					}
-					else
+					} else
 					{
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
 					}
@@ -619,7 +658,9 @@ 
 					// Test if this is an external URL of grabbed web site. If yes, we do not load resource
 					$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
 					$domaintograbbis = getDomainFromURL($urltograbbis);
-					if ($domaintograb != $domaintograbbis) continue;
+					if ($domaintograb != $domaintograbbis) {
+						continue;
+					}
 
 					/*
 	    			$tmpgeturl = getURLContent($urltograbbis);
@@ -668,8 +709,7 @@ 
 					if (preg_match('/^\//', $regs[2][$key]))
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-					}
-					else
+					} else
 					{
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key];	// We use dir of grabbed file
 					}
@@ -688,7 +728,9 @@ 
 					// Test if this is an external URL of grabbed web site. If yes, we do not load resource
 					$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
 					$domaintograbbis = getDomainFromURL($urltograbbis);
-					if ($domaintograb != $domaintograbbis) continue;
+					if ($domaintograb != $domaintograbbis) {
+						continue;
+					}
 
 					$tmpgeturl = getURLContent($urltograbbis);
 					if ($tmpgeturl['curl_error_no'])
@@ -697,15 +739,13 @@ 
 						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action='createcontainer';
-					}
-					elseif ($tmpgeturl['http_code'] != '200')
+					} elseif ($tmpgeturl['http_code'] != '200')
 					{
 						$errorforsubresource++;
 						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action='createcontainer';
-					}
-					else
+					} else
 					{
 						// Clean some comment
 						//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
@@ -773,8 +813,7 @@ 
 				$objectpage->grabbed_from = $urltograb;
 			}
 		}
-	}
-	else
+	} else
 	{
 		$objectpage->title = GETPOST('WEBSITE_TITLE', 'alpha');
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
@@ -790,7 +829,9 @@ 
 		$substitutionarray['__WEBSITE_CREATE_BY__']=$user->getFullName($langs);
 
 		$sample = GETPOST('sample', 'alpha');
-		if (empty($sample)) $sample='empty';
+		if (empty($sample)) {
+			$sample='empty';
+		}
 
 		$pathtosample = DOL_DOCUMENT_ROOT.'/website/samples/page-sample-'.$sample.'.html';
 
@@ -806,8 +847,7 @@ 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
 			$error++;
 			$action='createcontainer';
-		}
-		elseif (! preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
+		} elseif (! preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
@@ -852,8 +892,7 @@ 
 			if ($result)
 			{
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
-			}
-			else
+			} else
 			{
 				setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 				$action = 'createcontainer';
@@ -865,8 +904,7 @@ 
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action='';
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -977,8 +1015,7 @@ 
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		$db->rollback();
 		dol_print_error($db);
@@ -1014,8 +1051,7 @@ 
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey);
 		exit;
-	}
-	else
+	} else
 	{
 		$db->rollback();
 		dol_print_error($db);
@@ -1029,8 +1065,7 @@ 
 	if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') ||  GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 	{
 		$action='editcss';
-	}
-	else
+	} else
 	{
 		$res = $object->fetch(0, $websitekey);
 		$website = $object;
@@ -1262,16 +1297,17 @@ 
     			setEventMessages($langs->trans("Saved"), null, 'mesgs');
     		}
 
-    		if (! GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
+    		if (! GETPOSTISSET('updateandstay')) {
+    			// If we click on "Save And Stay", we don not make the redirect
     		{
     			$action='preview';
+    		}
     			if ($backtopage)
 	    		{
 	    			header("Location: ".$backtopage);
 	    			exit;
 	    		}
-    		}
-    		else
+    		} else
     		{
     			$action = 'editcss';
     		}
@@ -1302,12 +1338,14 @@ 
 		//-------------------------------------------------
 		$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
 
-		if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');
-		else setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+		if ($result) {
+			setEventMessages($langs->trans("Saved"), null, 'mesgs');
+		} else {
+			setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+		}
 
 		$action='preview';
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -1401,7 +1439,9 @@ 
 		$objectpage->fk_page = GETPOST('pageidfortranslation', 'int');
 
 		$newdatecreation=dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
-		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
+		if ($newdatecreation) {
+			$objectpage->date_creation = $newdatecreation;
+		}
 
 		$res = $objectpage->update($user);
 		if (! ($res > 0))
@@ -1413,8 +1453,7 @@ 
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
 				$action = 'editmeta';
-			}
-			else
+			} else
 			{
 				$error++;
 				$langs->load("errors");
@@ -1427,8 +1466,7 @@ 
 	if (! $error)
 	{
 		$db->commit();
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -1444,7 +1482,9 @@ 
 
 		// Now generate the master.inc.php page
 		$result = dolSaveMasterFile($filemaster);
-		if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+		if (! $result) {
+			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+		}
 
 		// Now delete the alias.php page
 		if (! empty($fileoldalias))
@@ -1468,7 +1508,9 @@ 
 
 		// Save page alias
 		$result=dolSavePageAlias($filealias, $object, $objectpage);
-		if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+		if (! $result) {
+			setEventMessages('Failed to write file '.$filealias, null, 'errors');
+		}
 		// Save alt aliases
 		if (! empty($objectpage->aliasalt))
 		{
@@ -1480,7 +1522,9 @@ 
 					if (trim($tmpaliasalt))
 					{
 						$result=dolSavePageAlias($pathofwebsite.'/'.trim($tmpaliasalt).'.php', $object, $objectpage);
-						if (! $result) setEventMessages('Failed to write file '.$pathofwebsite.'/'.trim($tmpaliasalt).'.php', null, 'errors');
+						if (! $result) {
+							setEventMessages('Failed to write file '.$pathofwebsite.'/'.trim($tmpaliasalt).'.php', null, 'errors');
+						}
 					}
 				}
 			}
@@ -1494,8 +1538,7 @@ 
 			setEventMessages($langs->trans("Saved"), null, 'mesgs');
 			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 			//exit;
-		}
-		else
+		} else
 		{
 			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
@@ -1526,8 +1569,7 @@ 
 			$action='preview';
 
 			$db->rollback();
-		}
-		else
+		} else
 		{
 			$object = $objectnew;
 			$id = $object->id;
@@ -1563,8 +1605,7 @@ 
 			{
 				$tmpwebsite->fetch($newwebsiteid);
 				$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
-			}
-			else
+			} else
 			{
 				$tmpwebsite = $object;
 			}
@@ -1578,8 +1619,7 @@ 
 				$action='createpagefromclone';
 
 				$db->rollback();
-			}
-			else
+			} else
 			{
 				$fileindex=$pathofwebsitenew.'/index.php';
 				$filetpl=$pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
@@ -1627,8 +1667,7 @@ 
 		if ($pageid > 0)
 		{
 			$res = $objectpage->fetch($pageid);
-		}
-		else
+		} else
 		{
 			$res=0;
 			if ($object->fk_default_home > 0)
@@ -1656,18 +1695,24 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
             $forbiddenphpcommands=array("exec", "passthru", "system", "shell_exec", "proc_open");
-            if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
+            if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE)) {
+            	// If option is not on, we disallow functions to write files
             {
                 $forbiddenphpcommands=array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
             }
+            }
             foreach($forbiddenphpcommands as $forbiddenphpcommand)
             {
                 if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
                 {
                     $error++;
                     setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
+                    if ($action == 'updatesource') {
+                    	$action = 'editsource';
+                    }
+                    if ($action == 'updatecontent') {
+                    	$action = 'editcontent';
+                    }
                 }
             }
 
@@ -1677,8 +1722,12 @@ 
                 {
                     $error++;
                     setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
+                    if ($action == 'updatesource') {
+                    	$action = 'editsource';
+                    }
+                    if ($action == 'updatecontent') {
+                    	$action = 'editcontent';
+                    }
                 }
             }
 
@@ -1692,8 +1741,12 @@ 
 			{
 				$error++;
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
-				if ($action == 'updatesource') $action = 'editsource';
-				if ($action == 'updatecontent') $action = 'editcontent';
+				if ($action == 'updatesource') {
+					$action = 'editsource';
+				}
+				if ($action == 'updatecontent') {
+					$action = 'editcontent';
+				}
 			}
 
 			if (! $error)
@@ -1710,7 +1763,9 @@ 
 				// Now generate the master.inc.php page
 				$result = dolSaveMasterFile($filemaster);
 
-				if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+				if (! $result) {
+					setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+				}
 
 
 				// Now generate the alias.php page
@@ -1722,7 +1777,9 @@ 
 
 				// Save page alias
 				$result=dolSavePageAlias($filealias, $object, $objectpage);
-				if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+				if (! $result) {
+					setEventMessages('Failed to write file '.$filealias, null, 'errors');
+				}
 
 				// Save page content
 				$result=dolSavePageContent($filetpl, $object, $objectpage);
@@ -1731,34 +1788,29 @@ 
 					setEventMessages($langs->trans("Saved"), null, 'mesgs');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 	   				exit;
-				}
-				else
+				} else
 				{
 					setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 	   				exit;
 				}
-			}
-			else
+			} else
 			{
 				$db->rollback();
 			}
-		}
-		else
+		} else
 		{
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 			exit;
 		}
-	}
-	else
+	} else
 	{
 		if (! $error)
 		{
 			if (empty($websitekey) || $websitekey == '-1')
 			{
 				setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
-			}
-			else
+			} else
 			{
 				setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
 				setEventMessages($langs->trans("YouCanCreatePageOrImportTemplate"), null, 'warnings');
@@ -1782,8 +1834,7 @@ 
 
 		readfile($fileofzip);
 		exit;
-	}
-	else
+	} else
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
@@ -1797,8 +1848,7 @@ 
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
-	}
-	else
+	} else
 	{
 		if (! empty($_FILES) || GETPOSTISSET('templateuserfile'))
 		{
@@ -1821,11 +1871,13 @@ 
 			if (GETPOSTISSET('templateuserfile'))
 			{
 				$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');
-			}
-			elseif (! empty($_FILES))
+			} elseif (! empty($_FILES))
 			{
-				if (is_array($_FILES['userfile']['tmp_name'])) $userfiles=$_FILES['userfile']['tmp_name'];
-				else $userfiles=array($_FILES['userfile']['tmp_name']);
+				if (is_array($_FILES['userfile']['tmp_name'])) {
+					$userfiles=$_FILES['userfile']['tmp_name'];
+				} else {
+					$userfiles=array($_FILES['userfile']['tmp_name']);
+				}
 
 				foreach($userfiles as $key => $userfile)
 				{
@@ -1835,8 +1887,7 @@ 
 						if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2){
 							setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
 							$action = 'importsite';
-						}
-						else {
+						} else {
 							setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 							$action = 'importsite';
 						}
@@ -1867,8 +1918,7 @@ 
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'importsite';
-				}
-				else
+				} else
 				{
 					// Force mode dynamic on
 					dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
@@ -1909,7 +1959,9 @@ 
 
 $arrayofjs[]='includes/jquery/plugins/blockUI/jquery.blockUI.js';
 $arrayofjs[]='core/js/blockUI.js';	// Used by ecm/tpl/enabledfiletreeajax.tpl.php
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $arrayofjs[]="includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$arrayofjs[]="includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
 
 $moreheadjs.='<script type="text/javascript">'."\n";
 $moreheadjs.='var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
@@ -1979,13 +2031,17 @@ 
 
 // Add a margin under toolbar ?
 $style='';
-if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource') $style=' margin-bottom: 5px;';
+if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource') {
+	$style=' margin-bottom: 5px;';
+}
 
 
 if (! GETPOST('hide_websitemenu'))
 {
 	$disabled='';
-	if (empty($user->rights->website->write)) $disabled=' disabled="disabled"';
+	if (empty($user->rights->website->write)) {
+		$disabled=' disabled="disabled"';
+	}
 
 	//var_dump($objectpage);exit;
 	print '<div class="centpercent websitebar">';
@@ -2006,15 +2062,22 @@ 
 	print '<span class="websiteselection">';
 	$out='';
 	$out.='<select name="website" class="minwidth100 maxwidth300" id="website">';
-	if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
+	if (empty($object->records)) {
+		$out.='<option value="-1">&nbsp;</option>';
+	}
 	// Loop on each sites
 	$i=0;
 	foreach($object->records as $key => $valwebsite)
 	{
-		if (empty($websitekey)) $websitekey=$valwebsite->ref;
+		if (empty($websitekey)) {
+			$websitekey=$valwebsite->ref;
+		}
 
 		$out.='<option value="'.$valwebsite->ref.'"';
-		if ($websitekey == $valwebsite->ref) $out.=' selected';		// To preselect a value
+		if ($websitekey == $valwebsite->ref) {
+			$out.=' selected';
+		}
+		// To preselect a value
 		$out.='>';
 		$out.=$valwebsite->ref;
 		$out.='</option>';
@@ -2031,7 +2094,9 @@ 
 	{
 		$virtualurl='';
 		$dataroot=DOL_DATA_ROOT.'/website/'.$websitekey;
-		if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
+		if (! empty($object->virtualhost)) {
+			$virtualurl=$object->virtualhost;
+		}
 	}
 
 	$array=array();
@@ -2040,7 +2105,9 @@ 
 		$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
 		$object->lines = $array;
 	}
-	if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+	if (! is_array($array) && $array < 0) {
+		dol_print_error('', $objectpage->error, $objectpage->errors);
+	}
 	$atleastonepage=(is_array($array) && count($array) > 0);
 
 	if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
@@ -2052,8 +2119,7 @@ 
 		if ($atleastonepage)
 		{
 			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
-		}
-		else
+		} else
 		{
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
 		}
@@ -2109,20 +2175,17 @@ 
 		if (empty($object->fk_default_home))
 		{
 		    $htmltext.= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
-		}
-		elseif (empty($virtualurl))
+		} elseif (empty($virtualurl))
 		{
 		    $htmltext.= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
-		}
-		else
+		} else
 		{
 		    $htmltext.= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (! empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
 		    $htmltext.= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
-		}
-		else
+		} else
 		{
     		$htmltext.=$langs->trans("SetHereVirtualHost", $dataroot);
     		$htmltext.='<br>';
@@ -2141,10 +2204,18 @@ 
 
 	if (in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm')))
 	{
-		if ($action == 'editcss' && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
-		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+		if ($action == 'editcss' && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+			print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+		}
+		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+			print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		}
+		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+			print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		}
+		if ($action != 'preview') {
+			print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+		}
 	}
 
 	print '</span>';
@@ -2173,8 +2244,7 @@ 
 		if ($action != 'addcontainer')
 		{
 			print '<span class="websiteselection">'.$formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action).'</span>';
-		}
-		else
+		} else
 		{
 			print $langs->trans("New");
 		}
@@ -2197,8 +2267,9 @@ 
 				{
 					$pagepreviousid = $obj->pagepreviousid;
 				}
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
 			$sql = 'SELECT MIN(rowid) as pagenextid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid > '.$pageid.' AND fk_website = '.$object->id;
 			$resql = $db->query($sql);
 			if ($resql)
@@ -2208,14 +2279,21 @@ 
 				{
 					$pagenextid = $obj->pagenextid;
 				}
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
 		}
 
-		if ($pagepreviousid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("PreviousContainer")).'</span>';
-		if ($pagenextid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("NextContainer")).'</span>';
+		if ($pagepreviousid) {
+			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
+		} else {
+			print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("PreviousContainer")).'</span>';
+		}
+		if ($pagenextid) {
+			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
+		} else {
+			print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("NextContainer")).'</span>';
+		}
 
 		$websitepage = new WebSitePage($db);
 		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
@@ -2226,7 +2304,9 @@ 
 		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
 		{
 			$disabled='';
-			if (empty($user->rights->website->write)) $disabled=' disabled="disabled"';
+			if (empty($user->rights->website->write)) {
+				$disabled=' disabled="disabled"';
+			}
 
 			// Confirmation delete site
 			if ($action == 'deletesite') {
@@ -2258,12 +2338,14 @@ 
 				print $formconfirm;
 			}
 
-			if ($pageid > 0 && $atleastonepage)		// pageid can be set without pages, if homepage of site is set and all pages were removed
+			if ($pageid > 0 && $atleastonepage) {
+				// pageid can be set without pages, if homepage of site is set and all pages were removed
 			{
 				// Confirmation to clone
 				if ($action == 'createpagefromclone') {
 					// Create an array for form
 					$preselectedlanguage = GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ($objectpage->lang ? $objectpage->lang : $langs->defaultlang);
+			}
 					$formquestion = array(
 						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
 						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0),
@@ -2339,15 +2421,13 @@ 
 				{
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
-				}
-				else
+				} else
 				{
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					if (empty($conf->global->WEBSITE_EDITINLINE))
 					{
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
-					}
-					else
+					} else
 					{
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
@@ -2365,8 +2445,7 @@ 
 				if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
 				{
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
-				}
-				else
+				} else
 				{
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
@@ -2381,8 +2460,7 @@ 
 					//print '<span class="button bordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
-				}
-				else
+				} else
 				{
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
@@ -2430,9 +2508,15 @@ 
 		}
 		if (! in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm','createsite','createcontainer','createfromclone','createpagefromclone','deletesite')))
 		{
-			if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+			if (preg_match('/^create/', $action)) {
+				print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			}
+			if (preg_match('/^edit/', $action)) {
+				print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			}
+			if ($action != 'preview') {
+				print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
+			}
 		}
 
 		print '</span>';	// end websitetools
@@ -2444,8 +2528,7 @@ 
             if ($conf->browser->layout == 'phone')
             {
                 print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
-            else
+            } else
             {
             	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
             	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
@@ -2529,32 +2612,33 @@ 
 		$csscontent = @file_get_contents($filecss);
 		// Clean the php css file to remove php code and get only css part
 		$csscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $csscontent);
-	}
-	else
+	} else
 	{
 		$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
 	}
-	if (! trim($csscontent)) $csscontent='/* CSS content (all pages) */'."\n"."body.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
+	if (! trim($csscontent)) {
+		$csscontent='/* CSS content (all pages) */'."\n"."body.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
+	}
 
 	if (! GETPOSTISSET('WEBSITE_JS_INLINE'))
 	{
 		$jscontent = @file_get_contents($filejs);
 		// Clean the php js file to remove php code and get only js part
 		$jscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $jscontent);
-	}
-	else
+	} else
 	{
 		$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
 	}
-	if (! trim($jscontent)) $jscontent='/* JS content (all pages) */'."\n";
+	if (! trim($jscontent)) {
+		$jscontent='/* JS content (all pages) */'."\n";
+	}
 
 	if (! GETPOSTISSET('WEBSITE_HTML_HEADER'))
 	{
 		$htmlheadercontent = @file_get_contents($filehtmlheader);
 		// Clean the php htmlheader file to remove php code and get only html part
 		$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htmlheadercontent);
-	}
-	else
+	} else
 	{
 		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
 	}
@@ -2563,8 +2647,7 @@ 
 		$htmlheadercontent ="<html>\n";
 		$htmlheadercontent.=$htmlheadercontentdefault;
 		$htmlheadercontent.="</html>";
-	}
-	else
+	} else
 	{
 		$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
 		$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
@@ -2576,8 +2659,7 @@ 
 		$robotcontent = @file_get_contents($filerobot);
 		// Clean the php htmlheader file to remove php code and get only html part
 		$robotcontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $robotcontent);
-	}
-	else
+	} else
 	{
 		$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
 	}
@@ -2594,8 +2676,7 @@ 
 		$htaccesscontent = @file_get_contents($filehtaccess);
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
-	}
-	else
+	} else
 	{
 		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
 	}
@@ -2611,8 +2692,7 @@ 
 		$manifestjsoncontent = @file_get_contents($filemanifestjson);
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
-	}
-	else
+	} else
 	{
 		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'none');
 	}
@@ -2626,8 +2706,7 @@ 
 		$readmecontent = @file_get_contents($filereadme);
 		// Clean the readme file to remove php code and get only html part
 		$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
-	}
-	else
+	} else
 	{
 		$readmecontent = GETPOST('WEBSITE_README', 'none');
 	}
@@ -2767,15 +2846,21 @@ 
 
     dol_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
     */
-	if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddSite"));
+	if ($action == 'createcontainer') {
+		print load_fiche_titre($langs->trans("AddSite"));
+	}
 
 	print '<!-- Add site -->'."\n";
 	//print '<div class="fichecenter">';
 
 	print '<table class="border centpercent">';
 
-	if (GETPOST('WEBSITE_REF'))         $siteref=GETPOST('WEBSITE_REF', 'alpha');
-	if (GETPOST('WEBSITE_DESCRIPTION')) $sitedesc=GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+	if (GETPOST('WEBSITE_REF')) {
+		$siteref=GETPOST('WEBSITE_REF', 'alpha');
+	}
+	if (GETPOST('WEBSITE_DESCRIPTION')) {
+		$sitedesc=GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+	}
 
 	print '<tr><td class="titlefieldcreate fieldrequired">';
 	print $langs->trans('Ref');
@@ -2871,15 +2956,21 @@ 
 
     dol_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
     */
-	if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddPage"));
+	if ($action == 'createcontainer') {
+		print load_fiche_titre($langs->trans("AddPage"));
+	}
 
 	print '<!-- Edit or create page/container -->'."\n";
 	//print '<div class="fichecenter">';
 
 	$hiddenfromfetchingafterload = ' hideobject';
 	$hiddenmanuallyafterload = ' hideobject';
-	if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') $hiddenfromfetchingafterload = '';
-	if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') $hiddenmanuallyafterload = '';
+	if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') {
+		$hiddenfromfetchingafterload = '';
+	}
+	if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') {
+		$hiddenmanuallyafterload = '';
+	}
 
 	if ($action == 'editmeta' || empty($conf->use_javascript_ajax)) {	// No autohide/show in such case
 		$hiddenfromfetchingafterload='';
@@ -2890,7 +2981,9 @@ 
 	{
 		print '<br>';
 
-		if (! empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		if (! empty($conf->use_javascript_ajax)) {
+			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		}
 		print '<label for="checkboxcreatefromfetching"><span class="opacitymedium">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
 		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
@@ -2911,7 +3004,9 @@ 
 
 		print '<br>';
 
-		if (! empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+		if (! empty($conf->use_javascript_ajax)) {
+			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+		}
 		print '<label for="checkboxcreatemanually"><span class="opacitymedium">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 	}
@@ -2946,22 +3041,37 @@ 
 		$pagedatemodification=$objectpage->date_modification;
 		$pageauthorid=$objectpage->fk_user_creat;
 		$pageusermodifid=$objectpage->fk_user_modif;
-	}
-	else
+	} else
 	{
 		$type_container = 'page';
 		$pagedatecreation=dol_now();
 		$pageauthorid=$user->id;
 		$pageusermodifid=0;
 	}
-	if (GETPOST('WEBSITE_TITLE', 'alpha'))       $pagetitle=GETPOST('WEBSITE_TITLE', 'alpha');
-	if (GETPOST('WEBSITE_PAGENAME', 'alpha'))    $pageurl=GETPOST('WEBSITE_PAGENAME', 'alpha');
-	if (GETPOST('WEBSITE_ALIASALT', 'alpha'))    $pagealiasalt=GETPOST('WEBSITE_ALIASALT', 'alpha');
-	if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) $pagedescription=GETPOST('WEBSITE_DESCRIPTION', 'alpha');
-	if (GETPOST('WEBSITE_IMAGE', 'alpha'))       $pageimage=GETPOST('WEBSITE_IMAGE', 'alpha');
-	if (GETPOST('WEBSITE_KEYWORDS', 'alpha'))    $pagekeywords=GETPOST('WEBSITE_KEYWORDS', 'alpha');
-	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang=GETPOST('WEBSITE_LANG', 'aZ09');
-	if (GETPOST('htmlheader', 'none'))			$pagehtmlheader=GETPOST('htmlheader', 'none');
+	if (GETPOST('WEBSITE_TITLE', 'alpha')) {
+		$pagetitle=GETPOST('WEBSITE_TITLE', 'alpha');
+	}
+	if (GETPOST('WEBSITE_PAGENAME', 'alpha')) {
+		$pageurl=GETPOST('WEBSITE_PAGENAME', 'alpha');
+	}
+	if (GETPOST('WEBSITE_ALIASALT', 'alpha')) {
+		$pagealiasalt=GETPOST('WEBSITE_ALIASALT', 'alpha');
+	}
+	if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) {
+		$pagedescription=GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+	}
+	if (GETPOST('WEBSITE_IMAGE', 'alpha')) {
+		$pageimage=GETPOST('WEBSITE_IMAGE', 'alpha');
+	}
+	if (GETPOST('WEBSITE_KEYWORDS', 'alpha')) {
+		$pagekeywords=GETPOST('WEBSITE_KEYWORDS', 'alpha');
+	}
+	if (GETPOST('WEBSITE_LANG', 'aZ09')) {
+		$pagelang=GETPOST('WEBSITE_LANG', 'aZ09');
+	}
+	if (GETPOST('htmlheader', 'none')) {
+		$pagehtmlheader=GETPOST('htmlheader', 'none');
+	}
 
 	// Title
 	print '<tr><td class="fieldrequired">';
@@ -3040,14 +3150,17 @@ 
 				{
 					$tmppage=new WebsitePage($db);
 					$tmppage->fetch($obj->rowid);
-					if ($i > 0) print ' - ';
+					if ($i > 0) {
+						print ' - ';
+					}
 					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')<br>';
 					$translatedby++;
 					$i++;
 				}
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 	if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0))
 	{
@@ -3056,8 +3169,7 @@ 
 		if ($result == 0)
 		{
 			// not found, we can reset value to clean database
-		}
-		elseif ($result > 0)
+		} elseif ($result > 0)
 		{
 			$translationof = $sourcepage->id;
 			print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
@@ -3185,7 +3297,10 @@ 
 	//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
 
 	$module = 'medias';
-	if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php';	// Must be an url without param
+	if (empty($url)) {
+		$url=DOL_URL_ROOT.'/website/index.php';
+	}
+	// Must be an url without param
 	include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
 
 	print '</div>';
@@ -3210,8 +3325,12 @@ 
 	$maxheightwin=480;
 	if (isset($_SESSION["dol_screenheight"]))
 	{
-		if ($_SESSION["dol_screenheight"] > 680) $maxheightwin = $_SESSION["dol_screenheight"]-400;
-		if ($_SESSION["dol_screenheight"] > 800) $maxheightwin = $_SESSION["dol_screenheight"]-490;
+		if ($_SESSION["dol_screenheight"] > 680) {
+			$maxheightwin = $_SESSION["dol_screenheight"]-400;
+		}
+		if ($_SESSION["dol_screenheight"] > 800) {
+			$maxheightwin = $_SESSION["dol_screenheight"]-490;
+		}
 	}
 	//var_dump($_SESSION["dol_screenheight"]);
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -3286,9 +3405,15 @@ 
 	if ($action == 'replacesiteconfirm')
 	{
 		$algo = '';
-		if (GETPOST('optionmeta')) $algo.='meta';
-		if (GETPOST('optioncontent')) $algo.='content';
-		if (GETPOST('optionsitefiles')) $algo.='sitefiles';
+		if (GETPOST('optionmeta')) {
+			$algo.='meta';
+		}
+		if (GETPOST('optioncontent')) {
+			$algo.='content';
+		}
+		if (GETPOST('optionsitefiles')) {
+			$algo.='sitefiles';
+		}
 
 		$listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000);
 
@@ -3335,8 +3460,7 @@ 
 					print '<td class="tdoverflow100">'.$answerrecord->description;
 					print '</td>';
 					print '</tr>';
-				}
-				else
+				} else
 				{
 					print '<tr>';
 					print '<td>'.$answerrecord['type'].'</td>';
@@ -3351,8 +3475,7 @@ 
 			}
 			print '</table>';
 			print '</div></div>';
-		}
-		else
+		} else
 		{
 			print $listofpages['message'];
 		}
@@ -3431,7 +3554,9 @@ 
 		foreach($tmp as $valtmp)
 		{
 			$i++;
-			if ($i % 2 == 0) $tmpstyleinheader.=$valtmp."\n";
+			if ($i % 2 == 0) {
+				$tmpstyleinheader.=$valtmp."\n";
+			}
 		}
 		$tmpout.= $tmpstyleinheader."\n";
 		// Clean style that may affect global style of Dolibarr
@@ -3464,8 +3589,7 @@ 
 		{
 		    // Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
-		}
-		else
+		} else
 		{
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
@@ -3506,15 +3630,13 @@ 
 
 		/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
         print '</iframe>';*/
-	}
-	else
+	} else
 	{
 		if (empty($websitekey) || $websitekey == '-1')
 		{
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
-		}
-		else
+		} else
 		{
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';

htdocs/modulebuilder/template/class/myobject.class.php

Spacing +75 added lines, -75 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -89,27 +89,27 @@ 
 	/**
      * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
      */
-	public $fields=array(
-	    'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref',              'enabled'=>1, 'visible'=>1,  'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-	    'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
-	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1),
-	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'default'=>'null', 'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
-	    'qty'           =>array('type'=>'real',         'label'=>'Qty',              'enabled'=>1, 'visible'=>1,  'default'=>'0', 'position'=>45,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
+	public $fields = array(
+	    'rowid'         =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+	    'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
+	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1),
+	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
+	    'qty'           =>array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
 	    'fk_soc' 		=>array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
 		'fk_project'    =>array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1),
-		'description'   =>array('type'=>'text',			'label'=>'Description',		 'enabled'=>1, 'visible'=>3,  'position'=>60),
-		'note_public'   =>array('type'=>'html',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		'note_private'  =>array('type'=>'html',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>62),
-		'date_creation' =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>500),
-	    'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 0, 'position'=>501),
+		'description'   =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60),
+		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
+		'note_private'  =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
+		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>500),
+	    'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 0, 'position'=>501),
 		//'date_validation'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>510, 'foreignkey'=>'user.rowid'),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif',        'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>510, 'foreignkey'=>'user.rowid'),
+		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0,  'position'=>1000),
-		'model_pdf' 	=>array('type'=>'varchar(255)', 'label'=>'Model pdf',        'enabled'=>1, 'visible'=>0,  'notnull'=>-1, 'position'=>1010),
-	    'status'        =>array('type'=>'smallint',     'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=> 1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled')),
+		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
+		'model_pdf' 	=>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'notnull'=>-1, 'position'=>1010),
+	    'status'        =>array('type'=>'smallint', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled')),
 	);
 
 	/**
@@ -214,11 +214,11 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 
 		// Unset fields that are disabled
-		foreach($this->fields as $key => $val)
+		foreach ($this->fields as $key => $val)
 		{
 			if (isset($val['enabled']) && empty($val['enabled']))
 			{
@@ -229,13 +229,13 @@ 
 		// Translate some data of arrayofkeyval
 		if (is_object($langs))
 		{
-			foreach($this->fields as $key => $val)
+			foreach ($this->fields as $key => $val)
 			{
 				if (is_array($val['arrayofkeyval']))
 				{
-					foreach($val['arrayofkeyval'] as $key2 => $val2)
+					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
-						$this->fields[$key]['arrayofkeyval'][$key2]=$langs->trans($val2);
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 					}
 				}
 			}
@@ -274,7 +274,7 @@ 
 
 	    // Load source object
 	    $result = $object->fetchCommon($fromid);
-	    if ($result > 0 && ! empty($object->table_element_line)) $object->fetchLines();
+	    if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
 
 	    // get lines so they will be clone
 	    //foreach($this->lines as $line)
@@ -287,18 +287,18 @@ 
 
 
 	    // Clear fields
-	    $object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref: $this->fields['ref']['default'];
-	    $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label: $this->fields['label']['default'];
+	    $object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
+	    $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
 	    $object->status = self::STATUS_DRAFT;
 	    // ...
 	    // Clear extrafields that are unique
 	    if (is_array($object->array_options) && count($object->array_options) > 0)
 	    {
 	    	$extrafields->fetch_name_optionals_label($this->table_element);
-	    	foreach($object->array_options as $key => $option)
+	    	foreach ($object->array_options as $key => $option)
 	    	{
 	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (! empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
 	    		{
 	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 	    			unset($object->array_options[$key]);
@@ -315,7 +315,7 @@ 
 	        $this->errors = $object->errors;
 	    }
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	    	// copy internal contacts
 	    	if ($this->copy_linked_contact($object, 'internal') < 0)
@@ -324,7 +324,7 @@ 
 	    	}
 	    }
 
-	    if (! $error)
+	    if (!$error)
 	    {
 	    	// copy external contacts if same company
 	    	if (property_exists($this, 'socid') && $this->socid == $object->socid)
@@ -356,7 +356,7 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -367,7 +367,7 @@ 
 	 */
 	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		$result = $this->fetchLinesCommon();
 		return $result;
@@ -391,40 +391,40 @@ 
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$records=array();
+		$records = array();
 
 		$sql = 'SELECT ';
 		$sql .= $this->getFieldList();
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
 		else $sql .= ' WHERE 1 = 1';
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key=='t.rowid') {
-					$sqlwhere[] = $key . '='. $value;
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
 				}
 				elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				}
-				elseif ($key=='customsql') {
+				elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				}
 				else {
-					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND (' . implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .=  ' ' . $this->db->plimit($limit, $offset);
+			$sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -446,8 +446,8 @@ 
 
 			return $records;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
 			return -1;
 		}
@@ -587,51 +587,51 @@ 
     {
         global $conf, $langs, $hookmanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
         $result = '';
 
-        $label = '<u>' . $langs->trans("MyObject") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("MyObject").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
         $url = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$this->id;
 
         if ($option != 'nolink')
         {
             // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowMyObject");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowMyObject");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-		global $action,$hookmanager;
+		global $action, $hookmanager;
 		$hookmanager->initHooks(array('myobjectdao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $result = $hookmanager->resPrint;
 		else $result .= $hookmanager->resPrint;
 
@@ -687,10 +687,10 @@ 
 	public function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -701,7 +701,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -715,7 +715,7 @@ 
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);
@@ -749,7 +749,7 @@ 
 	 */
 	public function getLinesArray()
 	{
-	    $this->lines=array();
+	    $this->lines = array();
 
 	    $objectline = new MyObjectLine($this->db);
 	    $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_myobject = '.$this->id));
@@ -780,16 +780,16 @@ 
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("mymodule@mymodule");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 			$modele = 'standard';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->MYOBJECT_ADDON_PDF)) {
+			} elseif (!empty($conf->global->MYOBJECT_ADDON_PDF)) {
 				$modele = $conf->global->MYOBJECT_ADDON_PDF;
 			}
 		}
@@ -814,7 +814,7 @@ 
 
 		$error = 0;
 		$this->output = '';
-		$this->error='';
+		$this->error = '';
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 

htdocs/theme/md/btn.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /* <style type="text/css" > */
 
 
@@ -26,8 +26,8 @@ 
 .button, .buttonDelete, .butAction, .butActionDelete, .butActionRefused, .butActionNewRefused {
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
 	display: inline-block;
-	padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
-	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	padding: 0.4em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
 	line-height: 20px;
 	text-align: center;
 	vertical-align: middle;
@@ -55,8 +55,8 @@ 
 	text-decoration: none;
 	/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
 	display: inline-block;
-	padding: 0.2em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
-	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	padding: 0.2em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
 	line-height: 20px;
 	/* text-align: center;  New button are on right of screen */
 	vertical-align: middle;
@@ -243,7 +243,7 @@ 
 
 
 
-<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (! $user->admin)) { ?>
+<?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
 .butActionRefused, .butActionNewRefused, .btnTitle.refused {
     display: none !important;
 }

htdocs/core/actions_addupdatedelete.inc.php

Spacing +51 added lines, -51 removed lines

@@ -30,44 +30,44 @@ 
 // $backtopage may be defined
 // $triggermodname may be defined
 
-if (! empty($permissionedit) && empty($permissiontoadd)) $permissiontoadd = $permissionedit;	// For backward compatibility
+if (!empty($permissionedit) && empty($permissiontoadd)) $permissiontoadd = $permissionedit; // For backward compatibility
 
 if ($cancel)
 {
 	/*var_dump($cancel);
 	var_dump($backtopage);exit;*/
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
 	}
-	$action='';
+	$action = '';
 }
 
 // Action to add record
-if ($action == 'add' && ! empty($permissiontoadd))
+if ($action == 'add' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
 			$value = GETPOST($key, 'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
-			$value = price2num(GETPOST($key, 'none'));	// To fix decimal separator according to lang setup
+			$value = price2num(GETPOST($key, 'none')); // To fix decimal separator according to lang setup
 		} else {
 			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && ! is_null($val['default']) && $val['default'] == '(PROV)')
+		$object->$key = $value;
+		if ($val['notnull'] > 0 && $object->$key == '' && !is_null($val['default']) && $val['default'] == '(PROV)')
 		{
 		    $object->$key = '(PROV)';
 		}
@@ -78,54 +78,54 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->create($user);
+		$result = $object->create($user);
 		if ($result > 0)
 		{
 		    // Creation OK
 			$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
-			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo);		// New method to autoselect project after a New on another form object creation
+			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
 			header("Location: ".$urltogo);
 			exit;
 		}
 		else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
+			$action = 'create';
 		}
 	}
 	else
 	{
-		$action='create';
+		$action = 'create';
 	}
 }
 
 // Action to update record
-if ($action == 'update' && ! empty($permissiontoadd))
+if ($action == 'update' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
 			$value = GETPOST($key, 'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
 		} elseif (in_array($object->fields[$key]['type'], array('price', 'real'))) {
 			$value = price2num(GETPOST($key));
 		} else {
 			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
@@ -133,28 +133,28 @@ 
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->update($user);
+		$result = $object->update($user);
 		if ($result > 0)
 		{
-			$action='view';
+			$action = 'view';
 		}
 		else
 		{
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
+			$action = 'edit';
 		}
 	}
 	else
 	{
-		$action='edit';
+		$action = 'edit';
 	}
 }
 
 // Action to update one extrafield
-if ($action == "update_extras" && ! empty($permissiontoadd))
+if ($action == "update_extras" && !empty($permissiontoadd))
 {
 	$object->fetch(GETPOST('id', 'int'));
 
@@ -162,7 +162,7 @@ 
 	$attributekeylong = 'options_'.$attributekey;
 	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, ' alpha');
 
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+	$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -176,15 +176,15 @@ 
 }
 
 // Action to delete
-if ($action == 'confirm_delete' && ! empty($permissiontodelete))
+if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-    if (! ($object->id > 0))
+    if (!($object->id > 0))
     {
         dol_print_error('', 'Error, object must be fetched before being deleted');
         exit;
     }
 
-	$result=$object->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
 		// Delete OK
@@ -194,13 +194,13 @@ 
 	}
 	else
 	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
 }
 
 // Remove a line
-if ($action == 'confirm_deleteline' && $confirm == 'yes' && ! empty($permissiontoadd))
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd))
 {
 	$result = $object->deleteline($user, $lineid);
 	if ($result > 0)
@@ -216,7 +216,7 @@ 
 		{
 			$newlang = $object->thirdparty->default_lang;
 		}
-		if (! empty($newlang)) {
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
@@ -248,11 +248,11 @@ 
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			$model=$object->modelpdf;
+			$model = $object->modelpdf;
 			$ret = $object->fetch($id); // Reload to get new records
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -277,11 +277,11 @@ 
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			$model=$object->modelpdf;
+			$model = $object->modelpdf;
 			$ret = $object->fetch($id); // Reload to get new records
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -320,11 +320,11 @@ 
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			$model=$object->modelpdf;
+			$model = $object->modelpdf;
 			$ret = $object->fetch($id); // Reload to get new records
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -337,30 +337,30 @@ 
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
+if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
 	else
 	{
-	    $objectutil = dol_clone($object, 1);   // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
+	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
 		//$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
         // ...
-	    $result=$objectutil->createFromClone($user, (($object->id > 0) ? $object->id : $id));
+	    $result = $objectutil->createFromClone($user, (($object->id > 0) ? $object->id : $id));
 	    if (is_object($result) || $result > 0)
 		{
 			$newid = 0;
 			if (is_object($result)) $newid = $result->id;
 			else $newid = $result;
-			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
 		}
 		else
 		{
 		    setEventMessages($objectutil->error, $objectutil->errors, 'errors');
-			$action='';
+			$action = '';
 		}
 	}
 }

htdocs/core/class/commonobject.class.php

Spacing +1533 added lines, -1533 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var string[]	Array of error strings
 	 */
-	public $errors=array();
+	public $errors = array();
 
 	/**
 	 * @var string ID to identify managed object
@@ -75,7 +75,7 @@ 
 	/**
 	 * @var int    Name of subtable line
 	 */
-	public $table_element_line='';
+	public $table_element_line = '';
 
 	/**
 	 * @var string		Key value used to track if data is coming from import wizard
@@ -85,7 +85,7 @@ 
 	/**
 	 * @var mixed		Contains data to manage extrafields
 	 */
-	public $array_options=array();
+	public $array_options = array();
 
 	/**
 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
@@ -114,7 +114,7 @@ 
 	/**
 	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method
 	 */
-	public $context=array();
+	public $context = array();
 
 	/**
 	 * @var string		Contains canvas name if record is an alternative canvas record
@@ -380,7 +380,7 @@ 
 	 * @var mixed		Contains comments
 	 * @see fetchComments()
 	 */
-	public $comments=array();
+	public $comments = array();
 
 	/**
 	 * @var int
@@ -427,8 +427,8 @@ 
 	public $date_creation;
 
 
-	public $date_validation;		// Date validation
-	public $date_modification;		// Date last change (tms field)
+	public $date_validation; // Date validation
+	public $date_modification; // Date last change (tms field)
 
 	public $next_prev_filter;
 
@@ -448,27 +448,27 @@ 
 	 */
 	public static function isExistingObject($element, $id, $ref = '', $ref_ext = '')
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		$sql = "SELECT rowid, ref, ref_ext";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
-		$sql.= " WHERE entity IN (".getEntity($element).")" ;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
+		$sql .= " WHERE entity IN (".getEntity($element).")";
 
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		elseif ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		elseif ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
+		elseif ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
+		elseif ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
 		else {
-			$error='ErrorWrongParameters';
+			$error = 'ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
+			$num = $db->num_rows($resql);
 			if ($num > 0) return 1;
 			else return 0;
 		}
@@ -482,7 +482,7 @@ 
 	 */
 	public function errorsToString()
 	{
-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ', $this->errors)):'');
+		return $this->error.(is_array($this->errors) ? (($this->error != '' ? ', ' : '').join(', ', $this->errors)) : '');
 	}
 
 	/**
@@ -495,14 +495,14 @@ 
 	{
 	    global $hookmanager;
 
-	    $parameters=array('objref'=>$objref);
-	    $action='';
+	    $parameters = array('objref'=>$objref);
+	    $action = '';
 	    $reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 	    if ($reshook > 0)
 	    {
 	        return $hookmanager->resArray['objref'];
 	    }
-	    return $objref.(isset($hookmanager->resArray['objref'])?$hookmanager->resArray['objref']:'');
+	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
 	}
 
 	/**
@@ -515,14 +515,14 @@ 
 	{
 	    global $hookmanager;
 
-	    $parameters=array('objref'=>$objref);
-	    $action='';
+	    $parameters = array('objref'=>$objref);
+	    $action = '';
 	    $reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 	    if ($reshook > 0)
 	    {
 	        return $hookmanager->resArray['objref'];
 	    }
-	    return $objref.(isset($hookmanager->resArray['objref'])?$hookmanager->resArray['objref']:'');
+	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
 	}
 
 	/**
@@ -537,18 +537,18 @@ 
 	public function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)
 	{
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
-		$lastname=$this->lastname;
-		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		$lastname = $this->lastname;
+		$firstname = $this->firstname;
+		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
 
-		$ret='';
+		$ret = '';
 		if ($option && $this->civility_id)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id) != "Civility".$this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			else $ret .= $this->civility_id.' ';
 		}
 
-		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
+		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
 
 		return dol_trunc($ret, $maxlen);
 	}
@@ -565,20 +565,20 @@ 
 	{
 		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
 		{
-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-			$tmparray=getCountry($this->country_id, 'all');
-			$this->country_code=$tmparray['code'];
-			$this->country     =$tmparray['label'];
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+			$tmparray = getCountry($this->country_id, 'all');
+			$this->country_code = $tmparray['code'];
+			$this->country     = $tmparray['label'];
 		}
 
         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))
     	{
-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-    		$tmparray=getState($this->state_id, 'all', 0, 1);
-			$this->state_code   =$tmparray['code'];
-			$this->state        =$tmparray['label'];
-			$this->region_code  =$tmparray['region_code'];
-			$this->region       =$tmparray['region'];
+    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+    		$tmparray = getState($this->state_id, 'all', 0, 1);
+			$this->state_code   = $tmparray['code'];
+			$this->state        = $tmparray['label'];
+			$this->region_code  = $tmparray['region_code'];
+			$this->region       = $tmparray['region'];
         }
 
 		return dol_format_address($this, $withcountry, $sep);
@@ -596,123 +596,123 @@ 
 	{
 		global $conf, $langs;
 
-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
+		$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS
 
-		$contactid=0;
-		$thirdpartyid=0;
+		$contactid = 0;
+		$thirdpartyid = 0;
 		if ($this->element == 'societe')
 		{
-			$thirdpartyid=$this->id;
+			$thirdpartyid = $this->id;
 		}
 		if ($this->element == 'contact')
 		{
-			$contactid=$this->id;
-			$thirdpartyid=$object->fk_soc;
+			$contactid = $this->id;
+			$thirdpartyid = $object->fk_soc;
 		}
 		if ($this->element == 'user')
 		{
-			$contactid=$this->contact_id;
-			$thirdpartyid=$object->fk_soc;
+			$contactid = $this->contact_id;
+			$thirdpartyid = $object->fk_soc;
 		}
 
-		$out='<!-- BEGIN part to show address block -->';
+		$out = '<!-- BEGIN part to show address block -->';
 
-		$outdone=0;
+		$outdone = 0;
 		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 		if ($coords)
 		{
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
 				$namecoords = '';
-				if ( $this->element == 'contact' && ! empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))
+				if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))
 				{
-					$namecoords.= $object->name.'<br>';
+					$namecoords .= $object->name.'<br>';
 				}
-				$namecoords.= $this->getFullName($langs, 1).'<br>'.$coords;
+				$namecoords .= $this->getFullName($langs, 1).'<br>'.$coords;
 				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
-				$out.=img_picto($langs->trans("Address"), 'object_address.png');
-				$out.='</a> ';
+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+				$out .= img_picto($langs->trans("Address"), 'object_address.png');
+				$out .= '</a> ';
 			}
-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
+			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
 			$outdone++;
 		}
 
-		if (! in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
+		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
 				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
-                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
+                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
             }
             else {
-                $out.=($outdone?' - ':'').$this->state;
+                $out .= ($outdone ? ' - ' : '').$this->state;
             }
 			$outdone++;
 		}
 
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
-			$out.=dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->phone_pro)) {
-			$out.=dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->phone_pro)) {
+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->phone_mobile)) {
-			$out.=dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+		if (!empty($this->phone_mobile)) {
+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
 		}
-		if (! empty($this->phone_perso)) {
-			$out.=dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
+		if (!empty($this->phone_perso)) {
+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
 		}
-		if (! empty($this->office_phone)) {
-			$out.=dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->office_phone)) {
+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->user_mobile)) {
-			$out.=dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+		if (!empty($this->user_mobile)) {
+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
 		}
-		if (! empty($this->fax)) {
-			$out.=dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+		if (!empty($this->fax)) {
+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
-		if (! empty($this->office_fax)) {
-			$out.=dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+		if (!empty($this->office_fax)) {
+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
 
-		$out.='<div style="clear: both;"></div>';
-		$outdone=0;
-		if (! empty($this->email))
+		$out .= '<div style="clear: both;"></div>';
+		$outdone = 0;
+		if (!empty($this->email))
 		{
-			$out.=dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
+			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
 			$outdone++;
 		}
-		if (! empty($this->url))
+		if (!empty($this->url))
 		{
             //$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
-		    $out.=dol_print_url($this->url, '_blank', 0, 1);
+		    $out .= dol_print_url($this->url, '_blank', 0, 1);
 			$outdone++;
 		}
-		$out.='<div style="clear: both;">';
-		if (! empty($conf->socialnetworks->enabled))
+		$out .= '<div style="clear: both;">';
+		if (!empty($conf->socialnetworks->enabled))
 		{
-			if (is_array($this->socialnetworks) && count($this->socialnetworks)>0) {
+			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
 				foreach ($this->socialnetworks as $key => $value) {
-					$out.=dol_print_socialnetworks($value, $this->id, $object->id, $key);
+					$out .= dol_print_socialnetworks($value, $this->id, $object->id, $key);
 					$outdone++;
 				}
 			} else {
-				if ($this->skype) $out.=dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				if ($this->skype) $out .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
 				$outdone++;
-				if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				if ($this->jabberid) $out .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
 				$outdone++;
-				if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				if ($this->twitter) $out .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
 				$outdone++;
-				if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				if ($this->facebook) $out .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
 				$outdone++;
-				if ($this->linkedin) $out.=dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				if ($this->linkedin) $out .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
 				$outdone++;
 			}
 		}
-		$out.='</div>';
+		$out .= '</div>';
 
-		$out.='<!-- END Part to show address block -->';
+		$out .= '<!-- END Part to show address block -->';
 
 		return $out;
 	}
@@ -731,11 +731,11 @@ 
 
 		if (empty($this->last_main_doc))
 		{
-			return '';		// No way to known which document name to use
+			return ''; // No way to known which document name to use
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($this->db);
+		$ecmfile = new EcmFiles($this->db);
 		$result = $ecmfile->fetch(0, '', $this->last_main_doc);
 		if ($result < 0)
 		{
@@ -782,29 +782,29 @@ 
 			else return '';
 		}
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 		// This is to use external domain name found into config file
 		//if (DOL_URL_ROOT && ! preg_match('/\/$/', $urlwithouturlroot) && ! preg_match('/^\//', DOL_URL_ROOT)) $urlwithroot=$urlwithouturlroot.'/'.DOL_URL_ROOT;
 		//else
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-		$forcedownload=0;
+		$forcedownload = 0;
 
-		$paramlink='';
+		$paramlink = '';
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
+		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
 
 		if ($relativelink)
 		{
-			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
+			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 		else
 		{
-			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
 		// Here $ecmfile->share is defined
@@ -825,7 +825,7 @@ 
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
         // phpcs:enable
-		global $user,$langs;
+		global $user, $langs;
 
 
 		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
@@ -834,43 +834,43 @@ 
 		if ($fk_socpeople <= 0)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX", "1");
+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "1");
 			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (! $type_contact)
+		if (!$type_contact)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX", "2");
+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");
 			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -2;
 		}
 
-		$id_type_contact=0;
+		$id_type_contact = 0;
 		if (is_numeric($type_contact))
 		{
-			$id_type_contact=$type_contact;
+			$id_type_contact = $type_contact;
 		}
 		else
 		{
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-			$sql.= " AND tc.source='".$this->db->escape($source)."'";
-			$sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+			$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+			$sql .= " AND tc.source='".$this->db->escape($source)."'";
+			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
 			//print $sql;
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
+				if ($obj) $id_type_contact = $obj->rowid;
 			}
 		}
 
 		if ($id_type_contact == 0)
 		{
-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';
+			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';
 			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
 			return -3;
 		}
@@ -878,34 +878,34 @@ 
 		$datecreate = dol_now();
 
 		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
-		$TListeContacts=$this->liste_contact(-1, $source);
-		$already_added=false;
-		if (is_array($TListeContacts) && ! empty($TListeContacts)) {
-			foreach($TListeContacts as $array_contact) {
+		$TListeContacts = $this->liste_contact(-1, $source);
+		$already_added = false;
+		if (is_array($TListeContacts) && !empty($TListeContacts)) {
+			foreach ($TListeContacts as $array_contact) {
 				if ($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {
-					$already_added=true;
+					$already_added = true;
 					break;
 				}
 			}
 		}
 
-		if(!$already_added) {
+		if (!$already_added) {
 			$this->db->begin();
 
 			// Insert into database
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
-			$sql.= "'".$this->db->idate($datecreate)."'";
-			$sql.= ", 4, ". $id_type_contact;
-			$sql.= ")";
+			$sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
+			$sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";
+			$sql .= "'".$this->db->idate($datecreate)."'";
+			$sql .= ", 4, ".$id_type_contact;
+			$sql .= ")";
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				if (! $notrigger)
+				if (!$notrigger)
 				{
-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
+					$result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
 					if ($result < 0)
 					{
 						$this->db->rollback();
@@ -920,14 +920,14 @@ 
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$this->db->errno();
+					$this->error = $this->db->errno();
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
 				}
 				else
 				{
-					$this->error=$this->db->error();
+					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
@@ -947,11 +947,11 @@ 
 	{
         // phpcs:enable
 		$contacts = $objFrom->liste_contact(-1, $source);
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
 			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -973,18 +973,18 @@ 
         // phpcs:enable
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
-		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
-		$sql.= " where rowid = ".$rowid;
-		$resql=$this->db->query($sql);
+		$sql .= " statut = ".$statut;
+		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";
+		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";
+		$sql .= " where rowid = ".$rowid;
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1006,14 +1006,14 @@ 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE rowid =".$rowid;
+		$sql .= " WHERE rowid =".$rowid;
 
 		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
+				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
 				if ($result < 0) { $this->db->rollback(); return -1; }
 			}
 
@@ -1022,7 +1022,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1042,16 +1042,16 @@ 
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
-		foreach($typeContact as $key => $value)
+		foreach ($typeContact as $key => $value)
 		{
 			array_push($temp, $key);
 		}
 		$listId = implode(",", $temp);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE element_id = ".$this->id;
+		$sql .= " WHERE element_id = ".$this->id;
 		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
+			$sql .= " AND fk_c_type_contact IN (".$listId.")";
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -1060,7 +1060,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1080,49 +1080,49 @@ 
         // phpcs:enable
 		global $langs;
 
-		$tab=array();
-
-		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
-		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
-		$sql.= " WHERE ec.element_id =".$this->id;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
-		$sql.= " AND tc.active=1";
-		if ($status >= 0) $sql.= " AND ec.statut = ".$status;
-		$sql.=" ORDER BY t.lastname ASC";
+		$tab = array();
+
+		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
+		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
+		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
+		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		$sql .= " WHERE ec.element_id =".$this->id;
+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
+		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+		$sql .= " AND tc.active=1";
+		if ($status >= 0) $sql .= " AND ec.statut = ".$status;
+		$sql .= " ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if (! $list)
+				if (!$list)
 				{
-					$transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
-					$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,
-								   'nom'=>$obj->lastname,      // For backward compatibility
+					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
+					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
+					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,
+								   'nom'=>$obj->lastname, // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
 				}
 				else
 				{
-					$tab[$i]=$obj->id;
+					$tab[$i] = $obj->id;
 				}
 
 				$i++;
@@ -1132,7 +1132,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1148,16 +1148,16 @@ 
 	public function swapContactStatus($rowid)
 	{
 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
-		$sql.= " tc.code, tc.libelle";
+		$sql .= " tc.code, tc.libelle";
 		//$sql.= ", s.fk_soc";
-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
+		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
-		$sql.= " WHERE ec.rowid =".$rowid;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
+		$sql .= " WHERE ec.rowid =".$rowid;
+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
 
 		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -1168,7 +1168,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1190,39 +1190,39 @@ 
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
+		if (empty($order)) $order = 'position';
+		if ($order == 'position') $order .= ',code';
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
-		$sql.= $this->db->order($order, 'ASC');
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
+		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";
+		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";
+		$sql .= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
-				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
+				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
+				if (empty($option)) $tab[$obj->rowid] = $libelle_type;
+				else $tab[$obj->code] = $libelle_type;
 				$i++;
 			}
 			return $tab;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
 		}
@@ -1247,51 +1247,51 @@ 
 		$tab = array();
 
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position, tc.element";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 
-		$sqlWhere=array();
+		$sqlWhere = array();
 		if (!empty($element))
-			$sqlWhere[]=" tc.element='".$this->db->escape($element)."'";
+			$sqlWhere[] = " tc.element='".$this->db->escape($element)."'";
 
 		if ($activeonly == 1)
-			$sqlWhere[]=" tc.active=1"; // only the active types
+			$sqlWhere[] = " tc.active=1"; // only the active types
 
-		if (! empty($source) && $source != 'all')
-			$sqlWhere[]=" tc.source='".$this->db->escape($source)."'";
+		if (!empty($source) && $source != 'all')
+			$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
 
-		if (! empty($code))
-			$sqlWhere[]=" tc.code='".$this->db->escape($code)."'";
+		if (!empty($code))
+			$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
 
-		if (count($sqlWhere)>0) {
-			$sql .= " WHERE ". implode(' AND ', $sqlWhere);
+		if (count($sqlWhere) > 0) {
+			$sql .= " WHERE ".implode(' AND ', $sqlWhere);
 		}
 
-		$sql.= $this->db->order('tc.element, tc.position', 'ASC');
+		$sql .= $this->db->order('tc.element, tc.position', 'ASC');
 
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
 				while ($obj = $this->db->fetch_object($resql)) {
-					if (strpos($obj->element, 'project')!==false) {
-						$element='projet';
-					} elseif($obj->element=='contrat') {
-						$element='contract';
-					} elseif(strpos($obj->element, 'supplier')!==false && $obj->element!='supplier_proposal') {
-						$element='fournisseur';
-					} elseif(strpos($obj->element, 'supplier')!==false && $obj->element!='supplier_proposal') {
-						$element='fournisseur';
+					if (strpos($obj->element, 'project') !== false) {
+						$element = 'projet';
+					} elseif ($obj->element == 'contrat') {
+						$element = 'contract';
+					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
+						$element = 'fournisseur';
+					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
+						$element = 'fournisseur';
 					} else {
-						$element=$obj->element;
+						$element = $obj->element;
 					}
 					if ($conf->{$element}->enabled) {
-						$libelle_element = $langs->trans('ContactDefault_' . $obj->element);
-						$transkey = "TypeContact_" . $this->element . "_" . $source . "_" . $obj->code;
+						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
+						$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
 						if (empty($option))
-							$tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
-						else $tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
+							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
+						else $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
 					}
 				}
 			}
@@ -1299,7 +1299,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return null;
 		}
 	}
@@ -1319,49 +1319,49 @@ 
 	{
 		global $conf;
 
-		$result=array();
-		$i=0;
+		$result = array();
+		$i = 0;
 		//cas particulier pour les expeditions
-		if ($this->element=='shipping' && $this->origin_id != 0) {
-			$id=$this->origin_id;
-			$element='commande';
-		} elseif ($this->element=='reception' && $this->origin_id != 0) {
-			$id=$this->origin_id;
-			$element='order_supplier';
+		if ($this->element == 'shipping' && $this->origin_id != 0) {
+			$id = $this->origin_id;
+			$element = 'commande';
+		} elseif ($this->element == 'reception' && $this->origin_id != 0) {
+			$id = $this->origin_id;
+			$element = 'order_supplier';
 		} else {
-			$id=$this->id;
-			$element=$this->element;
+			$id = $this->id;
+			$element = $this->element;
 		}
 
 		$sql = "SELECT ec.fk_socpeople";
-		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE ec.element_id = ".$id;
-		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
-		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
-		$sql.= " AND tc.element = '".$element."'";
-		$sql.= " AND tc.source = '".$source."'";
-		if ($code) $sql.= " AND tc.code = '".$code."'";
-		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
+		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
+		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
+		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE ec.element_id = ".$id;
+		$sql .= " AND ec.fk_socpeople = c.rowid";
+		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
+		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
+		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
+		$sql .= " AND tc.element = '".$element."'";
+		$sql .= " AND tc.source = '".$source."'";
+		if ($code) $sql .= " AND tc.code = '".$code."'";
+		$sql .= " AND tc.active = 1";
+		if ($status) $sql .= " AND ec.statut = ".$status;
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$result[$i]=$obj->fk_socpeople;
+				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return null;
 		}
 
@@ -1378,13 +1378,13 @@ 
 	public function fetch_contact($contactid = null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+		if (empty($contactid)) $contactid = $this->contactid;
 
 		if (empty($contactid)) return 0;
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
-		$result=$contact->fetch($contactid);
+		$result = $contact->fetch($contactid);
 		$this->contact = $contact;
 		return $result;
 	}
@@ -1404,7 +1404,7 @@ 
 		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
 			return 0;
 
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
 		if ($force_thirdparty_id)
@@ -1467,7 +1467,7 @@ 
 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
-		$idtype=$this->barcode_type;
+		$idtype = $this->barcode_type;
 		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
@@ -1480,8 +1480,8 @@ 
 			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-				$sql.= " WHERE rowid = ".$idtype;
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+				$sql .= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
@@ -1514,13 +1514,13 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
+		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
 		if (empty($this->fk_project)) return 0;
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
 
-		$this->projet = $project;	// deprecated
+		$this->projet = $project; // deprecated
 		$this->project = $project;
 		return $result;
 	}
@@ -1556,7 +1556,7 @@ 
 	{
         // phpcs:enable
 		$user = new User($this->db);
-		$result=$user->fetch($userid);
+		$result = $user->fetch($userid);
 		$this->user = $user;
 		return $result;
 	}
@@ -1594,14 +1594,14 @@ 
 	{
 		global $conf;
 
-		$result=false;
+		$result = false;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
-		$sql.= " WHERE ".$field." = '".$key."'";
-		if (! empty($element)) {
-			$sql.= " AND entity IN (".getEntity($element).")";
+		$sql .= " WHERE ".$field." = '".$key."'";
+		if (!empty($element)) {
+			$sql .= " AND entity IN (".getEntity($element).")";
 		} else {
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " AND entity = ".$conf->entity;
 		}
 
 		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
@@ -1628,10 +1628,10 @@ 
 	 */
 	public function getValueFrom($table, $id, $field)
 	{
-		$result=false;
+		$result = false;
 		if (!empty($id) && !empty($field) && !empty($table)) {
 			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE rowid = ".$id;
+			$sql .= " WHERE rowid = ".$id;
 
 			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1662,34 +1662,34 @@ 
 	 */
 	public function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif')
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
+		if (empty($table)) 	  $table = $this->table_element;
+		if (empty($id))    	  $id = $this->id;
+		if (empty($format))   $format = 'text';
+		if (empty($id_field)) $id_field = 'rowid';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
+		if ($table == 'product' && $field == 'note_private') $field = 'note';
 		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		elseif ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		elseif ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
+		elseif ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
+		elseif ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
 
 		if ($fk_user_field)
 		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
+			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
 		}
 
-		$sql.= " WHERE ".$id_field." = ".$id;
+		$sql .= " WHERE ".$id_field." = ".$id;
 
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1706,11 +1706,11 @@ 
 				{
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
+				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
 				if ($result < 0) $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				if (property_exists($this, $field)) $this->$field = $value;
 				$this->db->commit();
@@ -1724,7 +1724,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1744,7 +1744,7 @@ 
         // phpcs:enable
 		global $conf, $user;
 
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
@@ -1761,45 +1761,45 @@ 
 		if ($this->element == 'societe') $alias = 'te';
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
-		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if (!empty($filter))
+		{
+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			$sql .= $filter;
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql .= " AND te.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
+					$sql .= " AND ug.fk_user = te.rowid";
+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";
 				}
 			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 		$row = $this->db->fetch_row($result);
@@ -1807,46 +1807,46 @@ 
 
 
 		$sql = "SELECT MIN(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
-		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
-		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if (!empty($filter))
+		{
+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			$sql .= $filter;
+		}
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql .= " AND te.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
+					$sql .= " AND ug.fk_user = te.rowid";
+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";
 				}
 			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -2;
 		}
 		$row = $this->db->fetch_row($result);
@@ -1867,7 +1867,7 @@ 
 	{
 		$contactAlreadySelected = array();
 		$tab = $this->liste_contact(-1, $source);
-		$num=count($tab);
+		$num = count($tab);
 		$i = 0;
 		while ($i < $num)
 		{
@@ -1887,30 +1887,30 @@ 
 	 */
 	public function setProject($projectid)
 	{
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if (! empty($this->fields['fk_project']))		// Common case
+		if (!empty($this->fields['fk_project']))		// Common case
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
-			$sql.= ' WHERE rowid = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
+			else $sql .= ' SET fk_project = NULL';
+			$sql .= ' WHERE rowid = '.$this->id;
 		}
 		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
-			$sql.= ' WHERE id = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
+			else $sql .= ' SET fk_project = NULL';
+			$sql .= ' WHERE id = '.$this->id;
 		}
 		else											// Special case for old architecture objects
 		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
-			$sql.= ' WHERE rowid = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
+			else $sql .= ' SET fk_projet = NULL';
+			$sql .= ' WHERE rowid = '.$this->id;
 		}
 
 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
@@ -1956,14 +1956,14 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -1997,14 +1997,14 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2037,12 +2037,12 @@ 
 					foreach ($this->lines as &$line)
 					{
 						// Amounts in company currency will be recalculated
-						if($mode == 1) {
+						if ($mode == 1) {
 							$line->subprice = 0;
 						}
 
 						// Amounts in foreign currency will be recalculated
-						if($mode == 2) {
+						if ($mode == 2) {
 							$line->multicurrency_subprice = 0;
 						}
 
@@ -2050,14 +2050,14 @@ 
 							case 'propal':
 								$this->updateline(
 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,
 									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
 							case 'commande':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,
 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
 									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
@@ -2065,7 +2065,7 @@ 
 								break;
 							case 'facture':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,
 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
 									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice
@@ -2074,21 +2074,21 @@ 
 							case 'supplier_proposal':
 								$this->updateline(
 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,
 									$line->ref_fourn, $line->multicurrency_subprice
 								);
 								break;
 							case 'order_supplier':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
 							case 'invoice_supplier':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
 									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
@@ -2105,14 +2105,14 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2142,20 +2142,20 @@ 
 				$this->cond_reglement_id = $id;
 				// for supplier
 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
-				$this->cond_reglement = $id;	// for compatibility
+				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			}
 			else
 			{
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2186,14 +2186,14 @@ 
 	        else
 	        {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-	            $this->error=$this->db->error();
+	            $this->error = $this->db->error();
 	            return -1;
 	        }
 	    }
 	    else
 	    {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
-	        $this->error='Status of the object is incompatible '.$this->statut;
+	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
 	    }
 	}
@@ -2211,7 +2211,7 @@ 
 		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
-		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
 		if ($this->db->query($sql))
 		{
@@ -2220,7 +2220,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
 		}
@@ -2240,25 +2240,25 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
 		$error = 0;
 
-		if (! $this->table_element) {
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$this->db->begin();
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
+		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_shipping_method = ".$shipping_method_id;
+		$sql .= " WHERE rowid=".$this->id;
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
 			$this->error = $this->db->lasterror();
 			$error++;
@@ -2266,8 +2266,8 @@ 
 			if (!$notrigger)
 			{
 				// Call trigger
-				$this->context=array('shippingmethodupdate'=>1);
-				$result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+				$this->context = array('shippingmethodupdate'=>1);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -2277,7 +2277,7 @@ 
 			$this->db->rollback();
 			return -1;
 		} else {
-			$this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
+			$this->shipping_method_id = ($shipping_method_id == 'NULL') ?null:$shipping_method_id;
 			$this->db->commit();
 			return 1;
 		}
@@ -2292,23 +2292,23 @@ 
 	 */
 	public function setWarehouse($warehouse_id)
 	{
-		if (! $this->table_element) {
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
+		if ($warehouse_id < 0) $warehouse_id = 'NULL';
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_warehouse = ".$warehouse_id;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_warehouse = ".$warehouse_id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		if ($this->db->query($sql)) {
-			$this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;
+			$this->warehouse_id = ($warehouse_id == 'NULL') ?null:$warehouse_id;
 			return 1;
 		} else {
 			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return 0;
 		}
 	}
@@ -2323,25 +2323,25 @@ 
 	 */
 	public function setDocModel($user, $modelpdf)
 	{
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
-		$newmodelpdf=dol_trunc($modelpdf, 255);
+		$newmodelpdf = dol_trunc($modelpdf, 255);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
 		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
 
 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->modelpdf=$modelpdf;
+			$this->modelpdf = $modelpdf;
 			return 1;
 		}
 		else
@@ -2364,25 +2364,25 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
 		$error = 0;
 
-		if (! $this->table_element) {
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 		$this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
+		if ($fk_account < 0) $fk_account = 'NULL';
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_account = ".$fk_account;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_account = ".$fk_account;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
@@ -2393,8 +2393,8 @@ 
 			if (!$notrigger)
 			{
 				// Call trigger
-				$this->context=array('bankaccountupdate'=>1);
-				$result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+				$this->context = array('bankaccountupdate'=>1);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -2406,7 +2406,7 @@ 
 		}
 		else
 		{
-			$this->fk_account = ($fk_account=='NULL')?null:$fk_account;
+			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
 			$this->db->commit();
 			return 1;
 		}
@@ -2428,23 +2428,23 @@ 
 	public function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)
 	{
         // phpcs:enable
-		if (! $this->table_element_line)
+		if (!$this->table_element_line)
 		{
 			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);
 			return -1;
 		}
-		if (! $this->fk_element)
+		if (!$this->fk_element)
 		{
 			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		// Count number of lines to reorder (according to choice $renum)
-		$nl=0;
+		$nl = 0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
+		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
+		if (!$renum) $sql .= ' AND rang = 0';
+		if ($renum) $sql .= ' AND rang <> 0';
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2458,28 +2458,28 @@ 
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
 			// counter that parents.
-			$rows=array();
+			$rows = array();
 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$i=0;
+				$i = 0;
 				$num = $this->db->num_rows($resql);
 				while ($i < $num)
 				{
 					$row = $this->db->fetch_row($resql);
-					$rows[] = $row[0];	// Add parent line into array rows
+					$rows[] = $row[0]; // Add parent line into array rows
 					$childrens = $this->getChildrenOfLine($row[0]);
-					if (! empty($childrens))
+					if (!empty($childrens))
 					{
-						foreach($childrens as $child)
+						foreach ($childrens as $child)
 						{
 							array_push($rows, $child);
 						}
@@ -2488,11 +2488,11 @@ 
 				}
 
 				// Now we set a new number for each lines (parent and children with children included into parent tree)
-				if (! empty($rows))
+				if (!empty($rows))
 				{
-					foreach($rows as $key => $row)
+					foreach ($rows as $key => $row)
 					{
-						$this->updateRangOfLine($row, ($key+1));
+						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
 			}
@@ -2512,18 +2512,18 @@ 
 	 */
 	public function getChildrenOfLine($id)
 	{
-		$rows=array();
+		$rows = array();
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND fk_parent_line = '.$id;
-		$sql.= ' ORDER BY rang ASC';
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' AND fk_parent_line = '.$id;
+		$sql .= ' ORDER BY rang ASC';
 
 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$i=0;
+			$i = 0;
 			$num = $this->db->num_rows($resql);
 			while ($i < $num)
 			{
@@ -2588,14 +2588,14 @@ 
 	 */
 	public function updateRangOfLine($rowid, $rang)
 	{
-		$fieldposition = 'rang';	// @TODO Rename 'rang' into 'position'
+		$fieldposition = 'rang'; // @TODO Rename 'rang' into 'position'
 		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-		$sql.= ' WHERE rowid = '.$rowid;
+		$sql .= ' WHERE rowid = '.$rowid;
 
 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			dol_print_error($this->db);
 		}
@@ -2612,9 +2612,9 @@ 
 	{
         // phpcs:enable
 		$num = count($rows);
-		for ($i = 0 ; $i < $num ; $i++)
+		for ($i = 0; $i < $num; $i++)
 		{
-			$this->updateRangOfLine($rows[$i], ($i+1));
+			$this->updateRangOfLine($rows[$i], ($i + 1));
 		}
 	}
 
@@ -2632,14 +2632,14 @@ 
 			$fieldposition = 'rang';
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang - 1);
-			if ($this->db->query($sql) )
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND rang = '.($rang - 1);
+			if ($this->db->query($sql))
 			{
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
+				$sql .= ' WHERE rowid = '.$rowid;
+				if (!$this->db->query($sql))
 				{
 					dol_print_error($this->db);
 				}
@@ -2667,13 +2667,13 @@ 
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang+1);
-			if ($this->db->query($sql) )
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND rang = '.($rang + 1);
+			if ($this->db->query($sql))
 			{
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);
+				$sql .= ' WHERE rowid = '.$rowid;
+				if (!$this->db->query($sql))
 				{
 					dol_print_error($this->db);
 				}
@@ -2694,7 +2694,7 @@ 
 	public function getRangOfLine($rowid)
 	{
 		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid ='.$rowid;
+		$sql .= ' WHERE rowid ='.$rowid;
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2714,8 +2714,8 @@ 
 	public function getIdOfLine($rang)
 	{
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND rang = '.$rang;
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' AND rang = '.$rang;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2738,15 +2738,15 @@ 
 		if ($fk_parent_line)
 		{
 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND fk_parent_line = '.$fk_parent_line;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$row = $this->db->fetch_row($resql);
-				if (! empty($row[0]))
+				if (!empty($row[0]))
 				{
 					return $row[0];
 				}
@@ -2760,7 +2760,7 @@ 
 		else
 		{
 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2782,15 +2782,15 @@ 
 	public function update_ref_ext($ref_ext)
 	{
         // phpcs:enable
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
+		$sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2800,7 +2800,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2818,26 +2818,26 @@ 
         // phpcs:enable
 		global $user;
 
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
-			$this->error='update_note was called on objet with property table_element not defined';
+			$this->error = 'update_note was called on objet with property table_element not defined';
 			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if (! in_array($suffix, array('','_public','_private')))
+		if (!in_array($suffix, array('', '_public', '_private')))
 		{
-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
+			$this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
 			return -2;
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
+		if ($this->table_element == 'product') $suffix = '';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
-		$sql.= " WHERE rowid =". $this->id;
+		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
+		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
+		$sql .= " WHERE rowid =".$this->id;
 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2846,14 +2846,14 @@ 
 			elseif ($suffix == '_private') $this->note_private = $note;
 			else
 			{
-				$this->note = $note;      // deprecated
+				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -2904,8 +2904,8 @@ 
 		elseif ($this->element == 'supplier_proposal')
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
 
-		if (! empty($MODULE)) {
-			if (! empty($conf->global->$MODULE)) {
+		if (!empty($MODULE)) {
+			if (!empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
 					if ($conf->$mod->enabled)
@@ -2916,44 +2916,44 @@ 
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility
 
-		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+		$forcedroundingmode = $roundingadjust;
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
 
-		$error=0;
+		$error = 0;
 
 		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
 
 		// Define constants to find lines to sum
-		$fieldtva='total_tva';
-		$fieldlocaltax1='total_localtax1';
-		$fieldlocaltax2='total_localtax2';
-		$fieldup='subprice';
+		$fieldtva = 'total_tva';
+		$fieldlocaltax1 = 'total_localtax1';
+		$fieldlocaltax2 = 'total_localtax2';
+		$fieldup = 'subprice';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$fieldtva='tva';
-			$fieldup='pu_ht';
+			$fieldtva = 'tva';
+			$fieldup = 'pu_ht';
 		}
 		if ($this->element == 'expensereport')
 		{
-			$fieldup='value_unit';
+			$fieldup = 'value_unit';
 		}
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
-		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
+			if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+			$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
-			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+			$product_field = 'product_type';
+			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field
+			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';
 		}
-		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
+		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
 		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2967,7 +2967,7 @@ 
 			$total_ht_by_vats  = array();
 			$total_tva_by_vats = array();
 			$total_ttc_by_vats = array();
-			$this->multicurrency_total_ht	= 0;
+			$this->multicurrency_total_ht = 0;
 			$this->multicurrency_total_tva	= 0;
 			$this->multicurrency_total_ttc	= 0;
 
@@ -2978,54 +2978,54 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
-				$parameters=array('fk_element' => $obj->rowid);
+				$parameters = array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
-					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
-					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
+					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
+					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
+					$diff = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
 					if ($diff)
 					{
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db, 'Failed to update line');
+								$resqlfix = $this->db->query($sqlfix);
+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
 								$obj->total_tva = $tmpcal[1];
 								$obj->total_ttc = $tmpcal[2];
 						//
 					}
 				}
 
-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail
+				$this->total_ht        += $obj->total_ht; // The field visible at end of line detail
 				$this->total_tva       += $obj->total_tva;
 				$this->total_localtax1 += $obj->total_localtax1;
 				$this->total_localtax2 += $obj->total_localtax2;
 				$this->total_ttc       += $obj->total_ttc;
-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail
+				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht; // The field visible at end of line detail
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
 				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
+					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
 					{
 						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db, 'Failed to update line');
+								$resqlfix = $this->db->query($sqlfix);
+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -3037,11 +3037,11 @@ 
 			}
 
 			// Add revenue stamp to total
-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;
-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;
+			$this->total_ttc += isset($this->revenuestamp) ? $this->revenuestamp : 0;
+			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;
 
 			// Situations totals
-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )
+			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
 			{
 				$prev_sits = $this->get_prev_sits();
 
@@ -3060,17 +3060,17 @@ 
 			$this->db->free($resql);
 
 			// Now update global field total_ht, total_ttc and tva
-			$fieldht='total_ht';
-			$fieldtva='tva';
-			$fieldlocaltax1='localtax1';
-			$fieldlocaltax2='localtax2';
-			$fieldttc='total_ttc';
+			$fieldht = 'total_ht';
+			$fieldtva = 'tva';
+			$fieldlocaltax1 = 'localtax1';
+			$fieldlocaltax2 = 'localtax2';
+			$fieldttc = 'total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
+			if ($this->element == 'propal')                                                $fieldttc = 'total';
+			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';
+			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';
 
 			if (empty($nodatabaseupdate))
 			{
@@ -3087,16 +3087,16 @@ 
 
 
 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql)
+				$resql = $this->db->query($sql);
+				if (!$resql)
 				{
 					$error++;
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				return 1;
 			}
@@ -3124,27 +3124,27 @@ 
 	public function add_object_linked($origin = null, $origin_id = null)
 	{
 		// phpcs:enable
-		$origin = (! empty($origin) ? $origin : $this->origin);
-		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
+		$origin = (!empty($origin) ? $origin : $this->origin);
+		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-		if ($origin == 'supplierorder') $origin='order_supplier';
+		if ($origin == 'order') $origin = 'commande';
+		if ($origin == 'invoice') $origin = 'facture';
+		if ($origin == 'invoice_template') $origin = 'facturerec';
+		if ($origin == 'supplierorder') $origin = 'order_supplier';
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-		$sql.= "fk_source";
-		$sql.= ", sourcetype";
-		$sql.= ", fk_target";
-		$sql.= ", targettype";
-		$sql.= ") VALUES (";
-		$sql.= $origin_id;
-		$sql.= ", '".$this->db->escape($origin)."'";
-		$sql.= ", ".$this->id;
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ")";
+		$sql .= "fk_source";
+		$sql .= ", sourcetype";
+		$sql .= ", fk_target";
+		$sql .= ", targettype";
+		$sql .= ") VALUES (";
+		$sql .= $origin_id;
+		$sql .= ", '".$this->db->escape($origin)."'";
+		$sql .= ", ".$this->id;
+		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -3154,7 +3154,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
 		}
@@ -3186,29 +3186,29 @@ 
 	{
 		global $conf;
 
-		$this->linkedObjectsIds=array();
-		$this->linkedObjects=array();
+		$this->linkedObjectsIds = array();
+		$this->linkedObjects = array();
 
-		$justsource=false;
-		$justtarget=false;
-		$withtargettype=false;
-		$withsourcetype=false;
+		$justsource = false;
+		$justtarget = false;
+		$withtargettype = false;
+		$withsourcetype = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))
 		{
-			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
+			$justsource = true; // the source (id and type) is a search criteria
+			if (!empty($targettype)) $withtargettype = true;
 		}
-		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
+		if (!empty($targetid) && !empty($targettype) && empty($sourceid))
 		{
-			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
+			$justtarget = true; // the target (id and type) is a search criteria
+			if (!empty($sourcetype)) $withsourcetype = true;
 		}
 
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
+		$targetid = (!empty($targetid) ? $targetid : $this->id);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$targettype = (!empty($targettype) ? $targettype : $this->element);
 
 		/*if (empty($sourceid) && empty($targetid))
 		 {
@@ -3218,25 +3218,25 @@ 
 
 		// Links between objects are stored in table element_element
 		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
-		$sql.= " WHERE ";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';
+		$sql .= " WHERE ";
 		if ($justsource || $justtarget)
 		{
 			if ($justsource)
 			{
-				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
+				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
+				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
 			}
 			elseif ($justtarget)
 			{
-				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
+				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
 			}
 		}
 		else
 		{
-			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
-			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
+			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
+			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
 		$sql .= ' ORDER BY '.$orderby;
 
@@ -3253,31 +3253,31 @@ 
 				{
 					if ($justsource)
 					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
 					elseif ($justtarget)
 					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				else
 				{
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
 					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)
 					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				$i++;
 			}
 
-			if (! empty($this->linkedObjectsIds))
+			if (!empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
@@ -3290,31 +3290,31 @@ 
 
 					$classpath = $element.'/class';
 					// To work with non standard classpath or module name
-					if ($objecttype == 'facture')			{
+					if ($objecttype == 'facture') {
 						$classpath = 'compta/facture/class';
 					}
-					elseif ($objecttype == 'facturerec')			{
+					elseif ($objecttype == 'facturerec') {
 						$classpath = 'compta/facture/class'; $module = 'facture';
 					}
-					elseif ($objecttype == 'propal')			{
+					elseif ($objecttype == 'propal') {
 						$classpath = 'comm/propal/class';
 					}
-					elseif ($objecttype == 'supplier_proposal')			{
+					elseif ($objecttype == 'supplier_proposal') {
 						$classpath = 'supplier_proposal/class';
 					}
-					elseif ($objecttype == 'shipping')			{
+					elseif ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
 					}
-					elseif ($objecttype == 'delivery')			{
+					elseif ($objecttype == 'delivery') {
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
 					}
-					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
 					}
-					elseif ($objecttype == 'fichinter')			{
+					elseif ($objecttype == 'fichinter') {
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
 					}
-					elseif ($objecttype == 'subscription')			{
+					elseif ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
 
@@ -3327,16 +3327,16 @@ 
 					elseif ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
 					}
-					elseif ($objecttype == 'order_supplier')   {
+					elseif ($objecttype == 'order_supplier') {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
 					}
-					elseif ($objecttype == 'supplier_proposal')   {
+					elseif ($objecttype == 'supplier_proposal') {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
 					}
-					elseif ($objecttype == 'facturerec')   {
+					elseif ($objecttype == 'facturerec') {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
 					}
-					elseif ($objecttype == 'subscription')   {
+					elseif ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 
@@ -3349,7 +3349,7 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
 									$ret = $object->fetch($objectid);
@@ -3388,26 +3388,26 @@ 
 	 */
 	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')
 	{
-		$updatesource=false;
-		$updatetarget=false;
+		$updatesource = false;
+		$updatetarget = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
+		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
 		{
-			$sql.= "fk_source = ".$sourceid;
-			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
-			$sql.= " WHERE fk_target = ".$this->id;
-			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
+			$sql .= "fk_source = ".$sourceid;
+			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
+			$sql .= " WHERE fk_target = ".$this->id;
+			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
 		}
 		elseif ($updatetarget)
 		{
-			$sql.= "fk_target = ".$targetid;
-			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
-			$sql.= " WHERE fk_source = ".$this->id;
-			$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
+			$sql .= "fk_target = ".$targetid;
+			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
+			$sql .= " WHERE fk_source = ".$this->id;
+			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";
 		}
 
 		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
@@ -3417,7 +3417,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -3435,40 +3435,40 @@ 
 	 */
 	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')
 	{
-		$deletesource=false;
-		$deletetarget=false;
+		$deletesource = false;
+		$deletetarget = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
+		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
 
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$targetid = (!empty($targetid) ? $targetid : $this->id);
+		$targettype = (!empty($targettype) ? $targettype : $this->element);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
-		$sql.= " WHERE";
+		$sql .= " WHERE";
 		if ($rowid > 0)
 		{
-			$sql.=" rowid = ".$rowid;
+			$sql .= " rowid = ".$rowid;
 		}
 		else
 		{
 			if ($deletesource)
 			{
-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
+				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
 			}
 			elseif ($deletetarget)
 			{
-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
+				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
 			}
 			else
 			{
-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
-				$sql.= " OR";
-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
+				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
+				$sql .= " OR";
+				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
 			}
 		}
 
@@ -3479,8 +3479,8 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->error;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
 			return -1;
 		}
 	}
@@ -3496,28 +3496,28 @@ 
 	 */
 	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
+		$savElementId = $elementId; // To be used later to know if we were using the method using the id of this or not.
 
-		$elementId = (!empty($elementId)?$elementId:$this->id);
-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);
+		$elementId = (!empty($elementId) ? $elementId : $this->id);
+		$elementTable = (!empty($elementType) ? $elementType : $this->table_element);
 
 		$this->db->begin();
 
-		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+		$fieldstatus = "fk_statut";
+		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
+		if ($elementTable == 'mailing') $fieldstatus = "statut";
+		if ($elementTable == 'cronjob') $fieldstatus = "status";
+		if ($elementTable == 'user') $fieldstatus = "statut";
+		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
+		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
-		$sql.= " SET ".$fieldstatus." = ".$status;
+		$sql .= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid=".$elementId;
+		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -3527,27 +3527,27 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';
+				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';
+				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
 			}
 
 			if ($trigkey)
 			{
 				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers($trigkey, $this, $user, $langs, $conf);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($this->db);
+				$result = $interface->run_triggers($trigkey, $this, $user, $langs, $conf);
 				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
+					$error++; $this->errors = $interface->errors;
 				}
 				// Fin appel triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 
@@ -3568,7 +3568,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -3587,16 +3587,16 @@ 
 		global $conf;
 
 		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
 
 		$sql = "SELECT rowid, canvas";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity($this->element).")";
+		if (!empty($id))  $sql .= " AND rowid = ".$id;
+		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3604,7 +3604,7 @@ 
 			$obj = $this->db->fetch_object($resql);
 			if ($obj)
 			{
-				$this->canvas   = $obj->canvas;
+				$this->canvas = $obj->canvas;
 				return 1;
 			}
 			else return 0;
@@ -3626,7 +3626,7 @@ 
 	public function getSpecialCode($lineid)
 	{
 		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid = '.$lineid;
+		$sql .= ' WHERE rowid = '.$lineid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3646,10 +3646,10 @@ 
 	{
 		global $langs;
 
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) $id = $this->id;
 
 		// Check parameters
-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)
 		{
 			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');
 			return -1;
@@ -3657,24 +3657,24 @@ 
 
 		$arraytoscan = $this->childtables;
 		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)
-		$tmparray=array_keys($this->childtables);
+		$tmparray = array_keys($this->childtables);
 		if (is_numeric($tmparray[0]))
 		{
 			$arraytoscan = array_flip($this->childtables);
 		}
 
 		// Test if child exists
-		$haschild=0;
-		foreach($arraytoscan as $table => $elementname)
+		$haschild = 0;
+		foreach ($arraytoscan as $table => $elementname)
 		{
 			//print $id.'-'.$table.'-'.$elementname.'<br>';
 			// Check if third party can be deleted
 			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE ".$this->fk_element." = ".$id;
-			$resql=$this->db->query($sql);
+			$sql .= " WHERE ".$this->fk_element." = ".$id;
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$obj=$this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 				if ($obj->nb > 0)
 				{
 					$langs->load("errors");
@@ -3682,24 +3682,24 @@ 
 					$haschild += $obj->nb;
 					if (is_numeric($elementname))	// old usage
 					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
 					else	// new usage: $elementname=Translation key
 					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
-					break;    // We found at least one, we stop here
+					break; // We found at least one, we stop here
 				}
 			}
 			else
 			{
-				$this->errors[]=$this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
 		}
 		if ($haschild > 0)
 		{
-			$this->errors[]="ErrorRecordHasChildren";
+			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
 		}
 		else return 0;
@@ -3713,16 +3713,16 @@ 
 	 */
 	public function hasProductsOrServices($predefined = -1)
 	{
-		$nb=0;
+		$nb = 0;
 
-		foreach($this->lines as $key => $val)
+		foreach ($this->lines as $key => $val)
 		{
-			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
+			$qualified = 0;
+			if ($predefined == -1) $qualified = 1;
+			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
+			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
 			if ($qualified) $nb++;
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
@@ -3736,24 +3736,24 @@ 
 	 */
 	public function getTotalDiscount()
 	{
-		$total_discount=0.00;
+		$total_discount = 0.00;
 
 		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
+		$sql .= " WHERE ".$this->fk_element." = ".$this->id;
 
 		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
 				$pu_ht = $obj->pu_ht;
-				$qty= $obj->qty;
+				$qty = $obj->qty;
 				$total_ht = $obj->total_ht;
 
 				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
@@ -3787,18 +3787,18 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
-				$totalOrdered+=$line->qty_asked;    // defined for shipment only
+				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+				$totalOrdered += $line->qty_asked; // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
-				$totalToShip+=$line->qty_shipped;   // defined for shipment only
+				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+				$totalToShip += $line->qty_shipped; // defined for shipment only
 			}
 			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
-				if (empty($totalToShip)) $totalToShip=0;
-				$totalToShip+=$line->qty;   // defined for reception only
+				if (empty($totalToShip)) $totalToShip = 0;
+				$totalToShip += $line->qty; // defined for reception only
 			}
 
 			// Define qty, weight, volume, weight_units, volume_units
@@ -3811,27 +3811,27 @@ 
 			}
 
 			$weight = $line->weight ? $line->weight : 0;
-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;
+            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
 			$volume = $line->volume ? $line->volume : 0;
-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;
+			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;
 
-			$weight_units=$line->weight_units;
-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;
-			$volume_units=$line->volume_units;
-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;
+			$weight_units = $line->weight_units;
+			($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;
+			$volume_units = $line->volume_units;
+			($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;
 
-			$weightUnit=0;
-			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+			$weightUnit = 0;
+			$volumeUnit = 0;
+			if (!empty($weight_units)) $weightUnit = $weight_units;
+			if (!empty($volume_units)) $volumeUnit = $volume_units;
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
 			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
-				$trueWeightUnit=pow(10, $weightUnit);
+				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
 			}
 			else {
@@ -3845,19 +3845,19 @@ 
 					$totalWeight += $weight * $qty * $trueWeightUnit;
 				}
 				else {
-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
 			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
-				$trueVolumeUnit=pow(10, $volumeUnit);
+				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
 			}
 			else
 			{
-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
+				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
 
@@ -3874,17 +3874,17 @@ 
 	{
 		$this->db->begin();
 
-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);
+		$extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -3919,7 +3919,7 @@ 
 			}
 		}
 
-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;
+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;
 
 		return $out;
 	}
@@ -3965,11 +3965,11 @@ 
 		if ($this->id && $this->table_element)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->fk_incoterms = $id_incoterm;
@@ -4011,11 +4011,11 @@ 
 	 */
 	public function formAddObjectLine($dateSelector, $seller, $buyer, $defaulttpldir = '/core/tpl')
 	{
-		global $conf,$user,$langs,$object,$hookmanager,$extrafields;
-		global $form,$bcnd,$var;
+		global $conf, $user, $langs, $object, $hookmanager, $extrafields;
+		global $form, $bcnd, $var;
 
 		// Line extrafield
-		if (! is_object($extrafields))
+		if (!is_object($extrafields))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
@@ -4024,8 +4024,8 @@ 
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach($dirtpls as $module => $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+		foreach ($dirtpls as $module => $reldir)
 		{
 			if (!empty($module))
 			{
@@ -4037,9 +4037,9 @@ 
 			}
 
 			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
+				$res = @include $tpl;
 			} else {
-				$res=include $tpl; // for debug
+				$res = include $tpl; // for debug
 			}
 			if ($res) break;
 		}
@@ -4071,13 +4071,13 @@ 
 		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
 
 		// Define usemargins
-		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element, array('facture','facturerec','propal','commande'))) $usemargins=1;
+		$usemargins = 0;
+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
 
 		$num = count($this->lines);
 
 		// Line extrafield
-		if (! is_object($extrafields))
+		if (!is_object($extrafields))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
@@ -4090,8 +4090,8 @@ 
 		{
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach($dirtpls as $module => $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir)
 			{
 				if (!empty($module))
 				{
@@ -4102,16 +4102,16 @@ 
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
 		}
 
 		$var = true;
-		$i	 = 0;
+		$i = 0;
 
 		print "<tbody>\n";
 		foreach ($this->lines as $line)
@@ -4124,13 +4124,13 @@ 
 			{
 				if (empty($line->fk_parent_line))
 				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'table_element_line'=>$line->table_element);
-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
+					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 				else
 				{
-					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$parameters = array('line'=>$line, 'var'=>$var, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
+					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 			}
 			if (empty($reshook))
@@ -4162,21 +4162,21 @@ 
 	 */
 	public function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafields = null, $defaulttpldir = '/core/tpl')
 	{
-		global $conf,$langs,$user,$object,$hookmanager;
-		global $form,$bc,$bcdd;
-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !
+		global $conf, $langs, $user, $object, $hookmanager;
+		global $form, $bc, $bcdd;
+		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
 
 		$object_rights = $this->getRights();
 
-		$element=$this->element;
+		$element = $this->element;
 
-		$text=''; $description=''; $type=0;
+		$text = ''; $description = ''; $type = 0;
 
 		// Show product and description
-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
+		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
+		if (!empty($line->date_start)) $type = 1; // deprecated
+		if (!empty($line->date_end)) $type = 1; // deprecated
 
 		// Ligne en mode visu
 		if ($action != 'editline' || $selected != $line->id)
@@ -4189,12 +4189,12 @@ 
 
 				$product_static->ref = $line->ref; //can change ref in hook
 				$product_static->label = $line->label; //can change label in hook
-				$text=$product_static->getNomUrl(1);
+				$text = $product_static->getNomUrl(1);
 
 				// Define output language and label
-				if (! empty($conf->global->MAIN_MULTILANGS))
+				if (!empty($conf->global->MAIN_MULTILANGS))
 				{
-					if (property_exists($this, 'socid') && ! is_object($this->thirdparty))
+					if (property_exists($this, 'socid') && !is_object($this->thirdparty))
 					{
 						dol_print_error('', 'Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
 						return;
@@ -4204,32 +4204,32 @@ 
 					$prod->fetch($line->fk_product);
 
 					$outputlangs = $langs;
-					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang=$this->thirdparty->default_lang;		// To use language of customer
-					if (! empty($newlang))
+					$newlang = '';
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang = $this->thirdparty->default_lang; // To use language of customer
+					if (!empty($newlang))
 					{
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
 				}
 				else
 				{
 					$label = $line->product_label;
 				}
 
-				$text.= ' - '.(! empty($line->label)?$line->label:$label);
-				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
+				$text .= ' - '.(!empty($line->label) ? $line->label : $label);
+				$description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.
 			}
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach($dirtpls as $module => $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir)
 			{
 				if (!empty($module))
 				{
@@ -4241,9 +4241,9 @@ 
 				}
 
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
@@ -4252,15 +4252,15 @@ 
 		// Line in update mode
 		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
 		{
-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
-			$placeholder=' placeholder="'.$langs->trans("Label").'"';
+			$label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
+			$placeholder = ' placeholder="'.$langs->trans("Label").'"';
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach($dirtpls as $module => $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir)
 			{
 				if (!empty($module))
 				{
@@ -4272,9 +4272,9 @@ 
 				}
 
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
@@ -4306,7 +4306,7 @@ 
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
 		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
-		if($conf->global->PRODUCT_USE_UNITS)
+		if ($conf->global->PRODUCT_USE_UNITS)
 		{
 			print '<td class="left">'.$langs->trans('Unit').'</td>';
 		}
@@ -4314,19 +4314,19 @@ 
         print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
         print '</tr>';
 		$var = true;
-		$i	 = 0;
+		$i = 0;
 
-		if (! empty($this->lines))
+		if (!empty($this->lines))
 		{
 			foreach ($this->lines as $line)
 			{
-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))
 				{
 					if (empty($line->fk_parent_line))
 					{
-						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
-						$action='';
-						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+						$parameters = array('line'=>$line, 'var'=>$var, 'i'=>$i);
+						$action = '';
+						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
 				}
 				else
@@ -4359,35 +4359,35 @@ 
 		//var_dump($line);
 		if (!empty($line->date_start))
 		{
-			$date_start=$line->date_start;
+			$date_start = $line->date_start;
 		}
 		else
 		{
-			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+			$date_start = $line->date_debut_prevue;
+			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
 		if (!empty($line->date_end))
 		{
-			$date_end=$line->date_end;
+			$date_end = $line->date_end;
 		}
 		else
 		{
-			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+			$date_end = $line->date_fin_prevue;
+			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
 
         $this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
 
 		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
 		{
-			$discount=new DiscountAbsolute($this->db);
+			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
-			$this->tpl['label'].= $discount->getNomUrl(0, 'discount');
+			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
 		}
-		elseif (! empty($line->fk_product))
+		elseif (!empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4398,53 +4398,53 @@ 
 				$productstatic = $line->product;
 			}
 
-			$this->tpl['label'].= $productstatic->getNomUrl(1);
-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+			$this->tpl['label'] .= $productstatic->getNomUrl(1);
+			$this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 			// Dates
 			if ($line->product_type == 1 && ($date_start || $date_end))
 			{
-				$this->tpl['label'].= get_date_range($date_start, $date_end);
+				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 		else
 		{
-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
+			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
-				$this->tpl['label'].=$line->desc;
-			}else {
-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
+				$this->tpl['label'] .= $line->desc;
+			} else {
+				$this->tpl['label'] .= ($line->label ? '&nbsp;'.$line->label : '');
 			}
 
 			// Dates
 			if ($line->product_type == 1 && ($date_start || $date_end))
 			{
-				$this->tpl['label'].= get_date_range($date_start, $date_end);
+				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 
-		if (! empty($line->desc))
+		if (!empty($line->desc))
 		{
 			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(EXCESS PAID)')
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 			}
@@ -4461,7 +4461,7 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -4470,13 +4470,13 @@ 
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
-		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+		$this->tpl['strike'] = 0;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach($dirtpls as $module => $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+		foreach ($dirtpls as $module => $reldir)
 		{
 			if (!empty($module))
 			{
@@ -4488,9 +4488,9 @@ 
 			}
 
 			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
+				$res = @include $tpl;
 			} else {
-				$res=include $tpl; // for debug
+				$res = include $tpl; // for debug
 			}
 			if ($res) break;
 		}
@@ -4514,20 +4514,20 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
-		$sql.= "resource_id";
-		$sql.= ", resource_type";
-		$sql.= ", element_id";
-		$sql.= ", element_type";
-		$sql.= ", busy";
-		$sql.= ", mandatory";
-		$sql.= ") VALUES (";
-		$sql.= $resource_id;
-		$sql.= ", '".$this->db->escape($resource_type)."'";
-		$sql.= ", '".$this->db->escape($this->id)."'";
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ", '".$this->db->escape($busy)."'";
-		$sql.= ", '".$this->db->escape($mandatory)."'";
-		$sql.= ")";
+		$sql .= "resource_id";
+		$sql .= ", resource_type";
+		$sql .= ", element_id";
+		$sql .= ", element_type";
+		$sql .= ", busy";
+		$sql .= ", mandatory";
+		$sql .= ") VALUES (";
+		$sql .= $resource_id;
+		$sql .= ", '".$this->db->escape($resource_type)."'";
+		$sql .= ", '".$this->db->escape($this->id)."'";
+		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ", '".$this->db->escape($busy)."'";
+		$sql .= ", '".$this->db->escape($mandatory)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -4537,7 +4537,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
 		}
@@ -4560,22 +4560,22 @@ 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-		$sql.= " WHERE rowid=".$rowid;
+		$sql .= " WHERE rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 		else
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
+				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
 				if ($result < 0) { $this->db->rollback(); return -1; }
 			}
 			$this->db->commit();
@@ -4594,8 +4594,8 @@ 
 		// Force a copy of this->lines, otherwise it will point to same object.
 		if (isset($this->lines) && is_array($this->lines))
 		{
-			$nboflines=count($this->lines);
-			for($i=0; $i < $nboflines; $i++)
+			$nboflines = count($this->lines);
+			for ($i = 0; $i < $nboflines; $i++)
 			{
 				$this->lines[$i] = clone $this->lines[$i];
 			}
@@ -4619,48 +4619,48 @@ 
 	{
 		global $conf, $langs, $user, $hookmanager, $action;
 
-		$srctemplatepath='';
+		$srctemplatepath = '';
 
-		$parameters = array('modelspath'=>$modelspath,'modele'=>$modele,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'hidedesc'=>$hidedesc,'hideref'=>$hideref, 'moreparams'=>$moreparams);
+		$parameters = array('modelspath'=>$modelspath, 'modele'=>$modele, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'hidedesc'=>$hidedesc, 'hideref'=>$hideref, 'moreparams'=>$moreparams);
 		$reshook = $hookmanager->executeHooks('commonGenerateDocument', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 		if (empty($reshook))
 		{
-		    dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs)?$outputlangs->defaultlang:'null'));
+		    dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
 		    // Increase limit for PDF build
-		    $err=error_reporting();
+		    $err = error_reporting();
 		    error_reporting(0);
 		    @set_time_limit(120);
 		    error_reporting($err);
 
 		    // If selected model is a filename template (then $modele="modelname" or "modelname:filename")
-		    $tmp=explode(':', $modele, 2);
-		    if (! empty($tmp[1]))
+		    $tmp = explode(':', $modele, 2);
+		    if (!empty($tmp[1]))
 		    {
-			    $modele=$tmp[0];
-			    $srctemplatepath=$tmp[1];
+			    $modele = $tmp[0];
+			    $srctemplatepath = $tmp[1];
 		    }
 
 		    // Search template files
-			$file='';
-			$classname='';
-			$filefound=0;
-		    $dirmodels=array('/');
-		    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels, $conf->modules_parts['models']);
-		    foreach($dirmodels as $reldir)
+			$file = '';
+			$classname = '';
+			$filefound = 0;
+		    $dirmodels = array('/');
+		    if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		    foreach ($dirmodels as $reldir)
 		    {
-			    foreach(array('doc','pdf') as $prefix)
+			    foreach (array('doc', 'pdf') as $prefix)
 			    {
-				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
+				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
 				    else $file = $prefix."_".$modele.".modules.php";
 
 				    // On verifie l'emplacement du modele
-				    $file=dol_buildpath($reldir.$modelspath.$file, 0);
+				    $file = dol_buildpath($reldir.$modelspath.$file, 0);
 				    if (file_exists($file))
 				    {
-					    $filefound=1;
-					    $classname=$prefix.'_'.$modele;
+					    $filefound = 1;
+					    $classname = $prefix.'_'.$modele;
 					    break;
 				    }
 			    }
@@ -4670,7 +4670,7 @@ 
 		    // If generator was found
 		    if ($filefound)
 		    {
-			    global $db;  // Required to solve a conception default making an include of code using $db instead of $this->db just after.
+			    global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.
 
 			    require_once $file;
 
@@ -4679,32 +4679,32 @@ 
 			    // If generator is ODT, we must have srctemplatepath defined, if not we set it.
 			    if ($obj->type == 'odt' && empty($srctemplatepath))
 			    {
-				    $varfortemplatedir=$obj->scandir;
-				    if ($varfortemplatedir && ! empty($conf->global->$varfortemplatedir))
+				    $varfortemplatedir = $obj->scandir;
+				    if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))
 				    {
-					    $dirtoscan=$conf->global->$varfortemplatedir;
+					    $dirtoscan = $conf->global->$varfortemplatedir;
 
-					    $listoffiles=array();
+					    $listoffiles = array();
 
 					    // Now we add first model found in directories scanned
-					    $listofdir=explode(',', $dirtoscan);
-					    foreach($listofdir as $key => $tmpdir)
+					    $listofdir = explode(',', $dirtoscan);
+					    foreach ($listofdir as $key => $tmpdir)
 					    {
-						    $tmpdir=trim($tmpdir);
-						    $tmpdir=preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-						    if (! $tmpdir) { unset($listofdir[$key]); continue; }
+						    $tmpdir = trim($tmpdir);
+						    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+						    if (!$tmpdir) { unset($listofdir[$key]); continue; }
 						    if (is_dir($tmpdir))
 						    {
-							    $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-							    if (count($tmpfiles)) $listoffiles=array_merge($listoffiles, $tmpfiles);
+							    $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
+							    if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 						    }
 					    }
 
 					    if (count($listoffiles))
 					    {
-						    foreach($listoffiles as $record)
+						    foreach ($listoffiles as $record)
 						    {
-							    $srctemplatepath=$record['fullname'];
+							    $srctemplatepath = $record['fullname'];
 							    break;
 						    }
 					    }
@@ -4712,27 +4712,27 @@ 
 
 				    if (empty($srctemplatepath))
 				    {
-					    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
+					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
 					    return -1;
 				    }
 			    }
 
-			    if ($obj->type == 'odt' && ! empty($srctemplatepath))
+			    if ($obj->type == 'odt' && !empty($srctemplatepath))
 			    {
-				    if (! dol_is_file($srctemplatepath))
+				    if (!dol_is_file($srctemplatepath))
 				    {
-					    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
+					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
 					    return -1;
 				    }
 			    }
 
 			    // We save charset_output to restore it because write_file can change it if needed for
 			    // output format that does not support UTF8.
-			    $sav_charset_output=$outputlangs->charset_output;
+			    $sav_charset_output = $outputlangs->charset_output;
 
 			    if (in_array(get_class($this), array('Adherent')))
 			    {
-				    $arrayofrecords = array();   // The write_file of templates of adherent class need this var
+				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var
 				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
 			    }
 			    else
@@ -4743,46 +4743,46 @@ 
 
 			    if ($resultwritefile > 0)
 			    {
-				    $outputlangs->charset_output=$sav_charset_output;
+				    $outputlangs->charset_output = $sav_charset_output;
 
 				    // We delete old preview
 				    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				    dol_delete_preview($this);
 
 				    // Index file in database
-				    if (! empty($obj->result['fullpath']))
+				    if (!empty($obj->result['fullpath']))
 				    {
 					    $destfull = $obj->result['fullpath'];
 					    $upload_dir = dirname($destfull);
 					    $destfile = basename($destfull);
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 					    {
 						    $filename = basename($destfile);
 						    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 						    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-						    $ecmfile=new EcmFiles($this->db);
-						    $result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);
+						    $ecmfile = new EcmFiles($this->db);
+						    $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
 
 						     // Set the public "share" key
 						    $setsharekey = false;
 						    if ($this->element == 'propal')
 						    {
-							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							    if ($useonlinesignature) $setsharekey=true;
-							    if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+							    if ($useonlinesignature) $setsharekey = true;
+							    if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
 						    }
-						    if ($this->element == 'commande' && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey=true;
+						    if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey = true;
 						    }
-						    if ($this->element == 'facture' && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey=true;
+						    if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey = true;
 						    }
-						    if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey=true;
+						    if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey = true;
 						    }
 
 						    if ($setsharekey) {
@@ -4795,11 +4795,11 @@ 
 
 						    if ($result > 0)
 						     {
-							    $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 							    $ecmfile->fullpath_orig = '';
 							    $ecmfile->gen_or_uploaded = 'generated';
-							    $ecmfile->description = '';    // indexed content
-							    $ecmfile->keyword = '';        // keyword content
+							    $ecmfile->description = ''; // indexed content
+							    $ecmfile->keyword = ''; // keyword content
 							    $result = $ecmfile->update($user);
 							    if ($result < 0) {
 								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -4810,11 +4810,11 @@ 
 							    $ecmfile->entity = $conf->entity;
 							    $ecmfile->filepath = $rel_dir;
 							    $ecmfile->filename = $filename;
-							    $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 							    $ecmfile->fullpath_orig = '';
 							    $ecmfile->gen_or_uploaded = 'generated';
-							    $ecmfile->description = '';    // indexed content
-							    $ecmfile->keyword = '';        // keyword content
+							    $ecmfile->description = ''; // indexed content
+							    $ecmfile->keyword = ''; // keyword content
 							    $ecmfile->src_object_type = $this->table_element;
 							    $ecmfile->src_object_id   = $this->id;
 
@@ -4830,15 +4830,15 @@ 
 						    //var_dump($obj->update_main_doc_field);exit;
 
 						    // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
-						    $update_main_doc_field=0;
-						    if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
-						    if ($update_main_doc_field && ! empty($this->table_element))
+						    $update_main_doc_field = 0;
+						    if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+						    if ($update_main_doc_field && !empty($this->table_element))
 						    {
 							    $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
-							    $sql.= ' WHERE rowid = '.$this->id;
+							    $sql .= ' WHERE rowid = '.$this->id;
 
 							    $resql = $this->db->query($sql);
-							    if (! $resql) {
+							    if (!$resql) {
 									dol_print_error($this->db);
 								} else {
 							        $this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
@@ -4858,14 +4858,14 @@ 
 			    }
 			    else
 			    {
-				    $outputlangs->charset_output=$sav_charset_output;
+				    $outputlangs->charset_output = $sav_charset_output;
 				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				    return -1;
 			    }
 		    }
 		    else
 		    {
-			    $this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
+			    $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			    dol_print_error('', $this->error);
 			    return -1;
 		    }
@@ -4884,9 +4884,9 @@ 
 	{
 		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
 
-		$file_osencoded=dol_osencode($file);
+		$file_osencoded = dol_osencode($file);
 		if (file_exists($file_osencoded))
 		{
 			// Create small thumbs for company (Ratio is near 16/9)
@@ -4925,16 +4925,16 @@ 
 
 		if (isset($alternatevalue)) return $alternatevalue;
 
-		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
+		$newelement = $this->element;
+		if ($newelement == 'facture') $newelement = 'invoice';
+		if ($newelement == 'commande') $newelement = 'order';
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
 			return '';
 		}
 
-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
+		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
 		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
 
@@ -4959,26 +4959,26 @@ 
 	public function call_trigger($trigger_name, $user)
 	{
 		// phpcs:enable
-		global $langs,$conf;
+		global $langs, $conf;
 
-		if (! is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers.
+		if (!is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers.
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 			$langs = new Translate('', $conf);
 		}
 
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($this->db);
-		$result=$interface->run_triggers($trigger_name, $this, $user, $langs, $conf);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($this->db);
+		$result = $interface->run_triggers($trigger_name, $this, $user, $langs, $conf);
 
 		if ($result < 0)
 		{
 			if (!empty($this->errors))
 			{
-				$this->errors=array_unique(array_merge($this->errors, $interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
+				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
 			}
 			else
 			{
-				$this->errors=$interface->errors;
+				$this->errors = $interface->errors;
 			}
 		}
 		return $result;
@@ -5002,19 +5002,19 @@ 
 		// phpcs:enable
 		global $extrafields;
 
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) $rowid = $this->id;
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
 			return 0;
 		}
 
-		$this->array_options=array();
+		$this->array_options = array();
 
-		if (! is_array($optionsArray))
+		if (!is_array($optionsArray))
 		{
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
-			if (! isset($extrafields) || ! is_object($extrafields))
+			if (!isset($extrafields) || !is_object($extrafields))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				$extrafields = new ExtraFields($this->db);
@@ -5025,7 +5025,7 @@ 
 			{
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
+			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
 		}
 		else
 		{
@@ -5044,18 +5044,18 @@ 
 			{
 				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
 				{
-					$sql.= ", ".$name;
+					$sql .= ", ".$name;
 				}
 			}
-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
-			$sql.= " WHERE fk_object = ".$rowid;
+			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+			$sql .= " WHERE fk_object = ".$rowid;
 
 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->array_options = array();
-				$numrows=$this->db->num_rows($resql);
+				$numrows = $this->db->num_rows($resql);
 				if ($numrows)
 				{
 					$tab = $this->db->fetch_array($resql);
@@ -5063,17 +5063,17 @@ 
 					foreach ($tab as $key => $value)
 					{
 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))
 						{
 							// we can add this attribute to object
-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
-								$this->array_options["options_".$key]=$this->db->jdate($value);
+								$this->array_options["options_".$key] = $this->db->jdate($value);
 							}
 							else
 							{
-								$this->array_options["options_".$key]=$value;
+								$this->array_options["options_".$key] = $value;
 							}
 
 							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
@@ -5082,7 +5082,7 @@ 
 
 					// If field is a computed field, value must become result of compute
 					foreach ($tab as $key => $value) {
-						if (! empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))
+						if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))
 						{
 							$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0);
 						}
@@ -5117,10 +5117,10 @@ 
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
-		$resql=$this->db->query($sql_del);
-		if (! $resql)
+		$resql = $this->db->query($sql_del);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -5143,24 +5143,24 @@ 
 	 */
 	public function insertExtraFields($trigger = '', $userused = null)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-		if (! empty($this->array_options))
+		if (!empty($this->array_options))
 		{
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
 			//Eliminate copied source object extra_fields that do not exist in target object
-			$new_array_options=array();
+			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
 				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
@@ -5168,9 +5168,9 @@ 
 					$new_array_options['options_'.$key] = $value;
 			}
 
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-			   	$attributeKey      = substr($key, 8);   // Remove 'options_' prefix
+			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix
 			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
 			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
 			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
@@ -5180,13 +5180,13 @@ 
 
 			   	if ($attributeRequired)
 			   	{
-			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
+			   		$mandatorypb = false;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
+			   		if ($this->array_options[$key] === '') $mandatorypb = true;
 			   		if ($mandatorypb)
 			   		{
 			   		    dol_syslog("Mandatory extra field ".$key." is empty");
-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
+			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 			   			return -1;
 			   		}
 			   	}
@@ -5212,25 +5212,25 @@ 
 			   	switch ($attributeType)
 			   	{
 			   		case 'int':
-			  			if (!is_numeric($value) && $value!='')
+			  			if (!is_numeric($value) && $value != '')
 			   			{
-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
 			  			}
-			   			elseif ($value=='')
+			   			elseif ($value == '')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
 			 			break;
 					case 'double':
 						$value = price2num($value);
-						if (!is_numeric($value) && $value!='')
+						if (!is_numeric($value) && $value != '')
 						{
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
 						}
-						elseif ($value=='')
+						elseif ($value == '')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5244,12 +5244,12 @@ 
              			}
              			break;*/
 			   		case 'password':
-			   			$algo='';
+			   			$algo = '';
 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
 			   			{
 			   				// If there is an encryption choice, we use it to crypt data before insert
 			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
-			   				$algo=reset($tmparrays);
+			   				$algo = reset($tmparrays);
 			   				if ($algo != '')
 			   				{
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
@@ -5260,7 +5260,7 @@ 
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 				   					}
 									else
 									{
@@ -5271,7 +5271,7 @@ 
 			   					}
 			   					else
 			   					{
-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
 			   			}
@@ -5286,13 +5286,13 @@ 
 					case 'date':
 					case 'datetime':
 						// If data is a string instead of a timestamp, we convert it
-						if (! is_int($this->array_options[$key])) {
+						if (!is_int($this->array_options[$key])) {
 							$this->array_options[$key] = strtotime($this->array_options[$key]);
 						}
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
 						break;
 		   			case 'link':
-						$param_list=array_keys($attributeParam['options']);
+						$param_list = array_keys($attributeParam['options']);
 						// 0 : ObjectName
 						// 1 : classPath
 						$InfoFieldList = explode(":", $param_list[0]);
@@ -5301,18 +5301,18 @@ 
 						{
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
-								$new_array_options[$key]='';
+								$new_array_options[$key] = '';
 							}
 							elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('', $value);
+								if (is_numeric($value)) $res = $object->fetch($value);
+								else $res = $object->fetch('', $value);
 
-								if ($res > 0) $new_array_options[$key]=$object->id;
+								if ($res > 0) $new_array_options[$key] = $object->id;
 								else
 								{
-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
+									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
@@ -5337,70 +5337,70 @@ 
 			$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-				$attributeKey = substr($key, 8);   // Remove 'options_' prefix
+				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
-					$sql.=",".$attributeKey;
+					$sql .= ",".$attributeKey;
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-    			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+    			foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
     			    {
-    			        $sql.=",".$tmpkey;
+    			        $sql .= ",".$tmpkey;
     			    }
     			}
 			}
 			$sql .= ") VALUES (".$this->id;
 
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-				$attributeKey = substr($key, 8);   // Remove 'options_' prefix
+				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
+						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
 					}
 					else
 					{
-						$sql.=",null";
+						$sql .= ",null";
 					}
 				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-			    foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+			    foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
     			    {
-                        if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
-                        else $sql.=", ''";
+                        if (in_array($tmpval, array('int', 'double'))) $sql .= ", 0";
+                        else $sql .= ", ''";
     			    }
     			}
 			}
 
-			$sql.=")";
+			$sql .= ")";
 
 			$resql = $this->db->query($sql);
 
-			if (! $resql)
+			if (!$resql)
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$error++;
 			}
 
-			if (! $error && $trigger)
+			if (!$error && $trigger)
 			{
 				// Call trigger
-				$this->context=array('extrafieldaddupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
+				$this->context = array('extrafieldaddupdate'=>1);
+				$result = $this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -5431,23 +5431,23 @@ 
 	 */
 	public function updateExtraField($key, $trigger = null, $userused = null)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
+		if (!empty($this->array_options) && isset($this->array_options["options_".$key]))
 		{
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
-			$value=$this->array_options["options_".$key];
+			$value = $this->array_options["options_".$key];
 
 			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];
 			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
@@ -5460,25 +5460,25 @@ 
 			switch ($attributeType)
 			{
 				case 'int':
-					if (!is_numeric($value) && $value!='')
+					if (!is_numeric($value) && $value != '')
 					{
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					}
-					elseif ($value=='')
+					elseif ($value == '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
 					break;
 				case 'double':
 					$value = price2num($value);
-					if (!is_numeric($value) && $value!='')
+					if (!is_numeric($value) && $value != '')
 					{
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					}
-					elseif ($value=='')
+					elseif ($value == '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5495,13 +5495,13 @@ 
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
 					break;
 				case 'date':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'datetime':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'link':
-					$param_list=array_keys($attributeParam['options']);
+					$param_list = array_keys($attributeParam['options']);
 					// 0 : ObjectName
 					// 1 : classPath
 					$InfoFieldList = explode(":", $param_list[0]);
@@ -5510,7 +5510,7 @@ 
 					{
 						$object = new $InfoFieldList[0]($this->db);
 						$object->fetch(0, $value);
-						$this->array_options["options_".$key]=$object->id;
+						$this->array_options["options_".$key] = $object->id;
 					}
 					break;
 			}
@@ -5519,24 +5519,24 @@ 
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
 			$sql .= " WHERE fk_object = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				$error++;
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 			}
 
-			if (! $error && $trigger)
+			if (!$error && $trigger)
 			{
 				// Call trigger
-				$this->context=array('extrafieldupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
+				$this->context = array('extrafieldupdate'=>1);
+				$result = $this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
 
 			if ($error)
 			{
-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -5565,73 +5565,73 @@ 
 	 */
 	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0)
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
-		$val=$this->fields[$key];
+		$val = $this->fields[$key];
 
-		$out='';
-        $type='';
+		$out = '';
+        $type = '';
         $param = array();
-        $param['options']=array();
-        $reg=array();
+        $param['options'] = array();
+        $reg = array();
         $size = $this->fields[$key]['size'];
         // Because we work on extrafields
-        if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)){
-        	$param['options']=array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
-        	$type ='link';
-        } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)){
-        	$param['options']=array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-        	$type ='link';
-        } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)){
-            $param['options']=array($reg[2].':'.$reg[3] => 'N');
-            $type ='link';
-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-            $type ='sellist';
-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
-            $param['options']=array();
-            $type ='varchar';
-            $size=$reg[1];
-        } elseif(preg_match('/varchar/', $val['type'])) {
-            $param['options']=array();
-            $type ='varchar';
-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {
-            $param['options']=$this->fields[$key]['arrayofkeyval'];
-            $type ='select';
+        if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
+        	$type = 'link';
+        } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+        	$type = 'link';
+        } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[2].':'.$reg[3] => 'N');
+            $type = 'link';
+        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+            $type = 'sellist';
+        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
+            $param['options'] = array();
+            $type = 'varchar';
+            $size = $reg[1];
+        } elseif (preg_match('/varchar/', $val['type'])) {
+            $param['options'] = array();
+            $type = 'varchar';
+        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
+            $param['options'] = $this->fields[$key]['arrayofkeyval'];
+            $type = 'select';
         } else {
-            $param['options']=array();
-            $type =$this->fields[$key]['type'];
+            $param['options'] = array();
+            $type = $this->fields[$key]['type'];
         }
 
-		$label=$this->fields[$key]['label'];
+		$label = $this->fields[$key]['label'];
 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
-		$default=$this->fields[$key]['default'];
-		$computed=$this->fields[$key]['computed'];
-		$unique=$this->fields[$key]['unique'];
-		$required=$this->fields[$key]['required'];
+		$default = $this->fields[$key]['default'];
+		$computed = $this->fields[$key]['computed'];
+		$unique = $this->fields[$key]['unique'];
+		$required = $this->fields[$key]['required'];
 
-		$langfile=$this->fields[$key]['langfile'];
-		$list=$this->fields[$key]['list'];
-		$hidden=(in_array(abs($this->fields[$key]['visible']), array(0,2)) ? 1 : 0);
+		$langfile = $this->fields[$key]['langfile'];
+		$list = $this->fields[$key]['list'];
+		$hidden = (in_array(abs($this->fields[$key]['visible']), array(0, 2)) ? 1 : 0);
 
 		$objectid = $this->id;
 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
 
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
-		if (empty($morecss) && ! empty($val['css']))
+		if (empty($morecss) && !empty($val['css']))
 		{
 		    $morecss = $val['css'];
 		}
@@ -5645,15 +5645,15 @@ 
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type, array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -5672,10 +5672,10 @@ 
 			}
 		}
 
-		if (in_array($type, array('date','datetime')))
+		if (in_array($type, array('date', 'datetime')))
 		{
-			$tmp=explode(',', $size);
-			$newsize=$tmp[0];
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
 
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
@@ -5685,193 +5685,193 @@ 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
-		elseif (in_array($type, array('int','integer')))
+		elseif (in_array($type, array('int', 'integer')))
 		{
-			$tmp=explode(',', $size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('real')))
 		{
-		    $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+		    $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, ! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked value="1" ';
+				$checked = ' checked value="1" ';
 			} else {
-				$checked=' value="1" ';
+				$checked = ' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
 		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		}
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>'.$val.'</option>';
+				$out .= '<option value="'.$key.'"';
+				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+				$out .= '>'.$val.'</option>';
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			if (is_array($param['options']))
 			{
-				$param_list=array_keys($param['options']);
+				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
 				{
 					if (strpos($InfoFieldList[4], 'extra.') !== false)
 					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
 				{
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
+					$keyList .= ', '.$parentField;
 				}
 
 				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label))
 				{
-					$keyList .=', ';
+					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
 
-				$sqlwhere='';
+				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$', '0', $InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
+					if (strpos($InfoFieldList[4], 'extra') !== false)
 					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				else
 				{
-					$sqlwhere.= ' WHERE 1=1';
+					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
 				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
-				$sql.=$sqlwhere;
+				$sql .= $sqlwhere;
 				//print $sql;
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+				$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$out.='<option value="0">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					while ($i < $num)
 					{
-						$labeltoshow='';
+						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
@@ -5882,44 +5882,44 @@ 
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
-								$labeltoshow.= $obj->$field_toshow.' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
 						else
 						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
-						$labeltoshow=dol_trunc($labeltoshow, 45);
+						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if ($value == $obj->rowid)
 						{
 							foreach ($fields_label as $field_toshow)
 							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel, 18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow, 18).' ';
+								$translabel = $langs->trans($obj->$field_toshow);
+								if ($translabel != $obj->$field_toshow) {
+									$labeltoshow = dol_trunc($translabel, 18).' ';
+								} else {
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							if (! $notrans)
+							if (!$notrans)
 							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel, 18);
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$labeltoshow = dol_trunc($translabel, 18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]}, 18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid)
 							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
 							if (!empty($InfoFieldList[3]) && $parentField)
@@ -5927,10 +5927,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'"';
+							$out .= ($value == $obj->rowid ? ' selected' : '');
+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 
 						$i++;
@@ -5941,23 +5941,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',', $value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$value_arr = explode(',', $value);
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')
 		{
-			$out='';
+			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+				$out .= ' value="'.$keyopt.'"';
+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+				$out .= ($value == $keyopt ? 'checked' : '');
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -5972,24 +5972,24 @@ 
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					$keyList .= ', '.$parentField;
 				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
 
@@ -6000,49 +6000,49 @@ 
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
+				$sql = 'SELECT '.$keyList;
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$', '0', $InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
 
 				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);
+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
-					$data=array();
+					$data = array();
 
-					while ( $i < $num ) {
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
@@ -6052,7 +6052,7 @@ 
 						if (is_array($fields_label)) {
 							$notrans = true;
 							foreach ($fields_label as $field_toshow) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -6063,15 +6063,15 @@ 
 							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									$labeltoshow = dol_trunc($translabel, 18).' ';
 								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						} else {
-							if (! $notrans) {
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -6084,77 +6084,77 @@ 
 							}
 
 							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-								$data[$obj->rowid]=$labeltoshow;
+								$data[$obj->rowid] = $labeltoshow;
 							}
 
-							if (! empty($InfoFieldList[3]) && $parentField) {
-								$parent = $parentName . ':' . $obj->{$parentField};
+							if (!empty($InfoFieldList[3]) && $parentField) {
+								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						}
 
-						$i ++;
+						$i++;
 					}
 					$this->db->free($resql);
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
-			$showempty=(($required && $default != '')?0:1);
+			$showempty = (($required && $default != '') ? 0 : 1);
 
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled'])?0:1);
+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled']) ? 0 : 1);
 
-			if (! empty($param_list_array[2]))		// If we set to add a create button
+			if (!empty($param_list_array[2]))		// If we set to add a create button
 			{
-				if (! GETPOSTISSET('backtopage') && empty($val['disabled']))	// To avoid to open several infinitely the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']))	// To avoid to open several infinitely the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
 				{
-		   			list($class,$classfile)=explode(':', $param_list[0]);
-		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
-		   			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+		   			list($class, $classfile) = explode(':', $param_list[0]);
+		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+		   			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
 		   			$paramforthenewlink = '';
-		   			$paramforthenewlink .= (GETPOSTISSET('action')?'&action='.GETPOST('action', 'aZ09'):'');
-		   			$paramforthenewlink .= (GETPOSTISSET('id')?'&id='.GETPOST('id', 'int'):'');
+		   			$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
+		   			$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
 		   			$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';
 		   			// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page
-		   			$out.='<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
 		}
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
 
-			$out='';
+			$out = '';
 
 			$inputs = array();
-			if(! empty($value)) {
-				foreach($value as $option) {
-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $morecss).'<br></span>';
+			if (!empty($value)) {
+				foreach ($value as $option) {
+					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+					$out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $morecss).'<br></span>';
 				}
 			}
 
-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+			$out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 
 			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $morecss).'<br></span>';
+			$newInput .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $morecss).'<br></span>';
 
-			if(! empty($conf->use_javascript_ajax)) {
-				$out.= '
+			if (!empty($conf->use_javascript_ajax)) {
+				$out .= '
 					<script>
 					$(document).ready(function() {
 						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
@@ -6169,7 +6169,7 @@ 
 			}
 		}
 		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -6193,12 +6193,12 @@ 
 	 */
 	public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '')
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
 		$objectid = $this->id;
@@ -6210,36 +6210,36 @@ 
 		// Convert var to be able to share same code than showOutputField of extrafields
 		if (preg_match('/varchar\((\d+)\)/', $type, $reg))
 		{
-			$type = 'varchar';		// convert varchar(xx) int varchar
+			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
+		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) $type = 'select';
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
-		$default=$val['default'];
-		$computed=$val['computed'];
-		$unique=$val['unique'];
-		$required=$val['required'];
-		$param=array();
-		$param['options']=array();
+		$default = $val['default'];
+		$computed = $val['computed'];
+		$unique = $val['unique'];
+		$required = $val['required'];
+		$param = array();
+		$param['options'] = array();
 
 		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
-			$type='link';
-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
+			$type = 'link';
+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
 		}
-        elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1] . ':' . $reg[2] . ':' . $reg[3] . ':' . $reg[4] => 'N');
+        elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
             $type = 'sellist';
         }
 
 
-		$langfile=$val['langfile'];
-		$list=$val['list'];
-		$help=$val['help'];
-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		$langfile = $val['langfile'];
+		$list = $val['list'];
+		$help = $val['help'];
+		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
 		if ($hidden) return '';
 
@@ -6261,17 +6261,17 @@ 
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type, array('int','double','price')))
+			elseif (in_array($type, array('int', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
 			}
 			elseif ($type == 'url')
 			{
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -6291,90 +6291,90 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
+		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
 		elseif ($type == 'date')
 		{
-			if(! empty($value)) {
-				$value=dol_print_date($value, 'day');
+			if (!empty($value)) {
+				$value = dol_print_date($value, 'day');
 			} else {
-				$value='';
+				$value = '';
 			}
 		}
 		elseif ($type == 'datetime' || $type == 'timestamp')
 		{
-			if(! empty($value)) {
-				$value=dol_print_date($value, 'dayhour');
+			if (!empty($value)) {
+				$value = dol_print_date($value, 'dayhour');
 			} else {
-				$value='';
+				$value = '';
 			}
 		}
 		elseif ($type == 'double' || $type == 'real')
 		{
 			if (!empty($value)) {
-				$value=price($value);
+				$value = price($value);
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked ';
+				$checked = ' checked ';
 			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		}
 		elseif ($type == 'mail')
 		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		}
 		elseif ($type == 'url')
 		{
-			$value=dol_print_url($value, '_blank', 32, 1);
+			$value = dol_print_url($value, '_blank', 32, 1);
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		}
 		elseif ($type == 'price')
 		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 		}
 		elseif ($type == 'select')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
-			$param_list=array_keys($param['options']);
+			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
-			$selectkey="rowid";
-			$keyList='rowid';
+			$selectkey = "rowid";
+			$keyList = 'rowid';
 
-			if (count($InfoFieldList)>=3)
+			if (count($InfoFieldList) >= 3)
 			{
 				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
 
 			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (strpos($InfoFieldList[4], 'extra') !== false)
 			{
-				$sql.= ' as main';
+				$sql .= ' as main';
 			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+			if ($selectkey == 'rowid' && empty($value)) {
+				$sql .= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey == 'rowid') {
+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+			} else {
+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
@@ -6383,38 +6383,38 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
 
 				// Several field into label (eq table:code|libelle:rowid)
 				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if(is_array($fields_label) && count($fields_label)>1)
+				if (is_array($fields_label) && count($fields_label) > 1)
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel='';
+						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
+							$translabel = $langs->trans($obj->$field_toshow);
 						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel, 18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
+						if ($translabel != $field_toshow) {
+							$value .= dol_trunc($translabel, 18).' ';
+						} else {
+							$value .= $obj->$field_toshow.' ';
 						}
 					}
 				}
 				else
 				{
-					$translabel='';
+					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel, 18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
+					if ($translabel != $obj->{$InfoFieldList[1]}) {
+						$value = dol_trunc($translabel, 18);
+					} else {
+						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -6422,19 +6422,19 @@ 
 		}
 		elseif ($type == 'radio')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',', $value);
-			$value='';
-			if (is_array($value_arr) && count($value_arr)>0)
+			$value_arr = explode(',', $value);
+			$value = '';
+			if (is_array($value_arr) && count($value_arr) > 0)
 			{
-				$toprint=array();
+				$toprint = array();
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -6449,7 +6449,7 @@ 
 
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
@@ -6458,74 +6458,74 @@ 
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+			$sql = 'SELECT '.$keyList;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst', LOG_DEBUG);
+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				$toprint = array();
+				while ($obj = $this->db->fetch_object($resql)) {
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 						if (is_array($fields_label) && count($fields_label) > 1) {
 							foreach ($fields_label as $field_toshow) {
 								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
+								if (!empty($obj->$field_toshow)) {
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
+							if (!empty($obj->{$InfoFieldList[1]})) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$out='';
+			$out = '';
 
 			// only if something to display (perf)
 			if ($value)
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
-				if (! empty($classpath))
+				$classname = $InfoFieldList[0];
+				$classpath = $InfoFieldList[1];
+				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
+				if (!empty($classpath))
 				{
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname))
 					{
 						$object = new $classname($this->db);
 						$object->fetch($value);
-						$value=$object->getNomUrl($getnomurlparam);
+						$value = $object->getNomUrl($getnomurlparam);
 					}
 				}
 				else
@@ -6534,15 +6534,15 @@ 
 					return 'Error bad setup of extrafield';
 				}
 			}
-			else $value='';
+			else $value = '';
 		}
 		elseif ($type == 'text' || $type == 'html')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'password')
 		{
-			$value=preg_replace('/./i', '*', $value);
+			$value = preg_replace('/./i', '*', $value);
 		}
 		elseif ($type == 'array')
 		{
@@ -6550,7 +6550,7 @@ 
 		}
 
 		//print $type.'-'.$size;
-		$out=$value;
+		$out = $value;
 
 		return $out;
 	}
@@ -6571,7 +6571,7 @@ 
 	{
 		global $db, $conf, $langs, $action, $form;
 
-		if (! is_object($form)) $form=new Form($db);
+		if (!is_object($form)) $form = new Form($db);
 
 		$out = '';
 
@@ -6583,7 +6583,7 @@ 
 
             $extrafields_collapse_num = '';
 			$e = 0;
-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
 				// Show only the key field in params
 				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
@@ -6603,26 +6603,26 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 				}
 
-				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				elseif($mode == 'view' && empty($visibility)) continue;
+				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				elseif ($mode == 'view' && empty($visibility)) continue;
 				if (empty($perms)) continue;
 
 				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
 
-				$colspan='3';
-				if (is_array($params) && count($params)>0) {
+				$colspan = '3';
+				if (is_array($params) && count($params) > 0) {
 					if (array_key_exists('colspan', $params)) {
-						$colspan=$params['colspan'];
+						$colspan = $params['colspan'];
 					}
 				}
 
-				switch($mode) {
+				switch ($mode) {
 					case "view":
-						$value=$this->array_options["options_".$key.$keysuffix];
+						$value = $this->array_options["options_".$key.$keysuffix];
 						break;
 					case "edit":
-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.
+						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.
 						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
 						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
 						{
@@ -6633,7 +6633,7 @@ 
 								$value = $getposttemp;
 							}
 						} else {
-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
+							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
 						}
 						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 						break;
@@ -6646,10 +6646,10 @@ 
                     if (!empty($extrafield_param) && is_array($extrafield_param)) {
                         $extrafield_param_list = array_keys($extrafield_param['options']);
 
-                        if (count($extrafield_param_list)>0) {
+                        if (count($extrafield_param_list) > 0) {
                             $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
 
-                            if ($extrafield_collapse_display_value==1 || $extrafield_collapse_display_value==2) {
+                            if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
                                 $extrafields_collapse_num = $extrafields->attributes[$this->table_element]['pos'][$key];
                             }
                         }
@@ -6659,14 +6659,14 @@ 
 				}
 				else
 				{
-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
-					$csstyle='';
-					if (is_array($params) && count($params)>0) {
+					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+					$csstyle = '';
+					if (is_array($params) && count($params) > 0) {
 						if (array_key_exists('class', $params)) {
-							$class.=$params['class'].' ';
+							$class .= $params['class'].' ';
 						}
 						if (array_key_exists('style', $params)) {
-							$csstyle=$params['style'];
+							$csstyle = $params['style'];
 						}
 					}
 
@@ -6679,24 +6679,24 @@ 
 
 					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }
+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
 
 					if ($action == 'selectlines') { $colspan++; }
 
 					// Convert date into timestamp format (value in memory must be a timestamp)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 					{
-						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+						$datenotinstring = $this->array_options['options_'.$key];
+						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
 						{
 							$datenotinstring = $this->db->jdate($datenotinstring);
 						}
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)):$datenotinstring;
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price','double')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))
 					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
 
 					$labeltoshow = $langs->trans($label);
@@ -6706,25 +6706,25 @@ 
 					//if (GETPOST('action', 'none') == 'create') $out.='create';
 					// BUG #11554 : For public page, use red dot for required fields, instead of bold label
 					$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
-					if ($tpl_context=="public") {	// Public page : red dot instead of fieldrequired characters
+					if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
 						$out .= '">';
-						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
 						else $out .= $labeltoshow;
-						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
 					} else {
-						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
 						$out .= '">';
-						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
 						else $out .= $labeltoshow;
 					}
 					$out .= '</td>';
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
 
-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
+					$out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 					//$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'">';
 
-					switch($mode) {
+					switch ($mode) {
 						case "view":
 							$out .= $extrafields->showOutputField($key, $value);
 							break;
@@ -6740,14 +6740,14 @@ 
 						$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
 					}*/
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
 					else $out .= '</tr>';
 					$e++;
 				}
 			}
 			$out .= "\n";
 			// Add code to manage list depending on others
-			if (! empty($conf->use_javascript_ajax)) {
+			if (!empty($conf->use_javascript_ajax)) {
 				$out .= '
 				<script>
 				    jQuery(document).ready(function() {
@@ -6793,7 +6793,7 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
+		if ($element == 'facturerec') $element = 'facture';
 
 		return $user->rights->{$element};
 	}
@@ -6816,9 +6816,9 @@ 
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
-			if (! $db->query($sql))
+			if (!$db->query($sql))
 			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6852,7 +6852,7 @@ 
 		else
 		{
 			// Get cost price for margin calculation
-			if (! empty($fk_product))
+			if (!empty($fk_product))
 			{
 				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')
 				{
@@ -6889,7 +6889,7 @@ 
 					}
 				}
 
-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1','pmp','costprice')))
+				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice')))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 					$productFournisseur = new ProductFournisseur($this->db);
@@ -6929,25 +6929,25 @@ 
 	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)
 	{
         // phpcs:enable
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-		$sortfield='position_name';
-		$sortorder='asc';
+		$sortfield = 'position_name';
+		$sortorder = 'asc';
 
-		$dir = $sdir . '/';
+		$dir = $sdir.'/';
 		$pdir = '/';
 
 		$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
 		$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
 
 		// For backward compatibility
-		if ($modulepart == 'product' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+		if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 		{
-			$dir = $sdir . '/'. get_exdir($this->id, 2, 0, 0, $this, $modulepart) . $this->id ."/photos/";
-			$pdir = '/' . get_exdir($this->id, 2, 0, 0, $this, $modulepart) . $this->id ."/photos/";
+			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
 		}
 
 		// Defined relative dir to DOL_DATA_ROOT
@@ -6962,10 +6962,10 @@ 
 		$dirthumb = $dir.'thumbs/';
 		$pdirthumb = $pdir.'thumbs/';
 
-		$return ='<!-- Photo -->'."\n";
-		$nbphoto=0;
+		$return = '<!-- Photo -->'."\n";
+		$nbphoto = 0;
 
-		$filearray=dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 
 		/*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 		 {
@@ -6979,12 +6979,12 @@ 
 		{
 			if ($sortfield && $sortorder)
 			{
-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 			}
 
-			foreach($filearray as $key => $val)
+			foreach ($filearray as $key => $val)
 			{
-				$photo='';
+				$photo = '';
 				$file = $val['name'];
 
 				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
@@ -6998,36 +6998,36 @@ 
 
 					if ($size == 1 || $size == 'small') {   // Format vignette
 						// Find name of thumb file
-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
+						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
 
 						// Get filesize of original file
-						$imgarray=dol_getImageSize($dir.$photo);
+						$imgarray = dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return.= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
+							if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr class="center valignmiddle" style="border: 1px">';
-							$return.= '<td style="width: '.ceil(100/$nbbyrow).'%" class="photo">';
+							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
+							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
 						}
 						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
-						$return.= "\n";
+						$return .= "\n";
 
-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
+						$relativefile = preg_replace('/^\//', '', $pdir.$photo);
 						if (empty($nolink))
 						{
-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
+							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
+							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
+						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
+						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+						if ($notitle) $alt = '';
 
 						if ($usesharelink)
 						{
@@ -7035,81 +7035,81 @@ 
 							{
 								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 								{
-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
-									$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
+									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 								else {
-									$return.= '<!-- Show original file -->';
-									$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<!-- Show original file -->';
+									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 							}
 							else
 							{
-								$return.= '<!-- Show nophoto file (because file is not shared) -->';
-								$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show nophoto file (because file is not shared) -->';
+								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 						else
 						{
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
-								$return.= '<!-- Show thumb -->';
-								$return.= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show thumb -->';
+								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 							else {
-								$return.= '<!-- Show original file -->';
-								$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show original file -->';
+								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
-						if (empty($nolink)) $return.= '</a>';
-						$return.="\n";
+						if (empty($nolink)) $return .= '</a>';
+						$return .= "\n";
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) $return .= '<br>'.$viewfilename;
 						if ($showaction)
 						{
-							$return.= '<br>';
+							$return .= '<br>';
 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
 							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
 							{
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 							}
 							// Special cas for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
 							{
 								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= img_delete().'</a>';
 							}
 						}
-						$return.= "\n";
+						$return .= "\n";
 
 						if ($nbbyrow > 0)
 						{
-							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+							$return .= '</td>';
+							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
 						}
-						elseif ($nbbyrow < 0) $return.='</div>';
+						elseif ($nbbyrow < 0) $return .= '</div>';
 					}
 
 					if (empty($size)) {     // Format origine
-						$return.= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
+						$return .= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) $return .= '<br>'.$viewfilename;
 						if ($showaction)
 						{
 							// Special case for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
 							{
 								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= img_delete().'</a>';
 							}
 						}
 					}
@@ -7119,18 +7119,18 @@ 
 				}
 			}
 
-			if ($size==1 || $size=='small')
+			if ($size == 1 || $size == 'small')
 			{
 				if ($nbbyrow > 0)
 				{
 					// Ferme tableau
 					while ($nbphoto % $nbbyrow)
 					{
-						$return.= '<td style="width: '.ceil(100/$nbbyrow).'%">&nbsp;</td>';
+						$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) $return .= '</table>';
 				}
 			}
 		}
@@ -7151,7 +7151,7 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='array') return true;
+			if (isset($info['type']) && $info['type'] == 'array') return true;
 			else return false;
 		}
 		return false;
@@ -7165,7 +7165,7 @@ 
 	 */
 	public function isDate($info)
 	{
-		if (isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
 		return false;
 	}
 
@@ -7177,9 +7177,9 @@ 
 	 */
 	public function isInt($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
-			if (isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i', $info['type']))) return true;
+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
 		}
 		else return false;
@@ -7211,7 +7211,7 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='text') return true;
+			if (isset($info['type']) && $info['type'] == 'text') return true;
 			else return false;
 		}
 		return false;
@@ -7227,7 +7227,7 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['notnull']) && $info['notnull']!='1') return true;
+			if (isset($info['notnull']) && $info['notnull'] != '1') return true;
 			else return false;
 		}
 		return true;
@@ -7243,7 +7243,7 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['notnull']) && $info['notnull']=='-1') return true;
+			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;
 			else return false;
 		}
 		return false;
@@ -7259,7 +7259,7 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['index']) && $info['index']==true) return true;
+			if (isset($info['index']) && $info['index'] == true) return true;
 			else return false;
 		}
 		return false;
@@ -7277,13 +7277,13 @@ 
 	{
 		global $conf;
 
-		$queryarray=array();
+		$queryarray = array();
 		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
-			if($this->isDate($info))
+			if ($this->isDate($info))
 			{
-				if(empty($this->{$field}))
+				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
 				}
@@ -7292,10 +7292,10 @@ 
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
 			}
-			elseif($this->isArray($info))
+			elseif ($this->isArray($info))
 			{
-				if(! empty($this->{$field})) {
-					if(! is_array($this->{$field})) {
+				if (!empty($this->{$field})) {
+					if (!is_array($this->{$field})) {
 						$this->{$field} = array($this->{$field});
 					}
 					$queryarray[$field] = serialize($this->{$field});
@@ -7303,19 +7303,19 @@ 
 					$queryarray[$field] = null;
 				}
 			}
-			elseif($this->isInt($info))
+			elseif ($this->isInt($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
+				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
 				else
 				{
 					$queryarray[$field] = (int) $this->{$field};
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+					if (empty($queryarray[$field])) $queryarray[$field] = 0; // May be reset to null later if property 'notnull' is -1 for this field.
 				}
 			}
-			elseif($this->isFloat($info))
+			elseif ($this->isFloat($info))
 			{
 				$queryarray[$field] = (double) $this->{$field};
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
+				if (empty($queryarray[$field])) $queryarray[$field] = 0;
 			}
 			else
 			{
@@ -7323,7 +7323,7 @@ 
 			}
 
 			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
 		}
 
 		return $queryarray;
@@ -7339,22 +7339,22 @@ 
 	{
 		foreach ($this->fields as $field => $info)
 		{
-			if($this->isDate($info))
+			if ($this->isDate($info))
 			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->isArray($info))
+			elseif ($this->isArray($info))
 			{
-				if(! empty($obj->{$field})) {
+				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
 				} else {
 					$this->{$field} = array();
 				}
 			}
-			elseif($this->isInt($info))
+			elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
 				else
@@ -7370,7 +7370,7 @@ 
 					}
 				}
 			}
-			elseif($this->isFloat($info))
+			elseif ($this->isFloat($info))
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
@@ -7389,7 +7389,7 @@ 
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
 	}
 
 	/**
@@ -7431,13 +7431,13 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref']=dol_string_nospecial($fieldvalues['ref']);					// If field is a ref,we sanitize data
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
+		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref,we sanitize data
 
 		$keys = array();
 		$values = array();
@@ -7448,55 +7448,55 @@ 
 		}
 
 		// Clean and check mandatory
-		foreach($keys as $key)
+		foreach ($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($val['default']))
 			{
 				$error++;
-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
+				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
 			}
 
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key] = 'null';
+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
 		}
 
 		if ($error) return -1;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= ' ('.implode(", ", $keys).')';
-			$sql.= ' VALUES ('.implode(", ", $values).')';
+			$sql .= ' ('.implode(", ", $keys).')';
+			$sql .= ' VALUES ('.implode(", ", $values).')';
 
 			$res = $this->db->query($sql);
-			if ($res===false) {
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 		}
 
 		// If we have a field ref with a default value of (PROV)
-		if (! $error)
+		if (!$error)
 		{
-		    if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && ! is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
+		    if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
 		    {
-		        $sql="UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE ref = '(PROV)' AND rowid = ".$this->id;
+		        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE ref = '(PROV)' AND rowid = ".$this->id;
 		        $resqlupdate = $this->db->query($sql);
 
-		        if ($resqlupdate===false)
+		        if ($resqlupdate === false)
 		        {
 		            $error++;
 		            $this->errors[] = $this->db->lasterror();
@@ -7505,16 +7505,16 @@ 
 		}
 
 		// Create extrafields
-		if (! $error)
+		if (!$error)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0) $error++;
 		}
 
 		// Create lines
-		if (! empty($this->table_element_line) && ! empty($this->fk_element))
+		if (!empty($this->table_element_line) && !empty($this->fk_element))
 		{
-			$num=(is_array($this->lines) ? count($this->lines) : 0);
+			$num = (is_array($this->lines) ? count($this->lines) : 0);
 			for ($i = 0; $i < $num; $i++)
 			{
 				$line = $this->lines[$i];
@@ -7524,12 +7524,12 @@ 
 
 				// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-				if (! is_object($line)) $line = (object) $line;
+				if (!is_object($line)) $line = (object) $line;
 
 				$result = $line->create($user, 1);
 				if ($result < 0)
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
@@ -7537,10 +7537,10 @@ 
 		}
 
 		// Triggers
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
@@ -7569,14 +7569,14 @@ 
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
 		$sql = 'SELECT '.$this->getFieldList();
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.=' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere)   $sql.= $morewhere;
-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
+		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
+		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
+		if ($morewhere)   $sql .= $morewhere;
+		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
 		if ($res)
@@ -7609,7 +7609,7 @@ 
 	public function fetchLinesCommon($morewhere = '')
 	{
 		$objectlineclassname = get_class($this).'Line';
-		if (! class_exists($objectlineclassname))
+		if (!class_exists($objectlineclassname))
 		{
 			$this->error = 'Error, class '.$objectlineclassname.' not found during call of fetchLinesCommon';
 			return -1;
@@ -7618,9 +7618,9 @@ 
 		$objectline = new $objectlineclassname($this->db);
 
 		$sql = 'SELECT '.$objectline->getFieldList();
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
-		$sql.=' WHERE fk_'.$this->element.' = '.$this->id;
-		if ($morewhere)   $sql.= $morewhere;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
+		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
+		if ($morewhere)   $sql .= $morewhere;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -7663,12 +7663,12 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
 		$keys = array();
 		$values = array();
@@ -7681,10 +7681,10 @@ 
 		}
 
 		// Clean and check mandatory
-		foreach($keys as $key)
+		foreach ($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7695,13 +7695,13 @@ 
 			}*/
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id ;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;
 
 		$this->db->begin();
-		if (! $error)
+		if (!$error)
 		{
 			$res = $this->db->query($sql);
-			if ($res===false)
+			if ($res === false)
 			{
 				$error++;
 				$this->errors[] = $this->db->lasterror();
@@ -7709,9 +7709,9 @@ 
 		}
 
 		// Update extrafield
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+		if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0)
 			{
 				$error++;
@@ -7719,10 +7719,10 @@ 
 		}
 
 		// Triggers
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
 			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
 			// End call triggers
 		}
@@ -7747,82 +7747,82 @@ 
 	 */
 	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
 		{
-			foreach($this->childtables as $table)
+			foreach ($this->childtables as $table)
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
 				$resql = $this->db->query($sql);
-				if (! $resql)
+				if (!$resql)
 				{
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->error;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -1;
 				}
 			}
 		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
-			if (! empty($objectisused))
+			if (!empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
-				$this->error='ErrorRecordHasChildren';
-				$this->errors[]=$this->error;
+				$this->error = 'ErrorRecordHasChildren';
+				$this->errors[] = $this->error;
 				$this->db->rollback();
 				return 0;
 			}
 		}
 
 		// Delete cascade first
-		if (! empty($this->childtablesoncascade)) {
-            foreach($this->childtablesoncascade as $table)
+		if (!empty($this->childtablesoncascade)) {
+            foreach ($this->childtablesoncascade as $table)
             {
                 $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
                 $resql = $this->db->query($sql);
-                if (! $resql)
+                if (!$resql)
                 {
-                    $this->error=$this->db->lasterror();
-                    $this->errors[]=$this->error;
+                    $this->error = $this->db->lasterror();
+                    $this->errors[] = $this->error;
                     $this->db->rollback();
                     return -1;
                 }
             }
         }
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
 				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
 
-		if (! $error && ! empty($this->isextrafieldmanaged))
+		if (!$error && !empty($this->isextrafieldmanaged))
 		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";
-			$sql.= " WHERE fk_object=" . $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
 			$res = $this->db->query($sql);
-			if($res===false) {
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
@@ -7850,26 +7850,26 @@ 
 	{
 		global $conf;
 
-		$error=0;
+		$error = 0;
 
 		$tmpforobjectclass = get_class($this);
 		$tmpforobjectlineclass = ucfirst($tmpforobjectclass).'Line';
 
 		// Call trigger
-		$result=$this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
+		$result = $this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
 		if ($result < 0) return -1;
 		// End call triggers
 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= " WHERE rowid=".$idline;
+		$sql .= " WHERE rowid=".$idline;
 
 		dol_syslog(get_class($this)."::deleteLineCommon", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
@@ -7878,12 +7878,12 @@ 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
 				$tmpobjectline = new $tmpforobjectlineclass($this->db);
-				$tmpobjectline->id= $idline;
-				$result=$tmpobjectline->deleteExtraFields();
+				$tmpobjectline->id = $idline;
+				$result = $tmpobjectline->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
-					$this->error="Error ".get_class($this)."::deleteLineCommon deleteExtraFields error -4 ".$tmpobjectline->error;
+					$this->error = "Error ".get_class($this)."::deleteLineCommon deleteExtraFields error -4 ".$tmpobjectline->error;
 				}
 			}
 		}
@@ -7910,24 +7910,24 @@ 
 	 */
 	public function setStatusCommon($user, $status, $notrigger = 0, $triggercode = '')
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET status = ".$status;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET status = ".$status;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		if ($this->db->query($sql))
 		{
-			if (! $error)
+			if (!$error)
 			{
-				$this->oldcopy= clone $this;
+				$this->oldcopy = clone $this;
 			}
 
-			if (! $error && ! $notrigger) {
+			if (!$error && !$notrigger) {
 				// Call trigger
-				$result=$this->call_trigger($triggercode, $user);
+				$result = $this->call_trigger($triggercode, $user);
 				if ($result < 0) $error++;
 			}
 
@@ -7942,7 +7942,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -7960,14 +7960,14 @@ 
 	    global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label='This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public='Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private='Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation=(dol_now()-3600*24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification=(dol_now()-3600*24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat=$user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif=$user->id;
-		if (array_key_exists('date', $this->fields)) $this->date=dol_now();
+		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
+		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';
+		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';
+		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);
+		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);
+		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;
+		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;
+		if (array_key_exists('date', $this->fields)) $this->date = dol_now();
 		// ...
 	}
 
@@ -7983,9 +7983,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
 		$comment = new Comment($this->db);
-		$result=$comment->fetchAllFor($this->element, $this->id);
-		if ($result<0) {
-			$this->errors=array_merge($this->errors, $comment->errors);
+		$result = $comment->fetchAllFor($this->element, $this->id);
+		if ($result < 0) {
+			$this->errors = array_merge($this->errors, $comment->errors);
 			return -1;
 		} else {
 			$this->comments = $comment->comments;
@@ -8036,11 +8036,11 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_" . $categorystatic->MAP_CAT_TABLE[$type] . " (fk_categorie, fk_product)";
-		$sql.= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_" . $categorystatic->MAP_CAT_TABLE[$type];
-		$sql.= " WHERE fk_product = '".$fromId."'";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$categorystatic->MAP_CAT_TABLE[$type]." (fk_categorie, fk_product)";
+		$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".$categorystatic->MAP_CAT_TABLE[$type];
+		$sql .= " WHERE fk_product = '".$fromId."'";
 
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();

Braces +1403 added lines, -845 removed lines

@@ -454,23 +454,31 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
 		$sql.= " WHERE entity IN (".getEntity($element).")" ;
 
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		elseif ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		elseif ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
+		if ($id > 0) {
+			$sql.= " AND rowid = ".$db->escape($id);
+		} elseif ($ref) {
+			$sql.= " AND ref = '".$db->escape($ref)."'";
+		} elseif ($ref_ext) {
+			$sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {
 			$error='ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) {
+			$sql.= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num=$db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
+			if ($num > 0) {
+				return 1;
+			} else {
+				return 0;
+			}
 		}
 		return -1;
 	}
@@ -539,13 +547,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
 		$lastname=$this->lastname;
 		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		if (empty($lastname)) {
+			$lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		}
 
 		$ret='';
 		if ($option && $this->civility_id)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) {
+				$ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			} else {
+				$ret.=$this->civility_id.' ';
+			}
 		}
 
 		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -643,14 +656,15 @@ 
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
                 $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
-            }
-            else {
+            } else {
                 $out.=($outdone?' - ':'').$this->state;
             }
 			$outdone++;
 		}
 
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) {
+			$out.=($outdone?'<br>':'');
+		}
 		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out.=dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
@@ -698,15 +712,25 @@ 
 					$outdone++;
 				}
 			} else {
-				if ($this->skype) $out.=dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				if ($this->skype) {
+					$out.=dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				}
 				$outdone++;
-				if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				if ($this->jabberid) {
+					$out.=dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				}
 				$outdone++;
-				if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				if ($this->twitter) {
+					$out.=dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				}
 				$outdone++;
-				if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				if ($this->facebook) {
+					$out.=dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				}
 				$outdone++;
-				if ($this->linkedin) $out.=dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				if ($this->linkedin) {
+					$out.=dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				}
 				$outdone++;
 			}
 		}
@@ -767,10 +791,10 @@ 
 					$this->errors = $ecmfile->errors;
 				}
 				*/
+			} else {
+				return '';
 			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
+		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
 			if ($initsharekey)
@@ -778,8 +802,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
+			} else {
+				return '';
 			}
-			else return '';
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -795,14 +820,18 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+		if (! empty($ecmfile->share)) {
+			$paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share
+		if ($forcedownload) {
+			$paramlink.=($paramlink?'&':'').'attachment=1';
+		}
 
 		if ($relativelink)
 		{
 			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
-		}
-		else
+		} else
 		{
 			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
 		}
@@ -850,8 +879,7 @@ 
 		if (is_numeric($type_contact))
 		{
 			$id_type_contact=$type_contact;
-		}
-		else
+		} else
 		{
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
@@ -864,7 +892,9 @@ 
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
+				if ($obj) {
+					$id_type_contact=$obj->rowid;
+				}
 			}
 		}
 
@@ -915,8 +945,7 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
@@ -924,15 +953,16 @@ 
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -974,15 +1004,18 @@ 
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		if ($type_contact_id) {
+			$sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+		}
+		if ($fk_socpeople) {
+			$sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		}
 		$sql.= " where rowid = ".$rowid;
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1019,8 +1052,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1050,15 +1082,15 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql.= " WHERE element_id = ".$this->id;
-		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		if ($listId) {
+					$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		}
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1083,22 +1115,38 @@ 
 		$tab=array();
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		if ($source == 'internal') {
+			$sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		if ($source == 'internal') {
+			$sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external'|| $source == 'thirdparty') {
+			$sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql.= " WHERE ec.element_id =".$this->id;
 		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
+		if ($code) {
+			$sql.= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+			$sql.= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql.= " AND tc.source = 'external'";
+		}
 		$sql.= " AND tc.active=1";
-		if ($status >= 0) $sql.= " AND ec.statut = ".$status;
+		if ($status >= 0) {
+			$sql.= " AND ec.statut = ".$status;
+		}
 		$sql.=" ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
@@ -1119,8 +1167,7 @@ 
 								   'nom'=>$obj->lastname,      // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else
+				} else
 				{
 					$tab[$i]=$obj->id;
 				}
@@ -1129,8 +1176,7 @@ 
 			}
 
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_print_error($this->db);
@@ -1165,8 +1211,7 @@ 
 			$result = $this->update_contact($rowid, $newstatut);
 			$this->db->free($resql);
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_print_error($this->db);
@@ -1190,16 +1235,27 @@ 
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
+		if (empty($order)) {
+			$order='position';
+		}
+		if ($order == 'position') {
+			$order.=',code';
+		}
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		if ($activeonly == 1) {
+			$sql.= " AND tc.active=1";
+		}
+		// only the active types
+		if (! empty($source) && $source != 'all') {
+			$sql.= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (! empty($code)) {
+			$sql.= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql.= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
@@ -1214,13 +1270,15 @@ 
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				if (empty($option)) {
+					$tab[$obj->rowid]=$libelle_type;
+				} else {
+					$tab[$obj->code]=$libelle_type;
+				}
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			//dol_print_error($this->db);
@@ -1250,17 +1308,22 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 
 		$sqlWhere=array();
-		if (!empty($element))
-			$sqlWhere[]=" tc.element='".$this->db->escape($element)."'";
+		if (!empty($element)) {
+					$sqlWhere[]=" tc.element='".$this->db->escape($element)."'";
+		}
 
-		if ($activeonly == 1)
-			$sqlWhere[]=" tc.active=1"; // only the active types
+		if ($activeonly == 1) {
+					$sqlWhere[]=" tc.active=1";
+		}
+		// only the active types
 
-		if (! empty($source) && $source != 'all')
-			$sqlWhere[]=" tc.source='".$this->db->escape($source)."'";
+		if (! empty($source) && $source != 'all') {
+					$sqlWhere[]=" tc.source='".$this->db->escape($source)."'";
+		}
 
-		if (! empty($code))
-			$sqlWhere[]=" tc.code='".$this->db->escape($code)."'";
+		if (! empty($code)) {
+					$sqlWhere[]=" tc.code='".$this->db->escape($code)."'";
+		}
 
 		if (count($sqlWhere)>0) {
 			$sql .= " WHERE ". implode(' AND ', $sqlWhere);
@@ -1289,15 +1352,16 @@ 
 						$libelle_element = $langs->trans('ContactDefault_' . $obj->element);
 						$transkey = "TypeContact_" . $this->element . "_" . $source . "_" . $obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-						if (empty($option))
+						if (empty($option)) {
+													$tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
+						} else {
 							$tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
-						else $tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
+						}
 					}
 				}
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return null;
@@ -1335,19 +1399,31 @@ 
 
 		$sql = "SELECT ec.fk_socpeople";
 		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		if ($source == 'internal') {
+			$sql.= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+			$sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE ec.element_id = ".$id;
 		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'internal') {
+			$sql.= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+			$sql.= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql.= " AND tc.element = '".$element."'";
 		$sql.= " AND tc.source = '".$source."'";
-		if ($code) $sql.= " AND tc.code = '".$code."'";
+		if ($code) {
+			$sql.= " AND tc.code = '".$code."'";
+		}
 		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
+		if ($status) {
+			$sql.= " AND ec.statut = ".$status;
+		}
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -1358,8 +1434,7 @@ 
 				$result[$i]=$obj->fk_socpeople;
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return null;
@@ -1378,9 +1453,13 @@ 
 	public function fetch_contact($contactid = null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+		if (empty($contactid)) {
+			$contactid=$this->contactid;
+		}
 
-		if (empty($contactid)) return 0;
+		if (empty($contactid)) {
+			return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -1401,14 +1480,16 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-			return 0;
+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
-			$idtofetch = $force_thirdparty_id;
+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 
 		if ($idtofetch) {
 			$thirdparty = new Societe($this->db);
@@ -1421,8 +1502,9 @@ 
 			}
 
 			return $result;
-		} else
-			return -1;
+		} else {
+					return -1;
+		}
 	}
 
 
@@ -1468,18 +1550,24 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
 		$idtype=$this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+		if (empty($idtype) && $idtype != '0') {
+			// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			elseif ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+		} elseif ($this->element == 'societe') {
+				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			} else {
+				dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+			}
 		}
 
 		if ($idtype > 0)
 		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+				// If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 				$sql.= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
@@ -1492,8 +1580,7 @@ 
 					$this->barcode_type_label = $obj->label;
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
-				}
-				else
+				} else
 				{
 					dol_print_error($this->db);
 					return -1;
@@ -1514,8 +1601,13 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
-		if (empty($this->fk_project)) return 0;
+		if (empty($this->fk_project) && ! empty($this->fk_projet)) {
+			$this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility
+		if (empty($this->fk_project)) {
+			return 0;
+		}
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
@@ -1536,7 +1628,9 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-		if (empty($this->fk_product)) return 0;
+		if (empty($this->fk_product)) {
+			return 0;
+		}
 
 		$product = new Product($this->db);
 		$result = $product->fetch($this->fk_product);
@@ -1570,9 +1664,15 @@ 
 	public function fetch_origin()
 	{
         // phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'shipping') {
+			$this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+			$this->origin = 'livraison';
+		}
+        if ($this->origin == 'order_supplier') {
+        	$this->origin = 'commandeFournisseur';
+        }
 
 		$origin = $this->origin;
 
@@ -1664,29 +1764,48 @@ 
 	{
 		global $user,$langs,$conf;
 
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
+		if (empty($table)) {
+			$table=$this->table_element;
+		}
+		if (empty($id)) {
+			$id=$this->id;
+		}
+		if (empty($format)) {
+			$format='text';
+		}
+		if (empty($id_field)) {
+			$id_field='rowid';
+		}
 
 		$error=0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+		if ($table == 'product' && $field == 'note_private') {
+			$field='note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+			$fk_user_field = 'fk_user_mod';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		elseif ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		elseif ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') {
+			$sql.= $field." = '".$this->db->escape($value)."'";
+		} elseif ($format == 'int') {
+			$sql.= $field." = ".$this->db->escape($value);
+		} elseif ($format == 'date') {
+			$sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 
 		if ($fk_user_field)
 		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+			if (! empty($fuser) && is_object($fuser)) {
+				$sql.=", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+				$sql.=", ".$fk_user_field." = ".$user->id;
+			}
 		}
 
 		$sql.= " WHERE ".$id_field." = ".$id;
@@ -1701,28 +1820,32 @@ 
 				if (empty($this->fields) && method_exists($this, 'fetch'))
 				{
 					$result = $this->fetch($id);
-				}
-				else
+				} else
 				{
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
-				if ($result < 0) $error++;
+				if ($result >= 0) {
+					$result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (! $error)
 			{
-				if (property_exists($this, $field)) $this->$field = $value;
+				if (property_exists($this, $field)) {
+					$this->$field = $value;
+				}
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1749,36 +1872,66 @@ 
 			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
-		if ($fieldid == 'none') return 1;
+		if ($fieldid == 'none') {
+			return 1;
+		}
 
 		// Security on socid
 		$socid = 0;
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 
 		// this->ismultientitymanaged contains
 		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 		$alias = 's';
-		if ($this->element == 'societe') $alias = 'te';
+		if ($this->element == 'societe') {
+			$alias = 'te';
+		}
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
 		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
 		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+			if (! preg_match('/^\s*AND/i', $filter)) {
+				$sql.=" AND ";
+			}
+			// For backward compatibility
 			$sql.=$filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+			$sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1791,9 +1944,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
@@ -1811,20 +1970,44 @@ 
 		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+			if (! preg_match('/^\s*AND/i', $filter)) {
+				$sql.=" AND ";
+			}
+			// For backward compatibility
 			$sql.=$filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+			$sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1837,9 +2020,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1871,8 +2060,11 @@ 
 		$i = 0;
 		while ($i < $num)
 		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			if ($source == 'thirdparty') {
+				$contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+				$contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1894,22 +2086,29 @@ 
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if (! empty($this->fields['fk_project']))		// Common case
+		if (! empty($this->fields['fk_project'])) {
+			// Common case
 		{
 			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
+		} else {
+				$sql.= ' SET fk_project = NULL';
+			}
 			$sql.= ' WHERE rowid = '.$this->id;
-		}
-		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
+		} elseif ($this->table_element == 'actioncomm') {
+			// Special case for actioncomm
 		{
 			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
+		} else {
+				$sql.= ' SET fk_project = NULL';
+			}
 			$sql.= ' WHERE id = '.$this->id;
-		}
-		else											// Special case for old architecture objects
+		} else											// Special case for old architecture objects
 		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
+			if ($projectid) {
+				$sql.= ' SET fk_projet = '.$projectid;
+			} else {
+				$sql.= ' SET fk_projet = NULL';
+			}
 			$sql.= ' WHERE rowid = '.$this->id;
 		}
 
@@ -1918,8 +2117,7 @@ 
 		{
 			$this->fk_project = $projectid;
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -1939,8 +2137,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'mode_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -1950,17 +2152,17 @@ 
 			{
 				$this->mode_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->mode_reglement_supplier_id = $id;
+				}
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1990,18 +2192,18 @@ 
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate, 2);
+				if ($rate) {
+					$this->setMulticurrencyRate($rate, 2);
+				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -2101,15 +2303,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -2130,8 +2330,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'cond_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -2141,18 +2345,18 @@ 
 			{
 				$this->cond_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id;	// for compatibility
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -2182,15 +2386,13 @@ 
 	        {
 	            $this->retained_warranty_fk_cond_reglement = $id;
 	            return 1;
-	        }
-	        else
+	        } else
 	        {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 	            $this->error=$this->db->error();
 	            return -1;
 	        }
-	    }
-	    else
+	    } else
 	    {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
 	        $this->error='Status of the object is incompatible '.$this->statut;
@@ -2208,7 +2410,9 @@ 
 	public function setDeliveryAddress($id)
 	{
 		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+			$fieldname = 'fk_address';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
 		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -2217,8 +2421,7 @@ 
 		{
 			$this->fk_delivery_address = $id;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
@@ -2240,7 +2443,9 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+			$userused=$user;
+		}
 
 		$error = 0;
 
@@ -2251,7 +2456,9 @@ 
 
 		$this->db->begin();
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
+		if ($shipping_method_id<0) {
+			$shipping_method_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2268,7 +2475,9 @@ 
 				// Call trigger
 				$this->context=array('shippingmethodupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
@@ -2296,7 +2505,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
+		if ($warehouse_id<0) {
+			$warehouse_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2343,8 +2554,7 @@ 
 		{
 			$this->modelpdf=$modelpdf;
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return 0;
@@ -2364,7 +2574,9 @@ 
 	{
 		global $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+			$userused=$user;
+		}
 
 		$error = 0;
 
@@ -2374,7 +2586,9 @@ 
 		}
 		$this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
+		if ($fk_account<0) {
+			$fk_account='NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2387,15 +2601,16 @@ 
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
 			$error++;
-		}
-		else
+		} else
 		{
 			if (!$notrigger)
 			{
 				// Call trigger
 				$this->context=array('bankaccountupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
@@ -2403,8 +2618,7 @@ 
 		{
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->fk_account = ($fk_account=='NULL')?null:$fk_account;
 			$this->db->commit();
@@ -2443,8 +2657,12 @@ 
 		$nl=0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
+		if (! $renum) {
+			$sql.= ' AND rang = 0';
+		}
+		if ($renum) {
+			$sql.= ' AND rang <> 0';
+		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2452,8 +2670,9 @@ 
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
+		} else {
+			dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2463,7 +2682,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
+			if ($fk_parent_line) {
+				$sql.= ' AND fk_parent_line IS NULL';
+			}
 			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
@@ -2495,8 +2716,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));
 					}
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2589,7 +2809,9 @@ 
 	public function updateRangOfLine($rowid, $rang)
 	{
 		$fieldposition = 'rang';	// @TODO Rename 'rang' into 'position'
-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) {
+			$fieldposition = 'position';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
@@ -2630,7 +2852,9 @@ 
 		if ($rang > 1)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2643,8 +2867,7 @@ 
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2664,7 +2887,9 @@ 
 		if ($rang < $max)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2677,8 +2902,7 @@ 
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2749,8 +2973,7 @@ 
 				if (! empty($row[0]))
 				{
 					return $row[0];
-				}
-				else
+				} else
 				{
 					return $this->getRangOfLine($fk_parent_line);
 				}
@@ -2797,8 +3020,7 @@ 
 		{
 			$this->ref_ext = $ref_ext;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2832,7 +3054,9 @@ 
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
+		if ($this->table_element == 'product') {
+			$suffix='';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
@@ -2842,16 +3066,17 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if ($suffix == '_public') $this->note_public = $note;
-			elseif ($suffix == '_private') $this->note_private = $note;
-			else
+			if ($suffix == '_public') {
+				$this->note_public = $note;
+			} elseif ($suffix == '_private') {
+				$this->note_private = $note;
+			} else
 			{
 				$this->note = $note;      // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -2891,36 +3116,45 @@ 
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
-		if ($this->element == 'propal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'commande' || $this->element == 'order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture' || $this->element == 'invoice')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'commande' || $this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture' || $this->element == 'invoice') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 
 		if (! empty($MODULE)) {
 			if (! empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
-						return 1; // update was disabled by specific setup
+					if ($conf->$mod->enabled) {
+											return 1;
+					}
+					// update was disabled by specific setup
 				}
 			}
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+		if ($roundingadjust == '-1') {
+			$roundingadjust='auto';
+		}
+		// For backward compatibility
 
 		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+			$forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+			$forcedroundingmode='0';
+		}
 
 		$error=0;
 
@@ -2943,15 +3177,22 @@ 
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
 		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
+			if ($this->table_element_line == 'facturedet') {
+				$sql.= ', situation_percent';
+			}
 			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
 			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+			if ($this->table_element_line == 'contratdet') {
+				$product_field='';
+			}
+			// contratdet table has no product_type field
+			if ($product_field) {
+				$sql.= ' AND '.$product_field.' <> 9';
+			}
 		}
 		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
@@ -2981,9 +3222,11 @@ 
 				$parameters=array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+				if (empty($reshook) && $forcedroundingmode == '0') {
+					// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
 					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
+				}
 					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
 					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
 					if ($diff)
@@ -2991,7 +3234,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db, 'Failed to update line');
+								if (! $resqlfix) {
+									dol_print_error($this->db, 'Failed to update line');
+								}
 								$obj->total_tva = $tmpcal[1];
 								$obj->total_ttc = $tmpcal[2];
 						//
@@ -3007,16 +3252,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+				if (! isset($total_ht_by_vats[$obj->vatrate])) {
+					$total_ht_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_tva_by_vats[$obj->vatrate])) {
+					$total_tva_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_ttc_by_vats[$obj->vatrate])) {
+					$total_ttc_by_vats[$obj->vatrate]=0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+				if ($forcedroundingmode == '1') {
+					// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
 					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
@@ -3025,7 +3278,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db, 'Failed to update line');
+								if (! $resqlfix) {
+									dol_print_error($this->db, 'Failed to update line');
+								}
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -3066,11 +3321,21 @@ 
 			$fieldlocaltax2='localtax2';
 			$fieldttc='total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+				$fieldht='total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+				$fieldtva='total_tva';
+			}
+			if ($this->element == 'propal') {
+				$fieldttc='total';
+			}
+			if ($this->element == 'expensereport') {
+				$fieldtva='total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+				$fieldttc='total';
+			}
 
 			if (empty($nodatabaseupdate))
 			{
@@ -3099,13 +3364,11 @@ 
 			if (! $error)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db, 'Bad request in update_price');
 			return -1;
@@ -3128,10 +3391,18 @@ 
 		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-		if ($origin == 'supplierorder') $origin='order_supplier';
+		if ($origin == 'order') {
+			$origin='commande';
+		}
+		if ($origin == 'invoice') {
+			$origin='facture';
+		}
+		if ($origin == 'invoice_template') {
+			$origin='facturerec';
+		}
+		if ($origin == 'supplierorder') {
+			$origin='order_supplier';
+		}
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -3151,8 +3422,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -3197,12 +3467,16 @@ 
 		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
 		{
 			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
+			if (! empty($targettype)) {
+				$withtargettype=true;
+			}
 		}
 		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
 		{
 			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
+			if (! empty($sourcetype)) {
+				$withsourcetype=true;
+			}
 		}
 
 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
@@ -3225,15 +3499,17 @@ 
 			if ($justsource)
 			{
 				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
-			}
-			elseif ($justtarget)
+				if ($withtargettype) {
+					$sql.= " AND targettype = '".$targettype."'";
+				}
+			} elseif ($justtarget)
 			{
 				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+				if ($withsourcetype) {
+					$sql.= " AND sourcetype = '".$sourcetype."'";
+				}
 			}
-		}
-		else
+		} else
 		{
 			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
@@ -3254,13 +3530,11 @@ 
 					if ($justsource)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
-					}
-					elseif ($justtarget)
+					} elseif ($justtarget)
 					{
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
 					}
-				}
-				else
+				} else
 				{
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
@@ -3277,10 +3551,12 @@ 
 			if (! empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach($tmparray as $objecttype => $objectids) {
+					// $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 					{
@@ -3292,29 +3568,21 @@ 
 					// To work with non standard classpath or module name
 					if ($objecttype == 'facture')			{
 						$classpath = 'compta/facture/class';
-					}
-					elseif ($objecttype == 'facturerec')			{
+					} elseif ($objecttype == 'facturerec')			{
 						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					elseif ($objecttype == 'propal')			{
+					} elseif ($objecttype == 'propal')			{
 						$classpath = 'comm/propal/class';
-					}
-					elseif ($objecttype == 'supplier_proposal')			{
+					} elseif ($objecttype == 'supplier_proposal')			{
 						$classpath = 'supplier_proposal/class';
-					}
-					elseif ($objecttype == 'shipping')			{
+					} elseif ($objecttype == 'shipping')			{
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					elseif ($objecttype == 'delivery')			{
+					} elseif ($objecttype == 'delivery')			{
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
 						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					elseif ($objecttype == 'fichinter')			{
+					} elseif ($objecttype == 'fichinter')			{
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					elseif ($objecttype == 'subscription')			{
+					} elseif ($objecttype == 'subscription')			{
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
 
@@ -3323,20 +3591,15 @@ 
 
 					if ($objecttype == 'order') {
 						$classfile = 'commande'; $classname = 'Commande';
-					}
-					elseif ($objecttype == 'invoice_supplier') {
+					} elseif ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					elseif ($objecttype == 'order_supplier')   {
+					} elseif ($objecttype == 'order_supplier')   {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					elseif ($objecttype == 'supplier_proposal')   {
+					} elseif ($objecttype == 'supplier_proposal')   {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					elseif ($objecttype == 'facturerec')   {
+					} elseif ($objecttype == 'facturerec')   {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					elseif ($objecttype == 'subscription')   {
+					} elseif ($objecttype == 'subscription')   {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 
@@ -3349,9 +3612,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach($objectids as $i => $objectid) {
+									// $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);
 									if ($ret >= 0)
 									{
@@ -3360,16 +3625,14 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3391,8 +3654,11 @@ 
 		$updatesource=false;
 		$updatetarget=false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$updatesource=true;
+		} elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+			$updatetarget=true;
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
@@ -3401,8 +3667,7 @@ 
 			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
 			$sql.= " WHERE fk_target = ".$this->id;
 			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		elseif ($updatetarget)
+		} elseif ($updatetarget)
 		{
 			$sql.= "fk_target = ".$targetid;
 			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
@@ -3414,8 +3679,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -3438,8 +3702,11 @@ 
 		$deletesource=false;
 		$deletetarget=false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$deletesource=true;
+		} elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+			$deletetarget=true;
+		}
 
 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
 		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
@@ -3451,20 +3718,17 @@ 
 		if ($rowid > 0)
 		{
 			$sql.=" rowid = ".$rowid;
-		}
-		else
+		} else
 		{
 			if ($deletesource)
 			{
 				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			elseif ($deletetarget)
+			} elseif ($deletetarget)
 			{
 				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else
+			} else
 			{
 				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql.= " OR";
@@ -3476,8 +3740,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->error;
@@ -3506,17 +3769,31 @@ 
 		$this->db->begin();
 
 		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+		if ($elementTable == 'facture_rec') {
+			$fieldstatus="suspended";
+		}
+		if ($elementTable == 'mailing') {
+			$fieldstatus="statut";
+		}
+		if ($elementTable == 'cronjob') {
+			$fieldstatus="status";
+		}
+		if ($elementTable == 'user') {
+			$fieldstatus="statut";
+		}
+		if ($elementTable == 'expensereport') {
+			$fieldstatus="fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+			$fieldstatus="status";
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql.= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
+		if ($status == 1 && $elementTable == 'expensereport') {
+			$sql.=", fk_user_valid = ".$user->id;
+		}
 		$sql.= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
@@ -3527,12 +3804,27 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) {
+					$trigkey='SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) {
+					$trigkey='SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) {
+					$trigkey='SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) {
+					$trigkey='FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+					$trigkey='FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+					$trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}
 
 			if ($trigkey)
@@ -3551,22 +3843,22 @@ 
 			{
 				$this->db->commit();
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+				if (empty($savElementId)) {
+					// If the element we update was $this (so $elementId is null)
 				{
 					$this->statut = $status;
+				}
 					$this->status = $status;
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatus ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -3586,8 +3878,13 @@ 
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+		if (empty($id) && empty($ref)) {
+			return 0;
+		}
+		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) {
+			return 0;
+		}
+		// To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
@@ -3595,8 +3892,12 @@ 
 		$sql = "SELECT rowid, canvas";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		if (! empty($id)) {
+			$sql.= " AND rowid = ".$id;
+		}
+		if (! empty($ref)) {
+			$sql.= " AND ref = '".$this->db->escape($ref)."'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3606,10 +3907,10 @@ 
 			{
 				$this->canvas   = $obj->canvas;
 				return 1;
+			} else {
+				return 0;
 			}
-			else return 0;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3646,7 +3947,9 @@ 
 	{
 		global $langs;
 
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) {
+			$id=$this->id;
+		}
 
 		// Check parameters
 		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
@@ -3680,18 +3983,18 @@ 
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
+					if (is_numeric($elementname)) {
+						// old usage
 					{
 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
-					else	// new usage: $elementname=Translation key
+					} else	// new usage: $elementname=Translation key
 					{
 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break;    // We found at least one, we stop here
 				}
-			}
-			else
+			} else
 			{
 				$this->errors[]=$this->db->lasterror();
 				return -1;
@@ -3701,8 +4004,9 @@ 
 		{
 			$this->errors[]="ErrorRecordHasChildren";
 			return $haschild;
+		} else {
+			return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -3718,12 +4022,24 @@ 
 		foreach($this->lines as $key => $val)
 		{
 			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
-			if ($qualified) $nb++;
+			if ($predefined == -1) {
+				$qualified=1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+				$qualified=1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+				$qualified=1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) {
+				$qualified=1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) {
+				$qualified=1;
+			}
+			if ($qualified) {
+				$nb++;
+			}
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
 		return $nb;
@@ -3787,17 +4103,24 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
+				if (empty($totalOrdered)) {
+					$totalOrdered=0;
+				}
+				// Avoid warning because $totalOrdered is ''
 				$totalOrdered+=$line->qty_asked;    // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
+				if (empty($totalToShip)) {
+					$totalToShip=0;
+				}
+				// Avoid warning because $totalToShip is ''
 				$totalToShip+=$line->qty_shipped;   // defined for shipment only
-			}
-			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
-				if (empty($totalToShip)) $totalToShip=0;
+				if (empty($totalToShip)) {
+					$totalToShip=0;
+				}
 				$totalToShip+=$line->qty;   // defined for reception only
 			}
 
@@ -3805,8 +4128,7 @@ 
 			if ($this->element == 'shipping') {
 				// for shipments
 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
+			} else {
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
@@ -3822,19 +4144,30 @@ 
 
 			$weightUnit=0;
 			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+			if (! empty($weight_units)) {
+				$weightUnit = $weight_units;
+			}
+			if (! empty($volume_units)) {
+				$volumeUnit = $volume_units;
+			}
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) {
+				$totalWeight=0;
+			}
+			// Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) {
+				$totalVolume=0;
+			}
+			// Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($weight_units < 50) {
+				// < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				$trueWeightUnit=pow(10, $weightUnit);
-				$totalWeight += $weight * $qty * $trueWeightUnit;
 			}
-			else {
+				$totalWeight += $weight * $qty * $trueWeightUnit;
+			} else {
 				if ($weight_units == 99) {
 					// conversion 1 Pound = 0.45359237 KG
 					$trueWeightUnit = 0.45359237;
@@ -3843,19 +4176,19 @@ 
 					// conversion 1 Ounce = 0.0283495 KG
 					$trueWeightUnit = 0.0283495;
 					$totalWeight += $weight * $qty * $trueWeightUnit;
-				}
-				else {
+				} else {
 					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
 				}
 			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($volume_units < 50) {
+				// >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
 				$trueVolumeUnit=pow(10, $volumeUnit);
+			}
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else
+			} else
 			{
 				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
 			}
@@ -3887,8 +4220,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -3940,13 +4272,11 @@ 
 			{
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else
+			} else
 			{
 				return '';
 			}
-		}
-		else
+		} else
 		{
 			$this->errors[] = $this->db->lasterror();
 			return false;
@@ -3983,14 +4313,14 @@ 
 					$this->label_incoterms = $obj->libelle;
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
+		} else {
+			return -1;
 		}
-		else return -1;
 	}
 
 
@@ -4030,8 +4360,7 @@ 
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
-			}
-			else
+			} else
 			{
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
 			}
@@ -4041,7 +4370,9 @@ 
 			} else {
 				$res=include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4072,7 +4403,9 @@ 
 
 		// Define usemargins
 		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element, array('facture','facturerec','propal','commande'))) $usemargins=1;
+		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element, array('facture','facturerec','propal','commande'))) {
+			$usemargins=1;
+		}
 
 		$num = count($this->lines);
 
@@ -4096,8 +4429,7 @@ 
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
-				}
-				else
+				} else
 				{
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
@@ -4106,7 +4438,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
@@ -4120,14 +4454,15 @@ 
 			$line->fetch_optionals();
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
+			if (is_object($hookmanager)) {
+				// Old code is commented on preceding line.
 			{
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'table_element_line'=>$line->table_element);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-				}
-				else
+				} else
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
@@ -4175,8 +4510,14 @@ 
 		// Show product and description
 		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
+		if (! empty($line->date_start)) {
+			$type=1;
+		}
+		// deprecated
+		if (! empty($line->date_end)) {
+			$type=1;
+		}
+		// deprecated
 
 		// Ligne en mode visu
 		if ($action != 'editline' || $selected != $line->id)
@@ -4205,8 +4546,13 @@ 
 
 					$outputlangs = $langs;
 					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang=$this->thirdparty->default_lang;		// To use language of customer
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang=GETPOST('lang_id', 'aZ09');
+					}
+					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) {
+						$newlang=$this->thirdparty->default_lang;
+					}
+					// To use language of customer
 					if (! empty($newlang))
 					{
 						$outputlangs = new Translate("", $conf);
@@ -4214,8 +4560,7 @@ 
 					}
 
 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else
+				} else
 				{
 					$label = $line->product_label;
 				}
@@ -4234,8 +4579,7 @@ 
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
-				}
-				else
+				} else
 				{
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
 				}
@@ -4245,7 +4589,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
@@ -4265,8 +4611,7 @@ 
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
-				}
-				else
+				} else
 				{
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
 				}
@@ -4276,7 +4621,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 	}
@@ -4304,7 +4651,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';
 		print '<td class="right">'.$langs->trans('VATRate').'</td>';
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
 		if($conf->global->PRODUCT_USE_UNITS)
 		{
@@ -4328,8 +4677,7 @@ 
 						$action='';
 						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 					}
-				}
-				else
+				} else
 				{
 					$this->printOriginLine($line, $var, $restrictlist, '/core/tpl', $selectedLines);
 				}
@@ -4360,34 +4708,39 @@ 
 		if (!empty($line->date_start))
 		{
 			$date_start=$line->date_start;
-		}
-		else
+		} else
 		{
 			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+			if ($line->date_debut_reel) {
+				$date_start=$line->date_debut_reel;
+			}
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end=$line->date_end;
-		}
-		else
+		} else
 		{
 			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+			if ($line->date_fin_reel) {
+				$date_end=$line->date_fin_reel;
+			}
 		}
 
         $this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+		if (! empty($line->fk_parent_line)) {
+			$this->tpl['label'].= img_picto('', 'rightarrow');
+		}
 
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+		if (($line->info_bits & 2) == 2) {
+			// TODO Not sure this is used for source object
 		{
 			$discount=new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'].= $discount->getNomUrl(0, 'discount');
-		}
-		elseif (! empty($line->fk_product))
+		} elseif (! empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4405,13 +4758,12 @@ 
 			{
 				$this->tpl['label'].= get_date_range($date_start, $date_end);
 			}
-		}
-		else
+		} else
 		{
 			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'].=$line->desc;
-			}else {
+			} else {
 				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
 			}
 
@@ -4424,36 +4776,35 @@ 
 
 		if (! empty($line->desc))
 		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+			if ($line->desc == '(CREDIT_NOTE)') {
+				// TODO Not sure this is used for source object
 			{
 				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)') {
+				// TODO Not sure this is used for source object
 			{
 				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
+			} elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
+			} elseif ($line->desc == '(EXCESS PAID)')
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-			}
-			else
+			} else
 			{
 				$this->tpl['description'] = dol_trunc($line->desc, 60);
 			}
-		}
-		else
+		} else
 		{
 			$this->tpl['description'] = '&nbsp;';
 		}
@@ -4461,17 +4812,23 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) {
+        	$this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        }
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
 		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+			$this->tpl['strike']=1;
+		}
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
@@ -4481,8 +4838,7 @@ 
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
-			}
-			else
+			} else
 			{
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
 			}
@@ -4492,7 +4848,9 @@ 
 			} else {
 				$res=include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4534,8 +4892,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -4570,8 +4927,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			if (! $notrigger)
 			{
@@ -4647,13 +5003,20 @@ 
 			$classname='';
 			$filefound=0;
 		    $dirmodels=array('/');
-		    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels, $conf->modules_parts['models']);
+		    if (is_array($conf->modules_parts['models'])) {
+		    	$dirmodels=array_merge($dirmodels, $conf->modules_parts['models']);
+		    }
 		    foreach($dirmodels as $reldir)
 		    {
 			    foreach(array('doc','pdf') as $prefix)
 			    {
-				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
-				    else $file = $prefix."_".$modele.".modules.php";
+				    if (in_array(get_class($this), array('Adherent'))) {
+				    	$file = $prefix."_".$modele.".class.php";
+				    }
+				    // Member module use prefix_module.class.php
+				    else {
+				    	$file = $prefix."_".$modele.".modules.php";
+				    }
 
 				    // On verifie l'emplacement du modele
 				    $file=dol_buildpath($reldir.$modelspath.$file, 0);
@@ -4664,7 +5027,9 @@ 
 					    break;
 				    }
 			    }
-			    if ($filefound) break;
+			    if ($filefound) {
+			    	break;
+			    }
 		    }
 
 		    // If generator was found
@@ -4696,7 +5061,9 @@ 
 						    if (is_dir($tmpdir))
 						    {
 							    $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-							    if (count($tmpfiles)) $listoffiles=array_merge($listoffiles, $tmpfiles);
+							    if (count($tmpfiles)) {
+							    	$listoffiles=array_merge($listoffiles, $tmpfiles);
+							    }
 						    }
 					    }
 
@@ -4734,8 +5101,7 @@ 
 			    {
 				    $arrayofrecords = array();   // The write_file of templates of adherent class need this var
 				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			    }
-			    else
+			    } else
 			    {
 				     $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 			    }
@@ -4757,9 +5123,11 @@ 
 					    $destfile = basename($destfull);
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    	// If not a tmp dir
 					    {
 						    $filename = basename($destfile);
+					    }
 						    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -4772,8 +5140,12 @@ 
 						    if ($this->element == 'propal')
 						    {
 							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							    if ($useonlinesignature) $setsharekey=true;
-							    if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+							    if ($useonlinesignature) {
+							    	$setsharekey=true;
+							    }
+							    if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    	$setsharekey=true;
+							    }
 						    }
 						    if ($this->element == 'commande' && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
 							    $setsharekey=true;
@@ -4786,9 +5158,11 @@ 
 						    }
 
 						    if ($setsharekey) {
-							    if (empty($ecmfile->share))	// Because object not found or share not set yet
+							    if (empty($ecmfile->share)) {
+							    	// Because object not found or share not set yet
 							    {
 								    require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+							    }
 								    $ecmfile->share = getRandomPassword(true);
 							    }
 						    }
@@ -4804,8 +5178,7 @@ 
 							    if ($result < 0) {
 								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							    }
-						    }
-						    else
+						    } else
 						    {
 							    $ecmfile->entity = $conf->entity;
 							    $ecmfile->filepath = $rel_dir;
@@ -4831,7 +5204,9 @@ 
 
 						    // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
 						    $update_main_doc_field=0;
-						    if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
+						    if (! empty($obj->update_main_doc_field)) {
+						    	$update_main_doc_field=1;
+						    }
 						    if ($update_main_doc_field && ! empty($this->table_element))
 						    {
 							    $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
@@ -4845,8 +5220,7 @@ 
 							    }
 						    }
 					    }
-				    }
-				    else
+				    } else
 				    {
 					    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 				    }
@@ -4855,22 +5229,21 @@ 
 				    dol_meta_create($this);
 
 				    return 1;
-			    }
-			    else
+			    } else
 			    {
 				    $outputlangs->charset_output=$sav_charset_output;
 				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				    return -1;
 			    }
-		    }
-		    else
+		    } else
 		    {
 			    $this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			    dol_print_error('', $this->error);
 			    return -1;
 		    }
+		} else {
+			return $reshook;
 		}
-		else return $reshook;
 	}
 
 	/**
@@ -4921,13 +5294,21 @@ 
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
+		if (isset($_POST[$fieldname])) {
+			return GETPOST($fieldname, 2);
+		}
 
-		if (isset($alternatevalue)) return $alternatevalue;
+		if (isset($alternatevalue)) {
+			return $alternatevalue;
+		}
 
 		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
+		if ($newelement == 'facture') {
+			$newelement='invoice';
+		}
+		if ($newelement == 'commande') {
+			$newelement='order';
+		}
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
@@ -4936,7 +5317,9 @@ 
 
 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+		if (isset($conf->global->$keyforfieldname)) {
+			return $conf->global->$keyforfieldname;
+		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
 	}
@@ -4975,8 +5358,7 @@ 
 			if (!empty($this->errors))
 			{
 				$this->errors=array_unique(array_merge($this->errors, $interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else
+			} else
 			{
 				$this->errors=$interface->errors;
 			}
@@ -5002,7 +5384,9 @@ 
 		// phpcs:enable
 		global $extrafields;
 
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) {
+			$rowid=$this->id;
+		}
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -5026,15 +5410,17 @@ 
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
-		}
-		else
+		} else
 		{
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get complementary values
 		if (is_array($optionsArray) && count($optionsArray) > 0)
@@ -5070,8 +5456,7 @@ 
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key]=$this->db->jdate($value);
-							}
-							else
+							} else
 							{
 								$this->array_options["options_".$key]=$value;
 							}
@@ -5091,10 +5476,12 @@ 
 
 				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
-			}
-			else
+				if ($numrows) {
+					return $numrows;
+				} else {
+					return 0;
+				}
+			} else
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -5113,7 +5500,10 @@ 
 		$this->db->begin();
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories';
+		}
+		// For compatibility
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
@@ -5123,8 +5513,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -5145,11 +5534,16 @@ 
 	{
 		global $conf,$langs,$user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+			$userused=$user;
+		}
 
 		$error=0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (! empty($this->array_options))
 		{
@@ -5162,10 +5556,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object
 			$new_array_options=array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key, 8), array_keys($target_extrafields))) {
+					// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+					// We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
+				}
 			}
 
 			foreach($new_array_options as $key => $value)
@@ -5181,8 +5578,12 @@ 
 			   	if ($attributeRequired)
 			   	{
 			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   			$mandatorypb=true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   			$mandatorypb=true;
+			   		}
 			   		if ($mandatorypb)
 			   		{
 			   		    dol_syslog("Mandatory extra field ".$key." is empty");
@@ -5201,8 +5602,7 @@ 
 						$value = dol_eval($attrfieldcomputed, 1, 0);
 					    dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 					    $new_array_options[$key] = $value;
-					}
-					else
+					} else
 					{
 						$new_array_options[$key] = null;
 					}
@@ -5216,8 +5616,7 @@ 
 			   			{
 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
-			  			}
-			   			elseif ($value=='')
+			  			} elseif ($value=='')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
@@ -5229,8 +5628,7 @@ 
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value=='')
+						} elseif ($value=='')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5255,27 +5653,27 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
 			   					//var_dump($action);
 			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+			   					if (is_object($this->oldcopy)) {
+			   						// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 			   					{
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
-				   					}
-									else
+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept
+				   					} else
 									{
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					}
-			   					else
+			   					} else
 			   					{
 			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
 			   					}
 			   				}
-			   			}
-			   			else	// Common usage
+			   			} else	// Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5299,26 +5697,30 @@ 
 						dol_include_once($InfoFieldList[1]);
 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
+							if ($value == '-1') {
+								// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key]='';
 							}
-							elseif ($value)
+							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('', $value);
+								if (is_numeric($value)) {
+									$res=$object->fetch($value);
+								} else {
+									$res=$object->fetch('', $value);
+								}
 
-								if ($res > 0) $new_array_options[$key]=$object->id;
-								else
+								if ($res > 0) {
+									$new_array_options[$key]=$object->id;
+								} else
 								{
 									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
 							}
-						}
-						else
+						} else
 						{
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
@@ -5329,7 +5731,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories';
+			}
+			// For compatibility
 
 			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
 
@@ -5341,18 +5746,22 @@ 
 			{
 				$attributeKey = substr($key, 8);   // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+					// Only for other type than separator
 					$sql.=",".$attributeKey;
+				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
     			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {
+    			    	// If field not already added previously
     			    {
     			        $sql.=",".$tmpkey;
     			    }
+    			    }
     			}
 			}
 			$sql .= ") VALUES (".$this->id;
@@ -5361,13 +5770,14 @@ 
 			{
 				$attributeKey = substr($key, 8);   // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+					// Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
 						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else
+				}
+					} else
 					{
 						$sql.=",null";
 					}
@@ -5378,10 +5788,13 @@ 
 			{
 			    foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {
+    			    	// If field not already added previously
     			    {
                         if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
-                        else $sql.=", ''";
+    			    } else {
+                        	$sql.=", ''";
+                        }
     			    }
     			}
 			}
@@ -5401,7 +5814,9 @@ 
 				// Call trigger
 				$this->context=array('extrafieldaddupdate'=>1);
 				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5409,14 +5824,14 @@ 
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
 			}
+		} else {
+			return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -5433,11 +5848,16 @@ 
 	{
 		global $conf,$langs,$user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+			$userused=$user;
+		}
 
 		$error=0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
 		{
@@ -5464,8 +5884,7 @@ 
 					{
 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value=='')
+					} elseif ($value=='')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5477,8 +5896,7 @@ 
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value=='')
+					} elseif ($value=='')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5530,7 +5948,9 @@ 
 				// Call trigger
 				$this->context=array('extrafieldupdate'=>1);
 				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
@@ -5539,14 +5959,14 @@ 
 				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
 			}
+		} else {
+			return 0;
 		}
-		else return 0;
 	}
 
 
@@ -5625,8 +6045,11 @@ 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (! preg_match('/^search_/', $keyprefix)) {
+				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+				return '';
+			}
 		}
 
 
@@ -5634,38 +6057,31 @@ 
 		if (empty($morecss) && ! empty($val['css']))
 		{
 		    $morecss = $val['css'];
-		}
-		elseif (empty($morecss))
+		} elseif (empty($morecss))
 		{
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
+			} elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+			} elseif (in_array($type, array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -5680,56 +6096,53 @@ 
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('int','integer')))
+		} elseif (in_array($type, array('int','integer')))
 		{
 			$tmp=explode(',', $size);
 			$newsize=$tmp[0];
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('real')))
+		} elseif (in_array($type, array('real')))
 		{
 		    $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, ! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
@@ -5738,22 +6151,19 @@ 
 				$checked=' value="1" ';
 			}
 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -5763,10 +6173,14 @@ 
 			}
 
 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1)) {
+                	$out.='<option value="0">&nbsp;</option>';
+                }
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+					continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out.='<option value="'.$key.'"';
 				$out.= (((string) $value == (string) $key)?' selected':'');
@@ -5774,8 +6188,7 @@ 
 				$out.='>'.$val.'</option>';
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -5842,13 +6255,11 @@ 
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
+					} else
 					{
 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
+				} else
 				{
 					$sqlwhere.= ' WHERE 1=1';
 				}
@@ -5884,8 +6295,7 @@ 
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
 							}
-						}
-						else
+						} else
 						{
 							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
@@ -5898,25 +6308,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);
 								if ($translabel!=$obj->$field_toshow) {
 									$labeltoshow=dol_trunc($translabel, 18).' ';
-								}else {
+								} else {
 									$labeltoshow=dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if (! $notrans)
 							{
 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel, 18);
-								}
-								else {
+								} else {
 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
+							if (empty($labeltoshow)) {
+								$labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)
 							{
 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -5936,19 +6346,16 @@ 
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',', $value);
 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
@@ -5959,13 +6366,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');
 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -6103,8 +6508,7 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
@@ -6112,13 +6516,18 @@ 
 
 			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled'])?0:1);
 
-			if (! empty($param_list_array[2]))		// If we set to add a create button
+			if (! empty($param_list_array[2])) {
+				// If we set to add a create button
 			{
 				if (! GETPOSTISSET('backtopage') && empty($val['disabled']))	// To avoid to open several infinitely the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
 				{
 		   			list($class,$classfile)=explode(':', $param_list[0]);
-		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
-		   			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+			}
+		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+		   				$url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+		   			} else {
+		   				$url_path=dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+		   			}
 		   			$paramforthenewlink = '';
 		   			$paramforthenewlink .= (GETPOSTISSET('action')?'&action='.GETPOST('action', 'aZ09'):'');
 		   			$paramforthenewlink .= (GETPOSTISSET('id')?'&id='.GETPOST('id', 'int'):'');
@@ -6127,13 +6536,11 @@ 
 		   			$out.='<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -6212,10 +6619,16 @@ 
 		{
 			$type = 'varchar';		// convert varchar(xx) int varchar
 			$size = $reg[1];
+		} elseif (preg_match('/varchar/', $type)) {
+			$type = 'varchar';
+		}
+		// convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) {
+			$type='select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+			$type='link';
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
 
 		$default=$val['default'];
 		$computed=$val['computed'];
@@ -6224,13 +6637,14 @@ 
 		$param=array();
 		$param['options']=array();
 
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (is_array($val['arrayofkeyval'])) {
+			$param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type='link';
 			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
-		}
-        elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+		} elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
             $param['options'] = array($reg[1] . ':' . $reg[2] . ':' . $reg[3] . ':' . $reg[4] => 'N');
             $type = 'sellist';
         }
@@ -6241,7 +6655,9 @@ 
 		$help=$val['help'];
 		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
-		if ($hidden) return '';
+		if ($hidden) {
+			return '';
+		}
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -6256,34 +6672,27 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'timestamp')
+			} elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int','double','price')))
+			} elseif (in_array($type, array('int','double','price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -6291,59 +6700,52 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
-		elseif ($type == 'date')
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+			$value=$this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+			$value=$this->getLibStatut(3);
+		} elseif ($type == 'date')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value, 'day');
 			} else {
 				$value='';
 			}
-		}
-		elseif ($type == 'datetime' || $type == 'timestamp')
+		} elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value, 'dayhour');
 			} else {
 				$value='';
 			}
-		}
-		elseif ($type == 'double' || $type == 'real')
+		} elseif ($type == 'double' || $type == 'real')
 		{
 			if (!empty($value)) {
 				$value=price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
 				$checked=' checked ';
 			}
 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value=dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list=array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -6373,7 +6775,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";
 			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
+			} else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
@@ -6400,12 +6802,11 @@ 
 						}
 						if ($translabel!=$field_toshow) {
 							$value.=dol_trunc($translabel, 18).' ';
-						}else {
+						} else {
 							$value.=$obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
+				} else
 				{
 					$translabel='';
 					if (!empty($obj->{$InfoFieldList[1]})) {
@@ -6413,18 +6814,17 @@ 
 					}
 					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel, 18);
-					}else {
+					} else {
 						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
+			} else {
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',', $value);
 			$value='';
@@ -6436,8 +6836,7 @@ 
 				}
 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -6504,8 +6903,7 @@ 
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out='';
 
@@ -6527,24 +6925,21 @@ 
 						$object->fetch($value);
 						$value=$object->getNomUrl($getnomurlparam);
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
+			} else {
+				$value='';
 			}
-			else $value='';
-		}
-		elseif ($type == 'text' || $type == 'html')
+		} elseif ($type == 'text' || $type == 'html')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value=preg_replace('/./i', '*', $value);
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$value = implode('<br>', $value);
 		}
@@ -6571,7 +6966,9 @@ 
 	{
 		global $db, $conf, $langs, $action, $form;
 
-		if (! is_object($form)) $form=new Form($db);
+		if (! is_object($form)) {
+			$form=new Form($db);
+		}
 
 		$out = '';
 
@@ -6586,7 +6983,9 @@ 
 			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
 				// Show only the key field in params
-				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
+				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) {
+					continue;
+				}
 
 				// @TODO Add test also on 'enabled' (different than 'list' that is 'visibility')
 				$enabled = 1;
@@ -6603,12 +7002,21 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 				}
 
-				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				elseif($mode == 'view' && empty($visibility)) continue;
-				if (empty($perms)) continue;
+				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) {
+					continue;
+				}
+				// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				elseif($mode == 'view' && empty($visibility)) {
+					continue;
+				}
+				if (empty($perms)) {
+					continue;
+				}
 
 				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+					$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				}
 
 				$colspan='3';
 				if (is_array($params) && count($params)>0) {
@@ -6656,8 +7064,7 @@ 
                     }
 
 					$out .= $extrafields->showSeparator($key, $this);
-				}
-				else
+				} else
 				{
 					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 					$csstyle='';
@@ -6687,10 +7094,12 @@ 
 					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
 					{
 						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+						if (! is_numeric($this->array_options['options_' . $key])) {
+							// For backward compatibility
 						{
 							$datenotinstring = $this->db->jdate($datenotinstring);
 						}
+						}
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)):$datenotinstring;
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
@@ -6708,14 +7117,24 @@ 
 					$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
 					if ($tpl_context=="public") {	// Public page : red dot instead of fieldrequired characters
 						$out .= '">';
-						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
-						else $out .= $labeltoshow;
-						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+							$out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						} else {
+							$out .= $labeltoshow;
+						}
+						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+							$out .= '&nbsp;<font color="red">*</font>';
+						}
 					} else {
-						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+							$out .= ' fieldrequired';
+						}
 						$out .= '">';
-						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
-						else $out .= $labeltoshow;
+						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+							$out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						} else {
+							$out .= $labeltoshow;
+						}
 					}
 					$out .= '</td>';
 
@@ -6740,8 +7159,11 @@ 
 						$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
 					}*/
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-					else $out .= '</tr>';
+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+						$out .= '</tr>';
+					} else {
+						$out .= '</tr>';
+					}
 					$e++;
 				}
 			}
@@ -6793,7 +7215,9 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
+		if ($element == 'facturerec') {
+			$element='facture';
+		}
 
 		return $user->rights->{$element};
 	}
@@ -6818,7 +7242,10 @@ 
 
 			if (! $db->query($sql))
 			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) {
+					return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6845,11 +7272,12 @@ 
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+			// In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		}
-		else
+		} else
 		{
 			// Get cost price for margin calculation
 			if (! empty($fk_product))
@@ -6867,13 +7295,11 @@ 
 					if ($product->cost_price > 0)
 					{
 						$buyPrice = $product->cost_price;
-					}
-					elseif ($product->pmp > 0)
+					} elseif ($product->pmp > 0)
 					{
 						$buyPrice = $product->pmp;
 					}
-				}
-				elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				} elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
@@ -6896,8 +7322,7 @@ 
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->errors[] = $productFournisseur->error;
 						return -2;
@@ -6999,19 +7424,26 @@ 
 					if ($size == 1 || $size == 'small') {   // Format vignette
 						// Find name of thumb file
 						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						if (! dol_is_file($dirthumb.$photo_vignette)) {
+							$photo_vignette='';
+						}
 
 						// Get filesize of original file
 						$imgarray=dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return.= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
+							if ($nbphoto == 1) {
+								$return.= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
+							}
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr class="center valignmiddle" style="border: 1px">';
+							if ($nbphoto % $nbbyrow == 1) {
+								$return.= '<tr class="center valignmiddle" style="border: 1px">';
+							}
 							$return.= '<td style="width: '.ceil(100/$nbbyrow).'%" class="photo">';
+						} elseif ($nbbyrow < 0) {
+							$return .= '<div class="inline-block">';
 						}
-						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
 						$return.= "\n";
 
@@ -7019,15 +7451,20 @@ 
 						if (empty($nolink))
 						{
 							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							if ($urladvanced) {
+								$return.='<a href="'.$urladvanced.'">';
+							} else {
+								$return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
+						if ($notitle) {
+							$alt='';
+						}
 
 						if ($usesharelink)
 						{
@@ -7037,35 +7474,35 @@ 
 								{
 									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
+								} else {
 									$return.= '<!-- Show original file -->';
 									$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
-							}
-							else
+							} else
 							{
 								$return.= '<!-- Show nophoto file (because file is not shared) -->';
 								$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
-						}
-						else
+						} else
 						{
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return.= '<!-- Show thumb -->';
 								$return.= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
+							} else {
 								$return.= '<!-- Show original file -->';
 								$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
-						if (empty($nolink)) $return.= '</a>';
+						if (empty($nolink)) {
+							$return.= '</a>';
+						}
 						$return.="\n";
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) {
+							$return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							$return.= '<br>';
@@ -7090,15 +7527,20 @@ 
 						if ($nbbyrow > 0)
 						{
 							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+							if (($nbphoto % $nbbyrow) == 0) {
+								$return.= '</tr>';
+							}
+						} elseif ($nbbyrow < 0) {
+							$return.='</div>';
 						}
-						elseif ($nbbyrow < 0) $return.='</div>';
 					}
 
 					if (empty($size)) {     // Format origine
 						$return.= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) {
+							$return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							// Special case for product
@@ -7115,7 +7557,9 @@ 
 					}
 
 					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
+					if ($nbmax && $nbphoto >= $nbmax) {
+						break;
+					}
 				}
 			}
 
@@ -7130,7 +7574,9 @@ 
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) {
+						$return.= '</table>';
+					}
 				}
 			}
 		}
@@ -7151,8 +7597,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='array') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='array') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7165,7 +7614,9 @@ 
 	 */
 	public function isDate($info)
 	{
-		if (isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
+		if (isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -7179,10 +7630,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if (isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -7195,8 +7650,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7211,8 +7669,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='text') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='text') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7227,8 +7688,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['notnull']) && $info['notnull']!='1') return true;
-			else return false;
+			if(isset($info['notnull']) && $info['notnull']!='1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -7243,8 +7707,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['notnull']) && $info['notnull']=='-1') return true;
-			else return false;
+			if(isset($info['notnull']) && $info['notnull']=='-1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7259,8 +7726,11 @@ 
 	{
 		if (is_array($info))
 		{
-			if(isset($info['index']) && $info['index']==true) return true;
-			else return false;
+			if(isset($info['index']) && $info['index']==true) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7278,7 +7748,8 @@ 
 		global $conf;
 
 		$queryarray=array();
-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
+		foreach ($this->fields as $field=>$info) {
+			// Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
 			if($this->isDate($info))
@@ -7286,13 +7757,12 @@ 
 				if(empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
-				}
-				else
+		}
+				} else
 				{
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			}
-			elseif($this->isArray($info))
+			} elseif($this->isArray($info))
 			{
 				if(! empty($this->{$field})) {
 					if(! is_array($this->{$field})) {
@@ -7302,28 +7772,35 @@ 
 				} else {
 					$queryarray[$field] = null;
 				}
-			}
-			elseif($this->isInt($info))
+			} elseif($this->isInt($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
-				else
+				if ($field == 'entity' && is_null($this->{$field})) {
+					$queryarray[$field]=$conf->entity;
+				} else
 				{
 					$queryarray[$field] = (int) $this->{$field};
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+					if (empty($queryarray[$field])) {
+						$queryarray[$field]=0;
+					}
+					// May be reset to null later if property 'notnull' is -1 for this field.
 				}
-			}
-			elseif($this->isFloat($info))
+			} elseif($this->isFloat($info))
 			{
 				$queryarray[$field] = (double) $this->{$field};
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
-			}
-			else
+				if (empty($queryarray[$field])) {
+					$queryarray[$field]=0;
+				}
+			} else
 			{
 				$queryarray[$field] = $this->{$field};
 			}
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+				unset($queryarray[$field]);
+			}
+			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+				$queryarray[$field] = null;
+			}
 		}
 
 		return $queryarray;
@@ -7341,55 +7818,63 @@ 
 		{
 			if($this->isDate($info))
 			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif($this->isArray($info))
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+					$this->{$field} = 0;
+				} else {
+					$this->{$field} = strtotime($obj->{$field});
+				}
+			} elseif($this->isArray($info))
 			{
 				if(! empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if($this->{$field } === false) {
+						@unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {
 					$this->{$field} = array();
 				}
-			}
-			elseif($this->isInt($info))
+			} elseif($this->isInt($info))
 			{
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else
+				if ($field == 'rowid') {
+					$this->id = (int) $obj->{$field};
+				} else
 				{
 					if ($this->isForcedToNullIfZero($info))
 					{
-						if (empty($obj->{$field})) $this->{$field} = null;
-						else $this->{$field} = (double) $obj->{$field};
-					}
-					else
+						if (empty($obj->{$field})) {
+							$this->{$field} = null;
+						} else {
+							$this->{$field} = (double) $obj->{$field};
+						}
+					} else
 					{
 						$this->{$field} = (int) $obj->{$field};
 					}
 				}
-			}
-			elseif($this->isFloat($info))
+			} elseif($this->isFloat($info))
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
-					if (empty($obj->{$field})) $this->{$field} = null;
-					else $this->{$field} = (double) $obj->{$field};
-				}
-				else
+					if (empty($obj->{$field})) {
+						$this->{$field} = null;
+					} else {
+						$this->{$field} = (double) $obj->{$field};
+					}
+				} else
 				{
 					$this->{$field} = (double) $obj->{$field};
 				}
-			}
-			else
+			} else
 			{
 				$this->{$field} = $obj->{$field};
 			}
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (! isset($this->fields['ref']) && isset($this->id)) {
+			$this->ref = $this->id;
+		}
 	}
 
 	/**
@@ -7412,9 +7897,13 @@ 
 	 */
 	protected function quote($value, $fieldsentry)
 	{
-		if (is_null($value)) return 'NULL';
-		elseif (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		else return "'".$this->db->escape($value)."'";
+		if (is_null($value)) {
+			return 'NULL';
+		} elseif (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) {
+			return $this->db->escape("$value");
+		} else {
+			return "'".$this->db->escape($value)."'";
+		}
 	}
 
 
@@ -7434,10 +7923,17 @@ 
 		$now=dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+			$fieldvalues['date_creation']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) {
+			$fieldvalues['fk_user_creat']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref']=dol_string_nospecial($fieldvalues['ref']);					// If field is a ref,we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref']=dol_string_nospecial($fieldvalues['ref']);
+		}
+		// If field is a ref,we sanitize data
 
 		$keys = array();
 		$values = array();
@@ -7451,8 +7947,12 @@ 
 		foreach($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key]='';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key]='';
+			}
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
@@ -7462,11 +7962,17 @@ 
 			}
 
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
+				$values[$key]='null';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+				$values[$key]='null';
+			}
 		}
 
-		if ($error) return -1;
+		if ($error) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -7508,7 +8014,9 @@ 
 		if (! $error)
 		{
 			$result=$this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		// Create lines
@@ -7524,7 +8032,9 @@ 
 
 				// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-				if (! is_object($line)) $line = (object) $line;
+				if (! is_object($line)) {
+					$line = (object) $line;
+				}
 
 				$result = $line->create($user, 1);
 				if ($result < 0)
@@ -7566,16 +8076,27 @@ 
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+		if (empty($id) && empty($ref) && empty($morewhere)) {
+			return -1;
+		}
 
 		$sql = 'SELECT '.$this->getFieldList();
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.=' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere)   $sql.= $morewhere;
+		if (!empty($id)) {
+			$sql.= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+			$sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+			$sql.=' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql.=' AND entity IN ('.getEntity($this->table_element).')';
+		}
+		if ($morewhere) {
+			$sql.= $morewhere;
+		}
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
@@ -7586,13 +8107,11 @@ 
 			{
 				$this->setVarsFromFetchObj($obj);
 				return $this->id;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
@@ -7620,7 +8139,9 @@ 
 		$sql = 'SELECT '.$objectline->getFieldList();
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
 		$sql.=' WHERE fk_'.$this->element.' = '.$this->id;
-		if ($morewhere)   $sql.= $morewhere;
+		if ($morewhere) {
+			$sql.= $morewhere;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -7641,8 +8162,7 @@ 
 			}
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
@@ -7666,8 +8186,12 @@ 
 		$now=dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+			$fieldvalues['date_modification']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) {
+			$fieldvalues['fk_user_modif']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
 		$keys = array();
@@ -7683,8 +8207,14 @@ 
 		// Clean and check mandatory
 		foreach($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key]='';
+			}
+			// This is an implicit foreign key field
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key]='';
+			}
+			// This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7751,11 +8281,13 @@ 
 
 		$this->db->begin();
 
-		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
+		if ($forcechilddeletion) {
+			// Force also delete of childtables that should lock deletion in standard case when option force is off
 		{
 			foreach($this->childtables as $table)
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+		}
 				$resql = $this->db->query($sql);
 				if (! $resql)
 				{
@@ -7765,10 +8297,11 @@ 
 					return -1;
 				}
 			}
-		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (! empty($this->fk_element) && ! empty($this->childtables)) {
+			// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (! empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
@@ -7857,7 +8390,9 @@ 
 
 		// Call trigger
 		$result=$this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		$this->db->begin();
@@ -7875,9 +8410,11 @@ 
 
 		if (empty($error)) {
 			// Remove extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				// For avoid conflicts if trigger used
 			{
 				$tmpobjectline = new $tmpforobjectlineclass($this->db);
+			}
 				$tmpobjectline->id= $idline;
 				$result=$tmpobjectline->deleteExtraFields();
 				if ($result < 0)
@@ -7928,7 +8465,9 @@ 
 			if (! $error && ! $notrigger) {
 				// Call trigger
 				$result=$this->call_trigger($triggercode, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -7939,8 +8478,7 @@ 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -7960,14 +8498,30 @@ 
 	    global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label='This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public='Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private='Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation=(dol_now()-3600*24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification=(dol_now()-3600*24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat=$user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif=$user->id;
-		if (array_key_exists('date', $this->fields)) $this->date=dol_now();
+		if (array_key_exists('label', $this->fields)) {
+			$this->label='This is label';
+		}
+		if (array_key_exists('note_public', $this->fields)) {
+			$this->note_public='Public note';
+		}
+		if (array_key_exists('note_private', $this->fields)) {
+			$this->note_private='Private note';
+		}
+		if (array_key_exists('date_creation', $this->fields)) {
+			$this->date_creation=(dol_now()-3600*24);
+		}
+		if (array_key_exists('date_modification', $this->fields)) {
+			$this->date_modification=(dol_now()-3600*24);
+		}
+		if (array_key_exists('fk_user_creat', $this->fields)) {
+			$this->fk_user_creat=$user->id;
+		}
+		if (array_key_exists('fk_user_modif', $this->fields)) {
+			$this->fk_user_modif=$user->id;
+		}
+		if (array_key_exists('date', $this->fields)) {
+			$this->date=dol_now();
+		}
 		// ...
 	}
 
@@ -8011,7 +8565,9 @@ 
      */
     public function trimParameters($parameters)
     {
-        if (!is_array($parameters)) return;
+        if (!is_array($parameters)) {
+        	return;
+        }
         foreach ($parameters as $parameter) {
             if (isset($this->$parameter)) {
                 $this->$parameter = trim($this->$parameter);
@@ -8031,7 +8587,9 @@ 
 	{
 		$this->db->begin();
 
-		if (empty($type)) $type = $this->table_element;
+		if (empty($type)) {
+			$type = $this->table_element;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);

htdocs/core/class/html.formwebsite.class.php

Indentation +254 added lines, -254 removed lines

@@ -27,265 +27,265 @@
  */
 class FormWebsite
 {
-    private $db;
+	private $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *    Return HTML select list of websites
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Name of HTML select
-     *    @param    int		$useempty          Show empty value or not
-     *    @return	string					   Html component
-     */
-    public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
-    {
-        $out='';
-
-        $sql = "SELECT rowid, ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."website";
-        $sql.= " WHERE 1 = 1";
-        $sql.= " ORDER BY rowid";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $out.='<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                $out.='<option value="-1">&nbsp;</option>';
-            }
-
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid)
-                {
-                    $out.='<option value="'.$obj->rowid.'" selected>';
-                }
-                else
-                {
-                    $out.='<option value="'.$obj->rowid.'">';
-                }
-                $out.=$obj->ref;
-                $out.='</option>';
-                $i++;
-            }
-            $out.="</select>";
-        }
-        else {
-            dol_print_error($this->db);
-        }
-
-        return $out;
-    }
-
-
-    /**
-     *  Return a HTML select list of type of containers from the dictionary
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	void
-     */
-    public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
-    {
-        global $langs, $conf, $user;
-
-        $langs->load("admin");
-
-        $sql = "SELECT rowid, code, label, entity";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-        $sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-        $sql.= " ORDER BY label";
-
-    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
-    		if ($num)
-    		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-    			if ($useempty == 1 || ($useempty == 2 && $num > 1))
-    			{
-    				print '<option value="-1">&nbsp;</option>';
-    			}
-
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($result);
-    				if ($selected == $obj->rowid || $selected == $obj->code)
-    				{
-    					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$obj->code.'">';
-    				}
-    				print $obj->label;
-    				print '</option>';
-    				$i++;
-    			}
-    			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		}
-    		else
-    		{
-    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
-    		}
-    	}
-    	else {
-    		dol_print_error($this->db);
-    	}
-    }
-
-
-    /**
-     *  Return a HTML select list of samples of containers content
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	string						HTML select component with list of type of containers
-     */
-    public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
-    {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
-
-    	$arrayofsamples = array();
-    	$arrayofsamples['empty']='EmptyPage';	// Always this one first
-    	foreach($listofsamples as $sample)
-    	{
-    		$reg = array();
-    		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
-    		{
-    			$key = $reg[1];
-	    		$labelkey = ucfirst($key);
-    			if ($key == 'empty') $labelkey = 'EmptyPage';
-    			$arrayofsamples[$key] = $labelkey;
-    		}
-    	}
-
-    	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-
-    	if ($useempty == 1 || $useempty == 2)
-    	{
-    		$out .= '<option value="-1">&nbsp;</option>';
-    	}
-
-    	foreach($arrayofsamples as $key => $val)
-    	{
-    		if ($selected == $key)
-    		{
-    			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
-    		{
-    			$out .= '<option value="'.$key.'">';
-    		}
-    		$out .= $langs->trans($val);
-    		$out .= '</option>';
-    	}
-    	$out .= "</select>";
-
-    	return $out;
-    }
-
-
-    /**
-     *  Return a HTML select list of containers of a website.
-     *  Note: $website->lines must have been loaded.
-     *
-     *  @param  Website		$website       	Object Website
-     *  @param	string		$htmlname		Name of select zone
-     *  @param	int			$pageid			Preselected container ID
-     *  @param	int			$showempty		Show empty record
-     *  @param	string		$action			Action on page that use this select list
-     * 	@return	string						HTML select component with list of type of containers
-     */
-    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '')
-    {
-    	global $langs;
-
-    	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
-
-	    $out='';
-	    if ($atleastonepage && $action != 'editsource')
-	    {
-	    	$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">';
-	    }
-	    else
-	    {
-	    	$out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
-	    }
-
-	    if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';
-
-	    if ($atleastonepage)
-	    {
-	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
-	    	{
-	    		$firstpageid=0;$homepageid=0;
-	    		foreach($website->lines as $key => $valpage)
-	    		{
-	    			if (empty($firstpageid)) $firstpageid=$valpage->id;
-	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
-	    		}
-	    		$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
-	    	}
-
-	    	foreach($website->lines as $key => $valpage)
-	    	{
-	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
-	    		$valueforoption.= $valpage->pageurl.' - '.$valpage->title;
-	    		if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption.=' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
-
-	    		$out.='<option value="'.$key.'"';
-	    		if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
-	    		$out.=' data-html="'.dol_escape_htmltag($valueforoption).'"';
-	    		$out.='>';
-	    		$out.=$valueforoption;
-	    		$out.='</option>';
-	    	}
-	    }
-	    $out.='</select>';
-
-	    if ($atleastonepage && $action != 'editsource')
-	    {
-	    	$out.=ajax_combobox($htmlname);
-	    }
-	    else
-	    {
-	    	$out.='<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
-	    	$out.=ajax_combobox($htmlname);
-	    }
-	    return $out;
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *    Return HTML select list of websites
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Name of HTML select
+	 *    @param    int		$useempty          Show empty value or not
+	 *    @return	string					   Html component
+	 */
+	public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
+	{
+		$out='';
+
+		$sql = "SELECT rowid, ref";
+		$sql.= " FROM ".MAIN_DB_PREFIX."website";
+		$sql.= " WHERE 1 = 1";
+		$sql.= " ORDER BY rowid";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$out.='<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				$out.='<option value="-1">&nbsp;</option>';
+			}
+
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($selected == $obj->rowid)
+				{
+					$out.='<option value="'.$obj->rowid.'" selected>';
+				}
+				else
+				{
+					$out.='<option value="'.$obj->rowid.'">';
+				}
+				$out.=$obj->ref;
+				$out.='</option>';
+				$i++;
+			}
+			$out.="</select>";
+		}
+		else {
+			dol_print_error($this->db);
+		}
+
+		return $out;
+	}
+
+
+	/**
+	 *  Return a HTML select list of type of containers from the dictionary
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	void
+	 */
+	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		global $langs, $conf, $user;
+
+		$langs->load("admin");
+
+		$sql = "SELECT rowid, code, label, entity";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+		$sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+		$sql.= " ORDER BY label";
+
+		dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+				if ($useempty == 1 || ($useempty == 2 && $num > 1))
+				{
+					print '<option value="-1">&nbsp;</option>';
+				}
+
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid || $selected == $obj->code)
+					{
+						print '<option value="'.$obj->code.'" selected>';
+					}
+					else
+					{
+						print '<option value="'.$obj->code.'">';
+					}
+					print $obj->label;
+					print '</option>';
+					$i++;
+				}
+				print "</select>";
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
+			else
+			{
+				print $langs->trans("NoTypeOfPagePleaseEditDictionary");
+			}
+		}
+		else {
+			dol_print_error($this->db);
+		}
+	}
+
+
+	/**
+	 *  Return a HTML select list of samples of containers content
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	string						HTML select component with list of type of containers
+	 */
+	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		global $langs, $conf, $user;
+
+		$langs->load("admin");
+
+		$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
+
+		$arrayofsamples = array();
+		$arrayofsamples['empty']='EmptyPage';	// Always this one first
+		foreach($listofsamples as $sample)
+		{
+			$reg = array();
+			if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
+			{
+				$key = $reg[1];
+				$labelkey = ucfirst($key);
+				if ($key == 'empty') $labelkey = 'EmptyPage';
+				$arrayofsamples[$key] = $labelkey;
+			}
+		}
+
+		$out = '';
+		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+
+		if ($useempty == 1 || $useempty == 2)
+		{
+			$out .= '<option value="-1">&nbsp;</option>';
+		}
+
+		foreach($arrayofsamples as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$out .= '<option value="'.$key.'" selected>';
+			}
+			else
+			{
+				$out .= '<option value="'.$key.'">';
+			}
+			$out .= $langs->trans($val);
+			$out .= '</option>';
+		}
+		$out .= "</select>";
+
+		return $out;
+	}
+
+
+	/**
+	 *  Return a HTML select list of containers of a website.
+	 *  Note: $website->lines must have been loaded.
+	 *
+	 *  @param  Website		$website       	Object Website
+	 *  @param	string		$htmlname		Name of select zone
+	 *  @param	int			$pageid			Preselected container ID
+	 *  @param	int			$showempty		Show empty record
+	 *  @param	string		$action			Action on page that use this select list
+	 * 	@return	string						HTML select component with list of type of containers
+	 */
+	public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '')
+	{
+		global $langs;
+
+		$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+
+		$out='';
+		if ($atleastonepage && $action != 'editsource')
+		{
+			$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">';
+		}
+		else
+		{
+			$out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
+		}
+
+		if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';
+
+		if ($atleastonepage)
+		{
+			if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
+			{
+				$firstpageid=0;$homepageid=0;
+				foreach($website->lines as $key => $valpage)
+				{
+					if (empty($firstpageid)) $firstpageid=$valpage->id;
+					if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
+				}
+				$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+			}
+
+			foreach($website->lines as $key => $valpage)
+			{
+				$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
+				$valueforoption.= $valpage->pageurl.' - '.$valpage->title;
+				if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption.=' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+
+				$out.='<option value="'.$key.'"';
+				if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
+				$out.=' data-html="'.dol_escape_htmltag($valueforoption).'"';
+				$out.='>';
+				$out.=$valueforoption;
+				$out.='</option>';
+			}
+		}
+		$out.='</select>';
+
+		if ($atleastonepage && $action != 'editsource')
+		{
+			$out.=ajax_combobox($htmlname);
+		}
+		else
+		{
+			$out.='<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
+			$out.=ajax_combobox($htmlname);
+		}
+		return $out;
 	}
 }

Spacing +42 added lines, -42 removed lines

@@ -56,19 +56,19 @@ 
      */
     public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
     {
-        $out='';
+        $out = '';
 
         $sql = "SELECT rowid, ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."website";
-        $sql.= " WHERE 1 = 1";
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."website";
+        $sql .= " WHERE 1 = 1";
+        $sql .= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
         {
-            $out.='<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
             if ($useempty)
             {
-                $out.='<option value="-1">&nbsp;</option>';
+                $out .= '<option value="-1">&nbsp;</option>';
             }
 
             $num = $this->db->num_rows($result);
@@ -78,17 +78,17 @@ 
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid)
                 {
-                    $out.='<option value="'.$obj->rowid.'" selected>';
+                    $out .= '<option value="'.$obj->rowid.'" selected>';
                 }
                 else
                 {
-                    $out.='<option value="'.$obj->rowid.'">';
+                    $out .= '<option value="'.$obj->rowid.'">';
                 }
-                $out.=$obj->ref;
-                $out.='</option>';
+                $out .= $obj->ref;
+                $out .= '</option>';
                 $i++;
             }
-            $out.="</select>";
+            $out .= "</select>";
         }
         else {
             dol_print_error($this->db);
@@ -114,9 +114,9 @@ 
         $langs->load("admin");
 
         $sql = "SELECT rowid, code, label, entity";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-        $sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-        $sql.= " ORDER BY label";
+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+        $sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+        $sql .= " ORDER BY label";
 
     	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
     	$result = $this->db->query($sql);
@@ -126,7 +126,7 @@ 
     		$i = 0;
     		if ($num)
     		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
     			if ($useempty == 1 || ($useempty == 2 && $num > 1))
     			{
     				print '<option value="-1">&nbsp;</option>';
@@ -179,8 +179,8 @@ 
     	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
 
     	$arrayofsamples = array();
-    	$arrayofsamples['empty']='EmptyPage';	// Always this one first
-    	foreach($listofsamples as $sample)
+    	$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
+    	foreach ($listofsamples as $sample)
     	{
     		$reg = array();
     		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
@@ -193,14 +193,14 @@ 
     	}
 
     	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
     	if ($useempty == 1 || $useempty == 2)
     	{
     		$out .= '<option value="-1">&nbsp;</option>';
     	}
 
-    	foreach($arrayofsamples as $key => $val)
+    	foreach ($arrayofsamples as $key => $val)
     	{
     		if ($selected == $key)
     		{
@@ -236,55 +236,55 @@ 
 
     	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
 
-	    $out='';
+	    $out = '';
 	    if ($atleastonepage && $action != 'editsource')
 	    {
-	    	$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">';
+	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">';
 	    }
 	    else
 	    {
-	    	$out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
+	    	$out .= '<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
 	    }
 
-	    if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';
+	    if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
 
 	    if ($atleastonepage)
 	    {
 	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
 	    	{
-	    		$firstpageid=0;$homepageid=0;
-	    		foreach($website->lines as $key => $valpage)
+	    		$firstpageid = 0; $homepageid = 0;
+	    		foreach ($website->lines as $key => $valpage)
 	    		{
-	    			if (empty($firstpageid)) $firstpageid=$valpage->id;
-	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
+	    			if (empty($firstpageid)) $firstpageid = $valpage->id;
+	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
 	    		}
-	    		$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+	    		$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
 	    	}
 
-	    	foreach($website->lines as $key => $valpage)
+	    	foreach ($website->lines as $key => $valpage)
 	    	{
 	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
-	    		$valueforoption.= $valpage->pageurl.' - '.$valpage->title;
-	    		if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption.=' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
-
-	    		$out.='<option value="'.$key.'"';
-	    		if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
-	    		$out.=' data-html="'.dol_escape_htmltag($valueforoption).'"';
-	    		$out.='>';
-	    		$out.=$valueforoption;
-	    		$out.='</option>';
+	    		$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
+	    		if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+
+	    		$out .= '<option value="'.$key.'"';
+	    		if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
+	    		$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
+	    		$out .= '>';
+	    		$out .= $valueforoption;
+	    		$out .= '</option>';
 	    	}
 	    }
-	    $out.='</select>';
+	    $out .= '</select>';
 
 	    if ($atleastonepage && $action != 'editsource')
 	    {
-	    	$out.=ajax_combobox($htmlname);
+	    	$out .= ajax_combobox($htmlname);
 	    }
 	    else
 	    {
-	    	$out.='<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
-	    	$out.=ajax_combobox($htmlname);
+	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
+	    	$out .= ajax_combobox($htmlname);
 	    }
 	    return $out;
 	}

Braces +35 added lines, -25 removed lines

@@ -79,8 +79,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     $out.='<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     $out.='<option value="'.$obj->rowid.'">';
                 }
@@ -89,8 +88,7 @@ 
                 $i++;
             }
             $out.="</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -138,8 +136,7 @@ 
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$obj->code.'">';
     				}
@@ -148,14 +145,14 @@ 
     				$i++;
     			}
     			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		}
-    		else
+    			if ($user->admin) {
+    				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+    			}
+    		} else
     		{
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -187,7 +184,9 @@ 
     		{
     			$key = $reg[1];
 	    		$labelkey = ucfirst($key);
-    			if ($key == 'empty') $labelkey = 'EmptyPage';
+    			if ($key == 'empty') {
+    				$labelkey = 'EmptyPage';
+    			}
     			$arrayofsamples[$key] = $labelkey;
     		}
     	}
@@ -205,8 +204,7 @@ 
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
+    		} else
     		{
     			$out .= '<option value="'.$key.'">';
     		}
@@ -240,23 +238,31 @@ 
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">';
-	    }
-	    else
+	    } else
 	    {
 	    	$out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
 	    }
 
-	    if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';
+	    if ($showempty || ! $atleastonepage) {
+	    	$out.='<option value="-1">&nbsp;</option>';
+	    }
 
 	    if ($atleastonepage)
 	    {
-	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
+	    	if (empty($pageid) && $action != 'createcontainer') {
+	    		// Page id is not defined, we try to take one
 	    	{
-	    		$firstpageid=0;$homepageid=0;
+	    		$firstpageid=0;
+	    	}
+	    	$homepageid=0;
 	    		foreach($website->lines as $key => $valpage)
 	    		{
-	    			if (empty($firstpageid)) $firstpageid=$valpage->id;
-	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
+	    			if (empty($firstpageid)) {
+	    				$firstpageid=$valpage->id;
+	    			}
+	    			if ($website->fk_default_home && $key == $website->fk_default_home) {
+	    				$homepageid=$valpage->id;
+	    			}
 	    		}
 	    		$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
 	    	}
@@ -265,10 +271,15 @@ 
 	    	{
 	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
 	    		$valueforoption.= $valpage->pageurl.' - '.$valpage->title;
-	    		if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption.=' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+	    		if ($website->fk_default_home && $key == $website->fk_default_home) {
+	    			$valueforoption.=' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+	    		}
 
 	    		$out.='<option value="'.$key.'"';
-	    		if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
+	    		if ($pageid > 0 && $pageid == $key) {
+	    			$out.=' selected';
+	    		}
+	    		// To preselect a value
 	    		$out.=' data-html="'.dol_escape_htmltag($valueforoption).'"';
 	    		$out.='>';
 	    		$out.=$valueforoption;
@@ -280,8 +291,7 @@ 
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out.=ajax_combobox($htmlname);
-	    }
-	    else
+	    } else
 	    {
 	    	$out.='<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
 	    	$out.=ajax_combobox($htmlname);

htdocs/core/ajax/pingresult.php

Spacing +11 added lines, -11 removed lines

@@ -20,23 +20,23 @@ 
  *       \brief      File to save result of an anonymous ping into database (1 ping is done per installation)
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$action=GETPOST('action', 'alpha');
-$hash_unique_id=GETPOST('hash_unique_id', 'alpha');
-$hash_algo=GETPOST('hash_algo', 'alpha');
+$action = GETPOST('action', 'alpha');
+$hash_unique_id = GETPOST('hash_unique_id', 'alpha');
+$hash_algo = GETPOST('hash_algo', 'alpha');
 
 
 // Security check
-if (! empty($user->socid))
+if (!empty($user->socid))
 	$socid = $user->socid;
 
 $now = dol_now();
@@ -64,7 +64,7 @@ 
 elseif ($action == 'firstpingko')
 {
 	// Note: pings are by installation, done on entity 1.
-	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');	// erase last value
+	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt'); // erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
 }
 else {

Braces +22 added lines, -9 removed lines

@@ -20,12 +20,25 @@ 
  *       \brief      File to save result of an anonymous ping into database (1 ping is done per installation)
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -36,8 +49,9 @@ 
 
 
 // Security check
-if (! empty($user->socid))
+if (! empty($user->socid)) {
 	$socid = $user->socid;
+}
 
 $now = dol_now();
 
@@ -66,7 +80,6 @@ 
 	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');	// erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
-}
-else {
+} else {
 	print 'Error action='.$action.' not supported';
 }