alxarafe / alixar

dolibarr/htdocs/ftp/index.php

Indentation +560 added lines, -560 removed lines

@@ -83,268 +83,268 @@ 
 // Submit file
 if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$result=$ecmdir->fetch($_REQUEST["section"]);
-	if (! $result > 0)
-	{
-		dol_print_error($db,$ecmdir->error);
-		exit;
-	}
-	$relativepath=$ecmdir->getRelativePath();
-	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-
-	if (dol_mkdir($upload_dir) >= 0)
-	{
-		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
-		if (is_numeric($resupload) && $resupload > 0)
-		{
-			$result=$ecmdir->changeNbOfFiles('+');
-		}
-		else {
-			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
-			{
-				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-			}
-			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
-			{
-				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else	// Known error
-			{
-				setEventMessages($langs->trans($resupload), null, 'errors');
-			}
-		}
-	}
-	else
-	{
-		// Echec transfert (fichier depassant la limite ?)
-		$langs->load("errors");
-		setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
-	}
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    $result=$ecmdir->fetch($_REQUEST["section"]);
+    if (! $result > 0)
+    {
+        dol_print_error($db,$ecmdir->error);
+        exit;
+    }
+    $relativepath=$ecmdir->getRelativePath();
+    $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+
+    if (dol_mkdir($upload_dir) >= 0)
+    {
+        $resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
+        if (is_numeric($resupload) && $resupload > 0)
+        {
+            $result=$ecmdir->changeNbOfFiles('+');
+        }
+        else {
+            $langs->load("errors");
+            if ($resupload < 0)	// Unknown error
+            {
+                setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
+            }
+            else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+            {
+                setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
+            }
+            else	// Known error
+            {
+                setEventMessages($langs->trans($resupload), null, 'errors');
+            }
+        }
+    }
+    else
+    {
+        // Echec transfert (fichier depassant la limite ?)
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
+    }
 }
 
 // Action ajout d'un rep
 if ($action == 'add' && $user->rights->ftp->setup)
 {
-	$ecmdir->ref                = $_POST["ref"];
-	$ecmdir->label              = $_POST["label"];
-	$ecmdir->description        = $_POST["desc"];
-
-	$id = $ecmdir->create($user);
-	if ($id > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
-		$action = "create";
-	}
+    $ecmdir->ref                = $_POST["ref"];
+    $ecmdir->label              = $_POST["label"];
+    $ecmdir->description        = $_POST["desc"];
+
+    $id = $ecmdir->create($user);
+    if ($id > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
+        $action = "create";
+    }
 }
 
 // Remove file
 if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-	    $langs->load("other");
-
-		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
-
-		//print "x".$newremotefileiso;
-		dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-		$result=@ftp_delete($conn_id, $newremotefileiso);
-		if ($result)
-		{
-			setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-		}
-		else
-		{
-			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-			setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
-		}
-
-		//ftp_close($conn_id);	Close later
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
 
-		$action='';
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    if ($conn_id && $ok && ! $mesg)
+    {
+        $langs->load("other");
+
+        // Remote file
+        $filename=$file;
+        $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+        $newremotefileiso=utf8_decode($remotefile);
+
+        //print "x".$newremotefileiso;
+        dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
+        $result=@ftp_delete($conn_id, $newremotefileiso);
+        if ($result)
+        {
+            setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+        }
+        else
+        {
+            dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+            setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+        }
+
+        //ftp_close($conn_id);	Close later
+
+        $action='';
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 }
 
 // Delete several lines at once
 if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("Delete"))
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-		foreach($_POST["const"] as $const)
-		{
-			if ($const["check"])	// Is checkbox checked
-			{
-			    $langs->load("other");
-
-				// Remote file
-				$file=$const["file"];
-				$section=$const["section"];
-				$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newremotefileiso=utf8_decode($remotefile);
-
-				//print "x".$newremotefileiso;
-				dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-				$result=@ftp_delete($conn_id, $newremotefileiso);
-				if ($result)
-				{
-					setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-				}
-				else
-				{
-					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-					setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
-				}
-
-				//ftp_close($conn_id);	Close later
-
-				$action='';
-			}
-		}
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
+
+    if ($conn_id && $ok && ! $mesg)
+    {
+        foreach($_POST["const"] as $const)
+        {
+            if ($const["check"])	// Is checkbox checked
+            {
+                $langs->load("other");
+
+                // Remote file
+                $file=$const["file"];
+                $section=$const["section"];
+                $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+                $newremotefileiso=utf8_decode($remotefile);
+
+                //print "x".$newremotefileiso;
+                dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
+                $result=@ftp_delete($conn_id, $newremotefileiso);
+                if ($result)
+                {
+                    setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+                }
+                else
+                {
+                    dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+                    setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+                }
+
+                //ftp_close($conn_id);	Close later
+
+                $action='';
+            }
+        }
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 }
 
 // Remove directory
 if ($action == 'confirm_deletesection' && $confirm == 'yes')
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
-
-		$result=@ftp_rmdir($conn_id, $newremotefileiso);
-		if ($result)
-		{
-			setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
-		}
-		else
-		{
-			setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
-		}
-
-		//ftp_close($conn_id);	Close later
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
 
-		$action='';
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    if ($conn_id && $ok && ! $mesg)
+    {
+        // Remote file
+        $filename=$file;
+        $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+        $newremotefileiso=utf8_decode($remotefile);
+
+        $result=@ftp_rmdir($conn_id, $newremotefileiso);
+        if ($result)
+        {
+            setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
+        }
+
+        //ftp_close($conn_id);	Close later
+
+        $action='';
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 }
 
 // Download directory
 if ($action == 'download')
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-		// Local file
-		$localfile=tempnam($download_dir,'dol_');
-
-		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
-
-		$result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
-		if ($result)
-		{
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($localfile, octdec($conf->global->MAIN_UMASK));
-
-			// Define mime type
-			$type = 'application/octet-stream';
-			if (! empty($_GET["type"])) $type=$_GET["type"];
-			else $type=dol_mimetype($original_file);
-
-			// Define attachment (attachment=true to force choice popup 'open'/'save as')
-			$attachment = true;
-
-			if ($encoding)   header('Content-Encoding: '.$encoding);
-			if ($type)       header('Content-Type: '.$type);
-			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-			else header('Content-Disposition: inline; filename="'.$filename.'"');
-
-			// Ajout directives pour resoudre bug IE
-			header('Cache-Control: Public, must-revalidate');
-			header('Pragma: public');
-
-			readfile($localfile);
-
-			ftp_close($conn_id);
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
 
-			exit;
-		}
-		else
-		{
-			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
-		}
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    if ($conn_id && $ok && ! $mesg)
+    {
+        // Local file
+        $localfile=tempnam($download_dir,'dol_');
+
+        // Remote file
+        $filename=$file;
+        $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+        $newremotefileiso=utf8_decode($remotefile);
+
+        $result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
+        if ($result)
+        {
+            if (! empty($conf->global->MAIN_UMASK))
+            @chmod($localfile, octdec($conf->global->MAIN_UMASK));
+
+            // Define mime type
+            $type = 'application/octet-stream';
+            if (! empty($_GET["type"])) $type=$_GET["type"];
+            else $type=dol_mimetype($original_file);
+
+            // Define attachment (attachment=true to force choice popup 'open'/'save as')
+            $attachment = true;
+
+            if ($encoding)   header('Content-Encoding: '.$encoding);
+            if ($type)       header('Content-Type: '.$type);
+            if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+            else header('Content-Disposition: inline; filename="'.$filename.'"');
+
+            // Ajout directives pour resoudre bug IE
+            header('Cache-Control: Public, must-revalidate');
+            header('Pragma: public');
+
+            readfile($localfile);
+
+            ftp_close($conn_id);
+
+            exit;
+        }
+        else
+        {
+            setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
+        }
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 
-	//ftp_close($conn_id);	Close later
+    //ftp_close($conn_id);	Close later
 }
 
 
@@ -396,231 +396,231 @@ 
 
 if (! function_exists('ftp_connect'))
 {
-	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
+    print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
 else
 {
     if (! empty($ftp_server))
-	{
-		// Confirm remove file
-		if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
-		}
-
-		// Confirmation de la suppression d'une ligne categorie
-		if ($action == 'delete_section')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
-		}
-
-		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
-		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive?"(Passive)":"(Active)").'<br>';
-		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
+    {
+        // Confirm remove file
+        if ($action == 'delete')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+        }
+
+        // Confirmation de la suppression d'une ligne categorie
+        if ($action == 'delete_section')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
+        }
+
+        print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
+        print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive?"(Passive)":"(Active)").'<br>';
+        print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
         print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
         print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
         print $langs->trans("Directory").': ';
-		$sectionarray=preg_split('|[\/]|',$section);
-		// For /
-		$newsection='/';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
-		print '/';
-		print '</a> ';
-		// For other directories
-		$i=0;
-		foreach($sectionarray as $val)
-		{
-			if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
-			if ($i > 0)
-			{
-				print ' / ';
-				$newsection.='/';
-			}
-			$newsection.=$val;
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
-			print $val;
-			print '</a>';
-			$i++;
-		}
-		print '<br>';
-		print "<br>\n";
-
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $sectionarray=preg_split('|[\/]|',$section);
+        // For /
+        $newsection='/';
+        print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+        print '/';
+        print '</a> ';
+        // For other directories
+        $i=0;
+        foreach($sectionarray as $val)
+        {
+            if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
+            if ($i > 0)
+            {
+                print ' / ';
+                $newsection.='/';
+            }
+            $newsection.=$val;
+            print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+            print $val;
+            print '</a>';
+            $i++;
+        }
+        print '<br>';
+        print "<br>\n";
+
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
         print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-
-		// Construit liste des repertoires
-		print '<table width="100%" class="noborder">'."\n";
-
-		print '<tr class="liste_titre">'."\n";
-		print '<td class="liste_titre" align="left">'.$langs->trans("Content").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Size").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Date").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Owner").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Group").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
-		print '<td class="liste_titre nowrap" align="right">';
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
-		print '</td>'."\n";
-		print '</tr>'."\n";
-
-		// set up a connection or die
-		if (empty($conn_id))
-		{
-			$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
-
-			$conn_id=$resultarray['conn_id'];
-			$ok=$resultarray['ok'];
-			$mesg=$resultarray['mesg'];
-		}
-
-		if ($ok)
-		{
-			//$type = ftp_systype($conn_id);
-
-			$newsection=$section;
-		    $newsectioniso=utf8_decode($section);
-			//$newsection='/home';
-
-			// List content of directory ($newsection = '/', '/home', ...)
-			if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
-			{
-			    if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
-			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
-			    //var_dump($dirHandle);
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+
+        // Construit liste des repertoires
+        print '<table width="100%" class="noborder">'."\n";
+
+        print '<tr class="liste_titre">'."\n";
+        print '<td class="liste_titre" align="left">'.$langs->trans("Content").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Size").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Date").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Owner").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Group").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
+        print '<td class="liste_titre nowrap" align="right">';
+        if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
+        print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
+        print '</td>'."\n";
+        print '</tr>'."\n";
+
+        // set up a connection or die
+        if (empty($conn_id))
+        {
+            $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
+
+            $conn_id=$resultarray['conn_id'];
+            $ok=$resultarray['ok'];
+            $mesg=$resultarray['mesg'];
+        }
+
+        if ($ok)
+        {
+            //$type = ftp_systype($conn_id);
+
+            $newsection=$section;
+            $newsectioniso=utf8_decode($section);
+            //$newsection='/home';
+
+            // List content of directory ($newsection = '/', '/home', ...)
+            if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+            {
+                if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
+                //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
+                //var_dump($dirHandle);
                 $contents = scandir('ssh2.sftp://' . $conn_id . $newsection);
                 $buff=array();
                 foreach($contents as $i => $key)
                 {
                     $buff[$i]="---------- - root root 1234 Aug 01 2000 ".$key;
                 }
-    		}
-    		else
-    		{
+            }
+            else
+            {
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso);	// Sometimes rawlist fails but never nlist
-        		//var_dump($contents);
-		        //var_dump($buff);
-    		}
-
-			$nboflines=count($contents);
-			$rawlisthasfailed=false;
-			$i=0;
-			while ($i < $nboflines && $i < 1000)
-			{
-				$vals=preg_split('@ +@',utf8_encode($buff[$i]),9);
-				//$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
-				//var_dump($vals);
-				$file=$vals[8];
-				if (empty($file))
-				{
-					$rawlisthasfailed=true;
-					$file=utf8_encode($contents[$i]);
-				}
-
-				if ($file == '.' || ($file == '..' && $section == '/'))
-				{
-					$i++;
-					continue;
-				}
-
-				// Is it a directory ?
-				$is_directory=0;
-				if ($file == '..') $is_directory=1;
-				else if (! $rawlisthasfailed)
-				{
-					if (preg_match('/^d/',$vals[0])) $is_directory=1;
-					if (preg_match('/^l/',$vals[0])) $is_link=1;
-				}
-				else
-				{
-					// Remote file
-					$filename=$file;
-					//print "section=".$section.' file='.$file.'X';
-					//print preg_match('@[\/]$@','aaa/').'Y';
-					//print preg_match('@[\\\/]$@',"aaa\\").'Y';
-					$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').preg_replace('@^[\\\/]@','',$file);
-					//print 'A'.$remotefile.'A';
-					$newremotefileiso=utf8_decode($remotefile);
-					//print 'Z'.$newremotefileiso.'Z';
-					$is_directory=ftp_isdir($conn_id, $newremotefileiso);
-				}
-
-
-				print '<tr class="oddeven" height="18">';
-				// Name
-				print '<td>';
-				$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
-				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
-				print $file;
-				if ($is_directory) print '</a>';
-				print '</td>';
-				// Size
-				print '<td align="center" class="nowrap">';
-				if (! $is_directory && ! $is_link) print $vals[4];
-				else print '&nbsp;';
-				print '</td>';
-				// Date
-				print '<td align="center" class="nowrap">';
-				print $vals[5].' '.$vals[6].' '.$vals[7];
-				print '</td>';
-				// User
-				print '<td align="center" class="nowrap">';
-				print $vals[2];
-				print '</td>';
-				// Group
-				print '<td align="center" class="nowrap">';
-				print $vals[3];
-				print '</td>';
-				// Permissions
-				print '<td align="center" class="nowrap">';
-				print $vals[0];
-				print '</td>';
-				// Action
-				print '<td align="right" width="64" class="nowrap">';
-				if ($is_directory)
-				{
-					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
-					else print '&nbsp;';
-				}
-				else if ($is_link)
-				{
-					$newfile=$file;
-					$newfile=preg_replace('/ ->.*/','',$newfile);
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else
-				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
-					print ' &nbsp; ';
-					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
-					print ' &nbsp; ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
-					print '<input type="hidden" name="const['.$i.'][section]" value="'.$section.'">';
-					print '<input type="hidden" name="const['.$i.'][file]" value="'.$file.'">';
-				}
-				print '</td>';
-				print '</tr>'."\n";
-				$i++;
-				$nbofentries++;
-			}
-		}
+                //var_dump($contents);
+                //var_dump($buff);
+            }
+
+            $nboflines=count($contents);
+            $rawlisthasfailed=false;
+            $i=0;
+            while ($i < $nboflines && $i < 1000)
+            {
+                $vals=preg_split('@ +@',utf8_encode($buff[$i]),9);
+                //$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
+                //var_dump($vals);
+                $file=$vals[8];
+                if (empty($file))
+                {
+                    $rawlisthasfailed=true;
+                    $file=utf8_encode($contents[$i]);
+                }
 
-		print "</table>";
+                if ($file == '.' || ($file == '..' && $section == '/'))
+                {
+                    $i++;
+                    continue;
+                }
 
+                // Is it a directory ?
+                $is_directory=0;
+                if ($file == '..') $is_directory=1;
+                else if (! $rawlisthasfailed)
+                {
+                    if (preg_match('/^d/',$vals[0])) $is_directory=1;
+                    if (preg_match('/^l/',$vals[0])) $is_link=1;
+                }
+                else
+                {
+                    // Remote file
+                    $filename=$file;
+                    //print "section=".$section.' file='.$file.'X';
+                    //print preg_match('@[\/]$@','aaa/').'Y';
+                    //print preg_match('@[\\\/]$@',"aaa\\").'Y';
+                    $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').preg_replace('@^[\\\/]@','',$file);
+                    //print 'A'.$remotefile.'A';
+                    $newremotefileiso=utf8_decode($remotefile);
+                    //print 'Z'.$newremotefileiso.'Z';
+                    $is_directory=ftp_isdir($conn_id, $newremotefileiso);
+                }
 
-		if (! $ok)
-		{
-		      print $mesg.'<br>'."\n";
-		      setEventMessages($mesg, null, 'errors');
-		}
+
+                print '<tr class="oddeven" height="18">';
+                // Name
+                print '<td>';
+                $newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+                $newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
+                if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
+                print $file;
+                if ($is_directory) print '</a>';
+                print '</td>';
+                // Size
+                print '<td align="center" class="nowrap">';
+                if (! $is_directory && ! $is_link) print $vals[4];
+                else print '&nbsp;';
+                print '</td>';
+                // Date
+                print '<td align="center" class="nowrap">';
+                print $vals[5].' '.$vals[6].' '.$vals[7];
+                print '</td>';
+                // User
+                print '<td align="center" class="nowrap">';
+                print $vals[2];
+                print '</td>';
+                // Group
+                print '<td align="center" class="nowrap">';
+                print $vals[3];
+                print '</td>';
+                // Permissions
+                print '<td align="center" class="nowrap">';
+                print $vals[0];
+                print '</td>';
+                // Action
+                print '<td align="right" width="64" class="nowrap">';
+                if ($is_directory)
+                {
+                    if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+                    else print '&nbsp;';
+                }
+                else if ($is_link)
+                {
+                    $newfile=$file;
+                    $newfile=preg_replace('/ ->.*/','',$newfile);
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
+                }
+                else
+                {
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
+                    print ' &nbsp; ';
+                    print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
+                    print ' &nbsp; ';
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+                    print '<input type="hidden" name="const['.$i.'][section]" value="'.$section.'">';
+                    print '<input type="hidden" name="const['.$i.'][file]" value="'.$file.'">';
+                }
+                print '</td>';
+                print '</tr>'."\n";
+                $i++;
+                $nbofentries++;
+            }
+        }
+
+        print "</table>";
+
+
+        if (! $ok)
+        {
+                print $mesg.'<br>'."\n";
+                setEventMessages($mesg, null, 'errors');
+        }
 
 
-		// Actions
-		/*
+        // Actions
+        /*
 		if ($user->rights->ftp->write && ! empty($section))
 		{
 		$formfile->form_attach_new_file(DOL_URL_ROOT.'/ftp/index.php','',0,$section,1);
@@ -628,38 +628,38 @@ 
 		else print '&nbsp;';
 		*/
 
-		print '<br>';
-		print '<div id="delconst" align="right">';
-		print '<input type="submit" name="delete" class="button" value="'.$langs->trans("Delete").'">';
-		print '</div>';
-
-		print "</form>";
-	}
-	else
-	{
-		$foundsetup=false;
-		$MAXFTP=20;
-		$i=1;
-		while ($i <= $MAXFTP)
-		{
-			$paramkey='FTP_NAME_'.$i;
-			//print $paramkey;
-			if (! empty($conf->global->$paramkey))
-			{
-				$foundsetup=true;
-				break;
-			}
-			$i++;
-		}
-	    if (! $foundsetup)
-	    {
+        print '<br>';
+        print '<div id="delconst" align="right">';
+        print '<input type="submit" name="delete" class="button" value="'.$langs->trans("Delete").'">';
+        print '</div>';
+
+        print "</form>";
+    }
+    else
+    {
+        $foundsetup=false;
+        $MAXFTP=20;
+        $i=1;
+        while ($i <= $MAXFTP)
+        {
+            $paramkey='FTP_NAME_'.$i;
+            //print $paramkey;
+            if (! empty($conf->global->$paramkey))
+            {
+                $foundsetup=true;
+                break;
+            }
+            $i++;
+        }
+        if (! $foundsetup)
+        {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else
-	    {
-	        print $langs->trans("ChooseAFTPEntryIntoMenu");
-	    }
-	}
+        }
+        else
+        {
+            print $langs->trans("ChooseAFTPEntryIntoMenu");
+        }
+    }
 }
 
 print '<br>';
@@ -700,94 +700,94 @@ 
  */
 function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$ok=1;
+    $ok=1;
     $conn_id=null;
 
-	if (! is_numeric($ftp_port))
-	{
-		$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-		$ok=0;
-	}
+    if (! is_numeric($ftp_port))
+    {
+        $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
+        $ok=0;
+    }
 
-	if ($ok)
-	{
-		$connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT);
-		if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
-		{
-		    dol_syslog('Try to connect with ssh2_ftp');
-		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		}
-		else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
-		{
-		    dol_syslog('Try to connect with ftp_ssl_connect');
-		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		else
-		{
-		    dol_syslog('Try to connect with ftp_connect');
-		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		if ($conn_id || $tmp_conn_id)
-		{
-			if ($ftp_user)
-			{
-				if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
-				{
-				    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					//if ($ftp_passive) ftp_pasv($conn_id, true);
-
-    					// Change the dir
-    					$newsectioniso=utf8_decode($section);
-    					//ftp_chdir($conn_id, $newsectioniso);
-		                $conn_id = ssh2_sftp($tmp_conn_id);
-		                if (! $conn_id)
-		                {
-        					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-    	   				    $ok=0;
-        				    $error++;
-		                }
-    				}
-    				else
-    				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
-    				    $error++;
-    				}
-				}
-				else
-				{
-				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					if ($ftp_passive) ftp_pasv($conn_id, true);
-
-    					// Change the dir
-    					$newsectioniso=utf8_decode($section);
-    					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else
-    				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
-    				    $error++;
-    				}
-				}
-			}
-		}
-		else
-		{
-		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
-			$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-			$ok=0;
-		}
-	}
+    if ($ok)
+    {
+        $connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT);
+        if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+        {
+            dol_syslog('Try to connect with ssh2_ftp');
+            $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
+        }
+        else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+        {
+            dol_syslog('Try to connect with ftp_ssl_connect');
+            $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
+        }
+        else
+        {
+            dol_syslog('Try to connect with ftp_connect');
+            $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
+        }
+        if ($conn_id || $tmp_conn_id)
+        {
+            if ($ftp_user)
+            {
+                if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+                {
+                    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
+                    {
+                        // Turn on passive mode transfers (must be after a successful login
+                        //if ($ftp_passive) ftp_pasv($conn_id, true);
+
+                        // Change the dir
+                        $newsectioniso=utf8_decode($section);
+                        //ftp_chdir($conn_id, $newsectioniso);
+                        $conn_id = ssh2_sftp($tmp_conn_id);
+                        if (! $conn_id)
+                        {
+                            $mesg=$langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+                                $ok=0;
+                            $error++;
+                        }
+                    }
+                    else
+                    {
+                        $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+                            $ok=0;
+                        $error++;
+                    }
+                }
+                else
+                {
+                    if (ftp_login($conn_id, $ftp_user, $ftp_password))
+                    {
+                        // Turn on passive mode transfers (must be after a successful login
+                        if ($ftp_passive) ftp_pasv($conn_id, true);
+
+                        // Change the dir
+                        $newsectioniso=utf8_decode($section);
+                        ftp_chdir($conn_id, $newsectioniso);
+                    }
+                    else
+                    {
+                        $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+                            $ok=0;
+                        $error++;
+                    }
+                }
+            }
+        }
+        else
+        {
+            dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
+            $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
+            $ok=0;
+        }
+    }
 
-	$arrayresult=array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
-	return $arrayresult;
+    $arrayresult=array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
+    return $arrayresult;
 }
 
 
@@ -800,14 +800,14 @@ 
  */
 function ftp_isdir($connect_id,$dir)
 {
-	if (@ftp_chdir($connect_id,$dir))
-	{
-		ftp_cdup($connect_id);
-		return 1;
-	}
-	else
-	{
-		return 0;
-	}
+    if (@ftp_chdir($connect_id,$dir))
+    {
+        ftp_cdup($connect_id);
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
 }
 

Spacing +187 added lines, -187 removed lines

@@ -31,48 +31,48 @@ 
 $langs->loadLangs(array('ftp', 'companies', 'other'));
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ftp','');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'ftp', '');
 
 // Get parameters
-$action=GETPOST('action','aZ09');
-$section=GETPOST('section');
-if (! $section) $section='/';
+$action = GETPOST('action', 'aZ09');
+$section = GETPOST('section');
+if (!$section) $section = '/';
 $numero_ftp = GETPOST("numero_ftp");
 /* if (! $numero_ftp) $numero_ftp=1; */
-$file=GETPOST("file");
-$confirm=GETPOST('confirm');
+$file = GETPOST("file");
+$confirm = GETPOST('confirm');
 
 $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="label";
-
-$s_ftp_name='FTP_NAME_'.$numero_ftp;
-$s_ftp_server='FTP_SERVER_'.$numero_ftp;
-$s_ftp_port='FTP_PORT_'.$numero_ftp;
-$s_ftp_user='FTP_USER_'.$numero_ftp;
-$s_ftp_password='FTP_PASSWORD_'.$numero_ftp;
-$s_ftp_passive='FTP_PASSIVE_'.$numero_ftp;
-$ftp_name=$conf->global->$s_ftp_name;
-$ftp_server=$conf->global->$s_ftp_server;
-$ftp_port=$conf->global->$s_ftp_port; if (empty($ftp_port)) $ftp_port=21;
-$ftp_user=$conf->global->$s_ftp_user;
-$ftp_password=$conf->global->$s_ftp_password;
-$ftp_passive=$conf->global->$s_ftp_passive;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "label";
+
+$s_ftp_name = 'FTP_NAME_'.$numero_ftp;
+$s_ftp_server = 'FTP_SERVER_'.$numero_ftp;
+$s_ftp_port = 'FTP_PORT_'.$numero_ftp;
+$s_ftp_user = 'FTP_USER_'.$numero_ftp;
+$s_ftp_password = 'FTP_PASSWORD_'.$numero_ftp;
+$s_ftp_passive = 'FTP_PASSIVE_'.$numero_ftp;
+$ftp_name = $conf->global->$s_ftp_name;
+$ftp_server = $conf->global->$s_ftp_server;
+$ftp_port = $conf->global->$s_ftp_port; if (empty($ftp_port)) $ftp_port = 21;
+$ftp_user = $conf->global->$s_ftp_user;
+$ftp_password = $conf->global->$s_ftp_password;
+$ftp_passive = $conf->global->$s_ftp_passive;
 
 // For result on connection
-$ok=0;
-$conn_id=null;	// FTP connection ID
-$mesg='';
+$ok = 0;
+$conn_id = null; // FTP connection ID
+$mesg = '';
 
 
 
@@ -81,25 +81,25 @@ 
  */
 
 // Submit file
-if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
+if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	$result=$ecmdir->fetch($_REQUEST["section"]);
-	if (! $result > 0)
+	$result = $ecmdir->fetch($_REQUEST["section"]);
+	if (!$result > 0)
 	{
-		dol_print_error($db,$ecmdir->error);
+		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
-	$relativepath=$ecmdir->getRelativePath();
+	$relativepath = $ecmdir->getRelativePath();
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
 	if (dol_mkdir($upload_dir) >= 0)
 	{
-		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
+		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0);
 		if (is_numeric($resupload) && $resupload > 0)
 		{
-			$result=$ecmdir->changeNbOfFiles('+');
+			$result = $ecmdir->changeNbOfFiles('+');
 		}
 		else {
 			$langs->load("errors");
@@ -107,7 +107,7 @@ 
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			}
-			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+			else if (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 			{
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
@@ -121,7 +121,7 @@ 
 	{
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
-		setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
+		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
 	}
 }
 
@@ -149,44 +149,44 @@ 
 if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
 	    $langs->load("other");
 
 		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
+		$filename = $file;
+		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$newremotefileiso = utf8_decode($remotefile);
 
 		//print "x".$newremotefileiso;
 		dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-		$result=@ftp_delete($conn_id, $newremotefileiso);
+		$result = @ftp_delete($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 		}
 		else
 		{
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-			setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
-		$action='';
+		$action = '';
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 }
 
@@ -194,51 +194,51 @@ 
 if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("Delete"))
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
-		foreach($_POST["const"] as $const)
+		foreach ($_POST["const"] as $const)
 		{
 			if ($const["check"])	// Is checkbox checked
 			{
 			    $langs->load("other");
 
 				// Remote file
-				$file=$const["file"];
-				$section=$const["section"];
-				$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newremotefileiso=utf8_decode($remotefile);
+				$file = $const["file"];
+				$section = $const["section"];
+				$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+				$newremotefileiso = utf8_decode($remotefile);
 
 				//print "x".$newremotefileiso;
 				dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-				$result=@ftp_delete($conn_id, $newremotefileiso);
+				$result = @ftp_delete($conn_id, $newremotefileiso);
 				if ($result)
 				{
-					setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 				}
 				else
 				{
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-					setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+					setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 				}
 
 				//ftp_close($conn_id);	Close later
 
-				$action='';
+				$action = '';
 			}
 		}
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 }
 
@@ -246,39 +246,39 @@ 
 if ($action == 'confirm_deletesection' && $confirm == 'yes')
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
 		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
+		$filename = $file;
+		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$newremotefileiso = utf8_decode($remotefile);
 
-		$result=@ftp_rmdir($conn_id, $newremotefileiso);
+		$result = @ftp_rmdir($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
+			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
 		}
 		else
 		{
-			setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
+			setEventMessages($langs->trans("FTPFailedToRemoveDir", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
-		$action='';
+		$action = '';
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 }
 
@@ -286,35 +286,35 @@ 
 if ($action == 'download')
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
 		// Local file
-		$localfile=tempnam($download_dir,'dol_');
+		$localfile = tempnam($download_dir, 'dol_');
 
 		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
+		$filename = $file;
+		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$newremotefileiso = utf8_decode($remotefile);
 
-		$result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
+		$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
 		if ($result)
 		{
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($localfile, octdec($conf->global->MAIN_UMASK));
 
 			// Define mime type
 			$type = 'application/octet-stream';
-			if (! empty($_GET["type"])) $type=$_GET["type"];
-			else $type=dol_mimetype($original_file);
+			if (!empty($_GET["type"])) $type = $_GET["type"];
+			else $type = dol_mimetype($original_file);
 
 			// Define attachment (attachment=true to force choice popup 'open'/'save as')
 			$attachment = true;
@@ -336,12 +336,12 @@ 
 		}
 		else
 		{
-			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
+			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
 		}
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 
 	//ftp_close($conn_id);	Close later
@@ -384,8 +384,8 @@ 
 <?php
 }
 
-$form=new Form($db);
-$formfile=new FormFile($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
 $userstatic = new User($db);
 
 
@@ -394,50 +394,50 @@ 
 
 print $langs->trans("FTPAreaDesc")."<br>";
 
-if (! function_exists('ftp_connect'))
+if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
 else
 {
-    if (! empty($ftp_server))
+    if (!empty($ftp_server))
 	{
 		// Confirm remove file
 		if ($action == 'delete')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 		}
 
 		// Confirmation de la suppression d'une ligne categorie
 		if ($action == 'delete_section')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 		}
 
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
-		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive?"(Passive)":"(Active)").'<br>';
+		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
 		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
         print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
         print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
         print $langs->trans("Directory").': ';
-		$sectionarray=preg_split('|[\/]|',$section);
+		$sectionarray = preg_split('|[\/]|', $section);
 		// For /
-		$newsection='/';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+		$newsection = '/';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection ? '&section='.urlencode($newsection) : '').'">';
 		print '/';
 		print '</a> ';
 		// For other directories
-		$i=0;
-		foreach($sectionarray as $val)
+		$i = 0;
+		foreach ($sectionarray as $val)
 		{
-			if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
+			if (empty($val)) continue; // Discard first and last entry that should be empty as section start/end with /
 			if ($i > 0)
 			{
 				print ' / ';
-				$newsection.='/';
+				$newsection .= '/';
 			}
-			$newsection.=$val;
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+			$newsection .= $val;
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection ? '&section='.urlencode($newsection) : '').'">';
 			print $val;
 			print '</a>';
 			$i++;
@@ -462,62 +462,62 @@ 
 		print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
 		print '<td class="liste_titre nowrap" align="right">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section ? '&section='.urlencode($section) : '').'">'.img_picto($langs->trans("Refresh"), 'refresh').'</a>&nbsp;';
 		print '</td>'."\n";
 		print '</tr>'."\n";
 
 		// set up a connection or die
 		if (empty($conn_id))
 		{
-			$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
+			$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
 
-			$conn_id=$resultarray['conn_id'];
-			$ok=$resultarray['ok'];
-			$mesg=$resultarray['mesg'];
+			$conn_id = $resultarray['conn_id'];
+			$ok = $resultarray['ok'];
+			$mesg = $resultarray['mesg'];
 		}
 
 		if ($ok)
 		{
 			//$type = ftp_systype($conn_id);
 
-			$newsection=$section;
-		    $newsectioniso=utf8_decode($section);
+			$newsection = $section;
+		    $newsectioniso = utf8_decode($section);
 			//$newsection='/home';
 
 			// List content of directory ($newsection = '/', '/home', ...)
-			if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+			if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 			{
-			    if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
+			    if ($newsection == '/') $newsection = '/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
 			    //var_dump($dirHandle);
-                $contents = scandir('ssh2.sftp://' . $conn_id . $newsection);
-                $buff=array();
-                foreach($contents as $i => $key)
+                $contents = scandir('ssh2.sftp://'.$conn_id.$newsection);
+                $buff = array();
+                foreach ($contents as $i => $key)
                 {
-                    $buff[$i]="---------- - root root 1234 Aug 01 2000 ".$key;
+                    $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
                 }
     		}
     		else
     		{
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
-                $contents = ftp_nlist($conn_id, $newsectioniso);	// Sometimes rawlist fails but never nlist
+                $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
         		//var_dump($contents);
 		        //var_dump($buff);
     		}
 
-			$nboflines=count($contents);
-			$rawlisthasfailed=false;
-			$i=0;
+			$nboflines = count($contents);
+			$rawlisthasfailed = false;
+			$i = 0;
 			while ($i < $nboflines && $i < 1000)
 			{
-				$vals=preg_split('@ +@',utf8_encode($buff[$i]),9);
+				$vals = preg_split('@ +@', utf8_encode($buff[$i]), 9);
 				//$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
 				//var_dump($vals);
-				$file=$vals[8];
+				$file = $vals[8];
 				if (empty($file))
 				{
-					$rawlisthasfailed=true;
-					$file=utf8_encode($contents[$i]);
+					$rawlisthasfailed = true;
+					$file = utf8_encode($contents[$i]);
 				}
 
 				if ($file == '.' || ($file == '..' && $section == '/'))
@@ -527,40 +527,40 @@ 
 				}
 
 				// Is it a directory ?
-				$is_directory=0;
-				if ($file == '..') $is_directory=1;
-				else if (! $rawlisthasfailed)
+				$is_directory = 0;
+				if ($file == '..') $is_directory = 1;
+				else if (!$rawlisthasfailed)
 				{
-					if (preg_match('/^d/',$vals[0])) $is_directory=1;
-					if (preg_match('/^l/',$vals[0])) $is_link=1;
+					if (preg_match('/^d/', $vals[0])) $is_directory = 1;
+					if (preg_match('/^l/', $vals[0])) $is_link = 1;
 				}
 				else
 				{
 					// Remote file
-					$filename=$file;
+					$filename = $file;
 					//print "section=".$section.' file='.$file.'X';
 					//print preg_match('@[\/]$@','aaa/').'Y';
 					//print preg_match('@[\\\/]$@',"aaa\\").'Y';
-					$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').preg_replace('@^[\\\/]@','',$file);
+					$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').preg_replace('@^[\\\/]@', '', $file);
 					//print 'A'.$remotefile.'A';
-					$newremotefileiso=utf8_decode($remotefile);
+					$newremotefileiso = utf8_decode($remotefile);
 					//print 'Z'.$newremotefileiso.'Z';
-					$is_directory=ftp_isdir($conn_id, $newremotefileiso);
+					$is_directory = ftp_isdir($conn_id, $newremotefileiso);
 				}
 
 
 				print '<tr class="oddeven" height="18">';
 				// Name
 				print '<td>';
-				$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
+				$newsection = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+				$newsection = preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@', '/', $newsection); // Change aaa/xxx/.. to new aaa
 				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
 				print $file;
 				if ($is_directory) print '</a>';
 				print '</td>';
 				// Size
 				print '<td align="center" class="nowrap">';
-				if (! $is_directory && ! $is_link) print $vals[4];
+				if (!$is_directory && !$is_link) print $vals[4];
 				else print '&nbsp;';
 				print '</td>';
 				// Date
@@ -588,13 +588,13 @@ 
 				}
 				else if ($is_link)
 				{
-					$newfile=$file;
-					$newfile=preg_replace('/ ->.*/','',$newfile);
+					$newfile = $file;
+					$newfile = preg_replace('/ ->.*/', '', $newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
 				}
 				else
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
 					print ' &nbsp; ';
 					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
 					print ' &nbsp; ';
@@ -612,7 +612,7 @@ 
 		print "</table>";
 
 
-		if (! $ok)
+		if (!$ok)
 		{
 		      print $mesg.'<br>'."\n";
 		      setEventMessages($mesg, null, 'errors');
@@ -637,21 +637,21 @@ 
 	}
 	else
 	{
-		$foundsetup=false;
-		$MAXFTP=20;
-		$i=1;
+		$foundsetup = false;
+		$MAXFTP = 20;
+		$i = 1;
 		while ($i <= $MAXFTP)
 		{
-			$paramkey='FTP_NAME_'.$i;
+			$paramkey = 'FTP_NAME_'.$i;
 			//print $paramkey;
-			if (! empty($conf->global->$paramkey))
+			if (!empty($conf->global->$paramkey))
 			{
-				$foundsetup=true;
+				$foundsetup = true;
 				break;
 			}
 			$i++;
 		}
-	    if (! $foundsetup)
+	    if (!$foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
 	    }
@@ -667,11 +667,11 @@ 
 // Close FTP connection
 if ($conn_id)
 {
-    if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+    if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
 
     }
-    else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+    else if (!empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
     }
@@ -698,28 +698,28 @@ 
  * @param	integer	$ftp_passive	Use a passive mode
  * @return	int 	<0 if OK, >0 if KO
  */
-function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0)
+function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive = 0)
 {
 	global $langs, $conf;
 
-	$ok=1;
-    $conn_id=null;
+	$ok = 1;
+    $conn_id = null;
 
-	if (! is_numeric($ftp_port))
+	if (!is_numeric($ftp_port))
 	{
-		$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-		$ok=0;
+		$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
+		$ok = 0;
 	}
 
 	if ($ok)
 	{
-		$connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT);
-		if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
 		    dol_syslog('Try to connect with ssh2_ftp');
 		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
 		}
-		else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+		else if (!empty($conf->global->FTP_CONNECT_WITH_SSL))
 		{
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
@@ -733,7 +733,7 @@ 
 		{
 			if ($ftp_user)
 			{
-				if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 				{
 				    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
     				{
@@ -741,20 +741,20 @@ 
     					//if ($ftp_passive) ftp_pasv($conn_id, true);
 
     					// Change the dir
-    					$newsectioniso=utf8_decode($section);
+    					$newsectioniso = utf8_decode($section);
     					//ftp_chdir($conn_id, $newsectioniso);
 		                $conn_id = ssh2_sftp($tmp_conn_id);
-		                if (! $conn_id)
+		                if (!$conn_id)
 		                {
-        					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-    	   				    $ok=0;
+        					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+    	   				    $ok = 0;
         				    $error++;
 		                }
     				}
     				else
     				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
+    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   				    $ok = 0;
     				    $error++;
     				}
 				}
@@ -766,13 +766,13 @@ 
     					if ($ftp_passive) ftp_pasv($conn_id, true);
 
     					// Change the dir
-    					$newsectioniso=utf8_decode($section);
+    					$newsectioniso = utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
     				}
     				else
     				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
+    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   				    $ok = 0;
     				    $error++;
     				}
 				}
@@ -781,12 +781,12 @@ 
 		else
 		{
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
-			$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-			$ok=0;
+			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
+			$ok = 0;
 		}
 	}
 
-	$arrayresult=array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
+	$arrayresult = array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
 	return $arrayresult;
 }
 
@@ -798,9 +798,9 @@ 
  * @param 		string		$dir			Directory
  * @return		int			1=directory, 0=not a directory
  */
-function ftp_isdir($connect_id,$dir)
+function ftp_isdir($connect_id, $dir)
 {
-	if (@ftp_chdir($connect_id,$dir))
+	if (@ftp_chdir($connect_id, $dir))
 	{
 		ftp_cdup($connect_id);
 		return 1;

Braces +108 added lines, -85 removed lines

@@ -31,13 +31,17 @@ 
 $langs->loadLangs(array('ftp', 'companies', 'other'));
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'ftp','');
 
 // Get parameters
 $action=GETPOST('action','aZ09');
 $section=GETPOST('section');
-if (! $section) $section='/';
+if (! $section) {
+    $section='/';
+}
 $numero_ftp = GETPOST("numero_ftp");
 /* if (! $numero_ftp) $numero_ftp=1; */
 $file=GETPOST("file");
@@ -53,8 +57,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="label";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="label";
+}
 
 $s_ftp_name='FTP_NAME_'.$numero_ftp;
 $s_ftp_server='FTP_SERVER_'.$numero_ftp;
@@ -64,7 +72,9 @@ 
 $s_ftp_passive='FTP_PASSIVE_'.$numero_ftp;
 $ftp_name=$conf->global->$s_ftp_name;
 $ftp_server=$conf->global->$s_ftp_server;
-$ftp_port=$conf->global->$s_ftp_port; if (empty($ftp_port)) $ftp_port=21;
+$ftp_port=$conf->global->$s_ftp_port; if (empty($ftp_port)) {
+    $ftp_port=21;
+}
 $ftp_user=$conf->global->$s_ftp_user;
 $ftp_password=$conf->global->$s_ftp_password;
 $ftp_passive=$conf->global->$s_ftp_passive;
@@ -100,24 +110,24 @@ 
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result=$ecmdir->changeNbOfFiles('+');
-		}
-		else {
+		} else {
 			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
+			if ($resupload < 0) {
+			    // Unknown error
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			}
-			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+			} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+			    // Files infected by a virus
 			{
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
-			else	// Known error
+			} else	// Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
@@ -137,8 +147,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
 		$action = "create";
@@ -173,8 +182,7 @@ 
 		if ($result)
 		{
 			setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 			setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
@@ -183,8 +191,7 @@ 
 		//ftp_close($conn_id);	Close later
 
 		$action='';
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -207,9 +214,11 @@ 
 	{
 		foreach($_POST["const"] as $const)
 		{
-			if ($const["check"])	// Is checkbox checked
+			if ($const["check"]) {
+			    // Is checkbox checked
 			{
 			    $langs->load("other");
+			}
 
 				// Remote file
 				$file=$const["file"];
@@ -223,8 +232,7 @@ 
 				if ($result)
 				{
 					setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-				}
-				else
+				} else
 				{
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 					setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
@@ -235,8 +243,7 @@ 
 				$action='';
 			}
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -266,8 +273,7 @@ 
 		if ($result)
 		{
 			setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
 		}
@@ -275,8 +281,7 @@ 
 		//ftp_close($conn_id);	Close later
 
 		$action='';
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -308,21 +313,32 @@ 
 		$result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
 		if ($result)
 		{
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($localfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+						@chmod($localfile, octdec($conf->global->MAIN_UMASK));
+			}
 
 			// Define mime type
 			$type = 'application/octet-stream';
-			if (! empty($_GET["type"])) $type=$_GET["type"];
-			else $type=dol_mimetype($original_file);
+			if (! empty($_GET["type"])) {
+			    $type=$_GET["type"];
+			} else {
+			    $type=dol_mimetype($original_file);
+			}
 
 			// Define attachment (attachment=true to force choice popup 'open'/'save as')
 			$attachment = true;
 
-			if ($encoding)   header('Content-Encoding: '.$encoding);
-			if ($type)       header('Content-Type: '.$type);
-			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-			else header('Content-Disposition: inline; filename="'.$filename.'"');
+			if ($encoding) {
+			    header('Content-Encoding: '.$encoding);
+			}
+			if ($type) {
+			    header('Content-Type: '.$type);
+			}
+			if ($attachment) {
+			    header('Content-Disposition: attachment; filename="'.$filename.'"');
+			} else {
+			    header('Content-Disposition: inline; filename="'.$filename.'"');
+			}
 
 			// Ajout directives pour resoudre bug IE
 			header('Cache-Control: Public, must-revalidate');
@@ -333,13 +349,11 @@ 
 			ftp_close($conn_id);
 
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -397,8 +411,7 @@ 
 if (! function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
+} else
 {
     if (! empty($ftp_server))
 	{
@@ -430,7 +443,10 @@ 
 		$i=0;
 		foreach($sectionarray as $val)
 		{
-			if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
+			if (empty($val)) {
+			    continue;
+			}
+			// Discard first and last entry that should be empty as section start/end with /
 			if ($i > 0)
 			{
 				print ' / ';
@@ -461,7 +477,9 @@ 
 		print '<td class="liste_titre" align="center">'.$langs->trans("Group").'</td>'."\n";
 		print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
 		print '<td class="liste_titre nowrap" align="right">';
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
+		if ($conf->use_javascript_ajax) {
+		    print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
+		}
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
 		print '</td>'."\n";
 		print '</tr>'."\n";
@@ -487,7 +505,10 @@ 
 			// List content of directory ($newsection = '/', '/home', ...)
 			if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
 			{
-			    if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
+			    if ($newsection == '/') {
+			        $newsection='/./';
+			    }
+			    // workaround for bug https://bugs.php.net/bug.php?id=64169
 			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
 			    //var_dump($dirHandle);
                 $contents = scandir('ssh2.sftp://' . $conn_id . $newsection);
@@ -496,8 +517,7 @@ 
                 {
                     $buff[$i]="---------- - root root 1234 Aug 01 2000 ".$key;
                 }
-    		}
-    		else
+    		} else
     		{
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso);	// Sometimes rawlist fails but never nlist
@@ -528,13 +548,17 @@ 
 
 				// Is it a directory ?
 				$is_directory=0;
-				if ($file == '..') $is_directory=1;
-				else if (! $rawlisthasfailed)
+				if ($file == '..') {
+				    $is_directory=1;
+				} else if (! $rawlisthasfailed)
 				{
-					if (preg_match('/^d/',$vals[0])) $is_directory=1;
-					if (preg_match('/^l/',$vals[0])) $is_link=1;
-				}
-				else
+					if (preg_match('/^d/',$vals[0])) {
+					    $is_directory=1;
+					}
+					if (preg_match('/^l/',$vals[0])) {
+					    $is_link=1;
+					}
+				} else
 				{
 					// Remote file
 					$filename=$file;
@@ -554,14 +578,21 @@ 
 				print '<td>';
 				$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
 				$newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
-				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
+				if ($is_directory) {
+				    print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
+				}
 				print $file;
-				if ($is_directory) print '</a>';
+				if ($is_directory) {
+				    print '</a>';
+				}
 				print '</td>';
 				// Size
 				print '<td align="center" class="nowrap">';
-				if (! $is_directory && ! $is_link) print $vals[4];
-				else print '&nbsp;';
+				if (! $is_directory && ! $is_link) {
+				    print $vals[4];
+				} else {
+				    print '&nbsp;';
+				}
 				print '</td>';
 				// Date
 				print '<td align="center" class="nowrap">';
@@ -583,16 +614,17 @@ 
 				print '<td align="right" width="64" class="nowrap">';
 				if ($is_directory)
 				{
-					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
-					else print '&nbsp;';
-				}
-				else if ($is_link)
+					if ($file != '..') {
+					    print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+					} else {
+					    print '&nbsp;';
+					}
+				} else if ($is_link)
 				{
 					$newfile=$file;
 					$newfile=preg_replace('/ ->.*/','',$newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else
+				} else
 				{
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
 					print ' &nbsp; ';
@@ -634,8 +666,7 @@ 
 		print '</div>';
 
 		print "</form>";
-	}
-	else
+	} else
 	{
 		$foundsetup=false;
 		$MAXFTP=20;
@@ -654,8 +685,7 @@ 
 	    if (! $foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else
+	    } else
 	    {
 	        print $langs->trans("ChooseAFTPEntryIntoMenu");
 	    }
@@ -670,12 +700,10 @@ 
     if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
 
-    }
-    else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+    } else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
-    }
-    else
+    } else
     {
         ftp_close($conn_id);
     }
@@ -718,13 +746,11 @@ 
 		{
 		    dol_syslog('Try to connect with ssh2_ftp');
 		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		}
-		else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+		} else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
 		{
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		else
+		} else
 		{
 		    dol_syslog('Try to connect with ftp_connect');
 		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
@@ -750,26 +776,25 @@ 
     	   				    $ok=0;
         				    $error++;
 		                }
-    				}
-    				else
+    				} else
     				{
     					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok=0;
     				    $error++;
     				}
-				}
-				else
+				} else
 				{
 				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
     				{
     					// Turn on passive mode transfers (must be after a successful login
-    					if ($ftp_passive) ftp_pasv($conn_id, true);
+    					if ($ftp_passive) {
+    					    ftp_pasv($conn_id, true);
+    					}
 
     					// Change the dir
     					$newsectioniso=utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else
+    				} else
     				{
     					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok=0;
@@ -777,8 +802,7 @@ 
     				}
 				}
 			}
-		}
-		else
+		} else
 		{
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
@@ -804,8 +828,7 @@ 
 	{
 		ftp_cdup($connect_id);
 		return 1;
-	}
-	else
+	} else
 	{
 		return 0;
 	}

dolibarr/htdocs/dav/dav.class.php

Indentation +205 added lines, -205 removed lines

@@ -28,11 +28,11 @@ 
 class CdavLib
 {
 
-	private $db;
+    private $db;
 
-	private $user;
+    private $user;
 
-	private $langs;
+    private $langs;
 
     /**
      * Constructor
@@ -41,25 +41,25 @@ 
      * @param   DoliDB      $db     Database handler
      * @param   Translate   $langs  translation
      */
-	function __construct($user, $db, $langs)
-	{
-		$this->user = $user;
-		$this->db = $db;
-		$this->langs = $langs;
-	}
+    function __construct($user, $db, $langs)
+    {
+        $this->user = $user;
+        $this->db = $db;
+        $this->langs = $langs;
+    }
 
-	/**
-	 * Base sql request for calendar events
-	 *
-	 * @param 	int 		$calid 			Calendard id
-	 * @param 	int|boolean	$oid			Oid
-	 * @param	int|boolean	$ouri			Ouri
-	 * @return string
-	 */
-	public function getSqlCalEvents($calid, $oid=false, $ouri=false)
-	{
-		// TODO : replace GROUP_CONCAT by
-		$sql = 'SELECT
+    /**
+     * Base sql request for calendar events
+     *
+     * @param 	int 		$calid 			Calendard id
+     * @param 	int|boolean	$oid			Oid
+     * @param	int|boolean	$ouri			Ouri
+     * @return string
+     */
+    public function getSqlCalEvents($calid, $oid=false, $ouri=false)
+    {
+        // TODO : replace GROUP_CONCAT by
+        $sql = 'SELECT
 					a.tms AS lastupd,
 					a.*,
 					sp.firstname,
@@ -82,223 +82,223 @@ 
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (! $this->user->rights->societe->client->voir )//FIXME si 'voir' on voit plus de chose ?
-		{
-			$sql.=' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
+        if (! $this->user->rights->societe->client->voir )//FIXME si 'voir' on voit plus de chose ?
+        {
+            $sql.=' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
-		}
-		else
-		{
-			$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
+        }
+        else
+        {
+            $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
-		}
+        }
 
-		$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
+        $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as cos ON cos.rowid = s.fk_pays
 				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type=\'user\' AND ar.fk_element='.intval($calid).')
 						AND a.code IN (SELECT cac.code FROM '.MAIN_DB_PREFIX.'c_actioncomm cac WHERE cac.type<>\'systemauto\')
 						AND a.entity IN ('.getEntity('societe', 1).')';
-		if($oid!==false) {
-			if($ouri===false)
-			{
-				$sql.=' AND a.id = '.intval($oid);
-			}
-			else
-			{
-				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
-			}
-		}
+        if($oid!==false) {
+            if($ouri===false)
+            {
+                $sql.=' AND a.id = '.intval($oid);
+            }
+            else
+            {
+                $sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
+            }
+        }
 
-		return $sql;
-	}
+        return $sql;
+    }
 
-	/**
-	 * Convert calendar row to VCalendar string
-	 *
-	 * @param 	int		$calid		Calendar id
-	 * @param	Object	$obj		Object id
-	 * @return string
-	 */
-	public function toVCalendar($calid, $obj)
-	{
-		/*$categ = array();
+    /**
+     * Convert calendar row to VCalendar string
+     *
+     * @param 	int		$calid		Calendar id
+     * @param	Object	$obj		Object id
+     * @return string
+     */
+    public function toVCalendar($calid, $obj)
+    {
+        /*$categ = array();
 		if($obj->soc_client)
 		{
 			$nick[] = $obj->soc_code_client;
 			$categ[] = $this->langs->transnoentitiesnoconv('Customer');
 		}*/
 
-		$location=$obj->location;
+        $location=$obj->location;
 
-		// contact address
-		if(empty($location) && !empty($obj->address))
-		{
-			$location = trim(str_replace(array("\r","\t","\n"),' ', $obj->address));
-			$location = trim($location.', '.$obj->zip);
-			$location = trim($location.' '.$obj->town);
-			$location = trim($location.', '.$obj->country_label);
-		}
+        // contact address
+        if(empty($location) && !empty($obj->address))
+        {
+            $location = trim(str_replace(array("\r","\t","\n"),' ', $obj->address));
+            $location = trim($location.', '.$obj->zip);
+            $location = trim($location.' '.$obj->town);
+            $location = trim($location.', '.$obj->country_label);
+        }
 
-		// contact address
-		if(empty($location) && !empty($obj->soc_address))
-		{
-			$location = trim(str_replace(array("\r","\t","\n"),' ', $obj->soc_address));
-			$location = trim($location.', '.$obj->soc_zip);
-			$location = trim($location.' '.$obj->soc_town);
-			$location = trim($location.', '.$obj->soc_country_label);
-		}
+        // contact address
+        if(empty($location) && !empty($obj->soc_address))
+        {
+            $location = trim(str_replace(array("\r","\t","\n"),' ', $obj->soc_address));
+            $location = trim($location.', '.$obj->soc_zip);
+            $location = trim($location.' '.$obj->soc_town);
+            $location = trim($location.', '.$obj->soc_country_label);
+        }
 
-		$address=explode("\n",$obj->address,2);
-		foreach($address as $kAddr => $vAddr)
-		{
-			$address[$kAddr] = trim(str_replace(array("\r","\t"),' ', str_replace("\n",' | ', trim($vAddr))));
-		}
-		$address[]='';
-		$address[]='';
+        $address=explode("\n",$obj->address,2);
+        foreach($address as $kAddr => $vAddr)
+        {
+            $address[$kAddr] = trim(str_replace(array("\r","\t"),' ', str_replace("\n",' | ', trim($vAddr))));
+        }
+        $address[]='';
+        $address[]='';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
-		else
-			$type='VTODO';
+        if($obj->percent==-1 && trim($obj->datep)!='')
+            $type='VEVENT';
+        else
+            $type='VTODO';
 
-		$timezone = date_default_timezone_get();
+        $timezone = date_default_timezone_get();
 
-		$caldata ="BEGIN:VCALENDAR\n";
-		$caldata.="VERSION:2.0\n";
-		$caldata.="METHOD:PUBLISH\n";
-		$caldata.="PRODID:-//Dolibarr CDav//FR\n";
-		$caldata.="BEGIN:".$type."\n";
-		$caldata.="CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
-		$caldata.="LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		$caldata.="DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		if($obj->sourceuid=='')
-			$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
-		else
-			$caldata.="UID:".$obj->sourceuid."\n";
-		$caldata.="SUMMARY:".$obj->label."\n";
-		$caldata.="LOCATION:".$location."\n";
-		$caldata.="PRIORITY:".$obj->priority."\n";
-		if($obj->fulldayevent)
-		{
-			$caldata.="DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
-			if($type=='VEVENT')
-			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
-				else
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
-			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
-		}
-		else
-		{
-			$caldata.="DTSTART;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			if($type=='VEVENT')
-			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-		}
-		$caldata.="CLASS:PUBLIC\n";
-		if($obj->transparency==1)
-			$caldata.="TRANSP:TRANSPARENT\n";
-		else
-			$caldata.="TRANSP:OPAQUE\n";
+        $caldata ="BEGIN:VCALENDAR\n";
+        $caldata.="VERSION:2.0\n";
+        $caldata.="METHOD:PUBLISH\n";
+        $caldata.="PRODID:-//Dolibarr CDav//FR\n";
+        $caldata.="BEGIN:".$type."\n";
+        $caldata.="CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
+        $caldata.="LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
+        $caldata.="DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
+        if($obj->sourceuid=='')
+            $caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
+        else
+            $caldata.="UID:".$obj->sourceuid."\n";
+        $caldata.="SUMMARY:".$obj->label."\n";
+        $caldata.="LOCATION:".$location."\n";
+        $caldata.="PRIORITY:".$obj->priority."\n";
+        if($obj->fulldayevent)
+        {
+            $caldata.="DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
+            if($type=='VEVENT')
+            {
+                if(trim($obj->datep2)!='')
+                    $caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+                else
+                    $caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+            }
+            elseif(trim($obj->datep2)!='')
+                $caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+        }
+        else
+        {
+            $caldata.="DTSTART;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+            if($type=='VEVENT')
+            {
+                if(trim($obj->datep2)!='')
+                    $caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+                else
+                    $caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+            }
+            elseif(trim($obj->datep2)!='')
+                $caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+        }
+        $caldata.="CLASS:PUBLIC\n";
+        if($obj->transparency==1)
+            $caldata.="TRANSP:TRANSPARENT\n";
+        else
+            $caldata.="TRANSP:OPAQUE\n";
 
-		if($type=='VEVENT')
-			$caldata.="STATUS:CONFIRMED\n";
-		elseif($obj->percent==0)
-			$caldata.="STATUS:NEEDS-ACTION\n";
-		elseif($obj->percent==100)
-			$caldata.="STATUS:COMPLETED\n";
-		else
-		{
-			$caldata.="STATUS:IN-PROCESS\n";
-			$caldata.="PERCENT-COMPLETE:".$obj->percent."\n";
-		}
+        if($type=='VEVENT')
+            $caldata.="STATUS:CONFIRMED\n";
+        elseif($obj->percent==0)
+            $caldata.="STATUS:NEEDS-ACTION\n";
+        elseif($obj->percent==100)
+            $caldata.="STATUS:COMPLETED\n";
+        else
+        {
+            $caldata.="STATUS:IN-PROCESS\n";
+            $caldata.="PERCENT-COMPLETE:".$obj->percent."\n";
+        }
 
-		$caldata.="DESCRIPTION:";
-		$caldata.=strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
-		if(!empty($obj->soc_nom))
-			$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
-		if(!empty($obj->soc_phone))
-			$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
-		if(!empty($obj->firstname) || !empty($obj->lastname))
-			$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
-		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
-			$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
-		if(strpos($obj->other_users,',')) // several
-			$caldata.="\\n*DOLIBARR-USR: ".$obj->other_users;
-		$caldata.="\n";
+        $caldata.="DESCRIPTION:";
+        $caldata.=strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
+        if(!empty($obj->soc_nom))
+            $caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
+        if(!empty($obj->soc_phone))
+            $caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
+        if(!empty($obj->firstname) || !empty($obj->lastname))
+            $caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
+        if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
+            $caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
+        if(strpos($obj->other_users,',')) // several
+            $caldata.="\\n*DOLIBARR-USR: ".$obj->other_users;
+        $caldata.="\n";
 
-		$caldata.="END:".$type."\n";
-		$caldata.="END:VCALENDAR\n";
+        $caldata.="END:".$type."\n";
+        $caldata.="END:VCALENDAR\n";
 
-		return $caldata;
-	}
+        return $caldata;
+    }
 
-	/**
-	 * getFullCalendarObjects
-	 *
-	 * @param int	 	$calendarId			Calendar id
-	 * @param int		$bCalendarData		Add calendar data
-	 * @return array|string[][]
-	 */
-	public function getFullCalendarObjects($calendarId, $bCalendarData)
-	{
-		$calid = ($calendarId*1);
-		$calevents = array();
+    /**
+     * getFullCalendarObjects
+     *
+     * @param int	 	$calendarId			Calendar id
+     * @param int		$bCalendarData		Add calendar data
+     * @return array|string[][]
+     */
+    public function getFullCalendarObjects($calendarId, $bCalendarData)
+    {
+        $calid = ($calendarId*1);
+        $calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
-			return $calevents;
+        if(! $this->user->rights->agenda->myactions->read)
+            return $calevents;
 
-		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
-			return $calevents;
+        if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
+            return $calevents;
 
-		$sql = $this->getSqlCalEvents($calid);
+        $sql = $this->getSqlCalEvents($calid);
 
-		$result = $this->db->query($sql);
+        $result = $this->db->query($sql);
 
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
-				$calendardata = $this->toVCalendar($calid, $obj);
+        if ($result)
+        {
+            while ($obj = $this->db->fetch_object($result))
+            {
+                $calendardata = $this->toVCalendar($calid, $obj);
 
-				if($bCalendarData)
-				{
-					$calevents[] = array(
-						'calendardata' => $calendardata,
-						'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
-						'lastmodified' => strtotime($obj->lastupd),
-						'etag' => '"'.md5($calendardata).'"',
-						'calendarid'   => $calendarId,
-						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
-					);
-				}
-				else
-				{
-					$calevents[] = array(
-						// 'calendardata' => $calendardata,  not necessary because etag+size are present
-						'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
-						'lastmodified' => strtotime($obj->lastupd),
-						'etag' => '"'.md5($calendardata).'"',
-						'calendarid'   => $calendarId,
-						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
-					);
-				}
-			}
-		}
-		return $calevents;
-	}
+                if($bCalendarData)
+                {
+                    $calevents[] = array(
+                        'calendardata' => $calendardata,
+                        'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
+                        'lastmodified' => strtotime($obj->lastupd),
+                        'etag' => '"'.md5($calendardata).'"',
+                        'calendarid'   => $calendarId,
+                        'size' => strlen($calendardata),
+                        'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+                    );
+                }
+                else
+                {
+                    $calevents[] = array(
+                        // 'calendardata' => $calendardata,  not necessary because etag+size are present
+                        'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
+                        'lastmodified' => strtotime($obj->lastupd),
+                        'etag' => '"'.md5($calendardata).'"',
+                        'calendarid'   => $calendarId,
+                        'size' => strlen($calendardata),
+                        'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+                    );
+                }
+            }
+        }
+        return $calevents;
+    }
 }

Spacing +84 added lines, -84 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param	int|boolean	$ouri			Ouri
 	 * @return string
 	 */
-	public function getSqlCalEvents($calid, $oid=false, $ouri=false)
+	public function getSqlCalEvents($calid, $oid = false, $ouri = false)
 	{
 		// TODO : replace GROUP_CONCAT by
 		$sql = 'SELECT
@@ -82,33 +82,33 @@ 
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (! $this->user->rights->societe->client->voir )//FIXME si 'voir' on voit plus de chose ?
+		if (!$this->user->rights->societe->client->voir)//FIXME si 'voir' on voit plus de chose ?
 		{
-			$sql.=' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
+			$sql .= ' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
 		else
 		{
-			$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
 
-		$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as cos ON cos.rowid = s.fk_pays
 				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type=\'user\' AND ar.fk_element='.intval($calid).')
 						AND a.code IN (SELECT cac.code FROM '.MAIN_DB_PREFIX.'c_actioncomm cac WHERE cac.type<>\'systemauto\')
 						AND a.entity IN ('.getEntity('societe', 1).')';
-		if($oid!==false) {
-			if($ouri===false)
+		if ($oid !== false) {
+			if ($ouri === false)
 			{
-				$sql.=' AND a.id = '.intval($oid);
+				$sql .= ' AND a.id = '.intval($oid);
 			}
 			else
 			{
-				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
+				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
 		}
 
@@ -131,116 +131,116 @@ 
 			$categ[] = $this->langs->transnoentitiesnoconv('Customer');
 		}*/
 
-		$location=$obj->location;
+		$location = $obj->location;
 
 		// contact address
-		if(empty($location) && !empty($obj->address))
+		if (empty($location) && !empty($obj->address))
 		{
-			$location = trim(str_replace(array("\r","\t","\n"),' ', $obj->address));
+			$location = trim(str_replace(array("\r", "\t", "\n"), ' ', $obj->address));
 			$location = trim($location.', '.$obj->zip);
 			$location = trim($location.' '.$obj->town);
 			$location = trim($location.', '.$obj->country_label);
 		}
 
 		// contact address
-		if(empty($location) && !empty($obj->soc_address))
+		if (empty($location) && !empty($obj->soc_address))
 		{
-			$location = trim(str_replace(array("\r","\t","\n"),' ', $obj->soc_address));
+			$location = trim(str_replace(array("\r", "\t", "\n"), ' ', $obj->soc_address));
 			$location = trim($location.', '.$obj->soc_zip);
 			$location = trim($location.' '.$obj->soc_town);
 			$location = trim($location.', '.$obj->soc_country_label);
 		}
 
-		$address=explode("\n",$obj->address,2);
-		foreach($address as $kAddr => $vAddr)
+		$address = explode("\n", $obj->address, 2);
+		foreach ($address as $kAddr => $vAddr)
 		{
-			$address[$kAddr] = trim(str_replace(array("\r","\t"),' ', str_replace("\n",' | ', trim($vAddr))));
+			$address[$kAddr] = trim(str_replace(array("\r", "\t"), ' ', str_replace("\n", ' | ', trim($vAddr))));
 		}
-		$address[]='';
-		$address[]='';
+		$address[] = '';
+		$address[] = '';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
+		if ($obj->percent == -1 && trim($obj->datep) != '')
+			$type = 'VEVENT';
 		else
-			$type='VTODO';
+			$type = 'VTODO';
 
 		$timezone = date_default_timezone_get();
 
-		$caldata ="BEGIN:VCALENDAR\n";
-		$caldata.="VERSION:2.0\n";
-		$caldata.="METHOD:PUBLISH\n";
-		$caldata.="PRODID:-//Dolibarr CDav//FR\n";
-		$caldata.="BEGIN:".$type."\n";
-		$caldata.="CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
-		$caldata.="LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		$caldata.="DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		if($obj->sourceuid=='')
-			$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
+		$caldata = "BEGIN:VCALENDAR\n";
+		$caldata .= "VERSION:2.0\n";
+		$caldata .= "METHOD:PUBLISH\n";
+		$caldata .= "PRODID:-//Dolibarr CDav//FR\n";
+		$caldata .= "BEGIN:".$type."\n";
+		$caldata .= "CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
+		$caldata .= "LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
+		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
+		if ($obj->sourceuid == '')
+			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
 		else
-			$caldata.="UID:".$obj->sourceuid."\n";
-		$caldata.="SUMMARY:".$obj->label."\n";
-		$caldata.="LOCATION:".$location."\n";
-		$caldata.="PRIORITY:".$obj->priority."\n";
-		if($obj->fulldayevent)
+			$caldata .= "UID:".$obj->sourceuid."\n";
+		$caldata .= "SUMMARY:".$obj->label."\n";
+		$caldata .= "LOCATION:".$location."\n";
+		$caldata .= "PRIORITY:".$obj->priority."\n";
+		if ($obj->fulldayevent)
 		{
-			$caldata.="DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
-			if($type=='VEVENT')
+			$caldata .= "DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
+			if ($type == 'VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+				if (trim($obj->datep2) != '')
+					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
 				else
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+			elseif (trim($obj->datep2) != '')
+				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
 		}
 		else
 		{
-			$caldata.="DTSTART;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			if($type=='VEVENT')
+			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			if ($type == 'VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				if (trim($obj->datep2) != '')
+					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 				else
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			elseif (trim($obj->datep2) != '')
+				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
-		$caldata.="CLASS:PUBLIC\n";
-		if($obj->transparency==1)
-			$caldata.="TRANSP:TRANSPARENT\n";
+		$caldata .= "CLASS:PUBLIC\n";
+		if ($obj->transparency == 1)
+			$caldata .= "TRANSP:TRANSPARENT\n";
 		else
-			$caldata.="TRANSP:OPAQUE\n";
+			$caldata .= "TRANSP:OPAQUE\n";
 
-		if($type=='VEVENT')
-			$caldata.="STATUS:CONFIRMED\n";
-		elseif($obj->percent==0)
-			$caldata.="STATUS:NEEDS-ACTION\n";
-		elseif($obj->percent==100)
-			$caldata.="STATUS:COMPLETED\n";
+		if ($type == 'VEVENT')
+			$caldata .= "STATUS:CONFIRMED\n";
+		elseif ($obj->percent == 0)
+			$caldata .= "STATUS:NEEDS-ACTION\n";
+		elseif ($obj->percent == 100)
+			$caldata .= "STATUS:COMPLETED\n";
 		else
 		{
-			$caldata.="STATUS:IN-PROCESS\n";
-			$caldata.="PERCENT-COMPLETE:".$obj->percent."\n";
+			$caldata .= "STATUS:IN-PROCESS\n";
+			$caldata .= "PERCENT-COMPLETE:".$obj->percent."\n";
 		}
 
-		$caldata.="DESCRIPTION:";
-		$caldata.=strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
-		if(!empty($obj->soc_nom))
-			$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
-		if(!empty($obj->soc_phone))
-			$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
-		if(!empty($obj->firstname) || !empty($obj->lastname))
-			$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
-		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
-			$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
-		if(strpos($obj->other_users,',')) // several
-			$caldata.="\\n*DOLIBARR-USR: ".$obj->other_users;
-		$caldata.="\n";
+		$caldata .= "DESCRIPTION:";
+		$caldata .= strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
+		if (!empty($obj->soc_nom))
+			$caldata .= "\\n*DOLIBARR-SOC: ".$obj->soc_nom;
+		if (!empty($obj->soc_phone))
+			$caldata .= "\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
+		if (!empty($obj->firstname) || !empty($obj->lastname))
+			$caldata .= "\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
+		if (!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
+			$caldata .= "\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
+		if (strpos($obj->other_users, ',')) // several
+			$caldata .= "\\n*DOLIBARR-USR: ".$obj->other_users;
+		$caldata .= "\n";
 
-		$caldata.="END:".$type."\n";
-		$caldata.="END:VCALENDAR\n";
+		$caldata .= "END:".$type."\n";
+		$caldata .= "END:VCALENDAR\n";
 
 		return $caldata;
 	}
@@ -254,13 +254,13 @@ 
 	 */
 	public function getFullCalendarObjects($calendarId, $bCalendarData)
 	{
-		$calid = ($calendarId*1);
+		$calid = ($calendarId * 1);
 		$calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
+		if (!$this->user->rights->agenda->myactions->read)
 			return $calevents;
 
-		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
+		if ($calid != $this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
 			return $calevents;
 
 		$sql = $this->getSqlCalEvents($calid);
@@ -273,7 +273,7 @@ 
 			{
 				$calendardata = $this->toVCalendar($calid, $obj);
 
-				if($bCalendarData)
+				if ($bCalendarData)
 				{
 					$calevents[] = array(
 						'calendardata' => $calendardata,
@@ -282,7 +282,7 @@ 
 						'etag' => '"'.md5($calendardata).'"',
 						'calendarid'   => $calendarId,
 						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
 				}
 				else
@@ -294,7 +294,7 @@ 
 						'etag' => '"'.md5($calendardata).'"',
 						'calendarid'   => $calendarId,
 						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
 				}
 			}

Braces +63 added lines, -52 removed lines

@@ -82,14 +82,15 @@ 
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (! $this->user->rights->societe->client->voir )//FIXME si 'voir' on voit plus de chose ?
+		if (! $this->user->rights->societe->client->voir ) {
+		    //FIXME si 'voir' on voit plus de chose ?
 		{
 			$sql.=' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
-		else
+		} else
 		{
 			$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
@@ -105,8 +106,7 @@ 
 			if($ouri===false)
 			{
 				$sql.=' AND a.id = '.intval($oid);
-			}
-			else
+			} else
 			{
 				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
@@ -159,10 +159,11 @@ 
 		$address[]='';
 		$address[]='';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
-		else
-			$type='VTODO';
+		if($obj->percent==-1 && trim($obj->datep)!='') {
+					$type='VEVENT';
+		} else {
+					$type='VTODO';
+		}
 
 		$timezone = date_default_timezone_get();
 
@@ -174,10 +175,11 @@ 
 		$caldata.="CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
 		$caldata.="LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		$caldata.="DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		if($obj->sourceuid=='')
-			$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
-		else
-			$caldata.="UID:".$obj->sourceuid."\n";
+		if($obj->sourceuid=='') {
+					$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
+		} else {
+					$caldata.="UID:".$obj->sourceuid."\n";
+		}
 		$caldata.="SUMMARY:".$obj->label."\n";
 		$caldata.="LOCATION:".$location."\n";
 		$caldata.="PRIORITY:".$obj->priority."\n";
@@ -186,40 +188,42 @@ 
 			$caldata.="DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
 			if($type=='VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
-				else
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+				if(trim($obj->datep2)!='') {
+									$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+				} else {
+									$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+				}
+			} elseif(trim($obj->datep2)!='') {
+							$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
-		}
-		else
+		} else
 		{
 			$caldata.="DTSTART;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			if($type=='VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				if(trim($obj->datep2)!='') {
+									$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				} else {
+									$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				}
+			} elseif(trim($obj->datep2)!='') {
+							$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
 		$caldata.="CLASS:PUBLIC\n";
-		if($obj->transparency==1)
-			$caldata.="TRANSP:TRANSPARENT\n";
-		else
-			$caldata.="TRANSP:OPAQUE\n";
+		if($obj->transparency==1) {
+					$caldata.="TRANSP:TRANSPARENT\n";
+		} else {
+					$caldata.="TRANSP:OPAQUE\n";
+		}
 
-		if($type=='VEVENT')
-			$caldata.="STATUS:CONFIRMED\n";
-		elseif($obj->percent==0)
-			$caldata.="STATUS:NEEDS-ACTION\n";
-		elseif($obj->percent==100)
-			$caldata.="STATUS:COMPLETED\n";
-		else
+		if($type=='VEVENT') {
+					$caldata.="STATUS:CONFIRMED\n";
+		} elseif($obj->percent==0) {
+					$caldata.="STATUS:NEEDS-ACTION\n";
+		} elseif($obj->percent==100) {
+					$caldata.="STATUS:COMPLETED\n";
+		} else
 		{
 			$caldata.="STATUS:IN-PROCESS\n";
 			$caldata.="PERCENT-COMPLETE:".$obj->percent."\n";
@@ -227,16 +231,22 @@ 
 
 		$caldata.="DESCRIPTION:";
 		$caldata.=strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
-		if(!empty($obj->soc_nom))
-			$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
-		if(!empty($obj->soc_phone))
-			$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
-		if(!empty($obj->firstname) || !empty($obj->lastname))
-			$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
-		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
-			$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
-		if(strpos($obj->other_users,',')) // several
+		if(!empty($obj->soc_nom)) {
+					$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
+		}
+		if(!empty($obj->soc_phone)) {
+					$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
+		}
+		if(!empty($obj->firstname) || !empty($obj->lastname)) {
+					$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
+		}
+		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile)) {
+					$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
+		}
+		if(strpos($obj->other_users,',')) {
+		    // several
 			$caldata.="\\n*DOLIBARR-USR: ".$obj->other_users;
+		}
 		$caldata.="\n";
 
 		$caldata.="END:".$type."\n";
@@ -257,11 +267,13 @@ 
 		$calid = ($calendarId*1);
 		$calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
-			return $calevents;
+		if(! $this->user->rights->agenda->myactions->read) {
+					return $calevents;
+		}
 
-		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
-			return $calevents;
+		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read)) {
+					return $calevents;
+		}
 
 		$sql = $this->getSqlCalEvents($calid);
 
@@ -284,8 +296,7 @@ 
 						'size' => strlen($calendardata),
 						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
 					);
-				}
-				else
+				} else
 				{
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present

dolibarr/htdocs/dav/dav.lib.php

Indentation +22 added lines, -22 removed lines

@@ -24,19 +24,19 @@ 
 // define CDAV_CONTACT_TAG if not
 if(!defined('CDAV_CONTACT_TAG'))
 {
-	if(isset($conf->global->CDAV_CONTACT_TAG))
-		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-		else
-			define('CDAV_CONTACT_TAG', '');
+    if(isset($conf->global->CDAV_CONTACT_TAG))
+        define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
+        else
+            define('CDAV_CONTACT_TAG', '');
 }
 
 // define CDAV_URI_KEY if not
 if(!defined('CDAV_URI_KEY'))
 {
-	if(isset($conf->global->CDAV_URI_KEY))
-		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-		else
-			define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']),0,8));
+    if(isset($conf->global->CDAV_URI_KEY))
+        define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
+        else
+            define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']),0,8));
 }
 
 
@@ -49,24 +49,24 @@ 
  */
 function dav_admin_prepare_head()
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/dav.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("WebDAV");
-	$head[$h][2] = 'webdav';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/dav.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("WebDAV");
+    $head[$h][2] = 'webdav';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav','remove');
 
-	return $head;
+    return $head;
 }
 

Spacing +7 added lines, -7 removed lines

@@ -22,21 +22,21 @@ 
  */
 
 // define CDAV_CONTACT_TAG if not
-if(!defined('CDAV_CONTACT_TAG'))
+if (!defined('CDAV_CONTACT_TAG'))
 {
-	if(isset($conf->global->CDAV_CONTACT_TAG))
+	if (isset($conf->global->CDAV_CONTACT_TAG))
 		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
 		else
 			define('CDAV_CONTACT_TAG', '');
 }
 
 // define CDAV_URI_KEY if not
-if(!defined('CDAV_URI_KEY'))
+if (!defined('CDAV_URI_KEY'))
 {
-	if(isset($conf->global->CDAV_URI_KEY))
+	if (isset($conf->global->CDAV_URI_KEY))
 		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
 		else
-			define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']),0,8));
+			define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
 }
 
 
@@ -63,9 +63,9 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav', 'remove');
 
 	return $head;
 }

Braces +12 added lines, -10 removed lines

@@ -24,20 +24,22 @@
 // define CDAV_CONTACT_TAG if not
 if(!defined('CDAV_CONTACT_TAG'))
 {
-	if(isset($conf->global->CDAV_CONTACT_TAG))
-		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-		else
-			define('CDAV_CONTACT_TAG', '');
-}
+	if(isset($conf->global->CDAV_CONTACT_TAG)) {
+			define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
+	} else {
+					define('CDAV_CONTACT_TAG', '');
+		}
+		}
 
 // define CDAV_URI_KEY if not
 if(!defined('CDAV_URI_KEY'))
 {
-	if(isset($conf->global->CDAV_URI_KEY))
-		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-		else
-			define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']),0,8));
-}
+	if(isset($conf->global->CDAV_URI_KEY)) {
+			define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
+	} else {
+					define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']),0,8));
+		}
+		}
 
 
 

dolibarr/htdocs/dav/fileserver.php

Indentation +31 added lines, -31 removed lines

@@ -39,8 +39,8 @@ 
 $user = new User($db);
 if(isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER']!='')
 {
-	$user->fetch('',$_SERVER['PHP_AUTH_USER']);
-	$user->getrights();
+    $user->fetch('',$_SERVER['PHP_AUTH_USER']);
+    $user->getrights();
 }
 
 // Load translation files required by the page
@@ -48,7 +48,7 @@ 
 
 
 if(empty($conf->dav->enabled))
-	accessforbidden();
+    accessforbidden();
 
 
 // settings
@@ -59,27 +59,27 @@ 
 
 // Authentication callback function
 $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
-	global $user;
-	global $conf;
-	global $dolibarr_main_authentication;
-
-	if (empty($user->login))
-		return false;
-	if ($user->socid > 0)
-		return false;
-	if ($user->login != $username)
-		return false;
-
-	// Authentication mode
-	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
-	$authmode = explode(',',$dolibarr_main_authentication);
-	$entity = (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
-
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
-		return false;
-
-	return true;
+    global $user;
+    global $conf;
+    global $dolibarr_main_authentication;
+
+    if (empty($user->login))
+        return false;
+    if ($user->socid > 0)
+        return false;
+    if ($user->login != $username)
+        return false;
+
+    // Authentication mode
+    if (empty($dolibarr_main_authentication))
+        $dolibarr_main_authentication='http,dolibarr';
+    $authmode = explode(',',$dolibarr_main_authentication);
+    $entity = (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+
+    if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
+        return false;
+
+    return true;
 });
 
 $authBackend->setRealm(constant('DOL_APPLICATION_TITLE'));
@@ -100,14 +100,14 @@ 
 // Public dir
 if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
 {
-	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/public');
+    $nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/public');
 }
 // Private dir
 $nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/private');
 // ECM dir
 if (! empty($conf->ecm->enabled) && ! empty($conf->global->DAV_ALLOW_ECM_DIR))
 {
-	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/ecm');
+    $nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/ecm');
 }
 
 
@@ -135,12 +135,12 @@ 
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
-	|| ! preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public','/').'/', $_SERVER["PHP_SELF"]))
-	&& ! preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
-	)
+    || ! preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public','/').'/', $_SERVER["PHP_SELF"]))
+    && ! preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
+    )
 {
-	//var_dump($_SERVER["QUERY_STRING"]);exit;
-	$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
+    //var_dump($_SERVER["QUERY_STRING"]);exit;
+    $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 }
 // Support for LOCK and UNLOCK
 $lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir . '/.locksdb');

Spacing +22 added lines, -22 removed lines

@@ -21,12 +21,12 @@ 
  *      \brief      Server DAV
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOLOGIN'))  		 define("NOLOGIN",1);		// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOLOGIN'))  		 define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -37,17 +37,17 @@ 
 
 
 $user = new User($db);
-if(isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER']!='')
+if (isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '')
 {
-	$user->fetch('',$_SERVER['PHP_AUTH_USER']);
+	$user->fetch('', $_SERVER['PHP_AUTH_USER']);
 	$user->getrights();
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array("main","other"));
+$langs->loadLangs(array("main", "other"));
 
 
-if(empty($conf->dav->enabled))
+if (empty($conf->dav->enabled))
 	accessforbidden();
 
 
@@ -58,7 +58,7 @@ 
 //var_dump($tmpDir);exit;
 
 // Authentication callback function
-$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
+$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($username, $password) {
 	global $user;
 	global $conf;
 	global $dolibarr_main_authentication;
@@ -72,11 +72,11 @@ 
 
 	// Authentication mode
 	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
-	$authmode = explode(',',$dolibarr_main_authentication);
-	$entity = (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+		$dolibarr_main_authentication = 'http,dolibarr';
+	$authmode = explode(',', $dolibarr_main_authentication);
+	$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
+	if (checkLoginPassEntity($username, $password, $entity, $authmode) != $username)
 		return false;
 
 	return true;
@@ -100,14 +100,14 @@ 
 // Public dir
 if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
 {
-	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/public');
+	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root.'/dav/public');
 }
 // Private dir
-$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/private');
+$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root.'/dav/private');
 // ECM dir
-if (! empty($conf->ecm->enabled) && ! empty($conf->global->DAV_ALLOW_ECM_DIR))
+if (!empty($conf->ecm->enabled) && !empty($conf->global->DAV_ALLOW_ECM_DIR))
 {
-	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/ecm');
+	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root.'/ecm');
 }
 
 
@@ -135,15 +135,15 @@ 
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
-	|| ! preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public','/').'/', $_SERVER["PHP_SELF"]))
-	&& ! preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
+	|| !preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public', '/').'/', $_SERVER["PHP_SELF"]))
+	&& !preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
 	)
 {
 	//var_dump($_SERVER["QUERY_STRING"]);exit;
 	$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 }
 // Support for LOCK and UNLOCK
-$lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir . '/.locksdb');
+$lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir.'/.locksdb');
 $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
 $server->addPlugin($lockPlugin);
 

Braces +45 added lines, -19 removed lines

@@ -21,12 +21,28 @@ 
  *      \brief      Server DAV
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOLOGIN'))  		 define("NOLOGIN",1);		// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOLOGIN')) {
+    define("NOLOGIN",1);
+}
+// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK')) {
+    define("NOCSRFCHECK",1);
+}
+// We accept to go on this page from external web site.
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -47,8 +63,9 @@ 
 $langs->loadLangs(array("main","other"));
 
 
-if(empty($conf->dav->enabled))
+if(empty($conf->dav->enabled)) {
 	accessforbidden();
+}
 
 
 // settings
@@ -63,21 +80,26 @@ 
 	global $conf;
 	global $dolibarr_main_authentication;
 
-	if (empty($user->login))
-		return false;
-	if ($user->socid > 0)
-		return false;
-	if ($user->login != $username)
-		return false;
+	if (empty($user->login)) {
+			return false;
+	}
+	if ($user->socid > 0) {
+			return false;
+	}
+	if ($user->login != $username) {
+			return false;
+	}
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
+	if (empty($dolibarr_main_authentication)) {
+			$dolibarr_main_authentication='http,dolibarr';
+	}
 	$authmode = explode(',',$dolibarr_main_authentication);
 	$entity = (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
-		return false;
+	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username) {
+			return false;
+	}
 
 	return true;
 });
@@ -131,7 +153,9 @@ 
 // If you want to run the SabreDAV server in a custom location (using mod_rewrite for instance)
 // You can override the baseUri here.
 $baseUri = DOL_URL_ROOT.'/dav/fileserver.php/';
-if (isset($baseUri)) $server->setBaseUri($baseUri);
+if (isset($baseUri)) {
+    $server->setBaseUri($baseUri);
+}
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
@@ -166,4 +190,6 @@ 
 // And off we go!
 $server->exec();
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+    $db->close();
+}

dolibarr/htdocs/main.inc.php

Indentation +1481 added lines, -1481 removed lines

@@ -38,34 +38,34 @@ 
 $micro_start_time = 0;
 if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 {
-	list($usec, $sec) = explode(" ", microtime());
-	$micro_start_time=((float) $usec + (float) $sec);
-	// Add Xdebug code coverage
-	//define('XDEBUGCOVERAGE',1);
-	if (defined('XDEBUGCOVERAGE')) {
-		xdebug_start_code_coverage();
-	}
+    list($usec, $sec) = explode(" ", microtime());
+    $micro_start_time=((float) $usec + (float) $sec);
+    // Add Xdebug code coverage
+    //define('XDEBUGCOVERAGE',1);
+    if (defined('XDEBUGCOVERAGE')) {
+        xdebug_start_code_coverage();
+    }
 }
 
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
-	if (get_magic_quotes_gpc())
-	{
-		// Forcing parameter setting magic_quotes_gpc and cleaning parameters
-		// (Otherwise he would have for each position, condition
-		// Reading stripslashes variable according to state get_magic_quotes_gpc).
-		// Off mode recommended (just do $db->escape for insert / update).
-		function stripslashes_deep($value)
-		{
-			return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
-		}
-		$_GET     = array_map('stripslashes_deep', $_GET);
-		$_POST    = array_map('stripslashes_deep', $_POST);
-		$_FILES   = array_map('stripslashes_deep', $_FILES);
-		//$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
-		@set_magic_quotes_runtime(0);
-	}
+    if (get_magic_quotes_gpc())
+    {
+        // Forcing parameter setting magic_quotes_gpc and cleaning parameters
+        // (Otherwise he would have for each position, condition
+        // Reading stripslashes variable according to state get_magic_quotes_gpc).
+        // Off mode recommended (just do $db->escape for insert / update).
+        function stripslashes_deep($value)
+        {
+            return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
+        }
+        $_GET     = array_map('stripslashes_deep', $_GET);
+        $_POST    = array_map('stripslashes_deep', $_POST);
+        $_FILES   = array_map('stripslashes_deep', $_FILES);
+        //$_COOKIE  = array_map('stripslashes_deep', $_COOKIE); // Useless because a cookie should never be outputed on screen nor used into sql
+        @set_magic_quotes_runtime(0);
+    }
 }
 
 // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -93,58 +93,58 @@ 
  */
 function testSqlAndScriptInject($val, $type)
 {
-	$inj = 0;
-	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
-	if ($type == 1 || $type == 3)
-	{
-		$inj += preg_match('/delete\s+from/i',	 $val);
-		$inj += preg_match('/create\s+table/i',	 $val);
-		$inj += preg_match('/insert\s+into/i', 	 $val);
-		$inj += preg_match('/select\s+from/i', 	 $val);
-		$inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-		$inj += preg_match('/user\s*\(/i',  $val);						// avoid to use function user() that return current database login
-		$inj += preg_match('/information_schema/i',  $val);				// avoid to use request that read information_schema database
-	}
-	if ($type == 3)
-	{
-		$inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i',	 $val);
-	}
-	if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
-	{
-		$inj += preg_match('/updatexml\(/i', 	 $val);
-		$inj += preg_match('/update.+set.+=/i',  $val);
-		$inj += preg_match('/union.+select/i', 	 $val);
-		$inj += preg_match('/(\.\.%2f)+/i',		 $val);
-	}
-	// For XSS Injection done by adding javascript with script
-	// This is all cases a browser consider text is javascript:
-	// When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
-	// All examples on page: http://ha.ckers.org/xss.html#XSScalc
-	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-	$inj += preg_match('/<script/i', $val);
-	$inj += preg_match('/<iframe/i', $val);
-	$inj += preg_match('/<audio/i', $val);
-	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
-	$inj += preg_match('/base[\s]+href/si', $val);
-	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-	$inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-	$inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-	$inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
-	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-	//if ($type == 1)
-	//{
-		$inj += preg_match('/javascript:/i', $val);
-		$inj += preg_match('/vbscript:/i', $val);
-	//}
-	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
-	return $inj;
+    $inj = 0;
+    // For SQL Injection (only GET are used to be included into bad escaped SQL requests)
+    if ($type == 1 || $type == 3)
+    {
+        $inj += preg_match('/delete\s+from/i',	 $val);
+        $inj += preg_match('/create\s+table/i',	 $val);
+        $inj += preg_match('/insert\s+into/i', 	 $val);
+        $inj += preg_match('/select\s+from/i', 	 $val);
+        $inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
+        $inj += preg_match('/user\s*\(/i',  $val);						// avoid to use function user() that return current database login
+        $inj += preg_match('/information_schema/i',  $val);				// avoid to use request that read information_schema database
+    }
+    if ($type == 3)
+    {
+        $inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i',	 $val);
+    }
+    if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
+    {
+        $inj += preg_match('/updatexml\(/i', 	 $val);
+        $inj += preg_match('/update.+set.+=/i',  $val);
+        $inj += preg_match('/union.+select/i', 	 $val);
+        $inj += preg_match('/(\.\.%2f)+/i',		 $val);
+    }
+    // For XSS Injection done by adding javascript with script
+    // This is all cases a browser consider text is javascript:
+    // When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
+    // All examples on page: http://ha.ckers.org/xss.html#XSScalc
+    // More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
+    $inj += preg_match('/<script/i', $val);
+    $inj += preg_match('/<iframe/i', $val);
+    $inj += preg_match('/<audio/i', $val);
+    $inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
+    if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+    $inj += preg_match('/base[\s]+href/si', $val);
+    $inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+    $inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+    $inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+    $inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+    $inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
+    $inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
+    $inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+    //$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
+    $inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+    //if ($type == 1)
+    //{
+        $inj += preg_match('/javascript:/i', $val);
+        $inj += preg_match('/vbscript:/i', $val);
+    //}
+    // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
+    if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
+    if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+    return $inj;
 }
 
 /**
@@ -156,58 +156,58 @@ 
  */
 function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 {
-	if (is_array($var))
-	{
-		foreach ($var as $key => $value)	// Warning, $key may also be used for attacks
-		{
-			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
-			{
-				//$var[$key] = $value;	// This is useless
-			}
-			else
-			{
-				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
-				exit;
-			}
-		}
-		return true;
-	}
-	else
-	{
-		return (testSqlAndScriptInject($var, $type) <= 0);
-	}
+    if (is_array($var))
+    {
+        foreach ($var as $key => $value)	// Warning, $key may also be used for attacks
+        {
+            if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
+            {
+                //$var[$key] = $value;	// This is useless
+            }
+            else
+            {
+                print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
+                exit;
+            }
+        }
+        return true;
+    }
+    else
+    {
+        return (testSqlAndScriptInject($var, $type) <= 0);
+    }
 }
 
 
 // Check consistency of NOREQUIREXXX DEFINES
 if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU'))
 {
-	print 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not set them';
-	exit;
+    print 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not set them';
+    exit;
 }
 
 // Sanity check on URL
 if (! empty($_SERVER["PHP_SELF"]))
 {
-	$morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
+    $morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
 }
 // Sanity check on GET parameters
 if (! defined('NOSCANGETFORINJECTION') && ! empty($_SERVER["QUERY_STRING"]))
 {
-	$morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
+    $morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
+    analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
 }
 // Sanity check on POST
 if (! defined('NOSCANPOSTFORINJECTION'))
 {
-	analyseVarsForSqlAndScriptsInjection($_POST,0);
+    analyseVarsForSqlAndScriptsInjection($_POST,0);
 }
 
 // This is to make Dolibarr working with Plesk
 if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
 {
-	set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+    set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
 }
 
 // Include the conf.php and functions.lib.php
@@ -218,20 +218,20 @@ 
 // DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
 if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
-	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
-	$tmplist=explode(',',$tmpautoset[1]);
-	$cookiearrayvalue=array();
-	foreach ($tmplist as $tmpkey)
-	{
-		$postkey=$tmpautoset[0].'_'.$tmpkey;
-		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
-	}
-	$cookiename=$tmpautoset[0];
-	$cookievalue=json_encode($cookiearrayvalue);
-	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
-	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
+    $tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
+    $tmplist=explode(',',$tmpautoset[1]);
+    $cookiearrayvalue=array();
+    foreach ($tmplist as $tmpkey)
+    {
+        $postkey=$tmpautoset[0].'_'.$tmpkey;
+        //var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
+        if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+    }
+    $cookiename=$tmpautoset[0];
+    $cookievalue=json_encode($cookiearrayvalue);
+    //var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
+    setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
+    if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
 }
 
 
@@ -248,8 +248,8 @@ 
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (! defined('NOSESSION'))
 {
-	session_start();
-	/*if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
+    session_start();
+    /*if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
 	{
 		foreach ($_SESSION as $key=>$value)
 		{
@@ -267,72 +267,72 @@ 
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-	$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-	$conf->browser->name=$tmp['browsername'];
-	$conf->browser->os=$tmp['browseros'];
-	$conf->browser->version=$tmp['browserversion'];
-	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
-	//var_dump($conf->browser);
-
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+    $tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+    $conf->browser->name=$tmp['browsername'];
+    $conf->browser->os=$tmp['browseros'];
+    $conf->browser->version=$tmp['browserversion'];
+    $conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
+    //var_dump($conf->browser);
+
+    if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
+    if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
 if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-	$newurl='';
-	if (is_numeric($conf->file->main_force_https))
-	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
-		{
-			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
-			{
-				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
-			}
-		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
-		{
-			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
-		}
-	}
-	else
-	{
-		// Check HTTPS environment variable (Apache/mod_ssl only)
-		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
-	}
-	// Start redirect
-	if ($newurl)
-	{
-		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
-		header("Location: ".$newurl);
-		exit;
-	}
-	else
-	{
-		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
-	}
+    $newurl='';
+    if (is_numeric($conf->file->main_force_https))
+    {
+        if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+        {
+            if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
+            {
+                $newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
+            }
+        }
+        else	// Check HTTPS environment variable (Apache/mod_ssl only)
+        {
+            $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+        }
+    }
+    else
+    {
+        // Check HTTPS environment variable (Apache/mod_ssl only)
+        $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+    }
+    // Start redirect
+    if ($newurl)
+    {
+        dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
+        header("Location: ".$newurl);
+        exit;
+    }
+    else
+    {
+        dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
+    }
 }
 
 if (! defined('NOLOGIN') && ! defined('NOIPCHECK') && ! empty($dolibarr_main_restrict_ip))
 {
-	$listofip=explode(',', $dolibarr_main_restrict_ip);
-	$found = false;
-	foreach($listofip as $ip)
-	{
-		$ip=trim($ip);
-		if ($ip == $_SERVER['REMOTE_ADDR'])
-		{
-			$found = true;
-			break;
-		}
-	}
-	if (! $found)
-	{
-		print 'Access refused by IP protection';
-		exit;
-	}
+    $listofip=explode(',', $dolibarr_main_restrict_ip);
+    $found = false;
+    foreach($listofip as $ip)
+    {
+        $ip=trim($ip);
+        if ($ip == $_SERVER['REMOTE_ADDR'])
+        {
+            $found = true;
+            break;
+        }
+    }
+    if (! $found)
+    {
+        print 'Access refused by IP protection';
+        exit;
+    }
 }
 
 // Loading of additional presentation includes
@@ -342,75 +342,75 @@ 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
 {
-	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
-	header("Location: ".DOL_URL_ROOT."/install/index.php");
-	exit;
+    dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
+    header("Location: ".DOL_URL_ROOT."/install/index.php");
+    exit;
 }
 // If an upgrade process is required, we call the install page.
 if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
 || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
 {
-	$versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
-	require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
-	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
-	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
-	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
-	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-	{
-		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
-		header("Location: ".DOL_URL_ROOT."/install/index.php");
-		exit;
-	}
+    $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
+    require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
+    $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
+    $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
+    $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
+    if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
+    {
+        dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+        header("Location: ".DOL_URL_ROOT."/install/index.php");
+        exit;
+    }
 }
 
 // Creation of a token against CSRF vulnerabilities
 if (! defined('NOTOKENRENEWAL'))
 {
-	// roulement des jetons car cree a chaque appel
-	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+    // roulement des jetons car cree a chaque appel
+    if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
-	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-	$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
-	$_SESSION['newtoken'] = $token;
+    // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
+    $token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
+    $_SESSION['newtoken'] = $token;
 }
 if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
-	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
+    || defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
 {
-	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
-	{
-		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
-		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
-		die;
-	}
-	if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
-	{
-		if (GETPOST('token', 'alpha') != $_SESSION['token'])
-		{
-			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
-			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
-			unset($_POST);
-		}
-	}
+    if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
+    {
+        print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+        print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
+        die;
+    }
+    if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+    {
+        if (GETPOST('token', 'alpha') != $_SESSION['token'])
+        {
+            dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+            //print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
+            unset($_POST);
+        }
+    }
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
 if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
 if (! empty($_SESSION["disablemodules"]))
 {
-	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
-	foreach($disabled_modules as $module)
-	{
-		if ($module)
-		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();
-			$conf->$module->enabled=false;
-			if ($module == 'fournisseur')		// Special case
-			{
-				$conf->supplier_order->enabled=0;
-				$conf->supplier_invoice->enabled=0;
-			}
-		}
-	}
+    $disabled_modules=explode(',',$_SESSION["disablemodules"]);
+    foreach($disabled_modules as $module)
+    {
+        if ($module)
+        {
+            if (empty($conf->$module)) $conf->$module=new stdClass();
+            $conf->$module->enabled=false;
+            if ($module == 'fournisseur')		// Special case
+            {
+                $conf->supplier_order->enabled=0;
+                $conf->supplier_invoice->enabled=0;
+            }
+        }
+    }
 }
 
 /*
@@ -419,481 +419,481 @@ 
 $login='';
 if (! defined('NOLOGIN'))
 {
-	// $authmode lists the different means of identification to be tested in order of preference.
-	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
+    // $authmode lists the different means of identification to be tested in order of preference.
+    // Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
 
-	if (defined('MAIN_AUTHENTICATION_MODE'))
-	{
-		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
-	}
-	else
-	{
-		// Authentication mode
-		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
-		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-	}
-	// Set authmode
-	$authmode=explode(',',$dolibarr_main_authentication);
-
-	// No authentication mode
-	if (! count($authmode))
-	{
-		$langs->load('main');
-		dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
-		exit;
-	}
-
-	// If login request was already post, we retrieve login from the session
-	// Call module if not realized that his request.
-	// At the end of this phase, the variable $login is defined.
-	$resultFetchUser='';
-	$test=true;
-	if (! isset($_SESSION["dol_login"]))
-	{
-		// It is not already authenticated and it requests the login / password
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-
-		$dol_dst_observed=GETPOST("dst_observed",'int',3);
-		$dol_dst_first=GETPOST("dst_first",'int',3);
-		$dol_dst_second=GETPOST("dst_second",'int',3);
-		$dol_screenwidth=GETPOST("screenwidth",'int',3);
-		$dol_screenheight=GETPOST("screenheight",'int',3);
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
-		$dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
-		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
-
-		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
-		{
-			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
-			{
-				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-				$url='';
-				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-				$url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-				$url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-				$url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-				$url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
-				header("Location: ".$url);
-				exit;
-			}
-		}
+    if (defined('MAIN_AUTHENTICATION_MODE'))
+    {
+        $dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
+    }
+    else
+    {
+        // Authentication mode
+        if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+        // Authentication mode: forceuser
+        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+    }
+    // Set authmode
+    $authmode=explode(',',$dolibarr_main_authentication);
+
+    // No authentication mode
+    if (! count($authmode))
+    {
+        $langs->load('main');
+        dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
+        exit;
+    }
 
-		// Verification security graphic code
-		if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-		{
-			$sessionkey = 'dol_antispam_value';
-			$ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
-
-			// Check code
-			if (! $ok)
-			{
-				dol_syslog('Bad value for code, connexion refused');
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-				$test=false;
-
-				// Call trigger for the "security events" log
-				$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
-				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++;
-				}
-				// End Call of triggers
-
-				// Hooks on failed login
-				$action='';
-				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
-
-				// Note: exit is done later
-			}
-		}
+    // If login request was already post, we retrieve login from the session
+    // Call module if not realized that his request.
+    // At the end of this phase, the variable $login is defined.
+    $resultFetchUser='';
+    $test=true;
+    if (! isset($_SESSION["dol_login"]))
+    {
+        // It is not already authenticated and it requests the login / password
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+
+        $dol_dst_observed=GETPOST("dst_observed",'int',3);
+        $dol_dst_first=GETPOST("dst_first",'int',3);
+        $dol_dst_second=GETPOST("dst_second",'int',3);
+        $dol_screenwidth=GETPOST("screenwidth",'int',3);
+        $dol_screenheight=GETPOST("screenheight",'int',3);
+        $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
+        $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
+        $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
+        $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
+        $dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
+        //dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
+
+        // If in demo mode, we check we go to home page through the public/demo/index.php page
+        if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+        {
+            if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
+            {
+                dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+                $url='';
+                $url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
+                $url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
+                $url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
+                $url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
+                $url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
+                $url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+                header("Location: ".$url);
+                exit;
+            }
+        }
 
-		$allowedmethodtopostusername = 2;
-		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
-		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",$allowedmethodtopostusername));
-		$passwordtotest	= GETPOST('password','none',$allowedmethodtopostusername);
-		$entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+        // Verification security graphic code
+        if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+        {
+            $sessionkey = 'dol_antispam_value';
+            $ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
-		// Define if we received data to test the login.
-		$goontestloop=false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-		if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+            // Check code
+            if (! $ok)
+            {
+                dol_syslog('Bad value for code, connexion refused');
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
+                $test=false;
+
+                // Call trigger for the "security events" log
+                $user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+                // Call of triggers
+                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                $interface=new Interfaces($db);
+                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+                if ($result < 0) {
+                    $error++;
+                }
+                // End Call of triggers
 
-		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-			$langs=new Translate("",$conf);
-			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-			if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
-			$langs->setDefaultLang($langcode);
-		}
+                // Hooks on failed login
+                $action='';
+                $hookmanager->initHooks(array('login'));
+                $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+                $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
 
-		// Validation of login/pass/entity
-		// If ok, the variable login will be returned
-		// If error, we will put error message in session under the name dol_loginmesg
-		if ($test && $goontestloop)
-		{
-			$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
-			if ($login)
-			{
-				$dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
-				$dol_tz=$_POST["tz"];
-				$dol_tz_string=$_POST["tz_string"];
-				$dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
-				$dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
-				$dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
-				$dol_dst=0;
-				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-					$datenow=dol_now();
-					$datefirst=dol_stringtotime($_POST["dst_first"]);
-					$datesecond=dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
-				}
-				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
-			}
-
-			if (! $login)
-			{
-				dol_syslog('Bad password, connexion refused',LOG_DEBUG);
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				// Bad password. No authmode has found a good password.
-				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
-
-				// Call trigger for the "security events" log
-				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
-				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
-				if ($result < 0) {
-					$error++;
-				}
-				// End Call of triggers
-
-				// Hooks on failed login
-				$action='';
-				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
-
-				// Note: exit is done in next chapter
-			}
-		}
+                // Note: exit is done later
+            }
+        }
 
-		// End test login / passwords
-		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
-		{
-			// No data to test login, so we show the login page
-			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
-			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
-			exit;
-		}
+        $allowedmethodtopostusername = 2;
+        if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+        $usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",$allowedmethodtopostusername));
+        $passwordtotest	= GETPOST('password','none',$allowedmethodtopostusername);
+        $entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
-		if ($resultFetchUser <= 0)
-		{
-			dol_syslog('User not found, connexion refused');
-			session_destroy();
-			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
-
-			if ($resultFetchUser == 0)
-			{
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
-
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0)
-			{
-				$_SESSION["dol_loginmesg"]=$user->error;
-
-				$user->trigger_mesg=$user->error;
-			}
-
-			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++;
-			}
-			// End call triggers
-
-			// Hooks on failed login
-			$action='';
-			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
-
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
-			exit;
-		}
-	}
-	else
-	{
-		// We are already into an authenticated session
-		$login=$_SESSION["dol_login"];
-		$entity=$_SESSION["dol_entity"];
-		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
+        // Define if we received data to test the login.
+        $goontestloop=false;
+        if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
+        if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
+        if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-		if ($resultFetchUser <= 0)
-		{
-			// Account has been removed after login
-			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
-			session_destroy();
-			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
-
-			if ($resultFetchUser == 0)
-			{
-				// Load translation files required by page
-				$langs->loadLangs(array('main', 'errors'));
-
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
-
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0)
-			{
-				$_SESSION["dol_loginmesg"]=$user->error;
-
-				$user->trigger_mesg=$user->error;
-			}
-
-			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++;
-			}
-			// End call triggers
-
-			// Hooks on failed login
-			$action='';
-			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
-
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
-			exit;
-		}
-		else
-		{
-		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-		    $hookmanager->initHooks(array('main'));
-
-		    // Code for search criteria persistence.
-		    if (! empty($_GET['save_lastsearch_values']))    // We must use $_GET here
-		    {
-			    $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
-			    // Clean $relativepathstring
-   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-			    //var_dump($relativepathstring);
-
-			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-			    if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
-				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
-			    }
-			    if (! empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
-			    }
-			    if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
-			    {
-			    	$_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
-			    }
-			    if (! empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
-			    {
-			    	$_SESSION['lastsearch_limit_'.$relativepathstring]=$_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
-			    }
-		    }
-
-		    $action = '';
-		    $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
-		    if ($reshook < 0) {
-			    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		    }
-		}
-	}
+        if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+            $langs=new Translate("",$conf);
+            $langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+            if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+            $langs->setDefaultLang($langcode);
+        }
 
-	// Is it a new session that has started ?
-	// If we are here, this means authentication was successfull.
-	if (! isset($_SESSION["dol_login"]))
-	{
-		// New session for this login has started.
-		$error=0;
-
-		// Store value into session (values always stored)
-		$_SESSION["dol_login"]=$user->login;
-		$_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
-		$_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
-		$_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
-		$_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
-		$_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
-		$_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
-		$_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
-		$_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
-		$_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
-		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$_SESSION["dol_entity"]=$conf->entity;
-		// Store value into session (values stored only if defined)
-		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
-
-		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
-
-		$db->begin();
-
-		$user->update_last_login_date();
-
-		$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
-
-		// Call triggers for the "security events" log
-		$user->trigger_mesg = $loginfo;
-		// Call triggers
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($db);
-		$result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
-		if ($result < 0) {
-			$error++;
-		}
-		// End call triggers
+        // Validation of login/pass/entity
+        // If ok, the variable login will be returned
+        // If error, we will put error message in session under the name dol_loginmesg
+        if ($test && $goontestloop)
+        {
+            $login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
+            if ($login)
+            {
+                $dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
+                $dol_tz=$_POST["tz"];
+                $dol_tz_string=$_POST["tz_string"];
+                $dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
+                $dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
+                $dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
+                $dol_dst=0;
+                if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+                    $datenow=dol_now();
+                    $datefirst=dol_stringtotime($_POST["dst_first"]);
+                    $datesecond=dol_stringtotime($_POST["dst_second"]);
+                    if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+                }
+                //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
+            }
 
-		// Hooks on successfull login
-		$action='';
-		$hookmanager->initHooks(array('login'));
-		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
-		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0) $error++;
+            if (! $login)
+            {
+                dol_syslog('Bad password, connexion refused',LOG_DEBUG);
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                // Bad password. No authmode has found a good password.
+                // We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
+                if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+
+                // Call trigger for the "security events" log
+                $user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+                // Call of triggers
+                include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+                $interface=new Interfaces($db);
+                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+                if ($result < 0) {
+                    $error++;
+                }
+                // End Call of triggers
 
-		if ($error)
-		{
-			$db->rollback();
-			session_destroy();
-			dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
-			exit;
-		}
-		else
-		{
-			$db->commit();
-		}
+                // Hooks on failed login
+                $action='';
+                $hookmanager->initHooks(array('login'));
+                $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+                $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
 
-		// Change landing page if defined.
-		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-		if (! empty($landingpage))    // Example: /index.php
-		{
-			$newpath=dol_buildpath($landingpage, 1);
-			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
-			{
-				header('Location: '.$newpath);
-				exit;
-			}
-		}
-	}
+                // Note: exit is done in next chapter
+            }
+        }
+
+        // End test login / passwords
+        if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+        {
+            // No data to test login, so we show the login page
+            dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
+            if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
+            else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+            exit;
+        }
 
+        $resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+        if ($resultFetchUser <= 0)
+        {
+            dol_syslog('User not found, connexion refused');
+            session_destroy();
+            session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+            session_start();    // Fixing the bug of register_globals here is useless since session is empty
 
-	// If user admin, we force the rights-based modules
-	if ($user->admin)
-	{
-		$user->rights->user->user->lire=1;
-		$user->rights->user->user->creer=1;
-		$user->rights->user->user->password=1;
-		$user->rights->user->user->supprimer=1;
-		$user->rights->user->self->creer=1;
-		$user->rights->user->self->password=1;
-	}
-
-	/*
+            if ($resultFetchUser == 0)
+            {
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+            }
+            if ($resultFetchUser < 0)
+            {
+                $_SESSION["dol_loginmesg"]=$user->error;
+
+                $user->trigger_mesg=$user->error;
+            }
+
+            // Call triggers for the "security events" log
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($db);
+            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+            if ($result < 0) {
+                $error++;
+            }
+            // End call triggers
+
+            // Hooks on failed login
+            $action='';
+            $hookmanager->initHooks(array('login'));
+            $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+            $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0) $error++;
+
+            $paramsurl=array();
+            if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+            if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+            if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+            exit;
+        }
+    }
+    else
+    {
+        // We are already into an authenticated session
+        $login=$_SESSION["dol_login"];
+        $entity=$_SESSION["dol_entity"];
+        dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
+
+        $resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+        if ($resultFetchUser <= 0)
+        {
+            // Account has been removed after login
+            dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
+            session_destroy();
+            session_name($sessionname);
+            session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+            session_start();    // Fixing the bug of register_globals here is useless since session is empty
+
+            if ($resultFetchUser == 0)
+            {
+                // Load translation files required by page
+                $langs->loadLangs(array('main', 'errors'));
+
+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+                $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+            }
+            if ($resultFetchUser < 0)
+            {
+                $_SESSION["dol_loginmesg"]=$user->error;
+
+                $user->trigger_mesg=$user->error;
+            }
+
+            // Call triggers for the "security events" log
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($db);
+            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+            if ($result < 0) {
+                $error++;
+            }
+            // End call triggers
+
+            // Hooks on failed login
+            $action='';
+            $hookmanager->initHooks(array('login'));
+            $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+            $reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0) $error++;
+
+            $paramsurl=array();
+            if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+            if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
+            if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+            header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+            exit;
+        }
+        else
+        {
+            // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+            $hookmanager->initHooks(array('main'));
+
+            // Code for search criteria persistence.
+            if (! empty($_GET['save_lastsearch_values']))    // We must use $_GET here
+            {
+                $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+                $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+                // Clean $relativepathstring
+                    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+                $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+                $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+                //var_dump($relativepathstring);
+
+                // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
+                if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+                {
+                    $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+                }
+                if (! empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
+                {
+                    $_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+                }
+                if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
+                {
+                    $_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+                }
+                if (! empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
+                {
+                    $_SESSION['lastsearch_limit_'.$relativepathstring]=$_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+                    unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+                }
+            }
+
+            $action = '';
+            $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
+            if ($reshook < 0) {
+                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+            }
+        }
+    }
+
+    // Is it a new session that has started ?
+    // If we are here, this means authentication was successfull.
+    if (! isset($_SESSION["dol_login"]))
+    {
+        // New session for this login has started.
+        $error=0;
+
+        // Store value into session (values always stored)
+        $_SESSION["dol_login"]=$user->login;
+        $_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
+        $_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
+        $_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
+        $_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
+        $_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
+        $_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
+        $_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
+        $_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
+        $_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
+        $_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
+        $_SESSION["dol_entity"]=$conf->entity;
+        // Store value into session (values stored only if defined)
+        if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
+        if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
+        if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
+        if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
+        if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+
+        dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
+
+        $db->begin();
+
+        $user->update_last_login_date();
+
+        $loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+
+        // Call triggers for the "security events" log
+        $user->trigger_mesg = $loginfo;
+        // Call triggers
+        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+        $interface=new Interfaces($db);
+        $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+        if ($result < 0) {
+            $error++;
+        }
+        // End call triggers
+
+        // Hooks on successfull login
+        $action='';
+        $hookmanager->initHooks(array('login'));
+        $parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+        $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+        if ($reshook < 0) $error++;
+
+        if ($error)
+        {
+            $db->rollback();
+            session_destroy();
+            dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
+            exit;
+        }
+        else
+        {
+            $db->commit();
+        }
+
+        // Change landing page if defined.
+        $landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
+        if (! empty($landingpage))    // Example: /index.php
+        {
+            $newpath=dol_buildpath($landingpage, 1);
+            if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
+            {
+                header('Location: '.$newpath);
+                exit;
+            }
+        }
+    }
+
+
+    // If user admin, we force the rights-based modules
+    if ($user->admin)
+    {
+        $user->rights->user->user->lire=1;
+        $user->rights->user->user->creer=1;
+        $user->rights->user->user->password=1;
+        $user->rights->user->user->supprimer=1;
+        $user->rights->user->self->creer=1;
+        $user->rights->user->self->password=1;
+    }
+
+    /*
      * Overwrite some configs globals (try to avoid this and have code to use instead $user->conf->xxx)
      */
 
-	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+    // Set liste_limit
+    if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
+    if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
 
-	// Replace conf->css by personalized value if theme not forced
-	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
-	{
-		$conf->theme=$user->conf->MAIN_THEME;
-		$conf->css  = "/theme/".$conf->theme."/style.css.php";
-	}
+    // Replace conf->css by personalized value if theme not forced
+    if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
+    {
+        $conf->theme=$user->conf->MAIN_THEME;
+        $conf->css  = "/theme/".$conf->theme."/style.css.php";
+    }
 }
 
 // Case forcing style from url
 if (GETPOST('theme','alpha'))
 {
-	$conf->theme=GETPOST('theme','alpha',1);
-	$conf->css  = "/theme/".$conf->theme."/style.css.php";
+    $conf->theme=GETPOST('theme','alpha',1);
+    $conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
 
 // Set javascript option
 if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
 {
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
-	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
-	}
+    if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+    {
+        $conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+    }
 }
 else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
 elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
+    $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // Set terminal output option according to conf->browser.
@@ -904,56 +904,56 @@ 
 if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
 if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
-	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
-	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+    || (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+    || (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 )
 {
-	$conf->dol_optimize_smallscreen=1;
+    $conf->dol_optimize_smallscreen=1;
 }
 // If we force to use jmobile, then we reenable javascript
 if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
 // Replace themes bugged with jmobile with eldy
 if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
 {
-	$conf->theme='eldy';
-	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
+    $conf->theme='eldy';
+    $conf->css  =  "/theme/".$conf->theme."/style.css.php";
 }
 
 if (! defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
-	{
-		// If user has chosen its own language
-		if (! empty($user->conf->MAIN_LANG_DEFAULT))
-		{
-			// If different than current language
-			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
-			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
-			{
-				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
-			}
-		}
-	}
+    if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+    {
+        // If user has chosen its own language
+        if (! empty($user->conf->MAIN_LANG_DEFAULT))
+        {
+            // If different than current language
+            //print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
+            if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
+            {
+                $langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+            }
+        }
+    }
 }
 
 if (! defined('NOLOGIN'))
 {
-	// If the login is not recovered, it is identified with an account that does not exist.
-	// Hacking attempt?
-	if (! $user->login) accessforbidden();
+    // If the login is not recovered, it is identified with an account that does not exist.
+    // Hacking attempt?
+    if (! $user->login) accessforbidden();
+
+    // Check if user is active
+    if ($user->statut < 1)
+    {
+        // If not active, we refuse the user
+        $langs->load("other");
+        dol_syslog("Authentification ko as login is disabled");
+        accessforbidden($langs->trans("ErrorLoginDisabled"));
+        exit;
+    }
 
-	// Check if user is active
-	if ($user->statut < 1)
-	{
-		// If not active, we refuse the user
-		$langs->load("other");
-		dol_syslog("Authentification ko as login is disabled");
-		accessforbidden($langs->trans("ErrorLoginDisabled"));
-		exit;
-	}
-
-	// Load permissions
-	$user->getrights();
+    // Load permissions
+    $user->getrights();
 }
 
 
@@ -964,8 +964,8 @@ 
 // Load main languages files
 if (! defined('NOREQUIRETRAN'))
 {
-	// Load translation files required by page
-	$langs->loadLangs(array('main', 'dict'));
+    // Load translation files required by page
+    $langs->loadLangs(array('main', 'dict'));
 }
 
 // Define some constants used for style of arrays
@@ -982,27 +982,27 @@ 
 // Constants used to defined number of lines in textarea
 if (empty($conf->browser->firefox))
 {
-	define('ROWS_1',1);
-	define('ROWS_2',2);
-	define('ROWS_3',3);
-	define('ROWS_4',4);
-	define('ROWS_5',5);
-	define('ROWS_6',6);
-	define('ROWS_7',7);
-	define('ROWS_8',8);
-	define('ROWS_9',9);
+    define('ROWS_1',1);
+    define('ROWS_2',2);
+    define('ROWS_3',3);
+    define('ROWS_4',4);
+    define('ROWS_5',5);
+    define('ROWS_6',6);
+    define('ROWS_7',7);
+    define('ROWS_8',8);
+    define('ROWS_9',9);
 }
 else
 {
-	define('ROWS_1',0);
-	define('ROWS_2',1);
-	define('ROWS_3',2);
-	define('ROWS_4',3);
-	define('ROWS_5',4);
-	define('ROWS_6',5);
-	define('ROWS_7',6);
-	define('ROWS_8',7);
-	define('ROWS_9',8);
+    define('ROWS_1',0);
+    define('ROWS_2',1);
+    define('ROWS_3',2);
+    define('ROWS_4',3);
+    define('ROWS_5',4);
+    define('ROWS_6',5);
+    define('ROWS_7',6);
+    define('ROWS_8',7);
+    define('ROWS_9',8);
 }
 
 $heightforframes=50;
@@ -1010,36 +1010,36 @@ 
 // Init menu manager
 if (! defined('NOREQUIREMENU'))
 {
-	if (empty($user->societe_id))    // If internal user or not defined
-	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
-	}
-	else                        // If external user
-	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
-	}
+    if (empty($user->societe_id))    // If internal user or not defined
+    {
+        $conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+    }
+    else                        // If external user
+    {
+        $conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+    }
 
-	// Load the menu manager (only if not already done)
-	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
-	if (! class_exists('MenuManager'))
-	{
-		$menufound=0;
-		$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-		foreach($dirmenus as $dirmenu)
-		{
-			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-			if (class_exists('MenuManager')) break;
-		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
-		{
-			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-			$file_menu='eldy_menu.php';
-			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
-		}
-	}
-	$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
-	$menumanager->loadMenu();
+    // Load the menu manager (only if not already done)
+    $file_menu=$conf->standard_menu;
+    if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
+    if (! class_exists('MenuManager'))
+    {
+        $menufound=0;
+        $dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
+        foreach($dirmenus as $dirmenu)
+        {
+            $menufound=dol_include_once($dirmenu."standard/".$file_menu);
+            if (class_exists('MenuManager')) break;
+        }
+        if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+        {
+            dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+            $file_menu='eldy_menu.php';
+            include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
+        }
+    }
+    $menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+    $menumanager->loadMenu();
 }
 
 
@@ -1048,52 +1048,52 @@ 
 
 if (! function_exists("llxHeader"))
 {
-	/**
-	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
-	 *
-	 * @param 	string 	$head				Optionnal head lines
-	 * @param 	string 	$title				HTML title
-	 * @param	string	$help_url			Url links to help page
-	 * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
-	 *                                  	For other external page: http://server/url
-	 * @param	string	$target				Target to use on links
-	 * @param 	int    	$disablejs			More content into html header
-	 * @param 	int    	$disablehead		More content into html header
-	 * @param 	array  	$arrayofjs			Array of complementary js files
-	 * @param 	array  	$arrayofcss			Array of complementary css files
-	 * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
-	 * @param   string  $morecssonbody      More CSS on body tag.
-	 * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
-	 * @return	void
-	 */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='', $replacemainareaby='')
-	{
-		global $conf;
+    /**
+     *	Show HTML header HTML + BODY + Top menu + left menu + DIV
+     *
+     * @param 	string 	$head				Optionnal head lines
+     * @param 	string 	$title				HTML title
+     * @param	string	$help_url			Url links to help page
+     * 		                            	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
+     *                                  	For other external page: http://server/url
+     * @param	string	$target				Target to use on links
+     * @param 	int    	$disablejs			More content into html header
+     * @param 	int    	$disablehead		More content into html header
+     * @param 	array  	$arrayofjs			Array of complementary js files
+     * @param 	array  	$arrayofcss			Array of complementary css files
+     * @param	string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+     * @param   string  $morecssonbody      More CSS on body tag.
+     * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
+     * @return	void
+     */
+    function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='', $replacemainareaby='')
+    {
+        global $conf;
 
-		// html header
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+        // html header
+        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-		print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
 
-		// top menu and left menu area
-		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int'))
-		{
-			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
-		}
+        // top menu and left menu area
+        if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int'))
+        {
+            top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
+        }
 
-		if (empty($conf->dol_hide_leftmenu))
-		{
-			left_menu('', $help_url, '', '', 1, $title, 1);		// $menumanager is retreived with a global $menumanager inside this function
-		}
+        if (empty($conf->dol_hide_leftmenu))
+        {
+            left_menu('', $help_url, '', '', 1, $title, 1);		// $menumanager is retreived with a global $menumanager inside this function
+        }
 
-		// main area
-		if ($replacemainareaby)
-		{
-			print $replacemainareaby;
-			return;
-		}
-		main_area($title);
-	}
+        // main area
+        if ($replacemainareaby)
+        {
+            print $replacemainareaby;
+            return;
+        }
+        main_area($title);
+    }
 }
 
 
@@ -1106,53 +1106,53 @@ 
  */
 function top_httphead($contenttype='text/html', $forcenocache=0)
 {
-	global $db, $conf, $hookmanager;
-
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-	else header("Content-Type: ".$contenttype);
-	// Security options
-	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-	//header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
-	if (! defined('FORCECSP'))
-	{
-		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
-		//{
-		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
-		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
-		//}
-		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
-		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
-
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
-		$hookmanager->initHooks("main");
-
-		$parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
-		$result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
-		else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
-
-		if (! empty($contentsecuritypolicy))
-		{
-			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
-			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
-			// For example, to restrict everything to one domain, except 'object', ...:
-			// default-src https://cdn.example.net; object-src 'none'
-			// For example, to restrict everything to itself except img that can be on other servers:
-			// default-src 'self'; img-src *;
-			// Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
-			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
-			header("Content-Security-Policy: ".$contentsecuritypolicy);
-		}
-	}
-	elseif (constant('FORCECSP'))
-	{
-		header("Content-Security-Policy: ".constant('FORCECSP'));
-	}
-	if ($forcenocache)
-	{
-		header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
-	}
+    global $db, $conf, $hookmanager;
+
+    if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+    else header("Content-Type: ".$contenttype);
+    // Security options
+    header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+    header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+    //header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
+    if (! defined('FORCECSP'))
+    {
+        //if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+        //{
+        //	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+        //	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
+        //}
+        //else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+        $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+
+        if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+        $hookmanager->initHooks("main");
+
+        $parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
+        $result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
+        if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
+        else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
+
+        if (! empty($contentsecuritypolicy))
+        {
+            // For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
+            // script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
+            // For example, to restrict everything to one domain, except 'object', ...:
+            // default-src https://cdn.example.net; object-src 'none'
+            // For example, to restrict everything to itself except img that can be on other servers:
+            // default-src 'self'; img-src *;
+            // Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
+            // default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
+            header("Content-Security-Policy: ".$contentsecuritypolicy);
+        }
+    }
+    elseif (constant('FORCECSP'))
+    {
+        header("Content-Security-Policy: ".constant('FORCECSP'));
+    }
+    if ($forcenocache)
+    {
+        header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
+    }
 }
 
 /**
@@ -1171,220 +1171,220 @@ 
  */
 function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $disablejmobile=0, $disablenofollow=0)
 {
-	global $db, $conf, $langs, $user, $hookmanager;
+    global $db, $conf, $langs, $user, $hookmanager;
 
-	top_httphead();
+    top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+    if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
 
-	print '<!doctype html>'."\n";
+    print '<!doctype html>'."\n";
 
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
-	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
-	if (empty($disablehead))
-	{
-		$ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
-
-		print "<head>\n";
-
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
-
-		// Displays meta
-		print '<meta charset="UTF-8">'."\n";
-		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
-		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
-		print '<meta name="author" content="Dolibarr Development Team">'."\n";
-
-		// Favicon
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
-
-		// Auto refresh page
-		if (GETPOST('autorefresh','int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
-
-		// Displays title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
-
-		print '<title>';
-		$titletoshow='';
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
-		else if ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
-		else $titletoshow = dol_htmlentities($appli);
-
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
-		$hookmanager->initHooks("main");
-		$parameters=array('title'=>$titletoshow);
-		$result=$hookmanager->executeHooks('setHtmlTitle',$parameters);		// Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
-		else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
-
-		print $titletoshow;
-		print '</title>';
-
-		print "\n";
-
-		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
-
-		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-		$themeparam.=($ext?'&amp;'.$ext:'');
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-		if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-		if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
-
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
-		{
-			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
-			$jquerytheme = 'base';
-			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
-			{
-				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
-			}
-		}
+    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+    else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+    //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
+    if (empty($disablehead))
+    {
+        $ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
-		if (! defined('DISABLE_FONT_AWSOME'))
-		{
-			print '<!-- Includes CSS for font awesome -->'."\n";
-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
-		}
+        print "<head>\n";
 
-		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-		$themepath=dol_buildpath($conf->css,1);
-		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
-		{
-			foreach($conf->modules_parts['theme'] as $reldir)
-			{
-				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
-				{
-					$themepath=dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir=$reldir;
-					break;
-				}
-			}
-		}
+        if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
 
-		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+        // Displays meta
+        print '<meta charset="UTF-8">'."\n";
+        print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
+        print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
+        print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
-		// CSS forced by modules (relative url starting with /)
-		if (! empty($conf->modules_parts['css']))
-		{
-			$arraycss=(array) $conf->modules_parts['css'];
-			foreach($arraycss as $modcss => $filescss)
-			{
-				$filescss=(array) $filescss;	// To be sure filecss is an array
-				foreach($filescss as $cssfile)
-				{
-					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
-					// cssfile is a relative path
-					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
-					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
-					print '">'."\n";
-				}
-			}
-		}
-		// CSS forced by page in top_htmlhead call (relative url starting with /)
-		if (is_array($arrayofcss))
-		{
-			foreach($arrayofcss as $cssfile)
-			{
-				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
-				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
-				print '">'."\n";
-			}
-		}
+        // Favicon
+        $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
+        if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+        if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
+        //if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
-		// Output standard javascript links
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
-		{
-			// JQuery. Must be before other includes
-			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
-			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
-			{
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}
-			// Flot
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
-			{
-				if (constant('JS_JQUERY_FLOT'))
-				{
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				}
-				else
-				{
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				}
-			}
-			// jQuery jeditable
-			if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
-			{
-				print '<!-- JS to manage editInPlace feature -->'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript">'."\n";
-				print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
-				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
-				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
-				print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
-				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
-				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
-				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
-				print 'var withInPlace = 300;';		// width in pixel for default string edit
-				print '</script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}
+        // Auto refresh page
+        if (GETPOST('autorefresh','int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
+
+        // Displays title
+        $appli=constant('DOL_APPLICATION_TITLE');
+        if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+
+        print '<title>';
+        $titletoshow='';
+        if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
+        else if ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
+        else $titletoshow = dol_htmlentities($appli);
+
+        if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+        $hookmanager->initHooks("main");
+        $parameters=array('title'=>$titletoshow);
+        $result=$hookmanager->executeHooks('setHtmlTitle',$parameters);		// Note that $action and $object may have been modified by some hooks
+        if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
+        else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
+
+        print $titletoshow;
+        print '</title>';
+
+        print "\n";
+
+        if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
+        if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+
+        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+        $themeparam.=($ext?'&amp;'.$ext:'');
+        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+        if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+        if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+        if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+        if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+        if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+
+        if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+        {
+            print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
+            $jquerytheme = 'base';
+            if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+            if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
+            else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
+            if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+            {
+                $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+                print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+            }
+        }
+
+        if (! defined('DISABLE_FONT_AWSOME'))
+        {
+            print '<!-- Includes CSS for font awesome -->'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+        }
+
+        print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+        // Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+        $themepath=dol_buildpath($conf->css,1);
+        $themesubdir='';
+        if (! empty($conf->modules_parts['theme']))	// This slow down
+        {
+            foreach($conf->modules_parts['theme'] as $reldir)
+            {
+                if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+                {
+                    $themepath=dol_buildpath($reldir.$conf->css, 1);
+                    $themesubdir=$reldir;
+                    break;
+                }
+            }
+        }
+
+        //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+        print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
+        if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+
+        // CSS forced by modules (relative url starting with /)
+        if (! empty($conf->modules_parts['css']))
+        {
+            $arraycss=(array) $conf->modules_parts['css'];
+            foreach($arraycss as $modcss => $filescss)
+            {
+                $filescss=(array) $filescss;	// To be sure filecss is an array
+                foreach($filescss as $cssfile)
+                {
+                    if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+                    // cssfile is a relative path
+                    print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
+                    // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+                    if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+                    print '">'."\n";
+                }
+            }
+        }
+        // CSS forced by page in top_htmlhead call (relative url starting with /)
+        if (is_array($arrayofcss))
+        {
+            foreach($arrayofcss as $cssfile)
+            {
+                print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+                // We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
+                if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+                print '">'."\n";
+            }
+        }
+
+        // Output standard javascript links
+        if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+        {
+            // JQuery. Must be before other includes
+            print '<!-- Includes JS for JQuery -->'."\n";
+            if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+            {
+                if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            // jQuery jnotify
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+            {
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
+            // Flot
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+            {
+                if (constant('JS_JQUERY_FLOT'))
+                {
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                }
+                else
+                {
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                }
+            }
+            // jQuery jeditable
+            if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+            {
+                print '<!-- JS to manage editInPlace feature -->'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript">'."\n";
+                print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
+                print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
+                print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
+                print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+                print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
+                print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
+                print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
+                print 'var withInPlace = 300;';		// width in pixel for default string edit
+                print '</script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            }
             // jQuery Timepicker
             if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
             if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
+                $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
             }
             if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-		}
+        }
 
         if (! $disablejs && ! empty($conf->use_javascript_ajax))
         {
@@ -1396,7 +1396,7 @@ 
                 $jsckeditor='ckeditor.js';
                 if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
                 {
-                	$pathckeditor=constant('JS_CKEDITOR');
+                    $pathckeditor=constant('JS_CKEDITOR');
                 }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
@@ -1426,18 +1426,18 @@ 
 
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-        	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
-	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
-		            {
-	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
-		            }
-	            }
-        	}
+            {
+                $arrayjs=(array) $conf->modules_parts['js'];
+                foreach($arrayjs as $modjs => $filesjs)
+                {
+                    $filesjs=(array) $filesjs;	// To be sure filejs is an array
+                    foreach($filesjs as $jsfile)
+                    {
+                        // jsfile is a relative path
+                        print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+                    }
+                }
+            }
             // JS forced by page in top_htmlhead (relative url starting with /)
             if (is_array($arrayofjs))
             {
@@ -1484,192 +1484,192 @@ 
  */
 function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='')
 {
-	global $user, $conf, $langs, $db;
-	global $dolibarr_main_authentication, $dolibarr_main_demo;
-	global $hookmanager,$menumanager;
+    global $user, $conf, $langs, $db;
+    global $dolibarr_main_authentication, $dolibarr_main_demo;
+    global $hookmanager,$menumanager;
 
-	$searchform='';
-	$bookmarks='';
+    $searchform='';
+    $bookmarks='';
 
-	// Instantiate hooks of thirdparty module
-	$hookmanager->initHooks(array('toprightmenu'));
+    // Instantiate hooks of thirdparty module
+    $hookmanager->initHooks(array('toprightmenu'));
 
-	$toprightmenu='';
+    $toprightmenu='';
 
-	// For backward compatibility with old modules
-	if (empty($conf->headerdone))
-	{
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
-		print '<body id="mainbody">';
-	}
+    // For backward compatibility with old modules
+    if (empty($conf->headerdone))
+    {
+        top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+        print '<body id="mainbody">';
+    }
 
-	/*
+    /*
      * Top menu
      */
-	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int')) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
-	{
-		print "\n".'<!-- Start top horizontal -->'."\n";
+    if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int')) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+    {
+        print "\n".'<!-- Start top horizontal -->'."\n";
 
-		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">';		// dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+        print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">';		// dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 
-		// Show menu entries
-		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-		$menumanager->atarget=$target;
-		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
-		print "</div>\n";
+        // Show menu entries
+        print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
+        $menumanager->atarget=$target;
+        $menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
+        print "</div>\n";
 
-		// Define link to login card
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-		{
-			$appli=$conf->global->MAIN_APPLICATION_TITLE;
-			if (preg_match('/\d\.\d/', $appli))
-			{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-			}
-			else $appli.=" ".DOL_VERSION;
-		}
-		else $appli.=" ".DOL_VERSION;
+        // Define link to login card
+        $appli=constant('DOL_APPLICATION_TITLE');
+        if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+        {
+            $appli=$conf->global->MAIN_APPLICATION_TITLE;
+            if (preg_match('/\d\.\d/', $appli))
+            {
+                if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+            }
+            else $appli.=" ".DOL_VERSION;
+        }
+        else $appli.=" ".DOL_VERSION;
 
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+        if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
-		$logouttext='';
-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
-			//$logouthtmltext=$appli.'<br>';
-			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
-			{
-				$logouthtmltext.=$langs->trans("Logout").'<br>';
-
-				$logouttext .='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
-				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-				$logouttext .='</a>';
-			}
-			else
-			{
-				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
-				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-			}
-		}
+        $logouttext='';
+        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        {
+            //$logouthtmltext=$appli.'<br>';
+            if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
+            {
+                $logouthtmltext.=$langs->trans("Logout").'<br>';
 
-		print '<div class="login_block">'."\n";
+                $logouttext .='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
+                //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                $logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
+                $logouttext .='</a>';
+            }
+            else
+            {
+                $logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+                $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+            }
+        }
 
-		// Add login user link
-		$toprightmenu.='<div class="login_block_user">';
+        print '<div class="login_block">'."\n";
 
-		// Login name with photo and tooltip
-		$mode=-1;
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-		$toprightmenu.=$user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-		$toprightmenu.='</div></div>';
+        // Add login user link
+        $toprightmenu.='<div class="login_block_user">';
 
-		$toprightmenu.='</div>'."\n";
+        // Login name with photo and tooltip
+        $mode=-1;
+        $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+        $toprightmenu.=$user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
+        $toprightmenu.='</div></div>';
 
-		$toprightmenu.='<div class="login_block_other">';
+        $toprightmenu.='</div>'."\n";
 
-		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-		$parameters=array();
-		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if (is_numeric($result))
-		{
-			if ($result == 0)
-				$toprightmenu.=$hookmanager->resPrint;		// add
-			else
-				$toprightmenu=$hookmanager->resPrint;						// replace
-		}
-		else
-		{
-			$toprightmenu.=$result;	// For backward compatibility
-		}
+        $toprightmenu.='<div class="login_block_other">';
 
-		// Link to module builder
-		if (! empty($conf->modulebuilder->enabled))
-		{
-			$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-bug atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
-		}
+        // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
+        $parameters=array();
+        $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+        if (is_numeric($result))
+        {
+            if ($result == 0)
+                $toprightmenu.=$hookmanager->resPrint;		// add
+            else
+                $toprightmenu=$hookmanager->resPrint;						// replace
+        }
+        else
+        {
+            $toprightmenu.=$result;	// For backward compatibility
+        }
 
-		// Link to print main content area
-		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
-		{
-			$qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-
-			if (is_array($_POST))
-			{
-				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
-				}
-			}
-			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-			$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
-			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-print atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
-		}
+        // Link to module builder
+        if (! empty($conf->modulebuilder->enabled))
+        {
+            $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+            //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
+            $text.='<span class="fa fa-bug atoplogin"></span>';
+            $text.='</a>';
+            $toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+        }
 
-		// Link to Dolibarr wiki pages
-		if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
-			$langs->load("help");
+        // Link to print main content area
+        if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
+        {
+            $qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+
+            if (is_array($_POST))
+            {
+                foreach($_POST as $key=>$value) {
+                    if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+                }
+            }
+            $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
+            $text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+            //$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
+            $text.='<span class="fa fa-print atoplogin"></span>';
+            $text.='</a>';
+            $toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+        }
+
+        // Link to Dolibarr wiki pages
+        if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        {
+            $langs->load("help");
 
-			$helpbaseurl='';
-			$helppage='';
-			$mode='';
+            $helpbaseurl='';
+            $helppage='';
+            $mode='';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+            if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
 
-			// Get helpbaseurl, helppage and mode from helppagename and langs
-			$arrayres=getHelpParamFor($helppagename,$langs);
-			$helpbaseurl=$arrayres['helpbaseurl'];
-			$helppage=$arrayres['helppage'];
-			$mode=$arrayres['mode'];
+            // Get helpbaseurl, helppage and mode from helppagename and langs
+            $arrayres=getHelpParamFor($helppagename,$langs);
+            $helpbaseurl=$arrayres['helpbaseurl'];
+            $helppage=$arrayres['helppage'];
+            $mode=$arrayres['mode'];
 
-			// Link to help pages
-			if ($helpbaseurl && $helppage)
-			{
-				$text='';
-	            if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
+            // Link to help pages
+            if ($helpbaseurl && $helppage)
+            {
+                $text='';
+                if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                     $langs->load('admin');
                     $appli .= '<br>' . $langs->trans("Database") . ': ' . $db->database_name;
                 }
-				$title=$appli.'<br>';
-				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-				$text.='<a class="help" target="_blank" rel="noopener" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl,$helppage);
-				$text.='">';
-				//$text.=img_picto('', 'helpdoc_top').' ';
-				$text.='<span class="fa fa-question-circle atoplogin"></span>';
-				//$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
-				//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
-				$text.='</a>';
-				//$toprightmenu.='</div>'."\n";
-				$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
-			}
-		}
+                $title=$appli.'<br>';
+                $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
+                if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+                $text.='<a class="help" target="_blank" rel="noopener" href="';
+                if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
+                else $text.=sprintf($helpbaseurl,$helppage);
+                $text.='">';
+                //$text.=img_picto('', 'helpdoc_top').' ';
+                $text.='<span class="fa fa-question-circle atoplogin"></span>';
+                //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
+                //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
+                $text.='</a>';
+                //$toprightmenu.='</div>'."\n";
+                $toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+            }
+        }
 
-		// Logout link
-		$toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+        // Logout link
+        $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
 
-		$toprightmenu.='</div>';
+        $toprightmenu.='</div>';
 
-		print $toprightmenu;
+        print $toprightmenu;
 
-		print "</div>\n";		// end div class="login_block"
+        print "</div>\n";		// end div class="login_block"
 
-		print '</div></div>';
+        print '</div></div>';
 
-		print '<div style="clear: both;"></div>';
-		print "<!-- End top horizontal menu -->\n\n";
-	}
+        print '<div style="clear: both;"></div>';
+        print "<!-- End top horizontal menu -->\n\n";
+    }
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+    if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
 }
 
 
@@ -1689,172 +1689,172 @@ 
  */
 function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
 {
-	global $user, $conf, $langs, $db, $form;
-	global $hookmanager, $menumanager;
+    global $user, $conf, $langs, $db, $form;
+    global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+    $searchform='';
+    $bookmarks='';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+    if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
-	{
-		// Instantiate hooks of thirdparty module
-		$hookmanager->initHooks(array('searchform','leftblock'));
+    if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+    {
+        // Instantiate hooks of thirdparty module
+        $hookmanager->initHooks(array('searchform','leftblock'));
 
-		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
+        print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+        if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
-		print "\n";
+        print "\n";
 
-		if (! is_object($form)) $form=new Form($db);
-		$selected=-1;
-		$usedbyinclude=1;
-		include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
+        if (! is_object($form)) $form=new Form($db);
+        $selected=-1;
+        $usedbyinclude=1;
+        include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
 
-		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
-		{
-			//$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-			$searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-		}
-		else
-		{
-			foreach($arrayresult as $key => $val)
-			{
-				//$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleft', img_picto('',$val['img']));
-				$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
-			}
-		}
+        if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+        {
+            //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+            $searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+        }
+        else
+        {
+            foreach($arrayresult as $key => $val)
+            {
+                //$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleft', img_picto('',$val['img']));
+                $searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
+            }
+        }
 
-		// Execute hook printSearchForm
-		$parameters=array('searchform'=>$searchform);
-		$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
-			$searchform.=$hookmanager->resPrint;
-		}
-		else $searchform=$hookmanager->resPrint;
+        // Execute hook printSearchForm
+        $parameters=array('searchform'=>$searchform);
+        $reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+        if (empty($reshook))
+        {
+            $searchform.=$hookmanager->resPrint;
+        }
+        else $searchform=$hookmanager->resPrint;
 
-		// Force special value for $searchform
-		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
-		{
-			$urltosearch=DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
-		}
-		elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
-		{
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-			$searchform.='<script type="text/javascript">
+        // Force special value for $searchform
+        if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
+        {
+            $urltosearch=DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
+            $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
+        }
+        elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+        {
+            $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+            $searchform.='<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-			$searchform.='</div>';
-		}
+            $searchform.='</div>';
+        }
 
-		// Define $bookmarks
-		if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
-		{
-			include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
-			$langs->load("bookmarks");
+        // Define $bookmarks
+        if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+        {
+            include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
+            $langs->load("bookmarks");
 
-			$bookmarks=printBookmarksList($db, $langs);
-		}
+            $bookmarks=printBookmarksList($db, $langs);
+        }
 
-		// Left column
-		print '<!-- Begin left menu -->'."\n";
+        // Left column
+        print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+        print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
 
-		// Show left menu with other forms
-		$menumanager->menu_array = $menu_array_before;
-		$menumanager->menu_array_after = $menu_array_after;
-		$menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
+        // Show left menu with other forms
+        $menumanager->menu_array = $menu_array_before;
+        $menumanager->menu_array_after = $menu_array_after;
+        $menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
 
-		// Dolibarr version + help + bug report link
-		print "\n";
-		print "<!-- Begin Help Block-->\n";
-		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
+        // Dolibarr version + help + bug report link
+        print "\n";
+        print "<!-- Begin Help Block-->\n";
+        print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
-		// Version
-		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
-		{
-			$doliurl='https://www.dolibarr.org';
-			//local communities
-			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-
-			$appli=constant('DOL_APPLICATION_TITLE');
-			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-			{
-				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
-				if (preg_match('/\d\.\d/', $appli))
-				{
-					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-				}
-				else $appli.=" ".DOL_VERSION;
-			}
-			else $appli.=" ".DOL_VERSION;
-			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
-			else print '<span class="help">';
-			print $appli;
-			if ($doliurl) print '</a>';
-			else print '</span>';
-			print '</div>'."\n";
-		}
+        // Version
+        if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+        {
+            $doliurl='https://www.dolibarr.org';
+            //local communities
+            if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
+            if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
+            if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
+            if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
+            if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
+
+            $appli=constant('DOL_APPLICATION_TITLE');
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+            {
+                $appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+                if (preg_match('/\d\.\d/', $appli))
+                {
+                    if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+                }
+                else $appli.=" ".DOL_VERSION;
+            }
+            else $appli.=" ".DOL_VERSION;
+            print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
+            if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
+            else print '<span class="help">';
+            print $appli;
+            if ($doliurl) print '</a>';
+            else print '</span>';
+            print '</div>'."\n";
+        }
 
-		// Link to bugtrack
-		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
-			$bugbaseurl.= '?title=';
-			$bugbaseurl.= urlencode("Bug: ");
-			$bugbaseurl.= '&body=';
-			$bugbaseurl.= urlencode("# Bug\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Environment\n");
-			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
-			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
-			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Report\n");
-			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-			print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
-			print '</div>';
-		}
+        // Link to bugtrack
+        if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+            $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
+            $bugbaseurl.= '?title=';
+            $bugbaseurl.= urlencode("Bug: ");
+            $bugbaseurl.= '&body=';
+            $bugbaseurl.= urlencode("# Bug\n");
+            $bugbaseurl.= urlencode("\n");
+            $bugbaseurl.= urlencode("## Environment\n");
+            $bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
+            $bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
+            $bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
+            $bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
+            $bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
+            $bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+            $bugbaseurl.= urlencode("\n");
+            $bugbaseurl.= urlencode("## Report\n");
+            print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
+            print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
+            print '</div>';
+        }
 
-		print "</div>\n";
-		print "<!-- End Help Block-->\n";
-		print "\n";
+        print "</div>\n";
+        print "<!-- End Help Block-->\n";
+        print "\n";
 
-		print "</div>\n";
-		print "<!-- End left menu -->\n";
-		print "\n";
+        print "</div>\n";
+        print "<!-- End left menu -->\n";
+        print "\n";
 
-		// Execute hook printLeftBlock
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
-		print $hookmanager->resPrint;
+        // Execute hook printLeftBlock
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
+        print $hookmanager->resPrint;
 
-		print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
-	}
+        print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
+    }
 
-	print "\n";
-	print '<!-- Begin right area -->'."\n";
+    print "\n";
+    print '<!-- Begin right area -->'."\n";
 
-	if (empty($leftmenuwithoutmainarea)) main_area($title);
+    if (empty($leftmenuwithoutmainarea)) main_area($title);
 }
 
 
@@ -1866,15 +1866,15 @@ 
  */
 function main_area($title='')
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
+    if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
 
-	print "\n";
+    print "\n";
 
-	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
+    print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+    if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
 
@@ -1887,38 +1887,38 @@ 
  */
 function getHelpParamFor($helppagename,$langs)
 {
-	$helpbaseurl='';
-	$helppage='';
-	$mode='';
-
-	if (preg_match('/^http/i',$helppagename))
-	{
-		// If complete URL
-		$helpbaseurl='%s';
-		$helppage=$helppagename;
-		$mode='local';
-	}
-	else
-	{
-		// If WIKI URL
-		if (preg_match('/^es/i',$langs->defaultlang))
-		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-		}
-		if (preg_match('/^fr/i',$langs->defaultlang))
-		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-		}
-		if (empty($helppage))	// If help page not already found
-		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
-		}
-		$mode='wiki';
-	}
-	return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
+    $helpbaseurl='';
+    $helppage='';
+    $mode='';
+
+    if (preg_match('/^http/i',$helppagename))
+    {
+        // If complete URL
+        $helpbaseurl='%s';
+        $helppage=$helppagename;
+        $mode='local';
+    }
+    else
+    {
+        // If WIKI URL
+        if (preg_match('/^es/i',$langs->defaultlang))
+        {
+            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+        if (preg_match('/^fr/i',$langs->defaultlang))
+        {
+            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+        if (empty($helppage))	// If help page not already found
+        {
+            $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
+            if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+        }
+        $mode='wiki';
+    }
+    return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
 }
 
 
@@ -1939,138 +1939,138 @@ 
  */
 function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='', $showtitlebefore=0)
 {
-	global $conf,$langs,$user;
-
-	$ret='';
-	$ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
-	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$ret.='<input type="hidden" name="mode" value="search">';
-	$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	if ($showtitlebefore) $ret.=$title.' ';
-	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-	$ret.=' placeholder="'.strip_tags($title).'"';
-	$ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
-	//$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-	$ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
-	$ret.='<span class="fa fa-search"></span>';
-	$ret.='</button>';
-	$ret.="</form>\n";
-	return $ret;
+    global $conf,$langs,$user;
+
+    $ret='';
+    $ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
+    $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    $ret.='<input type="hidden" name="mode" value="search">';
+    $ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
+    if ($showtitlebefore) $ret.=$title.' ';
+    $ret.='<input type="text" class="flat '.$htmlmorecss.'"';
+    $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+    $ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
+    $ret.=' placeholder="'.strip_tags($title).'"';
+    $ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+    //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
+    $ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
+    $ret.='<span class="fa fa-search"></span>';
+    $ret.='</button>';
+    $ret.="</form>\n";
+    return $ret;
 }
 
 
 if (! function_exists("llxFooter"))
 {
-	/**
-	 * Show HTML footer
-	 * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
-	 * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
-	 *
-	 * @param	string	$comment    				A text to add as HTML comment into HTML generated page
-	 * @param	string	$zone						'private' (for private pages) or 'public' (for public pages)
-	 * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
-	 * @return	void
-	 */
-	function llxFooter($comment='',$zone='private', $disabledoutputofmessages=0)
-	{
-		global $conf, $langs, $user, $object;
-		global $delayedhtmlcontent;
-		global $contextpage, $page, $limit;
+    /**
+     * Show HTML footer
+     * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
+     * If global var $delayedhtmlcontent was filled, we output it just before closing the body.
+     *
+     * @param	string	$comment    				A text to add as HTML comment into HTML generated page
+     * @param	string	$zone						'private' (for private pages) or 'public' (for public pages)
+     * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
+     * @return	void
+     */
+    function llxFooter($comment='',$zone='private', $disabledoutputofmessages=0)
+    {
+        global $conf, $langs, $user, $object;
+        global $delayedhtmlcontent;
+        global $contextpage, $page, $limit;
 
-		$ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
+        $ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
-		// Global html output events ($mesgs, $errors, $warnings)
-		dol_htmloutput_events($disabledoutputofmessages);
+        // Global html output events ($mesgs, $errors, $warnings)
+        dol_htmloutput_events($disabledoutputofmessages);
 
-		// Code for search criteria persistence.
-		// $user->lastsearch_values was set by the GETPOST when form field search_xxx exists
-		if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
-		{
-			// Clean and save data
-			foreach($user->lastsearch_values_tmp as $key => $val)
-			{
-				unset($_SESSION['lastsearch_values_tmp_'.$key]);			// Clean array to rebuild it just after
-				if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
-				{
-					if (empty($val['sortfield'])) unset($val['sortfield']);
-					if (empty($val['sortorder'])) unset($val['sortorder']);
-					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
-					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
-					unset($_SESSION['lastsearch_values_'.$key]);
-				}
-			}
-		}
+        // Code for search criteria persistence.
+        // $user->lastsearch_values was set by the GETPOST when form field search_xxx exists
+        if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+        {
+            // Clean and save data
+            foreach($user->lastsearch_values_tmp as $key => $val)
+            {
+                unset($_SESSION['lastsearch_values_tmp_'.$key]);			// Clean array to rebuild it just after
+                if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
+                {
+                    if (empty($val['sortfield'])) unset($val['sortfield']);
+                    if (empty($val['sortorder'])) unset($val['sortorder']);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
+                }
+            }
+        }
 
 
-		$relativepathstring = $_SERVER["PHP_SELF"];
-		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
-		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-		if (preg_match('/list\.php$/', $relativepathstring))
-		{
-			unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+        $relativepathstring = $_SERVER["PHP_SELF"];
+        // Clean $relativepathstring
+        if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+        $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+        $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+        if (preg_match('/list\.php$/', $relativepathstring))
+        {
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
-			if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
-			if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
-			if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
+            if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
+            if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
+            if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
 
-			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
-			unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
-		}
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
+        }
 
-		// Core error message
-		if (! empty($conf->global->MAIN_CORE_ERROR))
-		{
-			// Ajax version
-			if ($conf->use_javascript_ajax)
-			{
-				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
-				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
-			}
-			// html version
-			else
-			{
-				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');
-				print '<div class="error">'.$msg.'</div>';
-			}
-
-			//define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
-		}
+        // Core error message
+        if (! empty($conf->global->MAIN_CORE_ERROR))
+        {
+            // Ajax version
+            if ($conf->use_javascript_ajax)
+            {
+                $title = img_warning().' '.$langs->trans('CoreErrorTitle');
+                print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
+            }
+            // html version
+            else
+            {
+                $msg = img_warning().' '.$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
+            }
 
-		print "\n\n";
+            //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
+        }
 
-		print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
+        print "\n\n";
 
-		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+        if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
-		print "\n";
-		if ($comment) print '<!-- '.$comment.' -->'."\n";
+        if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
 
-		printCommonFooter($zone);
+        print "\n";
+        if ($comment) print '<!-- '.$comment.' -->'."\n";
 
-		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+        printCommonFooter($zone);
 
-		if (! empty($conf->use_javascript_ajax))
-		{
-			print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
-		}
+        if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-		// Wrapper to add log when clicking on download or preview
-		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
-		{
-			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
-			{
-				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
-				?>
+        if (! empty($conf->use_javascript_ajax))
+        {
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
+        }
+
+        // Wrapper to add log when clicking on download or preview
+        if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+        {
+            if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+            {
+                print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+                ?>
     			<script type="text/javascript">
     			jQuery(document).ready(function () {
     				$('a.documentpreview').click(function() {
@@ -2094,14 +2094,14 @@ 
     			});
     			</script>
 				<?php
-			}
-	   	}
+            }
+            }
 
-		// A div for the address popup
-		print "\n<!-- A div to allow dialog popup -->\n";
-		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
+        // A div for the address popup
+        print "\n<!-- A div to allow dialog popup -->\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
-		print "</body>\n";
-		print "</html>\n";
-	}
+        print "</body>\n";
+        print "</html>\n";
+    }
 }

Spacing +646 added lines, -646 removed lines

@@ -36,10 +36,10 @@ 
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
 $micro_start_time = 0;
-if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
+if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 {
 	list($usec, $sec) = explode(" ", microtime());
-	$micro_start_time=((float) $usec + (float) $sec);
+	$micro_start_time = ((float) $usec + (float) $sec);
 	// Add Xdebug code coverage
 	//define('XDEBUGCOVERAGE',1);
 	if (defined('XDEBUGCOVERAGE')) {
@@ -97,24 +97,24 @@ 
 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
 	if ($type == 1 || $type == 3)
 	{
-		$inj += preg_match('/delete\s+from/i',	 $val);
-		$inj += preg_match('/create\s+table/i',	 $val);
-		$inj += preg_match('/insert\s+into/i', 	 $val);
-		$inj += preg_match('/select\s+from/i', 	 $val);
-		$inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-		$inj += preg_match('/user\s*\(/i',  $val);						// avoid to use function user() that return current database login
-		$inj += preg_match('/information_schema/i',  $val);				// avoid to use request that read information_schema database
+		$inj += preg_match('/delete\s+from/i', $val);
+		$inj += preg_match('/create\s+table/i', $val);
+		$inj += preg_match('/insert\s+into/i', $val);
+		$inj += preg_match('/select\s+from/i', $val);
+		$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
+		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
+		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 	}
 	if ($type == 3)
 	{
-		$inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i',	 $val);
+		$inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i', $val);
 	}
 	if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
 	{
-		$inj += preg_match('/updatexml\(/i', 	 $val);
-		$inj += preg_match('/update.+set.+=/i',  $val);
-		$inj += preg_match('/union.+select/i', 	 $val);
-		$inj += preg_match('/(\.\.%2f)+/i',		 $val);
+		$inj += preg_match('/updatexml\(/i', $val);
+		$inj += preg_match('/update.+set.+=/i', $val);
+		$inj += preg_match('/union.+select/i', $val);
+		$inj += preg_match('/(\.\.%2f)+/i', $val);
 	}
 	// For XSS Injection done by adding javascript with script
 	// This is all cases a browser consider text is javascript:
@@ -124,26 +124,26 @@ 
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/<audio/i', $val);
-	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
+	if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 	$inj += preg_match('/base[\s]+href/si', $val);
-	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-	$inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-	$inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-	$inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+	$inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+	$inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+	$inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+	$inj += preg_match('/onloadstart\s*=/i', $val); // onload can be set on audio tag <audio onloadstart=alert(1)>
+	$inj += preg_match('/onclick\s*=/i', $val); // onclick can be set on img text html tag like <img onclick = alert(1)>
+	$inj += preg_match('/onscroll\s*=/i', $val); // onscroll can be on textarea
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 	//if ($type == 1)
 	//{
 		$inj += preg_match('/javascript:/i', $val);
 		$inj += preg_match('/vbscript:/i', $val);
 	//}
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+	if ($type == 1) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
+	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
 	return $inj;
 }
 
@@ -180,34 +180,34 @@ 
 
 
 // Check consistency of NOREQUIREXXX DEFINES
-if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU'))
+if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && !defined('NOREQUIREMENU'))
 {
 	print 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not set them';
 	exit;
 }
 
 // Sanity check on URL
-if (! empty($_SERVER["PHP_SELF"]))
+if (!empty($_SERVER["PHP_SELF"]))
 {
-	$morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
+	$morevaltochecklikepost = array($_SERVER["PHP_SELF"]);
+	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost, 2);
 }
 // Sanity check on GET parameters
-if (! defined('NOSCANGETFORINJECTION') && ! empty($_SERVER["QUERY_STRING"]))
+if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))
 {
-	$morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
+	$morevaltochecklikeget = array($_SERVER["QUERY_STRING"]);
+	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget, 1);
 }
 // Sanity check on POST
-if (! defined('NOSCANPOSTFORINJECTION'))
+if (!defined('NOSCANPOSTFORINJECTION'))
 {
-	analyseVarsForSqlAndScriptsInjection($_POST,0);
+	analyseVarsForSqlAndScriptsInjection($_POST, 0);
 }
 
 // This is to make Dolibarr working with Plesk
-if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
+if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
 {
-	set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+	set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 }
 
 // Include the conf.php and functions.lib.php
@@ -216,37 +216,37 @@ 
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
 // This is used for example by form of boxes to save personalization of some options.
 // DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
-if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
+if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
-	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
-	$tmplist=explode(',',$tmpautoset[1]);
-	$cookiearrayvalue=array();
+	$tmpautoset = explode(':', $_POST["DOL_AUTOSET_COOKIE"], 2);
+	$tmplist = explode(',', $tmpautoset[1]);
+	$cookiearrayvalue = array();
 	foreach ($tmplist as $tmpkey)
 	{
-		$postkey=$tmpautoset[0].'_'.$tmpkey;
+		$postkey = $tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		if (!empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
 	}
-	$cookiename=$tmpautoset[0];
-	$cookievalue=json_encode($cookiearrayvalue);
+	$cookiename = $tmpautoset[0];
+	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
+	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
 	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
 }
 
 
 // Init session. Name of session is specific to Dolibarr instance.
 // Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
-$prefix=dol_getprefix('');
+$prefix = dol_getprefix('');
 
-$sessionname='DOLSESSID_'.$prefix;
-$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+$sessionname = 'DOLSESSID_'.$prefix;
+$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
+if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 session_name($sessionname);
-session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
-if (! defined('NOSESSION'))
+if (!defined('NOSESSION'))
 {
 	session_start();
 	/*if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
@@ -267,40 +267,40 @@ 
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-	$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-	$conf->browser->name=$tmp['browsername'];
-	$conf->browser->os=$tmp['browseros'];
-	$conf->browser->version=$tmp['browserversion'];
-	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
+	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$conf->browser->name = $tmp['browsername'];
+	$conf->browser->os = $tmp['browseros'];
+	$conf->browser->version = $tmp['browserversion'];
+	$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER = 1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
-if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
+if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-	$newurl='';
+	$newurl = '';
 	if (is_numeric($conf->file->main_force_https))
 	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+		if ($conf->file->main_force_https == '1' && !empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
 		{
-			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
+			if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && !preg_match('/^https:/i', $_SERVER["SCRIPT_URI"]))	// If link is http
 			{
-				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
+				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
 		}
 		else	// Check HTTPS environment variable (Apache/mod_ssl only)
 		{
-			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
 	}
 	else
 	{
 		// Check HTTPS environment variable (Apache/mod_ssl only)
-		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
 	// Start redirect
 	if ($newurl)
@@ -315,20 +315,20 @@ 
 	}
 }
 
-if (! defined('NOLOGIN') && ! defined('NOIPCHECK') && ! empty($dolibarr_main_restrict_ip))
+if (!defined('NOLOGIN') && !defined('NOIPCHECK') && !empty($dolibarr_main_restrict_ip))
 {
-	$listofip=explode(',', $dolibarr_main_restrict_ip);
+	$listofip = explode(',', $dolibarr_main_restrict_ip);
 	$found = false;
-	foreach($listofip as $ip)
+	foreach ($listofip as $ip)
 	{
-		$ip=trim($ip);
+		$ip = trim($ip);
 		if ($ip == $_SERVER['REMOTE_ADDR'])
 		{
 			$found = true;
 			break;
 		}
 	}
-	if (! $found)
+	if (!$found)
 	{
 		print 'Access refused by IP protection';
 		exit;
@@ -336,25 +336,25 @@ 
 }
 
 // Loading of additional presentation includes
-if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';	// Need 22ko memory
+if (!defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
-if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
+if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED))
 {
 	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
 	header("Location: ".DOL_URL_ROOT."/install/index.php");
 	exit;
 }
 // If an upgrade process is required, we call the install page.
-if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
-|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
+if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
+|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
 {
-	$versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
-	require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
-	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
-	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
-	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
+	$versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+	$dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
+	$dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
+	$rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
 	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
 	{
 		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
@@ -364,7 +364,7 @@ 
 }
 
 // Creation of a token against CSRF vulnerabilities
-if (! defined('NOTOKENRENEWAL'))
+if (!defined('NOTOKENRENEWAL'))
 {
 	// roulement des jetons car cree a chaque appel
 	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
@@ -373,10 +373,10 @@ 
 	$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
 	$_SESSION['newtoken'] = $token;
 }
-if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
+if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
 	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
 {
-	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
+	if ($_SERVER['REQUEST_METHOD'] == 'POST' && !GETPOST('token', 'alpha')) // Note, offender can still send request by GET
 	{
 		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
 		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
@@ -386,7 +386,7 @@ 
 	{
 		if (GETPOST('token', 'alpha') != $_SESSION['token'])
 		{
-			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
 			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
 			unset($_POST);
 		}
@@ -394,20 +394,20 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
-if (! empty($_SESSION["disablemodules"]))
+if (GETPOST('disablemodules', 'alpha'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+if (!empty($_SESSION["disablemodules"]))
 {
-	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
-	foreach($disabled_modules as $module)
+	$disabled_modules = explode(',', $_SESSION["disablemodules"]);
+	foreach ($disabled_modules as $module)
 	{
 		if ($module)
 		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();
-			$conf->$module->enabled=false;
+			if (empty($conf->$module)) $conf->$module = new stdClass();
+			$conf->$module->enabled = false;
 			if ($module == 'fournisseur')		// Special case
 			{
-				$conf->supplier_order->enabled=0;
-				$conf->supplier_invoice->enabled=0;
+				$conf->supplier_order->enabled = 0;
+				$conf->supplier_invoice->enabled = 0;
 			}
 		}
 	}
@@ -416,8 +416,8 @@ 
 /*
  * Phase authentication / login
  */
-$login='';
-if (! defined('NOLOGIN'))
+$login = '';
+if (!defined('NOLOGIN'))
 {
 	// $authmode lists the different means of identification to be tested in order of preference.
 	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
@@ -429,93 +429,93 @@ 
 	else
 	{
 		// Authentication mode
-		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
 		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
 	}
 	// Set authmode
-	$authmode=explode(',',$dolibarr_main_authentication);
+	$authmode = explode(',', $dolibarr_main_authentication);
 
 	// No authentication mode
-	if (! count($authmode))
+	if (!count($authmode))
 	{
 		$langs->load('main');
-		dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
+		dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
 		exit;
 	}
 
 	// If login request was already post, we retrieve login from the session
 	// Call module if not realized that his request.
 	// At the end of this phase, the variable $login is defined.
-	$resultFetchUser='';
-	$test=true;
-	if (! isset($_SESSION["dol_login"]))
+	$resultFetchUser = '';
+	$test = true;
+	if (!isset($_SESSION["dol_login"]))
 	{
 		// It is not already authenticated and it requests the login / password
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-		$dol_dst_observed=GETPOST("dst_observed",'int',3);
-		$dol_dst_first=GETPOST("dst_first",'int',3);
-		$dol_dst_second=GETPOST("dst_second",'int',3);
-		$dol_screenwidth=GETPOST("screenwidth",'int',3);
-		$dol_screenheight=GETPOST("screenheight",'int',3);
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
-		$dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
+		$dol_dst_observed = GETPOST("dst_observed", 'int', 3);
+		$dol_dst_first = GETPOST("dst_first", 'int', 3);
+		$dol_dst_second = GETPOST("dst_second", 'int', 3);
+		$dol_screenwidth = GETPOST("screenwidth", 'int', 3);
+		$dol_screenheight = GETPOST("screenheight", 'int', 3);
+		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int', 3);
+		$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int', 3);
+		$dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int', 3);
+		$dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int', 3);
+		$dol_use_jmobile = GETPOST('dol_use_jmobile', 'int', 3);
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
 		{
-			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
+			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER']))
 			{
 				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-				$url='';
-				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-				$url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-				$url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-				$url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-				$url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+				$url = '';
+				$url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+				$url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+				$url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+				$url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+				$url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+				$url = DOL_URL_ROOT.'/public/demo/index.php'.($url ? '?'.$url : '');
 				header("Location: ".$url);
 				exit;
 			}
 		}
 
 		// Verification security graphic code
-		if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
 			$sessionkey = 'dol_antispam_value';
-			$ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
 			// Check code
-			if (! $ok)
+			if (!$ok)
 			{
 				dol_syslog('Bad value for code, connexion refused');
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-				$test=false;
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadValueForCode");
+				$test = false;
 
 				// Call trigger for the "security events" log
-				$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+				$user->trigger_mesg = 'ErrorBadValueForCode - login='.GETPOST("username", "alpha", 2);
 				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($db);
+				$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 				if ($result < 0) {
 					$error++;
 				}
 				// End Call of triggers
 
 				// Hooks on failed login
-				$action='';
+				$action = '';
 				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 
 				// Note: exit is done later
@@ -524,22 +524,22 @@ 
 
 		$allowedmethodtopostusername = 2;
 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
-		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",$allowedmethodtopostusername));
-		$passwordtotest	= GETPOST('password','none',$allowedmethodtopostusername);
-		$entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", $allowedmethodtopostusername));
+		$passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
+		$entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
 		// Define if we received data to test the login.
-		$goontestloop=false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-		if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+		$goontestloop = false;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
+		if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) $goontestloop = true;
+		if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
 
-		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+		if (!is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-			$langs=new Translate("",$conf);
-			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-			if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+			$langs = new Translate("", $conf);
+			$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+			if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
 			$langs->setDefaultLang($langcode);
 		}
 
@@ -548,53 +548,53 @@ 
 		// If error, we will put error message in session under the name dol_loginmesg
 		if ($test && $goontestloop)
 		{
-			$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
+			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
 			if ($login)
 			{
-				$dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
-				$dol_tz=$_POST["tz"];
-				$dol_tz_string=$_POST["tz_string"];
-				$dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
-				$dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
-				$dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
-				$dol_dst=0;
+				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
+				$dol_tz = $_POST["tz"];
+				$dol_tz_string = $_POST["tz_string"];
+				$dol_tz_string = preg_replace('/\s*\(.+\)$/', '', $dol_tz_string);
+				$dol_tz_string = preg_replace('/,/', '/', $dol_tz_string);
+				$dol_tz_string = preg_replace('/\s/', '_', $dol_tz_string);
+				$dol_dst = 0;
 				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-					$datenow=dol_now();
-					$datefirst=dol_stringtotime($_POST["dst_first"]);
-					$datesecond=dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+					$datenow = dol_now();
+					$datefirst = dol_stringtotime($_POST["dst_first"]);
+					$datesecond = dol_stringtotime($_POST["dst_second"]);
+					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst = 1;
 				}
 				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
 			}
 
-			if (! $login)
+			if (!$login)
 			{
-				dol_syslog('Bad password, connexion refused',LOG_DEBUG);
+				dol_syslog('Bad password, connexion refused', LOG_DEBUG);
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
 				// Bad password. No authmode has found a good password.
 				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 
 				// Call trigger for the "security events" log
-				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+				$user->trigger_mesg = $langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username", "alpha", 2);
 				// Call of triggers
 				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+				$interface = new Interfaces($db);
+				$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf, GETPOST("username", "alpha", 2));
 				if ($result < 0) {
 					$error++;
 				}
 				// End Call of triggers
 
 				// Hooks on failed login
-				$action='';
+				$action = '';
 				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 
 				// Note: exit is done in next chapter
@@ -602,118 +602,118 @@ 
 		}
 
 		// End test login / passwords
-		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 		{
 			// No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+			else dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
 			exit;
 		}
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
 		if ($resultFetchUser <= 0)
 		{
 			dol_syslog('User not found, connexion refused');
 			session_destroy();
 			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+			session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+			session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
 			if ($resultFetchUser == 0)
 			{
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
 			if ($resultFetchUser < 0)
 			{
-				$_SESSION["dol_loginmesg"]=$user->error;
+				$_SESSION["dol_loginmesg"] = $user->error;
 
-				$user->trigger_mesg=$user->error;
+				$user->trigger_mesg = $user->error;
 			}
 
 			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($db);
+			$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 			if ($result < 0) {
 				$error++;
 			}
 			// End call triggers
 
 			// Hooks on failed login
-			$action='';
+			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+			$paramsurl = array();
+			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
 	}
 	else
 	{
 		// We are already into an authenticated session
-		$login=$_SESSION["dol_login"];
-		$entity=$_SESSION["dol_entity"];
+		$login = $_SESSION["dol_login"];
+		$entity = $_SESSION["dol_entity"];
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
 		if ($resultFetchUser <= 0)
 		{
 			// Account has been removed after login
 			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
 			session_destroy();
 			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+			session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+			session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
 			if ($resultFetchUser == 0)
 			{
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
 			if ($resultFetchUser < 0)
 			{
-				$_SESSION["dol_loginmesg"]=$user->error;
+				$_SESSION["dol_loginmesg"] = $user->error;
 
-				$user->trigger_mesg=$user->error;
+				$user->trigger_mesg = $user->error;
 			}
 
 			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($db);
+			$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 			if ($result < 0) {
 				$error++;
 			}
 			// End call triggers
 
 			// Hooks on failed login
-			$action='';
+			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+			$paramsurl = array();
+			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
 		else
@@ -722,35 +722,35 @@ 
 		    $hookmanager->initHooks(array('main'));
 
 		    // Code for search criteria persistence.
-		    if (! empty($_GET['save_lastsearch_values']))    // We must use $_GET here
+		    if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here
 		    {
-			    $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+			    $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
+			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
 			    // Clean $relativepathstring
-   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
 			    $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 			    $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 			    //var_dump($relativepathstring);
 
 			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-			    if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+			    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
 			    {
-			    	$_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
 				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
+			    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
 			    {
-			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
+			    if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
 			    {
-			    	$_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
+			    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
 			    {
-			    	$_SESSION['lastsearch_limit_'.$relativepathstring]=$_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 			    }
 		    }
@@ -765,30 +765,30 @@ 
 
 	// Is it a new session that has started ?
 	// If we are here, this means authentication was successfull.
-	if (! isset($_SESSION["dol_login"]))
+	if (!isset($_SESSION["dol_login"]))
 	{
 		// New session for this login has started.
-		$error=0;
+		$error = 0;
 
 		// Store value into session (values always stored)
-		$_SESSION["dol_login"]=$user->login;
-		$_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
-		$_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
-		$_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
-		$_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
-		$_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
-		$_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
-		$_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
-		$_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
-		$_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
-		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$_SESSION["dol_entity"]=$conf->entity;
+		$_SESSION["dol_login"] = $user->login;
+		$_SESSION["dol_authmode"] = isset($dol_authmode) ? $dol_authmode : '';
+		$_SESSION["dol_tz"] = isset($dol_tz) ? $dol_tz : '';
+		$_SESSION["dol_tz_string"] = isset($dol_tz_string) ? $dol_tz_string : '';
+		$_SESSION["dol_dst"] = isset($dol_dst) ? $dol_dst : '';
+		$_SESSION["dol_dst_observed"] = isset($dol_dst_observed) ? $dol_dst_observed : '';
+		$_SESSION["dol_dst_first"] = isset($dol_dst_first) ? $dol_dst_first : '';
+		$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
+		$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
+		$_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
+		$_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$_SESSION["dol_entity"] = $conf->entity;
 		// Store value into session (values stored only if defined)
-		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+		if (!empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+		if (!empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+		if (!empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+		if (!empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+		if (!empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
 
 		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -801,26 +801,26 @@ 
 		// Call triggers for the "security events" log
 		$user->trigger_mesg = $loginfo;
 		// Call triggers
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($db);
-		$result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($db);
+		$result = $interface->run_triggers('USER_LOGIN', $user, $user, $langs, $conf);
 		if ($result < 0) {
 			$error++;
 		}
 		// End call triggers
 
 		// Hooks on successfull login
-		$action='';
+		$action = '';
 		$hookmanager->initHooks(array('login'));
-		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
-		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+		$reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) $error++;
 
 		if ($error)
 		{
 			$db->rollback();
 			session_destroy();
-			dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
+			dol_print_error($db, 'Error in some triggers USER_LOGIN or in some hooks afterLogin');
 			exit;
 		}
 		else
@@ -829,10 +829,10 @@ 
 		}
 
 		// Change landing page if defined.
-		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-		if (! empty($landingpage))    // Example: /index.php
+		$landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
+		if (!empty($landingpage))    // Example: /index.php
 		{
-			$newpath=dol_buildpath($landingpage, 1);
+			$newpath = dol_buildpath($landingpage, 1);
 			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
 			{
 				header('Location: '.$newpath);
@@ -845,12 +845,12 @@ 
 	// If user admin, we force the rights-based modules
 	if ($user->admin)
 	{
-		$user->rights->user->user->lire=1;
-		$user->rights->user->user->creer=1;
-		$user->rights->user->user->password=1;
-		$user->rights->user->user->supprimer=1;
-		$user->rights->user->self->creer=1;
-		$user->rights->user->self->password=1;
+		$user->rights->user->user->lire = 1;
+		$user->rights->user->user->creer = 1;
+		$user->rights->user->user->password = 1;
+		$user->rights->user->user->supprimer = 1;
+		$user->rights->user->self->creer = 1;
+		$user->rights->user->self->password = 1;
 	}
 
 	/*
@@ -858,73 +858,73 @@ 
      */
 
 	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
+	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
 
 	// Replace conf->css by personalized value if theme not forced
-	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
+	if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME))
 	{
-		$conf->theme=$user->conf->MAIN_THEME;
+		$conf->theme = $user->conf->MAIN_THEME;
 		$conf->css  = "/theme/".$conf->theme."/style.css.php";
 	}
 }
 
 // Case forcing style from url
-if (GETPOST('theme','alpha'))
+if (GETPOST('theme', 'alpha'))
 {
-	$conf->theme=GETPOST('theme','alpha',1);
+	$conf->theme = GETPOST('theme', 'alpha', 1);
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
 
 // Set javascript option
-if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
+if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
 {
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
 }
-else $conf->use_javascript_ajax=0;
+else $conf->use_javascript_ajax = 0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
 }
-elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
-if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
-	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
-	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu = 1;
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen = 1;
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile = 1;
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover = 1;
+if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
+	|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+	|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 )
 {
-	$conf->dol_optimize_smallscreen=1;
+	$conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 // Replace themes bugged with jmobile with eldy
-if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
+if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok')))
 {
-	$conf->theme='eldy';
-	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
+	$conf->theme = 'eldy';
+	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+	if (!GETPOST('lang', 'aZ09'))	// If language was not forced on URL
 	{
 		// If user has chosen its own language
-		if (! empty($user->conf->MAIN_LANG_DEFAULT))
+		if (!empty($user->conf->MAIN_LANG_DEFAULT))
 		{
 			// If different than current language
 			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
@@ -936,11 +936,11 @@ 
 	}
 }
 
-if (! defined('NOLOGIN'))
+if (!defined('NOLOGIN'))
 {
 	// If the login is not recovered, it is identified with an account that does not exist.
 	// Hacking attempt?
-	if (! $user->login) accessforbidden();
+	if (!$user->login) accessforbidden();
 
 	// Check if user is active
 	if ($user->statut < 1)
@@ -957,88 +957,88 @@ 
 }
 
 
-dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action','az09').', massaction='.GETPOST('massaction','az09'));
+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'az09').', massaction='.GETPOST('massaction', 'az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
 // Load main languages files
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
 	// Load translation files required by page
 	$langs->loadLangs(array('main', 'dict'));
 }
 
 // Define some constants used for style of arrays
-$bc=array(0=>'class="impair"',1=>'class="pair"');
-$bcdd=array(0=>'class="drag drop oddeven"',1=>'class="drag drop oddeven"');
-$bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
-$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
+$bc = array(0=>'class="impair"', 1=>'class="pair"');
+$bcdd = array(0=>'class="drag drop oddeven"', 1=>'class="drag drop oddeven"');
+$bcnd = array(0=>'class="nodrag nodrop nohover"', 1=>'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
+$bctag = array(0=>'class="impair tagtr"', 1=>'class="pair tagtr"');
 
 // Define messages variables
-$mesg=''; $warning=''; $error=0;
+$mesg = ''; $warning = ''; $error = 0;
 // deprecated, see setEventMessages() and dol_htmloutput_events()
-$mesgs=array(); $warnings=array(); $errors=array();
+$mesgs = array(); $warnings = array(); $errors = array();
 
 // Constants used to defined number of lines in textarea
 if (empty($conf->browser->firefox))
 {
-	define('ROWS_1',1);
-	define('ROWS_2',2);
-	define('ROWS_3',3);
-	define('ROWS_4',4);
-	define('ROWS_5',5);
-	define('ROWS_6',6);
-	define('ROWS_7',7);
-	define('ROWS_8',8);
-	define('ROWS_9',9);
+	define('ROWS_1', 1);
+	define('ROWS_2', 2);
+	define('ROWS_3', 3);
+	define('ROWS_4', 4);
+	define('ROWS_5', 5);
+	define('ROWS_6', 6);
+	define('ROWS_7', 7);
+	define('ROWS_8', 8);
+	define('ROWS_9', 9);
 }
 else
 {
-	define('ROWS_1',0);
-	define('ROWS_2',1);
-	define('ROWS_3',2);
-	define('ROWS_4',3);
-	define('ROWS_5',4);
-	define('ROWS_6',5);
-	define('ROWS_7',6);
-	define('ROWS_8',7);
-	define('ROWS_9',8);
+	define('ROWS_1', 0);
+	define('ROWS_2', 1);
+	define('ROWS_3', 2);
+	define('ROWS_4', 3);
+	define('ROWS_5', 4);
+	define('ROWS_6', 5);
+	define('ROWS_7', 6);
+	define('ROWS_8', 7);
+	define('ROWS_9', 8);
 }
 
-$heightforframes=50;
+$heightforframes = 50;
 
 // Init menu manager
-if (! defined('NOREQUIREMENU'))
+if (!defined('NOREQUIREMENU'))
 {
 	if (empty($user->societe_id))    // If internal user or not defined
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
 	else                        // If external user
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
-	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
-	if (! class_exists('MenuManager'))
+	$file_menu = $conf->standard_menu;
+	if (GETPOST('menu', 'alpha')) $file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
+	if (!class_exists('MenuManager'))
 	{
-		$menufound=0;
-		$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-		foreach($dirmenus as $dirmenu)
+		$menufound = 0;
+		$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
+		foreach ($dirmenus as $dirmenu)
 		{
-			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
+			$menufound = dol_include_once($dirmenu."standard/".$file_menu);
 			if (class_exists('MenuManager')) break;
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (!class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-			$file_menu='eldy_menu.php';
+			$file_menu = 'eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
 	}
-	$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+	$menumanager = new MenuManager($db, empty($user->societe_id) ? 0 : 1);
 	$menumanager->loadMenu();
 }
 
@@ -1046,7 +1046,7 @@ 
 
 // Functions
 
-if (! function_exists("llxHeader"))
+if (!function_exists("llxHeader"))
 {
 	/**
 	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
@@ -1066,24 +1066,24 @@ 
 	 * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
 	 * @return	void
 	 */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='', $replacemainareaby='')
+	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '')
 	{
 		global $conf;
 
 		// html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-		print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+		print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
 		// top menu and left menu area
-		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int'))
+		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int'))
 		{
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
 
 		if (empty($conf->dol_hide_leftmenu))
 		{
-			left_menu('', $help_url, '', '', 1, $title, 1);		// $menumanager is retreived with a global $menumanager inside this function
+			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
 		}
 
 		// main area
@@ -1104,17 +1104,17 @@ 
  *  @param	int		$forcenocache	Force disabling of cache for the page
  *  @return	void
  */
-function top_httphead($contenttype='text/html', $forcenocache=0)
+function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 {
 	global $db, $conf, $hookmanager;
 
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	if ($contenttype == 'text/html') header("Content-Type: text/html; charset=".$conf->file->character_set_client);
 	else header("Content-Type: ".$contenttype);
 	// Security options
-	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+	header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 	//header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
-	if (! defined('FORCECSP'))
+	if (!defined('FORCECSP'))
 	{
 		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
 		//{
@@ -1124,15 +1124,15 @@ 
 		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
 		$hookmanager->initHooks("main");
 
-		$parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
-		$result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
-		else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy);
+		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
+		else $contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
 
-		if (! empty($contentsecuritypolicy))
+		if (!empty($contentsecuritypolicy))
 		{
 			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
 			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
@@ -1169,111 +1169,111 @@ 
  * @param   int     $disablenofollow Disable no follow tag
  * @return	void
  */
-function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $disablejmobile=0, $disablenofollow=0)
+function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disablejmobile = 0, $disablenofollow = 0)
 {
 	global $db, $conf, $langs, $user, $hookmanager;
 
 	top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
 
 	print '<!doctype html>'."\n";
 
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	else print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
-		$ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
+		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
 		print "<head>\n";
 
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		if (GETPOST('dol_basehref', 'alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
 
 		// Displays meta
 		print '<meta charset="UTF-8">'."\n";
-		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
-		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
+		print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',nofollow').'">'."\n"; // Do not index
+		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n"; // Scale for mobile device
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
 		// Favicon
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		$favicon = dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
+		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
+		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
 		// Auto refresh page
-		if (GETPOST('autorefresh','int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
+		if (GETPOST('autorefresh', 'int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
 
 		// Displays title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		$appli = constant('DOL_APPLICATION_TITLE');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
 		print '<title>';
-		$titletoshow='';
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
+		$titletoshow = '';
+		if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
 		else if ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
 		else $titletoshow = dol_htmlentities($appli);
 
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
 		$hookmanager->initHooks("main");
-		$parameters=array('title'=>$titletoshow);
-		$result=$hookmanager->executeHooks('setHtmlTitle',$parameters);		// Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
-		else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
+		$parameters = array('title'=>$titletoshow);
+		$result = $hookmanager->executeHooks('setHtmlTitle', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) $titletoshow = $hookmanager->resPrint; // Replace Title to show
+		else $titletoshow .= $hookmanager->resPrint; // Concat to Title to show
 
 		print $titletoshow;
 		print '</title>';
 
 		print "\n";
 
-		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+		if (GETPOST('version', 'int')) $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
+		if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) $ext .= '&testmenuhider='.(GETPOST('testmenuhider', 'int') ?GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
 
-		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-		$themeparam.=($ext?'&amp;'.$ext:'');
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-		if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-		if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+		$themeparam .= ($ext ? '&amp;'.$ext : '');
+		if (!empty($_SESSION['dol_resetcache'])) $themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		if (GETPOST('dol_hide_topmenu', 'int')) { $themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
+		if (GETPOST('dol_hide_leftmenu', 'int')) { $themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
+		if (GETPOST('dol_optimize_smallscreen', 'int')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
+		if (GETPOST('dol_no_mouse_hover', 'int')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
+		if (GETPOST('dol_use_jmobile', 'int')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
 
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
 		{
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'base';
 			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			if (!defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
+			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
 			{
-				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
 			}
 		}
 
-		if (! defined('DISABLE_FONT_AWSOME'))
+		if (!defined('DISABLE_FONT_AWSOME'))
 		{
 			print '<!-- Includes CSS for font awesome -->'."\n";
-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
 		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-		$themepath=dol_buildpath($conf->css,1);
-		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
+		$themepath = dol_buildpath($conf->css, 1);
+		$themesubdir = '';
+		if (!empty($conf->modules_parts['theme']))	// This slow down
 		{
-			foreach($conf->modules_parts['theme'] as $reldir)
+			foreach ($conf->modules_parts['theme'] as $reldir)
 			{
 				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 				{
-					$themepath=dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir=$reldir;
+					$themepath = dol_buildpath($reldir.$conf->css, 1);
+					$themesubdir = $reldir;
 					break;
 				}
 			}
@@ -1281,22 +1281,22 @@ 
 
 		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
 		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 
 		// CSS forced by modules (relative url starting with /)
-		if (! empty($conf->modules_parts['css']))
+		if (!empty($conf->modules_parts['css']))
 		{
-			$arraycss=(array) $conf->modules_parts['css'];
-			foreach($arraycss as $modcss => $filescss)
+			$arraycss = (array) $conf->modules_parts['css'];
+			foreach ($arraycss as $modcss => $filescss)
 			{
-				$filescss=(array) $filescss;	// To be sure filecss is an array
-				foreach($filescss as $cssfile)
+				$filescss = (array) $filescss; // To be sure filecss is an array
+				foreach ($filescss as $cssfile)
 				{
 					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
 					// cssfile is a relative path
-					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
+					print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile, 1);
 					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+					if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
 					print '">'."\n";
 				}
 			}
@@ -1304,137 +1304,137 @@ 
 		// CSS forced by page in top_htmlhead call (relative url starting with /)
 		if (is_array($arrayofcss))
 		{
-			foreach($arrayofcss as $cssfile)
+			foreach ($arrayofcss as $cssfile)
 			{
-				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile, 1);
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+				if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
 				print '">'."\n";
 			}
 		}
 
 		// Output standard javascript links
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+		if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax))
 		{
 			// JQuery. Must be before other includes
 			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (!empty($conf->global->MAIN_FEATURES_LEVEL) && !defined('JS_JQUERY_MIGRATE_DISABLED'))
 			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
 			{
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Flot
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
 			{
 				if (constant('JS_JQUERY_FLOT'))
 				{
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				}
 				else
 				{
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				}
 			}
 			// jQuery jeditable
-			if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
 			{
 				print '<!-- JS to manage editInPlace feature -->'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script type="text/javascript">'."\n";
 				print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
 				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
-				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
-				print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n"; // Added in title attribute of span
+				print 'var placeholderInPlace = \'&nbsp;\';'."\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
 				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
 				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
 				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
-				print 'var withInPlace = 300;';		// width in pixel for default string edit
+				print 'var withInPlace = 300;'; // width in pixel for default string edit
 				print '</script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
             // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
             }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
+            	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
             }
-            if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes
+            if (!defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
 		}
 
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
+        if (!$disablejs && !empty($conf->use_javascript_ajax))
         {
             // CKEditor
-            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
+            if (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
-                $jsckeditor='ckeditor.js';
+                $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
+                $jsckeditor = 'ckeditor.js';
                 if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
                 {
-                	$pathckeditor=constant('JS_CKEDITOR');
+                	$pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
+                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
                 print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print '</script>'."\n";
-                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
 
             // Browser notifications
-            if (! defined('DISABLE_BROWSER_NOTIF'))
+            if (!defined('DISABLE_BROWSER_NOTIF'))
             {
-                $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
+                if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
 
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
+        		$arrayjs = (array) $conf->modules_parts['js'];
+	            foreach ($arrayjs as $modjs => $filesjs)
 	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
+        			$filesjs = (array) $filesjs; // To be sure filejs is an array
+		            foreach ($filesjs as $jsfile)
 		            {
 	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
 		            }
 	            }
         	}
@@ -1442,27 +1442,27 @@ 
             if (is_array($arrayofjs))
             {
                 print '<!-- Includes JS added by page -->'."\n";
-                foreach($arrayofjs as $jsfile)
+                foreach ($arrayofjs as $jsfile)
                 {
-                    if (preg_match('/^http/i',$jsfile))
+                    if (preg_match('/^http/i', $jsfile))
                     {
                         print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
                     }
                     else
                     {
-                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
             }
         }
 
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+        if (!empty($head)) print $head."\n";
+        if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
 
         print "</head>\n\n";
     }
 
-    $conf->headerdone=1;	// To tell header was output
+    $conf->headerdone = 1; // To tell header was output
 }
 
 
@@ -1482,19 +1482,19 @@ 
  * 						                    For other external page: http://server/url
  *  @return		void
  */
-function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='')
+function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $helppagename = '')
 {
 	global $user, $conf, $langs, $db;
 	global $dolibarr_main_authentication, $dolibarr_main_demo;
-	global $hookmanager,$menumanager;
+	global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+	$searchform = '';
+	$bookmarks = '';
 
 	// Instantiate hooks of thirdparty module
 	$hookmanager->initHooks(array('toprightmenu'));
 
-	$toprightmenu='';
+	$toprightmenu = '';
 
 	// For backward compatibility with old modules
 	if (empty($conf->headerdone))
@@ -1506,49 +1506,49 @@ 
 	/*
      * Top menu
      */
-	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int')) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
 		print "\n".'<!-- Start top horizontal -->'."\n";
 
-		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">';		// dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 
 		// Show menu entries
-		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-		$menumanager->atarget=$target;
-		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
+		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
+		$menumanager->atarget = $target;
+		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // This contains a \n
 		print "</div>\n";
 
 		// Define link to login card
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+		$appli = constant('DOL_APPLICATION_TITLE');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 		{
-			$appli=$conf->global->MAIN_APPLICATION_TITLE;
+			$appli = $conf->global->MAIN_APPLICATION_TITLE;
 			if (preg_match('/\d\.\d/', $appli))
 			{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 			}
-			else $appli.=" ".DOL_VERSION;
+			else $appli .= " ".DOL_VERSION;
 		}
-		else $appli.=" ".DOL_VERSION;
+		else $appli .= " ".DOL_VERSION;
 
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
-		$logouttext='';
+		$logouttext = '';
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		{
 			//$logouthtmltext=$appli.'<br>';
 			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
 			{
-				$logouthtmltext.=$langs->trans("Logout").'<br>';
+				$logouthtmltext .= $langs->trans("Logout").'<br>';
 
-				$logouttext .='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
+				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
 				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-				$logouttext .='</a>';
+				$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
+				$logouttext .= '</a>';
 			}
 			else
 			{
-				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 			}
 		}
@@ -1556,60 +1556,60 @@ 
 		print '<div class="login_block">'."\n";
 
 		// Add login user link
-		$toprightmenu.='<div class="login_block_user">';
+		$toprightmenu .= '<div class="login_block_user">';
 
 		// Login name with photo and tooltip
-		$mode=-1;
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-		$toprightmenu.=$user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-		$toprightmenu.='</div></div>';
+		$mode = -1;
+		$toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+		$toprightmenu .= $user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');
+		$toprightmenu .= '</div></div>';
 
-		$toprightmenu.='</div>'."\n";
+		$toprightmenu .= '</div>'."\n";
 
-		$toprightmenu.='<div class="login_block_other">';
+		$toprightmenu .= '<div class="login_block_other">';
 
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-		$parameters=array();
-		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array();
+		$result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
 			if ($result == 0)
-				$toprightmenu.=$hookmanager->resPrint;		// add
+				$toprightmenu .= $hookmanager->resPrint; // add
 			else
-				$toprightmenu=$hookmanager->resPrint;						// replace
+				$toprightmenu = $hookmanager->resPrint; // replace
 		}
 		else
 		{
-			$toprightmenu.=$result;	// For backward compatibility
+			$toprightmenu .= $result; // For backward compatibility
 		}
 
 		// Link to module builder
-		if (! empty($conf->modulebuilder->enabled))
+		if (!empty($conf->modulebuilder->enabled))
 		{
-			$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+			$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-bug atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+			$text .= '<span class="fa fa-bug atoplogin"></span>';
+			$text .= '</a>';
+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to print main content area
 		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
 		{
-			$qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			if (is_array($_POST))
 			{
-				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+				foreach ($_POST as $key=>$value) {
+					if ($key !== 'action' && $key !== 'password' && !is_array($value)) $qs .= '&'.$key.'='.urlencode($value);
 				}
 			}
-			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-			$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+			$qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+			$text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-print atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+			$text .= '<span class="fa fa-print atoplogin"></span>';
+			$text .= '</a>';
+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to Dolibarr wiki pages
@@ -1617,51 +1617,51 @@ 
 		{
 			$langs->load("help");
 
-			$helpbaseurl='';
-			$helppage='';
-			$mode='';
+			$helpbaseurl = '';
+			$helppage = '';
+			$mode = '';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
-			$arrayres=getHelpParamFor($helppagename,$langs);
-			$helpbaseurl=$arrayres['helpbaseurl'];
-			$helppage=$arrayres['helppage'];
-			$mode=$arrayres['mode'];
+			$arrayres = getHelpParamFor($helppagename, $langs);
+			$helpbaseurl = $arrayres['helpbaseurl'];
+			$helppage = $arrayres['helppage'];
+			$mode = $arrayres['mode'];
 
 			// Link to help pages
 			if ($helpbaseurl && $helppage)
 			{
-				$text='';
-	            if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
+				$text = '';
+	            if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                     $langs->load('admin');
-                    $appli .= '<br>' . $langs->trans("Database") . ': ' . $db->database_name;
+                    $appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
                 }
-				$title=$appli.'<br>';
-				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-				$text.='<a class="help" target="_blank" rel="noopener" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl,$helppage);
-				$text.='">';
+				$title = $appli.'<br>';
+				$title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
+				if ($mode == 'wiki') $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
+				$text .= '<a class="help" target="_blank" rel="noopener" href="';
+				if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+				else $text .= sprintf($helpbaseurl, $helppage);
+				$text .= '">';
 				//$text.=img_picto('', 'helpdoc_top').' ';
-				$text.='<span class="fa fa-question-circle atoplogin"></span>';
+				$text .= '<span class="fa fa-question-circle atoplogin"></span>';
 				//$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
 				//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
-				$text.='</a>';
+				$text .= '</a>';
 				//$toprightmenu.='</div>'."\n";
-				$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
 		}
 
 		// Logout link
-		$toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+		$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 
-		$toprightmenu.='</div>';
+		$toprightmenu .= '</div>';
 
 		print $toprightmenu;
 
-		print "</div>\n";		// end div class="login_block"
+		print "</div>\n"; // end div class="login_block"
 
 		print '</div></div>';
 
@@ -1669,7 +1669,7 @@ 
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
 }
 
 
@@ -1687,87 +1687,87 @@ 
  *  @param  string  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
  *  @return	void
  */
-function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
+function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_array_after = '', $leftmenuwithoutmainarea = 0, $title = '', $acceptdelayedhtml = 0)
 {
 	global $user, $conf, $langs, $db, $form;
 	global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+	$searchform = '';
+	$bookmarks = '';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (!empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
 		// Instantiate hooks of thirdparty module
-		$hookmanager->initHooks(array('searchform','leftblock'));
+		$hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
 		print "\n";
 
-		if (! is_object($form)) $form=new Form($db);
-		$selected=-1;
-		$usedbyinclude=1;
-		include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
+		if (!is_object($form)) $form = new Form($db);
+		$selected = -1;
+		$usedbyinclude = 1;
+		include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
 			//$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-			$searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+			$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
 		}
 		else
 		{
-			foreach($arrayresult as $key => $val)
+			foreach ($arrayresult as $key => $val)
 			{
 				//$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleft', img_picto('',$val['img']));
-				$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
+				$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft', img_picto('', $val['img'], '', false, 1, 1));
 			}
 		}
 
 		// Execute hook printSearchForm
-		$parameters=array('searchform'=>$searchform);
-		$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('searchform'=>$searchform);
+		$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
-			$searchform.=$hookmanager->resPrint;
+			$searchform .= $hookmanager->resPrint;
 		}
-		else $searchform=$hookmanager->resPrint;
+		else $searchform = $hookmanager->resPrint;
 
 		// Force special value for $searchform
-		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
 		{
-			$urltosearch=DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
+			$urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
+			$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
 		}
-		elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+		elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-			$searchform.='<script type="text/javascript">
+			$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+			$searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-			$searchform.='</div>';
+			$searchform .= '</div>';
 		}
 
 		// Define $bookmarks
-		if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+		if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
 		{
 			include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
 			$langs->load("bookmarks");
 
-			$bookmarks=printBookmarksList($db, $langs);
+			$bookmarks = printBookmarksList($db, $langs);
 		}
 
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 		// Show left menu with other forms
 		$menumanager->menu_array = $menu_array_before;
@@ -1782,25 +1782,25 @@ 
 		// Version
 		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
 		{
-			$doliurl='https://www.dolibarr.org';
+			$doliurl = 'https://www.dolibarr.org';
 			//local communities
-			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-
-			$appli=constant('DOL_APPLICATION_TITLE');
-			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+			if (preg_match('/fr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.fr';
+			if (preg_match('/es/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.es';
+			if (preg_match('/de/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.de';
+			if (preg_match('/it/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.it';
+			if (preg_match('/gr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.gr';
+
+			$appli = constant('DOL_APPLICATION_TITLE');
+			if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 			{
-				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+				$appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = '';
 				if (preg_match('/\d\.\d/', $appli))
 				{
-					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 				}
-				else $appli.=" ".DOL_VERSION;
+				else $appli .= " ".DOL_VERSION;
 			}
-			else $appli.=" ".DOL_VERSION;
+			else $appli .= " ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
 			else print '<span class="help">';
@@ -1811,25 +1811,25 @@ 
 		}
 
 		// Link to bugtrack
-		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
-			$bugbaseurl.= '?title=';
-			$bugbaseurl.= urlencode("Bug: ");
-			$bugbaseurl.= '&body=';
-			$bugbaseurl.= urlencode("# Bug\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Environment\n");
-			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
-			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
-			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Report\n");
+			$bugbaseurl .= '?title=';
+			$bugbaseurl .= urlencode("Bug: ");
+			$bugbaseurl .= '&body=';
+			$bugbaseurl .= urlencode("# Bug\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Environment\n");
+			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+			$bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
 			print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';
@@ -1844,11 +1844,11 @@ 
 		print "\n";
 
 		// Execute hook printLeftBlock
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
 
-		print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
+		print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
 	}
 
 	print "\n";
@@ -1864,7 +1864,7 @@ 
  *  @param	string	$title		Title
  *  @return	void
  */
-function main_area($title='')
+function main_area($title = '')
 {
 	global $conf, $langs;
 
@@ -1874,7 +1874,7 @@ 
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
 
@@ -1885,40 +1885,40 @@ 
  *  @param  Translate	$langs				Language
  *  @return	array		Array of help urls
  */
-function getHelpParamFor($helppagename,$langs)
+function getHelpParamFor($helppagename, $langs)
 {
-	$helpbaseurl='';
-	$helppage='';
-	$mode='';
+	$helpbaseurl = '';
+	$helppage = '';
+	$mode = '';
 
-	if (preg_match('/^http/i',$helppagename))
+	if (preg_match('/^http/i', $helppagename))
 	{
 		// If complete URL
-		$helpbaseurl='%s';
-		$helppage=$helppagename;
-		$mode='local';
+		$helpbaseurl = '%s';
+		$helppage = $helppagename;
+		$mode = 'local';
 	}
 	else
 	{
 		// If WIKI URL
-		if (preg_match('/^es/i',$langs->defaultlang))
+		if (preg_match('/^es/i', $langs->defaultlang))
 		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
 		}
-		if (preg_match('/^fr/i',$langs->defaultlang))
+		if (preg_match('/^fr/i', $langs->defaultlang))
 		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
 		}
 		if (empty($helppage))	// If help page not already found
 		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
 		}
-		$mode='wiki';
+		$mode = 'wiki';
 	}
-	return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
+	return array('helpbaseurl'=>$helpbaseurl, 'helppage'=>$helppage, 'mode'=>$mode);
 }
 
 
@@ -1937,31 +1937,31 @@ 
  *  @param	string	$showtitlebefore	Show title before input text instead of into placeholder. This can be set when output is dedicated for text browsers.
  *  @return	string
  */
-function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='', $showtitlebefore=0)
+function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey = '', $prefhtmlinputname = '', $img = '', $showtitlebefore = 0)
 {
-	global $conf,$langs,$user;
-
-	$ret='';
-	$ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
-	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$ret.='<input type="hidden" name="mode" value="search">';
-	$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	if ($showtitlebefore) $ret.=$title.' ';
-	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-	$ret.=' placeholder="'.strip_tags($title).'"';
-	$ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+	global $conf, $langs, $user;
+
+	$ret = '';
+	$ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+	$ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	$ret .= '<input type="hidden" name="mode" value="search">';
+	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
+	if ($showtitlebefore) $ret .= $title.' ';
+	$ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+	$ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+	$ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+	$ret .= ' placeholder="'.strip_tags($title).'"';
+	$ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
 	//$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-	$ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
-	$ret.='<span class="fa fa-search"></span>';
-	$ret.='</button>';
-	$ret.="</form>\n";
+	$ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
+	$ret .= '<span class="fa fa-search"></span>';
+	$ret .= '</button>';
+	$ret .= "</form>\n";
 	return $ret;
 }
 
 
-if (! function_exists("llxFooter"))
+if (!function_exists("llxFooter"))
 {
 	/**
 	 * Show HTML footer
@@ -1973,31 +1973,31 @@ 
 	 * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
 	 * @return	void
 	 */
-	function llxFooter($comment='',$zone='private', $disabledoutputofmessages=0)
+	function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 	{
 		global $conf, $langs, $user, $object;
 		global $delayedhtmlcontent;
 		global $contextpage, $page, $limit;
 
-		$ext='layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
+		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
 		// Global html output events ($mesgs, $errors, $warnings)
 		dol_htmloutput_events($disabledoutputofmessages);
 
 		// Code for search criteria persistence.
 		// $user->lastsearch_values was set by the GETPOST when form field search_xxx exists
-		if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+		if (is_object($user) && !empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
 		{
 			// Clean and save data
-			foreach($user->lastsearch_values_tmp as $key => $val)
+			foreach ($user->lastsearch_values_tmp as $key => $val)
 			{
-				unset($_SESSION['lastsearch_values_tmp_'.$key]);			// Clean array to rebuild it just after
+				unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
 				if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
 				{
 					if (empty($val['sortfield'])) unset($val['sortfield']);
 					if (empty($val['sortorder'])) unset($val['sortorder']);
 					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
-					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+					$_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
 					unset($_SESSION['lastsearch_values_'.$key]);
 				}
 			}
@@ -2006,7 +2006,7 @@ 
 
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		if (preg_match('/list\.php$/', $relativepathstring))
@@ -2015,9 +2015,9 @@ 
 			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
-			if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
-			if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
-			if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
+			if (!empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
+			if (!empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
+			if (!empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
@@ -2025,7 +2025,7 @@ 
 		}
 
 		// Core error message
-		if (! empty($conf->global->MAIN_CORE_ERROR))
+		if (!empty($conf->global->MAIN_CORE_ERROR))
 		{
 			// Ajax version
 			if ($conf->use_javascript_ajax)
@@ -2049,23 +2049,23 @@ 
 
 		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n"; // End div container
 
 		print "\n";
 		if ($comment) print '<!-- '.$comment.' -->'."\n";
 
 		printCommonFooter($zone);
 
-		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+		if (!empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
-		if (! empty($conf->use_javascript_ajax))
+		if (!empty($conf->use_javascript_ajax))
 		{
 			print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 		}
 
 		// Wrapper to add log when clicking on download or preview
-		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+		if (!empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
 		{
 			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
 			{

Braces +533 added lines, -211 removed lines

@@ -48,7 +48,8 @@ 
 }
 
 // Removed magic_quotes
-if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
+if (function_exists('get_magic_quotes_gpc')) {
+    // magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
 	if (get_magic_quotes_gpc())
 	{
@@ -59,6 +60,7 @@ 
 		function stripslashes_deep($value)
 		{
 			return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
+}
 		}
 		$_GET     = array_map('stripslashes_deep', $_GET);
 		$_POST    = array_map('stripslashes_deep', $_POST);
@@ -109,9 +111,11 @@ 
 	{
 		$inj += preg_match('/select|update|delete|replace|group\s+by|concat|count|from/i',	 $val);
 	}
-	if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
+	if ($type != 2) {
+	    // Not common key strings, so we can check them both on GET and POST
 	{
 		$inj += preg_match('/updatexml\(/i', 	 $val);
+	}
 		$inj += preg_match('/update.+set.+=/i',  $val);
 		$inj += preg_match('/union.+select/i', 	 $val);
 		$inj += preg_match('/(\.\.%2f)+/i',		 $val);
@@ -125,7 +129,9 @@ 
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/<audio/i', $val);
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	if (! defined('NOSTYLECHECK')) {
+	    $inj += preg_match('/<style/i', $val);
+	}
 	$inj += preg_match('/base[\s]+href/si', $val);
 	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
@@ -142,8 +148,14 @@ 
 		$inj += preg_match('/vbscript:/i', $val);
 	//}
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+	if ($type == 1) {
+	    $inj += preg_match('/"/i', $val);
+	}
+	// We refused " in GET parameters value
+	if ($type == 2) {
+	    $inj += preg_match('/[;"]/', $val);
+	}
+	// PHP_SELF is a file system path. It can contains spaces.
 	return $inj;
 }
 
@@ -158,7 +170,8 @@ 
 {
 	if (is_array($var))
 	{
-		foreach ($var as $key => $value)	// Warning, $key may also be used for attacks
+		foreach ($var as $key => $value) {
+		    // Warning, $key may also be used for attacks
 		{
 			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
 			{
@@ -167,12 +180,12 @@ 
 			else
 			{
 				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
+		}
 				exit;
 			}
 		}
 		return true;
-	}
-	else
+	} else
 	{
 		return (testSqlAndScriptInject($var, $type) <= 0);
 	}
@@ -225,14 +238,18 @@ 
 	{
 		$postkey=$tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		if (! empty($_POST[$postkey])) {
+		    $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		}
 	}
 	$cookiename=$tmpautoset[0];
 	$cookievalue=json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
 	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
-	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
-}
+	if (empty($cookievalue)) {
+	    unset($_COOKIE[$cookiename]);
+	}
+	}
 
 
 // Init session. Name of session is specific to Dolibarr instance.
@@ -241,7 +258,9 @@ 
 
 $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+if (! empty($_COOKIE[$sessiontimeout])) {
+    ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock, released when session_write_close() or end of page.
@@ -274,9 +293,13 @@ 
 	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
-}
+	if ($conf->browser->layout == 'phone') {
+	    $conf->dol_no_mouse_hover=1;
+	}
+	if ($conf->browser->layout == 'phone') {
+	    $conf->global->MAIN_TESTMENUHIDER=1;
+	}
+	}
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -285,19 +308,19 @@ 
 	$newurl='';
 	if (is_numeric($conf->file->main_force_https))
 	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"])) {
+		    // If SCRIPT_URI supported by server
 		{
 			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
 			{
 				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
-			}
 		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
+			}
+		} else	// Check HTTPS environment variable (Apache/mod_ssl only)
 		{
 			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
-	}
-	else
+	} else
 	{
 		// Check HTTPS environment variable (Apache/mod_ssl only)
 		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
@@ -308,8 +331,7 @@ 
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
 	}
@@ -336,8 +358,14 @@ 
 }
 
 // Loading of additional presentation includes
-if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';	// Need 22ko memory
+if (! defined('NOREQUIREHTML')) {
+    require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
@@ -355,9 +383,11 @@ 
 	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
 	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
 	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
-	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
+	if ($rescomp > 0) {
+	    // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
 	{
 		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+	}
 		header("Location: ".DOL_URL_ROOT."/install/index.php");
 		exit;
 	}
@@ -367,26 +397,32 @@ 
 if (! defined('NOTOKENRENEWAL'))
 {
 	// roulement des jetons car cree a chaque appel
-	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+	if (isset($_SESSION['newtoken'])) {
+	    $_SESSION['token'] = $_SESSION['newtoken'];
+	}
 
 	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
 	$token = dol_hash(uniqid(mt_rand(), true)); // Generates a hash of a random number
 	$_SESSION['newtoken'] = $token;
 }
 if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
-	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
+	|| defined('CSRFCHECK_WITH_TOKEN')) {
+    // Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
 {
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
 	{
 		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+}
 		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
 		die;
 	}
-	if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+	if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+	    // This test must be after loading $_SESSION['token'].
 	{
 		if (GETPOST('token', 'alpha') != $_SESSION['token'])
 		{
 			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+	}
 			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
 			unset($_POST);
 		}
@@ -394,7 +430,9 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
+if (GETPOST('disablemodules','alpha')) {
+    $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
+}
 if (! empty($_SESSION["disablemodules"]))
 {
 	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
@@ -402,11 +440,15 @@ 
 	{
 		if ($module)
 		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();
+			if (empty($conf->$module)) {
+			    $conf->$module=new stdClass();
+			}
 			$conf->$module->enabled=false;
-			if ($module == 'fournisseur')		// Special case
+			if ($module == 'fournisseur') {
+			    // Special case
 			{
 				$conf->supplier_order->enabled=0;
+			}
 				$conf->supplier_invoice->enabled=0;
 			}
 		}
@@ -425,13 +467,16 @@ 
 	if (defined('MAIN_AUTHENTICATION_MODE'))
 	{
 		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
-	}
-	else
+	} else
 	{
 		// Authentication mode
-		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+		if (empty($dolibarr_main_authentication)) {
+		    $dolibarr_main_authentication='http,dolibarr';
+		}
 		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+		    $dolibarr_auto_user='auto';
+		}
 	}
 	// Set authmode
 	$authmode=explode(',',$dolibarr_main_authentication);
@@ -467,11 +512,13 @@ 
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') {
+		    // We ask index page
 		{
 			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
 			{
 				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+		}
 				$url='';
 				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
 				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
@@ -516,30 +563,44 @@ 
 				$hookmanager->initHooks(array('login'));
 				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+				    $error++;
+				}
 
 				// Note: exit is done later
 			}
 		}
 
 		$allowedmethodtopostusername = 2;
-		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
+		    $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+		}
 		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",$allowedmethodtopostusername));
 		$passwordtotest	= GETPOST('password','none',$allowedmethodtopostusername);
 		$entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
 		// Define if we received data to test the login.
 		$goontestloop=false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-		if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) {
+		    $goontestloop=true;
+		}
+		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) {
+		    $goontestloop=true;
+		}
+		if (GETPOST("username","alpha",$allowedmethodtopostusername) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) {
+		    $goontestloop=true;
+		}
 
-		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+		if (! is_object($langs)) {
+		    // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+		}
 			$langs=new Translate("",$conf);
 			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-			if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+			if (defined('MAIN_LANG_DEFAULT')) {
+			    $langcode=constant('MAIN_LANG_DEFAULT');
+			}
 			$langs->setDefaultLang($langcode);
 		}
 
@@ -564,7 +625,9 @@ 
 					$datenow=dol_now();
 					$datefirst=dol_stringtotime($_POST["dst_first"]);
 					$datesecond=dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+					if ($datenow >= $datefirst && $datenow < $datesecond) {
+					    $dol_dst=1;
+					}
 				}
 				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
 			}
@@ -577,7 +640,9 @@ 
 
 				// Bad password. No authmode has found a good password.
 				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				if (empty($_SESSION["dol_loginmesg"])) {
+				    $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				}
 
 				// Call trigger for the "security events" log
 				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
@@ -595,19 +660,26 @@ 
 				$hookmanager->initHooks(array('login'));
 				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+				    $error++;
+				}
 
 				// Note: exit is done in next chapter
 			}
 		}
 
 		// End test login / passwords
-		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest))) {
+		    // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 		{
 			// No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
-			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+		}
+			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+			    return 'ERROR_NOT_LOGGED';
+			} else {
+			    dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+			}
 			exit;
 		}
 
@@ -650,17 +722,24 @@ 
 			$hookmanager->initHooks(array('login'));
 			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+			    $error++;
+			}
 
 			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			if (GETPOST('textbrowser','int')) {
+			    $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+			}
+			if (GETPOST('nojs','int')) {
+			    $paramsurl[]='nojs='.GETPOST('nojs','int');
+			}
+			if (GETPOST('lang','aZ09')) {
+			    $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			}
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
 			exit;
 		}
-	}
-	else
+	} else
 	{
 		// We are already into an authenticated session
 		$login=$_SESSION["dol_login"];
@@ -707,27 +786,38 @@ 
 			$hookmanager->initHooks(array('login'));
 			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+			    $error++;
+			}
 
 			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			if (GETPOST('textbrowser','int')) {
+			    $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+			}
+			if (GETPOST('nojs','int')) {
+			    $paramsurl[]='nojs='.GETPOST('nojs','int');
+			}
+			if (GETPOST('lang','aZ09')) {
+			    $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			}
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
 			exit;
-		}
-		else
+		} else
 		{
 		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		    $hookmanager->initHooks(array('main'));
 
 		    // Code for search criteria persistence.
-		    if (! empty($_GET['save_lastsearch_values']))    // We must use $_GET here
+		    if (! empty($_GET['save_lastsearch_values'])) {
+		        // We must use $_GET here
 		    {
 			    $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+		    }
 			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
 			    // Clean $relativepathstring
-   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   			    if (constant('DOL_URL_ROOT')) {
+   			        $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   			    }
 			    $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 			    $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 			    //var_dump($relativepathstring);
@@ -784,11 +874,21 @@ 
 		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
 		$_SESSION["dol_entity"]=$conf->entity;
 		// Store value into session (values stored only if defined)
-		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+		if (! empty($dol_hide_topmenu)) {
+		    $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
+		}
+		if (! empty($dol_hide_leftmenu)) {
+		    $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
+		}
+		if (! empty($dol_optimize_smallscreen)) {
+		    $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
+		}
+		if (! empty($dol_no_mouse_hover)) {
+		    $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
+		}
+		if (! empty($dol_use_jmobile)) {
+		    $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+		}
 
 		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -814,7 +914,9 @@ 
 		$hookmanager->initHooks(array('login'));
 		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
 		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0) $error++;
+		if ($reshook < 0) {
+		    $error++;
+		}
 
 		if ($error)
 		{
@@ -822,20 +924,23 @@ 
 			session_destroy();
 			dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
 			exit;
-		}
-		else
+		} else
 		{
 			$db->commit();
 		}
 
 		// Change landing page if defined.
 		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-		if (! empty($landingpage))    // Example: /index.php
+		if (! empty($landingpage)) {
+		    // Example: /index.php
 		{
 			$newpath=dol_buildpath($landingpage, 1);
-			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
+		}
+			if ($_SERVER["PHP_SELF"] != $newpath) {
+			    // not already on landing page (avoid infinite loop)
 			{
 				header('Location: '.$newpath);
+			}
 				exit;
 			}
 		}
@@ -858,8 +963,14 @@ 
      */
 
 	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+	    $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+	}
+	// Can be 0
+	if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+	    $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+	}
+	// Can be 0
 
 	// Replace conf->css by personalized value if theme not forced
 	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
@@ -878,31 +989,47 @@ 
 
 
 // Set javascript option
-if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
+if (! GETPOST('nojs','int')) {
+    // If javascript was not disabled on URL
 {
 	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
 		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+}
 	}
+} else {
+    $conf->use_javascript_ajax=0;
 }
-else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+    // If we must enable text browser
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
-elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+} elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu'])) {
+    $conf->dol_hide_leftmenu=1;
+}
+if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu'])) {
+    $conf->dol_hide_topmenu=1;
+}
+if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) {
+    $conf->dol_optimize_smallscreen=1;
+}
+if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover'])) {
+    $conf->dol_no_mouse_hover=1;
+}
+if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile'])) {
+    $conf->dol_use_jmobile=1;
+}
+if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+    $conf->dol_no_mouse_hover=1;
+}
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
 	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
@@ -911,7 +1038,9 @@ 
 	$conf->dol_optimize_smallscreen=1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (! empty($conf->dol_use_jmobile)) {
+    $conf->use_javascript_ajax=1;
+}
 // Replace themes bugged with jmobile with eldy
 if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
 {
@@ -921,7 +1050,8 @@ 
 
 if (! defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+	if (! GETPOST('lang','aZ09')) {
+	    // If language was not forced on URL
 	{
 		// If user has chosen its own language
 		if (! empty($user->conf->MAIN_LANG_DEFAULT))
@@ -931,6 +1061,7 @@ 
 			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
 			{
 				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+	}
 			}
 		}
 	}
@@ -940,7 +1071,9 @@ 
 {
 	// If the login is not recovered, it is identified with an account that does not exist.
 	// Hacking attempt?
-	if (! $user->login) accessforbidden();
+	if (! $user->login) {
+	    accessforbidden();
+	}
 
 	// Check if user is active
 	if ($user->statut < 1)
@@ -991,8 +1124,7 @@ 
 	define('ROWS_7',7);
 	define('ROWS_8',8);
 	define('ROWS_9',9);
-}
-else
+} else
 {
 	define('ROWS_1',0);
 	define('ROWS_2',1);
@@ -1010,18 +1142,22 @@ 
 // Init menu manager
 if (! defined('NOREQUIREMENU'))
 {
-	if (empty($user->societe_id))    // If internal user or not defined
+	if (empty($user->societe_id)) {
+	    // If internal user or not defined
 	{
 		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
-	else                        // If external user
+	} else                        // If external user
 	{
 		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
 	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
+	if (GETPOST('menu','alpha')) {
+	    $file_menu=GETPOST('menu','alpha');
+	}
+	// example: menu=eldy_menu.php
 	if (! class_exists('MenuManager'))
 	{
 		$menufound=0;
@@ -1029,11 +1165,15 @@ 
 		foreach($dirmenus as $dirmenu)
 		{
 			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-			if (class_exists('MenuManager')) break;
+			if (class_exists('MenuManager')) {
+			    break;
+			}
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (! class_exists('MenuManager')) {
+		    // If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+		}
 			$file_menu='eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
@@ -1108,8 +1248,11 @@ 
 {
 	global $db, $conf, $hookmanager;
 
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-	else header("Content-Type: ".$contenttype);
+	if ($contenttype == 'text/html' ) {
+	    header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	} else {
+	    header("Content-Type: ".$contenttype);
+	}
 	// Security options
 	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
 	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
@@ -1124,13 +1267,21 @@ 
 		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+		if (! is_object($hookmanager)) {
+		    $hookmanager = new HookManager($db);
+		}
 		$hookmanager->initHooks("main");
 
 		$parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
 		$result=$hookmanager->executeHooks('setContentSecurityPolicy',$parameters);    // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
-		else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
+		if ($result > 0) {
+		    $contentsecuritypolicy = $hookmanager->resPrint;
+		}
+		// Replace CSP
+		else {
+		    $contentsecuritypolicy .= $hookmanager->resPrint;
+		}
+		// Concat CSP
 
 		if (! empty($contentsecuritypolicy))
 		{
@@ -1144,8 +1295,7 @@ 
 			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
-	}
-	elseif (constant('FORCECSP'))
+	} elseif (constant('FORCECSP'))
 	{
 		header("Content-Security-Policy: ".constant('FORCECSP'));
 	}
@@ -1175,12 +1325,18 @@ 
 
 	top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+	if (empty($conf->css)) {
+	    $conf->css = '/theme/eldy/style.css.php';
+	}
+	// If not defined, eldy by default
 
 	print '<!doctype html>'."\n";
 
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+	    print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	} else {
+	    print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	}
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
@@ -1188,7 +1344,9 @@ 
 
 		print "<head>\n";
 
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		if (GETPOST('dol_basehref','alpha')) {
+		    print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		}
 
 		// Displays meta
 		print '<meta charset="UTF-8">'."\n";
@@ -1198,43 +1356,71 @@ 
 
 		// Favicon
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		if (! empty($conf->global->MAIN_FAVICON_URL)) {
+		    $favicon=$conf->global->MAIN_FAVICON_URL;
+		}
+		if (empty($conf->dol_use_jmobile)) {
+		    print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
+		}
+		// Not required into an Android webview
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
 		// Auto refresh page
-		if (GETPOST('autorefresh','int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
+		if (GETPOST('autorefresh','int') > 0) {
+		    print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh','int').'">';
+		}
 
 		// Displays title
 		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		}
 
 		print '<title>';
 		$titletoshow='';
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
-		else if ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
-		else $titletoshow = dol_htmlentities($appli);
+		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) {
+		    $titletoshow = dol_htmlentities($title);
+		} else if ($title) {
+		    $titletoshow = dol_htmlentities($appli.' - '.$title);
+		} else {
+		    $titletoshow = dol_htmlentities($appli);
+		}
 
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+		if (! is_object($hookmanager)) {
+		    $hookmanager = new HookManager($db);
+		}
 		$hookmanager->initHooks("main");
 		$parameters=array('title'=>$titletoshow);
 		$result=$hookmanager->executeHooks('setHtmlTitle',$parameters);		// Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
-		else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
+		if ($result > 0) {
+		    $titletoshow = $hookmanager->resPrint;
+		}
+		// Replace Title to show
+		else {
+		    $titletoshow .= $hookmanager->resPrint;
+		}
+		// Concat to Title to show
 
 		print $titletoshow;
 		print '</title>';
 
 		print "\n";
 
-		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+		if (GETPOST('version','int')) {
+		    $ext='version='.GETPOST('version','int');
+		}
+		// usefull to force no cache on css/js
+		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) {
+		    $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+		}
 
 		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
 		$themeparam.=($ext?'&amp;'.$ext:'');
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		if (! empty($_SESSION['dol_resetcache'])) {
+		    $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		}
 		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
 		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
 		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
@@ -1245,13 +1431,26 @@ 
 		{
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'base';
-			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+			    $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+			}
+			if (constant('JS_JQUERY_UI')) {
+			    print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// JQuery
+			else {
+			    print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// JQuery
+			if (! defined('DISABLE_JQUERY_JNOTIFY')) {
+			    print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// JNotify
+			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+			    // jQuery plugin "mutiselect", "multiple-select", "select2"...
 			{
 				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+			}
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
 			}
 		}
@@ -1266,13 +1465,15 @@ 
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
 		$themepath=dol_buildpath($conf->css,1);
 		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
+		if (! empty($conf->modules_parts['theme'])) {
+		    // This slow down
 		{
 			foreach($conf->modules_parts['theme'] as $reldir)
 			{
 				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 				{
 					$themepath=dol_buildpath($reldir.$conf->css, 1);
+		}
 					$themesubdir=$reldir;
 					break;
 				}
@@ -1281,7 +1482,9 @@ 
 
 		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
 		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+		    print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		}
 
 		// CSS forced by modules (relative url starting with /)
 		if (! empty($conf->modules_parts['css']))
@@ -1292,11 +1495,15 @@ 
 				$filescss=(array) $filescss;	// To be sure filecss is an array
 				foreach($filescss as $cssfile)
 				{
-					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+					if (empty($cssfile)) {
+					    dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+					}
 					// cssfile is a relative path
 					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
 					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+					if (!preg_match('/\.css$/i',$cssfile)) {
+					    print $themeparam;
+					}
 					print '">'."\n";
 				}
 			}
@@ -1308,7 +1515,9 @@ 
 			{
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+				if (!preg_match('/\.css$/i',$cssfile)) {
+				    print $themeparam;
+				}
 				print '">'."\n";
 			}
 		}
@@ -1318,16 +1527,27 @@ 
 		{
 			// JQuery. Must be before other includes
 			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
+			    print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			} else {
+			    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
 			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
 			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) {
+				    print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				} else {
+				    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				}
+			}
+			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+			    print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			} else {
+			    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+			if (! defined('DISABLE_JQUERY_TABLEDND')) {
+			    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 			// jQuery jnotify
 			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
 			{
@@ -1341,8 +1561,7 @@ 
 					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				}
-				else
+				} else
 				{
 					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1375,15 +1594,19 @@ 
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+                // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            }
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
             }
-            if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes
+            if (! defined('DISABLE_MULTISELECT')) {
+                // jQuery plugin "mutiselect" to select with checkboxes
             {
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
+            }
 		}
 
         if (! $disablejs && ! empty($conf->use_javascript_ajax))
@@ -1394,10 +1617,12 @@ 
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
                 $jsckeditor='ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
+                if (constant('JS_CKEDITOR')) {
+                    // To use external ckeditor 4 js lib
                 {
                 	$pathckeditor=constant('JS_CKEDITOR');
                 }
+                }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
                 print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
@@ -1411,8 +1636,12 @@ 
             if (! defined('DISABLE_BROWSER_NOTIF'))
             {
                 $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                    $enablebrowsernotif=true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                    $enablebrowsernotif=false;
+                }
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
@@ -1425,9 +1654,11 @@ 
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (! empty($conf->modules_parts['js'])) {
+                // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
         		$arrayjs=(array) $conf->modules_parts['js'];
+            }
 	            foreach($arrayjs as $modjs => $filesjs)
 	            {
         			$filesjs=(array) $filesjs;	// To be sure filejs is an array
@@ -1447,8 +1678,7 @@ 
                     if (preg_match('/^http/i',$jsfile))
                     {
                         print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
+                    } else
                     {
                         print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
                     }
@@ -1456,8 +1686,12 @@ 
             }
         }
 
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+        if (! empty($head)) {
+            print $head."\n";
+        }
+        if (! empty($conf->global->MAIN_HTML_HEADER)) {
+            print $conf->global->MAIN_HTML_HEADER."\n";
+        }
 
         print "</head>\n\n";
     }
@@ -1525,13 +1759,20 @@ 
 			$appli=$conf->global->MAIN_APPLICATION_TITLE;
 			if (preg_match('/\d\.\d/', $appli))
 			{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+				    $appli.=" (".DOL_VERSION.")";
+				}
+				// If new title contains a version that is different than core
+			} else {
+			    $appli.=" ".DOL_VERSION;
 			}
-			else $appli.=" ".DOL_VERSION;
+		} else {
+		    $appli.=" ".DOL_VERSION;
 		}
-		else $appli.=" ".DOL_VERSION;
 
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {
+		    $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		}
 
 		$logouttext='';
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -1545,8 +1786,7 @@ 
 				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
 				$logouttext .='</a>';
-			}
-			else
+			} else
 			{
 				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
@@ -1573,12 +1813,15 @@ 
 		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
-			if ($result == 0)
-				$toprightmenu.=$hookmanager->resPrint;		// add
-			else
-				$toprightmenu=$hookmanager->resPrint;						// replace
-		}
-		else
+			if ($result == 0) {
+							$toprightmenu.=$hookmanager->resPrint;
+			}
+			// add
+			else {
+							$toprightmenu=$hookmanager->resPrint;
+			}
+			// replace
+		} else
 		{
 			$toprightmenu.=$result;	// For backward compatibility
 		}
@@ -1601,7 +1844,9 @@ 
 			if (is_array($_POST))
 			{
 				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+					if ($key!=='action' && $key!=='password' && !is_array($value)) {
+					    $qs.='&'.$key.'='.urlencode($value);
+					}
 				}
 			}
 			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
@@ -1621,7 +1866,9 @@ 
 			$helppage='';
 			$mode='';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) {
+			    $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			}
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
 			$arrayres=getHelpParamFor($helppagename,$langs);
@@ -1639,10 +1886,15 @@ 
                 }
 				$title=$appli.'<br>';
 				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+				if ($mode == 'wiki') {
+				    $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+				}
 				$text.='<a class="help" target="_blank" rel="noopener" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl,$helppage);
+				if ($mode == 'wiki') {
+				    $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
+				} else {
+				    $text.=sprintf($helpbaseurl,$helppage);
+				}
 				$text.='">';
 				//$text.=img_picto('', 'helpdoc_top').' ';
 				$text.='<span class="fa fa-question-circle atoplogin"></span>';
@@ -1669,8 +1921,10 @@ 
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
-}
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+	    print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+	}
+	}
 
 
 /**
@@ -1695,7 +1949,9 @@ 
 	$searchform='';
 	$bookmarks='';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (! empty($menu_array_before)) {
+	    dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	}
 
 	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
 	{
@@ -1704,11 +1960,16 @@ 
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+		if ($conf->browser->layout == 'phone') {
+		    $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;
+		}
+		// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
 		print "\n";
 
-		if (! is_object($form)) $form=new Form($db);
+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 		$selected=-1;
 		$usedbyinclude=1;
 		include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
@@ -1717,8 +1978,7 @@ 
 		{
 			//$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
 			$searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-		}
-		else
+		} else
 		{
 			foreach($arrayresult as $key => $val)
 			{
@@ -1733,16 +1993,16 @@ 
 		if (empty($reshook))
 		{
 			$searchform.=$hookmanager->resPrint;
+		} else {
+		    $searchform=$hookmanager->resPrint;
 		}
-		else $searchform=$hookmanager->resPrint;
 
 		// Force special value for $searchform
 		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax))
 		{
 			$urltosearch=DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
 			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
-		}
-		elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+		} elseif ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
 			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
 			$searchform.='<script type="text/javascript">
@@ -1780,15 +2040,27 @@ 
 		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 		// Version
-		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+		if (empty($conf->global->MAIN_HIDE_VERSION)) {
+		    // Version is already on help picto and on login page.
 		{
 			$doliurl='https://www.dolibarr.org';
+		}
 			//local communities
-			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
+			if (preg_match('/fr/i',$langs->defaultlang)) {
+			    $doliurl='https://www.dolibarr.fr';
+			}
+			if (preg_match('/es/i',$langs->defaultlang)) {
+			    $doliurl='https://www.dolibarr.es';
+			}
+			if (preg_match('/de/i',$langs->defaultlang)) {
+			    $doliurl='https://www.dolibarr.de';
+			}
+			if (preg_match('/it/i',$langs->defaultlang)) {
+			    $doliurl='https://www.dolibarr.it';
+			}
+			if (preg_match('/gr/i',$langs->defaultlang)) {
+			    $doliurl='https://www.dolibarr.gr';
+			}
 
 			$appli=constant('DOL_APPLICATION_TITLE');
 			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -1796,17 +2068,28 @@ 
 				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
 				if (preg_match('/\d\.\d/', $appli))
 				{
-					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+					    $appli.=" (".DOL_VERSION.")";
+					}
+					// If new title contains a version that is different than core
+				} else {
+				    $appli.=" ".DOL_VERSION;
 				}
-				else $appli.=" ".DOL_VERSION;
+			} else {
+			    $appli.=" ".DOL_VERSION;
 			}
-			else $appli.=" ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
-			else print '<span class="help">';
+			if ($doliurl) {
+			    print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
+			} else {
+			    print '<span class="help">';
+			}
 			print $appli;
-			if ($doliurl) print '</a>';
-			else print '</span>';
+			if ($doliurl) {
+			    print '</a>';
+			} else {
+			    print '</span>';
+			}
 			print '</div>'."\n";
 		}
 
@@ -1854,8 +2137,10 @@ 
 	print "\n";
 	print '<!-- Begin right area -->'."\n";
 
-	if (empty($leftmenuwithoutmainarea)) main_area($title);
-}
+	if (empty($leftmenuwithoutmainarea)) {
+	    main_area($title);
+	}
+	}
 
 
 /**
@@ -1868,14 +2153,18 @@ 
 {
 	global $conf, $langs;
 
-	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
+	if (empty($conf->dol_hide_leftmenu)) {
+	    print '<div id="id-right">';
+	}
 
 	print "\n";
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+	    print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	}
+	}
 
 
 /**
@@ -1897,24 +2186,31 @@ 
 		$helpbaseurl='%s';
 		$helppage=$helppagename;
 		$mode='local';
-	}
-	else
+	} else
 	{
 		// If WIKI URL
 		if (preg_match('/^es/i',$langs->defaultlang))
 		{
 			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) {
+			    $helppage=$reg[1];
+			}
 		}
 		if (preg_match('/^fr/i',$langs->defaultlang))
 		{
 			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) {
+			    $helppage=$reg[1];
+			}
 		}
-		if (empty($helppage))	// If help page not already found
+		if (empty($helppage)) {
+		    // If help page not already found
 		{
 			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+		}
+			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) {
+			    $helppage=$reg[1];
+			}
 		}
 		$mode='wiki';
 	}
@@ -1946,7 +2242,9 @@ 
 	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	$ret.='<input type="hidden" name="mode" value="search">';
 	$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	if ($showtitlebefore) $ret.=$title.' ';
+	if ($showtitlebefore) {
+	    $ret.=$title.' ';
+	}
 	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
 	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
 	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
@@ -1992,10 +2290,14 @@ 
 			foreach($user->lastsearch_values_tmp as $key => $val)
 			{
 				unset($_SESSION['lastsearch_values_tmp_'.$key]);			// Clean array to rebuild it just after
-				if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
+				if (count($val) && empty($_POST['button_removefilter'])) {
+				    // If there is search criteria to save and we did not click on 'Clear filter' button
 				{
 					if (empty($val['sortfield'])) unset($val['sortfield']);
-					if (empty($val['sortorder'])) unset($val['sortorder']);
+				}
+					if (empty($val['sortorder'])) {
+					    unset($val['sortorder']);
+					}
 					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
 					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
 					unset($_SESSION['lastsearch_values_'.$key]);
@@ -2006,7 +2308,9 @@ 
 
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) {
+		    $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+		}
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		if (preg_match('/list\.php$/', $relativepathstring))
@@ -2015,9 +2319,15 @@ 
 			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
-			if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
-			if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
-			if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
+			if (! empty($contextpage)) {
+			    $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
+			}
+			if (! empty($page) && $page > 1) {
+			    $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
+			}
+			if (! empty($limit) && $limit != $conf->limit) {
+			    $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
+			}
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
@@ -2047,16 +2357,26 @@ 
 
 		print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
-		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
+		if (empty($conf->dol_hide_leftmenu)) {
+		    print '</div> <!-- End div id-right -->'."\n";
+		}
+		// End div id-right
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+		    print '</div> <!-- End div id-container -->'."\n";
+		}
+		// End div container
 
 		print "\n";
-		if ($comment) print '<!-- '.$comment.' -->'."\n";
+		if ($comment) {
+		    print '<!-- '.$comment.' -->'."\n";
+		}
 
 		printCommonFooter($zone);
 
-		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+		if (! empty($delayedhtmlcontent)) {
+		    print $delayedhtmlcontent;
+		}
 
 		if (! empty($conf->use_javascript_ajax))
 		{
@@ -2067,9 +2387,11 @@ 
 		// Wrapper to add log when clicking on download or preview
 		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
 		{
-			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+			if (in_array($object->element, array('facture'))) {
+			    // Restrict for the moment to element 'facture'
 			{
 				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+			}
 				?>
     			<script type="text/javascript">
     			jQuery(document).ready(function () {

dolibarr/htdocs/exports/class/export.class.php

Indentation +796 added lines, -796 removed lines

@@ -30,60 +30,60 @@ 
  */
 class Export
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $array_export_code=array();             // Tableau de "idmodule_numlot"
-	var $array_export_module=array();           // Tableau de "nom de modules"
-	var $array_export_label=array();            // Tableau de "libelle de lots"
-	var $array_export_sql_start=array();        // Tableau des "requetes sql"
-	var $array_export_sql_end=array();          // Tableau des "requetes sql"
-	var $array_export_sql_order=array();        // Tableau des "requetes sql"
-
-	var $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
-	var $array_export_TypeFields=array();		// Tableau des listes de champ+Type de filtre
-	var $array_export_FilterValue=array();		// Tableau des listes de champ+Valeur a filtrer
-	var $array_export_entities=array();         // Tableau des listes de champ+alias a exporter
-	var $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
-	var $array_export_special=array();          // Tableau des operations speciales sur champ
+    var $array_export_code=array();             // Tableau de "idmodule_numlot"
+    var $array_export_module=array();           // Tableau de "nom de modules"
+    var $array_export_label=array();            // Tableau de "libelle de lots"
+    var $array_export_sql_start=array();        // Tableau des "requetes sql"
+    var $array_export_sql_end=array();          // Tableau des "requetes sql"
+    var $array_export_sql_order=array();        // Tableau des "requetes sql"
+
+    var $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
+    var $array_export_TypeFields=array();		// Tableau des listes de champ+Type de filtre
+    var $array_export_FilterValue=array();		// Tableau des listes de champ+Valeur a filtrer
+    var $array_export_entities=array();         // Tableau des listes de champ+alias a exporter
+    var $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
+    var $array_export_special=array();          // Tableau des operations speciales sur champ
     var $array_export_examplevalues=array();    // array with examples
 
-	// To store export modules
-	var $hexa;
-	var $hexafiltervalue;
-	var $datatoexport;
-	var $model_name;
+    // To store export modules
+    var $hexa;
+    var $hexafiltervalue;
+    var $datatoexport;
+    var $model_name;
 
-	var $sqlusedforexport;
+    var $sqlusedforexport;
 
 
-	/**
-	 *    Constructor
-	 *
-	 *    @param  	DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    /**
+     *    Constructor
+     *
+     *    @param  	DoliDB		$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Load an exportable dataset
-	 *
-	 *    @param  	User		$user      	Object user making export
-	 *    @param  	string		$filter    	Load a particular dataset only
-	 *    @return	int						<0 if KO, >0 if OK
-	 */
-	function load_arrays($user,$filter='')
-	{
+    /**
+     *    Load an exportable dataset
+     *
+     *    @param  	User		$user      	Object user making export
+     *    @param  	string		$filter    	Load a particular dataset only
+     *    @return	int						<0 if KO, >0 if OK
+     */
+    function load_arrays($user,$filter='')
+    {
         // phpcs:enable
-		global $langs,$conf,$mysoc;
+        global $langs,$conf,$mysoc;
 
-		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
+        dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
         $i=0;
 
@@ -92,798 +92,798 @@ 
 
         $modulesdir = dolGetModulesDirs();
 
-		foreach($modulesdir as $dir)
-		{
-			// Search available exports
-			$handle=@opendir(dol_osencode($dir));
-			if (is_resource($handle))
-			{
+        foreach($modulesdir as $dir)
+        {
+            // Search available exports
+            $handle=@opendir(dol_osencode($dir));
+            if (is_resource($handle))
+            {
                 // Search module files
-			    while (($file = readdir($handle))!==false)
-				{
-					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
-					{
-						$modulename=$reg[1];
-
-						// Defined if module is enabled
-						$enabled=true;
-						$part=strtolower(preg_replace('/^mod/i','',$modulename));
-						if ($part == 'propale') $part='propal';
-						if (empty($conf->$part->enabled)) $enabled=false;
-
-						if ($enabled)
-						{
-							// Loading Class
-							$file = $dir.$modulename.".class.php";
-							$classname = $modulename;
-							require_once $file;
-							$module = new $classname($this->db);
-
-							if (isset($module->export_code) && is_array($module->export_code))
-							{
-							    foreach($module->export_code as $r => $value)
-								{
+                while (($file = readdir($handle))!==false)
+                {
+                    if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
+                    {
+                        $modulename=$reg[1];
+
+                        // Defined if module is enabled
+                        $enabled=true;
+                        $part=strtolower(preg_replace('/^mod/i','',$modulename));
+                        if ($part == 'propale') $part='propal';
+                        if (empty($conf->$part->enabled)) $enabled=false;
+
+                        if ($enabled)
+                        {
+                            // Loading Class
+                            $file = $dir.$modulename.".class.php";
+                            $classname = $modulename;
+                            require_once $file;
+                            $module = new $classname($this->db);
+
+                            if (isset($module->export_code) && is_array($module->export_code))
+                            {
+                                foreach($module->export_code as $r => $value)
+                                {
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+                                    if ($filter && ($filter != $module->export_code[$r])) continue;
 
                                     // Test if condition to show are ok
                                     if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) continue;
 
                                     // Test if permissions are ok
-									$bool=true;
-									if (isset($module->export_permission))
-									{
-										foreach($module->export_permission[$r] as $val)
-										{
-	    									$perm=$val;
-	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (! empty($perm[2]))
-	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
-	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
-	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
-										}
-									}
-									//print $bool." $perm[0]"."<br>";
-
-									// Permissions ok
-									//	          if ($bool)
-									//	          {
-									// Charge fichier lang en rapport
-									$langtoload=$module->getLangFilesArray();
-									if (is_array($langtoload))
-									{
-										foreach($langtoload as $key)
-										{
-											$langs->load($key);
-										}
-									}
-
-									// Module
-									$this->array_export_module[$i]=$module;
-									// Permission
-									$this->array_export_perms[$i]=$bool;
-									// Icon
-									$this->array_export_icon[$i]=(isset($module->export_icon[$r])?$module->export_icon[$r]:$module->picto);
-									// Code du dataset export
-									$this->array_export_code[$i]=$module->export_code[$r];
-									// Libelle du dataset export
-									$this->array_export_label[$i]=$module->getExportDatasetLabel($r);
-									// Tableau des champ a exporter (cle=champ, valeur=libelle)
-									$this->array_export_fields[$i]=$module->export_fields_array[$r];
-									// Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
-									$this->array_export_TypeFields[$i]=(isset($module->export_TypeFields_array[$r])?$module->export_TypeFields_array[$r]:'');
-									// Tableau des entites a exporter (cle=champ, valeur=entite)
-									$this->array_export_entities[$i]=$module->export_entities_array[$r];
-									// Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
-									$this->array_export_dependencies[$i]=(! empty($module->export_dependencies_array[$r])?$module->export_dependencies_array[$r]:'');
-									// Tableau des operations speciales sur champ
-									$this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
-            						// Array of examples
-            						$this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
-
-									// Requete sql du dataset
-									$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
-									$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
-									$this->array_export_sql_order[$i]=$module->export_sql_order[$r];
-									//$this->array_export_sql[$i]=$module->export_sql[$r];
-
-									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(! empty($module->export_fields_code[$r])?count($module->export_fields_code[$r]):''));
-									$i++;
-									//	          }
-								}
-							}
-						}
-					}
-				}
+                                    $bool=true;
+                                    if (isset($module->export_permission))
+                                    {
+                                        foreach($module->export_permission[$r] as $val)
+                                        {
+                                            $perm=$val;
+                                            //print_r("$perm[0]-$perm[1]-$perm[2]<br>");
+                                            if (! empty($perm[2]))
+                                            {
+                                                $bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+                                            }
+                                            else
+                                            {
+                                                $bool=$user->rights->{$perm[0]}->{$perm[1]};
+                                            }
+                                            if ($perm[0]=='user' && $user->admin) $bool=true;
+                                            if (! $bool) break;
+                                        }
+                                    }
+                                    //print $bool." $perm[0]"."<br>";
+
+                                    // Permissions ok
+                                    //	          if ($bool)
+                                    //	          {
+                                    // Charge fichier lang en rapport
+                                    $langtoload=$module->getLangFilesArray();
+                                    if (is_array($langtoload))
+                                    {
+                                        foreach($langtoload as $key)
+                                        {
+                                            $langs->load($key);
+                                        }
+                                    }
+
+                                    // Module
+                                    $this->array_export_module[$i]=$module;
+                                    // Permission
+                                    $this->array_export_perms[$i]=$bool;
+                                    // Icon
+                                    $this->array_export_icon[$i]=(isset($module->export_icon[$r])?$module->export_icon[$r]:$module->picto);
+                                    // Code du dataset export
+                                    $this->array_export_code[$i]=$module->export_code[$r];
+                                    // Libelle du dataset export
+                                    $this->array_export_label[$i]=$module->getExportDatasetLabel($r);
+                                    // Tableau des champ a exporter (cle=champ, valeur=libelle)
+                                    $this->array_export_fields[$i]=$module->export_fields_array[$r];
+                                    // Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
+                                    $this->array_export_TypeFields[$i]=(isset($module->export_TypeFields_array[$r])?$module->export_TypeFields_array[$r]:'');
+                                    // Tableau des entites a exporter (cle=champ, valeur=entite)
+                                    $this->array_export_entities[$i]=$module->export_entities_array[$r];
+                                    // Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
+                                    $this->array_export_dependencies[$i]=(! empty($module->export_dependencies_array[$r])?$module->export_dependencies_array[$r]:'');
+                                    // Tableau des operations speciales sur champ
+                                    $this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
+                                    // Array of examples
+                                    $this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
+
+                                    // Requete sql du dataset
+                                    $this->array_export_sql_start[$i]=$module->export_sql_start[$r];
+                                    $this->array_export_sql_end[$i]=$module->export_sql_end[$r];
+                                    $this->array_export_sql_order[$i]=$module->export_sql_order[$r];
+                                    //$this->array_export_sql[$i]=$module->export_sql[$r];
+
+                                    dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(! empty($module->export_fields_code[$r])?count($module->export_fields_code[$r]):''));
+                                    $i++;
+                                    //	          }
+                                }
+                            }
+                        }
+                    }
+                }
                 closedir($handle);
-			}
-		}
+            }
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build the sql export request.
-	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
-	 *
-	 *      @param      int		$indice				Indice of export
-	 *      @param      array	$array_selected     Filter fields on array of fields to export
-	 *      @param      array	$array_filterValue  Filter records on array of value for fields
-	 *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
-	 */
-	function build_sql($indice, $array_selected, $array_filterValue)
-	{
+    /**
+     *      Build the sql export request.
+     *      Arrays this->array_export_xxx are already loaded for required datatoexport
+     *
+     *      @param      int		$indice				Indice of export
+     *      @param      array	$array_selected     Filter fields on array of fields to export
+     *      @param      array	$array_filterValue  Filter records on array of value for fields
+     *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
+     */
+    function build_sql($indice, $array_selected, $array_filterValue)
+    {
         // phpcs:enable
-		// Build the sql request
-		$sql=$this->array_export_sql_start[$indice];
-		$i=0;
-
-		//print_r($array_selected);
-		foreach ($this->array_export_fields[$indice] as $key => $value)
-		{
-			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+        // Build the sql request
+        $sql=$this->array_export_sql_start[$indice];
+        $i=0;
+
+        //print_r($array_selected);
+        foreach ($this->array_export_fields[$indice] as $key => $value)
+        {
+            if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
             if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
-			if ($i > 0) $sql.=', ';
-			else $i++;
-
-			if (strpos($key, ' as ')===false) {
-				$newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
-			} else {
-				$newfield=$key;
-			}
-
-			$sql.=$newfield;
-		}
-		$sql.=$this->array_export_sql_end[$indice];
-
-		// Add the WHERE part. Filtering into sql if a filtering array is provided
-		if (is_array($array_filterValue) && !empty($array_filterValue))
-		{
-			$sqlWhere='';
-			// Loop on each condition to add
-			foreach ($array_filterValue as $key => $value)
-			{
-			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
-			}
-			$sql.=$sqlWhere;
-		}
-
-		// Add the order
-		$sql.=$this->array_export_sql_order[$indice];
-
-		// Add the HAVING part.
-		if (is_array($array_filterValue) && !empty($array_filterValue))
-		{
-		    // Loop on each condition to add
-		    foreach ($array_filterValue as $key => $value)
-		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
-		    }
-		}
-
-		return $sql;
-	}
+            if ($i > 0) $sql.=', ';
+            else $i++;
+
+            if (strpos($key, ' as ')===false) {
+                $newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
+            } else {
+                $newfield=$key;
+            }
+
+            $sql.=$newfield;
+        }
+        $sql.=$this->array_export_sql_end[$indice];
+
+        // Add the WHERE part. Filtering into sql if a filtering array is provided
+        if (is_array($array_filterValue) && !empty($array_filterValue))
+        {
+            $sqlWhere='';
+            // Loop on each condition to add
+            foreach ($array_filterValue as $key => $value)
+            {
+                if (preg_match('/GROUP_CONCAT/i', $key)) continue;
+                if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+            }
+            $sql.=$sqlWhere;
+        }
+
+        // Add the order
+        $sql.=$this->array_export_sql_order[$indice];
+
+        // Add the HAVING part.
+        if (is_array($array_filterValue) && !empty($array_filterValue))
+        {
+            // Loop on each condition to add
+            foreach ($array_filterValue as $key => $value)
+            {
+                if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+            }
+        }
+
+        return $sql;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build the conditionnal string from filter the query
-	 *
-	 *      @param		string	$TypeField		Type of Field to filter
-	 *      @param		string	$NameField		Name of the field to filter
-	 *      @param		string	$ValueField		Value of the field for filter. Must not be ''
-	 *      @return		string					sql string of then field ex : "field='xxx'>"
-	 */
-	function build_filterQuery($TypeField, $NameField, $ValueField)
-	{
+    /**
+     *      Build the conditionnal string from filter the query
+     *
+     *      @param		string	$TypeField		Type of Field to filter
+     *      @param		string	$NameField		Name of the field to filter
+     *      @param		string	$ValueField		Value of the field for filter. Must not be ''
+     *      @return		string					sql string of then field ex : "field='xxx'>"
+     */
+    function build_filterQuery($TypeField, $NameField, $ValueField)
+    {
         // phpcs:enable
-		//print $TypeField." ".$NameField." ".$ValueField;
-		$InfoFieldList = explode(":", $TypeField);
-		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0]) {
-			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
-				break;
-			case 'Date':
-				if (strpos($ValueField, "+") > 0)
-				{
-					// mode plage
-					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
-					$szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
-				}
-				else
-				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
-					else
-						$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
-				}
-				break;
-			case 'Duree':
-				break;
-			case 'Numeric':
-				// si le signe -
-				if (strpos($ValueField, "+") > 0)
-				{
-					// mode plage
-					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
-					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
-				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
-				}
-				break;
-			case 'Boolean':
-				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
-				break;
-			case 'Status':
-			case 'List':
-				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else {
+        //print $TypeField." ".$NameField." ".$ValueField;
+        $InfoFieldList = explode(":", $TypeField);
+        // build the input field on depend of the type of file
+        switch ($InfoFieldList[0]) {
+            case 'Text':
+                if (! (strpos($ValueField, '%') === false))
+                    $szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+                else
+                    $szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+                break;
+            case 'Date':
+                if (strpos($ValueField, "+") > 0)
+                {
+                    // mode plage
+                    $ValueArray = explode("+", $ValueField);
+                    $szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
+                    $szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
+                }
+                else
+                {
+                    if (is_numeric(substr($ValueField,0,1)))
+                        $szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
+                    else
+                        $szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+                }
+                break;
+            case 'Duree':
+                break;
+            case 'Numeric':
+                // si le signe -
+                if (strpos($ValueField, "+") > 0)
+                {
+                    // mode plage
+                    $ValueArray = explode("+", $ValueField);
+                    $szFilterQuery ="(".$NameField.">=".$ValueArray[0];
+                    $szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
+                }
+                else
+                {
+                    if (is_numeric(substr($ValueField,0,1)))
+                        $szFilterQuery=" ".$NameField."=".$ValueField;
+                    else
+                        $szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+                }
+                break;
+            case 'Boolean':
+                $szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+                break;
+            case 'Status':
+            case 'List':
+                if (is_numeric($ValueField))
+                    $szFilterQuery=" ".$NameField."=".$ValueField;
+                else {
                     if (! (strpos($ValueField, '%') === false))
                         $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
                     else
                         $szFilterQuery=" ".$NameField." = '".$ValueField."'";
-				}
-				break;
-			default:
-			    dol_syslog("Error we try to forge an sql export request with a condition on a field with type '".$InfoFieldList[0]."' (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
-		}
-
-		return $szFilterQuery;
-	}
-
-	/**
-	 *	conditionDate
-	 *
-	 *  @param 	string	$Field		Field operand 1
-	 *  @param 	string	$Value		Value operand 2
-	 *  @param 	string	$Sens		Comparison operator
-	 *  @return string
-	 */
-	function conditionDate($Field, $Value, $Sens)
-	{
-		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
-		return $Condition;
-	}
+                }
+                break;
+            default:
+                dol_syslog("Error we try to forge an sql export request with a condition on a field with type '".$InfoFieldList[0]."' (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
+        }
+
+        return $szFilterQuery;
+    }
+
+    /**
+     *	conditionDate
+     *
+     *  @param 	string	$Field		Field operand 1
+     *  @param 	string	$Value		Value operand 2
+     *  @param 	string	$Sens		Comparison operator
+     *  @return string
+     */
+    function conditionDate($Field, $Value, $Sens)
+    {
+        // TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
+        if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+        elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+        else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+        return $Condition;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build an input field used to filter the query
-	 *
-	 *      @param		string	$TypeField		Type of Field to filter. Example: Text, Date, List:c_country:label:rowid, List:c_stcom:label:code, Numeric or Number, Boolean
-	 *      @param		string	$NameField		Name of the field to filter
-	 *      @param		string	$ValueField		Initial value of the field to filter
-	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
-	 */
-	function build_filterField($TypeField, $NameField, $ValueField)
-	{
+    /**
+     *      Build an input field used to filter the query
+     *
+     *      @param		string	$TypeField		Type of Field to filter. Example: Text, Date, List:c_country:label:rowid, List:c_stcom:label:code, Numeric or Number, Boolean
+     *      @param		string	$NameField		Name of the field to filter
+     *      @param		string	$ValueField		Initial value of the field to filter
+     *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
+     */
+    function build_filterField($TypeField, $NameField, $ValueField)
+    {
         // phpcs:enable
-		global $conf,$langs;
-
-		$szFilterField='';
-		$InfoFieldList = explode(":", $TypeField);
-
-		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0])
-		{
-			case 'Text':
-			case 'Date':
-				$szFilterField='<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
-				break;
-			case 'Duree':
-			case 'Numeric':
-			case 'Number':
-				// Must be a string text to allow to use comparison strings like "<= 999"
-			    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				break;
-			case 'Status':
-				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				else $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				break;
-			case 'Boolean':
-				$szFilterField='<select name="'.$NameField.'" class="flat">';
-				$szFilterField.='<option ';
-				if ($ValueField=='') $szFilterField.=' selected ';
-				$szFilterField.=' value="">&nbsp;</option>';
-
-				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
-				$szFilterField.=' value="1">'.yn(1).'</option>';
-
-				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
-				$szFilterField.=' value="0">'.yn(0).'</option>';
-				$szFilterField.="</select>";
-				break;
-			case 'List':
-				// 0 : Type du champ
-				// 1 : Nom de la table
-				// 2 : Nom du champ contenant le libelle
-				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
-				if (count($InfoFieldList)==4)
-					$keyList=$InfoFieldList[3];
-				else
-					$keyList='rowid';
-				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
-
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$szFilterField='<select class="flat" name="'.$NameField.'">';
-					$szFilterField.='<option value="0">&nbsp;</option>';
-					$num = $this->db->num_rows($resql);
-
-					$i = 0;
-					if ($num)
-					{
-						while ($i < $num)
-						{
-							$obj = $this->db->fetch_object($resql);
-							if ($obj->label == '-')
-							{
-								// Discard entry '-'
-								$i++;
-								continue;
-							}
-							//var_dump($InfoFieldList[1]);
-							$labeltoshow=dol_trunc($obj->label,18);
-							if ($InfoFieldList[1] == 'c_stcomm')
-							{
-								$langs->load("companies");
-								$labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
-							}
-							if ($InfoFieldList[1] == 'c_country')
-							{
-								//var_dump($sql);
-								$langs->load("dict");
-								$labeltoshow=(($langs->trans("Country".$obj->code) != "Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label);
-							}
-							if (!empty($ValueField) && $ValueField == $obj->rowid)
-							{
-								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
-							{
-								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
-							}
-							$i++;
-						}
-					}
-					$szFilterField.="</select>";
-
-					$this->db->free($resql);
-				}
-				else dol_print_error($this->db);
-				break;
-		}
-
-		return $szFilterField;
-	}
-
-	/**
-	 *      Build an input field used to filter the query
-	 *
-	 *      @param		string	$TypeField		Type of Field to filter
-	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
-	 */
-	function genDocFilter($TypeField)
-	{
+        global $conf,$langs;
+
+        $szFilterField='';
+        $InfoFieldList = explode(":", $TypeField);
+
+        // build the input field on depend of the type of file
+        switch ($InfoFieldList[0])
+        {
+            case 'Text':
+            case 'Date':
+                $szFilterField='<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
+                break;
+            case 'Duree':
+            case 'Numeric':
+            case 'Number':
+                // Must be a string text to allow to use comparison strings like "<= 999"
+                $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+                break;
+            case 'Status':
+                if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+                else $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+                break;
+            case 'Boolean':
+                $szFilterField='<select name="'.$NameField.'" class="flat">';
+                $szFilterField.='<option ';
+                if ($ValueField=='') $szFilterField.=' selected ';
+                $szFilterField.=' value="">&nbsp;</option>';
+
+                $szFilterField.='<option ';
+                if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
+                $szFilterField.=' value="1">'.yn(1).'</option>';
+
+                $szFilterField.='<option ';
+                if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
+                $szFilterField.=' value="0">'.yn(0).'</option>';
+                $szFilterField.="</select>";
+                break;
+            case 'List':
+                // 0 : Type du champ
+                // 1 : Nom de la table
+                // 2 : Nom du champ contenant le libelle
+                // 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
+                if (count($InfoFieldList)==4)
+                    $keyList=$InfoFieldList[3];
+                else
+                    $keyList='rowid';
+                $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+                if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+                if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+                $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
+
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $szFilterField='<select class="flat" name="'.$NameField.'">';
+                    $szFilterField.='<option value="0">&nbsp;</option>';
+                    $num = $this->db->num_rows($resql);
+
+                    $i = 0;
+                    if ($num)
+                    {
+                        while ($i < $num)
+                        {
+                            $obj = $this->db->fetch_object($resql);
+                            if ($obj->label == '-')
+                            {
+                                // Discard entry '-'
+                                $i++;
+                                continue;
+                            }
+                            //var_dump($InfoFieldList[1]);
+                            $labeltoshow=dol_trunc($obj->label,18);
+                            if ($InfoFieldList[1] == 'c_stcomm')
+                            {
+                                $langs->load("companies");
+                                $labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
+                            }
+                            if ($InfoFieldList[1] == 'c_country')
+                            {
+                                //var_dump($sql);
+                                $langs->load("dict");
+                                $labeltoshow=(($langs->trans("Country".$obj->code) != "Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label);
+                            }
+                            if (!empty($ValueField) && $ValueField == $obj->rowid)
+                            {
+                                $szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                            }
+                            else
+                            {
+                                $szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
+                            }
+                            $i++;
+                        }
+                    }
+                    $szFilterField.="</select>";
+
+                    $this->db->free($resql);
+                }
+                else dol_print_error($this->db);
+                break;
+        }
+
+        return $szFilterField;
+    }
+
+    /**
+     *      Build an input field used to filter the query
+     *
+     *      @param		string	$TypeField		Type of Field to filter
+     *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
+     */
+    function genDocFilter($TypeField)
+    {
         global $langs;
 
-		$szMsg='';
-		$InfoFieldList = explode(":", $TypeField);
-		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0]) {
-			case 'Text':
-				$szMsg= $langs->trans('ExportStringFilter');
-				break;
-			case 'Date':
-				$szMsg = $langs->trans('ExportDateFilter');
-				break;
-			case 'Duree':
-				break;
-			case 'Numeric':
-				$szMsg = $langs->trans('ExportNumericFilter');
-				break;
-			case 'Boolean':
-				break;
-			case 'List':
-				break;
-		}
-		return $szMsg;
-	}
+        $szMsg='';
+        $InfoFieldList = explode(":", $TypeField);
+        // build the input field on depend of the type of file
+        switch ($InfoFieldList[0]) {
+            case 'Text':
+                $szMsg= $langs->trans('ExportStringFilter');
+                break;
+            case 'Date':
+                $szMsg = $langs->trans('ExportDateFilter');
+                break;
+            case 'Duree':
+                break;
+            case 'Numeric':
+                $szMsg = $langs->trans('ExportNumericFilter');
+                break;
+            case 'Boolean':
+                break;
+            case 'List':
+                break;
+        }
+        return $szMsg;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build export file.
-	 *      File is built into directory $conf->export->dir_temp.'/'.$user->id
-	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
-	 *
-	 *      @param      User		$user               User that export
-	 *      @param      string		$model              Export format
-	 *      @param      string		$datatoexport       Name of dataset to export
-	 *      @param      array		$array_selected     Filter on array of fields to export
-	 *      @param      array		$array_filterValue  Filter on array of fields with a filter
-	 *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
-	 *      @return		int								<0 if KO, >0 if OK
-	 */
-	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
- 	{
+    /**
+     *      Build export file.
+     *      File is built into directory $conf->export->dir_temp.'/'.$user->id
+     *      Arrays this->array_export_xxx are already loaded for required datatoexport
+     *
+     *      @param      User		$user               User that export
+     *      @param      string		$model              Export format
+     *      @param      string		$datatoexport       Name of dataset to export
+     *      @param      array		$array_selected     Filter on array of fields to export
+     *      @param      array		$array_filterValue  Filter on array of fields with a filter
+     *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
+     *      @return		int								<0 if KO, >0 if OK
+     */
+    function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
+        {
         // phpcs:enable
-		global $conf,$langs;
+        global $conf,$langs;
 
-		$indice=0;
-		asort($array_selected);
+        $indice=0;
+        asort($array_selected);
 
-		dol_syslog(get_class($this)."::".__FUNCTION__." ".$model.", ".$datatoexport.", ".implode(",", $array_selected));
+        dol_syslog(get_class($this)."::".__FUNCTION__." ".$model.", ".$datatoexport.", ".implode(",", $array_selected));
 
-		// Check parameters or context properties
-		if (empty($this->array_export_fields) || ! is_array($this->array_export_fields))
-		{
-			$this->error="ErrorBadParameter";
-			return -1;
-		}
+        // Check parameters or context properties
+        if (empty($this->array_export_fields) || ! is_array($this->array_export_fields))
+        {
+            $this->error="ErrorBadParameter";
+            return -1;
+        }
 
-		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
-		$file = "export_".$model.".modules.php";
-		$classname = "Export".$model;
-		require_once $dir.$file;
-		$objmodel = new $classname($this->db);
+        // Creation of class to export using model ExportXXX
+        $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+        $file = "export_".$model.".modules.php";
+        $classname = "Export".$model;
+        require_once $dir.$file;
+        $objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
+        if (! empty($sqlquery)) $sql = $sqlquery;
+        else
+        {
+            // Define value for indice from $datatoexport
+            $foundindice=0;
+            foreach($this->array_export_code as $key => $dataset)
+            {
+                if ($datatoexport == $dataset)
+                {
+                    $indice=$key;
+                    $foundindice++;
+                    //print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
+                    break;
+                }
+            }
+            if (empty($foundindice))
+            {
+                $this->error="ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
+                return -1;
+            }
+            $sql=$this->build_sql($indice, $array_selected, $array_filterValue);
+        }
+
+        // Run the sql
+        $this->sqlusedforexport=$sql;
+        dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            //$this->array_export_label[$indice]
+            if ($conf->global->EXPORT_PREFIX_SPEC)
+                $filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+            else
+                $filename="export_".$datatoexport;
+            $filename.='.'.$objmodel->getDriverExtension();
+            $dirname=$conf->export->dir_temp.'/'.$user->id;
+
+            $outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
+
+            // Open file
+            dol_mkdir($dirname);
+            $result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
+
+            if ($result >= 0)
+            {
+                // Genere en-tete
+                $objmodel->write_header($outputlangs);
+
+                // Genere ligne de titre
+                $objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
+
+                while ($obj = $this->db->fetch_object($resql))
+                {
+                    // Process special operations
+                    if (! empty($this->array_export_special[$indice]))
+                    {
+                        foreach ($this->array_export_special[$indice] as $key => $value)
+                        {
+                            if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+                            // Operation NULLIFNEG
+                            if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
+                            {
+                                //$alias=$this->array_export_alias[$indice][$key];
+                                $alias=str_replace(array('.', '-','(',')'),'_',$key);
+                                if ($obj->$alias < 0) $obj->$alias='';
+                            }
+                            // Operation ZEROIFNEG
+                            elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
+                            {
+                                //$alias=$this->array_export_alias[$indice][$key];
+                                $alias=str_replace(array('.', '-','(',')'),'_',$key);
+                                if ($obj->$alias < 0) $obj->$alias='0';
+                            }
+                            // Operation INVOICEREMAINTOPAY
+                            elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
+                            {
+                                //$alias=$this->array_export_alias[$indice][$key];
+                                $alias=str_replace(array('.', '-','(',')'),'_',$key);
+                                $remaintopay='';
+                                if ($obj->f_rowid > 0)
+                                {
+                                    global $tmpobjforcomputecall;
+                                    if (! is_object($tmpobjforcomputecall))
+                                    {
+                                        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+                                        $tmpobjforcomputecall=new Facture($this->db);
+                                    }
+                                    $tmpobjforcomputecall->id = $obj->f_rowid;
+                                    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
+                                    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
+                                }
+                                $obj->$alias=$remaintopay;
+                            }
+                            else
+                            {
+                                // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
+                                $computestring=$this->array_export_special[$indice][$key];
+                                $tmp=dol_eval($computestring, 1, 0);
+                                $obj->$alias=$tmp;
+
+                                $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+                                return -1;
+                            }
+                        }
+                    }
+                    // end of special operation processing
+                    $objmodel->write_record($array_selected,$obj,$outputlangs,$this->array_export_TypeFields[$indice]);
+                }
+
+                // Genere en-tete
+                $objmodel->write_footer($outputlangs);
+
+                // Close file
+                $objmodel->close_file();
+
+                return 1;
+            }
+            else
+            {
+                $this->error=$objmodel->error;
+                dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error()." - sql=".$sql;
+            return -1;
+        }
+    }
+
+    /**
+     *  Save an export model in database
+     *
+     *  @param		User	$user 	Object user that save
+     *  @return		int				<0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf;
+
+        dol_syslog("Export.class.php::create");
+
+        $this->db->begin();
+
+        $filter='';
+
+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
+        $sql.= 'label,';
+        $sql.= 'type,';
+        $sql.= 'field,';
+        $sql.= 'fk_user,';
+        $sql.= 'filter';
+        $sql.= ') VALUES (';
+        $sql.= "'".$this->db->escape($this->model_name)."',";
+        $sql.= "'".$this->db->escape($this->datatoexport)."',";
+        $sql.= "'".$this->db->escape($this->hexa)."',";
+        $sql.= "'".$user->id."',";
+        $sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->db->commit();
+            return 1;
+        }
         else
-		{
-			// Define value for indice from $datatoexport
-			$foundindice=0;
-			foreach($this->array_export_code as $key => $dataset)
-			{
-				if ($datatoexport == $dataset)
-				{
-					$indice=$key;
-					$foundindice++;
-					//print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
-					break;
-				}
-			}
-			if (empty($foundindice))
-			{
-				$this->error="ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
-				return -1;
-			}
-        	$sql=$this->build_sql($indice, $array_selected, $array_filterValue);
-		}
-
-		// Run the sql
-		$this->sqlusedforexport=$sql;
-		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			//$this->array_export_label[$indice]
-			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename="export_".$datatoexport;
-			$filename.='.'.$objmodel->getDriverExtension();
-			$dirname=$conf->export->dir_temp.'/'.$user->id;
-
-			$outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
-
-			// Open file
-			dol_mkdir($dirname);
-			$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
-
-			if ($result >= 0)
-			{
-				// Genere en-tete
-				$objmodel->write_header($outputlangs);
-
-				// Genere ligne de titre
-				$objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
-
-				while ($obj = $this->db->fetch_object($resql))
-				{
-					// Process special operations
-					if (! empty($this->array_export_special[$indice]))
-					{
-						foreach ($this->array_export_special[$indice] as $key => $value)
-						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-							// Operation NULLIFNEG
-							if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
-							{
-								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='';
-							}
-							// Operation ZEROIFNEG
-							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
-							{
-								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='0';
-							}
-							// Operation INVOICEREMAINTOPAY
-							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
-							{
-								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								$remaintopay='';
-								if ($obj->f_rowid > 0)
-								{
-								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall))
-								    {
-								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall=new Facture($this->db);
-								    }
-								    $tmpobjforcomputecall->id = $obj->f_rowid;
-								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
-								}
-								$obj->$alias=$remaintopay;
-							}
-							else
-							{
-							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
-							    $computestring=$this->array_export_special[$indice][$key];
-							    $tmp=dol_eval($computestring, 1, 0);
-							    $obj->$alias=$tmp;
-
-							    $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
-							    return -1;
-							}
-						}
-					}
-					// end of special operation processing
-					$objmodel->write_record($array_selected,$obj,$outputlangs,$this->array_export_TypeFields[$indice]);
-				}
-
-				// Genere en-tete
-				$objmodel->write_footer($outputlangs);
-
-				// Close file
-				$objmodel->close_file();
-
-        		return 1;
-			}
-			else
-			{
-				$this->error=$objmodel->error;
-				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error()." - sql=".$sql;
-			return -1;
-		}
-	}
-
-	/**
-	 *  Save an export model in database
-	 *
-	 *  @param		User	$user 	Object user that save
-	 *  @return		int				<0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf;
-
-		dol_syslog("Export.class.php::create");
-
-		$this->db->begin();
-
-		$filter='';
-
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
-		$sql.= 'label,';
-		$sql.= 'type,';
-		$sql.= 'field,';
-		$sql.= 'fk_user,';
-		$sql.= 'filter';
-		$sql.= ') VALUES (';
-		$sql.= "'".$this->db->escape($this->model_name)."',";
-		$sql.= "'".$this->db->escape($this->datatoexport)."',";
-		$sql.= "'".$this->db->escape($this->hexa)."',";
-		$sql.= "'".$user->id."',";
-		$sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->errno=$this->db->lasterrno();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Load an export profil from database
-	 *
-	 *  @param		int		$id		Id of profil to load
-	 *  @return		int				<0 if KO, >0 if OK
-	 */
-	function fetch($id)
-	{
-		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
-		$sql.= ' WHERE em.rowid = '.$id;
-
-		dol_syslog("Export::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
-				$this->id				= $obj->rowid;
-				$this->model_name		= $obj->label;
-				$this->datatoexport		= $obj->type;
-
-				$this->hexa				= $obj->field;
-				$this->hexafiltervalue	= $obj->filter;
-
-				return 1;
-			}
-			else
-			{
-				$this->error="ModelNotFound";
-				return -2;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -3;
-		}
-	}
-
-
-	/**
-	 *	Delete object in database
-	 *
-	 *	@param      User		$user        	User that delete
-	 *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return		int							<0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        {
+            $this->error=$this->db->lasterror();
+            $this->errno=$this->db->lasterrno();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *  Load an export profil from database
+     *
+     *  @param		int		$id		Id of profil to load
+     *  @return		int				<0 if KO, >0 if OK
+     */
+    function fetch($id)
+    {
+        $sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
+        $sql.= ' WHERE em.rowid = '.$id;
+
+        dol_syslog("Export::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $obj = $this->db->fetch_object($result);
+            if ($obj)
+            {
+                $this->id				= $obj->rowid;
+                $this->model_name		= $obj->label;
+                $this->datatoexport		= $obj->type;
+
+                $this->hexa				= $obj->field;
+                $this->hexafiltervalue	= $obj->filter;
+
+                return 1;
+            }
+            else
+            {
+                $this->error="ModelNotFound";
+                return -2;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -3;
+        }
+    }
+
+
+    /**
+     *	Delete object in database
+     *
+     *	@param      User		$user        	User that delete
+     *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
+     *	@return		int							<0 if KO, >0 if OK
+     */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Output list all export models
-	 *  TODO Move this into a class htmlxxx.class.php
-	 *
-	 *	@return	void
-	 */
-	function list_export_model()
-	{
+    /**
+     *	Output list all export models
+     *  TODO Move this into a class htmlxxx.class.php
+     *
+     *	@return	void
+     */
+    function list_export_model()
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		$sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model as em";
-		$sql.= " ORDER BY rowid";
-
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-				$keyModel = array_search($obj->type, $this->array_export_code);
-				print "<tr>";
-				print '<td><a href=export.php?step=2&action=select_model&exportmodelid='.$obj->rowid.'&datatoexport='.$obj->type.'>'.$obj->label.'</a></td>';
-				print '<td>';
-				print img_object($this->array_export_module[$keyModel]->getName(),$this->array_export_icon[$keyModel]).' ';
-				print $this->array_export_module[$keyModel]->getName().' - ';
-				// recuperation du nom de l'export
-
-				$string=$langs->trans($this->array_export_label[$keyModel]);
-				print ($string!=$this->array_export_label[$keyModel]?$string:$this->array_export_label[$keyModel]);
-				print '</td>';
-				//print '<td>'.$obj->type.$keyModel.'</td>';
-				print '<td>'.str_replace(',',' , ',$obj->field).'</td>';
-				if (! empty($obj->filter)) {
-					$filter = json_decode($obj->filter, true);
-					print '<td>'.str_replace(',',' , ',$filter['field']).'</td>';
-					print '<td>'.str_replace(',',' , ',$filter['value']).'</td>';
-				}
-				// suppression de l'export
-				print '<td align="right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteprof&id='.$obj->rowid.'">';
-				print img_delete();
-				print '</a>';
-				print "</tr>";
-
-				$i++;
-			}
-		}
-		else {
-			dol_print_error($this->db);
-		}
-	}
+        global $conf, $langs;
+
+        $sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
+        $sql.= " FROM ".MAIN_DB_PREFIX."export_model as em";
+        $sql.= " ORDER BY rowid";
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                $keyModel = array_search($obj->type, $this->array_export_code);
+                print "<tr>";
+                print '<td><a href=export.php?step=2&action=select_model&exportmodelid='.$obj->rowid.'&datatoexport='.$obj->type.'>'.$obj->label.'</a></td>';
+                print '<td>';
+                print img_object($this->array_export_module[$keyModel]->getName(),$this->array_export_icon[$keyModel]).' ';
+                print $this->array_export_module[$keyModel]->getName().' - ';
+                // recuperation du nom de l'export
+
+                $string=$langs->trans($this->array_export_label[$keyModel]);
+                print ($string!=$this->array_export_label[$keyModel]?$string:$this->array_export_label[$keyModel]);
+                print '</td>';
+                //print '<td>'.$obj->type.$keyModel.'</td>';
+                print '<td>'.str_replace(',',' , ',$obj->field).'</td>';
+                if (! empty($obj->filter)) {
+                    $filter = json_decode($obj->filter, true);
+                    print '<td>'.str_replace(',',' , ',$filter['field']).'</td>';
+                    print '<td>'.str_replace(',',' , ',$filter['value']).'</td>';
+                }
+                // suppression de l'export
+                print '<td align="right">';
+                print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteprof&id='.$obj->rowid.'">';
+                print img_delete();
+                print '</a>';
+                print "</tr>";
+
+                $i++;
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
+    }
 }

Spacing +207 added lines, -207 removed lines

@@ -35,20 +35,20 @@ 
      */
     public $db;
 
-	var $array_export_code=array();             // Tableau de "idmodule_numlot"
-	var $array_export_module=array();           // Tableau de "nom de modules"
-	var $array_export_label=array();            // Tableau de "libelle de lots"
-	var $array_export_sql_start=array();        // Tableau des "requetes sql"
-	var $array_export_sql_end=array();          // Tableau des "requetes sql"
-	var $array_export_sql_order=array();        // Tableau des "requetes sql"
-
-	var $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
-	var $array_export_TypeFields=array();		// Tableau des listes de champ+Type de filtre
-	var $array_export_FilterValue=array();		// Tableau des listes de champ+Valeur a filtrer
-	var $array_export_entities=array();         // Tableau des listes de champ+alias a exporter
-	var $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
-	var $array_export_special=array();          // Tableau des operations speciales sur champ
-    var $array_export_examplevalues=array();    // array with examples
+	var $array_export_code = array(); // Tableau de "idmodule_numlot"
+	var $array_export_module = array(); // Tableau de "nom de modules"
+	var $array_export_label = array(); // Tableau de "libelle de lots"
+	var $array_export_sql_start = array(); // Tableau des "requetes sql"
+	var $array_export_sql_end = array(); // Tableau des "requetes sql"
+	var $array_export_sql_order = array(); // Tableau des "requetes sql"
+
+	var $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
+	var $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
+	var $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
+	var $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
+	var $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
+	var $array_export_special = array(); // Tableau des operations speciales sur champ
+    var $array_export_examplevalues = array(); // array with examples
 
 	// To store export modules
 	var $hexa;
@@ -66,7 +66,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -78,38 +78,38 @@ 
 	 *    @param  	string		$filter    	Load a particular dataset only
 	 *    @return	int						<0 if KO, >0 if OK
 	 */
-	function load_arrays($user,$filter='')
+	function load_arrays($user, $filter = '')
 	{
         // phpcs:enable
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
 		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i=0;
+        $i = 0;
 
         // Define list of modules directories into modulesdir
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
         $modulesdir = dolGetModulesDirs();
 
-		foreach($modulesdir as $dir)
+		foreach ($modulesdir as $dir)
 		{
 			// Search available exports
-			$handle=@opendir(dol_osencode($dir));
+			$handle = @opendir(dol_osencode($dir));
 			if (is_resource($handle))
 			{
                 // Search module files
-			    while (($file = readdir($handle))!==false)
+			    while (($file = readdir($handle)) !== false)
 				{
-					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
+					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
 					{
-						$modulename=$reg[1];
+						$modulename = $reg[1];
 
 						// Defined if module is enabled
-						$enabled=true;
-						$part=strtolower(preg_replace('/^mod/i','',$modulename));
-						if ($part == 'propale') $part='propal';
-						if (empty($conf->$part->enabled)) $enabled=false;
+						$enabled = true;
+						$part = strtolower(preg_replace('/^mod/i', '', $modulename));
+						if ($part == 'propale') $part = 'propal';
+						if (empty($conf->$part->enabled)) $enabled = false;
 
 						if ($enabled)
 						{
@@ -121,32 +121,32 @@ 
 
 							if (isset($module->export_code) && is_array($module->export_code))
 							{
-							    foreach($module->export_code as $r => $value)
+							    foreach ($module->export_code as $r => $value)
 								{
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
 								    if ($filter && ($filter != $module->export_code[$r])) continue;
 
                                     // Test if condition to show are ok
-                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) continue;
+                                    if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
 
                                     // Test if permissions are ok
-									$bool=true;
+									$bool = true;
 									if (isset($module->export_permission))
 									{
-										foreach($module->export_permission[$r] as $val)
+										foreach ($module->export_permission[$r] as $val)
 										{
-	    									$perm=$val;
+	    									$perm = $val;
 	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (! empty($perm[2]))
+	    									if (!empty($perm[2]))
 	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
 	    									}
 	    									else
 	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
+	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
+	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
+	    									if (!$bool) break;
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -155,45 +155,45 @@ 
 									//	          if ($bool)
 									//	          {
 									// Charge fichier lang en rapport
-									$langtoload=$module->getLangFilesArray();
+									$langtoload = $module->getLangFilesArray();
 									if (is_array($langtoload))
 									{
-										foreach($langtoload as $key)
+										foreach ($langtoload as $key)
 										{
 											$langs->load($key);
 										}
 									}
 
 									// Module
-									$this->array_export_module[$i]=$module;
+									$this->array_export_module[$i] = $module;
 									// Permission
-									$this->array_export_perms[$i]=$bool;
+									$this->array_export_perms[$i] = $bool;
 									// Icon
-									$this->array_export_icon[$i]=(isset($module->export_icon[$r])?$module->export_icon[$r]:$module->picto);
+									$this->array_export_icon[$i] = (isset($module->export_icon[$r]) ? $module->export_icon[$r] : $module->picto);
 									// Code du dataset export
-									$this->array_export_code[$i]=$module->export_code[$r];
+									$this->array_export_code[$i] = $module->export_code[$r];
 									// Libelle du dataset export
-									$this->array_export_label[$i]=$module->getExportDatasetLabel($r);
+									$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
 									// Tableau des champ a exporter (cle=champ, valeur=libelle)
-									$this->array_export_fields[$i]=$module->export_fields_array[$r];
+									$this->array_export_fields[$i] = $module->export_fields_array[$r];
 									// Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
-									$this->array_export_TypeFields[$i]=(isset($module->export_TypeFields_array[$r])?$module->export_TypeFields_array[$r]:'');
+									$this->array_export_TypeFields[$i] = (isset($module->export_TypeFields_array[$r]) ? $module->export_TypeFields_array[$r] : '');
 									// Tableau des entites a exporter (cle=champ, valeur=entite)
-									$this->array_export_entities[$i]=$module->export_entities_array[$r];
+									$this->array_export_entities[$i] = $module->export_entities_array[$r];
 									// Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
-									$this->array_export_dependencies[$i]=(! empty($module->export_dependencies_array[$r])?$module->export_dependencies_array[$r]:'');
+									$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
 									// Tableau des operations speciales sur champ
-									$this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
+									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
             						// Array of examples
-            						$this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
+            						$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
 
 									// Requete sql du dataset
-									$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
-									$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
-									$this->array_export_sql_order[$i]=$module->export_sql_order[$r];
+									$this->array_export_sql_start[$i] = $module->export_sql_start[$r];
+									$this->array_export_sql_end[$i] = $module->export_sql_end[$r];
+									$this->array_export_sql_order[$i] = $module->export_sql_order[$r];
 									//$this->array_export_sql[$i]=$module->export_sql[$r];
 
-									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(! empty($module->export_fields_code[$r])?count($module->export_fields_code[$r]):''));
+									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : ''));
 									$i++;
 									//	          }
 								}
@@ -223,42 +223,42 @@ 
 	{
         // phpcs:enable
 		// Build the sql request
-		$sql=$this->array_export_sql_start[$indice];
-		$i=0;
+		$sql = $this->array_export_sql_start[$indice];
+		$i = 0;
 
 		//print_r($array_selected);
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
-			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-            if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
-			if ($i > 0) $sql.=', ';
+			if (!array_key_exists($key, $array_selected)) continue; // Field not selected
+            if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
+			if ($i > 0) $sql .= ', ';
 			else $i++;
 
-			if (strpos($key, ' as ')===false) {
-				$newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
+			if (strpos($key, ' as ') === false) {
+				$newfield = $key.' as '.str_replace(array('.', '-', '(', ')'), '_', $key);
 			} else {
-				$newfield=$key;
+				$newfield = $key;
 			}
 
-			$sql.=$newfield;
+			$sql .= $newfield;
 		}
-		$sql.=$this->array_export_sql_end[$indice];
+		$sql .= $this->array_export_sql_end[$indice];
 
 		// Add the WHERE part. Filtering into sql if a filtering array is provided
 		if (is_array($array_filterValue) && !empty($array_filterValue))
 		{
-			$sqlWhere='';
+			$sqlWhere = '';
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
 			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				if ($value != '') $sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 			}
-			$sql.=$sqlWhere;
+			$sql .= $sqlWhere;
 		}
 
 		// Add the order
-		$sql.=$this->array_export_sql_order[$indice];
+		$sql .= $this->array_export_sql_order[$indice];
 
 		// Add the HAVING part.
 		if (is_array($array_filterValue) && !empty($array_filterValue))
@@ -266,7 +266,7 @@ 
 		    // Loop on each condition to add
 		    foreach ($array_filterValue as $key => $value)
 		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 		    }
 		}
 
@@ -290,25 +290,25 @@ 
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+				if (!(strpos($ValueField, '%') === false))
+					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
 				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
-					$szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
+					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
+					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
 				}
 				else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
+					if (is_numeric(substr($ValueField, 0, 1)))
+						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
 					else
-						$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
 				}
 				break;
 			case 'Duree':
@@ -319,29 +319,29 @@ 
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
-					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
+					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
+					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
 				}
 				else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
+					if (is_numeric(substr($ValueField, 0, 1)))
+						$szFilterQuery = " ".$NameField."=".$ValueField;
 					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
 				}
 				break;
 			case 'Boolean':
-				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+				$szFilterQuery = " ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField == 'yes' ? 1 : 0));
 				break;
 			case 'Status':
 			case 'List':
 				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
+					$szFilterQuery = " ".$NameField."=".$ValueField;
 				else {
-                    if (! (strpos($ValueField, '%') === false))
-                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    if (!(strpos($ValueField, '%') === false))
+                        $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
                     else
-                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+                        $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
@@ -362,9 +362,9 @@ 
 	function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+		else  $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
 	}
 
@@ -380,9 +380,9 @@ 
 	function build_filterField($TypeField, $NameField, $ValueField)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$szFilterField='';
+		$szFilterField = '';
 		$InfoFieldList = explode(":", $TypeField);
 
 		// build the input field on depend of the type of file
@@ -390,52 +390,52 @@ 
 		{
 			case 'Text':
 			case 'Date':
-				$szFilterField='<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
+				$szFilterField = '<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Duree':
 			case 'Numeric':
 			case 'Number':
 				// Must be a string text to allow to use comparison strings like "<= 999"
-			    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+			    $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
-				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				else $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				if (!empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField = '<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				else $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Boolean':
-				$szFilterField='<select name="'.$NameField.'" class="flat">';
-				$szFilterField.='<option ';
-				if ($ValueField=='') $szFilterField.=' selected ';
-				$szFilterField.=' value="">&nbsp;</option>';
-
-				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
-				$szFilterField.=' value="1">'.yn(1).'</option>';
-
-				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
-				$szFilterField.=' value="0">'.yn(0).'</option>';
-				$szFilterField.="</select>";
+				$szFilterField = '<select name="'.$NameField.'" class="flat">';
+				$szFilterField .= '<option ';
+				if ($ValueField == '') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="">&nbsp;</option>';
+
+				$szFilterField .= '<option ';
+				if ($ValueField == 'yes' || $ValueField == '1') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="1">'.yn(1).'</option>';
+
+				$szFilterField .= '<option ';
+				if ($ValueField == 'no' || $ValueField == '0') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="0">'.yn(0).'</option>';
+				$szFilterField .= "</select>";
 				break;
 			case 'List':
 				// 0 : Type du champ
 				// 1 : Nom de la table
 				// 2 : Nom du champ contenant le libelle
 				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
-				if (count($InfoFieldList)==4)
-					$keyList=$InfoFieldList[3];
+				if (count($InfoFieldList) == 4)
+					$keyList = $InfoFieldList[3];
 				else
-					$keyList='rowid';
-				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+					$keyList = 'rowid';
+				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
+				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[1];
 
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$szFilterField='<select class="flat" name="'.$NameField.'">';
-					$szFilterField.='<option value="0">&nbsp;</option>';
+					$szFilterField = '<select class="flat" name="'.$NameField.'">';
+					$szFilterField .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 
 					$i = 0;
@@ -451,30 +451,30 @@ 
 								continue;
 							}
 							//var_dump($InfoFieldList[1]);
-							$labeltoshow=dol_trunc($obj->label,18);
+							$labeltoshow = dol_trunc($obj->label, 18);
 							if ($InfoFieldList[1] == 'c_stcomm')
 							{
 								$langs->load("companies");
-								$labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
+								$labeltoshow = (($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id) ? $langs->trans("StatusProspect".$obj->id) : $obj->label);
 							}
 							if ($InfoFieldList[1] == 'c_country')
 							{
 								//var_dump($sql);
 								$langs->load("dict");
-								$labeltoshow=(($langs->trans("Country".$obj->code) != "Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label);
+								$labeltoshow = (($langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label);
 							}
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
-								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 							else
 							{
-								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
+								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
 						}
 					}
-					$szFilterField.="</select>";
+					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
 				}
@@ -495,12 +495,12 @@ 
 	{
         global $langs;
 
-		$szMsg='';
+		$szMsg = '';
 		$InfoFieldList = explode(":", $TypeField);
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				$szMsg= $langs->trans('ExportStringFilter');
+				$szMsg = $langs->trans('ExportStringFilter');
 				break;
 			case 'Date':
 				$szMsg = $langs->trans('ExportDateFilter');
@@ -535,37 +535,37 @@ 
 	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
  	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$indice=0;
+		$indice = 0;
 		asort($array_selected);
 
 		dol_syslog(get_class($this)."::".__FUNCTION__." ".$model.", ".$datatoexport.", ".implode(",", $array_selected));
 
 		// Check parameters or context properties
-		if (empty($this->array_export_fields) || ! is_array($this->array_export_fields))
+		if (empty($this->array_export_fields) || !is_array($this->array_export_fields))
 		{
-			$this->error="ErrorBadParameter";
+			$this->error = "ErrorBadParameter";
 			return -1;
 		}
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
+		if (!empty($sqlquery)) $sql = $sqlquery;
         else
 		{
 			// Define value for indice from $datatoexport
-			$foundindice=0;
-			foreach($this->array_export_code as $key => $dataset)
+			$foundindice = 0;
+			foreach ($this->array_export_code as $key => $dataset)
 			{
 				if ($datatoexport == $dataset)
 				{
-					$indice=$key;
+					$indice = $key;
 					$foundindice++;
 					//print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
 					break;
@@ -573,31 +573,31 @@ 
 			}
 			if (empty($foundindice))
 			{
-				$this->error="ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
+				$this->error = "ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
 				return -1;
 			}
-        	$sql=$this->build_sql($indice, $array_selected, $array_filterValue);
+        	$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
 		}
 
 		// Run the sql
-		$this->sqlusedforexport=$sql;
+		$this->sqlusedforexport = $sql;
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
 			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
 			else
-				$filename="export_".$datatoexport;
-			$filename.='.'.$objmodel->getDriverExtension();
-			$dirname=$conf->export->dir_temp.'/'.$user->id;
+				$filename = "export_".$datatoexport;
+			$filename .= '.'.$objmodel->getDriverExtension();
+			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
 			$outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
 
 			// Open file
 			dol_mkdir($dirname);
-			$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
+			$result = $objmodel->open_file($dirname."/".$filename, $outputlangs);
 
 			if ($result >= 0)
 			{
@@ -605,64 +605,64 @@ 
 				$objmodel->write_header($outputlangs);
 
 				// Genere ligne de titre
-				$objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
+				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, $this->array_export_TypeFields[$indice]);
 
 				while ($obj = $this->db->fetch_object($resql))
 				{
 					// Process special operations
-					if (! empty($this->array_export_special[$indice]))
+					if (!empty($this->array_export_special[$indice]))
 					{
 						foreach ($this->array_export_special[$indice] as $key => $value)
 						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+							if (!array_key_exists($key, $array_selected)) continue; // Field not selected
 							// Operation NULLIFNEG
-							if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
+							if ($this->array_export_special[$indice][$key] == 'NULLIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								if ($obj->$alias < 0) $obj->$alias = '';
 							}
 							// Operation ZEROIFNEG
-							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
+							elseif ($this->array_export_special[$indice][$key] == 'ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='0';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								if ($obj->$alias < 0) $obj->$alias = '0';
 							}
 							// Operation INVOICEREMAINTOPAY
-							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
+							elseif ($this->array_export_special[$indice][$key] == 'getRemainToPay')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								$remaintopay='';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								$remaintopay = '';
 								if ($obj->f_rowid > 0)
 								{
 								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall))
+								    if (!is_object($tmpobjforcomputecall))
 								    {
 								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall=new Facture($this->db);
+								        $tmpobjforcomputecall = new Facture($this->db);
 								    }
 								    $tmpobjforcomputecall->id = $obj->f_rowid;
 								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
+								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
-								$obj->$alias=$remaintopay;
+								$obj->$alias = $remaintopay;
 							}
 							else
 							{
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
-							    $computestring=$this->array_export_special[$indice][$key];
-							    $tmp=dol_eval($computestring, 1, 0);
-							    $obj->$alias=$tmp;
+							    $computestring = $this->array_export_special[$indice][$key];
+							    $tmp = dol_eval($computestring, 1, 0);
+							    $obj->$alias = $tmp;
 
-							    $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+							    $this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
 							    return -1;
 							}
 						}
 					}
 					// end of special operation processing
-					$objmodel->write_record($array_selected,$obj,$outputlangs,$this->array_export_TypeFields[$indice]);
+					$objmodel->write_record($array_selected, $obj, $outputlangs, $this->array_export_TypeFields[$indice]);
 				}
 
 				// Genere en-tete
@@ -675,14 +675,14 @@ 
 			}
 			else
 			{
-				$this->error=$objmodel->error;
+				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error()." - sql=".$sql;
+			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
 	}
@@ -701,24 +701,24 @@ 
 
 		$this->db->begin();
 
-		$filter='';
+		$filter = '';
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
-		$sql.= 'label,';
-		$sql.= 'type,';
-		$sql.= 'field,';
-		$sql.= 'fk_user,';
-		$sql.= 'filter';
-		$sql.= ') VALUES (';
-		$sql.= "'".$this->db->escape($this->model_name)."',";
-		$sql.= "'".$this->db->escape($this->datatoexport)."',";
-		$sql.= "'".$this->db->escape($this->hexa)."',";
-		$sql.= "'".$user->id."',";
-		$sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
-		$sql.= ")";
+		$sql .= 'label,';
+		$sql .= 'type,';
+		$sql .= 'field,';
+		$sql .= 'fk_user,';
+		$sql .= 'filter';
+		$sql .= ') VALUES (';
+		$sql .= "'".$this->db->escape($this->model_name)."',";
+		$sql .= "'".$this->db->escape($this->datatoexport)."',";
+		$sql .= "'".$this->db->escape($this->hexa)."',";
+		$sql .= "'".$user->id."',";
+		$sql .= "'".$this->db->escape($this->hexafiltervalue)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
@@ -726,8 +726,8 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errno=$this->db->lasterrno();
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
 			return -1;
 		}
@@ -742,8 +742,8 @@ 
 	function fetch($id)
 	{
 		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
-		$sql.= ' WHERE em.rowid = '.$id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
+		$sql .= ' WHERE em.rowid = '.$id;
 
 		dol_syslog("Export::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -752,18 +752,18 @@ 
 			$obj = $this->db->fetch_object($result);
 			if ($obj)
 			{
-				$this->id				= $obj->rowid;
-				$this->model_name		= $obj->label;
-				$this->datatoexport		= $obj->type;
+				$this->id = $obj->rowid;
+				$this->model_name = $obj->label;
+				$this->datatoexport = $obj->type;
 
-				$this->hexa				= $obj->field;
-				$this->hexafiltervalue	= $obj->filter;
+				$this->hexa = $obj->field;
+				$this->hexafiltervalue = $obj->filter;
 
 				return 1;
 			}
 			else
 			{
-				$this->error="ModelNotFound";
+				$this->error = "ModelNotFound";
 				return -2;
 			}
 		}
@@ -782,23 +782,23 @@ 
 	 *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return		int							<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action call a trigger.
@@ -815,13 +815,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -843,8 +843,8 @@ 
 		global $conf, $langs;
 
 		$sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model as em";
-		$sql.= " ORDER BY rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model as em";
+		$sql .= " ORDER BY rowid";
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -858,19 +858,19 @@ 
 				print "<tr>";
 				print '<td><a href=export.php?step=2&action=select_model&exportmodelid='.$obj->rowid.'&datatoexport='.$obj->type.'>'.$obj->label.'</a></td>';
 				print '<td>';
-				print img_object($this->array_export_module[$keyModel]->getName(),$this->array_export_icon[$keyModel]).' ';
+				print img_object($this->array_export_module[$keyModel]->getName(), $this->array_export_icon[$keyModel]).' ';
 				print $this->array_export_module[$keyModel]->getName().' - ';
 				// recuperation du nom de l'export
 
-				$string=$langs->trans($this->array_export_label[$keyModel]);
-				print ($string!=$this->array_export_label[$keyModel]?$string:$this->array_export_label[$keyModel]);
+				$string = $langs->trans($this->array_export_label[$keyModel]);
+				print ($string != $this->array_export_label[$keyModel] ? $string : $this->array_export_label[$keyModel]);
 				print '</td>';
 				//print '<td>'.$obj->type.$keyModel.'</td>';
-				print '<td>'.str_replace(',',' , ',$obj->field).'</td>';
-				if (! empty($obj->filter)) {
+				print '<td>'.str_replace(',', ' , ', $obj->field).'</td>';
+				if (!empty($obj->filter)) {
 					$filter = json_decode($obj->filter, true);
-					print '<td>'.str_replace(',',' , ',$filter['field']).'</td>';
-					print '<td>'.str_replace(',',' , ',$filter['value']).'</td>';
+					print '<td>'.str_replace(',', ' , ', $filter['field']).'</td>';
+					print '<td>'.str_replace(',', ' , ', $filter['value']).'</td>';
 				}
 				// suppression de l'export
 				print '<td align="right">';

Braces +127 added lines, -80 removed lines

@@ -108,8 +108,12 @@ 
 						// Defined if module is enabled
 						$enabled=true;
 						$part=strtolower(preg_replace('/^mod/i','',$modulename));
-						if ($part == 'propale') $part='propal';
-						if (empty($conf->$part->enabled)) $enabled=false;
+						if ($part == 'propale') {
+						    $part='propal';
+						}
+						if (empty($conf->$part->enabled)) {
+						    $enabled=false;
+						}
 
 						if ($enabled)
 						{
@@ -124,10 +128,14 @@ 
 							    foreach($module->export_code as $r => $value)
 								{
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+								    if ($filter && ($filter != $module->export_code[$r])) {
+								        continue;
+								    }
 
                                     // Test if condition to show are ok
-                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) continue;
+                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) {
+                                        continue;
+                                    }
 
                                     // Test if permissions are ok
 									$bool=true;
@@ -140,13 +148,16 @@ 
 	    									if (! empty($perm[2]))
 	    									{
 	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
+	    									} else
 	    									{
 	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
 	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
+	    									if ($perm[0]=='user' && $user->admin) {
+	    									    $bool=true;
+	    									}
+	    									if (! $bool) {
+	    									    break;
+	    									}
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -229,10 +240,19 @@ 
 		//print_r($array_selected);
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
-			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-            if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
-			if ($i > 0) $sql.=', ';
-			else $i++;
+			if (! array_key_exists($key, $array_selected)) {
+			    continue;
+			}
+			// Field not selected
+            if (preg_match('/^none\./', $key)) {
+                continue;
+            }
+            // A field that must not appears into SQL
+			if ($i > 0) {
+			    $sql.=', ';
+			} else {
+			    $i++;
+			}
 
 			if (strpos($key, ' as ')===false) {
 				$newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
@@ -251,8 +271,12 @@ 
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
-			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+			    if (preg_match('/GROUP_CONCAT/i', $key)) {
+			        continue;
+			    }
+				if ($value != '') {
+				    $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				}
 			}
 			$sql.=$sqlWhere;
 		}
@@ -266,7 +290,9 @@ 
 		    // Loop on each condition to add
 		    foreach ($array_filterValue as $key => $value)
 		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') {
+		            $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        }
 		    }
 		}
 
@@ -290,10 +316,11 @@ 
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+				if (! (strpos($ValueField, '%') === false)) {
+									$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+				} else {
+									$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+				}
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -302,13 +329,13 @@ 
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
 					$szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
-				}
-				else
+				} else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
-					else
-						$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+					if (is_numeric(substr($ValueField,0,1))) {
+											$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
+					} else {
+											$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+					}
 				}
 				break;
 			case 'Duree':
@@ -321,13 +348,13 @@ 
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
+				} else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+					if (is_numeric(substr($ValueField,0,1))) {
+											$szFilterQuery=" ".$NameField."=".$ValueField;
+					} else {
+											$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+					}
 				}
 				break;
 			case 'Boolean':
@@ -335,13 +362,14 @@ 
 				break;
 			case 'Status':
 			case 'List':
-				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else {
-                    if (! (strpos($ValueField, '%') === false))
-                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
-                    else
-                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+				if (is_numeric($ValueField)) {
+									$szFilterQuery=" ".$NameField."=".$ValueField;
+				} else {
+                    if (! (strpos($ValueField, '%') === false)) {
+                                            $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    } else {
+                                            $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+                    }
 				}
 				break;
 			default:
@@ -362,9 +390,13 @@ 
 	function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		if (strlen($Value)==4) {
+		    $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+		} elseif (strlen($Value)==6) {
+		    $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+		} else {
+		    $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		}
 		return $Condition;
 	}
 
@@ -399,21 +431,30 @@ 
 			    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
-				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				else $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) {
+				    $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				} else {
+				    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				}
 				break;
 			case 'Boolean':
 				$szFilterField='<select name="'.$NameField.'" class="flat">';
 				$szFilterField.='<option ';
-				if ($ValueField=='') $szFilterField.=' selected ';
+				if ($ValueField=='') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="">&nbsp;</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
+				if ($ValueField=='yes' || $ValueField == '1') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="1">'.yn(1).'</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
+				if ($ValueField=='no' || $ValueField=='0') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="0">'.yn(0).'</option>';
 				$szFilterField.="</select>";
 				break;
@@ -422,13 +463,18 @@ 
 				// 1 : Nom de la table
 				// 2 : Nom du champ contenant le libelle
 				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
-				if (count($InfoFieldList)==4)
-					$keyList=$InfoFieldList[3];
-				else
-					$keyList='rowid';
+				if (count($InfoFieldList)==4) {
+									$keyList=$InfoFieldList[3];
+				} else {
+									$keyList='rowid';
+				}
 				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+				if ($InfoFieldList[1] == 'c_stcomm') {
+				    $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+				}
+				if ($InfoFieldList[1] == 'c_country') {
+				    $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+				}
 				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
 
 				$resql = $this->db->query($sql);
@@ -466,8 +512,7 @@ 
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
+							} else
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
@@ -477,8 +522,9 @@ 
 					$szFilterField.="</select>";
 
 					$this->db->free($resql);
+				} else {
+				    dol_print_error($this->db);
 				}
-				else dol_print_error($this->db);
 				break;
 		}
 
@@ -556,8 +602,9 @@ 
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
-        else
+		if (! empty($sqlquery)) {
+		    $sql = $sqlquery;
+		} else
 		{
 			// Define value for indice from $datatoexport
 			$foundindice=0;
@@ -586,10 +633,11 @@ 
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
-			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename="export_".$datatoexport;
+			if ($conf->global->EXPORT_PREFIX_SPEC) {
+							$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+			} else {
+							$filename="export_".$datatoexport;
+			}
 			$filename.='.'.$objmodel->getDriverExtension();
 			$dirname=$conf->export->dir_temp.'/'.$user->id;
 
@@ -614,20 +662,27 @@ 
 					{
 						foreach ($this->array_export_special[$indice] as $key => $value)
 						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+							if (! array_key_exists($key, $array_selected)) {
+							    continue;
+							}
+							// Field not selected
 							// Operation NULLIFNEG
 							if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='';
+								if ($obj->$alias < 0) {
+								    $obj->$alias='';
+								}
 							}
 							// Operation ZEROIFNEG
 							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='0';
+								if ($obj->$alias < 0) {
+								    $obj->$alias='0';
+								}
 							}
 							// Operation INVOICEREMAINTOPAY
 							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
@@ -648,8 +703,7 @@ 
 								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias=$remaintopay;
-							}
-							else
+							} else
 							{
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
 							    $computestring=$this->array_export_special[$indice][$key];
@@ -672,15 +726,13 @@ 
 				$objmodel->close_file();
 
         		return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." - sql=".$sql;
 			return -1;
@@ -723,8 +775,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errno=$this->db->lasterrno();
@@ -760,14 +811,12 @@ 
 				$this->hexafiltervalue	= $obj->filter;
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error="ModelNotFound";
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -3;
@@ -822,8 +871,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -881,8 +929,7 @@ 
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}

dolibarr/htdocs/exports/export.php

Indentation +477 added lines, -477 removed lines

@@ -40,85 +40,85 @@ 
 //  accessforbidden();
 
 $entitytoicon = array(
-	'invoice'      => 'bill',
+    'invoice'      => 'bill',
     'invoice_line' => 'bill',
-	'order'        => 'order',
+    'order'        => 'order',
     'order_line'   => 'order',
-	'propal'       => 'propal',
+    'propal'       => 'propal',
     'propal_line'  => 'propal',
-	'intervention' => 'intervention',
+    'intervention' => 'intervention',
     'inter_line'   => 'intervention',
-	'member'       => 'user',
+    'member'       => 'user',
     'member_type'  => 'group',
     'subscription' => 'payment',
     'payment'      => 'payment',
-	'tax'          => 'generic',
+    'tax'          => 'generic',
     'tax_type'     => 'generic',
     'stock'        => 'generic',
     'other'        => 'generic',
-	'account'      => 'account',
-	'product'      => 'product',
+    'account'      => 'account',
+    'product'      => 'product',
     'virtualproduct'=>'product',
-	'subproduct'   => 'product',
-	'product_supplier_ref'      => 'product',
-	'warehouse'    => 'stock',
-	'batch'        => 'stock',
-	'stockbatch'   => 'stock',
-	'category'     => 'category',
-	'shipment'     => 'sending',
+    'subproduct'   => 'product',
+    'product_supplier_ref'      => 'product',
+    'warehouse'    => 'stock',
+    'batch'        => 'stock',
+    'stockbatch'   => 'stock',
+    'category'     => 'category',
+    'shipment'     => 'sending',
     'shipment_line'=> 'sending',
     'reception'=> 'sending',
     'reception_line'=> 'sending',
-	'expensereport'=> 'trip',
+    'expensereport'=> 'trip',
     'expensereport_line'=> 'trip',
-	'holiday'      => 'holiday',
+    'holiday'      => 'holiday',
     'contract_line' => 'contract',
     'translation'  => 'generic'
 );
 
 // Translation code
 $entitytolang = array(
-	'user'         => 'User',
-	'company'      => 'Company',
+    'user'         => 'User',
+    'company'      => 'Company',
     'contact'      => 'Contact',
-	'invoice'      => 'Bill',
+    'invoice'      => 'Bill',
     'invoice_line' => 'InvoiceLine',
-	'order'        => 'Order',
+    'order'        => 'Order',
     'order_line'   => 'OrderLine',
     'propal'       => 'Proposal',
     'propal_line'  => 'ProposalLine',
-	'intervention' => 'Intervention',
+    'intervention' => 'Intervention',
     'inter_line'   => 'InterLine',
-	'member'       => 'Member',
+    'member'       => 'Member',
     'member_type'  => 'MemberType',
     'subscription' => 'Subscription',
-	'tax'          => 'SocialContribution',
+    'tax'          => 'SocialContribution',
     'tax_type'     => 'DictionarySocialContributions',
-	'account'      => 'BankTransactions',
-	'payment'      => 'Payment',
-	'product'      => 'Product',
-	'virtualproduct'  => 'AssociatedProducts',
-	'subproduct'      => 'SubProduct',
-	'product_supplier_ref'      => 'SupplierPrices',
-	'service'      => 'Service',
+    'account'      => 'BankTransactions',
+    'payment'      => 'Payment',
+    'product'      => 'Product',
+    'virtualproduct'  => 'AssociatedProducts',
+    'subproduct'      => 'SubProduct',
+    'product_supplier_ref'      => 'SupplierPrices',
+    'service'      => 'Service',
     'stock'        => 'Stock',
-	'movement'	   => 'StockMovement',
-	'batch'        => 'Batch',
-	'stockbatch'   => 'StockDetailPerBatch',
-	'warehouse'    => 'Warehouse',
-	'category'     => 'Category',
-	'other'        => 'Other',
+    'movement'	   => 'StockMovement',
+    'batch'        => 'Batch',
+    'stockbatch'   => 'StockDetailPerBatch',
+    'warehouse'    => 'Warehouse',
+    'category'     => 'Category',
+    'other'        => 'Other',
     'trip'         => 'TripsAndExpenses',
     'shipment'     => 'Shipments',
     'shipment_line'=> 'ShipmentLine',
     'project'      => 'Projects',
     'projecttask'  => 'Tasks',
     'task_time'    => 'TaskTimeSpent',
-	'action'       => 'Event',
-	'expensereport'=> 'ExpenseReport',
-	'expensereport_line'=> 'ExpenseReportLine',
-	'holiday'      => 'TitreRequestCP',
-	'contract'     => 'Contract',
+    'action'       => 'Event',
+    'expensereport'=> 'ExpenseReport',
+    'expensereport_line'=> 'ExpenseReportLine',
+    'holiday'      => 'TitreRequestCP',
+    'contract'     => 'Contract',
     'contract_line'=> 'ContractLine',
     'translation'  => 'Translation'
 );
@@ -155,19 +155,19 @@ 
 
 if ($action=='selectfield')     // Selection of field at step 2
 {
-	$fieldsarray=$objexport->array_export_fields[0];
-	$fieldsentitiesarray=$objexport->array_export_entities[0];
+    $fieldsarray=$objexport->array_export_fields[0];
+    $fieldsentitiesarray=$objexport->array_export_entities[0];
     $fieldsdependenciesarray=$objexport->array_export_dependencies[0];
 
     if ($field=='all')
     {
-		foreach($fieldsarray as $key=>$val)
-		{
-			if (! empty($array_selected[$key])) continue;		// If already selected, check next
-			$array_selected[$key]=count($array_selected)+1;
-		    //print_r($array_selected);
-		    $_SESSION["export_selected_fields"]=$array_selected;
-		}
+        foreach($fieldsarray as $key=>$val)
+        {
+            if (! empty($array_selected[$key])) continue;		// If already selected, check next
+            $array_selected[$key]=count($array_selected)+1;
+            //print_r($array_selected);
+            $_SESSION["export_selected_fields"]=$array_selected;
+        }
     }
     else
     {
@@ -205,33 +205,33 @@ 
                 }
             }
         }
-	    //print_r($array_selected);
-	    $_SESSION["export_selected_fields"]=$array_selected;
+        //print_r($array_selected);
+        $_SESSION["export_selected_fields"]=$array_selected;
 
-	    setEventMessages($warnings, null, 'warnings');
+        setEventMessages($warnings, null, 'warnings');
     }
 }
 if ($action=='unselectfield')
 {
     if ($_GET["field"]=='all')
     {
-		$array_selected=array();
-		$_SESSION["export_selected_fields"]=$array_selected;
+        $array_selected=array();
+        $_SESSION["export_selected_fields"]=$array_selected;
     }
     else
     {
-	    unset($array_selected[$_GET["field"]]);
-	    // Renumber fields of array_selected (from 1 to nb_elements)
-	    asort($array_selected);
-	    $i=0;
-	    $array_selected_save=$array_selected;
-	    foreach($array_selected as $code=>$value)
-	    {
-	        $i++;
-	        $array_selected[$code]=$i;
-	        //print "x $code x $i y<br>";
-	    }
-	    $_SESSION["export_selected_fields"]=$array_selected;
+        unset($array_selected[$_GET["field"]]);
+        // Renumber fields of array_selected (from 1 to nb_elements)
+        asort($array_selected);
+        $i=0;
+        $array_selected_save=$array_selected;
+        foreach($array_selected as $code=>$value)
+        {
+            $i++;
+            $array_selected[$code]=$i;
+            //print "x $code x $i y<br>";
+        }
+        $_SESSION["export_selected_fields"]=$array_selected;
     }
 }
 
@@ -277,88 +277,88 @@ 
     }
 
     // Build export file
-	$result=$objexport->build_file($user, GETPOST('model','alpha'), $datatoexport, $array_selected, $array_filtervalue);
-	if ($result < 0)
-	{
-		setEventMessages($objexport->error, $objexport->errors, 'errors');
-		$sqlusedforexport=$objexport->sqlusedforexport;
-	}
-	else
-	{
-		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
-	    $sqlusedforexport=$objexport->sqlusedforexport;
+    $result=$objexport->build_file($user, GETPOST('model','alpha'), $datatoexport, $array_selected, $array_filtervalue);
+    if ($result < 0)
+    {
+        setEventMessages($objexport->error, $objexport->errors, 'errors');
+        $sqlusedforexport=$objexport->sqlusedforexport;
+    }
+    else
+    {
+        setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
+        $sqlusedforexport=$objexport->sqlusedforexport;
     }
 }
 
 // Delete file
 if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes')
 {
-	$file = $upload_dir . "/" . GETPOST('file');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+    $file = $upload_dir . "/" . GETPOST('file');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 
-	$ret=dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
-	header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
-	exit;
+    $ret=dol_delete_file($file);
+    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+    header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
+    exit;
 }
 
 if ($action == 'deleteprof')
 {
-	if ($_GET["id"])
-	{
-		$objexport->fetch($_GET["id"]);
-		$result=$objexport->delete($user);
-	}
+    if ($_GET["id"])
+    {
+        $objexport->fetch($_GET["id"]);
+        $result=$objexport->delete($user);
+    }
 }
 
 // TODO The export for filter is not yet implemented (old code created conflicts with step 2). We must use same way of working and same combo list of predefined export than step 2.
 if ($action == 'add_export_model')
 {
-	if ($export_name)
-	{
-		asort($array_selected);
-
-		// Set save string
-		$hexa='';
-		foreach($array_selected as $key=>$val)
-		{
-			if ($hexa) $hexa.=',';
-			$hexa.=$key;
-		}
-
-		$hexafiltervalue='';
-		if (! empty($array_filtervalue) && is_array($array_filtervalue))
-		{
-			foreach($array_filtervalue as $key=>$val)
-			{
-				if ($hexafiltervalue) $hexafiltervalue.=',';
-				$hexafiltervalue.=$key.'='.$val;
-			}
-		}
-
-	    $objexport->model_name = $export_name;
-	    $objexport->datatoexport = $datatoexport;
-	    $objexport->hexa = $hexa;
-	    $objexport->hexafiltervalue = $hexafiltervalue;
-
-	    $result = $objexport->create($user);
-		if ($result >= 0)
-		{
-			setEventMessages($langs->trans("ExportModelSaved",$objexport->model_name), null, 'mesgs');
-		}
-		else
-		{
-			$langs->load("errors");
-			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else
-				setEventMessages($objexport->error, $objexport->errors, 'errors');
-		}
-	}
-	else
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
-	}
+    if ($export_name)
+    {
+        asort($array_selected);
+
+        // Set save string
+        $hexa='';
+        foreach($array_selected as $key=>$val)
+        {
+            if ($hexa) $hexa.=',';
+            $hexa.=$key;
+        }
+
+        $hexafiltervalue='';
+        if (! empty($array_filtervalue) && is_array($array_filtervalue))
+        {
+            foreach($array_filtervalue as $key=>$val)
+            {
+                if ($hexafiltervalue) $hexafiltervalue.=',';
+                $hexafiltervalue.=$key.'='.$val;
+            }
+        }
+
+        $objexport->model_name = $export_name;
+        $objexport->datatoexport = $datatoexport;
+        $objexport->hexa = $hexa;
+        $objexport->hexafiltervalue = $hexafiltervalue;
+
+        $result = $objexport->create($user);
+        if ($result >= 0)
+        {
+            setEventMessages($langs->trans("ExportModelSaved",$objexport->model_name), null, 'mesgs');
+        }
+        else
+        {
+            $langs->load("errors");
+            if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
+            else
+                setEventMessages($objexport->error, $objexport->errors, 'errors');
+        }
+    }
+    else
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
+    }
 }
 
 // Reload an predefined export model
@@ -373,50 +373,50 @@ 
     $result = $objexport->fetch($exportmodelid);
     if ($result > 0)
     {
-		$fieldsarray=explode(',',$objexport->hexa);
-		$i=1;
-		foreach($fieldsarray as $val)
-		{
-			$array_selected[$val]=$i;
-			$i++;
-		}
-		$_SESSION["export_selected_fields"]=$array_selected;
-
-		$fieldsarrayvalue=explode(',',$objexport->hexafiltervalue);
-		$i=1;
-		foreach($fieldsarrayvalue as $val)
-		{
-			$tmp=explode('=',$val);
-			$array_filtervalue[$tmp[0]]=$tmp[1];
-			$i++;
-		}
-		$_SESSION["export_filtered_fields"]=$array_filtervalue;
+        $fieldsarray=explode(',',$objexport->hexa);
+        $i=1;
+        foreach($fieldsarray as $val)
+        {
+            $array_selected[$val]=$i;
+            $i++;
+        }
+        $_SESSION["export_selected_fields"]=$array_selected;
+
+        $fieldsarrayvalue=explode(',',$objexport->hexafiltervalue);
+        $i=1;
+        foreach($fieldsarrayvalue as $val)
+        {
+            $tmp=explode('=',$val);
+            $array_filtervalue[$tmp[0]]=$tmp[1];
+            $i++;
+        }
+        $_SESSION["export_filtered_fields"]=$array_filtervalue;
     }
 }
 
 // Get form with filters
 if ($step == 4 && $action == 'submitFormField')
 {
-	// on boucle sur les champs selectionne pour recuperer la valeur
-	if (is_array($objexport->array_export_TypeFields[0]))
-	{
-		$_SESSION["export_filtered_fields"]=array();
-		foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
-		{
-			$newcode=(string) preg_replace('/\./','_',$code);
-			//print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
-			$filterqualified=1;
-			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified=0;
-			elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) $filterqualified=0;
-			if ($filterqualified)
-			{
-				//print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
-				$objexport->array_export_FilterValue[0][$code] = $_POST[$newcode];
-			}
-		}
-		$array_filtervalue=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
-		$_SESSION["export_filtered_fields"]=$array_filtervalue;
-	}
+    // on boucle sur les champs selectionne pour recuperer la valeur
+    if (is_array($objexport->array_export_TypeFields[0]))
+    {
+        $_SESSION["export_filtered_fields"]=array();
+        foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
+        {
+            $newcode=(string) preg_replace('/\./','_',$code);
+            //print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
+            $filterqualified=1;
+            if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified=0;
+            elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) $filterqualified=0;
+            if ($filterqualified)
+            {
+                //print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
+                $objexport->array_export_FilterValue[0][$code] = $_POST[$newcode];
+            }
+        }
+        $array_filtervalue=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
+        $_SESSION["export_filtered_fields"]=$array_filtervalue;
+    }
 }
 
 
@@ -465,24 +465,24 @@ 
         {
             $val=!$val;
             print '<tr '.$bc[$val].'><td nospan="nospan">';
-	        //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
+            //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
             print $objexport->array_export_module[$key]->getName();
             print '</td><td>';
-			$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[$key]);
-			$label=$objexport->array_export_label[$key];
+            $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[$key]);
+            $label=$objexport->array_export_label[$key];
             //print $value.'-'.$icon.'-'.$label."<br>";
-			print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
+            print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
             print $label;
             print '</td><td align="right">';
             if ($objexport->array_export_perms[$key])
             {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
+                print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
             }
             else
             {
-            	print $langs->trans("NotEnoughPermissions");
+                print $langs->trans("NotEnoughPermissions");
             }
-           	print '</td></tr>';
+                print '</td></tr>';
         }
     }
     else
@@ -531,7 +531,7 @@ 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+    $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     $label=$objexport->array_export_label[0];
     //print $value.'-'.$icon.'-'.$label."<br>";
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
@@ -554,7 +554,7 @@ 
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectExportFields").' ';
     if(empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1,$user->id);
-	else $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+    else $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
     print ' ';
     print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
     print '</td></tr></table>';
@@ -563,7 +563,7 @@ 
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Entities").'</td>';
+    print '<td>'.$langs->trans("Entities").'</td>';
     print '<td>'.$langs->trans("ExportableFields").'</td>';
     print '<td width="100" align="center">';
     print '<a class="liste_titre" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
@@ -578,13 +578,13 @@ 
     // Select request if all fields are selected
     $sqlmaxforexport=$objexport->build_sql(0, array(), array());
 
-	//    $this->array_export_module[0]=$module;
-	//    $this->array_export_code[0]=$module->export_code[$r];
-	//    $this->array_export_label[0]=$module->export_label[$r];
-	//    $this->array_export_sql[0]=$module->export_sql[$r];
-	//    $this->array_export_fields[0]=$module->export_fields_array[$r];
-	//    $this->array_export_entities[0]=$module->export_fields_entities[$r];
-	//    $this->array_export_alias[0]=$module->export_fields_alias[$r];
+    //    $this->array_export_module[0]=$module;
+    //    $this->array_export_code[0]=$module->export_code[$r];
+    //    $this->array_export_label[0]=$module->export_label[$r];
+    //    $this->array_export_sql[0]=$module->export_sql[$r];
+    //    $this->array_export_fields[0]=$module->export_fields_array[$r];
+    //    $this->array_export_entities[0]=$module->export_fields_entities[$r];
+    //    $this->array_export_alias[0]=$module->export_fields_alias[$r];
 
     $i = 0;
 
@@ -623,16 +623,16 @@ 
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
-   		if (! empty($objexport->array_export_examplevalues[0][$code]))
-		{
-		    $htmltext.='<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
-		}
-    	if (! empty($objexport->array_export_TypeFields[0][$code]))
-		{
-		    $htmltext.='<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
-		}
-
-		if (isset($array_selected[$code]) && $array_selected[$code])
+            if (! empty($objexport->array_export_examplevalues[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+        }
+        if (! empty($objexport->array_export_TypeFields[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+        }
+
+        if (isset($array_selected[$code]) && $array_selected[$code])
         {
             // Selected fields
             print '<td>&nbsp;</td>';
@@ -640,16 +640,16 @@ 
             print '<td>';
             //print $text.'-'.$htmltext."<br>";
             print $form->textwithpicto($text,$htmltext);
-			//print ' ('.$code.')';
+            //print ' ('.$code.')';
             print '</td>';
         }
         else
         {
-        	// Fields not selected
+            // Fields not selected
             print '<td>';
-			//print $text.'-'.$htmltext."<br>";
-			print $form->textwithpicto($text,$htmltext);
-			//print ' ('.$code.')';
+            //print $text.'-'.$htmltext."<br>";
+            print $form->textwithpicto($text,$htmltext);
+            //print ' ('.$code.')';
             print '</td>';
             print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
             print '<td>&nbsp;</td>';
@@ -667,21 +667,21 @@ 
     print '<div class="tabsAction tabsActionNoBottom">';
 
     if (count($array_selected))
-	{
-		// If filters exist
-		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-		{
-			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
-		{
-			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-	}
-	else
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
-	}
+    {
+        // If filters exist
+        if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+        {
+            print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
+        }
+        else
+        {
+            print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
+        }
+    }
+    else
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
+    }
 
     print '</div>';
 }
@@ -697,167 +697,167 @@ 
 
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-	/*
+    /*
 	 * Affichage onglets
 	*/
-	$h = 0;
+    $h = 0;
 
-	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-	$head[$h][1] = $langs->trans("Step")." 1";
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+    $head[$h][1] = $langs->trans("Step")." 1";
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-	$head[$h][1] = $langs->trans("Step")." 2";
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+    $head[$h][1] = $langs->trans("Step")." 2";
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-	$head[$h][1] = $langs->trans("Step")." 3";
-	$hselected=$h;
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+    $head[$h][1] = $langs->trans("Step")." 3";
+    $hselected=$h;
+    $h++;
 
-	dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
+    dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
-	print '<table width="100%" class="border">';
-
-	// Module
-	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
-	print '<td>';
-	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-	print $objexport->array_export_module[0]->getName();
-	print '</td></tr>';
-
-	// Lot de donnees a exporter
-	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-	print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
-	$label=$objexport->array_export_label[0];
-	//print $value.'-'.$icon.'-'.$label."<br>";
-	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-	print $label;
-	print '</td></tr>';
-
-	// Nbre champs exportes
-	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-	$list='';
-	foreach($array_selected as $code=>$value)
-	{
-		$list.=(! empty($list)?', ':'');
-		$list.=(isset($objexport->array_export_fields[0][$code])?$langs->trans($objexport->array_export_fields[0][$code]):'');
-	}
-	print '<td>'.$list.'</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-	// Combo list of export models
-	print $langs->trans("SelectFilterFields").'<br>';
-
-
-	// un formulaire en plus pour recuperer les filtres
-	print '<form action="'.$_SERVER["PHP_SELF"].'?step=4&action=submitFormField&datatoexport='.$datatoexport.'" name="FilterField" method="post">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Entities").'</td>';
-	//print '<td>'.$langs->trans("ExportableFields").'</td>';
-	//print '<td align="center"></td>';
-	print '<td>'.$langs->trans("ExportableFields").'</td>';
-	print '<td width="25%">'.$langs->trans("FilteredFieldsValues").'</td>';
-	print '</tr>';
-
-	// Champs exportables
-	$fieldsarray=$objexport->array_export_fields[0];
-	// Champs filtrable
-	$Typefieldsarray=$objexport->array_export_TypeFields[0];
-	// valeur des filtres
-	$ValueFiltersarray=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
-	// Select request if all fields are selected
-	$sqlmaxforexport=$objexport->build_sql(0, array(), array());
-
-	$i = 0;
-	// on boucle sur les champs
-	foreach($fieldsarray as $code => $label)
-	{
-		print '<tr class="oddeven">';
-
-		$i++;
-		$entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
-		$entityicon=strtolower(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity);
-		$entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity);
-
-		print '<td class="nowrap">';
-		// If value of entityicon=entitylang='icon:Label'
-		$tmparray=explode(':',$entityicon);
-		if (count($tmparray) >=2)
-		{
-			$entityicon=$tmparray[0];
-			$entitylang=$tmparray[1];
-		}
-		print img_object('',$entityicon).' '.$langs->trans($entitylang);
-		print '</td>';
-
-		// Field name
-		$labelName=(! empty($fieldsarray[$code])?$fieldsarray[$code]:'');
-		$ValueFilter=(! empty($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
-
-		$tablename=getablenamefromfield($code,$sqlmaxforexport);
-		$htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-			if (! empty($objexport->array_export_special[0][$code]))
-		{
-		    $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-		}
-		else
-		{
-		    $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
-		}
-		if (! empty($objexport->array_export_examplevalues[0][$code]))
-		{
-		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
-		}
-		if (! empty($objexport->array_export_TypeFields[0][$code]))
-		{
-		    $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
-		}
-
-		print '<td>';
-		print $form->textwithpicto($text,$htmltext);
-		print '</td>';
-
-		// Filter value
-		print '<td>';
-		if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
-		{
-			$szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
-			if ($szInfoFiltre)	// Is there an info help for this filter ?
-			{
-				$tmp=$objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
-				print $form->textwithpicto($tmp, $szInfoFiltre);
-			}
-			else
-			{
-				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
-			}
-		}
-		print '</td>';
-
-		print '</tr>';
-	}
-
-	print '</table>';
-
-	print '</div>';
-
-	/*
+    print '<table width="100%" class="border">';
+
+    // Module
+    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
+    print '<td>';
+    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
+    print $objexport->array_export_module[0]->getName();
+    print '</td></tr>';
+
+    // Lot de donnees a exporter
+    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+    print '<td>';
+    $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+    $label=$objexport->array_export_label[0];
+    //print $value.'-'.$icon.'-'.$label."<br>";
+    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+    print $label;
+    print '</td></tr>';
+
+    // Nbre champs exportes
+    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
+    $list='';
+    foreach($array_selected as $code=>$value)
+    {
+        $list.=(! empty($list)?', ':'');
+        $list.=(isset($objexport->array_export_fields[0][$code])?$langs->trans($objexport->array_export_fields[0][$code]):'');
+    }
+    print '<td>'.$list.'</td></tr>';
+
+    print '</table>';
+    print '</div>';
+
+    print '<br>';
+
+    // Combo list of export models
+    print $langs->trans("SelectFilterFields").'<br>';
+
+
+    // un formulaire en plus pour recuperer les filtres
+    print '<form action="'.$_SERVER["PHP_SELF"].'?step=4&action=submitFormField&datatoexport='.$datatoexport.'" name="FilterField" method="post">';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td>'.$langs->trans("Entities").'</td>';
+    //print '<td>'.$langs->trans("ExportableFields").'</td>';
+    //print '<td align="center"></td>';
+    print '<td>'.$langs->trans("ExportableFields").'</td>';
+    print '<td width="25%">'.$langs->trans("FilteredFieldsValues").'</td>';
+    print '</tr>';
+
+    // Champs exportables
+    $fieldsarray=$objexport->array_export_fields[0];
+    // Champs filtrable
+    $Typefieldsarray=$objexport->array_export_TypeFields[0];
+    // valeur des filtres
+    $ValueFiltersarray=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
+    // Select request if all fields are selected
+    $sqlmaxforexport=$objexport->build_sql(0, array(), array());
+
+    $i = 0;
+    // on boucle sur les champs
+    foreach($fieldsarray as $code => $label)
+    {
+        print '<tr class="oddeven">';
+
+        $i++;
+        $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
+        $entityicon=strtolower(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity);
+        $entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity);
+
+        print '<td class="nowrap">';
+        // If value of entityicon=entitylang='icon:Label'
+        $tmparray=explode(':',$entityicon);
+        if (count($tmparray) >=2)
+        {
+            $entityicon=$tmparray[0];
+            $entitylang=$tmparray[1];
+        }
+        print img_object('',$entityicon).' '.$langs->trans($entitylang);
+        print '</td>';
+
+        // Field name
+        $labelName=(! empty($fieldsarray[$code])?$fieldsarray[$code]:'');
+        $ValueFilter=(! empty($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+        $text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+
+        $tablename=getablenamefromfield($code,$sqlmaxforexport);
+        $htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+            if (! empty($objexport->array_export_special[0][$code]))
+        {
+            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+        }
+        else
+        {
+            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+        }
+        if (! empty($objexport->array_export_examplevalues[0][$code]))
+        {
+            $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
+        }
+        if (! empty($objexport->array_export_TypeFields[0][$code]))
+        {
+            $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+        }
+
+        print '<td>';
+        print $form->textwithpicto($text,$htmltext);
+        print '</td>';
+
+        // Filter value
+        print '<td>';
+        if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
+        {
+            $szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
+            if ($szInfoFiltre)	// Is there an info help for this filter ?
+            {
+                $tmp=$objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
+                print $form->textwithpicto($tmp, $szInfoFiltre);
+            }
+            else
+            {
+                print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
+            }
+        }
+        print '</td>';
+
+        print '</tr>';
+    }
+
+    print '</table>';
+
+    print '</div>';
+
+    /*
 	 * Barre d'action
 	 */
-	print '<div class="tabsAction tabsActionNoBottom">';
-	// il n'est pas obligatoire de filtrer les champs
-	print '<a class="butAction" href="javascript:FilterField.submit();">'.$langs->trans("NextStep").'</a>';
-	print '</div>';
+    print '<div class="tabsAction tabsActionNoBottom">';
+    // il n'est pas obligatoire de filtrer les champs
+    print '<a class="butAction" href="javascript:FilterField.submit();">'.$langs->trans("NextStep").'</a>';
+    print '</div>';
 }
 
 if ($step == 4 && $datatoexport)
@@ -890,10 +890,10 @@ 
     // If filters exist
     if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
-    	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-    	$head[$h][1] = $langs->trans("Step")." 3";
-    	$h++;
-    	$stepoffset++;
+        $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+        $head[$h][1] = $langs->trans("Step")." 3";
+        $h++;
+        $stepoffset++;
     }
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
@@ -917,7 +917,7 @@ 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+    $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
@@ -936,22 +936,22 @@ 
     // List of filtered fiels
     if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
-    	print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
-    	$list='';
-    	if (! empty($array_filtervalue))
-    	{
-    		foreach($array_filtervalue as $code=>$value)
-    		{
-    			if (isset($objexport->array_export_fields[0][$code]))
-    			{
-    				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
-    			}
-    		}
-    	}
-    	print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
-    	print '</tr>';
+        print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
+        $list='';
+        if (! empty($array_filtervalue))
+        {
+            foreach($array_filtervalue as $code=>$value)
+            {
+                if (isset($objexport->array_export_fields[0][$code]))
+                {
+                    $list.=($list?', ':'');
+                    if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+                    else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+                }
+            }
+        }
+        print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
+        print '</tr>';
     }
 
     print '</table>';
@@ -994,7 +994,7 @@ 
 
         $labelName=$objexport->array_export_fields[0][$code];
 
-		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+        $text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
 
         $tablename=getablenamefromfield($code,$sqlmaxforexport);
         $htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
@@ -1017,7 +1017,7 @@ 
 
         print '<td>';
         print $form->textwithpicto($text,$htmltext);
-		//print ' ('.$code.')';
+        //print ' ('.$code.')';
         print '</td>';
 
         print '<td align="right" width="100">';
@@ -1051,57 +1051,57 @@ 
     print '</div>';
 
 
-	// Area for profils export
-	if (count($array_selected))
+    // Area for profils export
+    if (count($array_selected))
     {
-		print '<br>';
+        print '<br>';
         print $langs->trans("SaveExportModel");
 
-		print '<form class="nocellnopadd" action="export.php" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<form class="nocellnopadd" action="export.php" method="post">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="add_export_model">';
         print '<input type="hidden" name="step" value="'.$step.'">';
         print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
         print '<input type="hidden" name="hexa" value="'.$hexa.'">';
 
         print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("ExportModelName").'</td>';
-		print '<td>&nbsp;</td>';
-		print '</tr>';
+        print '<tr class="liste_titre">';
+        print '<td>'.$langs->trans("ExportModelName").'</td>';
+        print '<td>&nbsp;</td>';
+        print '</tr>';
 
-		print '<tr class="oddeven">';
-		print '<td><input name="export_name" size="32" value=""></td><td align="right">';
+        print '<tr class="oddeven">';
+        print '<td><input name="export_name" size="32" value=""></td><td align="right">';
         print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
         print '</td></tr>';
 
         // List of existing export profils
-    	$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
-		$sql.= " WHERE type = '".$datatoexport."'";
-		if(empty($conf->global->EXPORTS_SHARE_MODELS))$sql.=" AND fk_user=".$user->id;
-		$sql.= " ORDER BY rowid";
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$num = $db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven"><td>';
-				print $obj->label;
-				print '</td><td align="right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=deleteprof&id='.$obj->rowid.'">';
-				print img_delete();
-				print '</a>';
-				print '</tr>';
-				$i++;
-			}
-		}
-		else {
-			dol_print_error($this->db);
-		}
+        $sql = "SELECT rowid, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
+        $sql.= " WHERE type = '".$datatoexport."'";
+        if(empty($conf->global->EXPORTS_SHARE_MODELS))$sql.=" AND fk_user=".$user->id;
+        $sql.= " ORDER BY rowid";
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                print '<tr class="oddeven"><td>';
+                print $obj->label;
+                print '</td><td align="right">';
+                print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=deleteprof&id='.$obj->rowid.'">';
+                print img_delete();
+                print '</a>';
+                print '</tr>';
+                $i++;
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
 
         print '</table>';
         print '</form>';
@@ -1117,7 +1117,7 @@ 
         exit;
     }
 
-	asort($array_selected);
+    asort($array_selected);
 
     llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
@@ -1138,10 +1138,10 @@ 
     // si le filtrage est parametre pour l'export ou pas
     if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
-    	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-    	$head[$h][1] = $langs->trans("Step")." 3";
-    	$h++;
-    	$stepoffset++;
+        $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+        $head[$h][1] = $langs->trans("Step")." 3";
+        $h++;
+        $stepoffset++;
     }
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
@@ -1160,7 +1160,7 @@ 
      */
     if ($action == 'remove_file')
     {
-    	print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+        print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
     }
 
     print '<div class="fichecenter">';
@@ -1178,7 +1178,7 @@ 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+    $icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
@@ -1196,22 +1196,22 @@ 
     // List of filtered fiels
     if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
-    	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
-    	$list='';
-    	if (! empty($array_filtervalue))
-    	{
-    		foreach($array_filtervalue as $code=>$value)
-    		{
-    			if (isset($objexport->array_export_fields[0][$code]))
-    			{
-    				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
-    			}
-    		}
-    	}
-    	print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
-    	print '</tr>';
+        print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
+        $list='';
+        if (! empty($array_filtervalue))
+        {
+            foreach($array_filtervalue as $code=>$value)
+            {
+                if (isset($objexport->array_export_fields[0][$code]))
+                {
+                    $list.=($list?', ':'');
+                    if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+                    else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+                }
+            }
+        }
+        print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
+        print '</tr>';
     }
 
     print '</table>';
@@ -1233,17 +1233,17 @@ 
     $listeall=$liste;
     foreach($listeall as $key => $val)
     {
-    	if (preg_match('/__\(Disabled\)__/',$listeall[$key]))
-    	{
-    		$listeall[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$listeall[$key]);
-    		unset($liste[$key]);
-    	}
+        if (preg_match('/__\(Disabled\)__/',$listeall[$key]))
+        {
+            $listeall[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$listeall[$key]);
+            unset($liste[$key]);
+        }
 
         print '<tr class="oddeven">';
         print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).' ';
-	    $text=$objmodelexport->getDriverDescForKey($key);
-	    $label=$listeall[$key];
-	    print $form->textwithpicto($label,$text).'</td>';
+        $text=$objmodelexport->getDriverDescForKey($key);
+        $label=$listeall[$key];
+        print $form->textwithpicto($label,$text).'</td>';
         print '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
         print '<td align="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
         print '</tr>'."\n";
@@ -1257,14 +1257,14 @@ 
 
     if ($sqlusedforexport && $user->admin)
     {
-    	print '<tr><td>';
-    	print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport);
-    	print '</td></tr>';
+        print '<tr><td>';
+        print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport);
+        print '</td></tr>';
     }
-	print '</table>';
+    print '</table>';
 
 
-	print '<div class="fichecenter"><div class="fichehalfleft">';
+    print '<div class="fichecenter"><div class="fichehalfleft">';
 
     if (! is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
 
@@ -1293,16 +1293,16 @@ 
  */
 function getablenamefromfield($code,$sqlmaxforexport)
 {
-	$alias=preg_replace('/\.(.*)$/i','',$code);         // Keep only 'Alias' and remove '.Fieldname'
-	$regexstring='/([a-zA-Z_]+) as '.preg_quote($alias).'[, \)]/i';
-
-	$newsql=$sqlmaxforexport;
-	$newsql=preg_replace('/^(.*) FROM /i','',$newsql);  // Remove part before the FROM
-	$newsql=preg_replace('/WHERE (.*)$/i','',$newsql);	// Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
-
-	if (preg_match($regexstring,$newsql,$reg))
-	{
-		return $reg[1];   // The tablename
-	}
-	else return '';
+    $alias=preg_replace('/\.(.*)$/i','',$code);         // Keep only 'Alias' and remove '.Fieldname'
+    $regexstring='/([a-zA-Z_]+) as '.preg_quote($alias).'[, \)]/i';
+
+    $newsql=$sqlmaxforexport;
+    $newsql=preg_replace('/^(.*) FROM /i','',$newsql);  // Remove part before the FROM
+    $newsql=preg_replace('/WHERE (.*)$/i','',$newsql);	// Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
+
+    if (preg_match($regexstring,$newsql,$reg))
+    {
+        return $reg[1];   // The tablename
+    }
+    else return '';
 }

Spacing +257 added lines, -257 removed lines

@@ -123,153 +123,153 @@ 
     'translation'  => 'Translation'
 );
 
-$array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
-$array_filtervalue=isset($_SESSION["export_filtered_fields"])?$_SESSION["export_filtered_fields"]:array();
-$datatoexport=GETPOST("datatoexport","aZ09");
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$step=GETPOST("step","int")?GETPOST("step","int"):1;
-$export_name=GETPOST("export_name","alphanohtml");
-$hexa=GETPOST("hexa","alpha");
-$exportmodelid=GETPOST("exportmodelid","int");
-$field=GETPOST("field","alpa");
-
-$objexport=new Export($db);
-$objexport->load_arrays($user,$datatoexport);
-
-$objmodelexport=new ModeleExports($db);
+$array_selected = isset($_SESSION["export_selected_fields"]) ? $_SESSION["export_selected_fields"] : array();
+$array_filtervalue = isset($_SESSION["export_filtered_fields"]) ? $_SESSION["export_filtered_fields"] : array();
+$datatoexport = GETPOST("datatoexport", "aZ09");
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$step = GETPOST("step", "int") ?GETPOST("step", "int") : 1;
+$export_name = GETPOST("export_name", "alphanohtml");
+$hexa = GETPOST("hexa", "alpha");
+$exportmodelid = GETPOST("exportmodelid", "int");
+$field = GETPOST("field", "alpa");
+
+$objexport = new Export($db);
+$objexport->load_arrays($user, $datatoexport);
+
+$objmodelexport = new ModeleExports($db);
 $form = new Form($db);
 $htmlother = new FormOther($db);
 $formfile = new FormFile($db);
-$sqlusedforexport='';
+$sqlusedforexport = '';
 
 $upload_dir = $conf->export->dir_temp.'/'.$user->id;
 
 //$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
-$usefilters=1;
+$usefilters = 1;
 
 
 /*
  * Actions
  */
 
-if ($action=='selectfield')     // Selection of field at step 2
+if ($action == 'selectfield')     // Selection of field at step 2
 {
-	$fieldsarray=$objexport->array_export_fields[0];
-	$fieldsentitiesarray=$objexport->array_export_entities[0];
-    $fieldsdependenciesarray=$objexport->array_export_dependencies[0];
+	$fieldsarray = $objexport->array_export_fields[0];
+	$fieldsentitiesarray = $objexport->array_export_entities[0];
+    $fieldsdependenciesarray = $objexport->array_export_dependencies[0];
 
-    if ($field=='all')
+    if ($field == 'all')
     {
-		foreach($fieldsarray as $key=>$val)
+		foreach ($fieldsarray as $key=>$val)
 		{
-			if (! empty($array_selected[$key])) continue;		// If already selected, check next
-			$array_selected[$key]=count($array_selected)+1;
+			if (!empty($array_selected[$key])) continue; // If already selected, check next
+			$array_selected[$key] = count($array_selected) + 1;
 		    //print_r($array_selected);
-		    $_SESSION["export_selected_fields"]=$array_selected;
+		    $_SESSION["export_selected_fields"] = $array_selected;
 		}
     }
     else
     {
-        $warnings=array();
+        $warnings = array();
 
-        $array_selected[$field]=count($array_selected)+1;    // We tag the key $field as "selected"
+        $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
         // We check if there is a dependency to activate
         /*var_dump($field);
         var_dump($fieldsentitiesarray[$field]);
         var_dump($fieldsdependenciesarray);*/
-        $listofdependencies=array();
-        if (! empty($fieldsentitiesarray[$field]) && ! empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
+        $listofdependencies = array();
+        if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
         {
             // We found a dependency on the type of field
-            $tmp=$fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
+            $tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
+            if (is_array($tmp)) $listofdependencies = $tmp;
+            else $listofdependencies = array($tmp);
         }
-        else if (! empty($field) && ! empty($fieldsdependenciesarray[$field]))
+        else if (!empty($field) && !empty($fieldsdependenciesarray[$field]))
         {
             // We found a dependency on a dedicated field
-            $tmp=$fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
+            $tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
+            if (is_array($tmp)) $listofdependencies = $tmp;
+            else $listofdependencies = array($tmp);
         }
 
         if (count($listofdependencies))
         {
-            foreach($listofdependencies as $fieldid)
+            foreach ($listofdependencies as $fieldid)
             {
                 if (empty($array_selected[$fieldid]))
                 {
-                    $array_selected[$fieldid]=count($array_selected)+1;    // We tag the key $fieldid as "selected"
-                    $warnings[]=$langs->trans("ExportFieldAutomaticallyAdded",$langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
+                    $array_selected[$fieldid] = count($array_selected) + 1; // We tag the key $fieldid as "selected"
+                    $warnings[] = $langs->trans("ExportFieldAutomaticallyAdded", $langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
                 }
             }
         }
 	    //print_r($array_selected);
-	    $_SESSION["export_selected_fields"]=$array_selected;
+	    $_SESSION["export_selected_fields"] = $array_selected;
 
 	    setEventMessages($warnings, null, 'warnings');
     }
 }
-if ($action=='unselectfield')
+if ($action == 'unselectfield')
 {
-    if ($_GET["field"]=='all')
+    if ($_GET["field"] == 'all')
     {
-		$array_selected=array();
-		$_SESSION["export_selected_fields"]=$array_selected;
+		$array_selected = array();
+		$_SESSION["export_selected_fields"] = $array_selected;
     }
     else
     {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
 	    asort($array_selected);
-	    $i=0;
-	    $array_selected_save=$array_selected;
-	    foreach($array_selected as $code=>$value)
+	    $i = 0;
+	    $array_selected_save = $array_selected;
+	    foreach ($array_selected as $code=>$value)
 	    {
 	        $i++;
-	        $array_selected[$code]=$i;
+	        $array_selected[$code] = $i;
 	        //print "x $code x $i y<br>";
 	    }
-	    $_SESSION["export_selected_fields"]=$array_selected;
+	    $_SESSION["export_selected_fields"] = $array_selected;
     }
 }
 
-if ($action=='downfield' || $action=='upfield')
+if ($action == 'downfield' || $action == 'upfield')
 {
-    $pos=$array_selected[$_GET["field"]];
-    if ($action=='downfield') $newpos=$pos+1;
-    if ($action=='upfield') $newpos=$pos-1;
+    $pos = $array_selected[$_GET["field"]];
+    if ($action == 'downfield') $newpos = $pos + 1;
+    if ($action == 'upfield') $newpos = $pos - 1;
     // Recherche code avec qui switcher
-    $newcode="";
-    foreach($array_selected as $code=>$value)
+    $newcode = "";
+    foreach ($array_selected as $code=>$value)
     {
         if ($value == $newpos)
         {
-            $newcode=$code;
+            $newcode = $code;
             break;
         }
     }
     //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
     if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
     {
-        $array_selected[$_GET["field"]]=$newpos;
-        $array_selected[$newcode]=$pos;
-        $_SESSION["export_selected_fields"]=$array_selected;
+        $array_selected[$_GET["field"]] = $newpos;
+        $array_selected[$newcode] = $pos;
+        $_SESSION["export_selected_fields"] = $array_selected;
     }
 }
 
 if ($step == 1 || $action == 'cleanselect')
 {
-    $_SESSION["export_selected_fields"]=array();
-    $_SESSION["export_filtered_fields"]=array();
-    $array_selected=array();
-    $array_filtervalue=array();
+    $_SESSION["export_selected_fields"] = array();
+    $_SESSION["export_filtered_fields"] = array();
+    $array_selected = array();
+    $array_filtervalue = array();
 }
 
 if ($action == 'builddoc')
 {
-    $max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME)?300:$conf->global->EXPORT_MAX_EXECUTION_TIME);    // 5mn if not defined
+    $max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
     $max_time = @ini_get("max_execution_time");
     if ($max_time && $max_time < $max_execution_time_for_export)
     {
@@ -277,25 +277,25 @@ 
     }
 
     // Build export file
-	$result=$objexport->build_file($user, GETPOST('model','alpha'), $datatoexport, $array_selected, $array_filtervalue);
+	$result = $objexport->build_file($user, GETPOST('model', 'alpha'), $datatoexport, $array_selected, $array_filtervalue);
 	if ($result < 0)
 	{
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
-		$sqlusedforexport=$objexport->sqlusedforexport;
+		$sqlusedforexport = $objexport->sqlusedforexport;
 	}
 	else
 	{
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
-	    $sqlusedforexport=$objexport->sqlusedforexport;
+	    $sqlusedforexport = $objexport->sqlusedforexport;
     }
 }
 
 // Delete file
 if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes')
 {
-	$file = $upload_dir . "/" . GETPOST('file');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	$file = $upload_dir."/".GETPOST('file'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 
-	$ret=dol_delete_file($file);
+	$ret = dol_delete_file($file);
 	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
 	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 	header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
@@ -307,7 +307,7 @@ 
 	if ($_GET["id"])
 	{
 		$objexport->fetch($_GET["id"]);
-		$result=$objexport->delete($user);
+		$result = $objexport->delete($user);
 	}
 }
 
@@ -319,20 +319,20 @@ 
 		asort($array_selected);
 
 		// Set save string
-		$hexa='';
-		foreach($array_selected as $key=>$val)
+		$hexa = '';
+		foreach ($array_selected as $key=>$val)
 		{
-			if ($hexa) $hexa.=',';
-			$hexa.=$key;
+			if ($hexa) $hexa .= ',';
+			$hexa .= $key;
 		}
 
-		$hexafiltervalue='';
-		if (! empty($array_filtervalue) && is_array($array_filtervalue))
+		$hexafiltervalue = '';
+		if (!empty($array_filtervalue) && is_array($array_filtervalue))
 		{
-			foreach($array_filtervalue as $key=>$val)
+			foreach ($array_filtervalue as $key=>$val)
 			{
-				if ($hexafiltervalue) $hexafiltervalue.=',';
-				$hexafiltervalue.=$key.'='.$val;
+				if ($hexafiltervalue) $hexafiltervalue .= ',';
+				$hexafiltervalue .= $key.'='.$val;
 			}
 		}
 
@@ -344,7 +344,7 @@ 
 	    $result = $objexport->create($user);
 		if ($result >= 0)
 		{
-			setEventMessages($langs->trans("ExportModelSaved",$objexport->model_name), null, 'mesgs');
+			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
 		}
 		else
 		{
@@ -364,33 +364,33 @@ 
 // Reload an predefined export model
 if ($step == 2 && $action == 'select_model')
 {
-    $_SESSION["export_selected_fields"]=array();
-    $_SESSION["export_filtered_fields"]=array();
+    $_SESSION["export_selected_fields"] = array();
+    $_SESSION["export_filtered_fields"] = array();
 
-    $array_selected=array();
-    $array_filtervalue=array();
+    $array_selected = array();
+    $array_filtervalue = array();
 
     $result = $objexport->fetch($exportmodelid);
     if ($result > 0)
     {
-		$fieldsarray=explode(',',$objexport->hexa);
-		$i=1;
-		foreach($fieldsarray as $val)
+		$fieldsarray = explode(',', $objexport->hexa);
+		$i = 1;
+		foreach ($fieldsarray as $val)
 		{
-			$array_selected[$val]=$i;
+			$array_selected[$val] = $i;
 			$i++;
 		}
-		$_SESSION["export_selected_fields"]=$array_selected;
+		$_SESSION["export_selected_fields"] = $array_selected;
 
-		$fieldsarrayvalue=explode(',',$objexport->hexafiltervalue);
-		$i=1;
-		foreach($fieldsarrayvalue as $val)
+		$fieldsarrayvalue = explode(',', $objexport->hexafiltervalue);
+		$i = 1;
+		foreach ($fieldsarrayvalue as $val)
 		{
-			$tmp=explode('=',$val);
-			$array_filtervalue[$tmp[0]]=$tmp[1];
+			$tmp = explode('=', $val);
+			$array_filtervalue[$tmp[0]] = $tmp[1];
 			$i++;
 		}
-		$_SESSION["export_filtered_fields"]=$array_filtervalue;
+		$_SESSION["export_filtered_fields"] = $array_filtervalue;
     }
 }
 
@@ -400,22 +400,22 @@ 
 	// on boucle sur les champs selectionne pour recuperer la valeur
 	if (is_array($objexport->array_export_TypeFields[0]))
 	{
-		$_SESSION["export_filtered_fields"]=array();
-		foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
+		$_SESSION["export_filtered_fields"] = array();
+		foreach ($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
 		{
-			$newcode=(string) preg_replace('/\./','_',$code);
+			$newcode = (string) preg_replace('/\./', '_', $code);
 			//print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
-			$filterqualified=1;
-			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified=0;
-			elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) $filterqualified=0;
+			$filterqualified = 1;
+			if (!isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified = 0;
+			elseif (preg_match('/^List/', $type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) $filterqualified = 0;
 			if ($filterqualified)
 			{
 				//print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
 				$objexport->array_export_FilterValue[0][$code] = $_POST[$newcode];
 			}
 		}
-		$array_filtervalue=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
-		$_SESSION["export_filtered_fields"]=$array_filtervalue;
+		$array_filtervalue = (!empty($objexport->array_export_FilterValue[0]) ? $objexport->array_export_FilterValue[0] : '');
+		$_SESSION["export_filtered_fields"] = $array_filtervalue;
 	}
 }
 
@@ -424,9 +424,9 @@ 
  * View
  */
 
-if ($step == 1 || ! $datatoexport)
+if ($step == 1 || !$datatoexport)
 {
-    llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
     /*
      * Affichage onglets
@@ -435,7 +435,7 @@ 
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
     $head[$h][1] = $langs->trans("Step")." 1";
-    $hselected=$h;
+    $hselected = $h;
     $h++;
 
     /*
@@ -458,25 +458,25 @@ 
     print '<td>'.$langs->trans("ExportableDatas").'</td>';
     print '<td>&nbsp;</td>';
     print '</tr>';
-    $val=true;
+    $val = true;
     if (count($objexport->array_export_code))
     {
         foreach ($objexport->array_export_code as $key => $value)
         {
-            $val=!$val;
+            $val = !$val;
             print '<tr '.$bc[$val].'><td nospan="nospan">';
 	        //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
             print $objexport->array_export_module[$key]->getName();
             print '</td><td>';
-			$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[$key]);
-			$label=$objexport->array_export_label[$key];
+			$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
+			$label = $objexport->array_export_label[$key];
             //print $value.'-'.$icon.'-'.$label."<br>";
 			print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
             print $label;
             print '</td><td align="right">';
             if ($objexport->array_export_perms[$key])
             {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
+            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
             }
             else
             {
@@ -498,7 +498,7 @@ 
 
 if ($step == 2 && $datatoexport)
 {
-    llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
 
     /*
@@ -512,7 +512,7 @@ 
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
     $head[$h][1] = $langs->trans("Step")." 2";
-    $hselected=$h;
+    $hselected = $h;
     $h++;
 
     dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
@@ -531,8 +531,8 @@ 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
-    $label=$objexport->array_export_label[0];
+	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+    $label = $objexport->array_export_label[0];
     //print $value.'-'.$icon.'-'.$label."<br>";
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
     print $label;
@@ -553,8 +553,8 @@ 
     print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectExportFields").' ';
-    if(empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1,$user->id);
-	else $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+    if (empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
+	else $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
     print ' ';
     print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
     print '</td></tr></table>';
@@ -574,9 +574,9 @@ 
     print '</tr>';
 
     // Champs exportables
-    $fieldsarray=$objexport->array_export_fields[0];
+    $fieldsarray = $objexport->array_export_fields[0];
     // Select request if all fields are selected
-    $sqlmaxforexport=$objexport->build_sql(0, array(), array());
+    $sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
 	//    $this->array_export_module[0]=$module;
 	//    $this->array_export_code[0]=$module->export_code[$r];
@@ -588,48 +588,48 @@ 
 
     $i = 0;
 
-    foreach($fieldsarray as $code=>$label)
+    foreach ($fieldsarray as $code=>$label)
     {
         print '<tr class="oddeven">';
 
         $i++;
 
-        $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
-        $entityicon=strtolower(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity);
-        $entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity);
+        $entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+        $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+        $entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
         print '<td class="nowrap">';
         // If value of entityicon=entitylang='icon:Label'
         //print $code.'-'.$label.'-'.$entity;
 
-        $tmparray=explode(':',$entityicon);
-        if (count($tmparray) >=2)
+        $tmparray = explode(':', $entityicon);
+        if (count($tmparray) >= 2)
         {
-            $entityicon=$tmparray[0];
-            $entitylang=$tmparray[1];
+            $entityicon = $tmparray[0];
+            $entitylang = $tmparray[1];
         }
-        print img_object('',$entityicon).' '.$langs->trans($entitylang);
+        print img_object('', $entityicon).' '.$langs->trans($entitylang);
         print '</td>';
 
-        $text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+        $text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-        $tablename=getablenamefromfield($code,$sqlmaxforexport);
-        $htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        if (! empty($objexport->array_export_special[0][$code]))
+        $tablename = getablenamefromfield($code, $sqlmaxforexport);
+        $htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
+        if (!empty($objexport->array_export_special[0][$code]))
         {
-            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+            $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
         }
         else
         {
-            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+            $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
-   		if (! empty($objexport->array_export_examplevalues[0][$code]))
+   		if (!empty($objexport->array_export_examplevalues[0][$code]))
 		{
-		    $htmltext.='<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+		    $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
-    	if (! empty($objexport->array_export_TypeFields[0][$code]))
+    	if (!empty($objexport->array_export_TypeFields[0][$code]))
 		{
-		    $htmltext.='<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+		    $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
 
 		if (isset($array_selected[$code]) && $array_selected[$code])
@@ -639,7 +639,7 @@ 
             print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
             print '<td>';
             //print $text.'-'.$htmltext."<br>";
-            print $form->textwithpicto($text,$htmltext);
+            print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
             print '</td>';
         }
@@ -648,7 +648,7 @@ 
         	// Fields not selected
             print '<td>';
 			//print $text.'-'.$htmltext."<br>";
-			print $form->textwithpicto($text,$htmltext);
+			print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
             print '</td>';
             print '<td align="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
@@ -695,7 +695,7 @@ 
         exit;
     }
 
-    llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
 	/*
 	 * Affichage onglets
@@ -712,7 +712,7 @@ 
 
 	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
 	$head[$h][1] = $langs->trans("Step")." 3";
-	$hselected=$h;
+	$hselected = $h;
 	$h++;
 
 	dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
@@ -731,8 +731,8 @@ 
 	// Lot de donnees a exporter
 	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
 	print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
-	$label=$objexport->array_export_label[0];
+	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$label = $objexport->array_export_label[0];
 	//print $value.'-'.$icon.'-'.$label."<br>";
 	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
 	print $label;
@@ -740,11 +740,11 @@ 
 
 	// Nbre champs exportes
 	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-	$list='';
-	foreach($array_selected as $code=>$value)
+	$list = '';
+	foreach ($array_selected as $code=>$value)
 	{
-		$list.=(! empty($list)?', ':'');
-		$list.=(isset($objexport->array_export_fields[0][$code])?$langs->trans($objexport->array_export_fields[0][$code]):'');
+		$list .= (!empty($list) ? ', ' : '');
+		$list .= (isset($objexport->array_export_fields[0][$code]) ? $langs->trans($objexport->array_export_fields[0][$code]) : '');
 	}
 	print '<td>'.$list.'</td></tr>';
 
@@ -769,72 +769,72 @@ 
 	print '</tr>';
 
 	// Champs exportables
-	$fieldsarray=$objexport->array_export_fields[0];
+	$fieldsarray = $objexport->array_export_fields[0];
 	// Champs filtrable
-	$Typefieldsarray=$objexport->array_export_TypeFields[0];
+	$Typefieldsarray = $objexport->array_export_TypeFields[0];
 	// valeur des filtres
-	$ValueFiltersarray=(! empty($objexport->array_export_FilterValue[0])?$objexport->array_export_FilterValue[0]:'');
+	$ValueFiltersarray = (!empty($objexport->array_export_FilterValue[0]) ? $objexport->array_export_FilterValue[0] : '');
 	// Select request if all fields are selected
-	$sqlmaxforexport=$objexport->build_sql(0, array(), array());
+	$sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
 	$i = 0;
 	// on boucle sur les champs
-	foreach($fieldsarray as $code => $label)
+	foreach ($fieldsarray as $code => $label)
 	{
 		print '<tr class="oddeven">';
 
 		$i++;
-		$entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
-		$entityicon=strtolower(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity);
-		$entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity);
+		$entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+		$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+		$entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
 		print '<td class="nowrap">';
 		// If value of entityicon=entitylang='icon:Label'
-		$tmparray=explode(':',$entityicon);
-		if (count($tmparray) >=2)
+		$tmparray = explode(':', $entityicon);
+		if (count($tmparray) >= 2)
 		{
-			$entityicon=$tmparray[0];
-			$entitylang=$tmparray[1];
+			$entityicon = $tmparray[0];
+			$entitylang = $tmparray[1];
 		}
-		print img_object('',$entityicon).' '.$langs->trans($entitylang);
+		print img_object('', $entityicon).' '.$langs->trans($entitylang);
 		print '</td>';
 
 		// Field name
-		$labelName=(! empty($fieldsarray[$code])?$fieldsarray[$code]:'');
-		$ValueFilter=(! empty($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+		$labelName = (!empty($fieldsarray[$code]) ? $fieldsarray[$code] : '');
+		$ValueFilter = (!empty($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-		$tablename=getablenamefromfield($code,$sqlmaxforexport);
-		$htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-			if (! empty($objexport->array_export_special[0][$code]))
+		$tablename = getablenamefromfield($code, $sqlmaxforexport);
+		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+			if (!empty($objexport->array_export_special[0][$code]))
 		{
-		    $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		    $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		}
 		else
 		{
-		    $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
-		if (! empty($objexport->array_export_examplevalues[0][$code]))
+		if (!empty($objexport->array_export_examplevalues[0][$code]))
 		{
-		    $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
+		    $htmltext .= $langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
 		}
-		if (! empty($objexport->array_export_TypeFields[0][$code]))
+		if (!empty($objexport->array_export_TypeFields[0][$code]))
 		{
-		    $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+		    $htmltext .= $langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
 		}
 
 		print '<td>';
-		print $form->textwithpicto($text,$htmltext);
+		print $form->textwithpicto($text, $htmltext);
 		print '</td>';
 
 		// Filter value
 		print '<td>';
-		if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
+		if (!empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
 		{
-			$szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
+			$szInfoFiltre = $objexport->genDocFilter($Typefieldsarray[$code]);
 			if ($szInfoFiltre)	// Is there an info help for this filter ?
 			{
-				$tmp=$objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
+				$tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
 			}
 			else
@@ -871,12 +871,12 @@ 
 
     asort($array_selected);
 
-    llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
     /*
      * Affichage onglets
      */
-    $stepoffset=0;
+    $stepoffset = 0;
     $h = 0;
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
@@ -897,8 +897,8 @@ 
     }
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(3+$stepoffset);
-    $hselected=$h;
+    $head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
+    $hselected = $h;
     $h++;
 
     dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
@@ -917,18 +917,18 @@ 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
     // List of exported fields
     print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-    $list='';
-    foreach($array_selected as $code=>$value)
+    $list = '';
+    foreach ($array_selected as $code=>$value)
     {
-        $list.=(! empty($list)?', ':'');
-        $list.=$langs->trans($objexport->array_export_fields[0][$code]);
+        $list .= (!empty($list) ? ', ' : '');
+        $list .= $langs->trans($objexport->array_export_fields[0][$code]);
     }
     print '<td>'.$list.'</td>';
     print '</tr>';
@@ -937,20 +937,20 @@ 
     if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
     	print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
-    	$list='';
-    	if (! empty($array_filtervalue))
+    	$list = '';
+    	if (!empty($array_filtervalue))
     	{
-    		foreach($array_filtervalue as $code=>$value)
+    		foreach ($array_filtervalue as $code=>$value)
     		{
     			if (isset($objexport->array_export_fields[0][$code]))
     			{
-    				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				$list .= ($list ? ', ' : '');
+    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+    				else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
     			}
     		}
     	}
-    	print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
+    	print '<td>'.(!empty($list) ? $list : $langs->trans("None")).'</td>';
     	print '</tr>';
     }
 
@@ -960,7 +960,7 @@ 
     print '<br>';
 
     // Select request if all fields are selected
-    $sqlmaxforexport=$objexport->build_sql(0, array(), array());
+    $sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
     print $langs->trans("ChooseFieldsOrdersAndTitle").'<br>';
 
@@ -973,50 +973,50 @@ 
     //print '<td>'.$langs->trans("FieldsTitle").'</td>';
     print '</tr>';
 
-    foreach($array_selected as $code=>$value)
+    foreach ($array_selected as $code=>$value)
     {
         print '<tr class="oddeven">';
 
-        $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]);
-        $entityicon=strtolower(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity);
-        $entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity);
+        $entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+        $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+        $entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
         print '<td class="nowrap">';
         // If value of entityicon=entitylang='icon:Label'
-        $tmparray=explode(':',$entityicon);
-        if (count($tmparray) >=2)
+        $tmparray = explode(':', $entityicon);
+        if (count($tmparray) >= 2)
         {
-            $entityicon=$tmparray[0];
-            $entitylang=$tmparray[1];
+            $entityicon = $tmparray[0];
+            $entitylang = $tmparray[1];
         }
-        print img_object('',$entityicon).' '.$langs->trans($entitylang);
+        print img_object('', $entityicon).' '.$langs->trans($entitylang);
         print '</td>';
 
-        $labelName=$objexport->array_export_fields[0][$code];
+        $labelName = $objexport->array_export_fields[0][$code];
 
-		$text=(empty($objexport->array_export_special[0][$code])?'':'<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code])?'':'</i>');
+		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-        $tablename=getablenamefromfield($code,$sqlmaxforexport);
-        $htmltext ='<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-        if (! empty($objexport->array_export_special[0][$code]))
+        $tablename = getablenamefromfield($code, $sqlmaxforexport);
+        $htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+        if (!empty($objexport->array_export_special[0][$code]))
         {
-            $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+            $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
         }
         else
         {
-            $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
+            $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
-        if (! empty($objexport->array_export_examplevalues[0][$code]))
+        if (!empty($objexport->array_export_examplevalues[0][$code]))
         {
-            $htmltext.=$langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
+            $htmltext .= $langs->trans("SourceExample").': <b>'.$objexport->array_export_examplevalues[0][$code].'</b><br>';
         }
-        if (! empty($objexport->array_export_TypeFields[0][$code]))
+        if (!empty($objexport->array_export_TypeFields[0][$code]))
         {
-            $htmltext.=$langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
+            $htmltext .= $langs->trans("Type").': <b>'.$objexport->array_export_TypeFields[0][$code].'</b><br>';
         }
 
         print '<td>';
-        print $form->textwithpicto($text,$htmltext);
+        print $form->textwithpicto($text, $htmltext);
 		//print ' ('.$code.')';
         print '</td>';
 
@@ -1077,10 +1077,10 @@ 
 
         // List of existing export profils
     	$sql = "SELECT rowid, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
-		$sql.= " WHERE type = '".$datatoexport."'";
-		if(empty($conf->global->EXPORTS_SHARE_MODELS))$sql.=" AND fk_user=".$user->id;
-		$sql.= " ORDER BY rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+		$sql .= " WHERE type = '".$datatoexport."'";
+		if (empty($conf->global->EXPORTS_SHARE_MODELS))$sql .= " AND fk_user=".$user->id;
+		$sql .= " ORDER BY rowid";
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -1119,13 +1119,13 @@ 
 
 	asort($array_selected);
 
-    llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
     /*
      * Affichage onglets
      */
     $h = 0;
-    $stepoffset=0;
+    $stepoffset = 0;
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
     $head[$h][1] = $langs->trans("Step")." 1";
@@ -1145,12 +1145,12 @@ 
     }
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(3+$stepoffset);
+    $head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
     $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=5&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(4+$stepoffset);
-    $hselected=$h;
+    $head[$h][1] = $langs->trans("Step")." ".(4 + $stepoffset);
+    $hselected = $h;
     $h++;
 
     dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
@@ -1178,18 +1178,18 @@ 
     // Lot de donnees a exporter
     print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
     print '<td>';
-	$icon=preg_replace('/:.*$/','',$objexport->array_export_icon[0]);
+	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
     print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
     print $objexport->array_export_label[0];
     print '</td></tr>';
 
     // List of exported fields
     print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-    $list='';
-    foreach($array_selected as $code=>$label)
+    $list = '';
+    foreach ($array_selected as $code=>$label)
     {
-        $list.=(! empty($list)?', ':'');
-        $list.=$langs->trans($objexport->array_export_fields[0][$code]);
+        $list .= (!empty($list) ? ', ' : '');
+        $list .= $langs->trans($objexport->array_export_fields[0][$code]);
     }
     print '<td>'.$list.'</td></tr>';
 
@@ -1197,20 +1197,20 @@ 
     if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
     {
     	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
-    	$list='';
-    	if (! empty($array_filtervalue))
+    	$list = '';
+    	if (!empty($array_filtervalue))
     	{
-    		foreach($array_filtervalue as $code=>$value)
+    		foreach ($array_filtervalue as $code=>$value)
     		{
     			if (isset($objexport->array_export_fields[0][$code]))
     			{
-    				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				$list .= ($list ? ', ' : '');
+    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+    				else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
     			}
     		}
     	}
-    	print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
+    	print '<td>'.(!empty($list) ? $list : $langs->trans("None")).'</td>';
     	print '</tr>';
     }
 
@@ -1229,21 +1229,21 @@ 
     print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
     print '</tr>'."\n";
 
-    $liste=$objmodelexport->liste_modeles($db);
-    $listeall=$liste;
-    foreach($listeall as $key => $val)
+    $liste = $objmodelexport->liste_modeles($db);
+    $listeall = $liste;
+    foreach ($listeall as $key => $val)
     {
-    	if (preg_match('/__\(Disabled\)__/',$listeall[$key]))
+    	if (preg_match('/__\(Disabled\)__/', $listeall[$key]))
     	{
-    		$listeall[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$listeall[$key]);
+    		$listeall[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $listeall[$key]);
     		unset($liste[$key]);
     	}
 
         print '<tr class="oddeven">';
-        print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).' ';
-	    $text=$objmodelexport->getDriverDescForKey($key);
-	    $label=$listeall[$key];
-	    print $form->textwithpicto($label,$text).'</td>';
+        print '<td width="16">'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' ';
+	    $text = $objmodelexport->getDriverDescForKey($key);
+	    $label = $listeall[$key];
+	    print $form->textwithpicto($label, $text).'</td>';
         print '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
         print '<td align="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
         print '</tr>'."\n";
@@ -1266,11 +1266,11 @@ 
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    if (! is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
+    if (!is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
 
     // Affiche liste des documents
     // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
-    print $formfile->showdocuments('export','',$upload_dir,$_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport,$liste,1,(! empty($_POST['model'])?$_POST['model']:'csv'),1,1);
+    print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (!empty($_POST['model']) ? $_POST['model'] : 'csv'), 1, 1);
 
     print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
@@ -1281,7 +1281,7 @@ 
 
 $db->close();
 
-exit;	// don't know why but apache hangs with php 5.3.10-1ubuntu3.12 and apache 2.2.2 if i remove this exit or replace with return
+exit; // don't know why but apache hangs with php 5.3.10-1ubuntu3.12 and apache 2.2.2 if i remove this exit or replace with return
 
 
 /**
@@ -1291,18 +1291,18 @@ 
  * 	@param	string	$sqlmaxforexport	SQL request to parse
  * 	@return	string						Table name of field
  */
-function getablenamefromfield($code,$sqlmaxforexport)
+function getablenamefromfield($code, $sqlmaxforexport)
 {
-	$alias=preg_replace('/\.(.*)$/i','',$code);         // Keep only 'Alias' and remove '.Fieldname'
-	$regexstring='/([a-zA-Z_]+) as '.preg_quote($alias).'[, \)]/i';
+	$alias = preg_replace('/\.(.*)$/i', '', $code); // Keep only 'Alias' and remove '.Fieldname'
+	$regexstring = '/([a-zA-Z_]+) as '.preg_quote($alias).'[, \)]/i';
 
-	$newsql=$sqlmaxforexport;
-	$newsql=preg_replace('/^(.*) FROM /i','',$newsql);  // Remove part before the FROM
-	$newsql=preg_replace('/WHERE (.*)$/i','',$newsql);	// Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
+	$newsql = $sqlmaxforexport;
+	$newsql = preg_replace('/^(.*) FROM /i', '', $newsql); // Remove part before the FROM
+	$newsql = preg_replace('/WHERE (.*)$/i', '', $newsql); // Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
 
-	if (preg_match($regexstring,$newsql,$reg))
+	if (preg_match($regexstring, $newsql, $reg))
 	{
-		return $reg[1];   // The tablename
+		return $reg[1]; // The tablename
 	}
 	else return '';
 }

Braces +111 added lines, -69 removed lines

@@ -153,9 +153,11 @@ 
  * Actions
  */
 
-if ($action=='selectfield')     // Selection of field at step 2
+if ($action=='selectfield') {
+    // Selection of field at step 2
 {
 	$fieldsarray=$objexport->array_export_fields[0];
+}
 	$fieldsentitiesarray=$objexport->array_export_entities[0];
     $fieldsdependenciesarray=$objexport->array_export_dependencies[0];
 
@@ -163,13 +165,15 @@ 
     {
 		foreach($fieldsarray as $key=>$val)
 		{
-			if (! empty($array_selected[$key])) continue;		// If already selected, check next
+			if (! empty($array_selected[$key])) {
+			    continue;
+			}
+			// If already selected, check next
 			$array_selected[$key]=count($array_selected)+1;
 		    //print_r($array_selected);
 		    $_SESSION["export_selected_fields"]=$array_selected;
 		}
-    }
-    else
+    } else
     {
         $warnings=array();
 
@@ -183,15 +187,20 @@ 
         {
             // We found a dependency on the type of field
             $tmp=$fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
-        }
-        else if (! empty($field) && ! empty($fieldsdependenciesarray[$field]))
+            if (is_array($tmp)) {
+                $listofdependencies=$tmp;
+            } else {
+                $listofdependencies=array($tmp);
+            }
+        } else if (! empty($field) && ! empty($fieldsdependenciesarray[$field]))
         {
             // We found a dependency on a dedicated field
             $tmp=$fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
+            if (is_array($tmp)) {
+                $listofdependencies=$tmp;
+            } else {
+                $listofdependencies=array($tmp);
+            }
         }
 
         if (count($listofdependencies))
@@ -217,8 +226,7 @@ 
     {
 		$array_selected=array();
 		$_SESSION["export_selected_fields"]=$array_selected;
-    }
-    else
+    } else
     {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
@@ -238,8 +246,12 @@ 
 if ($action=='downfield' || $action=='upfield')
 {
     $pos=$array_selected[$_GET["field"]];
-    if ($action=='downfield') $newpos=$pos+1;
-    if ($action=='upfield') $newpos=$pos-1;
+    if ($action=='downfield') {
+        $newpos=$pos+1;
+    }
+    if ($action=='upfield') {
+        $newpos=$pos-1;
+    }
     // Recherche code avec qui switcher
     $newcode="";
     foreach($array_selected as $code=>$value)
@@ -251,9 +263,11 @@ 
         }
     }
     //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
-    if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
+    if ($newcode) {
+        // Si newcode trouve (protection contre resoumission de page)
     {
         $array_selected[$_GET["field"]]=$newpos;
+    }
         $array_selected[$newcode]=$pos;
         $_SESSION["export_selected_fields"]=$array_selected;
     }
@@ -282,8 +296,7 @@ 
 	{
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport=$objexport->sqlusedforexport;
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	    $sqlusedforexport=$objexport->sqlusedforexport;
@@ -296,8 +309,11 @@ 
 	$file = $upload_dir . "/" . GETPOST('file');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 
 	$ret=dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	if ($ret) {
+	    setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	} else {
+	    setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	}
 	header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
 	exit;
 }
@@ -322,7 +338,9 @@ 
 		$hexa='';
 		foreach($array_selected as $key=>$val)
 		{
-			if ($hexa) $hexa.=',';
+			if ($hexa) {
+			    $hexa.=',';
+			}
 			$hexa.=$key;
 		}
 
@@ -331,7 +349,9 @@ 
 		{
 			foreach($array_filtervalue as $key=>$val)
 			{
-				if ($hexafiltervalue) $hexafiltervalue.=',';
+				if ($hexafiltervalue) {
+				    $hexafiltervalue.=',';
+				}
 				$hexafiltervalue.=$key.'='.$val;
 			}
 		}
@@ -345,17 +365,16 @@ 
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved",$objexport->model_name), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
-			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else
-				setEventMessages($objexport->error, $objexport->errors, 'errors');
+			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+							setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
+			} else {
+							setEventMessages($objexport->error, $objexport->errors, 'errors');
+			}
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
 	}
@@ -401,13 +420,18 @@ 
 	if (is_array($objexport->array_export_TypeFields[0]))
 	{
 		$_SESSION["export_filtered_fields"]=array();
-		foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
+		foreach($objexport->array_export_TypeFields[0] as $code => $type) {
+		    // $code: s.fieldname $value: Text|Boolean|List:ccc
 		{
 			$newcode=(string) preg_replace('/\./','_',$code);
+		}
 			//print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
 			$filterqualified=1;
-			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified=0;
-			elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) $filterqualified=0;
+			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') {
+			    $filterqualified=0;
+			} elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) {
+			    $filterqualified=0;
+			}
 			if ($filterqualified)
 			{
 				//print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
@@ -477,15 +501,13 @@ 
             if ($objexport->array_export_perms[$key])
             {
             	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
-            }
-            else
+            } else
             {
             	print $langs->trans("NotEnoughPermissions");
             }
            	print '</td></tr>';
         }
-    }
-    else
+    } else
     {
         print '<tr><td '.$bc[false].' colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
@@ -553,8 +575,11 @@ 
     print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectExportFields").' ';
-    if(empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1,$user->id);
-	else $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+    if(empty($conf->global->EXPORTS_SHARE_MODELS)) {
+        $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1,$user->id);
+    } else {
+	    $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+	}
     print ' ';
     print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
     print '</td></tr></table>';
@@ -618,8 +643,7 @@ 
         if (! empty($objexport->array_export_special[0][$code]))
         {
             $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else
+        } else
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
@@ -642,8 +666,7 @@ 
             print $form->textwithpicto($text,$htmltext);
 			//print ' ('.$code.')';
             print '</td>';
-        }
-        else
+        } else
         {
         	// Fields not selected
             print '<td>';
@@ -672,13 +695,11 @@ 
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
 		{
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
+		} else
 		{
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
-	}
-	else
+	} else
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
@@ -688,10 +709,12 @@ 
 
 if ($step == 3 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+    if (count($array_selected) < 1) {
+        // This occurs when going back to page after sessecion expired
     {
         // Switch to step 2
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+    }
         exit;
     }
 
@@ -809,8 +832,7 @@ 
 			if (! empty($objexport->array_export_special[0][$code]))
 		{
 		    $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-		}
-		else
+		} else
 		{
 		    $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
 		}
@@ -829,15 +851,18 @@ 
 
 		// Filter value
 		print '<td>';
-		if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
+		if (! empty($Typefieldsarray[$code])) {
+		    // Example: Text, List:c_country:label:rowid, Number, Boolean
 		{
 			$szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
-			if ($szInfoFiltre)	// Is there an info help for this filter ?
+		}
+			if ($szInfoFiltre) {
+			    // Is there an info help for this filter ?
 			{
 				$tmp=$objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
-				print $form->textwithpicto($tmp, $szInfoFiltre);
 			}
-			else
+				print $form->textwithpicto($tmp, $szInfoFiltre);
+			} else
 			{
 				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 			}
@@ -862,10 +887,12 @@ 
 
 if ($step == 4 && $datatoexport)
 {
-    if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
+    if (count($array_selected) < 1) {
+        // This occurs when going back to page after sessecion expired
     {
         // Switch to step 2
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+    }
         exit;
     }
 
@@ -945,8 +972,11 @@ 
     			if (isset($objexport->array_export_fields[0][$code]))
     			{
     				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+    				} else {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				}
     			}
     		}
     	}
@@ -1001,8 +1031,7 @@ 
         if (! empty($objexport->array_export_special[0][$code]))
         {
             $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else
+        } else
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
@@ -1023,8 +1052,12 @@ 
         print '<td align="right" width="100">';
         print $value.' ';
         print '</td><td align="center" width="20">';
-        if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
-        if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+        if ($value < count($array_selected)) {
+            print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
+        }
+        if ($value > 1) {
+            print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+        }
         print '</td>';
 
         //print '<td>&nbsp;</td>';
@@ -1079,7 +1112,9 @@ 
     	$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql.= " WHERE type = '".$datatoexport."'";
-		if(empty($conf->global->EXPORTS_SHARE_MODELS))$sql.=" AND fk_user=".$user->id;
+		if(empty($conf->global->EXPORTS_SHARE_MODELS)) {
+		    $sql.=" AND fk_user=".$user->id;
+		}
 		$sql.= " ORDER BY rowid";
 		$resql = $db->query($sql);
 		if ($resql)
@@ -1098,8 +1133,7 @@ 
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1110,10 +1144,12 @@ 
 
 if ($step == 5 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+    if (count($array_selected) < 1) {
+        // This occurs when going back to page after sessecion expired
     {
         // Switch to step 2
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+    }
         exit;
     }
 
@@ -1205,8 +1241,11 @@ 
     			if (isset($objexport->array_export_fields[0][$code]))
     			{
     				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+    				} else {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				}
     			}
     		}
     	}
@@ -1266,7 +1305,9 @@ 
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    if (! is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
+    if (! is_dir($conf->export->dir_temp)) {
+        dol_mkdir($conf->export->dir_temp);
+    }
 
     // Affiche liste des documents
     // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
@@ -1303,6 +1344,7 @@ 
 	if (preg_match($regexstring,$newsql,$reg))
 	{
 		return $reg[1];   // The tablename
+	} else {
+	    return '';
+	}
 	}
-	else return '';
-}

dolibarr/htdocs/exports/index.php

Indentation +18 added lines, -18 removed lines

@@ -91,15 +91,15 @@ 
 print '<div class="center">';
 if (count($export->array_export_code))
 {
-	if ($user->rights->export->creer)
-	{
-		print '<a class="butActionNew" href="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else
-	{
-		print '<a class="butActionNewRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	/*
+    if ($user->rights->export->creer)
+    {
+        print '<a class="butActionNew" href="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
+    }
+    else
+    {
+        print '<a class="butActionNewRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
+    }
+    /*
 	 print '<form action="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export"><input type="submit" class="button" value="'.$langs->trans("NewExport").'"';
 	print ($user->rights->export->creer?'':' disabled');
 	print '><div class="center"></div></form>';
@@ -127,17 +127,17 @@ 
 {
     if (preg_match('/__\(Disabled\)__/',$liste[$key]))
     {
-    	$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
+        $liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
     }
 
-	print '<tr class="oddeven">';
-	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
-	$text=$model->getDriverDescForKey($key);
-	$label=$liste[$key];
-	print '<td>'.$form->textwithpicto($label,$text).'</td>';
-	print '<td>'.$model->getLibLabelForKey($key).'</td>';
-	print '<td class="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>';
-	print '</tr>';
+    print '<tr class="oddeven">';
+    print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
+    $text=$model->getDriverDescForKey($key);
+    $label=$liste[$key];
+    print '<td>'.$form->textwithpicto($label,$text).'</td>';
+    print '<td>'.$model->getLibLabelForKey($key).'</td>';
+    print '<td class="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>';
+    print '</tr>';
 }
 
 print '</table>';

Spacing +13 added lines, -13 removed lines

@@ -28,18 +28,18 @@ 
 $langs->load("exports");
 
 // Security check
-$result=restrictedArea($user,'export');
+$result = restrictedArea($user, 'export');
 
-$export=new Export($db);
+$export = new Export($db);
 $export->load_arrays($user);
 
 /*
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
+llxHeader('', $langs->trans("ExportsArea"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
 
 print load_fiche_titre($langs->trans("ExportsArea"));
 
@@ -120,21 +120,21 @@ 
 print '</tr>';
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-$model=new ModeleExports($db);
-$liste=$model->liste_modeles($db);    // This is not a static method for exports because method load non static properties
+$model = new ModeleExports($db);
+$liste = $model->liste_modeles($db); // This is not a static method for exports because method load non static properties
 
-foreach($liste as $key => $val)
+foreach ($liste as $key => $val)
 {
-    if (preg_match('/__\(Disabled\)__/',$liste[$key]))
+    if (preg_match('/__\(Disabled\)__/', $liste[$key]))
     {
-    	$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
+    	$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
     }
 
 	print '<tr class="oddeven">';
-	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
-	$text=$model->getDriverDescForKey($key);
-	$label=$liste[$key];
-	print '<td>'.$form->textwithpicto($label,$text).'</td>';
+	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';
+	$text = $model->getDriverDescForKey($key);
+	$label = $liste[$key];
+	print '<td>'.$form->textwithpicto($label, $text).'</td>';
 	print '<td>'.$model->getLibLabelForKey($key).'</td>';
 	print '<td class="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>';
 	print '</tr>';

Braces +1 added lines, -2 removed lines

@@ -94,8 +94,7 @@
 	if ($user->rights->export->creer)
 	{
 		print '<a class="butActionNew" href="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else
+	} else
 	{
 		print '<a class="butActionNewRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}

dolibarr/htdocs/margin/productMargins.php

Indentation +155 added lines, -155 removed lines

@@ -57,24 +57,24 @@ 
 $pagenext = $page + 1;
 if (! $sortfield)
 {
-	if ($id > 0)
-	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
-	}
-	else
-	{
-	    $sortfield="p.ref";
-	    $sortorder="ASC";
-	}
+    if ($id > 0)
+    {
+        $sortfield="f.datef";
+        $sortorder="DESC";
+    }
+    else
+    {
+        $sortfield="p.ref";
+        $sortorder="ASC";
+    }
 }
 
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
+    $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
+    $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
 
 
 /*
@@ -104,19 +104,19 @@ 
 
 if ($id > 0) {
 
-  print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-  print '<td class="maxwidthonsmartpone" colspan="4">';
-  print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
-  print '</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+    print '<td class="maxwidthonsmartpone" colspan="4">';
+    print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
+    print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
+    if (! $sortorder) $sortorder="DESC";
+    if (! $sortfield) $sortfield="f.datef";
 }
 else {
-	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
-	print '</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+    print '<td class="maxwidthonsmartphone" colspan="4">';
+    print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
+    print '</td></tr>';
 }
 
 // Categories
@@ -156,16 +156,16 @@ 
 
 // Margin Rate
 if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
-	print '<span id="marginRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
+    print '<span id="marginRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 // Mark Rate
 if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
-	print '<span id="markRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
+    print '<span id="markRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 print "</table>";
@@ -186,24 +186,24 @@ 
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
 if (! empty($TSelectedCats)) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
 }
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
 if ($id > 0)
-	$sql.= " AND d.fk_product =".$id;
+    $sql.= " AND d.fk_product =".$id;
 if (! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+    $sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
 if (!empty($startdate))
-  $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+    $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-  $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+    $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
-	$sql .= " AND d.buy_price_ht <> 0";
+    $sql .= " AND d.buy_price_ht <> 0";
 if ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
 else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
 $sql.=$db->order($sortfield,$sortorder);
@@ -214,137 +214,137 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
+    $num = $db->num_rows($result);
 
-	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
+    print '<br>';
+    print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
-	//var_dump($conf->global->MARGIN_TYPE);
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+    //var_dump($conf->global->MARGIN_TYPE);
+    if ($conf->global->MARGIN_TYPE == "1")
+        $labelcostprice='BuyingPrice';
+    else   // value is 'costprice' or 'pmp'
+        $labelcostprice='CostPrice';
 
-	$moreforfilter='';
+    $moreforfilter='';
 
-	$i = 0;
+    $i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre">';
-	if ($id > 0) {
-  		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
-  		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
-  	}
-  	else
-  	{
-  		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
-  	}
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	$cumul_achat = 0;
-	$cumul_vente = 0;
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-
-	if ($num > 0)
-	{
-		while ($i < $num /*&& $i < $conf->liste_limit*/)
-		{
-			$objp = $db->fetch_object($result);
-			$pa = $objp->buying_price;
-			$pv = $objp->selling_price;
-			$marge = $objp->marge;
-
-			if ($marge < 0)
-			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
-			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
-			}
-
-			print '<tr class="oddeven">';
-			if ($id > 0) {
-				print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
-				print $invoicestatic->getNomUrl(1);
-				print "</td>\n";
-				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-			}
-			else {
-				print '<td>';
-				if ($objp->rowid > 0)
-				{
-    				$product_static->type=$objp->fk_product_type;
-    				$product_static->id=$objp->rowid;
-    				$product_static->ref=$objp->ref;
-    				$product_static->label=$objp->label;
-    				$product_static->entity=$objp->pentity;
-    				$text=$product_static->getNomUrl(1);
-    				print $text.= ' - '.$objp->label;
-				}
-				else
-				{
-				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
-				}
-				print "</td>\n";
-				//print "<td>".$product_static->getNomUrl(1)."</td>\n";
-			}
-			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-			print "</tr>\n";
-
-			$i++;
-			$cumul_achat += $objp->buying_price;
-			$cumul_vente += $objp->selling_price;
-		}
-	}
-
-	// affichage totaux marges
-
-	$totalMargin = $cumul_vente - $cumul_achat;
-
-	$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-
-	print '<tr class="liste_total">';
-	if ($id > 0)
-		print '<td colspan=2>';
-	else
-		print '<td>';
-	print $langs->trans('TotalMargin')."</td>";
-	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
-	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
-	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-	print "</tr>\n";
-
-	print "</table>";
-	print '</div>';
+    print '<tr class="liste_titre">';
+    if ($id > 0) {
+            print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
+            print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
+        }
+        else
+        {
+            print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
+        }
+    print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+        print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARK_RATES))
+        print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+    $cumul_achat = 0;
+    $cumul_vente = 0;
+    $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+
+    if ($num > 0)
+    {
+        while ($i < $num /*&& $i < $conf->liste_limit*/)
+        {
+            $objp = $db->fetch_object($result);
+            $pa = $objp->buying_price;
+            $pv = $objp->selling_price;
+            $marge = $objp->marge;
+
+            if ($marge < 0)
+            {
+                $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+            }
+            else
+            {
+                $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+            }
+
+            print '<tr class="oddeven">';
+            if ($id > 0) {
+                print '<td>';
+                $invoicestatic->id=$objp->facid;
+                $invoicestatic->ref=$objp->ref;
+                print $invoicestatic->getNomUrl(1);
+                print "</td>\n";
+                print "<td align=\"center\">";
+                print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+            }
+            else {
+                print '<td>';
+                if ($objp->rowid > 0)
+                {
+                    $product_static->type=$objp->fk_product_type;
+                    $product_static->id=$objp->rowid;
+                    $product_static->ref=$objp->ref;
+                    $product_static->label=$objp->label;
+                    $product_static->entity=$objp->pentity;
+                    $text=$product_static->getNomUrl(1);
+                    print $text.= ' - '.$objp->label;
+                }
+                else
+                {
+                    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
+                }
+                print "</td>\n";
+                //print "<td>".$product_static->getNomUrl(1)."</td>\n";
+            }
+            print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
+            print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
+            print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+            print "</tr>\n";
+
+            $i++;
+            $cumul_achat += $objp->buying_price;
+            $cumul_vente += $objp->selling_price;
+        }
+    }
+
+    // affichage totaux marges
+
+    $totalMargin = $cumul_vente - $cumul_achat;
+
+    $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+    $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+
+    print '<tr class="liste_total">';
+    if ($id > 0)
+        print '<td colspan=2>';
+    else
+        print '<td>';
+    print $langs->trans('TotalMargin')."</td>";
+    print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
+    print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
+    print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+        print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    if (! empty($conf->global->DISPLAY_MARK_RATES))
+        print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    print "</tr>\n";
+
+    print "</table>";
+    print '</div>';
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 $db->free($result);
 

Spacing +96 added lines, -96 removed lines

@@ -33,48 +33,48 @@ 
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$TSelectedCats=GETPOST('categories', 'array');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$TSelectedCats = GETPOST('categories', 'array');
 
 // Security check
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
-$result=restrictedArea($user,'margins');
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+$result = restrictedArea($user, 'margins');
 
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield)
+if (!$sortfield)
 {
 	if ($id > 0)
 	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
+		$sortfield = "f.datef";
+		$sortorder = "DESC";
 	}
 	else
 	{
-	    $sortfield="p.ref";
-	    $sortorder="ASC";
+	    $sortfield = "p.ref";
+	    $sortorder = "ASC";
 	}
 }
 
-$startdate=$enddate='';
+$startdate = $enddate = '';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
+  $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
+  $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
 
 
 /*
@@ -82,19 +82,19 @@ 
  */
 
 $product_static = new Product($db);
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
 
 $form = new Form($db);
 
-llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Products"));
+llxHeader('', $langs->trans("Margins").' - '.$langs->trans("Products"));
 
-$text=$langs->trans("Margins");
+$text = $langs->trans("Margins");
 //print load_fiche_titre($text);
 
 // Show tabs
-$head=marges_prepare_head($user);
-$titre=$langs->trans("Margins");
-$picto='margin';
+$head = marges_prepare_head($user);
+$titre = $langs->trans("Margins");
+$picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
 
@@ -106,16 +106,16 @@ 
 
   print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
   print '<td class="maxwidthonsmartpone" colspan="4">';
-  print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
+  print $form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
   print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
+  if (!$sortorder) $sortorder = "DESC";
+  if (!$sortfield) $sortfield = "f.datef";
 }
 else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
+	print $form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
 	print '</td></tr>';
 }
 
@@ -155,14 +155,14 @@ 
 print '</td></tr>';
 
 // Margin Rate
-if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
 	print '<span id="marginRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
 }
 
 // Mark Rate
-if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
 	print '<span id="markRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
@@ -175,38 +175,38 @@ 
 print '</form>';
 
 $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
-if ($id > 0) $sql.= " d.fk_product,";
-if ($id > 0) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
-$sql.= " SUM(d.total_ht) as selling_price,";
+if ($id > 0) $sql .= " d.fk_product,";
+if ($id > 0) $sql .= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+$sql .= " SUM(d.total_ht) as selling_price,";
 // Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
-$sql.= " SUM(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
-$sql.= " SUM(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
-if (! empty($TSelectedCats)) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
+$sql .= " SUM(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1', 'd.qty * d.buy_price_ht').") as buying_price,";
+$sql .= " SUM(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))', 'd.total_ht - (d.buy_price_ht * d.qty)').") as marge";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product";
+if (!empty($TSelectedCats)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid';
 }
-$sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('invoice').')';
-$sql.= " AND f.fk_statut > 0";
-$sql.= " AND d.fk_facture = f.rowid";
+$sql .= " WHERE f.fk_soc = s.rowid";
+$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+$sql .= " AND f.fk_statut > 0";
+$sql .= " AND d.fk_facture = f.rowid";
 if ($id > 0)
-	$sql.= " AND d.fk_product =".$id;
-if (! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+	$sql .= " AND d.fk_product =".$id;
+if (!empty($TSelectedCats)) {
+	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats).')';
 }
 if (!empty($startdate))
-  $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+  $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
 if (!empty($enddate))
-  $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+  $sql .= " AND f.datef <= '".$db->idate($enddate)."'";
 $sql .= " AND d.buy_price_ht IS NOT NULL";
 if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
 	$sql .= " AND d.buy_price_ht <> 0";
-if ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
-else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
-$sql.=$db->order($sortfield,$sortorder);
+if ($id > 0) $sql .= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
+else $sql .= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+$sql .= $db->order($sortfield, $sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
@@ -221,37 +221,37 @@ 
 
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
+	    $labelcostprice = 'BuyingPrice';
 	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+	    $labelcostprice = 'CostPrice';
 
-	$moreforfilter='';
+	$moreforfilter = '';
 
 	$i = 0;
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	if ($id > 0) {
-  		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
-  		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
+  		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
+  		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, 'align="center"', $sortfield, $sortorder);
   	}
   	else
   	{
-  		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
+  		print_liste_field_titre("ProductService", $_SERVER["PHP_SELF"], "p.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   	}
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->DISPLAY_MARK_RATES))
+		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	$cumul_achat = 0;
 	$cumul_vente = 0;
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 	if ($num > 0)
 	{
@@ -264,36 +264,36 @@ 
 
 			if ($marge < 0)
 			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
 			}
 			else
 			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
 
 			print '<tr class="oddeven">';
 			if ($id > 0) {
 				print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
+				$invoicestatic->id = $objp->facid;
+				$invoicestatic->ref = $objp->ref;
 				print $invoicestatic->getNomUrl(1);
 				print "</td>\n";
 				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
 			}
 			else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
-    				$product_static->type=$objp->fk_product_type;
-    				$product_static->id=$objp->rowid;
-    				$product_static->ref=$objp->ref;
-    				$product_static->label=$objp->label;
-    				$product_static->entity=$objp->pentity;
-    				$text=$product_static->getNomUrl(1);
-    				print $text.= ' - '.$objp->label;
+    				$product_static->type = $objp->fk_product_type;
+    				$product_static->id = $objp->rowid;
+    				$product_static->ref = $objp->ref;
+    				$product_static->label = $objp->label;
+    				$product_static->entity = $objp->pentity;
+    				$text = $product_static->getNomUrl(1);
+    				print $text .= ' - '.$objp->label;
 				}
 				else
 				{
@@ -305,10 +305,10 @@ 
 			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print "<td align=\"right\">".(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print "<td align=\"right\">".(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
 			print "</tr>\n";
 
 			$i++;
@@ -321,8 +321,8 @@ 
 
 	$totalMargin = $cumul_vente - $cumul_achat;
 
-	$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+	$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+	$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
 
 	print '<tr class="liste_total">';
 	if ($id > 0)
@@ -333,10 +333,10 @@ 
 	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+		print "<td align=\"right\">".(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+	if (!empty($conf->global->DISPLAY_MARK_RATES))
+		print "<td align=\"right\">".(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
 	print "</tr>\n";
 
 	print "</table>";
@@ -358,8 +358,8 @@ 
   });
 
   $("#totalMargin").html("'.price($totalMargin, null, null, null, null, $rounding).'");
-  $("#marginRate").html("'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%").'");
-  $("#markRate").html("'.(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%").'");
+  $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price($marginRate, null, null, null, null, $rounding)."%").'");
+  $("#markRate").html("'.(($markRate === '') ? 'n/a' : price($markRate, null, null, null, null, $rounding)."%").'");
 
 });
 </script>

Braces +67 added lines, -46 removed lines

@@ -40,7 +40,9 @@ 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 $result=restrictedArea($user,'margins');
 
@@ -61,8 +63,7 @@ 
 	{
 		$sortfield="f.datef";
 		$sortorder="DESC";
-	}
-	else
+	} else
 	{
 	    $sortfield="p.ref";
 	    $sortorder="ASC";
@@ -71,10 +72,12 @@ 
 
 $startdate=$enddate='';
 
-if (!empty($_POST['startdatemonth']))
+if (!empty($_POST['startdatemonth'])) {
   $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
-if (!empty($_POST['enddatemonth']))
+}
+if (!empty($_POST['enddatemonth'])) {
   $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
+}
 
 
 /*
@@ -109,10 +112,13 @@ 
   print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
   print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
-}
-else {
+  if (! $sortorder) {
+      $sortorder="DESC";
+  }
+  if (! $sortfield) {
+      $sortfield="f.datef";
+  }
+  } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
@@ -175,8 +181,12 @@ 
 print '</form>';
 
 $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
-if ($id > 0) $sql.= " d.fk_product,";
-if ($id > 0) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+if ($id > 0) {
+    $sql.= " d.fk_product,";
+}
+if ($id > 0) {
+    $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+}
 $sql.= " SUM(d.total_ht) as selling_price,";
 // Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
 $sql.= " SUM(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
@@ -192,20 +202,27 @@ 
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
-if ($id > 0)
+if ($id > 0) {
 	$sql.= " AND d.fk_product =".$id;
+}
 if (! empty($TSelectedCats)) {
 	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
-if (!empty($startdate))
+if (!empty($startdate)) {
   $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
+}
+if (!empty($enddate)) {
   $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+}
 $sql .= " AND d.buy_price_ht IS NOT NULL";
-if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
 	$sql .= " AND d.buy_price_ht <> 0";
-if ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
-else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+}
+if ($id > 0) {
+    $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
+} else {
+    $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+}
 $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -220,10 +237,12 @@ 
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	//var_dump($conf->global->MARGIN_TYPE);
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	if ($conf->global->MARGIN_TYPE == "1") {
+		    $labelcostprice='BuyingPrice';
+	} else {
+	    // value is 'costprice' or 'pmp'
 	    $labelcostprice='CostPrice';
+	}
 
 	$moreforfilter='';
 
@@ -235,18 +254,19 @@ 
 	if ($id > 0) {
   		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
   		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
-  	}
-  	else
+  	} else
   	{
   		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
   	}
 	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	}
 	print "</tr>\n";
 
 	$cumul_achat = 0;
@@ -266,8 +286,7 @@ 
 			{
 				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
+			} else
 			{
 				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
@@ -282,8 +301,7 @@ 
 				print "</td>\n";
 				print "<td align=\"center\">";
 				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-			}
-			else {
+			} else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
@@ -294,8 +312,7 @@ 
     				$product_static->entity=$objp->pentity;
     				$text=$product_static->getNomUrl(1);
     				print $text.= ' - '.$objp->label;
-				}
-				else
+				} else
 				{
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
@@ -305,10 +322,12 @@ 
 			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
 			print "</tr>\n";
 
 			$i++;
@@ -325,24 +344,26 @@ 
 	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
 
 	print '<tr class="liste_total">';
-	if ($id > 0)
-		print '<td colspan=2>';
-	else
-		print '<td>';
+	if ($id > 0) {
+			print '<td colspan=2>';
+	} else {
+			print '<td>';
+	}
 	print $langs->trans('TotalMargin')."</td>";
 	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	}
 	print "</tr>\n";
 
 	print "</table>";
 	print '</div>';
-}
-else
+} else
 {
 	dol_print_error($db);
 }