Dolibarr / dolibarr

htdocs/core/lib/website.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
  *
  * @param	Website		$website			Web site object
  * @param	string		$content			Content to replace
- * @return	boolean							True if OK
+ * @return	string							True if OK
  */
 function dolWebsiteReplacementOfLinks($website, $content)
 {
@@ -188,7 +188,7 @@ 
  * Generate a zip with all data of web site.
  *
  * @param 	Website		$website		Object website
- * @return  void
+ * @return  string
  */
 function exportWebSite($website)
 {
@@ -287,7 +287,7 @@ 
  * @param 	string		$urltograb		URL to grab (exemple: http://www.nltechno.com/ or http://www.nltechno.com/dir1/ or http://www.nltechno.com/dir1/mapage1)
  * @param 	string		$tmp			Content to parse
  * @param 	string		$action			Var $action
- * @param	string		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
+ * @param	integer		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
  * @return	void
  */
 function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks=0)

Indentation +44 added lines, -44 removed lines

@@ -31,59 +31,59 @@
  */
 function dolWebsiteOutput($content)
 {
-    global $db, $langs, $conf, $user;
-    global $dolibarr_main_url_root, $dolibarr_main_data_root;
+	global $db, $langs, $conf, $user;
+	global $dolibarr_main_url_root, $dolibarr_main_data_root;
 
-    dol_syslog("dolWebsiteOutput start (mode=".(defined('USEDOLIBARRSERVER')?'USEDOLIBARRSERVER':'').')');
+	dol_syslog("dolWebsiteOutput start (mode=".(defined('USEDOLIBARRSERVER')?'USEDOLIBARRSERVER':'').')');
 
-    // Define $urlwithroot
-    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+	// Define $urlwithroot
+	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-    // Note: This seems never called when page is output inside the website editor (search 'REPLACEMENT OF LINKS When page called by website editor')
+	// Note: This seems never called when page is output inside the website editor (search 'REPLACEMENT OF LINKS When page called by website editor')
 
-    if (! defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from virtual host
-    {
-        $symlinktomediaexists=1;
+	if (! defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from virtual host
+	{
+		$symlinktomediaexists=1;
 
 		// Make a change into HTML code to allow to include images from medias directory correct with direct link for virtual server
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
 		// <img alt="" src="'.$urlwithroot.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-        $nbrep=0;
-        if (! $symlinktomediaexists)
-        {
-            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-        }
-        else
-        {
-        	$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep);
-            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep);
-        }
-    }
-    else								// REPLACEMENT OF LINKS When page called from dolibarr server
-    {
-    	global $website;
-
-    	// Replace relative link / with dolibarr URL:  ...href="/"...
-    	$content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
-    	// Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
-    	$content=preg_replace('/(href=")\/?([^\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-
-    	// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  ...href="/document.php?modulepart="
-    	$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
-    	// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT:  ...href="/viewimage.php?modulepart="
-    	$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
-
-    	// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
-    	$content=preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-    }
-
-    dol_syslog("dolWebsiteOutput end");
-
-    print $content;
+		$nbrep=0;
+		if (! $symlinktomediaexists)
+		{
+			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+		}
+		else
+		{
+			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep);
+		}
+	}
+	else								// REPLACEMENT OF LINKS When page called from dolibarr server
+	{
+		global $website;
+
+		// Replace relative link / with dolibarr URL:  ...href="/"...
+		$content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
+		// Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
+		$content=preg_replace('/(href=")\/?([^\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+
+		// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  ...href="/document.php?modulepart="
+		$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
+		// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT:  ...href="/viewimage.php?modulepart="
+		$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
+
+		// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
+		$content=preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+	}
+
+	dol_syslog("dolWebsiteOutput end");
+
+	print $content;
 }
 
 

Spacing +75 added lines, -75 removed lines

@@ -34,33 +34,33 @@ 
     global $db, $langs, $conf, $user;
     global $dolibarr_main_url_root, $dolibarr_main_data_root;
 
-    dol_syslog("dolWebsiteOutput start (mode=".(defined('USEDOLIBARRSERVER')?'USEDOLIBARRSERVER':'').')');
+    dol_syslog("dolWebsiteOutput start (mode=".(defined('USEDOLIBARRSERVER') ? 'USEDOLIBARRSERVER' : '').')');
 
     // Define $urlwithroot
-    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
     //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
     // Note: This seems never called when page is output inside the website editor (search 'REPLACEMENT OF LINKS When page called by website editor')
 
-    if (! defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from virtual host
+    if (!defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from virtual host
     {
-        $symlinktomediaexists=1;
+        $symlinktomediaexists = 1;
 
 		// Make a change into HTML code to allow to include images from medias directory correct with direct link for virtual server
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
 		// <img alt="" src="'.$urlwithroot.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-        $nbrep=0;
-        if (! $symlinktomediaexists)
+        $nbrep = 0;
+        if (!$symlinktomediaexists)
         {
-            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+            $content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+            $content = preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
         }
         else
         {
-        	$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep);
-            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep);
+        	$content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep);
+            $content = preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep);
         }
     }
     else								// REPLACEMENT OF LINKS When page called from dolibarr server
@@ -68,17 +68,17 @@ 
     	global $website;
 
     	// Replace relative link / with dolibarr URL:  ...href="/"...
-    	$content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
+    	$content = preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
     	// Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
-    	$content=preg_replace('/(href=")\/?([^\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+    	$content = preg_replace('/(href=")\/?([^\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/websites/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
 
     	// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  ...href="/document.php?modulepart="
-    	$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
+    	$content = preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
     	// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT:  ...href="/viewimage.php?modulepart="
-    	$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
+    	$content = preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep);
 
     	// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
-    	$content=preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+    	$content = preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
     }
 
     dol_syslog("dolWebsiteOutput end");
@@ -108,7 +108,7 @@ 
 	$content = preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 
 	// <img src="image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-	$content = preg_replace('/(<img[^>]*src=")(?!(http|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+	$content = preg_replace('/(<img[^>]*src=")(?!(http|'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 
 	return $content;
 }
@@ -153,11 +153,11 @@ 
 	global $conf, $db, $langs, $mysoc, $user, $website;
 	global $includehtmlcontentopened;
 
-	$MAXLEVEL=20;
+	$MAXLEVEL = 20;
 
-	$fullpathfile=DOL_DATA_ROOT.'/websites/'.$contentfile;
+	$fullpathfile = DOL_DATA_ROOT.'/websites/'.$contentfile;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
+	if (empty($includehtmlcontentopened)) $includehtmlcontentopened = 0;
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL)
 	{
@@ -169,14 +169,14 @@ 
 	//print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
 
 	ob_start();
-	$res = include $fullpathfile;		// Include because we want to execute code content
+	$res = include $fullpathfile; // Include because we want to execute code content
 	$tmpoutput = ob_get_contents();
 	ob_end_clean();
 
 	print "\n".'<!-- include '.$fullpathfile.' level = '.$includehtmlcontentopened.' -->'."\n";
-	print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $tmpoutput);
+	print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
-	if (! $res)
+	if (!$res)
 	{
 		print 'ERROR: FAILED TO INCLUDE PAGE '.$contentfile.".\n";
 	}
@@ -198,7 +198,7 @@ 
 	$srcdir = $conf->websites->dir_output.'/'.$website->ref;
 	$destdir = $conf->websites->dir_temp.'/'.$website->ref;
 
-	$arrayreplacement=array();
+	$arrayreplacement = array();
 
 	dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacement);
 
@@ -211,24 +211,24 @@ 
 	dol_mkdir($conf->websites->dir_temp.'/'.$website->ref.'/export');
 
 	$filesql = $conf->websites->dir_temp.'/'.$website->ref.'/export/pages.sql';
-	$fp = fopen($filesql,"w");
+	$fp = fopen($filesql, "w");
 
 	$objectpages = new WebsitePage($db);
 	$listofpages = $objectpages->fetchAll($website->id);
 
 	// Assign ->newid and ->newfk_page
-	$i=1;
-	foreach($listofpages as $pageid => $objectpageold)
+	$i = 1;
+	foreach ($listofpages as $pageid => $objectpageold)
 	{
-		$objectpageold->newid=$i;
+		$objectpageold->newid = $i;
 		$i++;
 	}
-	$i=1;
-	foreach($listofpages as $pageid => $objectpageold)
+	$i = 1;
+	foreach ($listofpages as $pageid => $objectpageold)
 	{
 		// Search newid
-		$newfk_page=0;
-		foreach($listofpages as $pageid2 => $objectpageold2)
+		$newfk_page = 0;
+		foreach ($listofpages as $pageid2 => $objectpageold2)
 		{
 			if ($pageid2 == $objectpageold->fk_page)
 			{
@@ -236,40 +236,40 @@ 
 				break;
 			}
 		}
-		$objectpageold->newfk_page=$newfk_page;
+		$objectpageold->newfk_page = $newfk_page;
 		$i++;
 	}
-	foreach($listofpages as $pageid => $objectpageold)
+	foreach ($listofpages as $pageid => $objectpageold)
 	{
 		$line = 'INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, title, description, keyword, status, date_creation, tms, lang, import_key, grabbed_from, content)';
-		$line.= " VALUES(";
-		$line.= $objectpageold->newid."+__MAXROWID__, ";
-		$line.= ($objectpageold->newfk_page ? $db->escape($objectpageold->newfk_page)."+__MAXROWID__" : "null").", ";
-		$line.= "__WEBSITE_ID__, ";
-		$line.= "'".$db->escape($objectpageold->pageurl)."', ";
-		$line.= "'".$db->escape($objectpageold->title)."', ";
-		$line.= "'".$db->escape($objectpageold->description)."', ";
-		$line.= "'".$db->escape($objectpageold->keyword)."', ";
-		$line.= "'".$db->escape($objectpageold->status)."', ";
-		$line.= "'".$db->idate($objectpageold->date_creation)."', ";
-		$line.= "'".$db->idate($objectpageold->date_modification)."', ";
-		$line.= "'".$db->escape($objectpageold->lang)."', ";
-		$line.= ($objectpageold->import_key ? "'".$db->escape($objectpageold->import_key)."'" : "null").", ";
-		$line.= "'".$db->escape($objectpageold->grabbed_from)."', ";
-		$line.= "'".$db->escape($objectpageold->content)."'";
-		$line.= ");";
-		$line.= "\n";
+		$line .= " VALUES(";
+		$line .= $objectpageold->newid."+__MAXROWID__, ";
+		$line .= ($objectpageold->newfk_page ? $db->escape($objectpageold->newfk_page)."+__MAXROWID__" : "null").", ";
+		$line .= "__WEBSITE_ID__, ";
+		$line .= "'".$db->escape($objectpageold->pageurl)."', ";
+		$line .= "'".$db->escape($objectpageold->title)."', ";
+		$line .= "'".$db->escape($objectpageold->description)."', ";
+		$line .= "'".$db->escape($objectpageold->keyword)."', ";
+		$line .= "'".$db->escape($objectpageold->status)."', ";
+		$line .= "'".$db->idate($objectpageold->date_creation)."', ";
+		$line .= "'".$db->idate($objectpageold->date_modification)."', ";
+		$line .= "'".$db->escape($objectpageold->lang)."', ";
+		$line .= ($objectpageold->import_key ? "'".$db->escape($objectpageold->import_key)."'" : "null").", ";
+		$line .= "'".$db->escape($objectpageold->grabbed_from)."', ";
+		$line .= "'".$db->escape($objectpageold->content)."'";
+		$line .= ");";
+		$line .= "\n";
 		fputs($fp, $line);
 	}
 
 	fclose($fp);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filesql, octdec($conf->global->MAIN_UMASK));
 
 	// Build zip file
 	$filedir = $conf->websites->dir_temp.'/'.$website->ref;
 	$fileglob = $conf->websites->dir_temp.'/'.$website->ref.'/export/'.$website->ref.'_export_*.zip';
-	$filename = $conf->websites->dir_temp.'/'.$website->ref.'/export/'.$website->ref.'_export_'.dol_print_date(dol_now(),'dayhourlog').'.zip';
+	$filename = $conf->websites->dir_temp.'/'.$website->ref.'/export/'.$website->ref.'_export_'.dol_print_date(dol_now(), 'dayhourlog').'.zip';
 
 	dol_delete_file($fileglob, 0);
 	dol_compress_file($filedir, $filename, 'zip');
@@ -290,32 +290,32 @@ 
  * @param	string		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
  * @return	void
  */
-function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks=0)
+function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks = 0)
 {
 	global $conf;
 
-	$alreadygrabbed=array();
+	$alreadygrabbed = array();
 
-	if (preg_match('/\/$/', $urltograb)) $urltograb.='.';
-	$urltograb = dirname($urltograb);							// So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
+	if (preg_match('/\/$/', $urltograb)) $urltograb .= '.';
+	$urltograb = dirname($urltograb); // So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
 
 	preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $tmp, $regs);
 
 	foreach ($regs[0] as $key => $val)
 	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue;		// We do nothing for such images
+		if (preg_match('/^data:image/i', $regs[2][$key])) continue; // We do nothing for such images
 
-		$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key]) ? '' : '/').$regs[2][$key];
 		$linkwithoutdomain = $regs[2][$key];
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key]) ? '' : '/').$regs[2][$key];
 		if (preg_match('/^http/', $regs[2][$key]))
 		{
 			$urltograbbis = $regs[2][$key];
 			$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
-			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 		}
 
-		$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+		$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 
 		// Clean the aa/bb/../cc into aa/cc
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
@@ -332,25 +332,25 @@ 
 			{
 				$error++;
 				setEventMessages($tmpgeturl['curl_error_msg'], null, 'errors');
-				$action='create';
+				$action = 'create';
 			}
 			else
 			{
-				$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
+				$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 				dol_mkdir(dirname($filetosave));
 
 				$fp = fopen($filetosave, "w");
 				fputs($fp, $tmpgeturl['content']);
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 			}
 		}
 
 		if ($modifylinks)
 		{
-			$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', '<img'.$regs[1][$key].'src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'"'.$regs[3][$key].'>', $tmp);
+			$tmp = preg_replace('/'.preg_quote($regs[0][$key], '/').'/i', '<img'.$regs[1][$key].'src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'"'.$regs[3][$key].'>', $tmp);
 		}
 	}
 
@@ -359,21 +359,21 @@ 
 
 	foreach ($regs[0] as $key => $val)
 	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue;		// We do nothing for such images
+		if (preg_match('/^data:image/i', $regs[2][$key])) continue; // We do nothing for such images
 
-		$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key]) ? '' : '/').$regs[2][$key];
 
 		$linkwithoutdomain = $regs[2][$key];
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key]) ? '' : '/').$regs[2][$key];
 
 		if (preg_match('/^http/', $regs[2][$key]))
 		{
 			$urltograbbis = $regs[2][$key];
 			$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
-			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 		}
 
-		$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+		$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 
 		// Clean the aa/bb/../cc into aa/cc
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
@@ -390,25 +390,25 @@ 
 			{
 				$error++;
 				setEventMessages($tmpgeturl['curl_error_msg'], null, 'errors');
-				$action='create';
+				$action = 'create';
 			}
 			else
 			{
-				$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
+				$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 				dol_mkdir(dirname($filetosave));
 
 				$fp = fopen($filetosave, "w");
 				fputs($fp, $tmpgeturl['content']);
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 			}
 		}
 
 		if ($modifylinks)
 		{
-			$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', 'background'.$regs[1][$key].'url("'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'")', $tmp);
+			$tmp = preg_replace('/'.preg_quote($regs[0][$key], '/').'/i', 'background'.$regs[1][$key].'url("'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'")', $tmp);
 		}
 	}
 

Braces +30 added lines, -19 removed lines

@@ -43,9 +43,11 @@ 
 
     // Note: This seems never called when page is output inside the website editor (search 'REPLACEMENT OF LINKS When page called by website editor')
 
-    if (! defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from virtual host
+    if (! defined('USEDOLIBARRSERVER')) {
+    	// REPLACEMENT OF LINKS When page called from virtual host
     {
         $symlinktomediaexists=1;
+    }
 
 		// Make a change into HTML code to allow to include images from medias directory correct with direct link for virtual server
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
@@ -56,14 +58,12 @@ 
         {
             $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
             $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-        }
-        else
+        } else
         {
         	$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep);
             $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep);
         }
-    }
-    else								// REPLACEMENT OF LINKS When page called from dolibarr server
+    } else								// REPLACEMENT OF LINKS When page called from dolibarr server
     {
     	global $website;
 
@@ -157,7 +157,9 @@ 
 
 	$fullpathfile=DOL_DATA_ROOT.'/websites/'.$contentfile;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
+	if (empty($includehtmlcontentopened)) {
+		$includehtmlcontentopened=0;
+	}
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL)
 	{
@@ -263,8 +265,9 @@ 
 	}
 
 	fclose($fp);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filesql, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filesql, octdec($conf->global->MAIN_UMASK));
+	}
 
 	// Build zip file
 	$filedir = $conf->websites->dir_temp.'/'.$website->ref;
@@ -296,14 +299,19 @@ 
 
 	$alreadygrabbed=array();
 
-	if (preg_match('/\/$/', $urltograb)) $urltograb.='.';
+	if (preg_match('/\/$/', $urltograb)) {
+		$urltograb.='.';
+	}
 	$urltograb = dirname($urltograb);							// So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
 
 	preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $tmp, $regs);
 
 	foreach ($regs[0] as $key => $val)
 	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue;		// We do nothing for such images
+		if (preg_match('/^data:image/i', $regs[2][$key])) {
+			continue;
+		}
+		// We do nothing for such images
 
 		$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
 		$linkwithoutdomain = $regs[2][$key];
@@ -333,8 +341,7 @@ 
 				$error++;
 				setEventMessages($tmpgeturl['curl_error_msg'], null, 'errors');
 				$action='create';
-			}
-			else
+			} else
 			{
 				$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
@@ -343,8 +350,9 @@ 
 				$fp = fopen($filetosave, "w");
 				fputs($fp, $tmpgeturl['content']);
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 		}
 
@@ -359,7 +367,10 @@ 
 
 	foreach ($regs[0] as $key => $val)
 	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue;		// We do nothing for such images
+		if (preg_match('/^data:image/i', $regs[2][$key])) {
+			continue;
+		}
+		// We do nothing for such images
 
 		$urltograbbis = $urltograb.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
 
@@ -391,8 +402,7 @@ 
 				$error++;
 				setEventMessages($tmpgeturl['curl_error_msg'], null, 'errors');
 				$action='create';
-			}
-			else
+			} else
 			{
 				$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
@@ -401,8 +411,9 @@ 
 				$fp = fopen($filetosave, "w");
 				fputs($fp, $tmpgeturl['content']);
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 		}
 

htdocs/compta/sociales/card.php

Indentation +243 added lines, -243 removed lines

@@ -63,50 +63,50 @@ 
 }
 
 if ($action == 'reopen' && $user->rights->tax->charges->creer) {
-    $result = $object->fetch($id);
-    if ($object->paye)
-    {
-        $result = $object->set_unpaid($user);
-        if ($result > 0)
-        {
-            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
-            exit();
-        } else {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	$result = $object->fetch($id);
+	if ($object->paye)
+	{
+		$result = $object->set_unpaid($user);
+		if ($result > 0)
+		{
+			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+			exit();
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 // Link to a project
 if ($action == 'classin' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $object->setProject(GETPOST('projectid'));
+	$object->fetch($id);
+	$object->setProject(GETPOST('projectid'));
 }
 
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-    if ($result < 0)
-        setEventMessages($object->error, $object->errors, 'errors');
+	$object->fetch($id);
+	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
 }
 
 // payment mode
 if ($action == 'setmode' && $user->rights->tax->charges->creer) {
-    $object->fetch($id);
-    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-    if ($result < 0)
-        setEventMessages($object->error, $object->errors, 'errors');
+	$object->fetch($id);
+	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
 }
 
 // bank account
 if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
-    $object->fetch($id);
-    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
-    if ($result < 0) {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
+	$object->fetch($id);
+	$result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 // Delete social contribution
@@ -131,8 +131,8 @@ 
 {
 	$dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
 	$dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
-    $amount=price2num(GETPOST('amount'));
-    $actioncode=GETPOST('actioncode');
+	$amount=price2num(GETPOST('amount'));
+	$actioncode=GETPOST('actioncode');
 
 	if (! $dateech)
 	{
@@ -166,8 +166,8 @@ 
 		$object->date_ech			= $dateech;
 		$object->periode			= $dateperiod;
 		$object->amount				= $amount;
-        $object->mode_reglement_id	= GETPOST('mode_reglement_id');
-        $object->fk_account			= GETPOST('fk_account', 'int');
+		$object->mode_reglement_id	= GETPOST('mode_reglement_id');
+		$object->fk_account			= GETPOST('fk_account', 'int');
 		$object->fk_project			= GETPOST('fk_project');
 
 		$id=$object->create($user);
@@ -182,43 +182,43 @@ 
 
 if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->creer)
 {
-    $dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
-    $dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
-    $amount=price2num(GETPOST('amount'));
-
-    if (! $dateech)
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateDue")), null, 'errors');
-        $action = 'edit';
-    }
-    elseif (! $dateperiod)
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
-        $action = 'edit';
-    }
-    elseif (empty($amount))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
-        $action = 'edit';
-    }
+	$dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
+	$dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
+	$amount=price2num(GETPOST('amount'));
+
+	if (! $dateech)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateDue")), null, 'errors');
+		$action = 'edit';
+	}
+	elseif (! $dateperiod)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
+		$action = 'edit';
+	}
+	elseif (empty($amount))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
+		$action = 'edit';
+	}
 	elseif (! is_numeric($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric",$langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	}
-    else
+	else
 	{
-        $result=$object->fetch($id);
+		$result=$object->fetch($id);
 
-        $object->date_ech	= $dateech;
-        $object->periode	= $dateperiod;
-        $object->amount		= price2num($amount);
+		$object->date_ech	= $dateech;
+		$object->periode	= $dateperiod;
+		$object->amount		= price2num($amount);
 
-        $result=$object->update($user);
-        if ($result <= 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
+		$result=$object->update($user);
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 }
 
@@ -293,51 +293,51 @@ 
 {
 	print load_fiche_titre($langs->trans("NewSocialContribution"));
 
-    $var=false;
+	$var=false;
 
-    print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    dol_fiche_head();
+	dol_fiche_head();
 
 	print '<table class="border" width="100%">';
 
-    // Label
-    print "<tr>";
-    print '<td class="titlefieldcreate fieldrequired">';
-    print $langs->trans("Label");
-    print '</td>';
-    print '<td><input type="text" size="34" name="label" class="flat" value="'.dol_escape_htmltag(GETPOST('label','alpha')).'" autofocus></td>';
-    print '</tr>';
-    print '<tr>';
-
-    // Type
-    print '<td class="fieldrequired">';
-    print $langs->trans("Type");
-    print '</td>';
-    print '<td>';
-    $formsocialcontrib->select_type_socialcontrib(GETPOST("actioncode",'alpha')?GETPOST("actioncode",'alpha'):'','actioncode',1);
-    print '</td>';
-    print '</tr>';
+	// Label
+	print "<tr>";
+	print '<td class="titlefieldcreate fieldrequired">';
+	print $langs->trans("Label");
+	print '</td>';
+	print '<td><input type="text" size="34" name="label" class="flat" value="'.dol_escape_htmltag(GETPOST('label','alpha')).'" autofocus></td>';
+	print '</tr>';
+	print '<tr>';
+
+	// Type
+	print '<td class="fieldrequired">';
+	print $langs->trans("Type");
+	print '</td>';
+	print '<td>';
+	$formsocialcontrib->select_type_socialcontrib(GETPOST("actioncode",'alpha')?GETPOST("actioncode",'alpha'):'','actioncode',1);
+	print '</td>';
+	print '</tr>';
 
 	// Date end period
-    print '<tr>';
-    print '<td class="fieldrequired">';
-    print $langs->trans("PeriodEndDate");
-    print '</td>';
+	print '<tr>';
+	print '<td class="fieldrequired">';
+	print $langs->trans("PeriodEndDate");
+	print '</td>';
    	print '<td>';
-    print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
+	print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Amount
-    print '<tr>';
-    print '<td class="fieldrequired">';
-    print $langs->trans("Amount");
-    print '</td>';
+	// Amount
+	print '<tr>';
+	print '<td class="fieldrequired">';
+	print $langs->trans("Amount");
+	print '</td>';
 	print '<td><input type="text" size="6" name="amount" class="flat" value="'.dol_escape_htmltag(GETPOST('amount','alpha')).'"></td>';
-    print '</tr>';
+	print '</tr>';
 
 	// Project
 	if (! empty($conf->projet->enabled))
@@ -354,30 +354,30 @@ 
 		print '</td></tr>';
 	}
 
-    // Payment Mode
-    print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
-    $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
-    print '</td></tr>';
-
-    // Bank Account
-    if (! empty($conf->banque->enabled))
-    {
-        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
-        $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
-        print '</td></tr>';
-    }
-
-    // Date due
-    print '<tr>';
-    print '<td class="fieldrequired">';
-    print $langs->trans("DateDue");
-    print '</td>';
-    print '<td>';
-    print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+	// Payment Mode
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
+	print '</td></tr>';
+
+	// Bank Account
+	if (! empty($conf->banque->enabled))
+	{
+		print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+		print '</td></tr>';
+	}
+
+	// Date due
+	print '<tr>';
+	print '<td class="fieldrequired">';
+	print $langs->trans("DateDue");
+	print '</td>';
+	print '<td>';
+	print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
 	print '</td>';
-    print "</tr>\n";
+	print "</tr>\n";
 
-    print '</table>';
+	print '</table>';
 
 	dol_fiche_end();
 
@@ -387,7 +387,7 @@ 
 	print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 /* *************************************************************************** */
@@ -398,7 +398,7 @@ 
 if ($id > 0)
 {
 	$object = new ChargeSociales($db);
-    $result=$object->fetch($id);
+	$result=$object->fetch($id);
 
 	if ($result > 0)
 	{
@@ -414,7 +414,7 @@ 
 
 			);
 
-		    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes');
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes');
 		}
 
 		// Confirmation de la suppression de la charge
@@ -445,34 +445,34 @@ 
 		// Project
 		if (! empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		    if ($user->rights->tax->charges->creer)
-		    {
-		        if ($action != 'classify')
-		            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-		            if ($action == 'classify') {
-		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-		                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		                $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref.='</form>';
-		            } else {
-		                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		            }
-		    } else {
-		        if (! empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-		            $morehtmlref.=$proj->ref;
-		            $morehtmlref.='</a>';
-		        } else {
-		            $morehtmlref.='';
-		        }
-		    }
+			$langs->load("projects");
+			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			if ($user->rights->tax->charges->creer)
+			{
+				if ($action != 'classify')
+					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					if ($action == 'classify') {
+						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+						$morehtmlref.='<input type="hidden" name="action" value="classin">';
+						$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+						$morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+						$morehtmlref.='</form>';
+					} else {
+						$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					}
+			} else {
+				if (! empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+					$morehtmlref.=$proj->ref;
+					$morehtmlref.='</a>';
+				} else {
+					$morehtmlref.='';
+				}
+			}
 		}
 		$morehtmlref.='</div>';
 
@@ -492,7 +492,7 @@ 
 		print '<tr><td class="titlefield">'.$langs->trans("Type")."</td><td>".$object->type_libelle."</td>";
 		print "</tr>";
 
-    	// Period end date
+		// Period end date
 		print "<tr><td>".$langs->trans("PeriodEndDate")."</td>";
 		print "<td>";
 		if ($action == 'edit')
@@ -517,51 +517,51 @@ 
 		}
 
 		// Amount
-        if ($action == 'edit')
-        {
-            print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
-            print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
-            print "</td></tr>";
-        }
-        else {
-            print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
-        }
-
-        // Mode of payment
-        print '<tr><td>';
-        print '<table class="nobordernopadding" width="100%"><tr><td>';
-        print $langs->trans('PaymentMode');
-        print '</td>';
-        if ($action != 'editmode')
-            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'editmode') {
-            $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
-        } else {
-            $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
-        }
-        print '</td></tr>';
-
-        // Bank Account
-        if (! empty($conf->banque->enabled))
-        {
-            print '<tr><td class="nowrap">';
-            print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-            print $langs->trans('BankAccount');
-            print '<td>';
-            if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
-                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
-            print '</tr></table>';
-            print '</td><td>';
-            if ($action == 'editbankaccount') {
-                $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-            } else {
-                $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
-            }
-            print '</td>';
-            print '</tr>';
-        }
+		if ($action == 'edit')
+		{
+			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
+			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
+			print "</td></tr>";
+		}
+		else {
+			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+		}
+
+		// Mode of payment
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentMode');
+		print '</td>';
+		if ($action != 'editmode')
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editmode') {
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
+		} else {
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
+		}
+		print '</td></tr>';
+
+		// Bank Account
+		if (! empty($conf->banque->enabled))
+		{
+			print '<tr><td class="nowrap">';
+			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+			print $langs->trans('BankAccount');
+			print '<td>';
+			if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
+				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editbankaccount') {
+				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+			} else {
+				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
 		print '</table>';
 
@@ -588,59 +588,59 @@ 
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-		    $totalpaye = 0;
-
-		    $num = $db->num_rows($resql);
-		    $i = 0; $total = 0;
-		    print '<table class="noborder paymenttable">';
-		    print '<tr class="liste_titre">';
-		    print '<td>'.$langs->trans("RefPayment").'</td>';
-		    print '<td>'.$langs->trans("Date").'</td>';
-		    print '<td>'.$langs->trans("Type").'</td>';
-		    print '<td align="right">'.$langs->trans("Amount").'</td>';
-		    print '</tr>';
-
-		    $var=true;
-            if ($num > 0)
-            {
-    		    while ($i < $num)
-    		    {
-    		        $objp = $db->fetch_object($resql);
-
-    		        print "<tr ".$bc[$var]."><td>";
-    		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
-    		        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-    		        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
-    		        print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
-    		        print '<td align="right">'.price($objp->amount)."</td>\n";
-    		        print "</tr>";
-    		        $totalpaye += $objp->amount;
-    		        $i++;
-    		    }
-            }
-            else
-		    {
-
-		        print '<tr class="oddeven"><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
-		    }
-
-		    //if ($object->status == ChargeSociales::STATUS_DRAFT)
-		    //{
-		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaye)."</td></tr>\n";
-		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
-
-		        $resteapayer = $object->amount - $totalpaye;
-		        $cssforamountpaymentcomplete = 'amountpaymentcomplete';
-
-		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-		        print '<td align="right"'.($resteapayer?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>'.price($resteapayer)."</td></tr>\n";
-		    //}
-		    print "</table>";
-		    $db->free($resql);
+			$totalpaye = 0;
+
+			$num = $db->num_rows($resql);
+			$i = 0; $total = 0;
+			print '<table class="noborder paymenttable">';
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("RefPayment").'</td>';
+			print '<td>'.$langs->trans("Date").'</td>';
+			print '<td>'.$langs->trans("Type").'</td>';
+			print '<td align="right">'.$langs->trans("Amount").'</td>';
+			print '</tr>';
+
+			$var=true;
+			if ($num > 0)
+			{
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($resql);
+
+					print "<tr ".$bc[$var]."><td>";
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
+					print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+					$labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+					print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
+					print '<td align="right">'.price($objp->amount)."</td>\n";
+					print "</tr>";
+					$totalpaye += $objp->amount;
+					$i++;
+				}
+			}
+			else
+			{
+
+				print '<tr class="oddeven"><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
+			}
+
+			//if ($object->status == ChargeSociales::STATUS_DRAFT)
+			//{
+				print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaye)."</td></tr>\n";
+				print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
+
+				$resteapayer = $object->amount - $totalpaye;
+				$cssforamountpaymentcomplete = 'amountpaymentcomplete';
+
+				print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
+				print '<td align="right"'.($resteapayer?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>'.price($resteapayer)."</td></tr>\n";
+			//}
+			print "</table>";
+			$db->free($resql);
 		}
 		else
 		{
-		    dol_print_error($db);
+			dol_print_error($db);
 		}
 
 		print '</div>';

Spacing +117 added lines, -117 removed lines

@@ -28,7 +28,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -37,15 +37,15 @@ 
 $langs->load("compta");
 $langs->load("bills");
 
-$id=GETPOST('id','int');
-$action=GETPOST('action','aZ09');
-$confirm=GETPOST('confirm');
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges');
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
 
 $object = new ChargeSociales($db);
 
@@ -69,7 +69,7 @@ 
         $result = $object->set_unpaid($user);
         if ($result > 0)
         {
-            header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
             exit();
         } else {
             setEventMessages($object->error, $object->errors, 'errors');
@@ -103,7 +103,7 @@ 
 // bank account
 if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
     $object->fetch($id);
-    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+    $result = $object->setBankAccount(GETPOST('fk_account', 'int'));
     if ($result < 0) {
         setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -113,7 +113,7 @@ 
 if ($action == 'confirm_delete' && $confirm == 'yes')
 {
 	$object->fetch($id);
-	$result=$object->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
 		header("Location: index.php");
@@ -129,22 +129,22 @@ 
 // Add social contribution
 if ($action == 'add' && $user->rights->tax->charges->creer)
 {
-	$dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
-	$dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
-    $amount=price2num(GETPOST('amount'));
-    $actioncode=GETPOST('actioncode');
+	$dateech = dol_mktime(GETPOST('echhour'), GETPOST('echmin'), GETPOST('echsec'), GETPOST('echmonth'), GETPOST('echday'), GETPOST('echyear'));
+	$dateperiod = dol_mktime(GETPOST('periodhour'), GETPOST('periodmin'), GETPOST('periodsec'), GETPOST('periodmonth'), GETPOST('periodday'), GETPOST('periodyear'));
+    $amount = price2num(GETPOST('amount'));
+    $actioncode = GETPOST('actioncode');
 
-	if (! $dateech)
+	if (!$dateech)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateDue")), null, 'errors');
 		$action = 'create';
 	}
-	elseif (! $dateperiod)
+	elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'create';
 	}
-	elseif (! $actioncode > 0)
+	elseif (!$actioncode > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
@@ -154,44 +154,44 @@ 
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	}
-	elseif (! is_numeric($amount))
+	elseif (!is_numeric($amount))
 	{
-		setEventMessages($langs->trans("ErrorFieldMustBeANumeric",$langs->transnoentities("Amount")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	}
 	else
 	{
-		$object->type				= $actioncode;
-		$object->lib				= GETPOST('label');
-		$object->date_ech			= $dateech;
+		$object->type = $actioncode;
+		$object->lib = GETPOST('label');
+		$object->date_ech = $dateech;
 		$object->periode			= $dateperiod;
 		$object->amount				= $amount;
-        $object->mode_reglement_id	= GETPOST('mode_reglement_id');
-        $object->fk_account			= GETPOST('fk_account', 'int');
-		$object->fk_project			= GETPOST('fk_project');
+        $object->mode_reglement_id = GETPOST('mode_reglement_id');
+        $object->fk_account = GETPOST('fk_account', 'int');
+		$object->fk_project = GETPOST('fk_project');
 
-		$id=$object->create($user);
+		$id = $object->create($user);
 		if ($id <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action='create';
+			$action = 'create';
 		}
 	}
 }
 
 
-if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->creer)
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer)
 {
-    $dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
-    $dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
-    $amount=price2num(GETPOST('amount'));
+    $dateech = dol_mktime(GETPOST('echhour'), GETPOST('echmin'), GETPOST('echsec'), GETPOST('echmonth'), GETPOST('echday'), GETPOST('echyear'));
+    $dateperiod = dol_mktime(GETPOST('periodhour'), GETPOST('periodmin'), GETPOST('periodsec'), GETPOST('periodmonth'), GETPOST('periodday'), GETPOST('periodyear'));
+    $amount = price2num(GETPOST('amount'));
 
-    if (! $dateech)
+    if (!$dateech)
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateDue")), null, 'errors');
         $action = 'edit';
     }
-    elseif (! $dateperiod)
+    elseif (!$dateperiod)
     {
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
         $action = 'edit';
@@ -201,20 +201,20 @@ 
         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
         $action = 'edit';
     }
-	elseif (! is_numeric($amount))
+	elseif (!is_numeric($amount))
 	{
-		setEventMessages($langs->trans("ErrorFieldMustBeANumeric",$langs->transnoentities("Amount")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	}
     else
 	{
-        $result=$object->fetch($id);
+        $result = $object->fetch($id);
 
-        $object->date_ech	= $dateech;
+        $object->date_ech = $dateech;
         $object->periode	= $dateperiod;
         $object->amount		= price2num($amount);
 
-        $result=$object->update($user);
+        $result = $object->update($user);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
@@ -223,7 +223,7 @@ 
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
+if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
 
 if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer))
 {
@@ -238,7 +238,7 @@ 
 		$object->paye = 0;
 		$object->id = $object->ref = null;
 
-		if(GETPOST('clone_for_next_month') != '') {
+		if (GETPOST('clone_for_next_month') != '') {
 
 			$object->date_ech = strtotime('+1month', $object->date_ech);
 			$object->periode = strtotime('+1month', $object->periode);
@@ -257,17 +257,17 @@ 
 			}
 			else
 			{
-				$id=$originalId;
+				$id = $originalId;
 				$db->rollback();
 
-				setEventMessages($object->error,$object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
 	else
 	{
 		$db->rollback();
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }
 
@@ -281,11 +281,11 @@ 
 
 $form = new Form($db);
 $formsocialcontrib = new FormSocialContrib($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
-$title = $langs->trans("SocialContribution") . ' - ' . $langs->trans("Card");
-$help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
-llxHeader("",$title,$help_url);
+$title = $langs->trans("SocialContribution").' - '.$langs->trans("Card");
+$help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
+llxHeader("", $title, $help_url);
 
 
 // Mode creation
@@ -293,7 +293,7 @@ 
 {
 	print load_fiche_titre($langs->trans("NewSocialContribution"));
 
-    $var=false;
+    $var = false;
 
     print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -308,7 +308,7 @@ 
     print '<td class="titlefieldcreate fieldrequired">';
     print $langs->trans("Label");
     print '</td>';
-    print '<td><input type="text" size="34" name="label" class="flat" value="'.dol_escape_htmltag(GETPOST('label','alpha')).'" autofocus></td>';
+    print '<td><input type="text" size="34" name="label" class="flat" value="'.dol_escape_htmltag(GETPOST('label', 'alpha')).'" autofocus></td>';
     print '</tr>';
     print '<tr>';
 
@@ -317,7 +317,7 @@ 
     print $langs->trans("Type");
     print '</td>';
     print '<td>';
-    $formsocialcontrib->select_type_socialcontrib(GETPOST("actioncode",'alpha')?GETPOST("actioncode",'alpha'):'','actioncode',1);
+    $formsocialcontrib->select_type_socialcontrib(GETPOST("actioncode", 'alpha') ?GETPOST("actioncode", 'alpha') : '', 'actioncode', 1);
     print '</td>';
     print '</tr>';
 
@@ -327,7 +327,7 @@ 
     print $langs->trans("PeriodEndDate");
     print '</td>';
    	print '<td>';
-    print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
+    print $form->select_date(!empty($dateperiod) ? $dateperiod : '-1', 'period', 0, 0, 0, 'charge', 1);
 	print '</td>';
     print '</tr>';
 
@@ -336,33 +336,33 @@ 
     print '<td class="fieldrequired">';
     print $langs->trans("Amount");
     print '</td>';
-	print '<td><input type="text" size="6" name="amount" class="flat" value="'.dol_escape_htmltag(GETPOST('amount','alpha')).'"></td>';
+	print '<td><input type="text" size="6" name="amount" class="flat" value="'.dol_escape_htmltag(GETPOST('amount', 'alpha')).'"></td>';
     print '</tr>';
 
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
-		$formproject=new FormProjets($db);
+		$formproject = new FormProjets($db);
 
 		// Associated project
 		$langs->load("projects");
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-		$numproject=$formproject->select_projects(-1, $projectid,'fk_project',0,0,1,1);
+		$numproject = $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
 
 		print '</td></tr>';
 	}
 
     // Payment Mode
-    print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+    print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
     $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
     print '</td></tr>';
 
     // Bank Account
-    if (! empty($conf->banque->enabled))
+    if (!empty($conf->banque->enabled))
     {
-        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+        print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
         $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
         print '</td></tr>';
     }
@@ -373,7 +373,7 @@ 
     print $langs->trans("DateDue");
     print '</td>';
     print '<td>';
-    print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+    print $form->select_date(!empty($dateech) ? $dateech : '-1', 'ech', 0, 0, 0, 'charge', 1);
 	print '</td>';
     print "</tr>\n";
 
@@ -384,7 +384,7 @@ 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
     print '</form>';
@@ -398,36 +398,36 @@ 
 if ($id > 0)
 {
 	$object = new ChargeSociales($db);
-    $result=$object->fetch($id);
+    $result = $object->fetch($id);
 
 	if ($result > 0)
 	{
-		$head=tax_prepare_head($object);
+		$head = tax_prepare_head($object);
 
 		$totalpaye = $object->getSommePaiement();
 
 		// Clone confirmation
 		if ($action === 'clone')
 		{
-			$formclone=array(
-				array('type' => 'checkbox', 'name' => 'clone_for_next_month','label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1),
+			$formclone = array(
+				array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1),
 
 			);
 
-		    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes');
+		    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneTax'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formclone, 'yes');
 		}
 
 		// Confirmation de la suppression de la charge
 		if ($action == 'paid')
 		{
-			$text=$langs->trans('ConfirmPaySocialContribution');
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans('PaySocialContribution'),$text,"confirm_paid",'','',2);
+			$text = $langs->trans('ConfirmPaySocialContribution');
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
 		}
 
 		if ($action == 'delete')
 		{
-			$text=$langs->trans('ConfirmDeleteSocialContribution');
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSocialContribution'),$text,'confirm_delete','','',2);
+			$text = $langs->trans('ConfirmDeleteSocialContribution');
+			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
 		}
 
 		if ($action == 'edit')
@@ -438,47 +438,47 @@ 
 
 		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
-		$morehtmlref='<div class="refidno">';
+		$morehtmlref = '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 		// Project
-		if (! empty($conf->projet->enabled))
+		if (!empty($conf->projet->enabled))
 		{
 		    $langs->load("projects");
-		    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		    if ($user->rights->tax->charges->creer)
 		    {
 		        if ($action != 'classify')
-		            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		            $morehtmlref .= '<a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 		            if ($action == 'classify') {
 		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-		                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		                $morehtmlref.=$formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref.='</form>';
+		                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+		                $morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		                $morehtmlref .= $formproject->select_projects(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+		                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		                $morehtmlref .= '</form>';
 		            } else {
-		                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 		            }
 		    } else {
-		        if (! empty($object->fk_project)) {
+		        if (!empty($object->fk_project)) {
 		            $proj = new Project($db);
 		            $proj->fetch($object->fk_project);
-		            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-		            $morehtmlref.=$proj->ref;
-		            $morehtmlref.='</a>';
+		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+		            $morehtmlref .= $proj->ref;
+		            $morehtmlref .= '</a>';
 		        } else {
-		            $morehtmlref.='';
+		            $morehtmlref .= '';
 		        }
 		    }
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/index.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
@@ -501,7 +501,7 @@ 
 		}
 		else
 		{
-			print dol_print_date($object->periode,"day");
+			print dol_print_date($object->periode, "day");
 		}
 		print "</td></tr>";
 
@@ -513,7 +513,7 @@ 
 			print "</td></tr>";
 		}
 		else {
-			print "<tr><td>".$langs->trans("DateDue")."</td><td>".dol_print_date($object->date_ech,'day')."</td></tr>";
+			print "<tr><td>".$langs->trans("DateDue")."</td><td>".dol_print_date($object->date_ech, 'day')."</td></tr>";
 		}
 
 		// Amount
@@ -524,7 +524,7 @@ 
             print "</td></tr>";
         }
         else {
-            print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+            print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
         }
 
         // Mode of payment
@@ -533,25 +533,25 @@ 
         print $langs->trans('PaymentMode');
         print '</td>';
         if ($action != 'editmode')
-            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editmode') {
-            $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
+            $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
         } else {
-            $form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
+            $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
         }
         print '</td></tr>';
 
         // Bank Account
-        if (! empty($conf->banque->enabled))
+        if (!empty($conf->banque->enabled))
         {
             print '<tr><td class="nowrap">';
             print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
             print $langs->trans('BankAccount');
             print '<td>';
             if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
-                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
             print '</tr></table>';
             print '</td><td>';
             if ($action == 'editbankaccount') {
@@ -573,16 +573,16 @@ 
 		 * Payments
 		 */
 		$sql = "SELECT p.rowid, p.num_paiement, datep as dp, p.amount,";
-		$sql.= "c.code as type_code,c.libelle as paiement_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
-		$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
-		$sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-		$sql.= " WHERE p.fk_charge = ".$id;
-		$sql.= " AND p.fk_charge = cs.rowid";
-		$sql.= " AND cs.entity = ".$conf->entity;
-		$sql.= " AND p.fk_typepaiement = c.id";
-		$sql.= " AND c.entity = " . getEntity('c_paiement');
-		$sql.= " ORDER BY dp DESC";
+		$sql .= "c.code as type_code,c.libelle as paiement_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
+		$sql .= ", ".MAIN_DB_PREFIX."c_paiement as c ";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " WHERE p.fk_charge = ".$id;
+		$sql .= " AND p.fk_charge = cs.rowid";
+		$sql .= " AND cs.entity = ".$conf->entity;
+		$sql .= " AND p.fk_typepaiement = c.id";
+		$sql .= " AND c.entity = ".getEntity('c_paiement');
+		$sql .= " ORDER BY dp DESC";
 
 		//print $sql;
 		$resql = $db->query($sql);
@@ -600,7 +600,7 @@ 
 		    print '<td align="right">'.$langs->trans("Amount").'</td>';
 		    print '</tr>';
 
-		    $var=true;
+		    $var = true;
             if ($num > 0)
             {
     		    while ($i < $num)
@@ -608,9 +608,9 @@ 
     		        $objp = $db->fetch_object($resql);
 
     		        print "<tr ".$bc[$var]."><td>";
-    		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
-    		        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-    		        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+    		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
+    		        print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+    		        $labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
     		        print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
     		        print '<td align="right">'.price($objp->amount)."</td>\n";
     		        print "</tr>";
@@ -633,7 +633,7 @@ 
 		        $cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-		        print '<td align="right"'.($resteapayer?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>'.price($resteapayer)."</td></tr>\n";
+		        print '<td align="right"'.($resteapayer ? ' class="amountremaintopay"' : (' class="'.$cssforamountpaymentcomplete.'"')).'>'.price($resteapayer)."</td></tr>\n";
 		    //}
 		    print "</table>";
 		    $db->free($resql);
@@ -674,7 +674,7 @@ 
 			// Reopen
 			if ($object->paye && $user->rights->tax->charges->creer)
 			{
-				print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php",1). "?id=$object->id&amp;action=reopen\">".$langs->trans("ReOpen")."</a>";
+				print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php", 1)."?id=$object->id&amp;action=reopen\">".$langs->trans("ReOpen")."</a>";
 			}
 
 			// Edit
@@ -690,7 +690,7 @@ 
 			}
 
 			// Classify 'paid'
-			if ($object->paye == 0 && round($resteapayer) <=0 && $user->rights->tax->charges->creer)
+			if ($object->paye == 0 && round($resteapayer) <= 0 && $user->rights->tax->charges->creer)
 			{
 				print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&amp;action=paid\">".$langs->trans("ClassifyPaid")."</a>";
 			}
@@ -698,7 +698,7 @@ 
 			// Clone
 			if ($user->rights->tax->charges->creer)
 			{
-				print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php",1). "?id=$object->id&amp;action=clone\">".$langs->trans("ToClone")."</a>";
+				print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php", 1)."?id=$object->id&amp;action=clone\">".$langs->trans("ToClone")."</a>";
 			}
 
 			// Delete
@@ -713,7 +713,7 @@ 
 	else
 	{
 		/* Social contribution not found */
-		dol_print_error('',$object->error);
+		dol_print_error('', $object->error);
 	}
 }
 

htdocs/compta/facture/stats/index.php

Spacing +63 added lines, -63 removed lines

@@ -29,17 +29,17 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$mode=GETPOST("mode")?GETPOST("mode"):'customer';
-if ($mode == 'customer' && ! $user->rights->facture->lire) accessforbidden();
-if ($mode == 'supplier' && ! $user->rights->fournisseur->facture->lire) accessforbidden();
+$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+if ($mode == 'customer' && !$user->rights->facture->lire) accessforbidden();
+if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) accessforbidden();
 
-$object_status=GETPOST('object_status');
+$object_status = GETPOST('object_status');
 
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
+$userid = GETPOST('userid', 'int');
+$socid = GETPOST('socid', 'int');
 // Security check
 if ($user->societe_id > 0)
 {
@@ -47,11 +47,11 @@ 
     $socid = $user->societe_id;
 }
 
-$nowyear=strftime("%Y", dol_now());
-$year = GETPOST('year')>0?GETPOST('year'):$nowyear;
+$nowyear = strftime("%Y", dol_now());
+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
 //$startyear=$year-2;
-$startyear=$year-1;
-$endyear=$year;
+$startyear = $year - 1;
+$endyear = $year;
 
 
 /*
@@ -62,26 +62,26 @@ 
 $langs->load('companies');
 $langs->load('other');
 
-$form=new Form($db);
+$form = new Form($db);
 
 llxHeader();
 
 if ($mode == 'customer')
 {
-	$title=$langs->trans("BillsStatistics");
-	$dir=$conf->facture->dir_temp;
+	$title = $langs->trans("BillsStatistics");
+	$dir = $conf->facture->dir_temp;
 }
 if ($mode == 'supplier')
 {
-	$title=$langs->trans("BillsStatisticsSuppliers");
-	$dir=$conf->fournisseur->facture->dir_temp;
+	$title = $langs->trans("BillsStatisticsSuppliers");
+	$dir = $conf->fournisseur->facture->dir_temp;
 }
 
 print load_fiche_titre($title, $mesg, 'title_accountancy.png');
 
 dol_mkdir($dir);
 
-$stats = new FactureStats($db, $socid, $mode, ($userid>0?$userid:0));
+$stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0));
 if ($mode == 'customer')
 {
     if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
@@ -93,7 +93,7 @@ 
 
 // Build graphic number of object
 // $data = array(array('Lib',val1,val2,val3),...)
-$data = $stats->getNbByMonthWithPrevYear($endyear,$startyear);
+$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 
 $filenamenb = $dir."/invoicesnbinyear-".$year.".png";
@@ -102,14 +102,14 @@ 
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
 	$px1->SetData($data);
 	$px1->SetPrecisionY(0);
-	$i=$startyear;$legend=array();
+	$i = $startyear; $legend = array();
 	while ($i <= $endyear)
 	{
-		$legend[]=$i;
+		$legend[] = $i;
 		$i++;
 	}
 	$px1->SetLegend($legend);
@@ -120,14 +120,14 @@ 
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
 	$px1->SetPrecisionY(0);
-	$px1->mode='depth';
+	$px1->mode = 'depth';
 	$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
 
-	$px1->draw($filenamenb,$fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
-$data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
+$data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
@@ -137,28 +137,28 @@ 
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
 	$px2->SetData($data);
-	$i=$startyear;$legend=array();
+	$i = $startyear; $legend = array();
 	while ($i <= $endyear)
 	{
-		$legend[]=$i;
+		$legend[] = $i;
 		$i++;
 	}
 	$px2->SetLegend($legend);
 	$px2->SetMaxValue($px2->GetCeilMaxValue());
-	$px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
 	$px2->SetWidth($WIDTH);
 	$px2->SetHeight($HEIGHT);
 	$px2->SetYLabel($langs->trans("AmountOfBills"));
 	$px2->SetShading(3);
 	$px2->SetHorizTickIncrement(1);
 	$px2->SetPrecisionY(0);
-	$px2->mode='depth';
+	$px2->mode = 'depth';
 	$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
 
-	$px2->draw($filenameamount,$fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -179,13 +179,13 @@ 
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (! $mesg)
+if (!$mesg)
 {
     $px3->SetData($data);
-    $i = $startyear;$legend=array();
+    $i = $startyear; $legend = array();
     while ($i <= $endyear)
     {
-        $legend[]=$i;
+        $legend[] = $i;
         $i++;
     }
     $px3->SetLegend($legend);
@@ -197,37 +197,37 @@ 
     $px3->SetShading(3);
     $px3->SetHorizTickIncrement(1);
     $px3->SetPrecisionY(0);
-    $px3->mode='depth';
+    $px3->mode = 'depth';
     $px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg,$fileurl_avg);
+    $px3->draw($filename_avg, $fileurl_avg);
 }
 
 
 // Show array
 $data = $stats->getAllByYear();
-$arrayyears=array();
-foreach($data as $val) {
-    $arrayyears[$val['year']]=$val['year'];
+$arrayyears = array();
+foreach ($data as $val) {
+    $arrayyears[$val['year']] = $val['year'];
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
 
-$h=0;
+$h = 0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT . '/compta/facture/stats/index.php?mode='.$mode;
+$head[$h][0] = DOL_URL_ROOT.'/compta/facture/stats/index.php?mode='.$mode;
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
 
-if ($mode == 'customer') $type='invoice_stats';
-if ($mode == 'supplier') $type='supplier_invoice_stats';
+if ($mode == 'customer') $type = 'invoice_stats';
+if ($mode == 'supplier') $type = 'supplier_invoice_stats';
 
-complete_head_from_modules($conf,$langs,null,$head,$h,$type);
+complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
 dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
-$tmp_companies = $form->select_thirdparty_list($socid,'socid',$filter,1, 0, 0, array(), '', 1);
+$tmp_companies = $form->select_thirdparty_list($socid, 'socid', $filter, 1, 0, 0, array(), '', 1);
 //Array passed as an argument to Form::selectarray to build a proper select input
 $companies = array();
 
@@ -247,8 +247,8 @@ 
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-	if ($mode == 'customer') $filter='s.client in (1,2,3)';
-	if ($mode == 'supplier') $filter='s.fournisseur = 1';
+	if ($mode == 'customer') $filter = 's.client in (1,2,3)';
+	if ($mode == 'supplier') $filter = 's.fournisseur = 1';
 	print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
 	print '</td></tr>';
 	// User
@@ -259,21 +259,21 @@ 
 	print '<tr><td align="left">'.$langs->trans("Status").'</td><td align="left">';
 	if ($mode == 'customer')
 	{
-	    $liststatus=array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
+	    $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
 	    print $form->selectarray('object_status', $liststatus, $object_status, 1);
 	}
 	if ($mode == 'supplier')
 	{
-	    $liststatus=array('0'=>$langs->trans("BillStatusDraft"),'1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
+	    $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
 	    print $form->selectarray('object_status', $liststatus, $object_status, 1);
 	}
 	print '</td></tr>';
 	// Year
 	print '<tr><td>'.$langs->trans("Year").'</td><td>';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
 	arsort($arrayyears);
-	print $form->selectarray('year',$arrayyears,$year,0);
+	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
 	print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
 	print '</table>';
@@ -292,16 +292,16 @@ 
 print '<td align="right">%</td>';
 print '</tr>';
 
-$oldyear=0;
+$oldyear = 0;
 foreach ($data as $val)
 {
 	$year = $val['year'];
-	while ($year && $oldyear > $year+1)
+	while ($year && $oldyear > $year + 1)
 	{	// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
-		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
 		print '<td align="right">0</td>';
@@ -312,15 +312,15 @@ 
 	}
 
 	print '<tr class="oddeven" height="24">';
-	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
-	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';
-	print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
-	print '<td align="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['total_diff']).'</td>';
-	print '<td align="right">'.price(price2num($val['avg'],'MT'),1).'</td>';
-	print '<td align="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['avg_diff']).'</td>';
+	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
+	print '<td align="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td align="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
+	print '<td align="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td align="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
 	print '</tr>';
-	$oldyear=$year;
+	$oldyear = $year;
 }
 
 print '</table>';

htdocs/compta/bank/card.php

Indentation +279 added lines, -279 removed lines

@@ -72,204 +72,204 @@ 
 
 if ($action == 'add')
 {
-    $error=0;
+	$error=0;
 
-    $db->begin();
+	$db->begin();
 
-    // Create account
-    $object = new Account($db);
+	// Create account
+	$object = new Account($db);
 
-    $object->ref           = dol_sanitizeFileName(trim($_POST["ref"]));
-    $object->label         = trim($_POST["label"]);
-    $object->courant       = $_POST["type"];
-    $object->clos          = $_POST["clos"];
-    $object->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
-    $object->url           = $_POST["url"];
+	$object->ref           = dol_sanitizeFileName(trim($_POST["ref"]));
+	$object->label         = trim($_POST["label"]);
+	$object->courant       = $_POST["type"];
+	$object->clos          = $_POST["clos"];
+	$object->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+	$object->url           = $_POST["url"];
 
 	$object->bank            = trim($_POST["bank"]);
-    $object->code_banque     = trim($_POST["code_banque"]);
-    $object->code_guichet    = trim($_POST["code_guichet"]);
-    $object->number          = trim($_POST["number"]);
-    $object->cle_rib         = trim($_POST["cle_rib"]);
-    $object->bic             = trim($_POST["bic"]);
-    $object->iban            = trim($_POST["iban"]);
-    $object->domiciliation   = trim($_POST["domiciliation"]);
+	$object->code_banque     = trim($_POST["code_banque"]);
+	$object->code_guichet    = trim($_POST["code_guichet"]);
+	$object->number          = trim($_POST["number"]);
+	$object->cle_rib         = trim($_POST["cle_rib"]);
+	$object->bic             = trim($_POST["bic"]);
+	$object->iban            = trim($_POST["iban"]);
+	$object->domiciliation   = trim($_POST["domiciliation"]);
 
-    $object->proprio 	     = trim($_POST["proprio"]);
-    $object->owner_address   = trim($_POST["owner_address"]);
+	$object->proprio 	     = trim($_POST["proprio"]);
+	$object->owner_address   = trim($_POST["owner_address"]);
 
 	$account_number 		 = GETPOST('account_number','alpha');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
 	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
-    $object->solde           = $_POST["solde"];
-    $object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
-
-    $object->currency_code   = trim($_POST["account_currency_code"]);
-
-    $object->state_id  	     = $_POST["account_state_id"];
-    $object->country_id      = $_POST["account_country_id"];
-
-    $object->min_allowed     = GETPOST("account_min_allowed",'int');
-    $object->min_desired     = GETPOST("account_min_desired",'int');
-    $object->comment         = trim(GETPOST("account_comment"));
-
-    $object->fk_user_author  = $user->id;
-
-    if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
-    {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
-        $action='create';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($object->ref))
-    {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-        $action='create';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($object->label))
-    {
-    	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
-    	$action='create';       // Force chargement page en mode creation
-    	$error++;
-    }
-
-    // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-    if (! $error)
-    {
-        $id = $object->create($user);
-        if ($id > 0)
-        {
-            // Category association
-            $categories = GETPOST('categories', 'array');
-            $object->setCategories($categories);
-
-            $_GET["id"]=$id;            // Force chargement page en mode visu
-
-            $action='';
-        }
-        else {
-            $error++;
-            setEventMessages($object->error, $object->errors, 'errors');
-
-            $action='create';   // Force chargement page en mode creation
-        }
-    }
-
-    if (! $error)
-    {
-        $db->commit();
-    }
-    else
-    {
-        $db->rollback();
-    }
+	$object->solde           = $_POST["solde"];
+	$object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+
+	$object->currency_code   = trim($_POST["account_currency_code"]);
+
+	$object->state_id  	     = $_POST["account_state_id"];
+	$object->country_id      = $_POST["account_country_id"];
+
+	$object->min_allowed     = GETPOST("account_min_allowed",'int');
+	$object->min_desired     = GETPOST("account_min_desired",'int');
+	$object->comment         = trim(GETPOST("account_comment"));
+
+	$object->fk_user_author  = $user->id;
+
+	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
+	{
+		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
+		$action='create';       // Force chargement page en mode creation
+		$error++;
+	}
+	if (empty($object->ref))
+	{
+		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		$action='create';       // Force chargement page en mode creation
+		$error++;
+	}
+	if (empty($object->label))
+	{
+		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+		$action='create';       // Force chargement page en mode creation
+		$error++;
+	}
+
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	if (! $error)
+	{
+		$id = $object->create($user);
+		if ($id > 0)
+		{
+			// Category association
+			$categories = GETPOST('categories', 'array');
+			$object->setCategories($categories);
+
+			$_GET["id"]=$id;            // Force chargement page en mode visu
+
+			$action='';
+		}
+		else {
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+
+			$action='create';   // Force chargement page en mode creation
+		}
+	}
+
+	if (! $error)
+	{
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
 }
 
 if ($action == 'update')
 {
-    $error=0;
-
-    // Update account
-    $object = new Account($db);
-    $object->fetch(GETPOST("id"));
-
-    $object->ref             = dol_string_nospecial(trim($_POST["ref"]));
-    $object->label           = trim($_POST["label"]);
-    $object->courant         = $_POST["type"];
-    $object->clos            = $_POST["clos"];
-    $object->rappro          = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
-    $object->url             = trim($_POST["url"]);
-
-    $object->bank            = trim($_POST["bank"]);
-    $object->code_banque     = trim($_POST["code_banque"]);
-    $object->code_guichet    = trim($_POST["code_guichet"]);
-    $object->number          = trim($_POST["number"]);
-    $object->cle_rib         = trim($_POST["cle_rib"]);
-    $object->bic             = trim($_POST["bic"]);
-    $object->iban            = trim($_POST["iban"]);
-    $object->domiciliation   = trim($_POST["domiciliation"]);
-
-    $object->proprio 	     = trim($_POST["proprio"]);
-    $object->owner_address   = trim($_POST["owner_address"]);
+	$error=0;
+
+	// Update account
+	$object = new Account($db);
+	$object->fetch(GETPOST("id"));
+
+	$object->ref             = dol_string_nospecial(trim($_POST["ref"]));
+	$object->label           = trim($_POST["label"]);
+	$object->courant         = $_POST["type"];
+	$object->clos            = $_POST["clos"];
+	$object->rappro          = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+	$object->url             = trim($_POST["url"]);
+
+	$object->bank            = trim($_POST["bank"]);
+	$object->code_banque     = trim($_POST["code_banque"]);
+	$object->code_guichet    = trim($_POST["code_guichet"]);
+	$object->number          = trim($_POST["number"]);
+	$object->cle_rib         = trim($_POST["cle_rib"]);
+	$object->bic             = trim($_POST["bic"]);
+	$object->iban            = trim($_POST["iban"]);
+	$object->domiciliation   = trim($_POST["domiciliation"]);
+
+	$object->proprio 	     = trim($_POST["proprio"]);
+	$object->owner_address   = trim($_POST["owner_address"]);
 
 	$account_number 		 = GETPOST('account_number', 'int');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
 	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
-    $object->currency_code   = trim($_POST["account_currency_code"]);
-
-    $object->state_id        = $_POST["account_state_id"];
-    $object->country_id      = $_POST["account_country_id"];
-
-    $object->min_allowed     = GETPOST("account_min_allowed",'int');
-    $object->min_desired     = GETPOST("account_min_desired",'int');
-    $object->comment         = trim(GETPOST("account_comment"));
-
-    if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
-    {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
-        $action='edit';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($object->ref))
-    {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-        $action='edit';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($object->label))
-    {
-    	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
-    	$action='edit';       // Force chargement page en mode creation
-    	$error++;
-    }
-
-    // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-    if (! $error)
-    {
-        $result = $object->update($user);
-        if ($result >= 0)
-        {
-            // Category association
-            $categories = GETPOST('categories', 'array');
-            $object->setCategories($categories);
-
-            $_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
-        }
-        else
-        {
-	        setEventMessages($object->error, $object->errors, 'errors');
-            $action='edit';     // Force chargement page edition
-        }
-    }
+	$object->currency_code   = trim($_POST["account_currency_code"]);
+
+	$object->state_id        = $_POST["account_state_id"];
+	$object->country_id      = $_POST["account_country_id"];
+
+	$object->min_allowed     = GETPOST("account_min_allowed",'int');
+	$object->min_desired     = GETPOST("account_min_desired",'int');
+	$object->comment         = trim(GETPOST("account_comment"));
+
+	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
+	{
+		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
+		$action='edit';       // Force chargement page en mode creation
+		$error++;
+	}
+	if (empty($object->ref))
+	{
+		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		$action='edit';       // Force chargement page en mode creation
+		$error++;
+	}
+	if (empty($object->label))
+	{
+		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+		$action='edit';       // Force chargement page en mode creation
+		$error++;
+	}
+
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	if (! $error)
+	{
+		$result = $object->update($user);
+		if ($result >= 0)
+		{
+			// Category association
+			$categories = GETPOST('categories', 'array');
+			$object->setCategories($categories);
+
+			$_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
+		}
+		else
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action='edit';     // Force chargement page edition
+		}
+	}
 }
 
 if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
 {
-    // Delete
-    $object = new Account($db);
-    $object->fetch(GETPOST("id","int"));
-    $result = $object->delete($user);
-
-    if ($result > 0)
-    {
-        setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-        header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
-        exit;
-    }
-    else
-    {
-        setEventMessages($account->error, $account->errors, 'errors');
-        $action='';
-    }
+	// Delete
+	$object = new Account($db);
+	$object->fetch(GETPOST("id","int"));
+	$result = $object->delete($user);
+
+	if ($result > 0)
+	{
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
+		exit;
+	}
+	else
+	{
+		setEventMessages($account->error, $account->errors, 'errors');
+		$action='';
+	}
 }
 
 
@@ -297,10 +297,10 @@ 
 
 	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
 
-    if ($conf->use_javascript_ajax)
-    {
+	if ($conf->use_javascript_ajax)
+	{
 		print "\n".'<script type="text/javascript" language="javascript">';
-        print 'jQuery(document).ready(function () {
+		print 'jQuery(document).ready(function () {
                     jQuery("#selecttype").change(function() {
                         document.formsoc.action.value="create";
                         document.formsoc.submit();
@@ -310,8 +310,8 @@ 
                         document.formsoc.submit();
                     });
                })';
-        print '</script>'."\n";
-    }
+		print '</script>'."\n";
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" name="formsoc" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -347,12 +347,12 @@ 
 	print '</td></tr>';
 
 	// Status
-    print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
-    print '<td>';
-    print $form->selectarray("clos", $object->status,(GETPOST("clos",'int')!=''?GETPOST("clos",'int'):$object->clos));
-    print '</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
+	print '<td>';
+	print $form->selectarray("clos", $object->status,(GETPOST("clos",'int')!=''?GETPOST("clos",'int'):$object->clos));
+	print '</td></tr>';
 
-    // Country
+	// Country
 	$selectedcode='';
 	if (isset($_POST["account_country_id"]))
 	{
@@ -383,24 +383,24 @@ 
 	print '<tr><td>'.$langs->trans("Web").'</td>';
 	print '<td><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
 
-    // Tags-Categories
-    if ($conf->categorie->enabled)
-    {
-        print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
-        $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
-        $c = new Categorie($db);
-        $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
-        foreach($cats as $cat) {
-            $arrayselected[] = $cat->id;
-        }
-        print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
-        print "</td></tr>";
-    }
+	// Tags-Categories
+	if ($conf->categorie->enabled)
+	{
+		print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
+		$c = new Categorie($db);
+		$cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
+		foreach($cats as $cat) {
+			$arrayselected[] = $cat->id;
+		}
+		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+		print "</td></tr>";
+	}
 
 	// Comment
 	print '<tr><td class="tdtop">'.$langs->trans("Comment").'</td>';
 	print '<td>';
-    // Editor wysiwyg
+	// Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'90%');
 	$doleditor->Create();
@@ -409,7 +409,7 @@ 
  	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
 		print $object->showOptionals($extrafields,'edit',$parameters);
@@ -504,7 +504,7 @@ 
 	print '<table class="border" width="100%">';
 	// Accountancy code
 	$fieldrequired='';
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
+	if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
 
 	if (! empty($conf->accounting->enabled))
 	{
@@ -523,7 +523,7 @@ 
 	if (! empty($conf->accounting->enabled))
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-	    print '<td>';
+		print '<td>';
 		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
 		print '</td></tr>';
 	}
@@ -547,7 +547,7 @@ 
 /* ************************************************************************** */
 else
 {
-    if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
+	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
 	{
 		$object = new Account($db);
 		if ($_GET["id"])
@@ -605,7 +605,7 @@ 
 		print '<td>';
 		$conciliate=$object->canBeConciliated();
 		if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
-        else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
+		else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
 		else print ($object->rappro==1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
 		print '</td></tr>';
 
@@ -624,15 +624,15 @@ 
 
 			print $accountingaccount->getNomUrl(0,1,1,'',1);
 		} else {
-		    print $object->account_number;
+			print $object->account_number;
 		}
 		print '</td></tr>';
 
 		// Accountancy journal
 		if (! empty($conf->accounting->enabled))
 		{
-		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
-		    print '<td>';
+			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
+			print '<td>';
 
 			$accountingjournal = new AccountingJournal($db);
 			$accountingjournal->fetch($object->fk_accountancy_journal);
@@ -655,12 +655,12 @@ 
 
 		print '<table class="border centpercent">';
 
-        // Categories
-        if ($conf->categorie->enabled) {
-            print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
-            print $form->showCategories($object->id,'bank_account',1);
-            print "</td></tr>";
-        }
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
+			print $form->showCategories($object->id,'bank_account',1);
+			print "</td></tr>";
+		}
 
 		print '<tr><td class="tdtop titlefield">'.$langs->trans("Comment").'</td>';
 		print '<td>'.dol_htmlentitiesbr($object->comment).'</td></tr>';
@@ -669,11 +669,11 @@ 
 
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
 		{
-		    print '<br>';
+			print '<br>';
 
-		    print '<div class="underbanner clearboth"></div>';
+			print '<div class="underbanner clearboth"></div>';
 
-		    print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
 			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("BankName").'</td>';
 			print '<td>'.$object->bank.'</td></tr>';
@@ -764,23 +764,23 @@ 
 
 	}
 
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* Edition                                                                    */
-    /*                                                                            */
-    /* ************************************************************************** */
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* Edition                                                                    */
+	/*                                                                            */
+	/* ************************************************************************** */
 
-    if (GETPOST('id','int') && $action == 'edit' && $user->rights->banque->configurer)
-    {
-        $object = new Account($db);
-        $object->fetch(GETPOST('id','int'));
+	if (GETPOST('id','int') && $action == 'edit' && $user->rights->banque->configurer)
+	{
+		$object = new Account($db);
+		$object->fetch(GETPOST('id','int'));
 
-        print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
+		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
 
-        if ($conf->use_javascript_ajax)
-        {
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
                         jQuery("#selecttype").change(function() {
                             document.formsoc.action.value="edit";
                             document.formsoc.submit();
@@ -793,33 +793,33 @@ 
                             document.formsoc.submit();
                         });
                    })';
-            print '</script>'."\n";
-        }
+			print '</script>'."\n";
+		}
 
-        print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formsoc">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="update">';
-        print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formsoc">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
 
-        dol_fiche_head('');
+		dol_fiche_head('');
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border" width="100%">';
+		print '<table class="border" width="100%">';
 
 		// Ref
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
 		print '<td><input size="8" type="text" class="flat" name="ref" value="'.(isset($_POST["ref"])?GETPOST("ref"):$object->ref).'"></td></tr>';
 
 		// Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-        print '<td><input type="text" class="flat minwidth300" name="label" value="'.(isset($_POST["label"])?GETPOST("label"):$object->label).'"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
+		print '<td><input type="text" class="flat minwidth300" name="label" value="'.(isset($_POST["label"])?GETPOST("label"):$object->label).'"></td></tr>';
 
-        // Type
-        print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
-        print '<td class="maxwidth200onsmartphone">';
+		// Type
+		print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
+		print '<td class="maxwidth200onsmartphone">';
 		$formbank->selectTypeOfBankAccount((isset($_POST["type"])?$_POST["type"]:$object->type),"type");
-        print '</td></tr>';
+		print '</td></tr>';
 
 		// Currency
 		print '<tr><td class="fieldrequired">'.$langs->trans("Currency");
@@ -834,10 +834,10 @@ 
 		print '</td></tr>';
 
 		// Status
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
-        print '<td class="maxwidth200onsmartphone">';
-        print $form->selectarray("clos", $object->status, (isset($_POST["clos"])?$_POST["clos"]:$object->clos));
-        print '</td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
+		print '<td class="maxwidth200onsmartphone">';
+		print $form->selectarray("clos", $object->status, (isset($_POST["clos"])?$_POST["clos"]:$object->clos));
+		print '</td></tr>';
 
 		// Country
 		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
@@ -865,15 +865,15 @@ 
 		print '</td></tr>';
 
 		// Conciliable
-        print '<tr><td>'.$langs->trans("Conciliable").'</td>';
-        print '<td>';
-        $conciliate=$object->canBeConciliated();
-        if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
-        else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-        else print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0)?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
-        print '</td></tr>';
-
-        // Balance
+		print '<tr><td>'.$langs->trans("Conciliable").'</td>';
+		print '<td>';
+		$conciliate=$object->canBeConciliated();
+		if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
+		else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
+		else print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0)?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
+		print '</td></tr>';
+
+		// Balance
 		print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
 		print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"])?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
 
@@ -881,28 +881,28 @@ 
 		print '<td ><input size="12" type="text" class="flat" name="account_min_desired" value="'.(isset($_POST["account_min_desired"])?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
 
 		// Web
-        print '<tr><td>'.$langs->trans("Web").'</td>';
-        print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(isset($_POST["url"])?GETPOST("url"):$object->url).'">';
-        print '</td></tr>';
-
-        // Tags-Categories
-        if ($conf->categorie->enabled)
-        {
-            print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
-            $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
-            $c = new Categorie($db);
-            $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
-            foreach($cats as $cat) {
-                $arrayselected[] = $cat->id;
-            }
-            print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
-            print "</td></tr>";
-        }
+		print '<tr><td>'.$langs->trans("Web").'</td>';
+		print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(isset($_POST["url"])?GETPOST("url"):$object->url).'">';
+		print '</td></tr>';
+
+		// Tags-Categories
+		if ($conf->categorie->enabled)
+		{
+			print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
+			$c = new Categorie($db);
+			$cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
+			foreach($cats as $cat) {
+				$arrayselected[] = $cat->id;
+			}
+			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+			print "</td></tr>";
+		}
 
 		// Comment
 		print '<tr><td class="tdtop">'.$langs->trans("Comment").'</td>';
 		print '<td>';
-	    // Editor wysiwyg
+		// Editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'95%');
 		$doleditor->Create();
@@ -911,7 +911,7 @@ 
 		// Other attributes
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
@@ -929,15 +929,15 @@ 
 		$tdextra = ' class="titlefieldcreate"';
 
 		if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) {
-		    $tdextra = ' class="fieldrequired titlefieldcreate"';
+			$tdextra = ' class="fieldrequired titlefieldcreate"';
 		}
 
 		print '<tr class="liste_titre_add"><td'.$tdextra.'>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		if (!empty($conf->accounting->enabled)) {
-		    print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
+			print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		} else {
-		    print '<input type="text" name="account_number" value="'.(GETPOST("account_number") ? GETPOST("account_number") : $object->account_number).'">';
+			print '<input type="text" name="account_number" value="'.(GETPOST("account_number") ? GETPOST("account_number") : $object->account_number).'">';
 		}
 		print '</td></tr>';
 
@@ -954,9 +954,9 @@ 
 
 		if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT)
 		{
-		    print '<br>';
+			print '<br>';
 
-		    //print '<div class="underbanner clearboth"></div>';
+			//print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border" width="100%">';
 

Spacing +160 added lines, -160 removed lines

@@ -28,16 +28,16 @@ 
  */
 
 require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->load("banks");
 $langs->load("bills");
@@ -45,22 +45,22 @@ 
 $langs->load("companies");
 $langs->load("compta");
 
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 // Security check
 if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = isset($_GET["id"])?GETPOST("id"):(isset($_GET["ref"])?GETPOST("ref"):'');
+	$id = isset($_GET["id"]) ?GETPOST("id") : (isset($_GET["ref"]) ?GETPOST("ref") : '');
 }
-$fieldid = isset($_GET["ref"])?'ref':'rowid';
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fieldid);
+$fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
 
 $object = new Account($db);
 $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 
 
@@ -68,11 +68,11 @@ 
  * Actions
  */
 
-if ($cancel) $action='';
+if ($cancel) $action = '';
 
 if ($action == 'add')
 {
-    $error=0;
+    $error = 0;
 
     $db->begin();
 
@@ -83,10 +83,10 @@ 
     $object->label         = trim($_POST["label"]);
     $object->courant       = $_POST["type"];
     $object->clos          = $_POST["clos"];
-    $object->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+    $object->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"]) ? 0 : 1;
     $object->url           = $_POST["url"];
 
-	$object->bank            = trim($_POST["bank"]);
+	$object->bank = trim($_POST["bank"]);
     $object->code_banque     = trim($_POST["code_banque"]);
     $object->code_guichet    = trim($_POST["code_guichet"]);
     $object->number          = trim($_POST["number"]);
@@ -95,51 +95,51 @@ 
     $object->iban            = trim($_POST["iban"]);
     $object->domiciliation   = trim($_POST["domiciliation"]);
 
-    $object->proprio 	     = trim($_POST["proprio"]);
+    $object->proprio = trim($_POST["proprio"]);
     $object->owner_address   = trim($_POST["owner_address"]);
 
-	$account_number 		 = GETPOST('account_number','alpha');
+	$account_number = GETPOST('account_number', 'alpha');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
+	$fk_accountancy_journal = GETPOST('fk_accountancy_journal', 'int');
 	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
     $object->solde           = $_POST["solde"];
-    $object->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+    $object->date_solde      = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 
     $object->currency_code   = trim($_POST["account_currency_code"]);
 
     $object->state_id  	     = $_POST["account_state_id"];
     $object->country_id      = $_POST["account_country_id"];
 
-    $object->min_allowed     = GETPOST("account_min_allowed",'int');
-    $object->min_desired     = GETPOST("account_min_desired",'int');
+    $object->min_allowed     = GETPOST("account_min_allowed", 'int');
+    $object->min_desired     = GETPOST("account_min_desired", 'int');
     $object->comment         = trim(GETPOST("account_comment"));
 
     $object->fk_user_author  = $user->id;
 
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
     {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
-        $action='create';       // Force chargement page en mode creation
+        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
+        $action = 'create'; // Force chargement page en mode creation
         $error++;
     }
     if (empty($object->ref))
     {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-        $action='create';       // Force chargement page en mode creation
+        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
+        $action = 'create'; // Force chargement page en mode creation
         $error++;
     }
     if (empty($object->label))
     {
-    	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
-    	$action='create';       // Force chargement page en mode creation
+    	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+    	$action = 'create'; // Force chargement page en mode creation
     	$error++;
     }
 
     // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+    $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 
-    if (! $error)
+    if (!$error)
     {
         $id = $object->create($user);
         if ($id > 0)
@@ -148,19 +148,19 @@ 
             $categories = GETPOST('categories', 'array');
             $object->setCategories($categories);
 
-            $_GET["id"]=$id;            // Force chargement page en mode visu
+            $_GET["id"] = $id; // Force chargement page en mode visu
 
-            $action='';
+            $action = '';
         }
         else {
             $error++;
             setEventMessages($object->error, $object->errors, 'errors');
 
-            $action='create';   // Force chargement page en mode creation
+            $action = 'create'; // Force chargement page en mode creation
         }
     }
 
-    if (! $error)
+    if (!$error)
     {
         $db->commit();
     }
@@ -172,7 +172,7 @@ 
 
 if ($action == 'update')
 {
-    $error=0;
+    $error = 0;
 
     // Update account
     $object = new Account($db);
@@ -182,7 +182,7 @@ 
     $object->label           = trim($_POST["label"]);
     $object->courant         = $_POST["type"];
     $object->clos            = $_POST["clos"];
-    $object->rappro          = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+    $object->rappro          = (isset($_POST["norappro"]) && $_POST["norappro"]) ? 0 : 1;
     $object->url             = trim($_POST["url"]);
 
     $object->bank            = trim($_POST["bank"]);
@@ -194,12 +194,12 @@ 
     $object->iban            = trim($_POST["iban"]);
     $object->domiciliation   = trim($_POST["domiciliation"]);
 
-    $object->proprio 	     = trim($_POST["proprio"]);
+    $object->proprio = trim($_POST["proprio"]);
     $object->owner_address   = trim($_POST["owner_address"]);
 
-	$account_number 		 = GETPOST('account_number', 'int');
+	$account_number = GETPOST('account_number', 'int');
 	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
-	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
+	$fk_accountancy_journal = GETPOST('fk_accountancy_journal', 'int');
 	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
     $object->currency_code   = trim($_POST["account_currency_code"]);
@@ -207,33 +207,33 @@ 
     $object->state_id        = $_POST["account_state_id"];
     $object->country_id      = $_POST["account_country_id"];
 
-    $object->min_allowed     = GETPOST("account_min_allowed",'int');
-    $object->min_desired     = GETPOST("account_min_desired",'int');
+    $object->min_allowed     = GETPOST("account_min_allowed", 'int');
+    $object->min_desired     = GETPOST("account_min_desired", 'int');
     $object->comment         = trim(GETPOST("account_comment"));
 
     if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
     {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
-        $action='edit';       // Force chargement page en mode creation
+        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
+        $action = 'edit'; // Force chargement page en mode creation
         $error++;
     }
     if (empty($object->ref))
     {
-        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
-        $action='edit';       // Force chargement page en mode creation
+        setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
+        $action = 'edit'; // Force chargement page en mode creation
         $error++;
     }
     if (empty($object->label))
     {
-    	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
-    	$action='edit';       // Force chargement page en mode creation
+    	setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
+    	$action = 'edit'; // Force chargement page en mode creation
     	$error++;
     }
 
     // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+    $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 
-    if (! $error)
+    if (!$error)
     {
         $result = $object->update($user);
         if ($result >= 0)
@@ -242,12 +242,12 @@ 
             $categories = GETPOST('categories', 'array');
             $object->setCategories($categories);
 
-            $_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
+            $_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
         }
         else
         {
 	        setEventMessages($object->error, $object->errors, 'errors');
-            $action='edit';     // Force chargement page edition
+            $action = 'edit'; // Force chargement page edition
         }
     }
 }
@@ -256,7 +256,7 @@ 
 {
     // Delete
     $object = new Account($db);
-    $object->fetch(GETPOST("id","int"));
+    $object->fetch(GETPOST("id", "int"));
     $result = $object->delete($user);
 
     if ($result > 0)
@@ -268,7 +268,7 @@ 
     else
     {
         setEventMessages($account->error, $account->errors, 'errors');
-        $action='';
+        $action = '';
     }
 }
 
@@ -280,20 +280,20 @@ 
 $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
+if (!empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db);
 
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-$title = $langs->trans("FinancialAccount") . " - " . $langs->trans("Card");
+$title = $langs->trans("FinancialAccount")." - ".$langs->trans("Card");
 $helpurl = "";
-llxHeader("",$title,$helpurl);
+llxHeader("", $title, $helpurl);
 
 
 // Creation
 
 if ($action == 'create')
 {
-	$object=new Account($db);
+	$object = new Account($db);
 
 	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
 
@@ -324,7 +324,7 @@ 
 
 	// Ref
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-	print '<td><input size="8" type="text" class="flat" name="ref" value="'.dol_escape_htmltag(GETPOST("ref")?GETPOST("ref",'alpha'):$object->ref).'" maxlength="12" autofocus></td></tr>';
+	print '<td><input size="8" type="text" class="flat" name="ref" value="'.dol_escape_htmltag(GETPOST("ref") ?GETPOST("ref", 'alpha') : $object->ref).'" maxlength="12" autofocus></td></tr>';
 
 	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
@@ -333,15 +333,15 @@ 
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 	print '<td>';
-	$formbank->selectTypeOfBankAccount(isset($_POST["type"])?$_POST["type"]: Account::TYPE_CURRENT,"type");
+	$formbank->selectTypeOfBankAccount(isset($_POST["type"]) ? $_POST["type"] : Account::TYPE_CURRENT, "type");
 	print '</td></tr>';
 
 	// Currency
 	print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
 	print '<td>';
-	$selectedcode=$object->currency_code;
-	if (! $selectedcode) $selectedcode=$conf->currency;
-	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
+	$selectedcode = $object->currency_code;
+	if (!$selectedcode) $selectedcode = $conf->currency;
+	print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
 	//print $langs->trans("Currency".$conf->currency);
 	//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
 	print '</td></tr>';
@@ -349,29 +349,29 @@ 
 	// Status
     print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
     print '<td>';
-    print $form->selectarray("clos", $object->status,(GETPOST("clos",'int')!=''?GETPOST("clos",'int'):$object->clos));
+    print $form->selectarray("clos", $object->status, (GETPOST("clos", 'int') != '' ?GETPOST("clos", 'int') : $object->clos));
     print '</td></tr>';
 
     // Country
-	$selectedcode='';
+	$selectedcode = '';
 	if (isset($_POST["account_country_id"]))
 	{
-		$selectedcode=$_POST["account_country_id"]?$_POST["account_country_id"]:$object->country_code;
+		$selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
 	}
-	else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
-	$object->country_code = getCountry($selectedcode, 2);	// Force country code on account to have following field on bank fields matching country rules
+	else if (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+	$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
 	print '<td>';
-	print $form->select_country($selectedcode,'account_country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	print $form->select_country($selectedcode, 'account_country_id');
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	print '</td></tr>';
 
 	// State
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($selectedcode)
 	{
-		$formcompany->select_departement(isset($_POST["account_state_id"])?$_POST["account_state_id"]:'',$selectedcode,'account_state_id');
+		$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
 	}
 	else
 	{
@@ -389,8 +389,8 @@ 
         print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
         $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
         $c = new Categorie($db);
-        $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
-        foreach($cats as $cat) {
+        $cats = $c->containing($object->id, Categorie::TYPE_ACCOUNT);
+        foreach ($cats as $cat) {
             $arrayselected[] = $cat->id;
         }
         print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
@@ -402,17 +402,17 @@ 
 	print '<td>';
     // Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'90%');
+	$doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ?GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_4, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
  	// Other attributes
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	if (empty($reshook) && !empty($extrafields->attribute_label))
 	{
-		print $object->showOptionals($extrafields,'edit',$parameters);
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print '</table>';
@@ -423,7 +423,7 @@ 
 
 	// Sold
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("InitialBankBalance").'</td>';
-	print '<td><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde")?GETPOST("solde"):price2num($object->solde)).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde") ?GETPOST("solde") : price2num($object->solde)).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Date").'</td>';
 	print '<td>';
@@ -431,10 +431,10 @@ 
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-	print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed")?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed") ?GETPOST("account_min_allowed") : $object->min_allowed).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-	print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired")?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired") ?GETPOST("account_min_desired") : $object->min_desired).'"></td></tr>';
 
 	print '</table>';
 	print '<br>';
@@ -445,7 +445,7 @@ 
 
 		// If bank account
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("BankName").'</td>';
-		print '<td><input size="30" type="text" class="flat" name="bank" value="'.(GETPOST('bank')?GETPOST('bank','alpha'):$object->bank).'"></td>';
+		print '<td><input size="30" type="text" class="flat" name="bank" value="'.(GETPOST('bank') ?GETPOST('bank', 'alpha') : $object->bank).'"></td>';
 		print '</tr>';
 
 		// Show fields of bank account
@@ -469,32 +469,32 @@ 
 			}
 
 			print '<td>'.$langs->trans($val).'</td>';
-			print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.(GETPOST($name)?GETPOST($name,'alpha'):$content).'"></td>';
+			print '<td><input size="'.$size.'" type="text" class="flat" name="'.$name.'" value="'.(GETPOST($name) ?GETPOST($name, 'alpha') : $content).'"></td>';
 			print '</tr>';
 		}
 		$ibankey = FormBank::getIBANLabel($object);
-		$bickey="BICNumber";
-		if ($object->getCountryCode() == 'IN') $bickey="SWIFT";
+		$bickey = "BICNumber";
+		if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
 
 		// IBAN
 		print '<tr><td>'.$langs->trans($ibankey).'</td>';
-		print '<td><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOST('iban')?GETPOST('iban','alpha'):$object->iban).'"></td></tr>';
+		print '<td><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOST('iban') ?GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans($bickey).'</td>';
-		print '<td><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOST('bic')?GETPOST('bic','alpha'):$object->bic).'"></td></tr>';
+		print '<td><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOST('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 		print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
-		print (GETPOST('domiciliation')?GETPOST('domiciliation'):$object->domiciliation);
+		print (GETPOST('domiciliation') ?GETPOST('domiciliation') : $object->domiciliation);
 		print "</textarea></td></tr>";
 
 		print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-		print '<td><input size="30" type="text" class="flat" name="proprio" value="'.(GETPOST('proprio')?GETPOST('proprio','alpha'):$object->proprio).'">';
+		print '<td><input size="30" type="text" class="flat" name="proprio" value="'.(GETPOST('proprio') ?GETPOST('proprio', 'alpha') : $object->proprio).'">';
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 		print "<textarea class=\"flat\" name=\"owner_address\" rows=\"2\" cols=\"40\">";
-		print (GETPOST('owner_address')?GETPOST('owner_address','alpha'):$object->owner_address);
+		print (GETPOST('owner_address') ?GETPOST('owner_address', 'alpha') : $object->owner_address);
 		print "</textarea></td></tr>";
 
 		print '</table>';
@@ -503,10 +503,10 @@ 
 
 	print '<table class="border" width="100%">';
 	// Accountancy code
-	$fieldrequired='';
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
+	$fieldrequired = '';
+    if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired = 'fieldrequired ';
 
-	if (! empty($conf->accounting->enabled))
+	if (!empty($conf->accounting->enabled))
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
@@ -516,11 +516,11 @@ 
 	else
 	{
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
-		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number")?GETPOST('account_number', 'alpha'):$object->account_number).'"></td></tr>';
+		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number") ?GETPOST('account_number', 'alpha') : $object->account_number).'"></td></tr>';
 	}
 
 	// Accountancy journal
-	if (! empty($conf->accounting->enabled))
+	if (!empty($conf->accounting->enabled))
 	{
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 	    print '<td>';
@@ -533,9 +533,9 @@ 
 	dol_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="' . $langs->trans("CreateAccount") . '">';
+	print '<input type="submit" class="button" value="'.$langs->trans("CreateAccount").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
 
 	print '</form>';
@@ -556,12 +556,12 @@ 
 		}
 		if ($_GET["ref"])
 		{
-			$object->fetch(0,$_GET["ref"]);
-			$_GET["id"]=$object->id;
+			$object->fetch(0, $_GET["ref"]);
+			$_GET["id"] = $object->id;
 		}
 
 		// Show tabs
-		$head=bank_prepare_head($object);
+		$head = bank_prepare_head($object);
 		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
 
 		$formconfirm = '';
@@ -569,7 +569,7 @@ 
 		// Confirmation to delete
 		if ($action == 'delete')
 		{
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("DeleteAccount"), $langs->trans("ConfirmDeleteAccount"), "confirm_delete");
 
 		}
 
@@ -578,7 +578,7 @@ 
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		$morehtmlref='';
+		$morehtmlref = '';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
@@ -595,18 +595,18 @@ 
 		// Currency
 		print '<tr><td>'.$langs->trans("Currency").'</td>';
 		print '<td>';
-		$selectedcode=$object->currency_code;
-		if (! $selectedcode) $selectedcode=$conf->currency;
+		$selectedcode = $object->currency_code;
+		if (!$selectedcode) $selectedcode = $conf->currency;
 		print $langs->trans("Currency".$selectedcode);
 		print '</td></tr>';
 
 		// Conciliate
 		print '<tr><td>'.$langs->trans("Conciliable").'</td>';
 		print '<td>';
-		$conciliate=$object->canBeConciliated();
+		$conciliate = $object->canBeConciliated();
 		if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
         else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-		else print ($object->rappro==1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
+		else print ($object->rappro == 1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
@@ -618,18 +618,18 @@ 
 		// Accountancy code
 		print '<tr class="liste_titre_add"><td class="titlefield">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		if (! empty($conf->accounting->enabled)) {
+		if (!empty($conf->accounting->enabled)) {
 			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch('',$object->account_number);
+			$accountingaccount->fetch('', $object->account_number);
 
-			print $accountingaccount->getNomUrl(0,1,1,'',1);
+			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 		} else {
 		    print $object->account_number;
 		}
 		print '</td></tr>';
 
 		// Accountancy journal
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
 		    print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 		    print '<td>';
@@ -637,14 +637,14 @@ 
 			$accountingjournal = new AccountingJournal($db);
 			$accountingjournal->fetch($object->fk_accountancy_journal);
 
-			print $accountingjournal->getNomUrl(0,1,1,'',1);
+			print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 
 			print '</td></tr>';
 		}
 
 		// Other attributes
 		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
@@ -658,7 +658,7 @@ 
         // Categories
         if ($conf->categorie->enabled) {
             print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
-            print $form->showCategories($object->id,'bank_account',1);
+            print $form->showCategories($object->id, 'bank_account', 1);
             print "</td></tr>";
         }
 
@@ -696,27 +696,27 @@ 
 			}
 
 			$ibankey = FormBank::getIBANLabel($object);
-			$bickey="BICNumber";
-			if ($object->getCountryCode() == 'IN') $bickey="SWIFT";
+			$bickey = "BICNumber";
+			if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
 
 			print '<tr><td>'.$langs->trans($ibankey).'</td>';
 			print '<td>'.$object->iban.'&nbsp;';
-			if (! empty($object->iban)) {
-				if (! checkIbanForAccount($object)) {
-					print img_picto($langs->trans("IbanNotValid"),'warning');
+			if (!empty($object->iban)) {
+				if (!checkIbanForAccount($object)) {
+					print img_picto($langs->trans("IbanNotValid"), 'warning');
 				} else {
-					print img_picto($langs->trans("IbanValid"),'info');
+					print img_picto($langs->trans("IbanValid"), 'info');
 				}
 			}
 			print '</td></tr>';
 
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td>'.$object->bic.'&nbsp;';
-			if (! empty($object->bic)) {
-				if (! checkSwiftForAccount($object)) {
-					print img_picto($langs->trans("SwiftNotValid"),'warning');
+			if (!empty($object->bic)) {
+				if (!checkSwiftForAccount($object)) {
+					print img_picto($langs->trans("SwiftNotValid"), 'warning');
 				} else {
-					print img_picto($langs->trans("SwiftValid"),'info');
+					print img_picto($langs->trans("SwiftValid"), 'info');
 				}
 			}
 			print '</td></tr>';
@@ -754,7 +754,7 @@ 
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
 		}
 
-		$canbedeleted=$object->can_be_deleted();   // Renvoi vrai si compte sans mouvements
+		$canbedeleted = $object->can_be_deleted(); // Renvoi vrai si compte sans mouvements
 		if ($user->rights->banque->configurer && $canbedeleted)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
@@ -770,10 +770,10 @@ 
     /*                                                                            */
     /* ************************************************************************** */
 
-    if (GETPOST('id','int') && $action == 'edit' && $user->rights->banque->configurer)
+    if (GETPOST('id', 'int') && $action == 'edit' && $user->rights->banque->configurer)
     {
         $object = new Account($db);
-        $object->fetch(GETPOST('id','int'));
+        $object->fetch(GETPOST('id', 'int'));
 
         print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
 
@@ -809,16 +809,16 @@ 
 
 		// Ref
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-		print '<td><input size="8" type="text" class="flat" name="ref" value="'.(isset($_POST["ref"])?GETPOST("ref"):$object->ref).'"></td></tr>';
+		print '<td><input size="8" type="text" class="flat" name="ref" value="'.(isset($_POST["ref"]) ?GETPOST("ref") : $object->ref).'"></td></tr>';
 
 		// Label
         print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-        print '<td><input type="text" class="flat minwidth300" name="label" value="'.(isset($_POST["label"])?GETPOST("label"):$object->label).'"></td></tr>';
+        print '<td><input type="text" class="flat minwidth300" name="label" value="'.(isset($_POST["label"]) ?GETPOST("label") : $object->label).'"></td></tr>';
 
         // Type
         print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
         print '<td class="maxwidth200onsmartphone">';
-		$formbank->selectTypeOfBankAccount((isset($_POST["type"])?$_POST["type"]:$object->type),"type");
+		$formbank->selectTypeOfBankAccount((isset($_POST["type"]) ? $_POST["type"] : $object->type), "type");
         print '</td></tr>';
 
 		// Currency
@@ -826,9 +826,9 @@ 
 		print '<input type="hidden" value="'.$object->currency_code.'">';
 		print '</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		$selectedcode=$object->currency_code;
-		if (! $selectedcode) $selectedcode=$conf->currency;
-		print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
+		$selectedcode = $object->currency_code;
+		if (!$selectedcode) $selectedcode = $conf->currency;
+		print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
 		//print $langs->trans("Currency".$conf->currency);
 		//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
 		print '</td></tr>';
@@ -836,27 +836,27 @@ 
 		// Status
         print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
         print '<td class="maxwidth200onsmartphone">';
-        print $form->selectarray("clos", $object->status, (isset($_POST["clos"])?$_POST["clos"]:$object->clos));
+        print $form->selectarray("clos", $object->status, (isset($_POST["clos"]) ? $_POST["clos"] : $object->clos));
         print '</td></tr>';
 
 		// Country
-		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
-		$selectedcode=$object->country_code;
-		if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
-		else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
-		$object->country_code = getCountry($selectedcode, 2);	// Force country code on account to have following field on bank fields matching country rules
+		$object->country_id = $object->country_id ? $object->country_id : $mysoc->country_id;
+		$selectedcode = $object->country_code;
+		if (isset($_POST["account_country_id"])) $selectedcode = $_POST["account_country_id"];
+		else if (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+		$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 		print '<tr><td class="fieldrequired">'.$langs->trans("Country").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		print $form->select_country($selectedcode,'account_country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print $form->select_country($selectedcode, 'account_country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td></tr>';
 
 		// State
 		print '<tr><td>'.$langs->trans('State').'</td><td class="maxwidth200onsmartphone">';
 		if ($selectedcode)
 		{
-			print $formcompany->select_state(isset($_POST["account_state_id"])?$_POST["account_state_id"]:$object->state_id,$selectedcode,'account_state_id');
+			print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
 		}
 		else
 		{
@@ -867,22 +867,22 @@ 
 		// Conciliable
         print '<tr><td>'.$langs->trans("Conciliable").'</td>';
         print '<td>';
-        $conciliate=$object->canBeConciliated();
+        $conciliate = $object->canBeConciliated();
         if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
         else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-        else print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0)?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
+        else print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0) ? '' : ' checked="checked"').'"> '.$langs->trans("DisableConciliation");
         print '</td></tr>';
 
         // Balance
 		print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-		print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"])?GETPOST("account_min_allowed"):$object->min_allowed).'"></td></tr>';
+		print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"]) ?GETPOST("account_min_allowed") : $object->min_allowed).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-		print '<td ><input size="12" type="text" class="flat" name="account_min_desired" value="'.(isset($_POST["account_min_desired"])?GETPOST("account_min_desired"):$object->min_desired).'"></td></tr>';
+		print '<td ><input size="12" type="text" class="flat" name="account_min_desired" value="'.(isset($_POST["account_min_desired"]) ?GETPOST("account_min_desired") : $object->min_desired).'"></td></tr>';
 
 		// Web
         print '<tr><td>'.$langs->trans("Web").'</td>';
-        print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(isset($_POST["url"])?GETPOST("url"):$object->url).'">';
+        print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="url" value="'.(isset($_POST["url"]) ?GETPOST("url") : $object->url).'">';
         print '</td></tr>';
 
         // Tags-Categories
@@ -891,8 +891,8 @@ 
             print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
             $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
             $c = new Categorie($db);
-            $cats = $c->containing($object->id,Categorie::TYPE_ACCOUNT);
-            foreach($cats as $cat) {
+            $cats = $c->containing($object->id, Categorie::TYPE_ACCOUNT);
+            foreach ($cats as $cat) {
                 $arrayselected[] = $cat->id;
             }
             print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
@@ -904,17 +904,17 @@ 
 		print '<td>';
 	    // Editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor=new DolEditor('account_comment',(GETPOST("account_comment")?GETPOST("account_comment"):$object->comment),'',90,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,'95%');
+		$doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ?GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_4, '95%');
 		$doleditor->Create();
 		print '</td></tr>';
 
 		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		if (empty($reshook) && !empty($extrafields->attribute_label))
 		{
-			print $object->showOptionals($extrafields,'edit');
+			print $object->showOptionals($extrafields, 'edit');
 		}
 
 		print '</table>';
@@ -942,7 +942,7 @@ 
 		print '</td></tr>';
 
 		// Accountancy journal
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
@@ -991,8 +991,8 @@ 
 			}
 
 			$ibankey = FormBank::getIBANLabel($object);
-			$bickey="BICNumber";
-			if ($object->getCountryCode() == 'IN') $bickey="SWIFT";
+			$bickey = "BICNumber";
+			if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
 
 			// IBAN
 			print '<tr><td>'.$langs->trans($ibankey).'</td>';

htdocs/fichinter/class/fichinter.class.php

Indentation +172 added lines, -172 removed lines

@@ -38,7 +38,7 @@ 
 	public $table_element='fichinter';
 	public $fk_element='fk_fichinter';
 	public $table_element_line='fichinterdet';
-    public $picto = 'intervention';
+	public $picto = 'intervention';
 
 	/**
 	 * {@inheritdoc}
@@ -83,7 +83,7 @@ 
 	 *	Constructor
 	 *
 	 *  @param	DoliDB	$db		Database handler
- 	 */
+	 */
 	function __construct($db)
 	{
 		$this->db = $db;
@@ -152,7 +152,7 @@ 
 	 *	Create an intervention into data base
 	 *
 	 *  @param		User	$user 		Objet user that make creation
-     *	@param		int		$notrigger	Disable all triggers
+	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
 	function create($user, $notrigger=0)
@@ -237,13 +237,13 @@ 
 			}
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            {
-            	$result=$this->insertExtraFields();
-            	if ($result < 0)
-            	{
-            		$error++;
-            	}
-            }
+			{
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			// Add linked object
 			if (! $error && $this->origin && $this->origin_id)
@@ -253,13 +253,13 @@ 
 			}
 
 
-            if (! $notrigger)
-            {
-                // Call trigger
-                $result=$this->call_trigger('FICHINTER_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('FICHINTER_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
 			if (! $error)
 			{
@@ -287,7 +287,7 @@ 
 	 *	Update an intervention
 	 *
 	 *	@param		User	$user 		Objet user that make creation
-     *	@param		int		$notrigger	Disable all triggers
+	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
 	function update($user, $notrigger=0)
@@ -316,10 +316,10 @@ 
 
 			if (! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('FICHINTER_MODIFY',$user);
-                if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('FICHINTER_MODIFY',$user);
+				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+				// End call triggers
 			}
 
 			$this->db->commit();
@@ -446,7 +446,7 @@ 
 	 *	Validate a intervention
 	 *
 	 *	@param		User		$user		User that validate
-     *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
 	function setValid($user, $notrigger=0)
@@ -471,7 +471,7 @@ 
 			{
 				$num = $this->ref;
 			}
-            $this->newref = $num;
+			$this->newref = $num;
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
 			$sql.= " SET fk_statut = 1";
@@ -492,10 +492,10 @@ 
 
 			if (! $error && ! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('FICHINTER_VALIDATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('FICHINTER_VALIDATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 
 			if (! $error)
@@ -517,17 +517,17 @@ 
 
 						if (@rename($dirsource, $dirdest))
 						{
-	                        dol_syslog("Rename ok");
-	                        // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
-	                        {
-	                        	$dirsource=$fileentry['name'];
-	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-	                        	@rename($dirsource, $dirdest);
-	                        }
+							dol_syslog("Rename ok");
+							// Rename docs starting with $oldref with $newref
+							$listoffiles=dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+							foreach($listoffiles as $fileentry)
+							{
+								$dirsource=$fileentry['name'];
+								$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+								$dirsource=$fileentry['path'].'/'.$dirsource;
+								$dirdest=$fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
 						}
 					}
 				}
@@ -647,7 +647,7 @@ 
 		if ($mode == 5)
 			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
 		if ($mode == 6)
-		    return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
 
 		return '';
 	}
@@ -657,8 +657,8 @@ 
 	 *
 	 *	@param		int		$withpicto					0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
 	 *	@param		string	$option						Options
-     *  @param	    int   	$notooltip					1=Disable tooltip
-     *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	    int   	$notooltip					1=Disable tooltip
+	 *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string								String with URL
 	 */
 	function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
@@ -667,20 +667,20 @@ 
 
 		$result='';
 
-        $label = '<u>' . $langs->trans("ShowIntervention") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+		$label = '<u>' . $langs->trans("ShowIntervention") . '</u>';
+		if (! empty($this->ref))
+			$label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
 
-        $picto='intervention';
-        $url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
+		$picto='intervention';
+		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
 
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-       	}
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	   	}
 
 		$linkclose='';
 		if (empty($notooltip))
@@ -698,7 +698,7 @@ 
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
 		return $result;
@@ -833,7 +833,7 @@ 
 	function delete($user, $notrigger=0)
 	{
 		global $conf,$langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error=0;
 
@@ -899,10 +899,10 @@ 
 
 				if (! $notrigger)
 				{
-                    // Call trigger
-                    $result=$this->call_trigger('FICHINTER_DELETE',$user);
-                    if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('FICHINTER_DELETE',$user);
+					if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+					// End call triggers
 				}
 
 				$this->db->commit();
@@ -1024,98 +1024,98 @@ 
 
 
 
-    /**
-     *	Load an object from its id and create a new one in database
-     *
-     *	@param		int			$socid			Id of thirdparty
-     *	@return		int							New id of clone
-     */
-    function createFromClone($socid=0)
-    {
-        global $user,$hookmanager;
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
+	 *	@param		int			$socid			Id of thirdparty
+	 *	@return		int							New id of clone
+	 */
+	function createFromClone($socid=0)
+	{
+		global $user,$hookmanager;
 
-        $error=0;
+		$error=0;
 
-        $this->context['createfromclone'] = 'createfromclone';
+		$this->context['createfromclone'] = 'createfromclone';
 
-        $this->db->begin();
+		$this->db->begin();
 
 		// get extrafields so they will be clone
 		foreach($this->lines as $line)
 			$line->fetch_optionals($line->rowid);
 
-        // Load source object
-        $objFrom = clone $this;
+		// Load source object
+		$objFrom = clone $this;
 
-        // Change socid if needed
-        if (! empty($socid) && $socid != $this->socid)
-        {
-            $objsoc = new Societe($this->db);
+		// Change socid if needed
+		if (! empty($socid) && $socid != $this->socid)
+		{
+			$objsoc = new Societe($this->db);
 
-            if ($objsoc->fetch($socid)>0)
-            {
-                $this->socid 				= $objsoc->id;
-                //$this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                //$this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $this->fk_project			= '';
-                $this->fk_delivery_address	= '';
-            }
+			if ($objsoc->fetch($socid)>0)
+			{
+				$this->socid 				= $objsoc->id;
+				//$this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				//$this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$this->fk_project			= '';
+				$this->fk_delivery_address	= '';
+			}
 
-            // TODO Change product price if multi-prices
-        }
+			// TODO Change product price if multi-prices
+		}
 
-        $this->id=0;
+		$this->id=0;
 		$this->ref = '';
-        $this->statut=0;
-
-        // Clear fields
-        $this->user_author_id     = $user->id;
-        $this->user_valid         = '';
-        $this->date_creation      = '';
-        $this->date_validation    = '';
-        $this->ref_client         = '';
-
-        // Create clone
-        $result=$this->create($user);
-        if ($result < 0) $error++;
-
-        if (! $error)
-        {
-            // Add lines because it is not included into create function
-            foreach ($this->lines as $line)
-            {
-            	$this->addline($user, $this->id, $line->desc, $line->datei, $line->duration);
-            }
-
-        	// Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
-
-            // Call trigger
-            $result=$this->call_trigger('INTERVENTION_CLONE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-
-        unset($this->context['createfromclone']);
-
-        // End
-        if (! $error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		$this->statut=0;
+
+		// Clear fields
+		$this->user_author_id     = $user->id;
+		$this->user_valid         = '';
+		$this->date_creation      = '';
+		$this->date_validation    = '';
+		$this->ref_client         = '';
+
+		// Create clone
+		$result=$this->create($user);
+		if ($result < 0) $error++;
+
+		if (! $error)
+		{
+			// Add lines because it is not included into create function
+			foreach ($this->lines as $line)
+			{
+				$this->addline($user, $this->id, $line->desc, $line->datei, $line->duration);
+			}
+
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters=array('objFrom'=>$objFrom);
+				$action='';
+				$reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
+
+			// Call trigger
+			$result=$this->call_trigger('INTERVENTION_CLONE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		unset($this->context['createfromclone']);
+
+		// End
+		if (! $error)
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
 	/**
@@ -1338,7 +1338,7 @@ 
 	 *	Insert the line into database
 	 *
 	 *	@param		User	$user 		Objet user that make creation
-     *	@param		int		$notrigger	Disable all triggers
+	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if ko, >0 if ok
 	 */
 	function insert($user, $notrigger=0)
@@ -1386,14 +1386,14 @@ 
 			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            {
-            	$this->id=$this->rowid;
-            	$result=$this->insertExtraFields();
-            	if ($result < 0)
-            	{
-            		$error++;
-            	}
-            }
+			{
+				$this->id=$this->rowid;
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 
 			$result=$this->update_total();
@@ -1404,10 +1404,10 @@ 
 
 				if (! $notrigger)
 				{
-                    // Call trigger
-                    $result=$this->call_trigger('LINEFICHINTER_CREATE',$user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('LINEFICHINTER_CREATE',$user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 			}
 
@@ -1434,7 +1434,7 @@ 
 	 *	Update intervention into database
 	 *
 	 *	@param		User	$user 		Objet user that make creation
-     *	@param		int		$notrigger	Disable all triggers
+	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if ko, >0 if ok
 	 */
 	function update($user,$notrigger=0)
@@ -1457,14 +1457,14 @@ 
 		{
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-        	{
-        		$this->id=$this->rowid;
-        		$result=$this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
+			{
+				$this->id=$this->rowid;
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			$result=$this->update_total();
 			if ($result > 0)
@@ -1472,10 +1472,10 @@ 
 
 				if (! $notrigger)
 				{
-                    // Call trigger
-                    $result=$this->call_trigger('LINEFICHINTER_UPDATE',$user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('LINEFICHINTER_UPDATE',$user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 			}
 
@@ -1555,7 +1555,7 @@ 
 	 *	Delete a intervention line
 	 *
 	 *	@param		User	$user 		Objet user that make creation
-     *	@param		int		$notrigger	Disable all triggers
+	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return     int		>0 if ok, <0 if ko
 	 */
 	function deleteline($user,$notrigger=0)
@@ -1577,14 +1577,14 @@ 
 				{
 					if (! $notrigger)
 					{
-                        // Call trigger
-                        $result=$this->call_trigger('LINEFICHINTER_DELETE',$user);
-                        if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-                        // End call triggers
+						// Call trigger
+						$result=$this->call_trigger('LINEFICHINTER_DELETE',$user);
+						if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+						// End call triggers
 					}
 
-                    $this->db->commit();
-                    return $result;
+					$this->db->commit();
+					return $result;
 				}
 				else
 				{

Spacing +337 added lines, -337 removed lines

@@ -25,8 +25,8 @@ 
  * 	\ingroup    ficheinter
  * 	\brief      Fichier de la classe des gestion des fiches interventions
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 
 
 /**
@@ -34,10 +34,10 @@ 
  */
 class Fichinter extends CommonObject
 {
-	public $element='fichinter';
-	public $table_element='fichinter';
-	public $fk_element='fk_fichinter';
-	public $table_element_line='fichinterdet';
+	public $element = 'fichinter';
+	public $table_element = 'fichinter';
+	public $fk_element = 'fk_fichinter';
+	public $table_element_line = 'fichinterdet';
     public $picto = 'intervention';
 
 	/**
@@ -45,7 +45,7 @@ 
 	 */
 	protected $table_ref_field = 'ref';
 
-	var $socid;		// Id client
+	var $socid; // Id client
 
 	var $author;
 	var $datec;
@@ -55,10 +55,10 @@ 
 	var $datet;
 	var $datem;
 	var $duration;
-	var $statut;		// 0=draft, 1=validated, 2=invoiced, 3=Terminate
+	var $statut; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
 	var $description;
 	var $fk_contrat;
-	var $extraparams=array();
+	var $extraparams = array();
 
 	var $lines = array();
 
@@ -93,18 +93,18 @@ 
 		$this->statut = 0;
 
 		// List of language codes for status
-		$this->statuts[0]='Draft';
-		$this->statuts[1]='Validated';
-		$this->statuts[2]='StatusInterInvoiced';
-		$this->statuts[3]='Done';
-		$this->statuts_short[0]='Draft';
-		$this->statuts_short[1]='Validated';
-		$this->statuts_short[2]='StatusInterInvoiced';
-		$this->statuts_short[3]='Done';
-		$this->statuts_logo[0]='statut0';
-		$this->statuts_logo[1]='statut1';
-		$this->statuts_logo[2]='statut6';
-		$this->statuts_logo[3]='statut6';
+		$this->statuts[0] = 'Draft';
+		$this->statuts[1] = 'Validated';
+		$this->statuts[2] = 'StatusInterInvoiced';
+		$this->statuts[3] = 'Done';
+		$this->statuts_short[0] = 'Draft';
+		$this->statuts_short[1] = 'Validated';
+		$this->statuts_short[2] = 'StatusInterInvoiced';
+		$this->statuts_short[3] = 'Done';
+		$this->statuts_logo[0] = 'statut0';
+		$this->statuts_logo[1] = 'statut1';
+		$this->statuts_logo[2] = 'statut6';
+		$this->statuts_logo[3] = 'statut6';
 	}
 
 	/**
@@ -116,26 +116,26 @@ 
 	{
 		global $user;
 
-		$this->nb=array();
+		$this->nb = array();
 		$clause = "WHERE";
 
 		$sql = "SELECT count(fi.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter as fi";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON fi.fk_soc = s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as fi";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON fi.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->societe_id)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
-		$sql.= " ".$clause." fi.entity IN (".getEntity($this->element, 1).")";
+		$sql .= " ".$clause." fi.entity IN (".getEntity($this->element, 1).")";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["fichinters"]=$obj->nb;
+				$this->nb["fichinters"] = $obj->nb;
 			}
 			$this->db->free($resql);
 			return 1;
@@ -143,7 +143,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -155,90 +155,90 @@ 
      *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $user, $langs;
 
 		dol_syslog(get_class($this)."::create ref=".$this->ref);
 
 		// Check parameters
-		if (! empty($this->ref))	// We check that ref is not already used
+		if (!empty($this->ref))	// We check that ref is not already used
 		{
-			$result=self::isExistingObject($this->element, 0, $this->ref);	// Check ref is not yet used
+			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
 			if ($result > 0)
 			{
-				$this->error='ErrorRefAlreadyExists';
-				dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING);
+				$this->error = 'ErrorRefAlreadyExists';
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		if (! is_numeric($this->duration)) $this->duration = 0;
+		if (!is_numeric($this->duration)) $this->duration = 0;
 
 		if ($this->socid <= 0)
 		{
-			$this->error='ErrorBadParameterForFunc';
-			dol_syslog(get_class($this)."::create ".$this->error,LOG_ERR);
+			$this->error = 'ErrorBadParameterForFunc';
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
 		}
 
 		$soc = new Societe($this->db);
-		$result=$soc->fetch($this->socid);
+		$result = $soc->fetch($this->socid);
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."fichinter (";
-		$sql.= "fk_soc";
-		$sql.= ", datec";
-		$sql.= ", ref";
-		$sql.= ", entity";
-		$sql.= ", fk_user_author";
-		$sql.= ", fk_user_modif";
-		$sql.= ", description";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_contrat";
-		$sql.= ", fk_statut";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ") ";
-		$sql.= " VALUES (";
-		$sql.= $this->socid;
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", '".$this->db->escape($this->ref)."'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".$user->id;
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->description?"'".$this->db->escape($this->description)."'":"null");
-		$sql.= ", '".$this->db->escape($this->modelpdf)."'";
-		$sql.= ", ".($this->fk_project ? $this->fk_project : 0);
-		$sql.= ", ".($this->fk_contrat ? $this->fk_contrat : 0);
-		$sql.= ", ".$this->statut;
-		$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ")";
+		$sql .= "fk_soc";
+		$sql .= ", datec";
+		$sql .= ", ref";
+		$sql .= ", entity";
+		$sql .= ", fk_user_author";
+		$sql .= ", fk_user_modif";
+		$sql .= ", description";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_projet";
+		$sql .= ", fk_contrat";
+		$sql .= ", fk_statut";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ") ";
+		$sql .= " VALUES (";
+		$sql .= $this->socid;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", '".$this->db->escape($this->ref)."'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".$user->id;
+		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->description ? "'".$this->db->escape($this->description)."'" : "null");
+		$sql .= ", '".$this->db->escape($this->modelpdf)."'";
+		$sql .= ", ".($this->fk_project ? $this->fk_project : 0);
+		$sql .= ", ".($this->fk_contrat ? $this->fk_contrat : 0);
+		$sql .= ", ".$this->statut;
+		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."fichinter");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."fichinter");
 
 			if ($this->id)
 			{
-				$this->ref='(PROV'.$this->id.')';
+				$this->ref = '(PROV'.$this->id.')';
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql) $error++;
+				$resql = $this->db->query($sql);
+				if (!$resql) $error++;
 			}
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-            	$result=$this->insertExtraFields();
+            	$result = $this->insertExtraFields();
             	if ($result < 0)
             	{
             		$error++;
@@ -246,22 +246,22 @@ 
             }
 
 			// Add linked object
-			if (! $error && $this->origin && $this->origin_id)
+			if (!$error && $this->origin && $this->origin_id)
 			{
 				$ret = $this->add_object_linked();
-				if (! $ret)	dol_print_error($this->db);
+				if (!$ret)	dol_print_error($this->db);
 			}
 
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('FICHINTER_CREATE',$user);
+                $result = $this->call_trigger('FICHINTER_CREATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return $this->id;
@@ -269,14 +269,14 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=join(',',$this->errors);
-				dol_syslog(get_class($this)."::create ".$this->error,LOG_ERR);
+				$this->error = join(',', $this->errors);
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -290,34 +290,34 @@ 
      *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-	function update($user, $notrigger=0)
+	function update($user, $notrigger = 0)
 	{
-	 	if (! is_numeric($this->duration)) {
+	 	if (!is_numeric($this->duration)) {
 	 		$this->duration = 0;
 	 	}
-	 	if (! dol_strlen($this->fk_project)) {
+	 	if (!dol_strlen($this->fk_project)) {
 	 		$this->fk_project = 0;
 	 	}
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter SET ";
-		$sql.= "description  = '".$this->db->escape($this->description)."'";
-		$sql.= ", duree = ".$this->duration;
-		$sql.= ", fk_projet = ".$this->fk_project;
-		$sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", fk_user_modif = ".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= "description  = '".$this->db->escape($this->description)."'";
+		$sql .= ", duree = ".$this->duration;
+		$sql .= ", fk_projet = ".$this->fk_project;
+		$sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", fk_user_modif = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('FICHINTER_MODIFY',$user);
+                $result = $this->call_trigger('FICHINTER_MODIFY', $user);
                 if ($result < 0) { $error++; $this->db->rollback(); return -1; }
                 // End call triggers
 			}
@@ -327,7 +327,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -340,19 +340,19 @@ 
 	 *	@param		string	$ref		Ref of intervention
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-	function fetch($rowid,$ref='')
+	function fetch($rowid, $ref = '')
 	{
 		$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
-		$sql.= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
-		$sql.= " f.date_valid as datev,";
-		$sql.= " f.tms as datem,";
-		$sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
-		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
-		if ($ref) $sql.= " WHERE f.ref='".$this->db->escape($ref)."'";
-		else $sql.= " WHERE f.rowid=".$rowid;
+		$sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
+		$sql .= " f.date_valid as datev,";
+		$sql .= " f.tms as datem,";
+		$sql .= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
+		if ($ref) $sql .= " WHERE f.ref='".$this->db->escape($ref)."'";
+		else $sql .= " WHERE f.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -375,23 +375,23 @@ 
 				$this->note_public  = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->modelpdf     = $obj->model_pdf;
-				$this->fk_contrat	= $obj->fk_contrat;
+				$this->fk_contrat = $obj->fk_contrat;
 
-				$this->user_creation= $obj->fk_user_author;
+				$this->user_creation = $obj->fk_user_author;
 
-				$this->extraparams	= (array) json_decode($obj->extraparams, true);
+				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				if ($this->statut == 0) $this->brouillon = 1;
 
 				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$extrafields = new ExtraFields($this->db);
+				$extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+				$this->fetch_optionals($this->id, $extralabels);
 
 				/*
 				 * Lines
 				*/
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
 					return -3;
@@ -402,7 +402,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -422,12 +422,12 @@ 
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
-			$sql.= " SET fk_statut = 0";
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " SET fk_statut = 0";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
 
 			dol_syslog("Fichinter::setDraft", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->db->commit();
@@ -436,7 +436,7 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -449,21 +449,21 @@ 
      *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function setValid($user, $notrigger=0)
+	function setValid($user, $notrigger = 0)
 	{
 		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		if ($this->statut != 1)
 		{
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			// Define new ref
-			if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 			{
 				$num = $this->getNextNumRef($this->thirdparty);
 			}
@@ -474,31 +474,31 @@ 
             $this->newref = $num;
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
-			$sql.= " SET fk_statut = 1";
-			$sql.= ", ref = '".$num."'";
-			$sql.= ", date_valid = '".$this->db->idate($now)."'";
-			$sql.= ", fk_user_valid = ".$user->id;
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
-			$sql.= " AND fk_statut = 0";
+			$sql .= " SET fk_statut = 1";
+			$sql .= ", ref = '".$num."'";
+			$sql .= ", date_valid = '".$this->db->idate($now)."'";
+			$sql .= ", fk_user_valid = ".$user->id;
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND fk_statut = 0";
 
 			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				dol_print_error($this->db);
 				$error++;
 			}
 
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('FICHINTER_VALIDATE',$user);
+                $result = $this->call_trigger('FICHINTER_VALIDATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->oldref = $this->ref;
 
@@ -519,13 +519,13 @@ 
 						{
 	                        dol_syslog("Rename ok");
 	                        // Rename docs starting with $oldref with $newref
-	                        $listoffiles=dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-	                        foreach($listoffiles as $fileentry)
+	                        $listoffiles = dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+	                        foreach ($listoffiles as $fileentry)
 	                        {
-	                        	$dirsource=$fileentry['name'];
-	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	$dirsource = $fileentry['name'];
+	                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+	                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+	                        	$dirdest = $fileentry['path'].'/'.$dirdest;
 	                        	@rename($dirsource, $dirdest);
 	                        }
 						}
@@ -534,15 +534,15 @@ 
 			}
 
 			// Set new ref and define current statut
-			if (! $error)
+			if (!$error)
 			{
 				$this->ref = $num;
-				$this->statut=1;
-				$this->brouillon=0;
-				$this->date_validation=$now;
+				$this->statut = 1;
+				$this->brouillon = 0;
+				$this->date_validation = $now;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
@@ -550,7 +550,7 @@ 
 			else
 			{
 				$this->db->rollback();
-				dol_syslog(get_class($this)."::setValid ".$this->error,LOG_ERR);
+				dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
@@ -572,7 +572,7 @@ 
 
 		$thm = $this->author->thm;
 
-		foreach($this->lines as $line) {
+		foreach ($this->lines as $line) {
 			$amount += ($line->duration / 60 / 60 * $thm);
 		}
 
@@ -590,19 +590,19 @@ 
 	 *  @param      int                     $hideref        Hide ref
 	 *  @return     int                                     0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("interventions");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'soleil';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->FICHEINTER_ADDON_PDF)) {
+			} elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
 				$modele = $conf->global->FICHEINTER_ADDON_PDF;
 			}
 		}
@@ -618,9 +618,9 @@ 
 	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *	@return     string      		Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *	@return     string      		Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		global $langs;
 
@@ -643,11 +643,11 @@ 
 		if ($mode == 3)
 			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]);
 		if ($mode == 4)
-			return img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]);
+			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]);
 		if ($mode == 5)
-			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), $this->statuts_logo[$statut]);
 		if ($mode == 6)
-		    return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+		    return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), $this->statuts_logo[$statut]);
 
 		return '';
 	}
@@ -661,46 +661,46 @@ 
      *  @param      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string								String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs;
 
-		$result='';
+		$result = '';
 
-        $label = '<u>' . $langs->trans("ShowIntervention") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+        $label = '<u>'.$langs->trans("ShowIntervention").'</u>';
+        if (!empty($this->ref))
+            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $picto='intervention';
+        $picto = 'intervention';
         $url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
 
         if ($option !== 'nolink')
         {
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
        	}
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowIntervention");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowIntervention");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 		}
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+        if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
@@ -717,7 +717,7 @@ 
 		global $conf, $db, $langs;
 		$langs->load("interventions");
 
-		if (! empty($conf->global->FICHEINTER_ADDON))
+		if (!empty($conf->global->FICHEINTER_ADDON))
 		{
 			$mybool = false;
 
@@ -732,26 +732,26 @@ 
 				$dir = dol_buildpath($reldir."core/modules/fichinter/");
 
 				// Load file with numbering class (if found)
-				$mybool|=@include_once $dir.$file;
+				$mybool |= @include_once $dir.$file;
 			}
 
-			if (! $mybool)
+			if (!$mybool)
 			{
-				dol_print_error('',"Failed to include file ".$file);
+				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
 
 			$obj = new $classname();
 			$numref = "";
-			$numref = $obj->getNextValue($soc,$this);
+			$numref = $obj->getNextValue($soc, $this);
 
-			if ( $numref != "")
+			if ($numref != "")
 			{
 				return $numref;
 			}
 			else
 			{
-				dol_print_error($db,"Fichinter::getNextNumRef ".$obj->error);
+				dol_print_error($db, "Fichinter::getNextNumRef ".$obj->error);
 				return "";
 			}
 		}
@@ -774,15 +774,15 @@ 
 		global $conf;
 
 		$sql = "SELECT f.rowid,";
-		$sql.= " f.datec,";
-		$sql.= " f.tms as date_modification,";
-		$sql.= " f.date_valid as datev,";
-		$sql.= " f.fk_user_author,";
-		$sql.= " f.fk_user_modif as fk_user_modification,";
-		$sql.= " f.fk_user_valid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
-		$sql.= " WHERE f.rowid = ".$id;
-		$sql.= " AND f.entity = ".$conf->entity;
+		$sql .= " f.datec,";
+		$sql .= " f.tms as date_modification,";
+		$sql .= " f.date_valid as datev,";
+		$sql .= " f.fk_user_author,";
+		$sql .= " f.fk_user_modif as fk_user_modification,";
+		$sql .= " f.fk_user_valid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
+		$sql .= " WHERE f.rowid = ".$id;
+		$sql .= " AND f.entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -799,19 +799,19 @@ 
 
 				$cuser = new User($this->db);
 				$cuser->fetch($obj->fk_user_author);
-				$this->user_creation     = $cuser;
+				$this->user_creation = $cuser;
 
 				if ($obj->fk_user_valid)
 				{
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation     = $vuser;
+					$this->user_validation = $vuser;
 				}
 				if ($obj->fk_user_modification)
 				{
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modification);
-					$this->user_modification   = $muser;
+					$this->user_modification = $muser;
 				}
 
 			}
@@ -830,12 +830,12 @@ 
 	 *	@param		int		$notrigger		Disable trigger
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -847,7 +847,7 @@ 
 		$res = $this->delete_linked_contact();
 		if ($res < 0)
 		{
-			$this->error='ErrorFailToDeleteLinkedContact';
+			$this->error = 'ErrorFailToDeleteLinkedContact';
 			$error++;
 		}
 
@@ -858,49 +858,49 @@ 
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet";
-		$sql.= " WHERE fk_fichinter = ".$this->id;
+		$sql .= " WHERE fk_fichinter = ".$this->id;
 
 		dol_syslog("Fichinter::delete", LOG_DEBUG);
-		if ( $this->db->query($sql) )
+		if ($this->db->query($sql))
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter";
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
 
 			dol_syslog("Fichinter::delete", LOG_DEBUG);
-			if ( $this->db->query($sql) )
+			if ($this->db->query($sql))
 			{
 
 				// Remove directory with files
 				$fichinterref = dol_sanitizeFileName($this->ref);
 				if ($conf->ficheinter->dir_output)
 				{
-					$dir = $conf->ficheinter->dir_output . "/" . $fichinterref ;
-					$file = $conf->ficheinter->dir_output . "/" . $fichinterref . "/" . $fichinterref . ".pdf";
+					$dir = $conf->ficheinter->dir_output."/".$fichinterref;
+					$file = $conf->ficheinter->dir_output."/".$fichinterref."/".$fichinterref.".pdf";
 					if (file_exists($file))
 					{
 						dol_delete_preview($this);
 
-						if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+						if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
 						{
-							$this->error=$langs->trans("ErrorCanNotDeleteFile",$file);
+							$this->error = $langs->trans("ErrorCanNotDeleteFile", $file);
 							return 0;
 						}
 					}
 					if (file_exists($dir))
 					{
-						if (! dol_delete_dir_recursive($dir))
+						if (!dol_delete_dir_recursive($dir))
 						{
-							$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+							$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 							return 0;
 						}
 					}
 				}
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('FICHINTER_DELETE',$user);
+                    $result = $this->call_trigger('FICHINTER_DELETE', $user);
                     if ($result < 0) { $error++; $this->db->rollback(); return -1; }
                     // End call triggers
 				}
@@ -910,14 +910,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -937,10 +937,10 @@ 
 		if ($user->rights->ficheinter->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
-			$sql.= " SET datei = '".$this->db->idate($date_delivery)."'";
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
-			$sql.= " AND fk_statut = 0";
+			$sql .= " SET datei = '".$this->db->idate($date_delivery)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND fk_statut = 0";
 
 			if ($this->db->query($sql))
 			{
@@ -949,7 +949,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_date_delivery Erreur SQL");
 				return -1;
 			}
@@ -970,10 +970,10 @@ 
 		if ($user->rights->ficheinter->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
-			$sql.= " SET description = '".$this->db->escape($description)."',";
-			$sql.= " fk_user_modif = ".$user->id;
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " SET description = '".$this->db->escape($description)."',";
+			$sql .= " fk_user_modif = ".$user->id;
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
 
 			if ($this->db->query($sql))
 			{
@@ -982,7 +982,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_description Erreur SQL");
 				return -1;
 			}
@@ -1004,9 +1004,9 @@ 
 		if ($user->rights->ficheinter->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
-			$sql.= " SET fk_contrat = '".$contractid."'";
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " SET fk_contrat = '".$contractid."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
 
 			if ($this->db->query($sql))
 			{
@@ -1015,7 +1015,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
@@ -1030,43 +1030,43 @@ 
      *	@param		int			$socid			Id of thirdparty
      *	@return		int							New id of clone
      */
-    function createFromClone($socid=0)
+    function createFromClone($socid = 0)
     {
-        global $user,$hookmanager;
+        global $user, $hookmanager;
 
-        $error=0;
+        $error = 0;
 
         $this->context['createfromclone'] = 'createfromclone';
 
         $this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach($this->lines as $line)
+		foreach ($this->lines as $line)
 			$line->fetch_optionals($line->rowid);
 
         // Load source object
         $objFrom = clone $this;
 
         // Change socid if needed
-        if (! empty($socid) && $socid != $this->socid)
+        if (!empty($socid) && $socid != $this->socid)
         {
             $objsoc = new Societe($this->db);
 
-            if ($objsoc->fetch($socid)>0)
+            if ($objsoc->fetch($socid) > 0)
             {
-                $this->socid 				= $objsoc->id;
+                $this->socid = $objsoc->id;
                 //$this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
                 //$this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $this->fk_project			= '';
-                $this->fk_delivery_address	= '';
+                $this->fk_project = '';
+                $this->fk_delivery_address = '';
             }
 
             // TODO Change product price if multi-prices
         }
 
-        $this->id=0;
+        $this->id = 0;
 		$this->ref = '';
-        $this->statut=0;
+        $this->statut = 0;
 
         // Clear fields
         $this->user_author_id     = $user->id;
@@ -1076,10 +1076,10 @@ 
         $this->ref_client         = '';
 
         // Create clone
-        $result=$this->create($user);
+        $result = $this->create($user);
         if ($result < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
             // Add lines because it is not included into create function
             foreach ($this->lines as $line)
@@ -1090,14 +1090,14 @@ 
         	// Hook of thirdparty module
             if (is_object($hookmanager))
             {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('objFrom'=>$objFrom);
+                $action = '';
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
 
             // Call trigger
-            $result=$this->call_trigger('INTERVENTION_CLONE',$user);
+            $result = $this->call_trigger('INTERVENTION_CLONE', $user);
             if ($result < 0) $error++;
             // End call triggers
         }
@@ -1105,7 +1105,7 @@ 
         unset($this->context['createfromclone']);
 
         // End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $this->id;
@@ -1129,7 +1129,7 @@ 
 	 *  @param		array	$array_options			Array option
 	 *	@return    	int             				>0 if ok, <0 if ko
 	 */
-	function addline($user,$fichinterid, $desc, $date_intervention, $duration, $array_options='')
+	function addline($user, $fichinterid, $desc, $date_intervention, $duration, $array_options = '')
 	{
 		dol_syslog(get_class($this)."::addline $fichinterid, $desc, $date_intervention, $duration");
 
@@ -1138,18 +1138,18 @@ 
 			$this->db->begin();
 
 			// Insertion ligne
-			$line=new FichinterLigne($this->db);
+			$line = new FichinterLigne($this->db);
 
 			$line->fk_fichinter = $fichinterid;
 			$line->desc         = $desc;
 			$line->datei        = $date_intervention;
 			$line->duration     = $duration;
 
-			if (is_array($array_options) && count($array_options)>0) {
-				$line->array_options=$array_options;
+			if (is_array($array_options) && count($array_options) > 0) {
+				$line->array_options = $array_options;
 			}
 
-			$result=$line->insert($user);
+			$result = $line->insert($user);
 
 			if ($result >= 0)
 			{
@@ -1158,7 +1158,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -1;
 			}
@@ -1175,32 +1175,32 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Initialise parametres
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->socid = 1;
 		$this->datec = $now;
-		$this->note_private='Private note';
-		$this->note_public='SPECIMEN';
+		$this->note_private = 'Private note';
+		$this->note_public = 'SPECIMEN';
 		$this->duration = 0;
 		$nbp = 25;
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$line=new FichinterLigne($this->db);
-			$line->desc=$langs->trans("Description")." ".$xnbp;
-			$line->datei=($now-3600*(1+$xnbp));
-			$line->duration=600;
-			$line->fk_fichinter=0;
-			$this->lines[$xnbp]=$line;
+			$line = new FichinterLigne($this->db);
+			$line->desc = $langs->trans("Description")." ".$xnbp;
+			$line->datei = ($now - 3600 * (1 + $xnbp));
+			$line->duration = 600;
+			$line->fk_fichinter = 0;
+			$this->lines[$xnbp] = $line;
 			$xnbp++;
 
-			$this->duration+=$line->duration;
+			$this->duration += $line->duration;
 		}
 	}
 
@@ -1212,11 +1212,11 @@ 
 	function fetch_lines()
 	{
 		$sql = 'SELECT rowid, description, duree, date, rang';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
-		$sql.=' WHERE fk_fichinter = '.$this->id .' ORDER BY rang ASC, date ASC' ;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
+		$sql .= ' WHERE fk_fichinter = '.$this->id.' ORDER BY rang ASC, date ASC';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -1230,7 +1230,7 @@ 
 				$line->desc = $objp->description;
 				$line->duration = $objp->duree;
 				//For invoicing we calculing hours
-				$line->qty = round($objp->duree/3600,2);
+				$line->qty = round($objp->duree / 3600, 2);
 				$line->date	= $this->db->jdate($objp->date);
 				$line->datei = $this->db->jdate($objp->date);
 				$line->rang	= $objp->rang;
@@ -1246,7 +1246,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -1279,14 +1279,14 @@ 
 
 	// From llx_fichinterdet
 	var $fk_fichinter;
-	var $desc;          	// Description ligne
-	var $datei;           // Date intervention
-	var $duration;        // Duree de l'intervention
+	var $desc; // Description ligne
+	var $datei; // Date intervention
+	var $duration; // Duree de l'intervention
 	var $rang = 0;
 
-	public $element='fichinterdet';
-	public $table_element='fichinterdet';
-	public $fk_element='fk_fichinter';
+	public $element = 'fichinterdet';
+	public $table_element = 'fichinterdet';
+	public $fk_element = 'fk_fichinter';
 
 	/**
 	 *	Constructor
@@ -1307,9 +1307,9 @@ 
 	function fetch($rowid)
 	{
 		$sql = 'SELECT ft.rowid, ft.fk_fichinter, ft.description, ft.duree, ft.rang,';
-		$sql.= ' ft.date as datei';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
-		$sql.= ' WHERE ft.rowid = '.$rowid;
+		$sql .= ' ft.date as datei';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
+		$sql .= ' WHERE ft.rowid = '.$rowid;
 
 		dol_syslog("FichinterLigne::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1317,9 +1317,9 @@ 
 		{
 			$objp = $this->db->fetch_object($result);
 			$this->rowid          	= $objp->rowid;
-			$this->id 				= $objp->rowid;
+			$this->id = $objp->rowid;
 			$this->fk_fichinter   	= $objp->fk_fichinter;
-			$this->datei			= $this->db->jdate($objp->datei);
+			$this->datei = $this->db->jdate($objp->datei);
 			$this->desc           	= $objp->description;
 			$this->duration       	= $objp->duree;
 			$this->rang           	= $objp->rang;
@@ -1329,7 +1329,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
 	}
@@ -1341,20 +1341,20 @@ 
      *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if ko, >0 if ok
 	 */
-	function insert($user, $notrigger=0)
+	function insert($user, $notrigger = 0)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		dol_syslog("FichinterLigne::insert rang=".$this->rang);
 
 		$this->db->begin();
 
-		$rangToUse=$this->rang;
+		$rangToUse = $this->rang;
 		if ($rangToUse == -1)
 		{
 			// Recupere rang max de la ligne d'intervention dans $rangmax
 			$sql = 'SELECT max(rang) as max FROM '.MAIN_DB_PREFIX.'fichinterdet';
-			$sql.= ' WHERE fk_fichinter ='.$this->fk_fichinter;
+			$sql .= ' WHERE fk_fichinter ='.$this->fk_fichinter;
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -1371,24 +1371,24 @@ 
 
 		// Insertion dans base de la ligne
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'fichinterdet';
-		$sql.= ' (fk_fichinter, description, date, duree, rang)';
-		$sql.= " VALUES (".$this->fk_fichinter.",";
-		$sql.= " '".$this->db->escape($this->desc)."',";
-		$sql.= " '".$this->db->idate($this->datei)."',";
-		$sql.= " ".$this->duration.",";
-		$sql.= ' '.$rangToUse;
-		$sql.= ')';
+		$sql .= ' (fk_fichinter, description, date, duree, rang)';
+		$sql .= " VALUES (".$this->fk_fichinter.",";
+		$sql .= " '".$this->db->escape($this->desc)."',";
+		$sql .= " '".$this->db->idate($this->datei)."',";
+		$sql .= " ".$this->duration.",";
+		$sql .= ' '.$rangToUse;
+		$sql .= ')';
 
 		dol_syslog("FichinterLigne::insert", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
+			$this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-            	$this->id=$this->rowid;
-            	$result=$this->insertExtraFields();
+            	$this->id = $this->rowid;
+            	$result = $this->insertExtraFields();
             	if ($result < 0)
             	{
             		$error++;
@@ -1396,16 +1396,16 @@ 
             }
 
 
-			$result=$this->update_total();
+			$result = $this->update_total();
 
 			if ($result > 0)
 			{
-				$this->rang=$rangToUse;
+				$this->rang = $rangToUse;
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('LINEFICHINTER_CREATE',$user);
+                    $result = $this->call_trigger('LINEFICHINTER_CREATE', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
 				}
@@ -1423,7 +1423,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error()." sql=".$sql;
+			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
 		}
@@ -1437,43 +1437,43 @@ 
      *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if ko, >0 if ok
 	 */
-	function update($user,$notrigger=0)
+	function update($user, $notrigger = 0)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$this->db->begin();
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinterdet SET";
-		$sql.= " description='".$this->db->escape($this->desc)."'";
-		$sql.= ",date='".$this->db->idate($this->datei)."'";
-		$sql.= ",duree=".$this->duration;
-		$sql.= ",rang='".$this->db->escape($this->rang)."'";
-		$sql.= " WHERE rowid = ".$this->rowid;
+		$sql .= " description='".$this->db->escape($this->desc)."'";
+		$sql .= ",date='".$this->db->idate($this->datei)."'";
+		$sql .= ",duree=".$this->duration;
+		$sql .= ",rang='".$this->db->escape($this->rang)."'";
+		$sql .= " WHERE rowid = ".$this->rowid;
 
 		dol_syslog("FichinterLigne::update", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
-        		$this->id=$this->rowid;
-        		$result=$this->insertExtraFields();
+        		$this->id = $this->rowid;
+        		$result = $this->insertExtraFields();
         		if ($result < 0)
         		{
         			$error++;
         		}
         	}
 
-			$result=$this->update_total();
+			$result = $this->update_total();
 			if ($result > 0)
 			{
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('LINEFICHINTER_UPDATE',$user);
+                    $result = $this->call_trigger('LINEFICHINTER_UPDATE', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
 				}
@@ -1486,14 +1486,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1511,26 +1511,26 @@ 
 		$this->db->begin();
 
 		$sql = "SELECT SUM(duree) as total_duration, min(date) as dateo, max(date) as datee ";
-		$sql.= " FROM ".MAIN_DB_PREFIX."fichinterdet";
-		$sql.= " WHERE fk_fichinter=".$this->fk_fichinter;
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinterdet";
+		$sql .= " WHERE fk_fichinter=".$this->fk_fichinter;
 
 		dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-			$total_duration=0;
+			$obj = $this->db->fetch_object($resql);
+			$total_duration = 0;
 			if (!empty($obj->total_duration)) $total_duration = $obj->total_duration;
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
-			$sql.= " SET duree = ".$total_duration;
-			$sql.= " , dateo = ".(! empty($obj->dateo)?"'".$this->db->idate($obj->dateo)."'":"null");
-			$sql.= " , datee = ".(! empty($obj->datee)?"'".$this->db->idate($obj->datee)."'":"null");
-			$sql.= " WHERE rowid = ".$this->fk_fichinter;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " SET duree = ".$total_duration;
+			$sql .= " , dateo = ".(!empty($obj->dateo) ? "'".$this->db->idate($obj->dateo)."'" : "null");
+			$sql .= " , datee = ".(!empty($obj->datee) ? "'".$this->db->idate($obj->datee)."'" : "null");
+			$sql .= " WHERE rowid = ".$this->fk_fichinter;
+			$sql .= " AND entity = ".$conf->entity;
 
 			dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->db->commit();
@@ -1538,14 +1538,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1558,9 +1558,9 @@ 
      *	@param		int		$notrigger	Disable all triggers
 	 *	@return     int		>0 if ok, <0 if ko
 	 */
-	function deleteline($user,$notrigger=0)
+	function deleteline($user, $notrigger = 0)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		if ($this->statut == 0)
 		{
@@ -1575,10 +1575,10 @@ 
 				$result = $this->update_total();
 				if ($result > 0)
 				{
-					if (! $notrigger)
+					if (!$notrigger)
 					{
                         // Call trigger
-                        $result=$this->call_trigger('LINEFICHINTER_DELETE',$user);
+                        $result = $this->call_trigger('LINEFICHINTER_DELETE', $user);
                         if ($result < 0) { $error++; $this->db->rollback(); return -1; }
                         // End call triggers
 					}
@@ -1594,7 +1594,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error()." sql=".$sql;
+				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}

Braces +123 added lines, -100 removed lines

@@ -139,8 +139,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -162,9 +161,12 @@ 
 		dol_syslog(get_class($this)."::create ref=".$this->ref);
 
 		// Check parameters
-		if (! empty($this->ref))	// We check that ref is not already used
+		if (! empty($this->ref)) {
+			// We check that ref is not already used
 		{
-			$result=self::isExistingObject($this->element, 0, $this->ref);	// Check ref is not yet used
+			$result=self::isExistingObject($this->element, 0, $this->ref);
+		}
+		// Check ref is not yet used
 			if ($result > 0)
 			{
 				$this->error='ErrorRefAlreadyExists';
@@ -173,7 +175,9 @@ 
 				return -1;
 			}
 		}
-		if (! is_numeric($this->duration)) $this->duration = 0;
+		if (! is_numeric($this->duration)) {
+			$this->duration = 0;
+		}
 
 		if ($this->socid <= 0)
 		{
@@ -233,12 +237,16 @@ 
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
-				if (! $resql) $error++;
+				if (! $resql) {
+					$error++;
+				}
 			}
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				// For avoid conflicts if trigger used
             {
             	$result=$this->insertExtraFields();
+			}
             	if ($result < 0)
             	{
             		$error++;
@@ -249,7 +257,9 @@ 
 			if (! $error && $this->origin && $this->origin_id)
 			{
 				$ret = $this->add_object_linked();
-				if (! $ret)	dol_print_error($this->db);
+				if (! $ret) {
+					dol_print_error($this->db);
+				}
 			}
 
 
@@ -265,16 +275,14 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=join(',',$this->errors);
 				dol_syslog(get_class($this)."::create ".$this->error,LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -324,8 +332,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -348,8 +355,11 @@ 
 		$sql.= " f.tms as datem,";
 		$sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
-		if ($ref) $sql.= " WHERE f.ref='".$this->db->escape($ref)."'";
-		else $sql.= " WHERE f.rowid=".$rowid;
+		if ($ref) {
+			$sql.= " WHERE f.ref='".$this->db->escape($ref)."'";
+		} else {
+			$sql.= " WHERE f.rowid=".$rowid;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -381,7 +391,9 @@ 
 
 				$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+					$this->brouillon = 1;
+				}
 
 				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
 				$extrafields=new ExtraFields($this->db);
@@ -399,8 +411,7 @@ 
 				$this->db->free($resql);
 				return 1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -432,8 +443,7 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->lasterror();
@@ -463,11 +473,12 @@ 
 			$now=dol_now();
 
 			// Define new ref
-			if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+			if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+				// empty should not happened, but when it occurs, the test save life
 			{
 				$num = $this->getNextNumRef($this->thirdparty);
 			}
-			else
+			} else
 			{
 				$num = $this->ref;
 			}
@@ -546,8 +557,7 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setValid ".$this->error,LOG_ERR);
@@ -634,20 +644,27 @@ 
 	{
 		global $langs;
 
-		if ($mode == 0)
-			return $langs->trans($this->statuts[$statut]);
-		if ($mode == 1)
-			return $langs->trans($this->statuts_short[$statut]);
-		if ($mode == 2)
-			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]).' '.$langs->trans($this->statuts_short[$statut]);
-		if ($mode == 3)
-			return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]);
-		if ($mode == 4)
-			return img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]);
-		if ($mode == 5)
-			return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
-		if ($mode == 6)
-		    return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+		if ($mode == 0) {
+					return $langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 1) {
+					return $langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 2) {
+					return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]).' '.$langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 3) {
+					return img_picto($langs->trans($this->statuts_short[$statut]), $this->statuts_logo[$statut]);
+		}
+		if ($mode == 4) {
+					return img_picto($langs->trans($this->statuts_short[$statut]),$this->statuts_logo[$statut]).' '.$langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 5) {
+					return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+		}
+		if ($mode == 6) {
+				    return '<span class="hideonsmartphone">'.$langs->trans($this->statuts[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),$this->statuts_logo[$statut]);
+		}
 
 		return '';
 	}
@@ -668,8 +685,9 @@ 
 		$result='';
 
         $label = '<u>' . $langs->trans("ShowIntervention") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+        if (! empty($this->ref)) {
+                    $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+        }
 
         $picto='intervention';
         $url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
@@ -678,8 +696,12 @@ 
         {
         	// Add param to save lastsearch_values or not
         	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        		$add_save_lastsearch_values=1;
+        	}
+        	if ($add_save_lastsearch_values) {
+        		$url.='&save_lastsearch_values=1';
+        	}
        	}
 
 		$linkclose='';
@@ -698,9 +720,15 @@ 
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+        if ($withpicto) {
+        	$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+        }
+		if ($withpicto && $withpicto != 2) {
+			$result.=' ';
+		}
+		if ($withpicto != 2) {
+			$result.=$linkstart.$this->ref.$linkend;
+		}
 		return $result;
 	}
 
@@ -748,14 +776,12 @@ 
 			if ( $numref != "")
 			{
 				return $numref;
-			}
-			else
+			} else
 			{
 				dol_print_error($db,"Fichinter::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined");
@@ -816,8 +842,7 @@ 
 
 			}
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -841,7 +866,9 @@ 
 
 		// Delete linked object
 		$res = $this->deleteObjectLinked();
-		if ($res < 0) $error++;
+		if ($res < 0) {
+			$error++;
+		}
 
 		// Delete linked contacts
 		$res = $this->delete_linked_contact();
@@ -881,9 +908,11 @@ 
 					{
 						dol_delete_preview($this);
 
-						if (! dol_delete_file($file,0,0,0,$this)) // For triggers
+						if (! dol_delete_file($file,0,0,0,$this)) {
+							// For triggers
 						{
 							$this->error=$langs->trans("ErrorCanNotDeleteFile",$file);
+						}
 							return 0;
 						}
 					}
@@ -907,15 +936,13 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -946,8 +973,7 @@ 
 			{
 				$this->date_delivery = $date_delivery;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				dol_syslog("Fichinter::set_date_delivery Erreur SQL");
@@ -979,8 +1005,7 @@ 
 			{
 				$this->description = $description;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				dol_syslog("Fichinter::set_description Erreur SQL");
@@ -1012,8 +1037,7 @@ 
 			{
 				$this->fk_contrat = $contractid;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				return -1;
@@ -1041,8 +1065,9 @@ 
         $this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+		foreach($this->lines as $line) {
+					$line->fetch_optionals($line->rowid);
+		}
 
         // Load source object
         $objFrom = clone $this;
@@ -1077,7 +1102,9 @@ 
 
         // Create clone
         $result=$this->create($user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+        	$error++;
+        }
 
         if (! $error)
         {
@@ -1093,12 +1120,16 @@ 
                 $parameters=array('objFrom'=>$objFrom);
                 $action='';
                 $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
+                if ($reshook < 0) {
+                	$error++;
+                }
             }
 
             // Call trigger
             $result=$this->call_trigger('INTERVENTION_CLONE',$user);
-            if ($result < 0) $error++;
+            if ($result < 0) {
+            	$error++;
+            }
             // End call triggers
         }
 
@@ -1109,8 +1140,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -1155,8 +1185,7 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				$this->db->rollback();
@@ -1243,8 +1272,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -1326,8 +1354,7 @@ 
 
 			$this->db->free($result);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
 			return -1;
@@ -1360,8 +1387,7 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 				$rangToUse = $obj->max + 1;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 				$this->db->rollback();
@@ -1385,9 +1411,11 @@ 
 		{
 			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				// For avoid conflicts if trigger used
             {
             	$this->id=$this->rowid;
+			}
             	$result=$this->insertExtraFields();
             	if ($result < 0)
             	{
@@ -1414,14 +1442,12 @@ 
 			if (!$error) {
 				$this->db->commit();
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." sql=".$sql;
 			$this->db->rollback();
@@ -1456,9 +1482,11 @@ 
 		if ($resql)
 		{
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				// For avoid conflicts if trigger used
         	{
         		$this->id=$this->rowid;
+			}
         		$result=$this->insertExtraFields();
         		if ($result < 0)
         		{
@@ -1483,15 +1511,13 @@ 
 			{
 				$this->db->commit();
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1520,7 +1546,9 @@ 
 		{
 			$obj=$this->db->fetch_object($resql);
 			$total_duration=0;
-			if (!empty($obj->total_duration)) $total_duration = $obj->total_duration;
+			if (!empty($obj->total_duration)) {
+				$total_duration = $obj->total_duration;
+			}
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
 			$sql.= " SET duree = ".$total_duration;
@@ -1535,15 +1563,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -1585,21 +1611,18 @@ 
 
                     $this->db->commit();
                     return $result;
-				}
-				else
+				} else
 				{
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}

htdocs/core/lib/usergroups.lib.php

Indentation +410 added lines, -410 removed lines

@@ -45,10 +45,10 @@ 
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("UserCard");
-    $head[$h][2] = 'user';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("UserCard");
+	$head[$h][2] = 'user';
+	$h++;
 
 	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
 		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
@@ -60,10 +60,10 @@ 
 		$h++;
 	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("UserGUISetup");
-    $head[$h][2] = 'guisetup';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("UserGUISetup");
+	$head[$h][2] = 'guisetup';
+	$h++;
 
 	if ($canreadperms)
 	{
@@ -73,116 +73,116 @@ 
 		$h++;
 	}
 
-    if (! empty($conf->agenda->enabled))
-    {
-        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-        $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
-
-        $i=1;
-        $nbagenda = 0;
-        while ($i <= $MAXAGENDA)
-        {
-            $key=$i;
-            $name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
-            $src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
-            $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
-            $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
-            $i++;
-
-            if (! empty($object->conf->$name)) $nbagenda++;
-        }
-
-	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
-	    $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
-	    $head[$h][2] = 'extsites';
-	    $h++;
-    }
-
-    if (! empty($conf->clicktodial->enabled))
-    {
-        $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
-        $head[$h][1] = $langs->trans("ClickToDial");
-	    $head[$h][2] = 'clicktodial';
-        $h++;
-    }
-
-    // Notifications
-    if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
-    {
-        $nbNote = 0;
-        $sql = "SELECT COUNT(n.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-        $sql.= " WHERE fk_user = ".$object->id;
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                $nbNote=$obj->nb;
-                $i++;
-            }
-        }
-        else {
-            dol_print_error($db);
-        }
-
-        $head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
-        $head[$h][1] = $langs->trans("Notifications");
-        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-        $head[$h][2] = 'notify';
-        $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,'user');
-
-    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-       || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
-    {
+	if (! empty($conf->agenda->enabled))
+	{
+		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+		$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+
+		$i=1;
+		$nbagenda = 0;
+		while ($i <= $MAXAGENDA)
+		{
+			$key=$i;
+			$name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
+			$src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
+			$offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
+			$color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
+			$i++;
+
+			if (! empty($object->conf->$name)) $nbagenda++;
+		}
+
+		$head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
+		$head[$h][2] = 'extsites';
+		$h++;
+	}
+
+	if (! empty($conf->clicktodial->enabled))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("ClickToDial");
+		$head[$h][2] = 'clicktodial';
+		$h++;
+	}
+
+	// Notifications
+	if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
+	{
+		$nbNote = 0;
+		$sql = "SELECT COUNT(n.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+		$sql.= " WHERE fk_user = ".$object->id;
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				$nbNote=$obj->nb;
+				$i++;
+			}
+		}
+		else {
+			dol_print_error($db);
+		}
+
+		$head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Notifications");
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		$head[$h][2] = 'notify';
+		$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,'user');
+
+	if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+	   || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
+	{
 		// Bank
-    	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("HRAndBank");
-    	$head[$h][2] = 'bank';
-    	$h++;
+		$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("HRAndBank");
+		$head[$h][2] = 'bank';
+		$h++;
 	}
 
-    // Such info on users is visible only by internal user
-    if (empty($user->societe_id))
-    {
+	// Such info on users is visible only by internal user
+	if (empty($user->societe_id))
+	{
 		// Notes
-        $nbNote = 0;
-        if(!empty($object->note)) $nbNote++;
-        $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
-        $head[$h][1] = $langs->trans("Note");
+		$nbNote = 0;
+		if(!empty($object->note)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Note");
 		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-        $head[$h][2] = 'note';
-        $h++;
-
-        // Attached files
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-        $upload_dir = $conf->user->dir_output . "/" . $object->id;
-        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-        $nbLinks=Link::count($db, $object->element, $object->id);
-        $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
-        $head[$h][1] = $langs->trans("Documents");
-        if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-        $head[$h][2] = 'document';
-        $h++;
-
-    	$head[$h][0] = DOL_URL_ROOT.'/user/info.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Info");
-    	$head[$h][2] = 'info';
-    	$h++;
-    }
-
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
+		$head[$h][2] = 'note';
+		$h++;
+
+		// Attached files
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+		$upload_dir = $conf->user->dir_output . "/" . $object->id;
+		$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+		$nbLinks=Link::count($db, $object->element, $object->id);
+		$head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
+		$head[$h][1] = $langs->trans("Documents");
+		if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+		$head[$h][2] = 'document';
+		$h++;
+
+		$head[$h][0] = DOL_URL_ROOT.'/user/info.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Info");
+		$head[$h][2] = 'info';
+		$h++;
+	}
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
 
 	return $head;
 }
@@ -206,10 +206,10 @@ 
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("GroupCard");
-    $head[$h][2] = 'group';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("GroupCard");
+	$head[$h][2] = 'group';
+	$h++;
 
 	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
 		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
@@ -229,15 +229,15 @@ 
 		$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,'group');
+	// 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,'group');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -252,25 +252,25 @@ 
 	$langs->load("users");
 	$h=0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'card';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/usergroup.php';
-    $head[$h][1] = $langs->trans("Group");
-    $head[$h][2] = 'usergroupcard';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/usergroup.php';
+	$head[$h][1] = $langs->trans("Group");
+	$head[$h][2] = 'usergroupcard';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
    $head[$h][0] = DOL_URL_ROOT.'/user/admin/group_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups");
-    $head[$h][2] = 'attributes_group';
-    $h++;
+	$head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups");
+	$head[$h][2] = 'attributes_group';
+	$h++;
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
@@ -293,134 +293,134 @@ 
  */
 function show_theme($fuser,$edit=0,$foruserprofile=false)
 {
-    global $conf,$langs,$db,$form;
-    global $bc;
+	global $conf,$langs,$db,$form;
+	global $bc;
 
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
-    $formother = new FormOther($db);
-
-    $dirthemes=array('/theme');
-    if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
-    {
-    	foreach($conf->modules_parts['theme'] as $reldir)
-    	{
-	    	$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
-    	}
-    }
-    $dirthemes=array_unique($dirthemes);
+	$formother = new FormOther($db);
+
+	$dirthemes=array('/theme');
+	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+	{
+		foreach($conf->modules_parts['theme'] as $reldir)
+		{
+			$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
+		}
+	}
+	$dirthemes=array_unique($dirthemes);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
-    $selected_theme='';
-    if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
-    else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+	$selected_theme='';
+	if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
+	else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
 
 	$hoverdisabled='';
-    if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-    else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
-
-    $colspan=2;
-    if ($foruserprofile) $colspan=4;
-
-    $thumbsbyrow=6;
-    print '<table class="noborder" width="100%">';
-
-    // Title
-    if ($foruserprofile)
-    {
-    	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
-    	print '<th colspan="2">&nbsp;</th>';
-	    print '</tr>';
-
-	    print '<tr>';
-	    print '<td>'.$langs->trans("DefaultSkin").'</td>';
-	    print '<td>'.$conf->global->MAIN_THEME.'</td>';
-	    print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-	    print '<td>&nbsp;</td>';
-	    print '</tr>';
-    }
-    else
-    {
-    	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
-    	print '<th align="right">';
-    	$url='https://www.dolistore.com/lang-en/4-skins';
-    	if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
-    	//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
-    	print '<a href="'.$url.'" target="_blank">';
-    	print $langs->trans('DownloadMoreSkins');
-    	print '</a>';
-    	print '</th></tr>';
-
-    	print '<tr>';
-    	print '<td>'.$langs->trans("ThemeDir").'</td>';
-    	print '<td>';
-    	foreach($dirthemes as $dirtheme)
-    	{
-    		echo '"'.$dirtheme.'" ';
-    	}
-    	print '</td>';
-    	print '</tr>';
-    }
-
-    print '<tr><td colspan="'.$colspan.'">';
-
-    print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
-
-    $i=0;
-    foreach($dirthemes as $dir)
-    {
-    	//print $dirroot.$dir;exit;
-    	$dirtheme=dol_buildpath($dir,0);	// This include loop on $conf->file->dol_document_root
-    	$urltheme=dol_buildpath($dir,1);
-
-    	if (is_dir($dirtheme))
-    	{
-    		$handle=opendir($dirtheme);
-    		if (is_resource($handle))
-    		{
-    			while (($subdir = readdir($handle))!==false)
-    			{
-    				if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-    						&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
-    				{
-    					// Disable not stable themes (dir ends with _exp or _dev)
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
-
-    					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-    					$file=$dirtheme."/".$subdir."/thumb.png";
-    					$url=$urltheme."/".$subdir."/thumb.png";
-    					if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-    					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-    					if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-    					else $title=$langs->trans("ShowPreview");
-    					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
-    					print '</a><br>';
-    					if ($subdir == $selected_theme)
-    					{
-    						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-    					}
-    					else
-    					{
-    						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
-    					}
+	if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+	else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+
+	$colspan=2;
+	if ($foruserprofile) $colspan=4;
+
+	$thumbsbyrow=6;
+	print '<table class="noborder" width="100%">';
+
+	// Title
+	if ($foruserprofile)
+	{
+		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
+		print '<th colspan="2">&nbsp;</th>';
+		print '</tr>';
+
+		print '<tr>';
+		print '<td>'.$langs->trans("DefaultSkin").'</td>';
+		print '<td>'.$conf->global->MAIN_THEME.'</td>';
+		print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td>&nbsp;</td>';
+		print '</tr>';
+	}
+	else
+	{
+		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
+		print '<th align="right">';
+		$url='https://www.dolistore.com/lang-en/4-skins';
+		if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
+		//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
+		print '<a href="'.$url.'" target="_blank">';
+		print $langs->trans('DownloadMoreSkins');
+		print '</a>';
+		print '</th></tr>';
+
+		print '<tr>';
+		print '<td>'.$langs->trans("ThemeDir").'</td>';
+		print '<td>';
+		foreach($dirthemes as $dirtheme)
+		{
+			echo '"'.$dirtheme.'" ';
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
+	print '<tr><td colspan="'.$colspan.'">';
+
+	print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
+
+	$i=0;
+	foreach($dirthemes as $dir)
+	{
+		//print $dirroot.$dir;exit;
+		$dirtheme=dol_buildpath($dir,0);	// This include loop on $conf->file->dol_document_root
+		$urltheme=dol_buildpath($dir,1);
+
+		if (is_dir($dirtheme))
+		{
+			$handle=opendir($dirtheme);
+			if (is_resource($handle))
+			{
+				while (($subdir = readdir($handle))!==false)
+				{
+					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+							&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
+					{
+						// Disable not stable themes (dir ends with _exp or _dev)
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
+
+						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+						$file=$dirtheme."/".$subdir."/thumb.png";
+						$url=$urltheme."/".$subdir."/thumb.png";
+						if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+						if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
+						else $title=$langs->trans("ShowPreview");
+						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+						print '</a><br>';
+						if ($subdir == $selected_theme)
+						{
+							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+						}
+						else
+						{
+							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
+						}
 						print '</div>';
 
-    					$i++;
-    				}
-    			}
-    		}
-    	}
-    }
+						$i++;
+					}
+				}
+			}
+		}
+	}
 
-    print '</div></td></tr></table>';
+	print '</div></td></tr></table>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // TopMenuDisableImages
-    if ($foruserprofile)
-    {
-        /*
+	// TopMenuDisableImages
+	if ($foruserprofile)
+	{
+		/*
          print '<tr class="oddeven">';
          print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
          print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
@@ -440,30 +440,30 @@ 
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-    }
-    else
-    {
-        $default=$langs->trans('No');
-        print '<tr class="oddeven">';
-        print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-        print '<td colspan="'.($colspan-1).'">';
-        if ($edit)
-        {
-            print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-        }
-        else
-        {
-            print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
-        }
-        print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-        print '</td>';
-    }
+	}
+	else
+	{
+		$default=$langs->trans('No');
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+		}
+		else
+		{
+			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+	}
 
 	// Background color THEME_ELDY_BACKBODY
-    if ($foruserprofile)
+	if ($foruserprofile)
 	{
-	    /*
+		/*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
@@ -486,29 +486,29 @@ 
 	}
 	else
 	{
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("BackgroundColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    //var_dump($conf->global->THEME_ELDY_BACKBODY);
-	    if ($edit)
-	    {
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BackgroundColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		//var_dump($conf->global->THEME_ELDY_BACKBODY);
+		if ($edit)
+		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
-	    }
+		}
 	   	else
 	   	{
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
-    	print ' &nbsp; ('.$langs->trans("Default").': <strong>ffffff</strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>ffffff</strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
 	}
 
 	// TopMenuBackgroundColor
-    if ($foruserprofile)
+	if ($foruserprofile)
 	{
-	    /*
+		/*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
@@ -531,25 +531,25 @@ 
 	}
 	else
 	{
-	    $default='5a6482';
-	    if ($conf->theme == 'md') $default='5a3278';
+		$default='5a6482';
+		if ($conf->theme == 'md') $default='5a3278';
 
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
-	    }
+		}
 	   	else
 	   	{
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
-    	print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
 	}
 
 	// LeftMenuBackgroundColor
@@ -607,22 +607,22 @@ 
 	}
 	else
 	{
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
-	    }
+		}
 	   	else
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
-    	print ' &nbsp; ('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
 
-	    print '</tr>';
+		print '</tr>';
 	}
 
 	// BackgroundTableLineOddColor
@@ -632,25 +632,25 @@ 
 	}
 	else
 	{
-	    $default='ffffff';
-	    if ($conf->theme == 'md') $default='ffffff';
+		$default='ffffff';
+		if ($conf->theme == 'md') $default='ffffff';
 
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
-	    }
-	    else
-	    {
-	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
-	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else print $langs->trans("Default");
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
+		}
+		else
+		{
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			else print $langs->trans("Default");
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
 	}
 
 	// BackgroundTableLineEvenColor
@@ -660,25 +660,25 @@ 
 	}
 	else
 	{
-	    $default='f8f8f8';
-	    if ($conf->theme == 'md') $default='f8f8f8';
+		$default='f8f8f8';
+		if ($conf->theme == 'md') $default='f8f8f8';
 
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
-	    }
-	    else
-	    {
-	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
-	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else print $langs->trans("Default");
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
+		}
+		else
+		{
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			else print $langs->trans("Default");
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
 	}
 
 	// TextTitleColor
@@ -689,29 +689,29 @@ 
 	}
 	else
 	{
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("TextTitleColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
-	    }
-	    else
-	    {
-	        print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TextTitleColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
+		}
+		else
+		{
+			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #3c3c14">3c3c14</span></strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 
-	    print '</td>';
+		print '</td>';
 
-	    print '</tr>';
+		print '</tr>';
 	}
 
 	// Text LinkColor
 	if ($foruserprofile)
 	{
-	    /*
+		/*
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';
@@ -734,33 +734,33 @@ 
 	}
 	else
 	{
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("LinkColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
-	    }
-	    else
-	    {
-	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
-	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else
-	        {
-	            //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
-	            //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
-	            print $langs->trans("Default");
-	        }
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("LinkColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+		}
+		else
+		{
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			else
+			{
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
 	}
 
 	// Use Hover
 	if ($foruserprofile)
 	{
-	    /* Must first change option to choose color of highlight instead of yes or no.
+		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
 	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
@@ -773,33 +773,33 @@ 
 	}
 	else
 	{
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-	    //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    if ($edit)
-	    {
-	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
-	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-	        print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
-	    }
-	    else
-	    {
-	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
-	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-	        if ($color)
-	        {
-	            if ($color != 'edf4fb') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	            else print $langs->trans("Default");
-	        }
-	        else print $langs->trans("None");
-	    }
-	    print ' &nbsp; ('.$langs->trans("Default").': <strong>edf4fb</strong>) ';
-    	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-	    print '</td>';
-	    print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		if ($edit)
+		{
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
+		}
+		else
+		{
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			if ($color)
+			{
+				if ($color != 'edf4fb') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+				else print $langs->trans("Default");
+			}
+			else print $langs->trans("None");
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>edf4fb</strong>) ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
 	}
 
-    print '</table>';
+	print '</table>';
 }

Spacing +120 added lines, -120 removed lines

@@ -36,10 +36,10 @@ 
 
 	$langs->load("users");
 
-	$canreadperms=true;
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+	$canreadperms = true;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
-		$canreadperms=($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
+		$canreadperms = ($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
 	}
 
 	$h = 0;
@@ -50,8 +50,8 @@ 
     $head[$h][2] = 'user';
     $h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
@@ -68,28 +68,28 @@ 
 	if ($canreadperms)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("UserRights"). ' <span class="badge">'.($object->nb_rights).'</span>';
+		$head[$h][1] = $langs->trans("UserRights").' <span class="badge">'.($object->nb_rights).'</span>';
 		$head[$h][2] = 'rights';
 		$h++;
 	}
 
-    if (! empty($conf->agenda->enabled))
+    if (!empty($conf->agenda->enabled))
     {
-        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-        $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
+        $MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
-        $i=1;
+        $i = 1;
         $nbagenda = 0;
         while ($i <= $MAXAGENDA)
         {
-            $key=$i;
-            $name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
-            $src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
-            $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
-            $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
+            $key = $i;
+            $name = 'AGENDA_EXT_NAME_'.$object->id.'_'.$key;
+            $src = 'AGENDA_EXT_SRC_'.$object->id.'_'.$key;
+            $offsettz = 'AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
+            $color = 'AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
             $i++;
 
-            if (! empty($object->conf->$name)) $nbagenda++;
+            if (!empty($object->conf->$name)) $nbagenda++;
         }
 
 	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
@@ -98,7 +98,7 @@ 
 	    $h++;
     }
 
-    if (! empty($conf->clicktodial->enabled))
+    if (!empty($conf->clicktodial->enabled))
     {
         $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
         $head[$h][1] = $langs->trans("ClickToDial");
@@ -107,13 +107,13 @@ 
     }
 
     // Notifications
-    if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
+    if ($user->societe_id == 0 && !empty($conf->notification->enabled))
     {
         $nbNote = 0;
         $sql = "SELECT COUNT(n.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-        $sql.= " WHERE fk_user = ".$object->id;
-        $resql=$db->query($sql);
+        $sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+        $sql .= " WHERE fk_user = ".$object->id;
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
@@ -121,7 +121,7 @@ 
             while ($i < $num)
             {
                 $obj = $db->fetch_object($resql);
-                $nbNote=$obj->nb;
+                $nbNote = $obj->nb;
                 $i++;
             }
         }
@@ -131,7 +131,7 @@ 
 
         $head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
         $head[$h][1] = $langs->trans("Notifications");
-        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
         $head[$h][2] = 'notify';
         $h++;
     }
@@ -140,10 +140,10 @@ 
     // 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,'user');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'user');
 
-    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-       || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read)))
+    if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+       || (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read)))
     {
 		// Bank
     	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
@@ -157,22 +157,22 @@ 
     {
 		// Notes
         $nbNote = 0;
-        if(!empty($object->note)) $nbNote++;
+        if (!empty($object->note)) $nbNote++;
         $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
         $head[$h][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
         $head[$h][2] = 'note';
         $h++;
 
         // Attached files
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-        $upload_dir = $conf->user->dir_output . "/" . $object->id;
-        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-        $nbLinks=Link::count($db, $object->element, $object->id);
+        $upload_dir = $conf->user->dir_output."/".$object->id;
+        $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+        $nbLinks = Link::count($db, $object->element, $object->id);
         $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
         $head[$h][1] = $langs->trans("Documents");
-        if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+        if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
         $head[$h][2] = 'document';
         $h++;
 
@@ -182,7 +182,7 @@ 
     	$h++;
     }
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'user', 'remove');
 
 	return $head;
 }
@@ -197,10 +197,10 @@ 
 {
 	global $langs, $conf, $user;
 
-	$canreadperms=true;
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+	$canreadperms = true;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
-		$canreadperms=($user->admin || $user->rights->user->group_advance->readperms);
+		$canreadperms = ($user->admin || $user->rights->user->group_advance->readperms);
 	}
 
 	$h = 0;
@@ -211,8 +211,8 @@ 
     $head[$h][2] = 'group';
     $h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
@@ -233,9 +233,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,'group');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'group');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'group', 'remove');
 
     return $head;
 }
@@ -250,7 +250,7 @@ 
 	global $langs, $conf, $user;
 
 	$langs->load("users");
-	$h=0;
+	$h = 0;
 
     $head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
     $head[$h][1] = $langs->trans("Parameters");
@@ -276,9 +276,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,null,$head,$h,'useradmin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'useradmin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'useradmin', 'remove');
 
 	return $head;
 }
@@ -291,38 +291,38 @@ 
  * 	@param	boolean		$foruserprofile		Show for user profile view
  * 	@return	void
  */
-function show_theme($fuser,$edit=0,$foruserprofile=false)
+function show_theme($fuser, $edit = 0, $foruserprofile = false)
 {
-    global $conf,$langs,$db,$form;
+    global $conf, $langs, $db, $form;
     global $bc;
 
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
     $formother = new FormOther($db);
 
-    $dirthemes=array('/theme');
-    if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+    $dirthemes = array('/theme');
+    if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
     {
-    	foreach($conf->modules_parts['theme'] as $reldir)
+    	foreach ($conf->modules_parts['theme'] as $reldir)
     	{
-	    	$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
+	    	$dirthemes = array_merge($dirthemes, (array) ($reldir.'theme'));
     	}
     }
-    $dirthemes=array_unique($dirthemes);
+    $dirthemes = array_unique($dirthemes);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
-    $selected_theme='';
-    if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
-    else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+    $selected_theme = '';
+    if (empty($foruserprofile)) $selected_theme = $conf->global->MAIN_THEME;
+    else $selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');
 
-	$hoverdisabled='';
-    if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-    else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+	$hoverdisabled = '';
+    if (empty($foruserprofile)) $hoverdisabled = (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+    else $hoverdisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0') : '');
 
-    $colspan=2;
-    if ($foruserprofile) $colspan=4;
+    $colspan = 2;
+    if ($foruserprofile) $colspan = 4;
 
-    $thumbsbyrow=6;
+    $thumbsbyrow = 6;
     print '<table class="noborder" width="100%">';
 
     // Title
@@ -335,7 +335,7 @@ 
 	    print '<tr>';
 	    print '<td>'.$langs->trans("DefaultSkin").'</td>';
 	    print '<td>'.$conf->global->MAIN_THEME.'</td>';
-	    print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+	    print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 	    print '<td>&nbsp;</td>';
 	    print '</tr>';
     }
@@ -343,8 +343,8 @@ 
     {
     	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
     	print '<th align="right">';
-    	$url='https://www.dolistore.com/lang-en/4-skins';
-    	if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
+    	$url = 'https://www.dolistore.com/lang-en/4-skins';
+    	if (preg_match('/fr/i', $langs->defaultlang)) $url = 'https://www.dolistore.com/fr/4-themes';
     	//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
     	print '<a href="'.$url.'" target="_blank">';
     	print $langs->trans('DownloadMoreSkins');
@@ -354,7 +354,7 @@ 
     	print '<tr>';
     	print '<td>'.$langs->trans("ThemeDir").'</td>';
     	print '<td>';
-    	foreach($dirthemes as $dirtheme)
+    	foreach ($dirthemes as $dirtheme)
     	{
     		echo '"'.$dirtheme.'" ';
     	}
@@ -366,43 +366,43 @@ 
 
     print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
 
-    $i=0;
-    foreach($dirthemes as $dir)
+    $i = 0;
+    foreach ($dirthemes as $dir)
     {
     	//print $dirroot.$dir;exit;
-    	$dirtheme=dol_buildpath($dir,0);	// This include loop on $conf->file->dol_document_root
-    	$urltheme=dol_buildpath($dir,1);
+    	$dirtheme = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
+    	$urltheme = dol_buildpath($dir, 1);
 
     	if (is_dir($dirtheme))
     	{
-    		$handle=opendir($dirtheme);
+    		$handle = opendir($dirtheme);
     		if (is_resource($handle))
     		{
-    			while (($subdir = readdir($handle))!==false)
+    			while (($subdir = readdir($handle)) !== false)
     			{
     				if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-    						&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
+    						&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
     				{
     					// Disable not stable themes (dir ends with _exp or _dev)
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
+    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
 
     					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-    					$file=$dirtheme."/".$subdir."/thumb.png";
-    					$url=$urltheme."/".$subdir."/thumb.png";
-    					if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-    					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-    					if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-    					else $title=$langs->trans("ShowPreview");
+    					$file = $dirtheme."/".$subdir."/thumb.png";
+    					$url = $urltheme."/".$subdir."/thumb.png";
+    					if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+    					print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+    					if ($subdir == $conf->global->MAIN_THEME) $title = $langs->trans("ThemeCurrentlyActive");
+    					else $title = $langs->trans("ShowPreview");
     					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
     					print '</a><br>';
     					if ($subdir == $selected_theme)
     					{
-    						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+    						print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
     					}
     					else
     					{
-    						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
+    						print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
     					}
 						print '</div>';
 
@@ -443,10 +443,10 @@ 
     }
     else
     {
-        $default=$langs->trans('No');
+        $default = $langs->trans('No');
         print '<tr class="oddeven">';
         print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-        print '<td colspan="'.($colspan-1).'">';
+        print '<td colspan="'.($colspan - 1).'">';
         if ($edit)
         {
             print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
@@ -488,15 +488,15 @@ 
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    //var_dump($conf->global->THEME_ELDY_BACKBODY);
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
 	    }
 	   	else
 	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
@@ -531,19 +531,19 @@ 
 	}
 	else
 	{
-	    $default='5a6482';
-	    if ($conf->theme == 'md') $default='5a3278';
+	    $default = '5a6482';
+	    if ($conf->theme == 'md') $default = '5a3278';
 
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
 	    }
 	   	else
 	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
@@ -578,19 +578,19 @@ 
 	}
 	else
 	{
-		$default='ffffff';
-		if ($conf->theme == 'md') $default='ffffff';
+		$default = 'ffffff';
+		if ($conf->theme == 'md') $default = 'ffffff';
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
 		}
 		else
 		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),'');
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
@@ -609,16 +609,16 @@ 
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
 	    }
 	   	else
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
-    	print ' &nbsp; ('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
+    	print ' &nbsp; ('.$langs->trans("Default").': <strong>f0f0f0</strong>) '; // $colorbacktitle1 in CSS
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 	    print '</td>';
 
@@ -632,19 +632,19 @@ 
 	}
 	else
 	{
-	    $default='ffffff';
-	    if ($conf->theme == 'md') $default='ffffff';
+	    $default = 'ffffff';
+	    if ($conf->theme == 'md') $default = 'ffffff';
 
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    if ($edit)
 	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
 	    }
 	    else
 	    {
-	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 	        else print $langs->trans("Default");
 	    }
@@ -660,19 +660,19 @@ 
 	}
 	else
 	{
-	    $default='f8f8f8';
-	    if ($conf->theme == 'md') $default='f8f8f8';
+	    $default = 'f8f8f8';
+	    if ($conf->theme == 'md') $default = 'f8f8f8';
 
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    if ($edit)
 	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
 	    }
 	    else
 	    {
-	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 	        else print $langs->trans("Default");
 	    }
@@ -691,10 +691,10 @@ 
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TextTitleColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    if ($edit)
 	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
 	    }
 	    else
 	    {
@@ -736,14 +736,14 @@ 
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("LinkColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    if ($edit)
 	    {
-	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
 	    }
 	    else
 	    {
-	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
+	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 	        else
 	        {
@@ -775,19 +775,19 @@ 
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
+	    print '<td colspan="'.($colspan - 1).'">';
 	    //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 	    //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    if ($edit)
 	    {
-	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
-	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-	        print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
+	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = 'edf4fb';
+	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
+	        print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
 	    }
 	    else
 	    {
-	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
-	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = 'edf4fb';
+	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 	        if ($color)
 	        {
 	            if ($color != 'edf4fb') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

Braces +131 added lines, -87 removed lines

@@ -75,7 +75,9 @@ 
 
     if (! empty($conf->agenda->enabled))
     {
-        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+        if (empty($conf->global->AGENDA_EXT_NB)) {
+        	$conf->global->AGENDA_EXT_NB=5;
+        }
         $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
         $i=1;
@@ -89,7 +91,9 @@ 
             $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
             $i++;
 
-            if (! empty($object->conf->$name)) $nbagenda++;
+            if (! empty($object->conf->$name)) {
+            	$nbagenda++;
+            }
         }
 
 	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
@@ -124,14 +128,15 @@ 
                 $nbNote=$obj->nb;
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
         $head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
         $head[$h][1] = $langs->trans("Notifications");
-        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if ($nbNote > 0) {
+        	$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        }
         $head[$h][2] = 'notify';
         $h++;
     }
@@ -157,10 +162,14 @@ 
     {
 		// Notes
         $nbNote = 0;
-        if(!empty($object->note)) $nbNote++;
+        if(!empty($object->note)) {
+        	$nbNote++;
+        }
         $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
         $head[$h][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
         $head[$h][2] = 'note';
         $h++;
 
@@ -172,7 +181,9 @@ 
         $nbLinks=Link::count($db, $object->element, $object->id);
         $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
         $head[$h][1] = $langs->trans("Documents");
-        if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+        if (($nbFiles+$nbLinks) > 0) {
+        	$head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+        }
         $head[$h][2] = 'document';
         $h++;
 
@@ -301,26 +312,36 @@ 
     $formother = new FormOther($db);
 
     $dirthemes=array('/theme');
-    if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+    if (! empty($conf->modules_parts['theme'])) {
+    	// Using this feature slow down application
     {
     	foreach($conf->modules_parts['theme'] as $reldir)
     	{
 	    	$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
+    }
     	}
     }
     $dirthemes=array_unique($dirthemes);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
     $selected_theme='';
-    if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
-    else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+    if (empty($foruserprofile)) {
+    	$selected_theme=$conf->global->MAIN_THEME;
+    } else {
+    	$selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+    }
 
 	$hoverdisabled='';
-    if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-    else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+    if (empty($foruserprofile)) {
+    	$hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+    } else {
+    	$hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+    }
 
     $colspan=2;
-    if ($foruserprofile) $colspan=4;
+    if ($foruserprofile) {
+    	$colspan=4;
+    }
 
     $thumbsbyrow=6;
     print '<table class="noborder" width="100%">';
@@ -338,13 +359,14 @@ 
 	    print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
 	    print '<td>&nbsp;</td>';
 	    print '</tr>';
-    }
-    else
+    } else
     {
     	print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
     	print '<th align="right">';
     	$url='https://www.dolistore.com/lang-en/4-skins';
-    	if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
+    	if (preg_match('/fr/i',$langs->defaultlang)) {
+    		$url='https://www.dolistore.com/fr/4-themes';
+    	}
     	//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
     	print '<a href="'.$url.'" target="_blank">';
     	print $langs->trans('DownloadMoreSkins');
@@ -384,23 +406,31 @@ 
     						&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
     				{
     					// Disable not stable themes (dir ends with _exp or _dev)
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
+    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) {
+    						continue;
+    					}
+    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) {
+    						continue;
+    					}
 
     					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
     					$file=$dirtheme."/".$subdir."/thumb.png";
     					$url=$urltheme."/".$subdir."/thumb.png";
-    					if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+    					if (! file_exists($file)) {
+    						$url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+    					}
     					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-    					if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-    					else $title=$langs->trans("ShowPreview");
+    					if ($subdir == $conf->global->MAIN_THEME) {
+    						$title=$langs->trans("ThemeCurrentlyActive");
+    					} else {
+    						$title=$langs->trans("ShowPreview");
+    					}
     					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
     					print '</a><br>';
     					if ($subdir == $selected_theme)
     					{
     						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-    					}
-    					else
+    					} else
     					{
     						print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
     					}
@@ -440,8 +470,7 @@ 
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-    }
-    else
+    } else
     {
         $default=$langs->trans('No');
         print '<tr class="oddeven">';
@@ -450,8 +479,7 @@ 
         if ($edit)
         {
             print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-        }
-        else
+        } else
         {
             print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
         }
@@ -483,8 +511,7 @@ 
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
+	} else
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundColor").'</td>';
@@ -493,12 +520,14 @@ 
 	    if ($edit)
 	    {
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
-	    }
-	   	else
+	    } else
 	   	{
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
 	   	}
     	print ' &nbsp; ('.$langs->trans("Default").': <strong>ffffff</strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -528,11 +557,12 @@ 
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
+	} else
 	{
 	    $default='5a6482';
-	    if ($conf->theme == 'md') $default='5a3278';
+	    if ($conf->theme == 'md') {
+	    	$default='5a3278';
+	    }
 
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -540,12 +570,14 @@ 
 	    if ($edit)
 	    {
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
-	    }
-	   	else
+	    } else
 	   	{
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
 	   	}
     	print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -575,11 +607,12 @@ 
 		 }
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
-	}
-	else
+	} else
 	{
 		$default='ffffff';
-		if ($conf->theme == 'md') $default='ffffff';
+		if ($conf->theme == 'md') {
+			$default='ffffff';
+		}
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
@@ -587,12 +620,14 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -604,8 +639,7 @@ 
 	{
 
 
-	}
-	else
+	} else
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
@@ -613,8 +647,7 @@ 
 	    if ($edit)
 	    {
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
-	    }
-	   	else
+	    } else
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -629,11 +662,12 @@ 
 	if ($foruserprofile)
 	{
 
-	}
-	else
+	} else
 	{
 	    $default='ffffff';
-	    if ($conf->theme == 'md') $default='ffffff';
+	    if ($conf->theme == 'md') {
+	    	$default='ffffff';
+	    }
 
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
@@ -641,12 +675,14 @@ 
 	    if ($edit)
 	    {
 	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
-	    }
-	    else
+	    } else
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
-	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else print $langs->trans("Default");
+	        if ($color) {
+	        	print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        } else {
+	        	print $langs->trans("Default");
+	        }
 	    }
 	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -657,11 +693,12 @@ 
 	if ($foruserprofile)
 	{
 
-	}
-	else
+	} else
 	{
 	    $default='f8f8f8';
-	    if ($conf->theme == 'md') $default='f8f8f8';
+	    if ($conf->theme == 'md') {
+	    	$default='f8f8f8';
+	    }
 
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
@@ -669,12 +706,14 @@ 
 	    if ($edit)
 	    {
 	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
-	    }
-	    else
+	    } else
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
-	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else print $langs->trans("Default");
+	        if ($color) {
+	        	print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        } else {
+	        	print $langs->trans("Default");
+	        }
 	    }
 	    print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 	    print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -686,8 +725,7 @@ 
 	{
 
 
-	}
-	else
+	} else
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TextTitleColor").'</td>';
@@ -695,8 +733,7 @@ 
 	    if ($edit)
 	    {
 	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
-	    }
-	    else
+	    } else
 	    {
 	        print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 	    }
@@ -731,8 +768,7 @@ 
 	     }
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
-	}
-	else
+	} else
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("LinkColor").'</td>';
@@ -740,12 +776,12 @@ 
 	    if ($edit)
 	    {
 	        print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
-	    }
-	    else
+	    } else
 	    {
 	        $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
-	        if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	        else
+	        if ($color) {
+	        	print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	        } else
 	        {
 	            //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 	            //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
@@ -770,8 +806,7 @@ 
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else
+	} else
 	{
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
@@ -780,20 +815,29 @@ 
 	    //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    if ($edit)
 	    {
-	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
-	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
+	        	$color='edf4fb';
+	        } else {
+	        	$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+	        }
 	        print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
-	    }
-	    else
+	    } else
 	    {
-	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb';
-	        else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+	        if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
+	        	$color='edf4fb';
+	        } else {
+	        	$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+	        }
 	        if ($color)
 	        {
-	            if ($color != 'edf4fb') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	            else print $langs->trans("Default");
+	            if ($color != 'edf4fb') {
+	            	print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+	            } else {
+	            	print $langs->trans("Default");
+	            }
+	        } else {
+	        	print $langs->trans("None");
 	        }
-	        else print $langs->trans("None");
 	    }
 	    print ' &nbsp; ('.$langs->trans("Default").': <strong>edf4fb</strong>) ';
     	print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

htdocs/core/lib/security.lib.php

Spacing +169 added lines, -169 removed lines

@@ -35,13 +35,13 @@ 
  */
 function dol_encode($chain)
 {
-    $strlength=dol_strlen($chain);
-	for ($i=0; $i < $strlength; $i++)
+    $strlength = dol_strlen($chain);
+	for ($i = 0; $i < $strlength; $i++)
 	{
-		$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+		$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 	}
 
-	$string_coded = base64_encode(implode("",$output_tab));
+	$string_coded = base64_encode(implode("", $output_tab));
 	return $string_coded;
 }
 
@@ -57,13 +57,13 @@ 
 {
 	$chain = base64_decode($chain);
 
-	$strlength=dol_strlen($chain);
-	for($i=0; $i < $strlength;$i++)
+	$strlength = dol_strlen($chain);
+	for ($i = 0; $i < $strlength; $i++)
 	{
-		$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+		$output_tab[$i] = chr(ord(substr($chain, $i, 1)) - 17);
 	}
 
-	$string_decoded = implode("",$output_tab);
+	$string_decoded = implode("", $output_tab);
 	return $string_decoded;
 }
 
@@ -77,19 +77,19 @@ 
  * 	@param		int			$type		Type of hash (0:auto, 1:sha1, 2:sha1+md5, 3:md5, 4:md5 for OpenLdap). Use 3 here, if hash is not needed for security purpose, for security need, prefer 0.
  * 	@return		string					Hash of string
  */
-function dol_hash($chain,$type=0)
+function dol_hash($chain, $type = 0)
 {
 	global $conf;
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (!empty($conf->global->MAIN_SECURITY_SALT)) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == 1) return sha1($chain);
 	else if ($type == 2) return sha1(md5($chain));
 	else if ($type == 3) return md5($chain);
-	else if ($type == 4) return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	else if ($type == 4) return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+	else if (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
+	else if (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
 
 	// No particular enconding defined, use default
 	return md5($chain);
@@ -111,7 +111,7 @@ 
  * 	@return	int						Always 1, die process if not allowed
  *  @see dol_check_secure_access_document
  */
-function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $objcanvas=null)
+function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $objcanvas = null)
 {
     global $db, $conf;
 
@@ -123,7 +123,7 @@ 
     // If we use canvas, we try to use function that overlod restrictarea if provided with canvas
     if (is_object($objcanvas))
     {
-        if (method_exists($objcanvas->control,'restrictedArea')) return $objcanvas->control->restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+        if (method_exists($objcanvas->control, 'restrictedArea')) return $objcanvas->control->restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
     }
 
     if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
@@ -134,211 +134,211 @@ 
     else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
 
     // More subfeatures to check
-    if (! empty($feature2)) $feature2 = explode("|", $feature2);
+    if (!empty($feature2)) $feature2 = explode("|", $feature2);
 
     // More parameters
     $params = explode('&', $tableandshare);
-    $dbtablename=(! empty($params[0]) ? $params[0] : '');
-    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+    $dbtablename = (!empty($params[0]) ? $params[0] : '');
+    $sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
-	$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 
 	// Check read permission from module
-    $readok=1; $nbko=0;
+    $readok = 1; $nbko = 0;
     foreach ($featuresarray as $feature)	// first we check nb of test ko
     {
-        $featureforlistofmodule=$feature;
-        if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+        $featureforlistofmodule = $feature;
+        if ($featureforlistofmodule == 'produit') $featureforlistofmodule = 'product';
+        if (!empty($user->societe_id) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
     	{
-    		$readok=0; $nbko++;
+    		$readok = 0; $nbko++;
     		continue;
     	}
 
         if ($feature == 'societe')
         {
-            if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
+            if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }
         }
         else if ($feature == 'contact')
         {
-            if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
+            if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }
         }
         else if ($feature == 'produit|service')
         {
-            if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
+            if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }
         }
         else if ($feature == 'prelevement')
         {
-            if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
+            if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }
         }
         else if ($feature == 'cheque')
         {
-            if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
+            if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }
         }
         else if ($feature == 'projet')
         {
-            if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
+            if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }
         }
-        else if (! empty($feature2))	// This should be used for future changes
+        else if (!empty($feature2))	// This should be used for future changes
         {
-        	$tmpreadok=1;
-        	foreach($feature2 as $subfeature)
+        	$tmpreadok = 1;
+        	foreach ($feature2 as $subfeature)
         	{
-        		if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-        		else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-        		else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+        		if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }
+        		else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }
+        		else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
         	}
-        	if (! $tmpreadok)	// We found a test on feature that is ko
+        	if (!$tmpreadok)	// We found a test on feature that is ko
         	{
-        		$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+        		$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
         		$nbko++;
         	}
         }
-        else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+        else if (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is for old permissions
         {
             if (empty($user->rights->$feature->lire)
             && empty($user->rights->$feature->read)
-            && empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+            && empty($user->rights->$feature->run)) { $readok = 0; $nbko++; }
         }
     }
 
     // If a or and at least one ok
-    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok = 1;
 
-    if (! $readok) accessforbidden();
+    if (!$readok) accessforbidden();
     //print "Read access is ok";
 
     // Check write permission from module
-    $createok=1; $nbko=0;
-    if (GETPOST('action','aZ09')  == 'create')
+    $createok = 1; $nbko = 0;
+    if (GETPOST('action', 'aZ09') == 'create')
     {
         foreach ($featuresarray as $feature)
         {
             if ($feature == 'contact')
             {
-                if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
+                if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }
             }
             else if ($feature == 'produit|service')
             {
-                if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
+                if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }
             }
             else if ($feature == 'prelevement')
             {
-                if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
+                if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }
             }
             else if ($feature == 'commande_fournisseur')
             {
-                if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
+                if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }
             }
             else if ($feature == 'banque')
             {
-                if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
+                if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }
             }
             else if ($feature == 'cheque')
             {
-                if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
+                if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }
             }
-            else if (! empty($feature2))	// This should be used
+            else if (!empty($feature2))	// This should be used
             {
-            	foreach($feature2 as $subfeature)
+            	foreach ($feature2 as $subfeature)
             	{
             		if (empty($user->rights->$feature->$subfeature->creer)
             		&& empty($user->rights->$feature->$subfeature->write)
-            		&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-            		else { $createok=1; break; } // Break to bypass second test if the first is ok
+            		&& empty($user->rights->$feature->$subfeature->create)) { $createok = 0; $nbko++; }
+            		else { $createok = 1; break; } // Break to bypass second test if the first is ok
             	}
             }
-            else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+            else if (!empty($feature))		// This is for old permissions ('creer' or 'write')
             {
                 //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
                 if (empty($user->rights->$feature->creer)
                 && empty($user->rights->$feature->write)
-                && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+                && empty($user->rights->$feature->create)) { $createok = 0; $nbko++; }
             }
         }
 
 	    // If a or and at least one ok
-	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok = 1;
 
-        if (! $createok) accessforbidden();
+        if (!$createok) accessforbidden();
         //print "Write access is ok";
     }
 
     // Check create user permission
-    $createuserok=1;
-    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm") == 'yes')
+    $createuserok = 1;
+    if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm") == 'yes')
     {
-        if (! $user->rights->user->user->creer) $createuserok=0;
+        if (!$user->rights->user->user->creer) $createuserok = 0;
 
-        if (! $createuserok) accessforbidden();
+        if (!$createuserok) accessforbidden();
         //print "Create user access is ok";
     }
 
     // Check delete permission from module
-    $deleteok=1; $nbko=0;
-    if ((GETPOST('action','aZ09')  == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST('action','aZ09')  == 'delete')
+    $deleteok = 1; $nbko = 0;
+    if ((GETPOST('action', 'aZ09') == 'confirm_delete' && GETPOST("confirm") == 'yes') || GETPOST('action', 'aZ09') == 'delete')
     {
         foreach ($featuresarray as $feature)
         {
             if ($feature == 'contact')
             {
-                if (! $user->rights->societe->contact->supprimer) $deleteok=0;
+                if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
             }
             else if ($feature == 'produit|service')
             {
-                if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
+                if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
             }
             else if ($feature == 'commande_fournisseur')
             {
-                if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
+                if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
             }
             else if ($feature == 'banque')
             {
-                if (! $user->rights->banque->modifier) $deleteok=0;
+                if (!$user->rights->banque->modifier) $deleteok = 0;
             }
             else if ($feature == 'cheque')
             {
-                if (! $user->rights->banque->cheque) $deleteok=0;
+                if (!$user->rights->banque->cheque) $deleteok = 0;
             }
             else if ($feature == 'ecm')
             {
-                if (! $user->rights->ecm->upload) $deleteok=0;
+                if (!$user->rights->ecm->upload) $deleteok = 0;
             }
             else if ($feature == 'ftp')
             {
-                if (! $user->rights->ftp->write) $deleteok=0;
+                if (!$user->rights->ftp->write) $deleteok = 0;
             }
             else if ($feature == 'salaries')
             {
-                if (! $user->rights->salaries->delete) $deleteok=0;
+                if (!$user->rights->salaries->delete) $deleteok = 0;
             }
-            else if (! empty($feature2))	// This should be used for future changes
+            else if (!empty($feature2))	// This should be used for future changes
             {
-            	foreach($feature2 as $subfeature)
+            	foreach ($feature2 as $subfeature)
             	{
-            		if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-            		else { $deleteok=1; break; } // For bypass the second test if the first is ok
+            		if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
+            		else { $deleteok = 1; break; } // For bypass the second test if the first is ok
             	}
             }
-            else if (! empty($feature))		// This is for old permissions
+            else if (!empty($feature))		// This is for old permissions
             {
                 //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
                 if (empty($user->rights->$feature->supprimer)
                 && empty($user->rights->$feature->delete)
-                && empty($user->rights->$feature->run)) $deleteok=0;
+                && empty($user->rights->$feature->run)) $deleteok = 0;
             }
         }
 
 	    // If a or and at least one ok
-	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok = 1;
 
-        if (! $deleteok) accessforbidden();
+        if (!$deleteok) accessforbidden();
         //print "Delete access is ok";
     }
 
     // If we have a particular object to check permissions on, we check this object
     // is linked to a company allowed to $user.
-    if (! empty($objectid) && $objectid > 0)
+    if (!empty($objectid) && $objectid > 0)
     {
     	$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
 		return $ok ? 1 : accessforbidden();
@@ -361,51 +361,51 @@ 
  * @return	bool		True if user has access, False otherwise
  * @see restrictedArea
  */
-function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
+function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid')
 {
 	global $db, $conf;
 
 	// More parameters
 	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+	$dbtablename = (!empty($params[0]) ? $params[0] : '');
+	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
 	foreach ($featuresarray as $feature)
 	{
-		$sql='';
+		$sql = '';
 
 		// For backward compatibility
-		if ($feature == 'member') $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task') $feature='projet_task';
-
-		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
-		$checksoc = array('societe');	 // Test for societe object
-		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet','project'); // Test for project object
+		if ($feature == 'member') $feature = 'adherent';
+		if ($feature == 'project') $feature = 'projet';
+		if ($feature == 'task') $feature = 'projet_task';
+
+		$check = array('adherent', 'banque', 'user', 'usergroup', 'produit', 'service', 'produit|service', 'categorie'); // Test on entity only (Objects with no link to company)
+		$checksoc = array('societe'); // Test for societe object
+		$checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
+		$checkproject = array('projet', 'project'); // Test for project object
 		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock','fournisseur');	// No test
+		$nocheck = array('barcode', 'stock', 'fournisseur'); // No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtable not defined, we use same name for table than module name
 		if (empty($dbtablename)) $dbtablename = $feature;
 
 		// Check permission for object with entity
-		if (in_array($feature,$check))
+		if (in_array($feature, $check))
 		{
 			$sql = "SELECT dbt.".$dbt_select;
-			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
+			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+			$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 			{
-				$sql.= " AND dbt.entity IS NOT NULL";
+				$sql .= " AND dbt.entity IS NOT NULL";
 			}
 			else
 			{
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
+		else if (in_array($feature, $checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -413,132 +413,132 @@ 
 				if ($user->socid <> $objectid) return false;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT sc.fk_soc";
-				$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
-				$sql.= " WHERE sc.fk_soc = ".$objectid;
-				$sql.= " AND sc.fk_user = ".$user->id;
-				$sql.= " AND sc.fk_soc = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ", ".MAIN_DB_PREFIX."societe as s)";
+				$sql .= " WHERE sc.fk_soc = ".$objectid;
+				$sql .= " AND sc.fk_user = ".$user->id;
+				$sql .= " AND sc.fk_soc = s.rowid";
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT s.rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE s.rowid = ".$objectid;
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+				$sql .= " WHERE s.rowid = ".$objectid;
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		else if (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->societe_id > 0)
 			{
 				$sql = "SELECT dbt.".$dbt_select;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND dbt.fk_soc = ".$user->societe_id;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND dbt.fk_soc = ".$user->societe_id;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT dbt.".$dbt_select;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT dbt.".$dbt_select;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkproject))
+		else if (in_array($feature, $checkproject))
 		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
+				$projectstatic = new Project($db);
+				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+				$tmparray = explode(',', $tmps);
+				if (!in_array($objectid, $tmparray)) return false;
 			}
 			else
 			{
 				$sql = "SELECT dbt.".$dbt_select;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checktask))
+		else if (in_array($feature, $checktask))
 		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 			    $task = new Task($db);
 			    $task->fetch($objectid);
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
+				$projectstatic = new Project($db);
+				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+				$tmparray = explode(',', $tmps);
+				if (!in_array($task->fk_project, $tmparray)) return false;
 			}
 			else
 			{
 				$sql = "SELECT dbt.".$dbt_select;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (! in_array($feature,$nocheck))	// By default we check with link to third party
+		else if (!in_array($feature, $nocheck))	// By default we check with link to third party
 		{
 			// If external user: Check permission for external users
 			if ($user->societe_id > 0)
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT dbt.".$dbt_keyfield;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid = ".$objectid;
-				$sql.= " AND dbt.".$dbt_keyfield." = ".$user->societe_id;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.rowid = ".$objectid;
+				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->societe_id;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT sc.fk_soc";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-				$sql.= " AND sc.fk_user = ".$user->id;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " AND sc.fk_user = ".$user->id;
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT dbt.".$dbt_select;
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." = ".$objectid;
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
 
 		//print "sql=".$sql."<br>";
 		if ($sql)
 		{
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
 				if ($db->num_rows($resql) == 0)	return false;
@@ -562,13 +562,13 @@ 
  *  @param  int		$showonlymessage     Show only message parameter. Otherwise add more information.
  *  @return	void
  */
-function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymessage=0)
+function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0)
 {
     global $conf, $db, $user, $langs;
-    if (! is_object($langs))
+    if (!is_object($langs))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-        $langs=new Translate('',$conf);
+        $langs = new Translate('', $conf);
     }
 
     $langs->load("errors");
@@ -579,7 +579,7 @@ 
         else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
     }
     print '<div class="error">';
-    if (! $message) print $langs->trans("ErrorForbidden");
+    if (!$message) print $langs->trans("ErrorForbidden");
     else print $message;
     print '</div>';
     print '<br>';
@@ -588,7 +588,7 @@ 
         if ($user->login)
         {
             print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-            print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+            print $langs->trans("ErrorForbidden2", $langs->trans("Home"), $langs->trans("Users"));
         }
         else
         {

Braces +191 added lines, -121 removed lines

@@ -82,14 +82,25 @@ 
 	global $conf;
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT)) {
+		$chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	}
 
-	if ($type == 1) return sha1($chain);
-	else if ($type == 2) return sha1(md5($chain));
-	else if ($type == 3) return md5($chain);
-	else if ($type == 4) return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	if ($type == 1) {
+		return sha1($chain);
+	} else if ($type == 2) {
+		return sha1(md5($chain));
+	} else if ($type == 3) {
+		return md5($chain);
+	} else if ($type == 4) {
+		return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain));
+	}
+	// For OpenLdap with md5 (based on an unencrypted password in base)
+	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') {
+		return sha1($chain);
+	} else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') {
+		return sha1(md5($chain));
+	}
 
 	// No particular enconding defined, use default
 	return md5($chain);
@@ -123,18 +134,27 @@ 
     // If we use canvas, we try to use function that overlod restrictarea if provided with canvas
     if (is_object($objcanvas))
     {
-        if (method_exists($objcanvas->control,'restrictedArea')) return $objcanvas->control->restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+        if (method_exists($objcanvas->control,'restrictedArea')) {
+        	return $objcanvas->control->restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+        }
     }
 
-    if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+    if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+    	$objectid = "'".$objectid."'";
+    }
 
     // Features/modules to check
     $featuresarray = array($features);
-    if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-    else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+    if (preg_match('/&/', $features)) {
+    	$featuresarray = explode("&", $features);
+    } else if (preg_match('/\|/', $features)) {
+    	$featuresarray = explode("|", $features);
+    }
 
     // More subfeatures to check
-    if (! empty($feature2)) $feature2 = explode("|", $feature2);
+    if (! empty($feature2)) {
+    	$feature2 = explode("|", $feature2);
+    }
 
     // More parameters
     $params = explode('&', $tableandshare);
@@ -145,67 +165,77 @@ 
 
 	// Check read permission from module
     $readok=1; $nbko=0;
-    foreach ($featuresarray as $feature)	// first we check nb of test ko
+    foreach ($featuresarray as $feature) {
+    	// first we check nb of test ko
     {
         $featureforlistofmodule=$feature;
-        if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+    }
+        if ($featureforlistofmodule == 'produit') {
+        	$featureforlistofmodule='product';
+        }
+        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules)) {
+        	// If limits on modules for external users, module must be into list of modules for external users
     	{
-    		$readok=0; $nbko++;
+    		$readok=0;
+        }
+        $nbko++;
     		continue;
     	}
 
         if ($feature == 'societe')
         {
             if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
-        }
-        else if ($feature == 'contact')
+        } else if ($feature == 'contact')
         {
             if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
-        }
-        else if ($feature == 'produit|service')
+        } else if ($feature == 'produit|service')
         {
             if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
-        }
-        else if ($feature == 'prelevement')
+        } else if ($feature == 'prelevement')
         {
             if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
-        }
-        else if ($feature == 'cheque')
+        } else if ($feature == 'cheque')
         {
             if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
-        }
-        else if ($feature == 'projet')
+        } else if ($feature == 'projet')
         {
             if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
-        }
-        else if (! empty($feature2))	// This should be used for future changes
+        } else if (! empty($feature2)) {
+        	// This should be used for future changes
         {
         	$tmpreadok=1;
+        }
         	foreach($feature2 as $subfeature)
         	{
-        		if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-        		else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-        		else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+        		if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; } else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; } else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
         	}
-        	if (! $tmpreadok)	// We found a test on feature that is ko
+        	if (! $tmpreadok) {
+        		// We found a test on feature that is ko
         	{
-        		$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+        		$readok=0;
+        	}
+        	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
         		$nbko++;
         	}
-        }
-        else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+        } else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) {
+        	// This is for old permissions
         {
             if (empty($user->rights->$feature->lire)
             && empty($user->rights->$feature->read)
-            && empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+            && empty($user->rights->$feature->run)) { $readok=0;
+        }
+        $nbko++; }
         }
     }
 
     // If a or and at least one ok
-    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+    	$readok=1;
+    }
 
-    if (! $readok) accessforbidden();
+    if (! $readok) {
+    	accessforbidden();
+    }
     //print "Read access is ok";
 
     // Check write permission from module
@@ -217,50 +247,52 @@ 
             if ($feature == 'contact')
             {
                 if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
-            }
-            else if ($feature == 'produit|service')
+            } else if ($feature == 'produit|service')
             {
                 if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
-            }
-            else if ($feature == 'prelevement')
+            } else if ($feature == 'prelevement')
             {
                 if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
-            }
-            else if ($feature == 'commande_fournisseur')
+            } else if ($feature == 'commande_fournisseur')
             {
                 if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
-            }
-            else if ($feature == 'banque')
+            } else if ($feature == 'banque')
             {
                 if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
-            }
-            else if ($feature == 'cheque')
+            } else if ($feature == 'cheque')
             {
                 if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
-            }
-            else if (! empty($feature2))	// This should be used
+            } else if (! empty($feature2)) {
+            	// This should be used
             {
             	foreach($feature2 as $subfeature)
             	{
             		if (empty($user->rights->$feature->$subfeature->creer)
             		&& empty($user->rights->$feature->$subfeature->write)
-            		&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-            		else { $createok=1; break; } // Break to bypass second test if the first is ok
-            	}
+            		&& empty($user->rights->$feature->$subfeature->create)) { $createok=0;
             }
-            else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+            $nbko++; } else { $createok=1; break; } // Break to bypass second test if the first is ok
+            	}
+            } else if (! empty($feature)) {
+            	// This is for old permissions ('creer' or 'write')
             {
                 //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
                 if (empty($user->rights->$feature->creer)
                 && empty($user->rights->$feature->write)
-                && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+                && empty($user->rights->$feature->create)) { $createok=0;
+            }
+            $nbko++; }
             }
         }
 
 	    // If a or and at least one ok
-	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+	    	$createok=1;
+	    }
 
-        if (! $createok) accessforbidden();
+        if (! $createok) {
+        	accessforbidden();
+        }
         //print "Write access is ok";
     }
 
@@ -268,9 +300,13 @@ 
     $createuserok=1;
     if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm") == 'yes')
     {
-        if (! $user->rights->user->user->creer) $createuserok=0;
+        if (! $user->rights->user->user->creer) {
+        	$createuserok=0;
+        }
 
-        if (! $createuserok) accessforbidden();
+        if (! $createuserok) {
+        	accessforbidden();
+        }
         //print "Create user access is ok";
     }
 
@@ -282,57 +318,71 @@ 
         {
             if ($feature == 'contact')
             {
-                if (! $user->rights->societe->contact->supprimer) $deleteok=0;
-            }
-            else if ($feature == 'produit|service')
+                if (! $user->rights->societe->contact->supprimer) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'produit|service')
             {
-                if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
-            }
-            else if ($feature == 'commande_fournisseur')
+                if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'commande_fournisseur')
             {
-                if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
-            }
-            else if ($feature == 'banque')
+                if (! $user->rights->fournisseur->commande->supprimer) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'banque')
             {
-                if (! $user->rights->banque->modifier) $deleteok=0;
-            }
-            else if ($feature == 'cheque')
+                if (! $user->rights->banque->modifier) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'cheque')
             {
-                if (! $user->rights->banque->cheque) $deleteok=0;
-            }
-            else if ($feature == 'ecm')
+                if (! $user->rights->banque->cheque) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'ecm')
             {
-                if (! $user->rights->ecm->upload) $deleteok=0;
-            }
-            else if ($feature == 'ftp')
+                if (! $user->rights->ecm->upload) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'ftp')
             {
-                if (! $user->rights->ftp->write) $deleteok=0;
-            }
-            else if ($feature == 'salaries')
+                if (! $user->rights->ftp->write) {
+                	$deleteok=0;
+                }
+            } else if ($feature == 'salaries')
             {
-                if (! $user->rights->salaries->delete) $deleteok=0;
-            }
-            else if (! empty($feature2))	// This should be used for future changes
+                if (! $user->rights->salaries->delete) {
+                	$deleteok=0;
+                }
+            } else if (! empty($feature2)) {
+            	// This should be used for future changes
             {
             	foreach($feature2 as $subfeature)
             	{
             		if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-            		else { $deleteok=1; break; } // For bypass the second test if the first is ok
+            } else { $deleteok=1; break; } // For bypass the second test if the first is ok
             	}
-            }
-            else if (! empty($feature))		// This is for old permissions
+            } else if (! empty($feature)) {
+            	// This is for old permissions
             {
                 //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
                 if (empty($user->rights->$feature->supprimer)
                 && empty($user->rights->$feature->delete)
                 && empty($user->rights->$feature->run)) $deleteok=0;
             }
+            }
         }
 
 	    // If a or and at least one ok
-	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+	    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+	    	$deleteok=1;
+	    }
 
-        if (! $deleteok) accessforbidden();
+        if (! $deleteok) {
+        	accessforbidden();
+        }
         //print "Delete access is ok";
     }
 
@@ -375,9 +425,15 @@ 
 		$sql='';
 
 		// For backward compatibility
-		if ($feature == 'member') $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task') $feature='projet_task';
+		if ($feature == 'member') {
+			$feature='adherent';
+		}
+		if ($feature == 'project') {
+			$feature='projet';
+		}
+		if ($feature == 'task') {
+			$feature='projet_task';
+		}
 
 		$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
@@ -388,7 +444,9 @@ 
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtable not defined, we use same name for table than module name
-		if (empty($dbtablename)) $dbtablename = $feature;
+		if (empty($dbtablename)) {
+			$dbtablename = $feature;
+		}
 
 		// Check permission for object with entity
 		if (in_array($feature,$check))
@@ -399,18 +457,18 @@ 
 			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
 			{
 				$sql.= " AND dbt.entity IS NOT NULL";
-			}
-			else
+			} else
 			{
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
+		} else if (in_array($feature,$checksoc)) {
+			// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
+		}
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
@@ -431,13 +489,14 @@ 
 				$sql.= " WHERE s.rowid = ".$objectid;
 				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} else if (in_array($feature,$checkother)) {
+			// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->societe_id > 0)
 			{
 				$sql = "SELECT dbt.".$dbt_select;
+		}
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND dbt.fk_soc = ".$user->societe_id;
@@ -460,8 +519,7 @@ 
 				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checkproject))
+		} else if (in_array($feature,$checkproject))
 		{
 			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -469,17 +527,17 @@ 
 				$projectstatic=new Project($db);
 				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
 				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
-			}
-			else
+				if (! in_array($objectid,$tmparray)) {
+					return false;
+				}
+			} else
 			{
 				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checktask))
+		} else if (in_array($feature,$checktask))
 		{
 			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -490,22 +548,24 @@ 
 				$projectstatic=new Project($db);
 				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
 				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
-			}
-			else
+				if (! in_array($task->fk_project,$tmparray)) {
+					return false;
+				}
+			} else
 			{
 				$sql = "SELECT dbt.".$dbt_select;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (! in_array($feature,$nocheck))	// By default we check with link to third party
+		} else if (! in_array($feature,$nocheck)) {
+			// By default we check with link to third party
 		{
 			// If external user: Check permission for external users
 			if ($user->societe_id > 0)
 			{
 				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+		}
 				$sql = "SELECT dbt.".$dbt_keyfield;
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.rowid = ".$objectid;
@@ -514,7 +574,9 @@ 
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) {
+					dol_print_error('','Param dbt_keyfield is required but not defined');
+				}
 				$sql = "SELECT sc.fk_soc";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -541,9 +603,10 @@ 
 			$resql=$db->query($sql);
 			if ($resql)
 			{
-				if ($db->num_rows($resql) == 0)	return false;
-			}
-			else
+				if ($db->num_rows($resql) == 0) {
+					return false;
+				}
+			} else
 			{
 				return false;
 			}
@@ -575,12 +638,18 @@ 
 
     if ($printheader)
     {
-        if (function_exists("llxHeader")) llxHeader('');
-        else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+        if (function_exists("llxHeader")) {
+        	llxHeader('');
+        } else if (function_exists("llxHeaderVierge")) {
+        	llxHeaderVierge('');
+        }
     }
     print '<div class="error">';
-    if (! $message) print $langs->trans("ErrorForbidden");
-    else print $message;
+    if (! $message) {
+    	print $langs->trans("ErrorForbidden");
+    } else {
+    	print $message;
+    }
     print '</div>';
     print '<br>';
     if (empty($showonlymessage))
@@ -589,13 +658,14 @@ 
         {
             print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
             print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-        }
-        else
+        } else
         {
             print $langs->trans("ErrorForbidden3");
         }
     }
-    if ($printfooter && function_exists("llxFooter")) llxFooter();
+    if ($printfooter && function_exists("llxFooter")) {
+    	llxFooter();
+    }
     exit(0);
 }
 

htdocs/core/lib/files.lib.php

Indentation +705 added lines, -705 removed lines

@@ -34,7 +34,7 @@ 
  */
 function dol_basename($pathfile)
 {
-    return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
+	return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
 }
 
 /**
@@ -75,9 +75,9 @@ 
 
 	if (is_object($hookmanager) && ! $nohook)
 	{
-	    $hookmanager->resArray=array();
+		$hookmanager->resArray=array();
 
-	    $hookmanager->initHooks(array('fileslib'));
+		$hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array(
 				'path' => $newpath,
@@ -221,66 +221,66 @@ 
  */
 function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
 {
-    global $conf, $db;
-
-    $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
-    if ($mode) $sql.=", description";
-    $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
-    $sql.=" WHERE filepath = '".$db->escape($path)."'";
-    $sql.=" AND entity = ".$conf->entity;
-
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $file_list=array();
-        $num = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj)
-            {
-                preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
-                $level1name=(isset($reg[1])?$reg[1]:'');
-                $file_list[] = array(
-                    "rowid" => $obj->rowid,
-                    "label" => $obj->label,         // md5
-    				"name" => $obj->filename,
-    				"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
-                    "level1name" => $level1name,
-    				"fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
-    				"fullpath_orig" => $obj->fullpath_orig,
-                    "date_c" => $db->jdate($obj->date_c),
-                    "date_m" => $db->jdate($obj->date_m),
-    				"type" => 'file',
-                    "keywords" => $obj->keywords,
-                    "cover" => $obj->cover,
-                    "position" => (int) $obj->position,
-                    "acl" => $obj->acl
-                );
-            }
-            $i++;
-        }
-
-        // Obtain a list of columns
-        if (! empty($sortcriteria))
-        {
-            $myarray=array();
-            foreach ($file_list as $key => $row)
-            {
-                $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
-            }
-            // Sort the data
-            if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
-        }
-
-        return $file_list;
-    }
-    else
-    {
-        dol_print_error($db);
-        return array();
-    }
+	global $conf, $db;
+
+	$sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+	if ($mode) $sql.=", description";
+	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
+	$sql.=" WHERE filepath = '".$db->escape($path)."'";
+	$sql.=" AND entity = ".$conf->entity;
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$file_list=array();
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
+				$level1name=(isset($reg[1])?$reg[1]:'');
+				$file_list[] = array(
+					"rowid" => $obj->rowid,
+					"label" => $obj->label,         // md5
+					"name" => $obj->filename,
+					"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
+					"level1name" => $level1name,
+					"fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
+					"fullpath_orig" => $obj->fullpath_orig,
+					"date_c" => $db->jdate($obj->date_c),
+					"date_m" => $db->jdate($obj->date_m),
+					"type" => 'file',
+					"keywords" => $obj->keywords,
+					"cover" => $obj->cover,
+					"position" => (int) $obj->position,
+					"acl" => $obj->acl
+				);
+			}
+			$i++;
+		}
+
+		// Obtain a list of columns
+		if (! empty($sortcriteria))
+		{
+			$myarray=array();
+			foreach ($file_list as $key => $row)
+			{
+				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+			}
+			// Sort the data
+			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+		}
+
+		return $file_list;
+	}
+	else
+	{
+		dol_print_error($db);
+		return array();
+	}
 }
 
 
@@ -411,9 +411,9 @@ 
  */
 function dol_is_dir($folder)
 {
-    $newfolder=dol_osencode($folder);
-    if (is_dir($newfolder)) return true;
-    else return false;
+	$newfolder=dol_osencode($folder);
+	if (is_dir($newfolder)) return true;
+	else return false;
 }
 
 /**
@@ -424,8 +424,8 @@ 
  */
 function dol_is_file($pathoffile)
 {
-    $newpathoffile=dol_osencode($pathoffile);
-    return is_file($newpathoffile);
+	$newpathoffile=dol_osencode($pathoffile);
+	return is_file($newpathoffile);
 }
 
 /**
@@ -436,12 +436,12 @@ 
  */
 function dol_is_url($url)
 {
-    $tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
-    foreach($tmpprot as $prot)
-    {
-        if (preg_match('/^'.$prot.':/i',$url)) return true;
-    }
-    return false;
+	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
+	foreach($tmpprot as $prot)
+	{
+		if (preg_match('/^'.$prot.':/i',$url)) return true;
+	}
+	return false;
 }
 
 /**
@@ -456,14 +456,14 @@ 
 	if (is_dir($newfolder))
 	{
 		$handle = opendir($newfolder);
-        $folder_content = '';
+		$folder_content = '';
 		while ((gettype($name = readdir($handle)) != "boolean"))
 		{
 			$name_array[] = $name;
 		}
 		foreach($name_array as $temp) $folder_content .= $temp;
 
-        closedir($handle);
+		closedir($handle);
 
 		if ($folder_content == "...") return true;
 		else return false;
@@ -491,7 +491,7 @@ 
 		while (!feof($fp))
 		{
 			$line=fgets($fp);
-            // We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
+			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
 			if (! $line === false) $nb++;
 		}
 		fclose($fp);
@@ -542,61 +542,61 @@ 
  */
 function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
-    global $conf;
+	global $conf;
 
-    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
+	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-    if (empty($srcfile)) return -1;
-    if (empty($destfile)) $destfile=$srcfile;
+	if (empty($srcfile)) return -1;
+	if (empty($destfile)) $destfile=$srcfile;
 
-    $destexists=dol_is_file($destfile);
-    if (($destfile != $srcfile) && $destexists) return 0;
+	$destexists=dol_is_file($destfile);
+	if (($destfile != $srcfile) && $destexists) return 0;
 
-    $tmpdestfile=$destfile.'.tmp';
+	$tmpdestfile=$destfile.'.tmp';
 
-    $newpathofsrcfile=dol_osencode($srcfile);
-    $newpathoftmpdestfile=dol_osencode($tmpdestfile);
-    $newpathofdestfile=dol_osencode($destfile);
-    $newdirdestfile=dirname($newpathofdestfile);
+	$newpathofsrcfile=dol_osencode($srcfile);
+	$newpathoftmpdestfile=dol_osencode($tmpdestfile);
+	$newpathofdestfile=dol_osencode($destfile);
+	$newdirdestfile=dirname($newpathofdestfile);
 
-    if ($destexists && ! is_writable($newpathofdestfile))
-    {
-        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
-        return -1;
-    }
-    if (! is_writable($newdirdestfile))
-    {
-        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
-        return -2;
-    }
+	if ($destexists && ! is_writable($newpathofdestfile))
+	{
+		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
+		return -1;
+	}
+	if (! is_writable($newdirdestfile))
+	{
+		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+		return -2;
+	}
 
-    dol_delete_file($tmpdestfile);
+	dol_delete_file($tmpdestfile);
 
-    // Create $newpathoftmpdestfile from $newpathofsrcfile
-    $content=file_get_contents($newpathofsrcfile, 'r');
+	// Create $newpathoftmpdestfile from $newpathofsrcfile
+	$content=file_get_contents($newpathofsrcfile, 'r');
 
-    $content = make_substitutions($content, $arrayreplacement, null);
+	$content = make_substitutions($content, $arrayreplacement, null);
 
-    file_put_contents($newpathoftmpdestfile, $content);
-    @chmod($newpathoftmpdestfile, octdec($newmask));
+	file_put_contents($newpathoftmpdestfile, $content);
+	@chmod($newpathoftmpdestfile, octdec($newmask));
 
-    // Rename
-    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
-    if (! $result)
-    {
-        dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
-        return -3;
-    }
-    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-    if (empty($newmask))	// This should no happen
-    {
-        dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
-        $newmask='0664';
-    }
+	// Rename
+	$result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
+	if (! $result)
+	{
+		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
+		return -3;
+	}
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+	if (empty($newmask))	// This should no happen
+	{
+		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+		$newmask='0664';
+	}
 
-    @chmod($newpathofdestfile, octdec($newmask));
+	@chmod($newpathofdestfile, octdec($newmask));
 
-    return 1;
+	return 1;
 }
 
 /**
@@ -638,26 +638,26 @@ 
 	if (! $overwriteifexists && $destexists) return 0;
 
 	$newpathofsrcfile=dol_osencode($srcfile);
-    $newpathofdestfile=dol_osencode($destfile);
-    $newdirdestfile=dirname($newpathofdestfile);
-
-    if ($destexists && ! is_writable($newpathofdestfile))
-    {
-        dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
-        return -1;
-    }
-    if (! is_writable($newdirdestfile))
-    {
-        dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
-        return -2;
-    }
-    // Copy with overwriting if exists
-    $result=@copy($newpathofsrcfile, $newpathofdestfile);
+	$newpathofdestfile=dol_osencode($destfile);
+	$newdirdestfile=dirname($newpathofdestfile);
+
+	if ($destexists && ! is_writable($newpathofdestfile))
+	{
+		dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
+		return -1;
+	}
+	if (! is_writable($newdirdestfile))
+	{
+		dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+		return -2;
+	}
+	// Copy with overwriting if exists
+	$result=@copy($newpathofsrcfile, $newpathofdestfile);
 	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
 	if (! $result)
 	{
-	    dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
-	    return -3;
+		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
+		return -3;
 	}
 	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
 	if (empty($newmask))	// This should no happen
@@ -695,33 +695,33 @@ 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
-    if (! $destexists)
-    {
-        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
-        umask(0);
-        $dirmaskdec=octdec($newmask);
-        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-        $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-        dol_mkdir($destfile, '', decoct($dirmaskdec));
-    }
+	if (! $destexists)
+	{
+		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
+		umask(0);
+		$dirmaskdec=octdec($newmask);
+		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+		dol_mkdir($destfile, '', decoct($dirmaskdec));
+	}
 
 	$ossrcfile=dol_osencode($srcfile);
 	$osdestfile=dol_osencode($destfile);
 
-    // Recursive function to copy all subdirectories and contents:
+	// Recursive function to copy all subdirectories and contents:
 	if (is_dir($ossrcfile))
 	{
-        $dir_handle=opendir($ossrcfile);
-        while ($file=readdir($dir_handle))
-        {
-            if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
-            {
-                if (is_dir($ossrcfile."/".$file))
-                {
-                    //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-                }
-                else
+		$dir_handle=opendir($ossrcfile);
+		while ($file=readdir($dir_handle))
+		{
+			if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
+			{
+				if (is_dir($ossrcfile."/".$file))
+				{
+					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
+					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+				}
+				else
 				{
 					$newfile = $file;
 					// Replace destination filename with a new one
@@ -732,30 +732,30 @@ 
 							$newfile = str_replace($key, $val, $newfile);
 						}
 					}
-                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
-                }
-                // Set result
-                if ($result > 0 && $tmpresult >= 0)
-                {
-                    // Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-                }
-                else
-                {
-                    $result=$tmpresult;
-                }
-                if ($result < 0) break;
+					$tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
+				}
+				// Set result
+				if ($result > 0 && $tmpresult >= 0)
+				{
+					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
+				}
+				else
+				{
+					$result=$tmpresult;
+				}
+				if ($result < 0) break;
 
-            }
-        }
-        closedir($dir_handle);
-    }
-    else
+			}
+		}
+		closedir($dir_handle);
+	}
+	else
 	{
 		// Source directory does not exists
-        $result = -2;
-    }
+		$result = -2;
+	}
 
-    return $result;
+	return $result;
 }
 
 
@@ -777,123 +777,123 @@ 
  */
 function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
 {
-    global $user, $db, $conf;
-    $result=false;
-
-    dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
-    $srcexists=dol_is_file($srcfile);
-    $destexists=dol_is_file($destfile);
-
-    if (! $srcexists)
-    {
-        dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
-        return false;
-    }
-
-    if ($overwriteifexists || ! $destexists)
-    {
-        $newpathofsrcfile=dol_osencode($srcfile);
-        $newpathofdestfile=dol_osencode($destfile);
-
-        // Check virus
-        $testvirusarray=array();
-        if ($testvirus)
-        {
-            $testvirusarray=dolCheckVirus($newpathofsrcfile);
-            if (count($testvirusarray))
-            {
-                dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
-                return false;
-            }
-        }
-
-        $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-        if (! $result)
-        {
-        	if ($destexists)
-        	{
-        		dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
-        		// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
-        		dol_delete_file($destfile);
-        		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-        	}
-        	else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
-        }
-
-        // Move ok
-        if ($result && $indexdatabase)
-        {
-            // Rename entry into ecm database
-            $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
-            $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
-            {
-                $rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
-                $rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
-                //var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
-
-                dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
-                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-
-                $ecmfiletarget=new EcmFiles($db);
-                $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-                if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
-                {
-                    $ecmfiletarget->delete($user);
-                }
-
-                $ecmfile=new EcmFiles($db);
-                $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-                if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
-                {
-                    $filename = basename($rel_filetorenameafter);
-                    $rel_dir = dirname($rel_filetorenameafter);
-                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-                    $ecmfile->filepath = $rel_dir;
-                    $ecmfile->filename = $filename;
-                    $resultecm = $ecmfile->update($user);
-                }
-                elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
-                {
-                    $filename = basename($rel_filetorenameafter);
-                    $rel_dir = dirname($rel_filetorenameafter);
-                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-                    $ecmfile->filepath = $rel_dir;
-                    $ecmfile->filename = $filename;
-                    $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
-                    $ecmfile->fullpath_orig = $srcfile;
-                    $ecmfile->gen_or_uploaded = 'unknown';
-                    $ecmfile->description = '';    // indexed content
-                    $ecmfile->keyword = '';        // keyword content
-                    $resultecm = $ecmfile->create($user);
-                    if ($resultecm < 0)
-                    {
-                        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-                    }
-                }
-                elseif ($resultecm < 0)
-                {
-                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-                }
-
-                if ($resultecm > 0) $result=true;
-                else $result = false;
-            }
-        }
+	global $user, $db, $conf;
+	$result=false;
 
-        if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
-        $newmaskdec=octdec($newmask);
-        // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
-        // to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
-        // if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
-        @chmod($newpathofdestfile, $newmaskdec);
-    }
+	dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
+	$srcexists=dol_is_file($srcfile);
+	$destexists=dol_is_file($destfile);
+
+	if (! $srcexists)
+	{
+		dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
+		return false;
+	}
+
+	if ($overwriteifexists || ! $destexists)
+	{
+		$newpathofsrcfile=dol_osencode($srcfile);
+		$newpathofdestfile=dol_osencode($destfile);
+
+		// Check virus
+		$testvirusarray=array();
+		if ($testvirus)
+		{
+			$testvirusarray=dolCheckVirus($newpathofsrcfile);
+			if (count($testvirusarray))
+			{
+				dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
+				return false;
+			}
+		}
+
+		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+		if (! $result)
+		{
+			if ($destexists)
+			{
+				dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
+				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
+				dol_delete_file($destfile);
+				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+			}
+			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+		}
+
+		// Move ok
+		if ($result && $indexdatabase)
+		{
+			// Rename entry into ecm database
+			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
+			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			{
+				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
+				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
+
+				dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
+				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+
+				$ecmfiletarget=new EcmFiles($db);
+				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
+				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+				{
+					$ecmfiletarget->delete($user);
+				}
+
+				$ecmfile=new EcmFiles($db);
+				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
+				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+				{
+					$filename = basename($rel_filetorenameafter);
+					$rel_dir = dirname($rel_filetorenameafter);
+					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+					$ecmfile->filepath = $rel_dir;
+					$ecmfile->filename = $filename;
+					$resultecm = $ecmfile->update($user);
+				}
+				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				{
+					$filename = basename($rel_filetorenameafter);
+					$rel_dir = dirname($rel_filetorenameafter);
+					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+					$ecmfile->filepath = $rel_dir;
+					$ecmfile->filename = $filename;
+					$ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+					$ecmfile->fullpath_orig = $srcfile;
+					$ecmfile->gen_or_uploaded = 'unknown';
+					$ecmfile->description = '';    // indexed content
+					$ecmfile->keyword = '';        // keyword content
+					$resultecm = $ecmfile->create($user);
+					if ($resultecm < 0)
+					{
+						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+					}
+				}
+				elseif ($resultecm < 0)
+				{
+					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+				}
+
+				if ($resultecm > 0) $result=true;
+				else $result = false;
+			}
+		}
 
-    return $result;
+		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		$newmaskdec=octdec($newmask);
+		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
+		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
+		// if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
+		@chmod($newpathofdestfile, $newmaskdec);
+	}
+
+	return $result;
 }
 
 /**
@@ -920,22 +920,22 @@ 
  */
 function dolCheckVirus($src_file)
 {
-    global $conf;
-
-    if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-    {
-        if (! class_exists('AntiVir')) {
-            require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
-        }
-        $antivir=new AntiVir($db);
-        $result = $antivir->dol_avscan_file($src_file);
-        if ($result < 0)	// If virus or error, we stop here
-        {
-            $reterrors=$antivir->errors;
-            return $reterrors;
-        }
-    }
-    return array();
+	global $conf;
+
+	if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+	{
+		if (! class_exists('AntiVir')) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
+		}
+		$antivir=new AntiVir($db);
+		$result = $antivir->dol_avscan_file($src_file);
+		if ($result < 0)	// If virus or error, we stop here
+		{
+			$reterrors=$antivir->errors;
+			return $reterrors;
+		}
+	}
+	return array();
 }
 
 
@@ -975,68 +975,68 @@ 
 
 	if (empty($reshook))
 	{
-    	// If an upload error has been reported
-    	if ($uploaderrorcode)
-    	{
-    	    switch($uploaderrorcode)
-    	    {
-    	        case UPLOAD_ERR_INI_SIZE:	// 1
-    	            return 'ErrorFileSizeTooLarge';
-    	            break;
-    	        case UPLOAD_ERR_FORM_SIZE:	// 2
-    	            return 'ErrorFileSizeTooLarge';
-    	            break;
-    	        case UPLOAD_ERR_PARTIAL:	// 3
-    	            return 'ErrorPartialFile';
-    	            break;
-    	        case UPLOAD_ERR_NO_TMP_DIR:	//
-    	            return 'ErrorNoTmpDir';
-    	            break;
-    	        case UPLOAD_ERR_CANT_WRITE:
-    	            return 'ErrorFailedToWriteInDir';
-    	            break;
-    	        case UPLOAD_ERR_EXTENSION:
-    	            return 'ErrorUploadBlockedByAddon';
-    	            break;
-    	        default:
-    	            break;
-    	    }
-    	}
-
-    	// If we need to make a virus scan
-    	if (empty($disablevirusscan) && file_exists($src_file))
-    	{
-    	    $checkvirusarray=dolCheckVirus($src_file);
-    	    if (count($checkvirusarray))
-    	    {
-    	       dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
-    	       return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
-    	    }
-    	}
-
-    	// Security:
-    	// Disallow file with some extensions. We rename them.
-    	// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-    	if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-    	{
-    	    $file_name.= '.noexe';
-    	}
-
-    	// Security:
-    	// We refuse cache files/dirs, upload using .. and pipes into filenames.
-    	if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
-    	{
-    	    dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
-    	    return -1;
-    	}
-
-    	// Security:
-    	// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-    	if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
-    	{
-    	    dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
-    	    return -2;
-    	}
+		// If an upload error has been reported
+		if ($uploaderrorcode)
+		{
+			switch($uploaderrorcode)
+			{
+				case UPLOAD_ERR_INI_SIZE:	// 1
+					return 'ErrorFileSizeTooLarge';
+					break;
+				case UPLOAD_ERR_FORM_SIZE:	// 2
+					return 'ErrorFileSizeTooLarge';
+					break;
+				case UPLOAD_ERR_PARTIAL:	// 3
+					return 'ErrorPartialFile';
+					break;
+				case UPLOAD_ERR_NO_TMP_DIR:	//
+					return 'ErrorNoTmpDir';
+					break;
+				case UPLOAD_ERR_CANT_WRITE:
+					return 'ErrorFailedToWriteInDir';
+					break;
+				case UPLOAD_ERR_EXTENSION:
+					return 'ErrorUploadBlockedByAddon';
+					break;
+				default:
+					break;
+			}
+		}
+
+		// If we need to make a virus scan
+		if (empty($disablevirusscan) && file_exists($src_file))
+		{
+			$checkvirusarray=dolCheckVirus($src_file);
+			if (count($checkvirusarray))
+			{
+			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
+			   return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+			}
+		}
+
+		// Security:
+		// Disallow file with some extensions. We rename them.
+		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+		if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+		{
+			$file_name.= '.noexe';
+		}
+
+		// Security:
+		// We refuse cache files/dirs, upload using .. and pipes into filenames.
+		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+		{
+			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
+			return -1;
+		}
+
+		// Security:
+		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
+		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+		{
+			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
+			return -2;
+		}
 	}
 
 	if ($reshook < 0)	// At least one blocking error returned by one hook
@@ -1108,8 +1108,8 @@ 
 	// We refuse transversal using .. and pipes into filenames.
 	if (preg_match('/\.\./',$file) || preg_match('/[<>|]/',$file))
 	{
-        dol_syslog("Refused to delete file ".$file, LOG_WARNING);
-	    return False;
+		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
+		return False;
 	}
 
 	if (empty($nohook))
@@ -1150,27 +1150,27 @@ 
 					else $ok=unlink($filename);
 					if ($ok)
 					{
-					    dol_syslog("Removed file ".$filename, LOG_DEBUG);
-
-	                    // Delete entry into ecm database
-    				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-    				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
-    				    {
-    				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
-
-    				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
-        				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-        				    $ecmfile=new EcmFiles($db);
-        				    $result = $ecmfile->fetch(0, '', $rel_filetodelete);
-        				    if ($result >= 0 && $ecmfile->id > 0)
-        				    {
-        				        $result = $ecmfile->delete($user);
-        				    }
-        				    if ($result < 0)
-        				    {
-        				        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-        				    }
-    				    }
+						dol_syslog("Removed file ".$filename, LOG_DEBUG);
+
+						// Delete entry into ecm database
+						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
+						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						{
+							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+
+							dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+							$ecmfile=new EcmFiles($db);
+							$result = $ecmfile->fetch(0, '', $rel_filetodelete);
+							if ($result >= 0 && $ecmfile->id > 0)
+							{
+								$result = $ecmfile->delete($user);
+							}
+							if ($result < 0)
+							{
+								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+							}
+						}
 					}
 					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
@@ -1207,12 +1207,12 @@ 
 	// We refuse transversal using .. and pipes into filenames.
 	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
 	{
-        dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
-	    return False;
+		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
+		return False;
 	}
 
-    $dir_osencoded=dol_osencode($dir);
-    return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
+	$dir_osencoded=dol_osencode($dir);
+	return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
 }
 
 /**
@@ -1227,42 +1227,42 @@ 
  */
 function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
 {
-    dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
-    if (dol_is_dir($dir))
-    {
-        $dir_osencoded=dol_osencode($dir);
-        if ($handle = opendir("$dir_osencoded"))
-        {
-            while (false !== ($item = readdir($handle)))
-            {
-                if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
-
-                if ($item != "." && $item != "..")
-                {
-                    if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
-                    {
-                        $count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-                    }
-                    else
-                    {
-                        $result=dol_delete_file("$dir/$item", 1, $nophperrors);
-                        $count++;
-                        if ($result) $countdeleted++;
-                    }
-                }
-            }
-            closedir($handle);
+	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
+	if (dol_is_dir($dir))
+	{
+		$dir_osencoded=dol_osencode($dir);
+		if ($handle = opendir("$dir_osencoded"))
+		{
+			while (false !== ($item = readdir($handle)))
+			{
+				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
 
-            if (empty($onlysub))
-            {
-	            $result=dol_delete_dir($dir, $nophperrors);
-	            $count++;
-    	        if ($result) $countdeleted++;
-            }
-        }
-    }
+				if ($item != "." && $item != "..")
+				{
+					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
+					{
+						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
+					}
+					else
+					{
+						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
+						$count++;
+						if ($result) $countdeleted++;
+					}
+				}
+			}
+			closedir($handle);
 
-    return $count;
+			if (empty($onlysub))
+			{
+				$result=dol_delete_dir($dir, $nophperrors);
+				$count++;
+				if ($result) $countdeleted++;
+			}
+		}
+	}
+
+	return $count;
 }
 
 
@@ -1279,15 +1279,15 @@ 
 	// Define parent dir of elements
 	$element = $object->element;
 
-    if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-    elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-    elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-    elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-    elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-    elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
+	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
+	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
+	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
+	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
+	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
+	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
 
-    if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
@@ -1425,7 +1425,7 @@ 
 			$listofmimes[]=dol_mimetype($val['name']);
 		}
 	}
-    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
 	$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
 	$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
 	$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
@@ -1500,14 +1500,14 @@ 
 					{
 						if (image_format_supported($destfull) == 1)
 						{
-						    // Create thumbs
-						    // We can't use $object->addThumbs here because there is no $object known
-
-						    // Used on logon for example
-						    $imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-						    // Create mini thumbs for image (Ratio is near 16/9)
-						    // Used on menu or for setup page for example
-						    $imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+							// Create thumbs
+							// We can't use $object->addThumbs here because there is no $object known
+
+							// Used on logon for example
+							$imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+							// Create mini thumbs for image (Ratio is near 16/9)
+							// Used on menu or for setup page for example
+							$imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
 						}
 					}
 
@@ -1523,29 +1523,29 @@ 
 					// Update table of files
 					if ($donotupdatesession)
 					{
-					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-
-					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-					    {
-					        $filename = basename($destfile);
-					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-    					    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-    					    $ecmfile=new EcmFiles($db);
-    					    $ecmfile->filepath = $rel_dir;
-    					    $ecmfile->filename = $filename;
-    					    $ecmfile->label = md5_file(dol_osencode($destfull));	// MD5 of file content
-    					    $ecmfile->fullpath_orig = $TFile['name'][$i];
-    					    $ecmfile->gen_or_uploaded = 'uploaded';
-    					    $ecmfile->description = '';    // indexed content
-    					    $ecmfile->keyword = '';        // keyword content
-    					    $result = $ecmfile->create($user);
-                            if ($result < 0)
-                            {
-                                setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-                            }
-					    }
+						$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+
+						if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+						{
+							$filename = basename($destfile);
+							$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+							$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+							$ecmfile=new EcmFiles($db);
+							$ecmfile->filepath = $rel_dir;
+							$ecmfile->filename = $filename;
+							$ecmfile->label = md5_file(dol_osencode($destfull));	// MD5 of file content
+							$ecmfile->fullpath_orig = $TFile['name'][$i];
+							$ecmfile->gen_or_uploaded = 'uploaded';
+							$ecmfile->description = '';    // indexed content
+							$ecmfile->keyword = '';        // keyword content
+							$result = $ecmfile->create($user);
+							if ($result < 0)
+							{
+								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+							}
+						}
 					}
 
 					$res = 1;
@@ -1616,7 +1616,7 @@ 
 	$listofpaths=array();
 	$listofnames=array();
 	$listofmimes=array();
-    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
 	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
 	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
 	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
@@ -1706,48 +1706,48 @@ 
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
-    $foundhandler=0;
-
-    try
-    {
-        $data = implode("", file(dol_osencode($inputfile)));
-        if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-        elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-        elseif ($mode == 'zip')
-        {
-            if (defined('ODTPHP_PATHTOPCLZIP'))
-            {
-                $foundhandler=1;
+	$foundhandler=0;
 
-                include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
-                $archive = new PclZip($outputfile);
-                $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
-                //$archive->add($inputfile);
-                return 1;
-            }
-        }
-
-        if ($foundhandler)
-        {
-            $fp = fopen($outputfile, "w");
-            fwrite($fp, $compressdata);
-            fclose($fp);
-            return 1;
-        }
-        else
-        {
-            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
-            return -2;
-        }
-    }
-    catch (Exception $e)
-    {
-        global $langs, $errormsg;
-        $langs->load("errors");
-        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
-        return -1;
-    }
+	try
+	{
+		$data = implode("", file(dol_osencode($inputfile)));
+		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
+		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
+		elseif ($mode == 'zip')
+		{
+			if (defined('ODTPHP_PATHTOPCLZIP'))
+			{
+				$foundhandler=1;
+
+				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+				$archive = new PclZip($outputfile);
+				$archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
+				//$archive->add($inputfile);
+				return 1;
+			}
+		}
+
+		if ($foundhandler)
+		{
+			$fp = fopen($outputfile, "w");
+			fwrite($fp, $compressdata);
+			fclose($fp);
+			return 1;
+		}
+		else
+		{
+			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+			return -2;
+		}
+	}
+	catch (Exception $e)
+	{
+		global $langs, $errormsg;
+		$langs->load("errors");
+		dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+		$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+		return -1;
+	}
 }
 
 /**
@@ -1759,17 +1759,17 @@ 
  */
 function dol_uncompress($inputfile,$outputdir)
 {
-    global $langs;
-
-    if (defined('ODTPHP_PATHTOPCLZIP'))
-    {
-    	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
-        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
-        $archive = new PclZip($inputfile);
-        $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
-        //var_dump($result);
-        if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-        else
+	global $langs;
+
+	if (defined('ODTPHP_PATHTOPCLZIP'))
+	{
+		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+		$archive = new PclZip($inputfile);
+		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
+		//var_dump($result);
+		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
+		else
 		{
 			$ok=1; $errmsg='';
 			// Loop on each file to check result for unzipping file
@@ -1787,26 +1787,26 @@ 
 			if ($ok) return array();
 			else return array('error'=>$errmsg);
 		}
-    }
-
-    if (class_exists('ZipArchive'))
-    {
-    	dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
-    	$zip = new ZipArchive;
-        $res = $zip->open($inputfile);
-        if ($res === TRUE)
-        {
-            $zip->extractTo($outputdir.'/');
-            $zip->close();
-            return array();
-        }
-        else
-        {
-            return array('error'=>'ErrUnzipFails');
-        }
-    }
-
-    return array('error'=>'ErrNoZipEngine');
+	}
+
+	if (class_exists('ZipArchive'))
+	{
+		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
+		$zip = new ZipArchive;
+		$res = $zip->open($inputfile);
+		if ($res === TRUE)
+		{
+			$zip->extractTo($outputdir.'/');
+			$zip->close();
+			return array();
+		}
+		else
+		{
+			return array('error'=>'ErrUnzipFails');
+		}
+	}
+
+	return array('error'=>'ErrNoZipEngine');
 }
 
 
@@ -1820,25 +1820,25 @@ 
  */
 function dol_compress_dir($inputdir, $outputfile, $mode="zip")
 {
-    $foundhandler=0;
+	$foundhandler=0;
 
-    dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
+	dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
 
-    if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
-    {
-    	global $langs, $errormsg;
-    	$langs->load("errors");
-    	$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+	if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
+	{
+		global $langs, $errormsg;
+		$langs->load("errors");
+		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
 		return -3;
-    }
-
-    try
-    {
-        if ($mode == 'gz')     { $foundhandler=0; }
-        elseif ($mode == 'bz') { $foundhandler=0; }
-        elseif ($mode == 'zip')
-        {
-            /*if (defined('ODTPHP_PATHTOPCLZIP'))
+	}
+
+	try
+	{
+		if ($mode == 'gz')     { $foundhandler=0; }
+		elseif ($mode == 'bz') { $foundhandler=0; }
+		elseif ($mode == 'zip')
+		{
+			/*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
                 $foundhandler=0;        // TODO implement this
 
@@ -1849,61 +1849,61 @@ 
                 return 1;
             }
             else*/
-            if (class_exists('ZipArchive'))
-            {
-                $foundhandler=1;
-
-                // Initialize archive object
-                $zip = new ZipArchive();
-                $result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-                // Create recursive directory iterator
-                /** @var SplFileInfo[] $files */
-                $files = new RecursiveIteratorIterator(
-                    new RecursiveDirectoryIterator($inputdir),
-                    RecursiveIteratorIterator::LEAVES_ONLY
-                    );
-
-                foreach ($files as $name => $file)
-                {
-                    // Skip directories (they would be added automatically)
-                    if (!$file->isDir())
-                    {
-                        // Get real and relative path for current file
-                        $filePath = $file->getRealPath();
-                        $relativePath = substr($filePath, strlen($inputdir) + 1);
-
-                        // Add current file to archive
-                        $zip->addFile($filePath, $relativePath);
-                    }
-                }
-
-                // Zip archive will be created only after closing object
-                $zip->close();
+			if (class_exists('ZipArchive'))
+			{
+				$foundhandler=1;
 
-                return 1;
-            }
-        }
-
-        if (! $foundhandler)
-        {
-            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
-            return -2;
-        }
-        else
-        {
-        	return 0;
-        }
-    }
-    catch (Exception $e)
-    {
-        global $langs, $errormsg;
-        $langs->load("errors");
-        dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
-        dol_syslog($e->getMessage(), LOG_ERR);
-        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
-        return -1;
-    }
+				// Initialize archive object
+				$zip = new ZipArchive();
+				$result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+
+				// Create recursive directory iterator
+				/** @var SplFileInfo[] $files */
+				$files = new RecursiveIteratorIterator(
+					new RecursiveDirectoryIterator($inputdir),
+					RecursiveIteratorIterator::LEAVES_ONLY
+					);
+
+				foreach ($files as $name => $file)
+				{
+					// Skip directories (they would be added automatically)
+					if (!$file->isDir())
+					{
+						// Get real and relative path for current file
+						$filePath = $file->getRealPath();
+						$relativePath = substr($filePath, strlen($inputdir) + 1);
+
+						// Add current file to archive
+						$zip->addFile($filePath, $relativePath);
+					}
+				}
+
+				// Zip archive will be created only after closing object
+				$zip->close();
+
+				return 1;
+			}
+		}
+
+		if (! $foundhandler)
+		{
+			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+			return -2;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	catch (Exception $e)
+	{
+		global $langs, $errormsg;
+		$langs->load("errors");
+		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+		dol_syslog($e->getMessage(), LOG_ERR);
+		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+		return -1;
+	}
 }
 
 
@@ -1920,8 +1920,8 @@ 
  */
 function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false,$mode='')
 {
-    $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
-    return $tmparray[0];
+	$tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
+	return $tmparray[0];
 }
 
 /**
@@ -1951,7 +1951,7 @@ 
 	$sqlprotectagainstexternals='';
 	$ret=array();
 
-    // Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
+	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
 	if (empty($refname)) $refname=basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
@@ -1960,20 +1960,20 @@ 
 	$lire='lire'; $read='read'; $download='download';
 	if ($mode == 'write')
 	{
-	    $lire='creer'; $read='write'; $download='upload';
+		$lire='creer'; $read='write'; $download='upload';
 	}
 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
-	    $accessallowed=1;
-	    $original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
+		$accessallowed=1;
+		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
-	    $accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
-	    $original_file=$dolibarr_main_data_root.'/'.$original_file;
+		$accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+		$original_file=$dolibarr_main_data_root.'/'.$original_file;
 	}
 	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
@@ -1982,8 +1982,8 @@ 
 		$tmp=explode(',', $dolibarr_main_document_root_alt);
 		$dirins = $tmp[0];
 
-	    $accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
-	    $original_file=$dirins.'/'.$original_file;
+		$accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
+		$original_file=$dirins.'/'.$original_file;
 	}
 	// Wrapping for some images
 	elseif (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
@@ -2024,38 +2024,38 @@ 
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-	    if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
-	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-	    if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
-	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
+		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+		$original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
-	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-	    if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
-	    $original_file=$conf->expensereport->dir_output.'/'.$original_file;
+		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
@@ -2181,13 +2181,13 @@ 
 	// Wrapping for users
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
-        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-        if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
-        if ($canreaduser || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->user->dir_output.'/'.$original_file;
+		$canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
+		if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
+		if ($canreaduser || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->user->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for third parties
@@ -2224,67 +2224,67 @@ 
 	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
-	    if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_invoices')
 	{
-	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_expensereport')
 	{
-	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_interventions')
 	{
-	    if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
-	    if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
-	    if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-	    {
-	        $accessallowed=1;
-	    }
-	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
@@ -2577,15 +2577,15 @@ 
 		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
-    // GENERIC Wrapping
-    // If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
-    // If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
-    // If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
-    // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
-    else
+	// GENERIC Wrapping
+	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
+	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
+	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
+	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
+	else
 	{
-	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-	    if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) $accessallowed=1;    // If user is admin
 
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
@@ -2595,7 +2595,7 @@ 
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		}
 		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
@@ -2605,7 +2605,7 @@ 
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
 		}
 		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
@@ -2615,7 +2615,7 @@ 
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
 		}
 		else
@@ -2679,10 +2679,10 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-    if (! dol_is_dir($directory)) dol_mkdir($directory);
-    $cachefile = $directory . $filename;
-    file_put_contents($cachefile, serialize($object), LOCK_EX);
-    @chmod($cachefile, 0644);
+	if (! dol_is_dir($directory)) dol_mkdir($directory);
+	$cachefile = $directory . $filename;
+	file_put_contents($cachefile, serialize($object), LOCK_EX);
+	@chmod($cachefile, 0644);
 }
 
 /**
@@ -2695,10 +2695,10 @@ 
  */
 function dol_cache_refresh($directory, $filename, $cachetime)
 {
-    $now = dol_now();
-    $cachefile = $directory . $filename;
-    $refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
-    return $refresh;
+	$now = dol_now();
+	$cachefile = $directory . $filename;
+	$refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
+	return $refresh;
 }
 
 /**
@@ -2710,7 +2710,7 @@ 
  */
 function dol_readcachefile($directory, $filename)
 {
-    $cachefile = $directory . $filename;
-    $object = unserialize(file_get_contents($cachefile));
-    return $object;
+	$cachefile = $directory . $filename;
+	$object = unserialize(file_get_contents($cachefile));
+	return $object;
 }

Spacing +558 added lines, -558 removed lines

@@ -34,7 +34,7 @@ 
  */
 function dol_basename($pathfile)
 {
-    return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
+    return preg_replace('/^.*\/([^\/]+)$/', '$1', rtrim($pathfile, '/'));
 }
 
 /**
@@ -55,7 +55,7 @@ 
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  *  @see dol_dir_list_indatabase
  */
-function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter="", $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="")
+function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = "", $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "")
 {
 	global $db, $hookmanager;
 	global $object;
@@ -63,23 +63,23 @@ 
 	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
 	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
 
-	$loaddate=($mode==1||$mode==2)?true:false;
-	$loadsize=($mode==1||$mode==3)?true:false;
+	$loaddate = ($mode == 1 || $mode == 2) ?true:false;
+	$loadsize = ($mode == 1 || $mode == 3) ?true:false;
 
 	// Clean parameters
-	$path=preg_replace('/([\\/]+)$/i','',$path);
-	$newpath=dol_osencode($path);
+	$path = preg_replace('/([\\/]+)$/i', '', $path);
+	$newpath = dol_osencode($path);
 
 	$reshook = 0;
 	$file_list = array();
 
-	if (is_object($hookmanager) && ! $nohook)
+	if (is_object($hookmanager) && !$nohook)
 	{
-	    $hookmanager->resArray=array();
+	    $hookmanager->resArray = array();
 
 	    $hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array(
+		$parameters = array(
 				'path' => $newpath,
 				'types'=> $types,
 				'recursive' => $recursive,
@@ -91,61 +91,61 @@ 
 				'loadsize' => $loadsize,
 				'mode' => $mode
 		);
-		$reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('getDirList', $parameters, $object);
 	}
 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (!is_dir($newpath)) return array();
 
 		if ($dir = opendir($newpath))
 		{
-			$filedate='';
-			$filesize='';
+			$filedate = '';
+			$filesize = '';
 
 			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+				if (!utf8_check($file)) $file = utf8_encode($file); // To be sure data is stored in utf8 in memory
 
-				$qualified=1;
+				$qualified = 1;
 
 				// Define excludefilterarray
-				$excludefilterarray=array('^\.');
+				$excludefilterarray = array('^\.');
 				if (is_array($excludefilter))
 				{
-					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
+				else if ($excludefilter) $excludefilterarray[] = $excludefilter;
 				// Check if file is qualified
-				foreach($excludefilterarray as $filt)
+				foreach ($excludefilterarray as $filt)
 				{
-					if (preg_match('/'.$filt.'/i',$file)) {
-						$qualified=0; break;
+					if (preg_match('/'.$filt.'/i', $file)) {
+						$qualified = 0; break;
 					}
 				}
 
 				if ($qualified)
 				{
-					$isdir=is_dir(dol_osencode($path."/".$file));
+					$isdir = is_dir(dol_osencode($path."/".$file));
 					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
+					if ($isdir && (($types == "directories") || ($types == "all") || $recursive))
 					{
 						// Add entry into file_list array
-						if (($types=="directories") || ($types=="all"))
+						if (($types == "directories") || ($types == "all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
+							if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into all $path, only into $file part
 							{
-								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-								$level1name=(isset($reg[1])?$reg[1]:'');
+								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+								$level1name = (isset($reg[1]) ? $reg[1] : '');
 								$file_list[] = array(
 										"name" => $file,
 										"path" => $path,
 										"level1name" => $level1name,
-										"relativename" => ($relativename?$relativename.'/':'').$file,
+										"relativename" => ($relativename ? $relativename.'/' : '').$file,
 										"fullname" => $path.'/'.$file,
 										"date" => $filedate,
 										"size" => $filesize,
@@ -157,24 +157,24 @@ 
 						// if we're in a directory and we want recursive behavior, call this function again
 						if ($recursive)
 						{
-							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename?$relativename.'/':'').$file));
+							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename ? $relativename.'/' : '').$file));
 						}
 					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					else if (!$isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
+						if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into $path, only into $file
 						{
-							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-							$level1name=(isset($reg[1])?$reg[1]:'');
+							preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+							$level1name = (isset($reg[1]) ? $reg[1] : '');
 							$file_list[] = array(
 									"name" => $file,
 									"path" => $path,
 									"level1name" => $level1name,
-									"relativename" => ($relativename?$relativename.'/':'').$file,
+									"relativename" => ($relativename ? $relativename.'/' : '').$file,
 									"fullname" => $path.'/'.$file,
 									"date" => $filedate,
 									"size" => $filesize,
@@ -187,12 +187,12 @@ 
 			closedir($dir);
 
 			// Obtain a list of columns
-			if (! empty($sortcriteria))
+			if (!empty($sortcriteria))
 			{
-				$myarray=array();
+				$myarray = array();
 				foreach ($file_list as $key => $row)
 				{
-					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+					$myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
 				}
 				// Sort the data
 				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
@@ -219,20 +219,20 @@ 
  *  @return	array						Array of array('name'=>'xxx','fullname'=>'/abc/xxx','type'=>'dir|file',...)
  *  @see dol_dir_list
  */
-function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
+function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0)
 {
     global $conf, $db;
 
-    $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
-    if ($mode) $sql.=", description";
-    $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
-    $sql.=" WHERE filepath = '".$db->escape($path)."'";
-    $sql.=" AND entity = ".$conf->entity;
+    $sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
+    if ($mode) $sql .= ", description";
+    $sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
+    $sql .= " WHERE filepath = '".$db->escape($path)."'";
+    $sql .= " AND entity = ".$conf->entity;
 
     $resql = $db->query($sql);
     if ($resql)
     {
-        $file_list=array();
+        $file_list = array();
         $num = $db->num_rows($resql);
         $i = 0;
         while ($i < $num)
@@ -240,11 +240,11 @@ 
             $obj = $db->fetch_object($resql);
             if ($obj)
             {
-                preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
-                $level1name=(isset($reg[1])?$reg[1]:'');
+                preg_match('/([^\/]+)\/[^\/]+$/', DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename, $reg);
+                $level1name = (isset($reg[1]) ? $reg[1] : '');
                 $file_list[] = array(
                     "rowid" => $obj->rowid,
-                    "label" => $obj->label,         // md5
+                    "label" => $obj->label, // md5
     				"name" => $obj->filename,
     				"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
                     "level1name" => $level1name,
@@ -263,12 +263,12 @@ 
         }
 
         // Obtain a list of columns
-        if (! empty($sortcriteria))
+        if (!empty($sortcriteria))
         {
-            $myarray=array();
+            $myarray = array();
             foreach ($file_list as $key => $row)
             {
-                $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+                $myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
             }
             // Sort the data
             if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
@@ -302,37 +302,37 @@ 
 	//var_dump($filearrayindatabase);
 
 	// Complete filearray with properties found into $filearrayindatabase
-	foreach($filearray as $key => $val)
+	foreach ($filearray as $key => $val)
 	{
-		$found=0;
+		$found = 0;
 		// Search if it exists into $filearrayindatabase
-		foreach($filearrayindatabase as $key2 => $val2)
+		foreach ($filearrayindatabase as $key2 => $val2)
 		{
 			if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
 			{
-				$filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
-				$filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
-				$filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
-				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
-				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
-				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
-				$found=1;
+				$filearray[$key]['position_name'] = ($filearrayindatabase[$key2]['position'] ? $filearrayindatabase[$key2]['position'] : '0').'_'.$filearrayindatabase[$key2]['name'];
+				$filearray[$key]['position'] = $filearrayindatabase[$key2]['position'];
+				$filearray[$key]['cover'] = $filearrayindatabase[$key2]['cover'];
+				$filearray[$key]['acl'] = $filearrayindatabase[$key2]['acl'];
+				$filearray[$key]['rowid'] = $filearrayindatabase[$key2]['rowid'];
+				$filearray[$key]['label'] = $filearrayindatabase[$key2]['label'];
+				$found = 1;
 				break;
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (!$found)    // This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
-			$filearray[$key]['cover']=0;
-			$filearray[$key]['acl']='';
+			$filearray[$key]['position'] = '999999'; // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['cover'] = 0;
+			$filearray[$key]['acl'] = '';
 
-			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filearray[$key]['fullname']);
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-				$ecmfile=new EcmFiles($db);
+				$ecmfile = new EcmFiles($db);
 
 				// Add entry into database
 				$filename = basename($rel_filename);
@@ -342,11 +342,11 @@ 
 
 				$ecmfile->filepath = $rel_dir;
 				$ecmfile->filename = $filename;
-				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
+				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname'])); // $destfile is a full path to file
 				$ecmfile->fullpath_orig = $filearray[$key]['fullname'];
 				$ecmfile->gen_or_uploaded = 'unknown';
-				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
+				$ecmfile->description = ''; // indexed content
+				$ecmfile->keyword = ''; // keyword content
 				$result = $ecmfile->create($user);
 				if ($result < 0)
 				{
@@ -354,12 +354,12 @@ 
 				}
 				else
 				{
-					$filearray[$key]['rowid']=$result;
+					$filearray[$key]['rowid'] = $result;
 				}
 			}
 			else
 			{
-				$filearray[$key]['rowid']=0;     // Should not happened
+				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
 	}
@@ -380,10 +380,10 @@ 
 	global $sortorder;
 	global $sortfield;
 
-	$sortorder=strtoupper($sortorder);
+	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }
+	else { $retup = 1; $retdown = -1; }
 
 	if ($sortfield == 'name')
 	{
@@ -411,7 +411,7 @@ 
  */
 function dol_is_dir($folder)
 {
-    $newfolder=dol_osencode($folder);
+    $newfolder = dol_osencode($folder);
     if (is_dir($newfolder)) return true;
     else return false;
 }
@@ -424,7 +424,7 @@ 
  */
 function dol_is_file($pathoffile)
 {
-    $newpathoffile=dol_osencode($pathoffile);
+    $newpathoffile = dol_osencode($pathoffile);
     return is_file($newpathoffile);
 }
 
@@ -436,10 +436,10 @@ 
  */
 function dol_is_url($url)
 {
-    $tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
-    foreach($tmpprot as $prot)
+    $tmpprot = array('file', 'http', 'https', 'ftp', 'zlib', 'data', 'ssh', 'ssh2', 'ogg', 'expect');
+    foreach ($tmpprot as $prot)
     {
-        if (preg_match('/^'.$prot.':/i',$url)) return true;
+        if (preg_match('/^'.$prot.':/i', $url)) return true;
     }
     return false;
 }
@@ -452,7 +452,7 @@ 
  */
 function dol_dir_is_emtpy($folder)
 {
-	$newfolder=dol_osencode($folder);
+	$newfolder = dol_osencode($folder);
 	if (is_dir($newfolder))
 	{
 		$handle = opendir($newfolder);
@@ -461,7 +461,7 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach ($name_array as $temp) $folder_content .= $temp;
 
         closedir($handle);
 
@@ -481,24 +481,24 @@ 
  */
 function dol_count_nb_of_line($file)
 {
-	$nb=0;
+	$nb = 0;
 
-	$newfile=dol_osencode($file);
+	$newfile = dol_osencode($file);
 	//print 'x'.$file;
-	$fp=fopen($newfile,'r');
+	$fp = fopen($newfile, 'r');
 	if ($fp)
 	{
 		while (!feof($fp))
 		{
-			$line=fgets($fp);
+			$line = fgets($fp);
             // We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (!$line === false) $nb++;
 		}
 		fclose($fp);
 	}
 	else
 	{
-		$nb=-1;
+		$nb = -1;
 	}
 
 	return $nb;
@@ -513,7 +513,7 @@ 
  */
 function dol_filesize($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return filesize($newpathoffile);
 }
 
@@ -525,7 +525,7 @@ 
  */
 function dol_filemtime($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
+	$newpathoffile = dol_osencode($pathoffile);
 	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
@@ -540,31 +540,31 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dolCopyr dolReplaceRegExInFile
  */
-function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0)
 {
     global $conf;
 
     dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
     if (empty($srcfile)) return -1;
-    if (empty($destfile)) $destfile=$srcfile;
+    if (empty($destfile)) $destfile = $srcfile;
 
-    $destexists=dol_is_file($destfile);
+    $destexists = dol_is_file($destfile);
     if (($destfile != $srcfile) && $destexists) return 0;
 
-    $tmpdestfile=$destfile.'.tmp';
+    $tmpdestfile = $destfile.'.tmp';
 
-    $newpathofsrcfile=dol_osencode($srcfile);
-    $newpathoftmpdestfile=dol_osencode($tmpdestfile);
-    $newpathofdestfile=dol_osencode($destfile);
-    $newdirdestfile=dirname($newpathofdestfile);
+    $newpathofsrcfile = dol_osencode($srcfile);
+    $newpathoftmpdestfile = dol_osencode($tmpdestfile);
+    $newpathofdestfile = dol_osencode($destfile);
+    $newdirdestfile = dirname($newpathofdestfile);
 
-    if ($destexists && ! is_writable($newpathofdestfile))
+    if ($destexists && !is_writable($newpathofdestfile))
     {
         dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
         return -1;
     }
-    if (! is_writable($newdirdestfile))
+    if (!is_writable($newdirdestfile))
     {
         dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
         return -2;
@@ -573,7 +573,7 @@ 
     dol_delete_file($tmpdestfile);
 
     // Create $newpathoftmpdestfile from $newpathofsrcfile
-    $content=file_get_contents($newpathofsrcfile, 'r');
+    $content = file_get_contents($newpathofsrcfile, 'r');
 
     $content = make_substitutions($content, $arrayreplacement, null);
 
@@ -581,17 +581,17 @@ 
     @chmod($newpathoftmpdestfile, octdec($newmask));
 
     // Rename
-    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
-    if (! $result)
+    $result = dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile) ? 1 : 0), 0, $indexdatabase);
+    if (!$result)
     {
         dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
         return -3;
     }
-    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
     if (empty($newmask))	// This should no happen
     {
         dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
-        $newmask='0664';
+        $newmask = '0664';
     }
 
     @chmod($newpathofdestfile, octdec($newmask));
@@ -610,7 +610,7 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dolCopyr dolReplaceInFile
  */
-function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
+function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0)
 {
 	// TODO
 
@@ -626,7 +626,7 @@ 
  * @return	int							<0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK
  * @see		dolCopyr
  */
-function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
+function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)
 {
 	global $conf;
 
@@ -634,36 +634,36 @@ 
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
-	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	$destexists = dol_is_file($destfile);
+	if (!$overwriteifexists && $destexists) return 0;
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-    $newpathofdestfile=dol_osencode($destfile);
-    $newdirdestfile=dirname($newpathofdestfile);
+	$newpathofsrcfile = dol_osencode($srcfile);
+    $newpathofdestfile = dol_osencode($destfile);
+    $newdirdestfile = dirname($newpathofdestfile);
 
-    if ($destexists && ! is_writable($newpathofdestfile))
+    if ($destexists && !is_writable($newpathofdestfile))
     {
         dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
         return -1;
     }
-    if (! is_writable($newdirdestfile))
+    if (!is_writable($newdirdestfile))
     {
         dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
         return -2;
     }
     // Copy with overwriting if exists
-    $result=@copy($newpathofsrcfile, $newpathofdestfile);
+    $result = @copy($newpathofsrcfile, $newpathofdestfile);
 	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
-	if (! $result)
+	if (!$result)
 	{
 	    dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 	    return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 	if (empty($newmask))	// This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
+		$newmask = '0664';
 	}
 
 	@chmod($newpathofdestfile, octdec($newmask));
@@ -682,44 +682,44 @@ 
  * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null)
 {
 	global $conf;
 
-	$result=0;
+	$result = 0;
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
 	if (empty($srcfile) || empty($destfile)) return -1;
 
-	$destexists=dol_is_dir($destfile);
+	$destexists = dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
-    if (! $destexists)
+    if (!$destexists)
     {
         // We must set mask just before creating dir, becaause it can be set differently by dol_copy
         umask(0);
-        $dirmaskdec=octdec($newmask);
-        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-        $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+        $dirmaskdec = octdec($newmask);
+        if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+        $dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
         dol_mkdir($destfile, '', decoct($dirmaskdec));
     }
 
-	$ossrcfile=dol_osencode($srcfile);
-	$osdestfile=dol_osencode($destfile);
+	$ossrcfile = dol_osencode($srcfile);
+	$osdestfile = dol_osencode($destfile);
 
     // Recursive function to copy all subdirectories and contents:
 	if (is_dir($ossrcfile))
 	{
-        $dir_handle=opendir($ossrcfile);
-        while ($file=readdir($dir_handle))
+        $dir_handle = opendir($ossrcfile);
+        while ($file = readdir($dir_handle))
         {
-            if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
+            if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file))
             {
                 if (is_dir($ossrcfile."/".$file))
                 {
                     //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+                    $tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
                 }
                 else
 				{
@@ -727,12 +727,12 @@ 
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
 					{
-						foreach($arrayreplacement as $key => $val)
+						foreach ($arrayreplacement as $key => $val)
 						{
 							$newfile = str_replace($key, $val, $newfile);
 						}
 					}
-                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
+                    $tmpresult = dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
                 }
                 // Set result
                 if ($result > 0 && $tmpresult >= 0)
@@ -741,7 +741,7 @@ 
                 }
                 else
                 {
-                    $result=$tmpresult;
+                    $result = $tmpresult;
                 }
                 if ($result < 0) break;
 
@@ -775,31 +775,31 @@ 
  * @return  boolean 		            True if OK, false if KO
  * @see dol_move_uploaded_file
  */
-function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
+function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1)
 {
     global $user, $db, $conf;
-    $result=false;
+    $result = false;
 
     dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
-    $srcexists=dol_is_file($srcfile);
-    $destexists=dol_is_file($destfile);
+    $srcexists = dol_is_file($srcfile);
+    $destexists = dol_is_file($destfile);
 
-    if (! $srcexists)
+    if (!$srcexists)
     {
         dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
         return false;
     }
 
-    if ($overwriteifexists || ! $destexists)
+    if ($overwriteifexists || !$destexists)
     {
-        $newpathofsrcfile=dol_osencode($srcfile);
-        $newpathofdestfile=dol_osencode($destfile);
+        $newpathofsrcfile = dol_osencode($srcfile);
+        $newpathofdestfile = dol_osencode($destfile);
 
         // Check virus
-        $testvirusarray=array();
+        $testvirusarray = array();
         if ($testvirus)
         {
-            $testvirusarray=dolCheckVirus($newpathofsrcfile);
+            $testvirusarray = dolCheckVirus($newpathofsrcfile);
             if (count($testvirusarray))
             {
                 dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
@@ -807,15 +807,15 @@ 
             }
         }
 
-        $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-        if (! $result)
+        $result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+        if (!$result)
         {
         	if ($destexists)
         	{
         		dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
         		// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
         		dol_delete_file($destfile);
-        		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+        		$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
         	}
         	else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
         }
@@ -824,9 +824,9 @@ 
         if ($result && $indexdatabase)
         {
             // Rename entry into ecm database
-            $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
-            $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $srcfile);
+            $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $destfile);
+            if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
             {
                 $rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
                 $rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
@@ -835,14 +835,14 @@ 
                 dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
                 include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 
-                $ecmfiletarget=new EcmFiles($db);
+                $ecmfiletarget = new EcmFiles($db);
                 $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
                 if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
                 {
                     $ecmfiletarget->delete($user);
                 }
 
-                $ecmfile=new EcmFiles($db);
+                $ecmfile = new EcmFiles($db);
                 $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
                 if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
                 {
@@ -864,11 +864,11 @@ 
 
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
-                    $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+                    $ecmfile->label = md5_file(dol_osencode($destfile)); // $destfile is a full path to file
                     $ecmfile->fullpath_orig = $srcfile;
                     $ecmfile->gen_or_uploaded = 'unknown';
-                    $ecmfile->description = '';    // indexed content
-                    $ecmfile->keyword = '';        // keyword content
+                    $ecmfile->description = ''; // indexed content
+                    $ecmfile->keyword = ''; // keyword content
                     $resultecm = $ecmfile->create($user);
                     if ($resultecm < 0)
                     {
@@ -880,13 +880,13 @@ 
                     setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                 }
 
-                if ($resultecm > 0) $result=true;
+                if ($resultecm > 0) $result = true;
                 else $result = false;
             }
         }
 
-        if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
-        $newmaskdec=octdec($newmask);
+        if (empty($newmask)) $newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;
+        $newmaskdec = octdec($newmask);
         // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
         // to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
         // if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
@@ -922,16 +922,16 @@ 
 {
     global $conf;
 
-    if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+    if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
     {
-        if (! class_exists('AntiVir')) {
+        if (!class_exists('AntiVir')) {
             require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
         }
-        $antivir=new AntiVir($db);
+        $antivir = new AntiVir($db);
         $result = $antivir->dol_avscan_file($src_file);
         if ($result < 0)	// If virus or error, we stop here
         {
-            $reterrors=$antivir->errors;
+            $reterrors = $antivir->errors;
             return $reterrors;
         }
     }
@@ -957,20 +957,20 @@ 
  *	@return int       			  		>0 if OK, <0 or string if KO
  *  @see    dol_move
  */
-function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $nohook=0, $varfiles='addedfile')
+function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan = 0, $uploaderrorcode = 0, $nohook = 0, $varfiles = 'addedfile')
 {
 	global $conf, $db, $user, $langs;
 	global $object, $hookmanager;
 
-	$reshook=0;
+	$reshook = 0;
 	$file_name = $dest_file;
 
 	if (empty($nohook))
 	{
-		$reshook=$hookmanager->initHooks(array('fileslib'));
+		$reshook = $hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
-		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
+		$parameters = array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
+		$reshook = $hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
 
 	if (empty($reshook))
@@ -978,7 +978,7 @@ 
     	// If an upload error has been reported
     	if ($uploaderrorcode)
     	{
-    	    switch($uploaderrorcode)
+    	    switch ($uploaderrorcode)
     	    {
     	        case UPLOAD_ERR_INI_SIZE:	// 1
     	            return 'ErrorFileSizeTooLarge';
@@ -1006,25 +1006,25 @@ 
     	// If we need to make a virus scan
     	if (empty($disablevirusscan) && file_exists($src_file))
     	{
-    	    $checkvirusarray=dolCheckVirus($src_file);
+    	    $checkvirusarray = dolCheckVirus($src_file);
     	    if (count($checkvirusarray))
     	    {
-    	       dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
-    	       return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+    	       dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',', $checkvirusarray), LOG_WARNING);
+    	       return 'ErrorFileIsInfectedWithAVirus: '.join(',', $checkvirusarray);
     	    }
     	}
 
     	// Security:
     	// Disallow file with some extensions. We rename them.
     	// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-    	if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+    	if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i', $dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
     	{
-    	    $file_name.= '.noexe';
+    	    $file_name .= '.noexe';
     	}
 
     	// Security:
     	// We refuse cache files/dirs, upload using .. and pipes into filenames.
-    	if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+    	if (preg_match('/^\./', $src_file) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))
     	{
     	    dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
     	    return -1;
@@ -1032,7 +1032,7 @@ 
 
     	// Security:
     	// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-    	if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+    	if (preg_match('/^\./', $dest_file) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))
     	{
     	    dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
     	    return -2;
@@ -1042,20 +1042,20 @@ 
 	if ($reshook < 0)	// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
 	}
 	elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
-		$src_file_osencoded=dol_osencode($src_file);
-		$file_name_osencoded=dol_osencode($file_name);
+		$src_file_osencoded = dol_osencode($src_file);
+		$file_name_osencoded = dol_osencode($file_name);
 
 		// Check if destination dir is writable
 		// TODO
 
 		// Check if destination file already exists
-		if (! $allowoverwrite)
+		if (!$allowoverwrite)
 		{
 			if (file_exists($file_name_osencoded))
 			{
@@ -1065,21 +1065,21 @@ 
 		}
 
 		// Move file
-		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
+		$return = move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
-			return 1;	// Success
+			return 1; // Success
 		}
 		else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
-			return -3;	// Unknown error
+			return -3; // Unknown error
 		}
 	}
 
-	return 1;	// Success
+	return 1; // Success
 }
 
 /**
@@ -1094,7 +1094,7 @@ 
  *  @return boolean         		True if no error (file is deleted or if glob is used and there's nothing to delete), False if error
  *  @see dol_delete_dir
  */
-function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=null)
+function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0, $object = null)
 {
 	global $db, $conf, $user, $langs;
 	global $hookmanager;
@@ -1106,7 +1106,7 @@ 
 
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$file) || preg_match('/[<>|]/',$file))
+	if (preg_match('/\.\./', $file) || preg_match('/[<>|]/', $file))
 	{
         dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 	    return False;
@@ -1116,13 +1116,13 @@ 
 	{
 		$hookmanager->initHooks(array('fileslib'));
 
-		$parameters=array(
+		$parameters = array(
 				'GET' => $_GET,
 				'file' => $file,
 				'disableglob'=> $disableglob,
 				'nophperrors' => $nophperrors
 		);
-		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
 	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
@@ -1132,35 +1132,35 @@ 
 	}
 	else
 	{
-		$error=0;
+		$error = 0;
 
 		//print "x".$file." ".$disableglob;exit;
-		$file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
-		if (empty($disableglob) && ! empty($file_osencoded))
+		$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
+		if (empty($disableglob) && !empty($file_osencoded))
 		{
-			$ok=true;
-			$globencoded=str_replace('[','\[',$file_osencoded);
-			$globencoded=str_replace(']','\]',$globencoded);
-			$listofdir=glob($globencoded);
-			if (! empty($listofdir) && is_array($listofdir))
+			$ok = true;
+			$globencoded = str_replace('[', '\[', $file_osencoded);
+			$globencoded = str_replace(']', '\]', $globencoded);
+			$listofdir = glob($globencoded);
+			if (!empty($listofdir) && is_array($listofdir))
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) $ok = @unlink($filename);
+					else $ok = unlink($filename);
 					if ($ok)
 					{
 					    dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 	                    // Delete entry into ecm database
-    				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-    				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+    				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filename);
+    				    if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
     				    {
     				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
 
     				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
         				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-        				    $ecmfile=new EcmFiles($db);
+        				    $ecmfile = new EcmFiles($db);
         				    $result = $ecmfile->fetch(0, '', $rel_filetodelete);
         				    if ($result >= 0 && $ecmfile->id > 0)
         				    {
@@ -1181,9 +1181,9 @@ 
 		}
 		else
 		{
-			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
+			$ok = false;
+			if ($nophperrors) $ok = @unlink($file_osencoded);
+			else $ok = unlink($file_osencoded);
 			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
 			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
 		}
@@ -1201,18 +1201,18 @@ 
  *  @return boolean         		True if success, false if error
  *  @see dol_delete_file
  */
-function dol_delete_dir($dir,$nophperrors=0)
+function dol_delete_dir($dir, $nophperrors = 0)
 {
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
+	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir))
 	{
         dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 	    return False;
 	}
 
-    $dir_osencoded=dol_osencode($dir);
-    return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
+    $dir_osencoded = dol_osencode($dir);
+    return ($nophperrors ? @rmdir($dir_osencoded) : rmdir($dir_osencoded));
 }
 
 /**
@@ -1225,27 +1225,27 @@ 
  *  @param  int		$countdeleted   Counter to count nb of elements found really deleted
  *  @return int             		Number of files and directory we try to remove. NB really removed is returned into $countdeleted.
  */
-function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
+function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub = 0, &$countdeleted = 0)
 {
-    dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
+    dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir, LOG_DEBUG);
     if (dol_is_dir($dir))
     {
-        $dir_osencoded=dol_osencode($dir);
+        $dir_osencoded = dol_osencode($dir);
         if ($handle = opendir("$dir_osencoded"))
         {
             while (false !== ($item = readdir($handle)))
             {
-                if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+                if (!utf8_check($item)) $item = utf8_encode($item); // should be useless
 
                 if ($item != "." && $item != "..")
                 {
-                    if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
+                    if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
                     {
-                        $count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
+                        $count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
                     }
                     else
                     {
-                        $result=dol_delete_file("$dir/$item", 1, $nophperrors);
+                        $result = dol_delete_file("$dir/$item", 1, $nophperrors);
                         $count++;
                         if ($result) $countdeleted++;
                     }
@@ -1255,7 +1255,7 @@ 
 
             if (empty($onlysub))
             {
-	            $result=dol_delete_dir($dir, $nophperrors);
+	            $result = dol_delete_dir($dir, $nophperrors);
 	            $count++;
     	        if ($result) $countdeleted++;
             }
@@ -1274,7 +1274,7 @@ 
  */
 function dol_delete_preview($object)
 {
-	global $langs,$conf;
+	global $langs, $conf;
 
 	// Define parent dir of elements
 	$element = $object->element;
@@ -1285,20 +1285,20 @@ 
     elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
     elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
     elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+    else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
 
     if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
 
 	$refsan = dol_sanitizeFileName($object->ref);
-	$dir = $dir . "/" . $refsan ;
-	$file = $dir . "/" . $refsan . ".pdf.png";
-	$multiple = $file . ".";
+	$dir = $dir."/".$refsan;
+	$file = $dir."/".$refsan.".pdf.png";
+	$multiple = $file.".";
 
 	if (file_exists($file) && is_writable($file))
 	{
-		if (! dol_delete_file($file,1))
+		if (!dol_delete_file($file, 1))
 		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$file);
+			$object->error = $langs->trans("ErrorFailedToDeleteFile", $file);
 			return 0;
 		}
 	}
@@ -1310,9 +1310,9 @@ 
 
 			if (file_exists($preview) && is_writable($preview))
 			{
-				if ( ! dol_delete_file($preview,1) )
+				if (!dol_delete_file($preview, 1))
 				{
-					$object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
+					$object->error = $langs->trans("ErrorFailedToOpenFile", $preview);
 					return 0;
 				}
 			}
@@ -1335,10 +1335,10 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0; // By default, no metafile.
 
 	// Define parent dir of elements
-	$element=$object->element;
+	$element = $object->element;
 
 	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
 	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
@@ -1346,17 +1346,17 @@ 
 	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
 	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
 	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
 
 	if ($dir)
 	{
 		$object->fetch_thirdparty();
 
 		$objectref = dol_sanitizeFileName($object->ref);
-		$dir = $dir . "/" . $objectref;
-		$file = $dir . "/" . $objectref . ".meta";
+		$dir = $dir."/".$objectref;
+		$file = $dir."/".$objectref.".meta";
 
-		if (! is_dir($dir))
+		if (!is_dir($dir))
 		{
 			dol_mkdir($dir);
 		}
@@ -1364,29 +1364,29 @@ 
 		if (is_dir($dir))
 		{
 			$nblignes = count($object->lines);
-			$client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
-			$meta = "REFERENCE=\"" . $object->ref . "\"
-			DATE=\"" . dol_print_date($object->date,'') . "\"
-			NB_ITEMS=\"" . $nblignes . "\"
-			CLIENT=\"" . $client . "\"
-			AMOUNT_EXCL_TAX=\"" . $object->total_ht . "\"
-			AMOUNT=\"" . $object->total_ttc . "\"\n";
-
-			for ($i = 0 ; $i < $nblignes ; $i++)
+			$client = $object->thirdparty->name." ".$object->thirdparty->address." ".$object->thirdparty->zip." ".$object->thirdparty->town;
+			$meta = "REFERENCE=\"".$object->ref."\"
+			DATE=\"" . dol_print_date($object->date, '')."\"
+			NB_ITEMS=\"" . $nblignes."\"
+			CLIENT=\"" . $client."\"
+			AMOUNT_EXCL_TAX=\"" . $object->total_ht."\"
+			AMOUNT=\"" . $object->total_ttc."\"\n";
+
+			for ($i = 0; $i < $nblignes; $i++)
 			{
 				//Pour les articles
-				$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
-				ITEM_" . $i . "_AMOUNT_WO_TAX=\"" . $object->lines[$i]->total_ht . "\"
-				ITEM_" . $i . "_VAT=\"" .$object->lines[$i]->tva_tx . "\"
-				ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\"
+				$meta .= "ITEM_".$i."_QUANTITY=\"".$object->lines[$i]->qty."\"
+				ITEM_" . $i."_AMOUNT_WO_TAX=\"".$object->lines[$i]->total_ht."\"
+				ITEM_" . $i."_VAT=\"".$object->lines[$i]->tva_tx."\"
+				ITEM_" . $i."_DESCRIPTION=\"".str_replace("\r\n", "", nl2br($object->lines[$i]->desc))."\"
 				";
 			}
 		}
 
-		$fp = fopen($file,"w");
-		fputs($fp,$meta);
+		$fp = fopen($file, "w");
+		fputs($fp, $meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		return 1;
@@ -1409,26 +1409,26 @@ 
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
-function dol_init_file_process($pathtoscan='', $trackid='')
+function dol_init_file_process($pathtoscan = '', $trackid = '')
 {
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
+	$listofpaths = array();
+	$listofnames = array();
+	$listofmimes = array();
 
 	if ($pathtoscan)
 	{
-		$listoffiles=dol_dir_list($pathtoscan,'files');
-		foreach($listoffiles as $key => $val)
+		$listoffiles = dol_dir_list($pathtoscan, 'files');
+		foreach ($listoffiles as $key => $val)
 		{
-			$listofpaths[]=$val['fullname'];
-			$listofnames[]=$val['name'];
-			$listofmimes[]=dol_mimetype($val['name']);
+			$listofpaths[] = $val['fullname'];
+			$listofnames[] = $val['name'];
+			$listofmimes[] = dol_mimetype($val['name']);
 		}
 	}
-    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-	$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-	$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+    $keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+	$_SESSION["listofpaths".$keytoavoidconflict] = join(';', $listofpaths);
+	$_SESSION["listofnames".$keytoavoidconflict] = join(';', $listofnames);
+	$_SESSION["listofmimes".$keytoavoidconflict] = join(';', $listofmimes);
 }
 
 
@@ -1447,13 +1447,13 @@ 
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
  * @return	int                             <=0 if KO, >0 if OK
  */
-function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='', $generatethumbs=1)
+function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1)
 {
-	global $db,$user,$conf,$langs;
+	global $db, $user, $conf, $langs;
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (!empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
 		if (dol_mkdir($upload_dir) >= 0)
@@ -1472,13 +1472,13 @@ 
 			for ($i = 0; $i < $nbfile; $i++)
 			{
 				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull=$upload_dir . "/" . $TFile['name'][$i];
-				$destfile=$TFile['name'][$i];
+				$destfull = $upload_dir."/".$TFile['name'][$i];
+				$destfile = $TFile['name'][$i];
 
 				if ($savingdocmask)
 				{
-					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
+					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
 				}
 
 				// dol_sanitizeFileName the file name and lowercase extension
@@ -1523,23 +1523,23 @@ 
 					// Update table of files
 					if ($donotupdatesession)
 					{
-					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 					    {
 					        $filename = basename($destfile);
 					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
     					    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-    					    $ecmfile=new EcmFiles($db);
+    					    $ecmfile = new EcmFiles($db);
     					    $ecmfile->filepath = $rel_dir;
     					    $ecmfile->filename = $filename;
-    					    $ecmfile->label = md5_file(dol_osencode($destfull));	// MD5 of file content
+    					    $ecmfile->label = md5_file(dol_osencode($destfull)); // MD5 of file content
     					    $ecmfile->fullpath_orig = $TFile['name'][$i];
     					    $ecmfile->gen_or_uploaded = 'uploaded';
-    					    $ecmfile->description = '';    // indexed content
-    					    $ecmfile->keyword = '';        // keyword content
+    					    $ecmfile->description = ''; // indexed content
+    					    $ecmfile->keyword = ''; // keyword content
     					    $result = $ecmfile->create($user);
                             if ($result < 0)
                             {
@@ -1558,7 +1558,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');
 					}
@@ -1571,7 +1571,7 @@ 
 
 		}
 	} elseif ($link) {
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 		$linkObject = new Link($db);
 		$linkObject->entity = $conf->entity;
 		$linkObject->url = $link;
@@ -1606,33 +1606,33 @@ 
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
  */
-function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=1,$trackid='')
+function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletefile = 1, $trackid = '')
 {
-	global $db,$user,$conf,$langs,$_FILES;
+	global $db, $user, $conf, $langs, $_FILES;
 
-	$keytodelete=$filenb;
+	$keytodelete = $filenb;
 	$keytodelete--;
 
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	$listofpaths = array();
+	$listofnames = array();
+	$listofmimes = array();
+    $keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 
 	if ($keytodelete >= 0)
 	{
-		$pathtodelete=$listofpaths[$keytodelete];
-		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		$pathtodelete = $listofpaths[$keytodelete];
+		$filetodelete = $listofnames[$keytodelete];
+		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file
+		else $result = 0;
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
 			{
 				$langs->load("other");
-				setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+				setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 			}
 			if (empty($donotupdatesession))
 			{
@@ -1654,16 +1654,16 @@ 
  *  @param	string	$fileoutput	Output filename
  *  @return	int					<0 if KO, 0=Nothing done, >0 if OK
  */
-function dol_convert_file($fileinput, $ext='png', $fileoutput='')
+function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '')
 {
 	global $langs;
 
 	if (class_exists('Imagick'))
 	{
-		$image=new Imagick();
+		$image = new Imagick();
 		try {
 			$ret = $image->readImage($fileinput);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
 			return 0;
 		}
@@ -1672,7 +1672,7 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) $fileoutput = $fileinput.".".$ext;
 
 				$count = $image->getNumberImages();
 				$ret = $image->writeImages($fileoutput, true);
@@ -1704,20 +1704,20 @@ 
  * @param 	string	$mode			'gz' or 'bz' or 'zip'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_file($inputfile, $outputfile, $mode="gz")
+function dol_compress_file($inputfile, $outputfile, $mode = "gz")
 {
-    $foundhandler=0;
+    $foundhandler = 0;
 
     try
     {
         $data = implode("", file(dol_osencode($inputfile)));
-        if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-        elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
+        if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }
+        elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }
         elseif ($mode == 'zip')
         {
             if (defined('ODTPHP_PATHTOPCLZIP'))
             {
-                $foundhandler=1;
+                $foundhandler = 1;
 
                 include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
                 $archive = new PclZip($outputfile);
@@ -1736,7 +1736,7 @@ 
         }
         else
         {
-            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
             return -2;
         }
     }
@@ -1744,8 +1744,8 @@ 
     {
         global $langs, $errormsg;
         $langs->load("errors");
-        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+        dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+        $errormsg = $langs->trans("ErrorFailedToWriteInDir");
         return -1;
     }
 }
@@ -1757,7 +1757,7 @@ 
  * @param 	string	$outputdir		Target dir name
  * @return 	array					array('error'=>'Error code') or array() if no error
  */
-function dol_uncompress($inputfile,$outputdir)
+function dol_uncompress($inputfile, $outputdir)
 {
     global $langs;
 
@@ -1766,20 +1766,20 @@ 
     	dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
         include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
         $archive = new PclZip($inputfile);
-        $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
+        $result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);
         //var_dump($result);
-        if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
+        if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
         else
 		{
-			$ok=1; $errmsg='';
+			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
-			foreach($result as $key => $val)
+			foreach ($result as $key => $val)
 			{
 				if ($val['status'] == 'path_creation_fail')
 				{
 					$langs->load("errors");
-					$ok=0;
-					$errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
+					$ok = 0;
+					$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);
 					break;
 				}
 			}
@@ -1818,24 +1818,24 @@ 
  * @param 	string	$mode			'zip'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_dir($inputdir, $outputfile, $mode="zip")
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
 {
-    $foundhandler=0;
+    $foundhandler = 0;
 
     dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
 
-    if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
+    if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile)))
     {
     	global $langs, $errormsg;
     	$langs->load("errors");
-    	$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+    	$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
 		return -3;
     }
 
     try
     {
-        if ($mode == 'gz')     { $foundhandler=0; }
-        elseif ($mode == 'bz') { $foundhandler=0; }
+        if ($mode == 'gz') { $foundhandler = 0; }
+        elseif ($mode == 'bz') { $foundhandler = 0; }
         elseif ($mode == 'zip')
         {
             /*if (defined('ODTPHP_PATHTOPCLZIP'))
@@ -1851,7 +1851,7 @@ 
             else*/
             if (class_exists('ZipArchive'))
             {
-                $foundhandler=1;
+                $foundhandler = 1;
 
                 // Initialize archive object
                 $zip = new ZipArchive();
@@ -1885,9 +1885,9 @@ 
             }
         }
 
-        if (! $foundhandler)
+        if (!$foundhandler)
         {
-            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
             return -2;
         }
         else
@@ -1901,7 +1901,7 @@ 
         $langs->load("errors");
         dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
         dol_syslog($e->getMessage(), LOG_ERR);
-        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        $errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
         return -1;
     }
 }
@@ -1918,9 +1918,9 @@ 
  * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  * @return	string						Full path to most recent file
  */
-function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false,$mode='')
+function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
 {
-    $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
+    $tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
     return $tmparray[0];
 }
 
@@ -1936,268 +1936,268 @@ 
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea
  */
-function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
+function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser = '', $refname = '', $mode = 'read')
 {
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (!is_object($fuser)) $fuser = $user;
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
-	if (empty($entity)) $entity=0;
+	if (empty($entity)) $entity = 0;
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file);
 	// We define $accessallowed and $sqlprotectagainstexternals
-	$accessallowed=0;
-	$sqlprotectagainstexternals='';
-	$ret=array();
+	$accessallowed = 0;
+	$sqlprotectagainstexternals = '';
+	$ret = array();
 
     // Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) $refname = basename(dirname($original_file)."/");
 
 	$relative_original_file = $original_file;
 
 	// Define possible keys to use for permission check
-	$lire='lire'; $read='read'; $download='download';
+	$lire = 'lire'; $read = 'read'; $download = 'download';
 	if ($mode == 'write')
 	{
-	    $lire='creer'; $read='write'; $download='upload';
+	    $lire = 'creer'; $read = 'write'; $download = 'upload';
 	}
 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
-	    $accessallowed=1;
-	    $original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
+	    $accessallowed = 1;
+	    $original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
-	    $accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
-	    $original_file=$dolibarr_main_data_root.'/'.$original_file;
+	    $accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+	    $original_file = $dolibarr_main_data_root.'/'.$original_file;
 	}
 	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
 		// Dir for custom dirs
-		$tmp=explode(',', $dolibarr_main_document_root_alt);
+		$tmp = explode(',', $dolibarr_main_document_root_alt);
 		$dirins = $tmp[0];
 
-	    $accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
-	    $original_file=$dirins.'/'.$original_file;
+	    $accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
+	    $original_file = $dirins.'/'.$original_file;
 	}
 	// Wrapping for some images
 	elseif (($modulepart == 'mycompany' || $modulepart == 'companylogo') && !empty($conf->mycompany->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;
 	}
 	// Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->user->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->user->dir_output.'/'.$original_file;
 	}
 	// Wrapping for members photos
 	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+		$original_file = $conf->propal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-	    if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
-	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+	    if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
+	    $original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-	    if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
-	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
+	    if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
+	    $original_file = $conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
-	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+	    if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
+	    $original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+	    if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+	    $original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+	    $original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-	    if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
-	    $original_file=$conf->expensereport->dir_output.'/'.$original_file;
+	    if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
+	    $original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->dir_temp.'/'.$original_file;
+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+		$original_file = $conf->propal->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_temp.'/'.$original_file;
+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->commande->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_temp.'/'.$original_file;
+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->facture->dir_temp.'/'.$original_file;
 	}
 	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
-		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
+		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
+		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
-		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
+		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
+		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
-		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
+		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
+		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
+	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
-		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
+		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
-		$original_file=$conf->tax->dir_output.'/'.$original_file;
+		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
+		$original_file = $conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
+		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
-		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
+		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
+		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
-		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
+		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->stock->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->stock->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les graph fournisseurs
 	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les graph des produits
 	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les code barre
 	elseif ($modulepart == 'barcode')
 	{
-		$accessallowed=1;
+		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
-		$original_file='';
+		$original_file = '';
 	}
 	// Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour le scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 	// Wrapping pour les images fckeditor
 	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for users
 	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
-        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-        if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
-        if ($canreaduser || preg_match('/^specimen/i',$original_file))
+        $canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
+        if ($fuser->id == (int) $refname) { $canreaduser = 1; } // A user can always read its own card
+        if ($canreaduser || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->user->dir_output.'/'.$original_file;
+	    $original_file = $conf->user->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
+		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
 	}
 
@@ -2206,247 +2206,247 @@ 
 	{
 		if ($fuser->rights->societe->{$lire})
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
+		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
 	}
 
 	// Wrapping for invoices
 	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		$original_file = $conf->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping for mass actions
 	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_orders')
 	{
-	    if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_invoices')
 	{
-	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_expensereport')
 	{
-	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_interventions')
 	{
-	    if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_order')
 	{
-	    if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
-	    if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+	    if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 	    {
-	        $accessallowed=1;
+	        $accessallowed = 1;
 	    }
-	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	    $original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les deplacements et notes de frais
 	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->deplacement->dir_output.'/'.$original_file;
+		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les propales
 	else if ($modulepart == 'propal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 
-		$original_file=$conf->propal->dir_output.'/'.$original_file;
+		$original_file = $conf->propal->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les commandes
 	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		$original_file = $conf->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les projets
 	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	}
 
 	// Wrapping pour les commandes fournisseurs
 	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les factures fournisseurs
 	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'supplier_payment')
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
+		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
 	// Wrapping pour les rapport de paiements
 	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
 	}
 
 	// Wrapping for accounting exports
 	else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
 	{
-		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->accounting->dir_output.'/'.$original_file;
+		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les expedition
 	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expedition->dir_output."/sending/".$original_file;
+		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
 	}
 	// Wrapping pour les bons de livraison
 	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
-		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->expedition->dir_output."/receipt/".$original_file;
+		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
 	}
 
 	// Wrapping pour les actions
 	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
+		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les actions
 	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
 	}
@@ -2454,54 +2454,54 @@ 
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
+		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
 	}
 
 	// Wrapping pour les contrats
 	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
+		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	}
 
 	// Wrapping pour les dons
 	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->don->dir_output.'/'.$original_file;
+		$original_file = $conf->don->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les dons
 	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
 	{
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->resource->dir_output.'/'.$original_file;
+		$original_file = $conf->resource->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les remises de cheques
 	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
 	{
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
 
-		$original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
+		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
 	}
 
 	// Wrapping for bank
@@ -2509,9 +2509,9 @@ 
 	{
 		if ($fuser->rights->banque->{$lire})
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->bank->dir_output.'/'.$original_file;
+		$original_file = $conf->bank->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for export module
@@ -2519,62 +2519,62 @@ 
 	{
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
-		$accessallowed=1;
-		$original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
 	// Wrapping for import module
 	else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->import->dir_temp.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->import->dir_temp.'/'.$original_file;
 	}
 
 	// Wrapping pour l'editeur wysiwyg
 	else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
 	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_output.'/'.$original_file;
+		if ($fuser->admin) $accessallowed = 1;
+		$original_file = $conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_temp.'/'.$original_file;
+		if ($fuser->admin) $accessallowed = 1;
+		$original_file = $conf->admin->dir_temp.'/'.$original_file;
 	}
 
 	// Wrapping pour BitTorrent
 	else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
 	{
-		$accessallowed=1;
-		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
-		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
+		$accessallowed = 1;
+		$dir = 'files';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
+		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
 	// Wrapping pour Foundation module
 	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
-			$accessallowed=1;
+			$accessallowed = 1;
 		}
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
+		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for Scanner
 	else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		$accessallowed = 1;
+		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	}
 
     // GENERIC Wrapping
@@ -2584,76 +2584,76 @@ 
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-	    if ($fuser->admin) $accessallowed=1;    // If user is admin
+	    if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
+	    if ($fuser->admin) $accessallowed = 1; // If user is admin
 
 		// Define $accessallowed
-		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		else if (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
 		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		else if (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
 		}
 		else
 		{
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
 
-			$perm=GETPOST('perm');
-			$subperm=GETPOST('subperm');
+			$perm = GETPOST('perm');
+			$subperm = GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+				if (($perm && !$subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed = 1;
+				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;
 			}
 			else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;
+				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
 
 		// For modules who wants to manage different levels of permissions for documents
 		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (! empty($conf->global->$subPermCategoryConstName))
+		if (!empty($conf->global->$subPermCategoryConstName))
 		{
 			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
+			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
 			{
-				$accessallowed=1;
+				$accessallowed = 1;
 			}
 		}
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (!empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
@@ -2679,8 +2679,8 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-    if (! dol_is_dir($directory)) dol_mkdir($directory);
-    $cachefile = $directory . $filename;
+    if (!dol_is_dir($directory)) dol_mkdir($directory);
+    $cachefile = $directory.$filename;
     file_put_contents($cachefile, serialize($object), LOCK_EX);
     @chmod($cachefile, 0644);
 }
@@ -2696,8 +2696,8 @@ 
 function dol_cache_refresh($directory, $filename, $cachetime)
 {
     $now = dol_now();
-    $cachefile = $directory . $filename;
-    $refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
+    $cachefile = $directory.$filename;
+    $refresh = !file_exists($cachefile) || ($now - $cachetime) > dol_filemtime($cachefile);
     return $refresh;
 }
 
@@ -2710,7 +2710,7 @@ 
  */
 function dol_readcachefile($directory, $filename)
 {
-    $cachefile = $directory . $filename;
+    $cachefile = $directory.$filename;
     $object = unserialize(file_get_contents($cachefile));
     return $object;
 }

Braces +454 added lines, -240 removed lines

@@ -97,16 +97,21 @@ 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (! is_dir($newpath)) {
+			return array();
+		}
 
 		if ($dir = opendir($newpath))
 		{
 			$filedate='';
 			$filesize='';
 
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+			while (false !== ($file = readdir($dir))) {
+				// $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+				if (! utf8_check($file)) $file=utf8_encode($file);
+			}
+			// To be sure data is stored in utf8 in memory
 
 				$qualified=1;
 
@@ -115,8 +120,9 @@ 
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+				} else if ($excludefilter) {
+					$excludefilterarray[]=$excludefilter;
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
 				// Check if file is qualified
 				foreach($excludefilterarray as $filt)
 				{
@@ -134,12 +140,18 @@ 
 						// Add entry into file_list array
 						if (($types=="directories") || ($types=="all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') {
+								$filedate=dol_filemtime($path."/".$file);
+							}
+							if ($loadsize || $sortcriteria == 'size') {
+								$filesize=dol_filesize($path."/".$file);
+							}
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+								// We do not search key $filter into all $path, only into $file part
 							{
 								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+							}
 								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
@@ -159,16 +171,21 @@ 
 						{
 							$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename?$relativename.'/':'').$file));
 						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					} else if (! $isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') {
+							$filedate=dol_filemtime($path."/".$file);
+						}
+						if ($loadsize || $sortcriteria == 'size') {
+							$filesize=dol_filesize($path."/".$file);
+						}
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+							// We do not search key $filter into $path, only into $file
 						{
 							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+						}
 							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
@@ -195,12 +212,16 @@ 
 					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 				}
 				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+				if ($sortorder) {
+					array_multisort($myarray, $sortorder, $file_list);
+				}
 			}
 		}
 	}
 
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {
+		$file_list = array_merge($file_list, $hookmanager->resArray);
+	}
 
 	return $file_list;
 }
@@ -224,7 +245,9 @@ 
     global $conf, $db;
 
     $sql=" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m, acl, position";
-    if ($mode) $sql.=", description";
+    if ($mode) {
+    	$sql.=", description";
+    }
     $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
     $sql.=" WHERE filepath = '".$db->escape($path)."'";
     $sql.=" AND entity = ".$conf->entity;
@@ -271,12 +294,13 @@ 
                 $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
             }
             // Sort the data
-            if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+            if ($sortorder) {
+            	array_multisort($myarray, $sortorder, $file_list);
+            }
         }
 
         return $file_list;
-    }
-    else
+    } else
     {
         dol_print_error($db);
         return array();
@@ -321,16 +345,21 @@ 
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (! $found) {
+			// This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['position']='999999';
+		}
+		// File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover']=0;
 			$filearray[$key]['acl']='';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+				// If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+			}
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile=new EcmFiles($db);
 
@@ -351,13 +380,11 @@ 
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
+				} else
 				{
 					$filearray[$key]['rowid']=$result;
 				}
-			}
-			else
+			} else
 			{
 				$filearray[$key]['rowid']=0;     // Should not happened
 			}
@@ -382,22 +409,27 @@ 
 
 	$sortorder=strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; } else { $retup=1; $retdown=-1; }
 
 	if ($sortfield == 'name')
 	{
-		if ($a->name == $b->name) return 0;
+		if ($a->name == $b->name) {
+			return 0;
+		}
 		return ($a->name < $b->name) ? $retup : $retdown;
 	}
 	if ($sortfield == 'date')
 	{
-		if ($a->date == $b->date) return 0;
+		if ($a->date == $b->date) {
+			return 0;
+		}
 		return ($a->date < $b->date) ? $retup : $retdown;
 	}
 	if ($sortfield == 'size')
 	{
-		if ($a->size == $b->size) return 0;
+		if ($a->size == $b->size) {
+			return 0;
+		}
 		return ($a->size < $b->size) ? $retup : $retdown;
 	}
 }
@@ -412,9 +444,12 @@ 
 function dol_is_dir($folder)
 {
     $newfolder=dol_osencode($folder);
-    if (is_dir($newfolder)) return true;
-    else return false;
-}
+    if (is_dir($newfolder)) {
+    	return true;
+    } else {
+    	return false;
+    }
+    }
 
 /**
  * Return if path is a file
@@ -439,7 +474,9 @@ 
     $tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
     foreach($tmpprot as $prot)
     {
-        if (preg_match('/^'.$prot.':/i',$url)) return true;
+        if (preg_match('/^'.$prot.':/i',$url)) {
+        	return true;
+        }
     }
     return false;
 }
@@ -461,15 +498,21 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach($name_array as $temp) {
+			$folder_content .= $temp;
+		}
 
         closedir($handle);
 
-		if ($folder_content == "...") return true;
-		else return false;
+		if ($folder_content == "...") {
+			return true;
+		} else {
+			return false;
+		}
+	} else {
+		return true;
 	}
-	else
-	return true; // Dir does not exists
+	// Dir does not exists
 }
 
 /**
@@ -492,11 +535,12 @@ 
 		{
 			$line=fgets($fp);
             // We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (! $line === false) {
+				$nb++;
+			}
 		}
 		fclose($fp);
-	}
-	else
+	} else
 	{
 		$nb=-1;
 	}
@@ -546,11 +590,17 @@ 
 
     dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-    if (empty($srcfile)) return -1;
-    if (empty($destfile)) $destfile=$srcfile;
+    if (empty($srcfile)) {
+    	return -1;
+    }
+    if (empty($destfile)) {
+    	$destfile=$srcfile;
+    }
 
     $destexists=dol_is_file($destfile);
-    if (($destfile != $srcfile) && $destexists) return 0;
+    if (($destfile != $srcfile) && $destexists) {
+    	return 0;
+    }
 
     $tmpdestfile=$destfile.'.tmp';
 
@@ -587,10 +637,14 @@ 
         dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
         return -3;
     }
-    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-    if (empty($newmask))	// This should no happen
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+    	$newmask=$conf->global->MAIN_UMASK;
+    }
+    if (empty($newmask)) {
+    	// This should no happen
     {
         dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+    }
         $newmask='0664';
     }
 
@@ -632,10 +686,14 @@ 
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+		return -1;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	if (! $overwriteifexists && $destexists) {
+		return 0;
+	}
 
 	$newpathofsrcfile=dol_osencode($srcfile);
     $newpathofdestfile=dol_osencode($destfile);
@@ -659,10 +717,14 @@ 
 	    dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 	    return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+		$newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+		// This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -690,7 +752,9 @@ 
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+		return -1;
+	}
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
@@ -700,7 +764,9 @@ 
         // We must set mask just before creating dir, becaause it can be set differently by dol_copy
         umask(0);
         $dirmaskdec=octdec($newmask);
-        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+        	$dirmaskdec=octdec($conf->global->MAIN_UMASK);
+        }
         $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
         dol_mkdir($destfile, '', decoct($dirmaskdec));
     }
@@ -720,8 +786,7 @@ 
                 {
                     //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
                     $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-                }
-                else
+                } else
 				{
 					$newfile = $file;
 					// Replace destination filename with a new one
@@ -738,18 +803,18 @@ 
                 if ($result > 0 && $tmpresult >= 0)
                 {
                     // Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-                }
-                else
+                } else
                 {
                     $result=$tmpresult;
                 }
-                if ($result < 0) break;
+                if ($result < 0) {
+                	break;
+                }
 
             }
         }
         closedir($dir_handle);
-    }
-    else
+    } else
 	{
 		// Source directory does not exists
         $result = -2;
@@ -816,8 +881,9 @@ 
         		// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
         		dol_delete_file($destfile);
         		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+        	} else {
+        		dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
         	}
-        	else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
         }
 
         // Move ok
@@ -826,9 +892,11 @@ 
             // Rename entry into ecm database
             $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
             $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+            	// If not a tmp file
             {
                 $rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+            }
                 $rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
                 //var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
 
@@ -837,16 +905,20 @@ 
 
                 $ecmfiletarget=new EcmFiles($db);
                 $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-                if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+                if ($resultecmtarget > 0) {
+                	// An entry for target name already exists for target, we delete it, a new one will be created.
                 {
                     $ecmfiletarget->delete($user);
                 }
+                }
 
                 $ecmfile=new EcmFiles($db);
                 $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-                if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+                if ($resultecm > 0) {
+                	// If an entry was found for src file, we use it to move entry
                 {
                     $filename = basename($rel_filetorenameafter);
+                }
                     $rel_dir = dirname($rel_filetorenameafter);
                     $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                     $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -854,10 +926,11 @@ 
                     $ecmfile->filepath = $rel_dir;
                     $ecmfile->filename = $filename;
                     $resultecm = $ecmfile->update($user);
-                }
-                elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+                } elseif ($resultecm == 0) {
+                	// If no entry were found for src files, create/update target file
                 {
                     $filename = basename($rel_filetorenameafter);
+                }
                     $rel_dir = dirname($rel_filetorenameafter);
                     $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
                     $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -874,18 +947,22 @@ 
                     {
                         setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                     }
-                }
-                elseif ($resultecm < 0)
+                } elseif ($resultecm < 0)
                 {
                     setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
                 }
 
-                if ($resultecm > 0) $result=true;
-                else $result = false;
+                if ($resultecm > 0) {
+                	$result=true;
+                } else {
+                	$result = false;
+                }
             }
         }
 
-        if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+        if (empty($newmask)) {
+        	$newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+        }
         $newmaskdec=octdec($newmask);
         // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
         // to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
@@ -929,9 +1006,11 @@ 
         }
         $antivir=new AntiVir($db);
         $result = $antivir->dol_avscan_file($src_file);
-        if ($result < 0)	// If virus or error, we stop here
+        if ($result < 0) {
+        	// If virus or error, we stop here
         {
             $reterrors=$antivir->errors;
+        }
             return $reterrors;
         }
     }
@@ -1039,13 +1118,17 @@ 
     	}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
+	if ($reshook < 0) {
+		// At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
 	}
-	elseif (empty($reshook))
+		if (empty($errmsg)) {
+			$errmsg = 'ErrorReturnedBySomeHooks';
+		}
+		// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		return $errmsg;
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded=dol_osencode($src_file);
@@ -1068,11 +1151,12 @@ 
 		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+				@chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			}
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1;	// Success
-		}
-		else
+		} else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3;	// Unknown error
@@ -1125,12 +1209,13 @@ 
 		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+	if (empty($nohook) && $reshook != 0) {
+		// reshook = 0 to do standard actions, 1 = ok, -1 = ko
 	{
 		if ($reshook < 0) return false;
-		return true;
 	}
-	else
+		return true;
+	} else
 	{
 		$error=0;
 
@@ -1146,17 +1231,22 @@ 
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) {
+						$ok=@unlink($filename);
+					} else {
+						$ok=unlink($filename);
+					}
 					if ($ok)
 					{
 					    dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 	                    // Delete entry into ecm database
     				    $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-    				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+    				    if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {
+    				    	// If not a tmp file
     				    {
     				        $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+    				    }
 
     				        dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
         				    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
@@ -1171,21 +1261,28 @@ 
         				        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
         				    }
     				    }
+					} else {
+						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
 					// If error because of not exists, we must should return true and we should return false if this is a permission problem
 				}
+			} else {
+				dol_syslog("No files to delete found", LOG_DEBUG);
 			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			if ($nophperrors) {
+				$ok=@unlink($file_osencoded);
+			} else {
+				$ok=unlink($file_osencoded);
+			}
+			if ($ok) {
+				dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+			} else {
+				dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			}
 		}
 
 		return $ok;
@@ -1235,19 +1332,23 @@ 
         {
             while (false !== ($item = readdir($handle)))
             {
-                if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+                if (! utf8_check($item)) {
+                	$item=utf8_encode($item);
+                }
+                // should be useless
 
                 if ($item != "." && $item != "..")
                 {
                     if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
                     {
                         $count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-                    }
-                    else
+                    } else
                     {
                         $result=dol_delete_file("$dir/$item", 1, $nophperrors);
                         $count++;
-                        if ($result) $countdeleted++;
+                        if ($result) {
+                        	$countdeleted++;
+                        }
                     }
                 }
             }
@@ -1257,7 +1358,9 @@ 
             {
 	            $result=dol_delete_dir($dir, $nophperrors);
 	            $count++;
-    	        if ($result) $countdeleted++;
+    	        if ($result) {
+    	        	$countdeleted++;
+    	        }
             }
         }
     }
@@ -1279,15 +1382,25 @@ 
 	// Define parent dir of elements
 	$element = $object->element;
 
-    if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-    elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-    elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-    elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-    elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-    elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+    if ($object->element == 'order_supplier') {
+    	$dir = $conf->fournisseur->commande->dir_output;
+    } elseif ($object->element == 'invoice_supplier') {
+    	$dir = $conf->fournisseur->facture->dir_output;
+    } elseif ($object->element == 'project') {
+    	$dir = $conf->projet->dir_output;
+    } elseif ($object->element == 'shipping') {
+    	$dir = $conf->expedition->dir_output.'/sending';
+    } elseif ($object->element == 'delivery') {
+    	$dir = $conf->expedition->dir_output.'/receipt';
+    } elseif ($object->element == 'fichinter') {
+    	$dir = $conf->ficheinter->dir_output;
+    } else {
+    	$dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+    }
 
-    if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+    if (empty($dir)) {
+    	return 'ErrorObjectNoSupportedByFunction';
+    }
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
@@ -1301,8 +1414,7 @@ 
 			$object->error=$langs->trans("ErrorFailedToDeleteFile",$file);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		for ($i = 0; $i < 20; $i++)
 		{
@@ -1335,18 +1447,29 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+		return 0;
+	}
+	// By default, no metafile.
 
 	// Define parent dir of elements
 	$element=$object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+		$dir = $conf->fournisseur->dir_output.'/commande';
+	} elseif ($object->element == 'invoice_supplier') {
+		$dir = $conf->fournisseur->dir_output.'/facture';
+	} elseif ($object->element == 'project') {
+		$dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+		$dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+		$dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+		$dir = $conf->ficheinter->dir_output;
+	} else {
+		$dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
 	if ($dir)
 	{
@@ -1386,12 +1509,12 @@ 
 		$fp = fopen($file,"w");
 		fputs($fp,$meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
-		@chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return 1;
-	}
-	else
+	} else
 	{
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
@@ -1453,9 +1576,11 @@ 
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (! empty($_FILES[$varfiles])) {
+		// For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+	}
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$TFile = $_FILES[$varfiles];
@@ -1489,9 +1614,11 @@ 
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+				if (is_numeric($resupload) && $resupload > 0) {
+					// $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+				}
 
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -1525,9 +1652,11 @@ 
 					{
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
 
-					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    	// If not a tmp dir
 					    {
 					        $filename = basename($destfile);
+					    }
 					        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -1550,19 +1679,20 @@ 
 
 					$res = 1;
 					setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
-				}
-				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');
 					}
@@ -1585,8 +1715,7 @@ 
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
@@ -1617,16 +1746,27 @@ 
 	$listofnames=array();
 	$listofmimes=array();
     $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		$listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		$listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		$listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	if ($keytodelete >= 0)
 	{
 		$pathtodelete=$listofpaths[$keytodelete];
 		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		if (empty($donotdeletefile)) {
+			$result = dol_delete_file($pathtodelete,1);
+		}
+		// The delete of ecm database is inside the function dol_delete_file
+		else {
+			$result=0;
+		}
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
@@ -1672,24 +1812,26 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) {
+					$fileoutput=$fileinput.".".$ext;
+				}
 
 				$count = $image->getNumberImages();
 				$ret = $image->writeImages($fileoutput, true);
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
+				if ($ret) {
+					return $count;
+				} else {
+					return -3;
+				}
+			} else
 			{
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		return 0;
 	}
@@ -1711,9 +1853,7 @@ 
     try
     {
         $data = implode("", file(dol_osencode($inputfile)));
-        if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-        elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-        elseif ($mode == 'zip')
+        if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
         {
             if (defined('ODTPHP_PATHTOPCLZIP'))
             {
@@ -1733,14 +1873,12 @@ 
             fwrite($fp, $compressdata);
             fclose($fp);
             return 1;
-        }
-        else
+        } else
         {
             dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
             return -2;
         }
-    }
-    catch (Exception $e)
+    } catch (Exception $e)
     {
         global $langs, $errormsg;
         $langs->load("errors");
@@ -1768,8 +1906,9 @@ 
         $archive = new PclZip($inputfile);
         $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
         //var_dump($result);
-        if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-        else
+        if (! is_array($result) && $result <= 0) {
+        	return array('error'=>$archive->errorInfo(true));
+        } else
 		{
 			$ok=1; $errmsg='';
 			// Loop on each file to check result for unzipping file
@@ -1784,8 +1923,11 @@ 
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+				return array();
+			} else {
+				return array('error'=>$errmsg);
+			}
 		}
     }
 
@@ -1799,8 +1941,7 @@ 
             $zip->extractTo($outputdir.'/');
             $zip->close();
             return array();
-        }
-        else
+        } else
         {
             return array('error'=>'ErrUnzipFails');
         }
@@ -1834,9 +1975,7 @@ 
 
     try
     {
-        if ($mode == 'gz')     { $foundhandler=0; }
-        elseif ($mode == 'bz') { $foundhandler=0; }
-        elseif ($mode == 'zip')
+        if ($mode == 'gz')     { $foundhandler=0; } elseif ($mode == 'bz') { $foundhandler=0; } elseif ($mode == 'zip')
         {
             /*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
@@ -1889,13 +2028,11 @@ 
         {
             dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
             return -2;
-        }
-        else
+        } else
         {
         	return 0;
         }
-    }
-    catch (Exception $e)
+    } catch (Exception $e)
     {
         global $langs, $errormsg;
         $langs->load("errors");
@@ -1941,10 +2078,16 @@ 
 	global $user, $conf, $db;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (! is_object($fuser)) {
+		$fuser=$user;
+	}
 
-	if (empty($modulepart)) return 'ErrorBadParameter';
-	if (empty($entity)) $entity=0;
+	if (empty($modulepart)) {
+		return 'ErrorBadParameter';
+	}
+	if (empty($entity)) {
+		$entity=0;
+	}
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file);
 	// We define $accessallowed and $sqlprotectagainstexternals
 	$accessallowed=0;
@@ -1952,7 +2095,9 @@ 
 	$ret=array();
 
     // Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) {
+		$refname=basename(dirname($original_file)."/");
+	}
 
 	$relative_original_file = $original_file;
 
@@ -2006,131 +2151,173 @@ 
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->dir_output))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->propal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-	    if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+	    if ($fuser->rights->ficheinter->{$lire}) {
+	    	$accessallowed=1;
+	    }
 	    $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-	    if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+	    if ($fuser->rights->contrat->{$lire}) {
+	    	$accessallowed=1;
+	    }
 	    $original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-	    if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+	    if ($fuser->rights->supplier_proposal->{$lire}) {
+	    	$accessallowed=1;
+	    }
 	    $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+	    if ($fuser->rights->fournisseur->commande->{$lire}) {
+	    	$accessallowed=1;
+	    }
 	    $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-	    if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+	    if ($fuser->rights->fournisseur->facture->{$lire}) {
+	    	$accessallowed=1;
+	    }
 	    $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-	    if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+	    if ($fuser->rights->expensereport->{$lire}) {
+	    	$accessallowed=1;
+	    }
 	    $original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->dir_temp))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->propal->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+		if ($fuser->rights->categorie->{$lire}) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -2229,64 +2416,56 @@ 
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->propal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
+	} else if ($modulepart == 'massfilesarea_orders')
 	{
 	    if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
+	} else if ($modulepart == 'massfilesarea_invoices')
 	{
 	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
+	} else if ($modulepart == 'massfilesarea_expensereport')
 	{
 	    if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
+	} else if ($modulepart == 'massfilesarea_interventions')
 	{
 	    if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
+	} else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->propal->dir_output))
 	{
 	    if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
+	} else if ($modulepart == 'massfilesarea_supplier_order')
 	{
 	    if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
+	} else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 	    if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 	    {
 	        $accessallowed=1;
 	    }
 	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2348,8 +2527,7 @@ 
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2398,8 +2576,11 @@ 
 		{
 			$accessallowed=1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) {
+			$original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		} else {
+			$original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		}
 	}
 
 	// Wrapping for accounting exports
@@ -2458,8 +2639,11 @@ 
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->product->enabled)) {
+			$original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+		} elseif (! empty($conf->service->enabled)) {
+			$original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les contrats
@@ -2540,14 +2724,18 @@ 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+			$accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_temp.'/'.$original_file;
 	}
 
@@ -2556,7 +2744,9 @@ 
 	{
 		$accessallowed=1;
 		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') {
+			$dir='torrents';
+		}
 		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
@@ -2584,45 +2774,62 @@ 
     // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
     else
 	{
-	    if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-	    if ($fuser->admin) $accessallowed=1;    // If user is admin
+	    if (preg_match('/^specimen/i',$original_file)) {
+	    	$accessallowed=1;
+	    }
+	    // If link to a file called specimen. Test must be done before changing $original_file int full path.
+	    if ($fuser->admin) {
+	    	$accessallowed=1;
+	    }
+	    // If user is admin
 
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+		    	$accessallowed=1;
+		    }
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+		    	$accessallowed=1;
+		    }
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+		    if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+		    	$accessallowed=1;
+		    }
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else
+		} else
 		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+			if (empty($conf->$modulepart->dir_output)) {
+				// modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 
@@ -2630,12 +2837,15 @@ 
 			$subperm=GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) {
+					$accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
+			} else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) {
+					$accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2653,11 +2863,13 @@ 
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (! empty($conf->global->$sqlProtectConstName)) {
+			// If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
+		}
 	}
 
 	$ret = array(
@@ -2679,7 +2891,9 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-    if (! dol_is_dir($directory)) dol_mkdir($directory);
+    if (! dol_is_dir($directory)) {
+    	dol_mkdir($directory);
+    }
     $cachefile = $directory . $filename;
     file_put_contents($cachefile, serialize($object), LOCK_EX);
     @chmod($cachefile, 0644);

htdocs/core/lib/project.lib.php

Indentation +163 added lines, -163 removed lines

@@ -44,7 +44,7 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
 	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
@@ -69,22 +69,22 @@ 
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
+	{
+		$nbNote = 0;
+		if(!empty($object->note_private)) $nbNote++;
 		if(!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
 		$h++;
-    }
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
@@ -123,12 +123,12 @@ 
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
-    $head[$h][1].= $langs->trans("Events");
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-    {
-        $head[$h][1].= '/';
-        $head[$h][1].= $langs->trans("Agenda");
-    }
+	$head[$h][1].= $langs->trans("Events");
+	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	{
+		$head[$h][1].= '/';
+		$head[$h][1].= $langs->trans("Agenda");
+	}
 	$head[$h][2] = 'agenda';
 	$h++;
 
@@ -171,8 +171,8 @@ 
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $obj = $db->fetch_object($resql);
-	    if ($obj) $nbTimeSpent=1;
+		$obj = $db->fetch_object($resql);
+		if ($obj) $nbTimeSpent=1;
 	}
 	else dol_print_error($db);
 
@@ -189,23 +189,23 @@ 
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
+	{
+		$nbNote = 0;
+		if(!empty($object->note_private)) $nbNote++;
 		if(!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'task_notes';
 		$h++;
-    }
+	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
 	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
 	$head[$h][2] = 'task_document';
@@ -467,11 +467,11 @@ 
 				// Date end
 				print '<td align="center">';
 				$taskstatic->projectstatus = $lines[$i]->projectstatus;
-	            $taskstatic->progress = $lines[$i]->progress;
-	            $taskstatic->fk_statut = $lines[$i]->status;
-	            $taskstatic->datee = $lines[$i]->date_end;
-	            print dol_print_date($lines[$i]->date_end,'dayhour');
-	            if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
+				$taskstatic->progress = $lines[$i]->progress;
+				$taskstatic->fk_statut = $lines[$i]->status;
+				$taskstatic->datee = $lines[$i]->date_end;
+				print dol_print_date($lines[$i]->date_end,'dayhour');
+				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
 				print '</td>';
 
 				$plannedworkloadoutputformat='allhourmin';
@@ -531,9 +531,9 @@ 
 
 				if ($level >= 0)    // Call sublevels
 				{
-    				$level++;
-    				if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
-    				$level--;
+					$level++;
+					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+					$level--;
 				}
 
 				$total_projectlinesa_spent += $lines[$i]->duration;
@@ -605,13 +605,13 @@ 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-	    for ($i = 0 ; $i < $numlines ; $i++)
-	    {
-	        if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-	    }
+		for ($i = 0 ; $i < $numlines ; $i++)
+		{
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		}
 	}
 
-    //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
 		if ($parent == 0) $level = 0;
@@ -621,26 +621,26 @@ 
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
-                //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
-        		if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-        		{
-        			$lastprojectid=$lines[$i]->fk_project;
-        			if ($preselectedday)
-        			{
-        				$projectstatic->id = $lines[$i]->fk_project;
-        			}
-        		}
-
-			    if (empty($workloadforid[$projectstatic->id]))
-			    {
-    				if ($preselectedday)
-    				{
-    			        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-	       		        $workloadforid[$projectstatic->id]=1;
-    				}
-			    }
+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+				{
+					$lastprojectid=$lines[$i]->fk_project;
+					if ($preselectedday)
+					{
+						$projectstatic->id = $lines[$i]->fk_project;
+					}
+				}
+
+				if (empty($workloadforid[$projectstatic->id]))
+				{
+					if ($preselectedday)
+					{
+						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+		   				$workloadforid[$projectstatic->id]=1;
+					}
+				}
 
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
@@ -665,12 +665,12 @@ 
 
 				if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
 				{
-				    // Thirdparty
-				    print '<td class="tdoverflowmax100">';
-				    $thirdpartystatic->id=$lines[$i]->socid;
-				    $thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				    print $thirdpartystatic->getNomUrl(1, 'project', 10);
-				    print '</td>';
+					// Thirdparty
+					print '<td class="tdoverflowmax100">';
+					$thirdpartystatic->id=$lines[$i]->socid;
+					$thirdpartystatic->name=$lines[$i]->thirdparty_name;
+					print $thirdpartystatic->getNomUrl(1, 'project', 10);
+					print '</td>';
 				}
 
 				// Ref
@@ -753,14 +753,14 @@ 
 				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
 
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
-		        $alreadyspent='';
-		        if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+				$alreadyspent='';
+				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
 
-		        $idw = 0;
+				$idw = 0;
 
 				$tableCell='';
 				$tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-                $tableCell.='<span class="hideonsmartphone"> + </span>';
+				$tableCell.='<span class="hideonsmartphone"> + </span>';
 				//$tableCell.='&nbsp;&nbsp;&nbsp;';
 				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
 				//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
@@ -800,8 +800,8 @@ 
 			$level++;
 			if ($lines[$i]->id > 0)
 			{
-			    if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable);
-			    else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable);
+				if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable);
+				else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable);
 			}
 			$level--;
 		}
@@ -845,13 +845,13 @@ 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-	    for ($i = 0 ; $i < $numlines ; $i++)
-	    {
-	       if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-	    }
+		for ($i = 0 ; $i < $numlines ; $i++)
+		{
+		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+		}
 	}
 
-    //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
@@ -862,20 +862,20 @@ 
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
 			{
-			    //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
-			    // Break on a new project
-    			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-    			{
-    				$lastprojectid=$lines[$i]->fk_project;
-    				$projectstatic->id = $lines[$i]->fk_project;
-    			}
+				// Break on a new project
+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+				{
+					$lastprojectid=$lines[$i]->fk_project;
+					$projectstatic->id = $lines[$i]->fk_project;
+				}
 
-			    if (empty($workloadforid[$projectstatic->id]))
-			    {
-				    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-                    $workloadforid[$projectstatic->id]=1;
-			    }
+				if (empty($workloadforid[$projectstatic->id]))
+				{
+					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+					$workloadforid[$projectstatic->id]=1;
+				}
 
 				$projectstatic->id=$lines[$i]->fk_project;
 				$projectstatic->ref=$lines[$i]->projectref;
@@ -899,12 +899,12 @@ 
 
 				if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
 				{
-				    // Thirdparty
-				    print '<td class="tdoverflowmax100">';
-				    $thirdpartystatic->id=$lines[$i]->thirdparty_id;
-				    $thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				    print $thirdpartystatic->getNomUrl(1, 'project');
-				    print '</td>';
+					// Thirdparty
+					print '<td class="tdoverflowmax100">';
+					$thirdpartystatic->id=$lines[$i]->thirdparty_id;
+					$thirdpartystatic->name=$lines[$i]->thirdparty_name;
+					print $thirdpartystatic->getNomUrl(1, 'project');
+					print '</td>';
 				}
 
 				// Ref
@@ -979,7 +979,7 @@ 
 				// Fields to show current time
 				$tableCell=''; $modeinput='hours';
 				for ($idw = 0; $idw < 7; $idw++)
-		        {
+				{
 					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 					$cssonholiday='';
@@ -988,28 +988,28 @@ 
 					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
 
 					$tmparray=dol_getdate($tmpday);
-		        	$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
-		        	$alreadyspent='';
-		        	if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-                    $alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
-
-                    $tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').'">';
-                    if ($alreadyspent)
-                    {
-                        $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-                        //$placeholder=' placeholder="00:00"';
-                        $placeholder='';
-                     	//$tableCell.='+';
-                    }
-                  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
-	        		$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-                   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-                   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-                   	$tableCell.='</td>';
-                    print $tableCell;
-		        }
-
-		        // Warning
+					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
+					$alreadyspent='';
+					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
+
+					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').'">';
+					if ($alreadyspent)
+					{
+						$tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+						//$placeholder=' placeholder="00:00"';
+						$placeholder='';
+					 	//$tableCell.='+';
+					}
+				  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+					$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
+				   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+				   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+				   	$tableCell.='</td>';
+					print $tableCell;
+				}
+
+				// Warning
 				print '<td align="right">';
    				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
@@ -1021,7 +1021,7 @@ 
    				}
 				print '</td>';
 
-		        print "</tr>\n";
+				print "</tr>\n";
 			}
 
 			// Call to show task with a lower level (task under the current task)
@@ -1029,8 +1029,8 @@ 
 			$level++;
 			if ($lines[$i]->id > 0)
 			{
-			    if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable);
-			    else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable);
+				if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable);
+				else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable);
 			}
 			$level--;
 		}
@@ -1100,7 +1100,7 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 	$projectstatic=new Project($db);
-    $thirdpartystatic=new Societe($db);
+	$thirdpartystatic=new Societe($db);
 
 	$sortfield='';
 	$sortorder='';
@@ -1161,12 +1161,12 @@ 
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
-	    $i=0;
+		$i=0;
 		$num = $db->num_rows($resql);
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-            $arrayidofprojects[$objp->projectid]=$objp->projectid;
+			$arrayidofprojects[$objp->projectid]=$objp->projectid;
 			$i++;
 		}
 	}
@@ -1194,22 +1194,22 @@ 
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-    	print '<tr class="liste_titre">';
-    	print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-    	print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-    	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-    	{
-    		print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
-    		print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
-    	}
-    	if (empty($conf->global->PROJECT_HIDE_TASKS))
-    	{
-            print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-            if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-            if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
-    	}
-    	print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
-    	print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+		print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		{
+			print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
+		}
+		if (empty($conf->global->PROJECT_HIDE_TASKS))
+		{
+			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
+			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
+			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+		}
+		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
+		print "</tr>\n";
 
 		while ($i < $num)
 		{
@@ -1223,11 +1223,11 @@ 
 			$userAccess = $projectstatic->restrictedProjectArea($user);
 			if ($userAccess >= 0)
 			{
-			    $projectstatic->ref=$objp->ref;
-			    $projectstatic->statut = $objp->status;
-			    $projectstatic->title = $objp->title;
-			    $projectstatic->datee = $db->jdate($objp->datee);
-			    $projectstatic->dateo = $db->jdate($objp->dateo);
+				$projectstatic->ref=$objp->ref;
+				$projectstatic->statut = $objp->status;
+				$projectstatic->title = $objp->title;
+				$projectstatic->datee = $db->jdate($objp->datee);
+				$projectstatic->dateo = $db->jdate($objp->dateo);
 
 
 				print '<tr class="oddeven">';
@@ -1238,41 +1238,41 @@ 
 				print '<td>';
 				if ($objp->fk_soc > 0)
 				{
-    				$thirdpartystatic->id=$objp->fk_soc;
-    				$thirdpartystatic->ref=$objp->socname;
-    				$thirdpartystatic->name=$objp->socname;
-    				print $thirdpartystatic->getNomUrl(1);
+					$thirdpartystatic->id=$objp->fk_soc;
+					$thirdpartystatic->ref=$objp->socname;
+					$thirdpartystatic->name=$objp->socname;
+					print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
 				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
-        			if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
 					print '</td>';
 					print '<td align="right">';
 					$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
-        			if ($code) print $langs->trans("OppStatus".$code);
+					if ($code) print $langs->trans("OppStatus".$code);
 					print '</td>';
 				}
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
-				    print '<td align="right">'.$objp->nb.'</td>';
-
-    				$plannedworkload=$objp->planned_workload;
-    				$total_plannedworkload+=$plannedworkload;
-    				if (! in_array('plannedworkload', $hiddenfields))
-    				{
-    				    print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
-    				}
-    				if (! in_array('declaredprogress', $hiddenfields))
-    				{
-    				    $declaredprogressworkload=$objp->declared_progess_workload;
-        				$total_declaredprogressworkload+=$declaredprogressworkload;
-        				print '<td align="right">';
-        				//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-        				print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
-        				print '</td>';
-    				}
+					print '<td align="right">'.$objp->nb.'</td>';
+
+					$plannedworkload=$objp->planned_workload;
+					$total_plannedworkload+=$plannedworkload;
+					if (! in_array('plannedworkload', $hiddenfields))
+					{
+						print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+					}
+					if (! in_array('declaredprogress', $hiddenfields))
+					{
+						$declaredprogressworkload=$objp->declared_progess_workload;
+						$total_declaredprogressworkload+=$declaredprogressworkload;
+						print '<td align="right">';
+						//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
+						print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
+						print '</td>';
+					}
 				}
 
 				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
@@ -1295,12 +1295,12 @@ 
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-            print '<td class="liste_total" align="right">'.$total_task.'</td>';
-            if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-            if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+			print '<td class="liste_total" align="right">'.$total_task.'</td>';
+			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
+			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
 		}
 		print '<td class="liste_total"></td>';
-        print '</tr>';
+		print '</tr>';
 
 		$db->free($resql);
 	}

Spacing +277 added lines, -277 removed lines

@@ -44,16 +44,16 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 	$head[$h][2] = 'contact';
 	$h++;
 
-	if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
-	|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
-	|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+	if (!empty($conf->fournisseur->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
+	|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
+	|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ProjectOverview");
@@ -65,29 +65,29 @@ 
 	// 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,'project');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
 		$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -98,15 +98,15 @@ 
 		$head[$h][1] = $langs->trans("Tasks");
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-		$taskstatic=new Task($db);
-		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		$taskstatic = new Task($db);
+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+		if ($nbTasks > 0) $head[$h][1] .= ' <span class="badge">'.($nbTasks).'</span>';
 		$head[$h][2] = 'tasks';
 		$h++;
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Gantt");
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+		if ($nbTasks > 0) $head[$h][1] .= ' <span class="badge">'.($nbTasks).'</span>';
 		$head[$h][2] = 'gantt';
 		$h++;
 	}
@@ -117,22 +117,22 @@ 
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) $head[$h][1] .= ' <span class="badge">'.$nbComments.'</span>';
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
-    $head[$h][1].= $langs->trans("Events");
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    $head[$h][1] .= $langs->trans("Events");
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
     {
-        $head[$h][1].= '/';
-        $head[$h][1].= $langs->trans("Agenda");
+        $head[$h][1] .= '/';
+        $head[$h][1] .= $langs->trans("Agenda");
     }
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');
 
 	return $head;
 }
@@ -150,20 +150,20 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'task_task';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 	$head[$h][2] = 'task_contact';
 	$h++;
 
 	// Is there timespent ?
-	$nbTimeSpent=0;
+	$nbTimeSpent = 0;
 	$sql = "SELECT t.rowid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 	$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
@@ -172,13 +172,13 @@ 
 	if ($resql)
 	{
 	    $obj = $db->fetch_object($resql);
-	    if ($obj) $nbTimeSpent=1;
+	    if ($obj) $nbTimeSpent = 1;
 	}
 	else dol_print_error($db);
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+	if ($nbTimeSpent > 0) $head[$h][1] .= ' <span class="badge">...</span>';
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -186,28 +186,28 @@ 
 	// 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,'task');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task');
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'task_notes';
 		$h++;
     }
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
+	$filesdir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$nbFiles = count(dol_dir_list($filesdir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'task_document';
 	$h++;
 
@@ -215,14 +215,14 @@ 
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
 	{
 		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+		if ($nbComments > 0) $head[$h][1] .= ' <span class="badge">'.$nbComments.'</span>';
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task', 'remove');
 
 	return $head;
 }
@@ -234,7 +234,7 @@ 
  * @param   string  $fuser      Filter on user
  * @return  array				Array of tabs to show
  */
-function project_timesheet_prepare_head($mode, $fuser=null)
+function project_timesheet_prepare_head($mode, $fuser = null)
 {
 	global $langs, $conf, $user;
 	$h = 0;
@@ -242,13 +242,13 @@ 
 
 	$h = 0;
 
-	$param='';
-	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+	$param = '';
+	$param .= ($mode ? '&mode='.$mode : '');
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param .= '&search_usertoprocessid='.$fuser->id;
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
@@ -256,7 +256,7 @@ 
 
 	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
 		$h++;
@@ -270,9 +270,9 @@ 
 		$h++;
 	}*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet', 'remove');
 
 	return $head;
 }
@@ -296,7 +296,7 @@ 
 	$head[$h][2] = 'project';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin');
 
 	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
 	$head[$h][1] = $langs->trans("ExtraFieldsProject");
@@ -308,7 +308,7 @@ 
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin', 'remove');
 
 	return $head;
 }
@@ -329,29 +329,29 @@ 
  * @param   int         $projectidfortotallink     0 or Id of project to use on total line (link to see all time consumed for project)
  * @return	void
  */
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0)
+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0)
 {
 	global $user, $bc, $langs;
 	global $projectstatic, $taskstatic;
 
-	$lastprojectid=0;
+	$lastprojectid = 0;
 
-	$projectsArrayId=explode(',',$projectsListId);
+	$projectsArrayId = explode(',', $projectsListId);
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// We declare counter as global because we want to edit them into recursive call
-	global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
+	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned;
 	if ($level == 0)
 	{
-		$total_projectlinesa_spent=0;
-		$total_projectlinesa_planned=0;
-		$total_projectlinesa_spent_if_planned=0;
+		$total_projectlinesa_spent = 0;
+		$total_projectlinesa_planned = 0;
+		$total_projectlinesa_spent_if_planned = 0;
 	}
 
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+		if ($parent == 0 && $level >= 0) $level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
@@ -359,26 +359,26 @@ 
 		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
 		{
 			// Show task line.
-			$showline=1;
-			$showlineingray=0;
+			$showline = 1;
+			$showlineingray = 0;
 
 			// If there is filters to use
 			if (is_array($taskrole))
 			{
 				// If task not legitimate to show, search if a legitimate task exists later in tree
-				if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
+				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
 				{
 					// So search if task has a subtask legitimate to show
-					$foundtaskforuserdeeper=0;
-					searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
+					$foundtaskforuserdeeper = 0;
+					searchTaskInChild($foundtaskforuserdeeper, $lines[$i]->id, $lines, $taskrole);
 					//print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
 					if ($foundtaskforuserdeeper > 0)
 					{
-						$showlineingray=1;		// We will show line but in gray
+						$showlineingray = 1; // We will show line but in gray
 					}
 					else
 					{
-						$showline=0;			// No reason to show line
+						$showline = 0; // No reason to show line
 					}
 				}
 			}
@@ -389,12 +389,12 @@ 
 				if (empty($user->rights->projet->all->lire))
 				{
 					// User is not allowed on this project and project is not public, so we hide line
-					if (! in_array($lines[$i]->fk_project, $projectsArrayId))
+					if (!in_array($lines[$i]->fk_project, $projectsArrayId))
 					{
 						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
 						// because assignement on task can be done only on contact of project.
 						// If assignement was done and after, was removed from contact of project, then we can hide the line.
-						$showline=0;
+						$showline = 0;
 					}
 				}
 			}
@@ -405,7 +405,7 @@ 
 				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
 				{
 					$var = !$var;
-					$lastprojectid=$lines[$i]->fk_project;
+					$lastprojectid = $lines[$i]->fk_project;
 				}
 
 				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
@@ -415,18 +415,18 @@ 
 					// Project ref
 					print "<td>";
 					//if ($showlineingray) print '<i>';
-					$projectstatic->id=$lines[$i]->fk_project;
-					$projectstatic->ref=$lines[$i]->projectref;
-					$projectstatic->public=$lines[$i]->public;
-					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
+					$projectstatic->id = $lines[$i]->fk_project;
+					$projectstatic->ref = $lines[$i]->projectref;
+					$projectstatic->public = $lines[$i]->public;
+					$projectstatic->title = $lines[$i]->projectlabel;
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
+					else print $projectstatic->getNomUrl(1, 'nolink');
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
 					// Project status
 					print '<td>';
-					$projectstatic->statut=$lines[$i]->projectstatus;
+					$projectstatic->statut = $lines[$i]->projectstatus;
 					print $projectstatic->getLibStatut(2);
 					print "</td>";
 				}
@@ -435,14 +435,14 @@ 
 				print '<td>';
 				if ($showlineingray)
 				{
-					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
+					print '<i>'.img_object('', 'projecttask').' '.$lines[$i]->ref.'</i>';
 				}
 				else
 				{
-					$taskstatic->id=$lines[$i]->id;
-					$taskstatic->ref=$lines[$i]->ref;
-					$taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
-					print $taskstatic->getNomUrl(1,'withproject');
+					$taskstatic->id = $lines[$i]->id;
+					$taskstatic->ref = $lines[$i]->ref;
+					$taskstatic->label = ($taskrole[$lines[$i]->id] ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');
+					print $taskstatic->getNomUrl(1, 'withproject');
 				}
 				print '</td>';
 
@@ -450,7 +450,7 @@ 
 				print "<td>";
 				if ($showlineingray) print '<i>';
 				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
-				for ($k = 0 ; $k < $level ; $k++)
+				for ($k = 0; $k < $level; $k++)
 				{
 					print "&nbsp; &nbsp; &nbsp;";
 				}
@@ -461,7 +461,7 @@ 
 
 				// Date start
 				print '<td align="center">';
-				print dol_print_date($lines[$i]->date_start,'dayhour');
+				print dol_print_date($lines[$i]->date_start, 'dayhour');
 				print '</td>';
 
 				// Date end
@@ -470,19 +470,19 @@ 
 	            $taskstatic->progress = $lines[$i]->progress;
 	            $taskstatic->fk_statut = $lines[$i]->status;
 	            $taskstatic->datee = $lines[$i]->date_end;
-	            print dol_print_date($lines[$i]->date_end,'dayhour');
+	            print dol_print_date($lines[$i]->date_end, 'dayhour');
 	            if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
 				print '</td>';
 
-				$plannedworkloadoutputformat='allhourmin';
-				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+				$plannedworkloadoutputformat = 'allhourmin';
+				$timespentoutputformat = 'allhourmin';
+				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 
 				// Planned Workload (in working hours)
 				print '<td align="right">';
-				$fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
-				$workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+				$fullhour = convertSecondToTime($lines[$i]->planned_workload, $plannedworkloadoutputformat);
+				$workingdelay = convertSecondToTime($lines[$i]->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
 				if ($lines[$i]->planned_workload != '')
 				{
 					print $fullhour;
@@ -495,8 +495,8 @@ 
 				// Time spent
 				print '<td align="right">';
 				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';
+				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
 				else print '--:--';
 				if ($showlineingray) print '</i>';
 				else print '</a>';
@@ -506,7 +506,7 @@ 
 				print '<td align="right">';
 				if ($lines[$i]->planned_workload || $lines[$i]->duration)
 				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
 					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
 				}
 				print '</td>';
@@ -527,7 +527,7 @@ 
 
 				print "</tr>\n";
 
-				if (! $showlineingray) $inc++;
+				if (!$showlineingray) $inc++;
 
 				if ($level >= 0)    // Call sublevels
 				{
@@ -559,12 +559,12 @@ 
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject ? '' : '&withproject=1').'">';
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
 		if ($projectidfortotallink > 0) print '</a>';
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2).' %';
 		print '</td>';
 		print '<td></td>';
 		if ($addordertick) print '<td class="hideonsmartphone"></td>';
@@ -596,37 +596,37 @@ 
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$lastprojectid=0;
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$workloadforid = array();
+	$lineswithoutlevel0 = array();
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-	    for ($i = 0 ; $i < $numlines ; $i++)
+	    for ($i = 0; $i < $numlines; $i++)
 	    {
-	        if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+	        if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 	    }
 	}
 
     //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
                 //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
         		if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
         		{
-        			$lastprojectid=$lines[$i]->fk_project;
+        			$lastprojectid = $lines[$i]->fk_project;
         			if ($preselectedday)
         			{
         				$projectstatic->id = $lines[$i]->fk_project;
@@ -637,17 +637,17 @@ 
 			    {
     				if ($preselectedday)
     				{
-    			        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-	       		        $workloadforid[$projectstatic->id]=1;
+    			        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+	       		        $workloadforid[$projectstatic->id] = 1;
     				}
 			    }
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->projectref;
+				$projectstatic->title = $lines[$i]->projectlabel;
+				$projectstatic->public = $lines[$i]->public;
 
-				$taskstatic->id=$lines[$i]->id;
+				$taskstatic->id = $lines[$i]->id;
 
 				print '<tr class="oddeven">'."\n";
 
@@ -660,32 +660,32 @@ 
 
 				// Project
 				print "<td>";
-				print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";
 
-				if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
+				if (!empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
 				{
 				    // Thirdparty
 				    print '<td class="tdoverflowmax100">';
-				    $thirdpartystatic->id=$lines[$i]->socid;
-				    $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+				    $thirdpartystatic->id = $lines[$i]->socid;
+				    $thirdpartystatic->name = $lines[$i]->thirdparty_name;
 				    print $thirdpartystatic->getNomUrl(1, 'project', 10);
 				    print '</td>';
 				}
 
 				// Ref
 				print '<td>';
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				print '</td>';
 
 				// Label task
 				print "<td>";
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = $lines[$i]->label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 				print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -694,13 +694,13 @@ 
 
 				// Planned Workload
 				print '<td align="right">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
 				else print '--:--';
 				print '</td>';
 
 				// Progress declared %
 				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 				print '</td>';
 
 				// Time spent by everybody
@@ -709,7 +709,7 @@ 
 				if ($lines[$i]->duration)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
 				}
 				else print '--:--';
@@ -717,56 +717,56 @@ 
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
 				else print '--:--';
 				print "</td>\n";
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				// Form to add new time
 				print '<td class="nowrap" align="center">';
-				$tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask);
+				$tableCell = $form->select_date($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, 1, $disabledtask);
 				print $tableCell;
 				print '</td>';
 
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+				$cssonholiday = '';
+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
 				// Duration
-				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
+				print '<td align="center" class="duration'.($cssonholiday ? ' '.$cssonholiday : '').'">';
 
 				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
-		        $alreadyspent='';
-		        if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+		        $alreadyspent = '';
+		        if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
 
 		        $idw = 0;
 
-				$tableCell='';
-				$tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-                $tableCell.='<span class="hideonsmartphone"> + </span>';
+				$tableCell = '';
+				$tableCell .= '<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+                $tableCell .= '<span class="hideonsmartphone"> + </span>';
 				//$tableCell.='&nbsp;&nbsp;&nbsp;';
-				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
+				$tableCell .= $form->select_duration($lines[$i]->id.'duration', '', $disabledtask, 'text', 0, 1);
 				//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
 				print $tableCell;
 
-				$modeinput='hours';
+				$modeinput = 'hours';
 
 				print '<script type="text/javascript">';
 				print "jQuery(document).ready(function () {\n";
@@ -777,19 +777,19 @@ 
 				print '</td>';
 
 				print '<td align="right">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask ? ' disabled="disabled"' : '').'>';
 				print '</textarea>';
 				print '</td>';
 
 				// Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
    					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
 
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
 				print '</td>';
 
@@ -836,52 +836,52 @@ 
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
-	$numlines=count($lines);
+	$numlines = count($lines);
 
-	$lastprojectid=0;
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
+	$lastprojectid = 0;
+	$workloadforid = array();
+	$lineswithoutlevel0 = array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
 	if ($parent == 0) // Always and only if at first level
 	{
-	    for ($i = 0 ; $i < $numlines ; $i++)
+	    for ($i = 0; $i < $numlines; $i++)
 	    {
-	       if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+	       if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 	    }
 	}
 
     //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
-	for ($i = 0 ; $i < $numlines ; $i++)
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		if ($parent == 0) $level = 0;
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
 			{
 			    //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 			    // Break on a new project
     			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
     			{
-    				$lastprojectid=$lines[$i]->fk_project;
+    				$lastprojectid = $lines[$i]->fk_project;
     				$projectstatic->id = $lines[$i]->fk_project;
     			}
 
 			    if (empty($workloadforid[$projectstatic->id]))
 			    {
-				    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-                    $workloadforid[$projectstatic->id]=1;
+				    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                    $workloadforid[$projectstatic->id] = 1;
 			    }
 
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-				$projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
+				$projectstatic->id = $lines[$i]->fk_project;
+				$projectstatic->ref = $lines[$i]->projectref;
+				$projectstatic->title = $lines[$i]->projectlabel;
+				$projectstatic->public = $lines[$i]->public;
+				$projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
 
 				print '<tr class="oddeven">'."\n";
 
@@ -894,34 +894,34 @@ 
 
 				// Project
 				print '<td class="nowrap">';
-				print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+				print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";
 
-				if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
+				if (!empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
 				{
 				    // Thirdparty
 				    print '<td class="tdoverflowmax100">';
-				    $thirdpartystatic->id=$lines[$i]->thirdparty_id;
-				    $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+				    $thirdpartystatic->id = $lines[$i]->thirdparty_id;
+				    $thirdpartystatic->name = $lines[$i]->thirdparty_name;
 				    print $thirdpartystatic->getNomUrl(1, 'project');
 				    print '</td>';
 				}
 
 				// Ref
 				print '<td class="nowrap">';
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				print '</td>';
 
 				// Label task
 				print "<td>";
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
+				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+				$taskstatic->id = $lines[$i]->id;
+				$taskstatic->ref = $lines[$i]->label;
+				$taskstatic->date_start = $lines[$i]->date_start;
+				$taskstatic->date_end = $lines[$i]->date_end;
 				print $taskstatic->getNomUrl(0, 'withproject', 'time');
 				//print "<br>";
 				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -930,13 +930,13 @@ 
 
 				// Planned Workload
 				print '<td align="right">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
 				else print '--:--';
 				print '</td>';
 
 				// Progress declared %
 				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 				print '</td>';
 
 				// Time spent by everybody
@@ -945,7 +945,7 @@ 
 				if ($lines[$i]->duration)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
 				}
 				else print '--:--';
@@ -953,71 +953,71 @@ 
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
 				else print '--:--';
 				print "</td>\n";
 
-				$disabledproject=1;$disabledtask=1;
+				$disabledproject = 1; $disabledtask = 1;
 				//print "x".$lines[$i]->fk_project;
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
 				{
-					$disabledproject=0;
-					$disabledtask=0;
+					$disabledproject = 0;
+					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
 				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
 				{
-					$disabledtask=1;
+					$disabledtask = 1;
 				}
 
 				//var_dump($projectstatic->weekWorkLoadPerTask);
 
 				// Fields to show current time
-				$tableCell=''; $modeinput='hours';
+				$tableCell = ''; $modeinput = 'hours';
 				for ($idw = 0; $idw < 7; $idw++)
 		        {
-					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+					$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
-					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+					$cssonholiday = '';
+					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
+					elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
+					elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
 
-					$tmparray=dol_getdate($tmpday);
+					$tmparray = dol_getdate($tmpday);
 		        	$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
-		        	$alreadyspent='';
-		        	if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-                    $alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
+		        	$alreadyspent = '';
+		        	if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+                    $alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);
 
-                    $tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').'">';
+                    $tableCell = '<td align="center" class="hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').'">';
                     if ($alreadyspent)
                     {
-                        $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+                        $tableCell .= '<span class="timesheetalreadyrecorded"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
                         //$placeholder=' placeholder="00:00"';
-                        $placeholder='';
+                        $placeholder = '';
                      	//$tableCell.='+';
                     }
-                  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
-	        		$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-                   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-                   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-                   	$tableCell.='</td>';
+                  	$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+	        		$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
+                   	$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+                   	$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+                   	$tableCell .= '</td>';
                     print $tableCell;
 		        }
 
 		        // Warning
 				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
    				else if ($disabledtask)
    				{
    					$titleassigntask = $langs->trans("AssignTaskToMe");
    					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
 
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
    				}
 				print '</td>';
 
@@ -1056,8 +1056,8 @@ 
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {
 	//print 'Search in line with parent id = '.$parent.'<br>';
-	$numlines=count($lines);
-	for ($i = 0 ; $i < $numlines ; $i++)
+	$numlines = count($lines);
+	for ($i = 0; $i < $numlines; $i++)
 	{
 		// Process line $lines[$i]
 		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
@@ -1093,51 +1093,51 @@ 
  * @param   array   $hiddenfields       List of info to not show ('projectlabel', 'declaredprogress', '...', )
  * @return	void
  */
-function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array(),$hiddenfields=array())
+function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $statut = -1, $listofoppstatus = array(), $hiddenfields = array())
 {
-	global $langs,$conf,$user,$bc;
+	global $langs, $conf, $user, $bc;
 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-	$projectstatic=new Project($db);
-    $thirdpartystatic=new Societe($db);
+	$projectstatic = new Project($db);
+    $thirdpartystatic = new Societe($db);
 
-	$sortfield='';
-	$sortorder='';
-	$project_year_filter=0;
+	$sortfield = '';
+	$sortorder = '';
+	$project_year_filter = 0;
 
-	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+	$title = $langs->trans("Projects");
+	if (strcmp($statut, '') && $statut >= 0) $title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
 
-	$arrayidtypeofcontact=array();
+	$arrayidtypeofcontact = array();
 
 	print '<table class="noborder" width="100%">';
 
-	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 	if ($mytasks)
 	{
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 	}
 	else
 	{
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
-	$sql.= " WHERE p.entity = ".$conf->entity;
-	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	$sql .= " WHERE p.entity = ".$conf->entity;
+	$sql .= " AND p.rowid IN (".$projectsListId.")";
+	if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	if ($mytasks)
 	{
-		$sql.= " AND p.rowid = t.fk_projet";
-		$sql.= " AND ec.element_id = t.rowid";
-		$sql.= " AND ec.fk_socpeople = ".$user->id;
-		$sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
-		$sql.= " AND ctc.element = 'project_task'";
+		$sql .= " AND p.rowid = t.fk_projet";
+		$sql .= " AND ec.element_id = t.rowid";
+		$sql .= " AND ec.fk_socpeople = ".$user->id;
+		$sql .= " AND ec.fk_c_type_contact = ctc.rowid"; // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
+		$sql .= " AND ctc.element = 'project_task'";
 	}
 	if ($statut >= 0)
 	{
-		$sql.= " AND p.fk_statut = ".$statut;
+		$sql .= " AND p.fk_statut = ".$statut;
 	}
 	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
 	{
@@ -1149,40 +1149,40 @@ 
 			{
 				$project_year_filter = date("Y");
 			}
-			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
-			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
+			$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter, 12, false)).")";
+			$sql .= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter, 1, false)).")";
 		}
 	}
 
 	// Get id of project we must show tasks
-	$arrayidofprojects=array();
+	$arrayidofprojects = array();
 	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql;
+	$sql1 .= $sql;
 	$resql = $db->query($sql1);
 	if ($resql)
 	{
-	    $i=0;
+	    $i = 0;
 		$num = $db->num_rows($resql);
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-            $arrayidofprojects[$objp->projectid]=$objp->projectid;
+            $arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
 	}
 	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
+	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
-	$sql2.= " p.dateo, p.datee,";
-	$sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
-	$sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-	$sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
-	$sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
-	$sql2.= " ORDER BY p.title, p.ref";
+	$sql2 .= " p.dateo, p.datee,";
+	$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
+	$sql2 .= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+	$sql2 .= " WHERE p.rowid IN (".join(',', $arrayidofprojects).")";
+	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
+	$sql2 .= " ORDER BY p.title, p.ref";
 
 	$resql = $db->query($sql2);
 	if ($resql)
@@ -1195,20 +1195,20 @@ 
 		$i = 0;
 
     	print '<tr class="liste_titre">';
-    	print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-    	print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-    	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+    	print_liste_field_titre($title.' <span class="badge">'.$num.'</span>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+    	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+    	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
     	{
-    		print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
-    		print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
+    		print_liste_field_titre("OpportunityAmount", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+    		print_liste_field_titre("OpportunityStatus", "", "", "", "", 'align="right"', $sortfield, $sortorder);
     	}
     	if (empty($conf->global->PROJECT_HIDE_TASKS))
     	{
-            print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-            if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-            if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+            if (!in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload", "", "", "", "", 'align="right"', $sortfield, $sortorder);
+            if (!in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared", "", "", "", "", 'align="right"', $sortfield, $sortorder);
     	}
-    	print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
+    	print_liste_field_titre("Status", "", "", "", "", 'align="right"', $sortfield, $sortorder);
     	print "</tr>\n";
 
 		while ($i < $num)
@@ -1223,7 +1223,7 @@ 
 			$userAccess = $projectstatic->restrictedProjectArea($user);
 			if ($userAccess >= 0)
 			{
-			    $projectstatic->ref=$objp->ref;
+			    $projectstatic->ref = $objp->ref;
 			    $projectstatic->statut = $objp->status;
 			    $projectstatic->title = $objp->title;
 			    $projectstatic->datee = $db->jdate($objp->datee);
@@ -1233,18 +1233,18 @@ 
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+				if (!in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title, 24);
 				print '</td>';
 				print '<td>';
 				if ($objp->fk_soc > 0)
 				{
-    				$thirdpartystatic->id=$objp->fk_soc;
-    				$thirdpartystatic->ref=$objp->socname;
-    				$thirdpartystatic->name=$objp->socname;
+    				$thirdpartystatic->id = $objp->fk_soc;
+    				$thirdpartystatic->ref = $objp->socname;
+    				$thirdpartystatic->name = $objp->socname;
     				print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
-				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 				{
 					print '<td align="right">';
         			if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
@@ -1258,19 +1258,19 @@ 
 				{
 				    print '<td align="right">'.$objp->nb.'</td>';
 
-    				$plannedworkload=$objp->planned_workload;
-    				$total_plannedworkload+=$plannedworkload;
-    				if (! in_array('plannedworkload', $hiddenfields))
+    				$plannedworkload = $objp->planned_workload;
+    				$total_plannedworkload += $plannedworkload;
+    				if (!in_array('plannedworkload', $hiddenfields))
     				{
-    				    print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+    				    print '<td align="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
     				}
-    				if (! in_array('declaredprogress', $hiddenfields))
+    				if (!in_array('declaredprogress', $hiddenfields))
     				{
-    				    $declaredprogressworkload=$objp->declared_progess_workload;
-        				$total_declaredprogressworkload+=$declaredprogressworkload;
+    				    $declaredprogressworkload = $objp->declared_progess_workload;
+        				$total_declaredprogressworkload += $declaredprogressworkload;
         				print '<td align="right">';
         				//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-        				print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
+        				print ($plannedworkload ?round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');
         				print '</td>';
     				}
 				}
@@ -1288,7 +1288,7 @@ 
 
 		print '<tr class="liste_total">';
 		print '<td colspan="2">'.$langs->trans("Total")."</td>";
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
 			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
 			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
@@ -1296,8 +1296,8 @@ 
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
             print '<td class="liste_total" align="right">'.$total_task.'</td>';
-            if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-            if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+            if (!in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';
+            if (!in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
 		}
 		print '<td class="liste_total"></td>';
         print '</tr>';