alxarafe / alixar

dolibarr/htdocs/core/lib/ws.lib.php

Indentation +21 added lines, -21 removed lines

@@ -65,32 +65,32 @@
             $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
         }
 
-		if (! $error && $fuser->statut == 0)
-		{
-			$error++;
-			$errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
-		}
+        if (! $error && $fuser->statut == 0)
+        {
+            $error++;
+            $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
+        }
 
-    	// Validation of login
-		if (! $error)
-		{
-			$fuser->getrights();	// Load permission of user
+        // Validation of login
+        if (! $error)
+        {
+            $fuser->getrights();	// Load permission of user
 
-        	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
-        	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-        	// Set authmode
-        	$authmode=explode(',',$dolibarr_main_authentication);
+            // Authentication mode
+            if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+            // Authentication mode: forceuser
+            if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+            // Set authmode
+            $authmode=explode(',',$dolibarr_main_authentication);
 
             include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode);
-			if (empty($login))
-			{
-			    $error++;
+            $login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode);
+            if (empty($login))
+            {
+                $error++;
                 $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
-			}
-		}
+            }
+        }
     }
 
     return $fuser;

Spacing +21 added lines, -21 removed lines

@@ -32,63 +32,63 @@
  *  @param  string	$errorlabel		Error string label
  *  @return User						Return user object identified by login/pass/entity into authentication array
  */
-function check_authentication($authentication,&$error,&$errorcode,&$errorlabel)
+function check_authentication($authentication, &$error, &$errorcode, &$errorlabel)
 {
-    global $db,$conf,$langs;
-    global $dolibarr_main_authentication,$dolibarr_auto_user;
+    global $db, $conf, $langs;
+    global $dolibarr_main_authentication, $dolibarr_auto_user;
 
-    $fuser=new User($db);
+    $fuser = new User($db);
 
-    if (! $error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
+    if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
     {
         $error++;
-        $errorcode='BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel='Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
+        $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
     }
 
-    if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity']))
+    if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
     {
         $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
     }
 
-    if (! $error)
+    if (!$error)
     {
-        $result=$fuser->fetch('',$authentication['login'],'',0);
+        $result = $fuser->fetch('', $authentication['login'], '', 0);
         if ($result < 0)
         {
             $error++;
-            $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user';
+            $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
         }
         else if ($result == 0)
         {
             $error++;
-            $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
+            $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
         }
 
-		if (! $error && $fuser->statut == 0)
+		if (!$error && $fuser->statut == 0)
 		{
 			$error++;
-			$errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
+			$errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';
 		}
 
     	// Validation of login
-		if (! $error)
+		if (!$error)
 		{
-			$fuser->getrights();	// Load permission of user
+			$fuser->getrights(); // Load permission of user
 
         	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
         	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
         	// Set authmode
-        	$authmode=explode(',',$dolibarr_main_authentication);
+        	$authmode = explode(',', $dolibarr_main_authentication);
 
             include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode);
+        	$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode);
 			if (empty($login))
 			{
 			    $error++;
-                $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
+                $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
 			}
 		}
     }

Braces +7 added lines, -4 removed lines

@@ -58,8 +58,7 @@ 
         {
             $error++;
             $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user';
-        }
-        else if ($result == 0)
+        } else if ($result == 0)
         {
             $error++;
             $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
@@ -77,9 +76,13 @@ 
 			$fuser->getrights();	// Load permission of user
 
         	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+        	if (empty($dolibarr_main_authentication)) {
+        	    $dolibarr_main_authentication='http,dolibarr';
+        	}
         	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+        	    $dolibarr_auto_user='auto';
+        	}
         	// Set authmode
         	$authmode=explode(',',$dolibarr_main_authentication);
 

dolibarr/htdocs/core/lib/fichinter.lib.php

Indentation +91 added lines, -91 removed lines

@@ -35,26 +35,26 @@ 
  */
 function fichinter_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$langs->load("fichinter");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('InterventionContact');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    global $db, $langs, $conf, $user;
+    $langs->load("fichinter");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('InterventionContact');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -62,58 +62,58 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention');
 
-	// Tab to link resources
-	if ($conf->resource->enabled)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
- 		$nbResource = 0;
-		$objectres=new Dolresource($db);
-		if (is_array($objectres->available_resources))
-		{
-	 		foreach ($objectres->available_resources as $modresources => $resources)
-			{
-				$resources=(array) $resources;  // To be sure $resources is an array
-				foreach($resources as $resource_obj)
-				{
-					$linked_resources = $object->getElementResources('fichinter',$object->id,$resource_obj);
-				}
-			}
-		}
-
-   		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
-		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
-		$head[$h][2] = 'resource';
-		$h++;
-	}
+    // Tab to link resources
+    if ($conf->resource->enabled)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+            $nbResource = 0;
+        $objectres=new Dolresource($db);
+        if (is_array($objectres->available_resources))
+        {
+                foreach ($objectres->available_resources as $modresources => $resources)
+            {
+                $resources=(array) $resources;  // To be sure $resources is an array
+                foreach($resources as $resource_obj)
+                {
+                    $linked_resources = $object->getElementResources('fichinter',$object->id,$resource_obj);
+                }
+            }
+        }
+
+            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
+        $head[$h][1] = $langs->trans("Resources");
+        if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+        $head[$h][2] = 'resource';
+        $h++;
+    }
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fichinter/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] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/fichinter/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] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->ficheinter->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->ficheinter->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.'/fichinter/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention','remove');
 
@@ -127,39 +127,39 @@ 
  */
 function fichinter_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$h = 0;
+    $h = 0;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php";
-	$head[$h][1] = $langs->trans("Interventions");
-	$head[$h][2] = 'ficheinter';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php";
+    $head[$h][1] = $langs->trans("Interventions");
+    $head[$h][2] = 'ficheinter';
+    $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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin');
+    // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributesdet';
     $h++;
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
 
-		return $head;
+        return $head;
 }
 
 /**
@@ -170,20 +170,20 @@ 
  */
 function fichinter_rec_prepare_head($object)
 {
-	global $langs, $conf; //, $user;
+    global $langs, $conf; //, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardFichinter");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("CardFichinter");
+    $head[$h][2] = 'card';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h,'intervention-rec','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h,'intervention-rec','remove');
 
 
-	return $head;
+    return $head;
 }

Spacing +19 added lines, -19 removed lines

@@ -48,10 +48,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $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.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
-		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++;
 	}
@@ -60,29 +60,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,'intervention');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');
 
 	// Tab to link resources
 	if ($conf->resource->enabled)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
  		$nbResource = 0;
-		$objectres=new Dolresource($db);
+		$objectres = new Dolresource($db);
 		if (is_array($objectres->available_resources))
 		{
 	 		foreach ($objectres->available_resources as $modresources => $resources)
 			{
-				$resources=(array) $resources;  // To be sure $resources is an array
-				foreach($resources as $resource_obj)
+				$resources = (array) $resources; // To be sure $resources is an array
+				foreach ($resources as $resource_obj)
 				{
-					$linked_resources = $object->getElementResources('fichinter',$object->id,$resource_obj);
+					$linked_resources = $object->getElementResources('fichinter', $object->id, $resource_obj);
 				}
 			}
 		}
 
    		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+		if ($nbResource > 0) $head[$h][1] .= ' <span class="badge">'.$nbResource.'</span>';
 		$head[$h][2] = 'resource';
 		$h++;
 	}
@@ -90,23 +90,23 @@ 
     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.'/fichinter/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] = 'note';
     	$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->ficheinter->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->ficheinter->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.'/fichinter/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] = 'documents';
 	$h++;
 
@@ -115,7 +115,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');
 
     return $head;
 }
@@ -143,7 +143,7 @@ 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'fichinter_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -157,7 +157,7 @@ 
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'fichinter_admin', 'remove');
 
 		return $head;
 }
@@ -182,7 +182,7 @@ 
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h,'intervention-rec','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec', 'remove');
 
 
 	return $head;

Braces +18 added lines, -6 removed lines

@@ -51,7 +51,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
-		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++;
 	}
@@ -82,7 +84,9 @@ 
 
    		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+		if ($nbResource > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+		}
 		$head[$h][2] = 'resource';
 		$h++;
 	}
@@ -90,11 +94,17 @@ 
     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.'/fichinter/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] = 'note';
     	$h++;
     }
@@ -106,7 +116,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/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] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/emailing.lib.php

Indentation +29 added lines, -29 removed lines

@@ -29,42 +29,42 @@
  */
 function emailing_prepare_head(Mailing $object)
 {
-	global $user, $langs, $conf;
+    global $user, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("MailCard");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/comm/mailing/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("MailCard");
+    $head[$h][2] = 'card';
+    $h++;
 
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
-	{
-    	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("MailRecipients");
-		if ($object->nbemail > 0) $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
-    	$head[$h][2] = 'targets';
-    	$h++;
-	}
+    if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("MailRecipients");
+        if ($object->nbemail > 0) $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
+        $head[$h][2] = 'targets';
+        $h++;
+    }
 
-	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
-		$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
-		$head[$h][2] = 'advtargets';
-		$h++;
-	}
+    if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("MailAdvTargetRecipients");
+        $head[$h][2] = 'advtargets';
+        $h++;
+    }
 
-	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/comm/mailing/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,'emailing');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
 
-	return $head;
+    return $head;
 }
 

Spacing +5 added lines, -5 removed lines

@@ -39,16 +39,16 @@ 
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
 	{
     	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("MailRecipients");
-		if ($object->nbemail > 0) $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
+		if ($object->nbemail > 0) $head[$h][1] .= ' <span class="badge">'.$object->nbemail.'</span>';
     	$head[$h][2] = 'targets';
     	$h++;
 	}
 
-	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
+	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
@@ -61,9 +61,9 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailing');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailing', 'remove');
 
 	return $head;
 }

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
 	{
     	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("MailRecipients");
-		if ($object->nbemail > 0) $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
+		if ($object->nbemail > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
+		}
     	$head[$h][2] = 'targets';
     	$h++;
 	}

dolibarr/htdocs/core/lib/order.lib.php

Indentation +83 added lines, -83 removed lines

@@ -33,48 +33,48 @@ 
  */
 function commande_prepare_head(Commande $object)
 {
-	global $db, $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
-	$langs->load("orders");
-
-	$h = 0;
-	$head = array();
-
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("OrderCard");
-		$head[$h][2] = 'order';
-		$h++;
-	}
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
-	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
-	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
-	{
-		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
-		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
-		$text='';
-		if ($conf->expedition_bon->enabled) $text.=$langs->trans("Shipments");
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
-		$head[$h][1] = $text;
-		$head[$h][2] = 'shipping';
-		$h++;
-	}
+    global $db, $langs, $conf, $user;
+    if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+    $langs->load("orders");
+
+    $h = 0;
+    $head = array();
+
+    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("OrderCard");
+        $head[$h][2] = 'order';
+        $h++;
+    }
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
+
+    if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
+    || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
+    {
+        $nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
+        $head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
+        $text='';
+        if ($conf->expedition_bon->enabled) $text.=$langs->trans("Shipments");
+        if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
+        if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
+        if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
+        if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
+        if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
+        if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
+        $head[$h][1] = $text;
+        $head[$h][2] = 'shipping';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -82,33 +82,33 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'order');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = 0;
+    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.'/commande/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] = 'note';
-		$h++;
-	}
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/commande/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] = 'note';
+        $h++;
+    }
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->commande->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.'/commande/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/commande/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/commande/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,'order','remove');
 
@@ -122,31 +122,31 @@ 
  */
 function order_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/commande.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/commande.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/order_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/order_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/orderdet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/orderdet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +24 added lines, -24 removed lines

@@ -34,13 +34,13 @@ 
 function commande_prepare_head(Commande $object)
 {
 	global $db, $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (!empty($conf->expedition->enabled)) $langs->load("sendings");
 	$langs->load("orders");
 
 	$h = 0;
 	$head = array();
 
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderCard");
@@ -50,10 +50,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $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.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		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++;
 	}
@@ -61,16 +61,16 @@ 
 	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
 	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
 	{
-		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
+		$nbShipments = $object->getNbOfShipments(); $nbReceiption = 0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
-		$text='';
-		if ($conf->expedition_bon->enabled) $text.=$langs->trans("Shipments");
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
+		$text = '';
+		if ($conf->expedition_bon->enabled) $text .= $langs->trans("Shipments");
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text .= '/';
+		if ($conf->livraison_bon->enabled)  $text .= $langs->trans("Receivings");
+		if ($nbShipments > 0 || $nbReceiption > 0) $text .= ' <span class="badge">'.($nbShipments ? $nbShipments : 0);
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text .= '/';
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ($nbReceiption ? $nbReceiption : 0);
+		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '</span>';
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -80,28 +80,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,'order');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
 
 	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.'/commande/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] = 'note';
 		$h++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->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->commande->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.'/commande/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] = 'documents';
 	$h++;
 
@@ -110,7 +110,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
     return $head;
 }
@@ -132,7 +132,7 @@ 
 	$head[$h][2] = 'general';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'order_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/order_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -144,7 +144,7 @@ 
 	$head[$h][2] = 'attributeslines';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'order_admin', 'remove');
 
 	return $head;
 }

Braces +39 added lines, -13 removed lines

@@ -34,7 +34,9 @@ 
 function commande_prepare_head(Commande $object)
 {
 	global $db, $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (! empty($conf->expedition->enabled)) {
+	    $langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;
@@ -53,7 +55,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		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++;
 	}
@@ -64,13 +68,27 @@ 
 		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
 		$text='';
-		if ($conf->expedition_bon->enabled) $text.=$langs->trans("Shipments");
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
+		if ($conf->expedition_bon->enabled) {
+		    $text.=$langs->trans("Shipments");
+		}
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) {
+		    $text.='/';
+		}
+		if ($conf->livraison_bon->enabled) {
+		    $text.=$langs->trans("Receivings");
+		}
+		if ($nbShipments > 0 || $nbReceiption > 0) {
+		    $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
+		}
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) {
+		    $text.='/';
+		}
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) {
+		    $text.= ($nbReceiption?$nbReceiption:0);
+		}
+		if ($nbShipments > 0 || $nbReceiption > 0) {
+		    $text.= '</span>';
+		}
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -85,11 +103,17 @@ 
 	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.'/commande/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] = 'note';
 		$h++;
 	}
@@ -101,7 +125,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/commande/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] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/website.lib.php

Indentation +601 added lines, -601 removed lines

@@ -35,63 +35,63 @@ 
  */
 function dolWebsiteReplacementOfLinks($website, $content, $removephppart=0)
 {
-	$nbrep = 0;
-
-	// Replace php code. Note $content may come from database and does not contains body tags.
-	$replacewith='...php...';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
-
-	$replacewith='"callto=#';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	$replacewith='"mailto=#';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	$replacewith='src="php';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	$replacewith='href="php';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	//$replacewith='<span class="phptag">...php...</span>';
-	$replacewith='<span class="phptag">...php...</span>';
-	if ($removephppart) $replacewith='';
-	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
-	/*if ($content === null) {
+    $nbrep = 0;
+
+    // Replace php code. Note $content may come from database and does not contains body tags.
+    $replacewith='...php...';
+    if ($removephppart) $replacewith='';
+    $content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
+
+    $replacewith='"callto=#';
+    if ($removephppart) $replacewith='';
+    $content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+    $replacewith='"mailto=#';
+    if ($removephppart) $replacewith='';
+    $content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+    $replacewith='src="php';
+    if ($removephppart) $replacewith='';
+    $content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+    $replacewith='href="php';
+    if ($removephppart) $replacewith='';
+    $content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+    //$replacewith='<span class="phptag">...php...</span>';
+    $replacewith='<span class="phptag">...php...</span>';
+    if ($removephppart) $replacewith='';
+    //$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
+    /*if ($content === null) {
 		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
 	}*/
-	$content = dolStripPhpCode($content, $replacewith);
-	//var_dump($content);
+    $content = dolStripPhpCode($content, $replacewith);
+    //var_dump($content);
 
-	// Replace relative link / with dolibarr URL
-	$content = preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
-	// Replace relative link /xxx.php with dolibarr URL
-	$content = preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+    // Replace relative link / with dolibarr URL
+    $content = preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
+    // Replace relative link /xxx.php with dolibarr URL
+    $content = preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2"', $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('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $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('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 
-	// <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-	$content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\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|\/?viewimage|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-	// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
-	$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
+    // <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+    $content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\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|\/?viewimage|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+    // <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
+    $content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
 
-	// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
-	$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+    // action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
+    $content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/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('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $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('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
-	return $content;
+    return $content;
 }
 
 
@@ -104,33 +104,33 @@ 
  */
 function dolStripPhpCode($str, $replacewith='')
 {
-	$newstr = '';
-
-	//split on each opening tag
-	$parts = explode('<?php',$str);
-	if (!empty($parts))
-	{
-		$i=0;
-		foreach($parts as $part)
-		{
-			if ($i == 0) 	// The first part is never php code
-			{
-				$i++;
-				$newstr .= $part;
-				continue;
-			}
-			//split on closing tag
-			$partlings = explode('?>', $part);
-			if (!empty($partlings))
-			{
-				//remove content before closing tag
-				if (count($partlings) > 1) $partlings[0] = '';
-				//append to out string
-				$newstr .= $replacewith.implode('',$partlings);
-			}
-		}
-	}
-	return $newstr;
+    $newstr = '';
+
+    //split on each opening tag
+    $parts = explode('<?php',$str);
+    if (!empty($parts))
+    {
+        $i=0;
+        foreach($parts as $part)
+        {
+            if ($i == 0) 	// The first part is never php code
+            {
+                $i++;
+                $newstr .= $part;
+                continue;
+            }
+            //split on closing tag
+            $partlings = explode('?>', $part);
+            if (!empty($partlings))
+            {
+                //remove content before closing tag
+                if (count($partlings) > 1) $partlings[0] = '';
+                //append to out string
+                $newstr .= $replacewith.implode('',$partlings);
+            }
+        }
+    }
+    return $newstr;
 }
 
 
@@ -144,101 +144,101 @@ 
  */
 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 (USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." (USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
+
+    // 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
+
+    if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
+    {
+        // We remove the <head> part of content
+        $content = preg_replace('/<head>.*<\/head>/ims', '', $content);
+        $content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
+        $content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
+    }
+    elseif (defined('USEDOLIBARRSERVER'))	// 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/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
+        // Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
+        $content=preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+        // Replace relative link /xxx with dolibarr URL:  ...href="....php"
+        $content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
+        $content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\?)/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
+
+        // Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  href="/document.php?modulepart=" => href="/dolibarr/document.php?modulepart="
+        $content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+        $content=preg_replace('/(src=")(\/?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=" => href="/dolibarr/viewimage.php?modulepart="
+        $content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+        $content=preg_replace('/(src=")(\/?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('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+
+        // <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+        $content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\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|\/?viewimage|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+        // <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
+        $content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
+
+        // action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
+        $content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+    }
+    else									// 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('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+
+            $content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+
+            $content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
+
+            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
+        }
+        else
+        {
+            $content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
+
+            $content=preg_replace('/(<a[^>]*href=")[^\"]*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);
+
+            $content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+            $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+
+            $content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
+        }
+    }
 
-	dol_syslog("dolWebsiteOutput start (USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." (USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
+    $content=preg_replace('/ contenteditable="true"/', ' contenteditable="false"', $content, -1, $nbrep);
 
-	// 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
+    dol_syslog("dolWebsiteOutput end");
 
-	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
-	{
-		// We remove the <head> part of content
-		$content = preg_replace('/<head>.*<\/head>/ims', '', $content);
-		$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
-		$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
-	}
-	elseif (defined('USEDOLIBARRSERVER'))	// 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/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
-		// Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
-		$content=preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-		// Replace relative link /xxx with dolibarr URL:  ...href="....php"
-		$content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\?)/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
-
-		// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  href="/document.php?modulepart=" => href="/dolibarr/document.php?modulepart="
-		$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(src=")(\/?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=" => href="/dolibarr/viewimage.php?modulepart="
-		$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(src=")(\/?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('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-
-		// <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-		$content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\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|\/?viewimage|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-		// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
-		$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
-
-		// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
-		$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-	}
-	else									// 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('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
-
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
-		}
-		else
-		{
-			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
-
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*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);
-
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
-		}
-	}
-
-	$content=preg_replace('/ contenteditable="true"/', ' contenteditable="false"', $content, -1, $nbrep);
-
-	dol_syslog("dolWebsiteOutput end");
-
-	print $content;
+    print $content;
 }
 
 
@@ -279,74 +279,74 @@ 
  */
 function redirectToContainer($containerref, $containeraliasalt='',$containerid=0)
 {
-	global $db, $website;
-
-	$newurl = '';
-	$result=0;
-
-	// We make redirect using the alternative alias, we must find the real $containerref
-	if ($containeraliasalt)
-	{
-		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
-		$tmpwebsitepage=new WebsitePage($db);
-		$result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt);
-		if ($result > 0)
-		{
-			$containerref = $tmpwebsitepage->pageurl;
-		}
-		else
-		{
-			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
-			exit;
-		}
-	}
-
-	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
-	{
-		// Check new container exists
-		if (! $containeraliasalt)	// If containeraliasalt set, we already did the test
-		{
-			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
-			$tmpwebsitepage=new WebsitePage($db);
-			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
-			unset($tmpwebsitepage);
-		}
-		if ($result > 0)
-		{
-			$currenturi = $_SERVER["REQUEST_URI"];
-			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
-			{
-				if ($regtmp[0] == $containerref)
-				{
-					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
-					exit;
-				}
-				else
-				{
-					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
-				}
-			}
-			else
-			{
-				$newurl = $currenturi.'&pageref='.urlencode($containerref);
-			}
-		}
-	}
-	else								// When page called from virtual host server
-	{
-		$newurl = '/'.$containerref.'.php';
-	}
-
-	if ($newurl)
-	{
-		header("Location: ".$newurl);
-		exit;
-	}
-	else
-	{
-		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
-		exit;
-	}
+    global $db, $website;
+
+    $newurl = '';
+    $result=0;
+
+    // We make redirect using the alternative alias, we must find the real $containerref
+    if ($containeraliasalt)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+        $tmpwebsitepage=new WebsitePage($db);
+        $result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt);
+        if ($result > 0)
+        {
+            $containerref = $tmpwebsitepage->pageurl;
+        }
+        else
+        {
+            print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
+            exit;
+        }
+    }
+
+    if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
+    {
+        // Check new container exists
+        if (! $containeraliasalt)	// If containeraliasalt set, we already did the test
+        {
+            include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+            $tmpwebsitepage=new WebsitePage($db);
+            $result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
+            unset($tmpwebsitepage);
+        }
+        if ($result > 0)
+        {
+            $currenturi = $_SERVER["REQUEST_URI"];
+            if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
+            {
+                if ($regtmp[0] == $containerref)
+                {
+                    print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
+                    exit;
+                }
+                else
+                {
+                    $newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
+                }
+            }
+            else
+            {
+                $newurl = $currenturi.'&pageref='.urlencode($containerref);
+            }
+        }
+    }
+    else								// When page called from virtual host server
+    {
+        $newurl = '/'.$containerref.'.php';
+    }
+
+    if ($newurl)
+    {
+        header("Location: ".$newurl);
+        exit;
+    }
+    else
+    {
+        print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
+        exit;
+    }
 }
 
 
@@ -359,41 +359,41 @@ 
  */
 function includeContainer($containerref)
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs;	// Very important. Required to have var available when running inluded containers.
-	global $includehtmlcontentopened;
-	global $websitekey, $websitepagefile;
+    global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs;	// Very important. Required to have var available when running inluded containers.
+    global $includehtmlcontentopened;
+    global $websitekey, $websitepagefile;
 
-	$MAXLEVEL=20;
+    $MAXLEVEL=20;
 
-	if (! preg_match('/\.php$/i', $containerref)) $containerref.='.php';
+    if (! preg_match('/\.php$/i', $containerref)) $containerref.='.php';
 
-	$fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
+    $fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
-	$includehtmlcontentopened++;
-	if ($includehtmlcontentopened > $MAXLEVEL)
-	{
-		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.$MAXLEVEL.".\n";
-		return;
-	}
-	// file_get_contents is not possible. We must execute code with include
-	//$content = file_get_contents($fullpathfile);
-	//print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
+    if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
+    $includehtmlcontentopened++;
+    if ($includehtmlcontentopened > $MAXLEVEL)
+    {
+        print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.$MAXLEVEL.".\n";
+        return;
+    }
+    // file_get_contents is not possible. We must execute code with include
+    //$content = file_get_contents($fullpathfile);
+    //print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $content);*/
 
-	ob_start();
-	$res = include $fullpathfile;		// Include because we want to execute code content
-	$tmpoutput = ob_get_contents();
-	ob_end_clean();
+    ob_start();
+    $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 "\n".'<!-- include '.$fullpathfile.' level = '.$includehtmlcontentopened.' -->'."\n";
+    print preg_replace(array('/^.*<body[^>]*>/ims','/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
-	if (! $res)
-	{
-		print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref.".\n";
-	}
+    if (! $res)
+    {
+        print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref.".\n";
+    }
 
-	$includehtmlcontentopened--;
+    $includehtmlcontentopened--;
 }
 
 
@@ -414,172 +414,172 @@ 
  */
 function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks=0, $grabimages=1, $grabimagesinto='subpage')
 {
-	global $conf;
-
-	$error=0;
-
-	dol_syslog("Call getAllImages with grabimagesinto=".$grabimagesinto);
-
-	$alreadygrabbed=array();
-
-	if (preg_match('/\/$/', $urltograb)) $urltograb.='.';
-	$urltograb = dirname($urltograb);							// So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
-
-	// Search X in "img...src=X"
-	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('/^\//', $regs[2][$key]))
-		{
-			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
-			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-		}
-		else
-		{
-			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
-		}
-
-		$linkwithoutdomain = $regs[2][$key];
-		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
-
-		// Define $filetosave and $filename
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(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.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-		}
-		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-
-		// Clean the aa/bb/../cc into aa/cc
-		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
-		$filename = preg_replace('/\/[^\/]+\/\.\./', '', $filename);
-
-		//var_dump($filetosave);
-		//var_dump($filename);
-		//exit;
-
-		if (empty($alreadygrabbed[$urltograbbis]))
-		{
-			if ($grabimages)
-			{
-				$tmpgeturl = getURLContent($urltograbbis);
-				if ($tmpgeturl['curl_error_no'])
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-					$action='create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
-					$action='create';
-				}
-				else
-				{
-					$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))
-						@chmod($filetosave, 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);
-		}
-	}
-
-	// Search X in "background...url(X)"
-	preg_match_all('/background([^\.\/\(;]+)url\([\"\']?([^\)\"\']*)[\"\']?\)/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('/^\//', $regs[2][$key]))
-		{
-			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
-			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-		}
-		else
-		{
-			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
-		}
-
-		$linkwithoutdomain = $regs[2][$key];
-
-		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
-
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(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.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-		}
-
-		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
-
-		// Clean the aa/bb/../cc into aa/cc
-		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
-		$filename = preg_replace('/\/[^\/]+\/\.\./', '', $filename);
-
-		//var_dump($filetosave);
-		//var_dump($filename);
-		//exit;
-
-		if (empty($alreadygrabbed[$urltograbbis]))
-		{
-			if ($grabimages)
-			{
-				$tmpgeturl = getURLContent($urltograbbis);
-				if ($tmpgeturl['curl_error_no'])
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-					$action='create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
-				{
-					$error++;
-					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
-					$action='create';
-				}
-				else
-				{
-					$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))
-						@chmod($filetosave, 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);
-		}
-	}
+    global $conf;
+
+    $error=0;
+
+    dol_syslog("Call getAllImages with grabimagesinto=".$grabimagesinto);
+
+    $alreadygrabbed=array();
+
+    if (preg_match('/\/$/', $urltograb)) $urltograb.='.';
+    $urltograb = dirname($urltograb);							// So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
+
+    // Search X in "img...src=X"
+    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('/^\//', $regs[2][$key]))
+        {
+            $urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
+            $urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+        }
+        else
+        {
+            $urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
+        }
+
+        $linkwithoutdomain = $regs[2][$key];
+        $dirforimages = '/'.$objectpage->pageurl;
+        if ($grabimagesinto == 'root') $dirforimages='';
+
+        // Define $filetosave and $filename
+        $filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(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.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+        }
+        $filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+
+        // Clean the aa/bb/../cc into aa/cc
+        $filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
+        $filename = preg_replace('/\/[^\/]+\/\.\./', '', $filename);
+
+        //var_dump($filetosave);
+        //var_dump($filename);
+        //exit;
+
+        if (empty($alreadygrabbed[$urltograbbis]))
+        {
+            if ($grabimages)
+            {
+                $tmpgeturl = getURLContent($urltograbbis);
+                if ($tmpgeturl['curl_error_no'])
+                {
+                    $error++;
+                    setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+                    $action='create';
+                }
+                elseif ($tmpgeturl['http_code'] != '200')
+                {
+                    $error++;
+                    setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+                    $action='create';
+                }
+                else
+                {
+                    $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))
+                        @chmod($filetosave, 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);
+        }
+    }
+
+    // Search X in "background...url(X)"
+    preg_match_all('/background([^\.\/\(;]+)url\([\"\']?([^\)\"\']*)[\"\']?\)/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('/^\//', $regs[2][$key]))
+        {
+            $urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
+            $urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+        }
+        else
+        {
+            $urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
+        }
+
+        $linkwithoutdomain = $regs[2][$key];
+
+        $dirforimages = '/'.$objectpage->pageurl;
+        if ($grabimagesinto == 'root') $dirforimages='';
+
+        $filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(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.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+        }
+
+        $filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+
+        // Clean the aa/bb/../cc into aa/cc
+        $filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
+        $filename = preg_replace('/\/[^\/]+\/\.\./', '', $filename);
+
+        //var_dump($filetosave);
+        //var_dump($filename);
+        //exit;
+
+        if (empty($alreadygrabbed[$urltograbbis]))
+        {
+            if ($grabimages)
+            {
+                $tmpgeturl = getURLContent($urltograbbis);
+                if ($tmpgeturl['curl_error_no'])
+                {
+                    $error++;
+                    setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+                    $action='create';
+                }
+                elseif ($tmpgeturl['http_code'] != '200')
+                {
+                    $error++;
+                    setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+                    $action='create';
+                }
+                else
+                {
+                    $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))
+                        @chmod($filetosave, 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);
+        }
+    }
 }
 
 
@@ -592,21 +592,21 @@ 
  */
 function dolSaveMasterFile($filemaster)
 {
-	global $conf;
+    global $conf;
 
-	// Now generate the master.inc.php page
-	dol_syslog("We regenerate the master file");
-	dol_delete_file($filemaster);
+    // Now generate the master.inc.php page
+    dol_syslog("We regenerate the master file");
+    dol_delete_file($filemaster);
 
-	$mastercontent = '<?php'."\n";
-	$mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
-	$mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
-	$mastercontent.= '?>'."\n";
-	$result = file_put_contents($filemaster, $mastercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+    $mastercontent = '<?php'."\n";
+    $mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
+    $mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+    $mastercontent.= '?>'."\n";
+    $result = file_put_contents($filemaster, $mastercontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filemaster, octdec($conf->global->MAIN_UMASK));
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -619,23 +619,23 @@ 
  */
 function dolSavePageAlias($filealias, $object, $objectpage)
 {
-	global $conf;
-
-	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
-	dol_syslog("We regenerate the alias page filealias=".$filealias);
-
-	$aliascontent = '<?php'."\n";
-	$aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
-	$aliascontent.= 'global $dolibarr_main_data_root;'."\n";
-	$aliascontent.= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
-	$aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
-	$aliascontent.= '?>'."\n";
-	$result = file_put_contents($filealias, $aliascontent);
-	if (! empty($conf->global->MAIN_UMASK)) {
+    global $conf;
+
+    // Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
+    dol_syslog("We regenerate the alias page filealias=".$filealias);
+
+    $aliascontent = '<?php'."\n";
+    $aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
+    $aliascontent.= 'global $dolibarr_main_data_root;'."\n";
+    $aliascontent.= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
+    $aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+    $aliascontent.= '?>'."\n";
+    $result = file_put_contents($filealias, $aliascontent);
+    if (! empty($conf->global->MAIN_UMASK)) {
         @chmod($filealias, octdec($conf->global->MAIN_UMASK));
     }
 
-	return ($result?true:false);
+    return ($result?true:false);
 }
 
 
@@ -649,60 +649,60 @@ 
  */
 function dolSavePageContent($filetpl, $object, $objectpage)
 {
-	global $conf;
-
-	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
-	dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
-
-	dol_delete_file($filetpl);
-
-	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
-
-	$tplcontent ='';
-	$tplcontent.= "<?php // BEGIN PHP\n";
-	$tplcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$tplcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
-	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$tplcontent.= "ob_start();\n";
-	$tplcontent.= "// END PHP ?>\n";
-	$tplcontent.= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"':'').'>'."\n";
-	$tplcontent.= '<head>'."\n";
-	$tplcontent.= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
-	$tplcontent.= '<meta charset="UTF-8">'."\n";
-	$tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
-	$tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
-	$tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-	$tplcontent.= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
-	$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
-	$tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
-	$tplcontent.= '<!-- Include link to CSS file -->'."\n";
-	$tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
-	$tplcontent.= '<!-- Include HTML header from common file -->'."\n";
-	$tplcontent.= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
-	$tplcontent.= '<!-- Include HTML header from page header block -->'."\n";
-	$tplcontent.= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
-	$tplcontent.= '</head>'."\n";
-
-	$tplcontent.= '<!-- File generated by Dolibarr website module editor -->'."\n";
-	$tplcontent.= '<body id="bodywebsite" class="bodywebsite">'."\n";
-	$tplcontent.= $objectpage->content."\n";
-	$tplcontent.= '</body>'."\n";
-	$tplcontent.= '</html>'."\n";
-
-	$tplcontent.= '<?php // BEGIN PHP'."\n";
-	$tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-	$tplcontent.= "// END PHP ?>"."\n";
-
-	//var_dump($filetpl);exit;
-	$result = file_put_contents($filetpl, $tplcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
-
-		return $result;
+    global $conf;
+
+    // Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
+    dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
+
+    dol_delete_file($filetpl);
+
+    $shortlangcode = '';
+    if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
+
+    $tplcontent ='';
+    $tplcontent.= "<?php // BEGIN PHP\n";
+    $tplcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+    $tplcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
+    $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+    $tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+    $tplcontent.= "ob_start();\n";
+    $tplcontent.= "// END PHP ?>\n";
+    $tplcontent.= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"':'').'>'."\n";
+    $tplcontent.= '<head>'."\n";
+    $tplcontent.= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
+    $tplcontent.= '<meta charset="UTF-8">'."\n";
+    $tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
+    $tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
+    $tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+    $tplcontent.= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
+    $tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
+    $tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
+    $tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
+    $tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
+    $tplcontent.= '<!-- Include link to CSS file -->'."\n";
+    $tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
+    $tplcontent.= '<!-- Include HTML header from common file -->'."\n";
+    $tplcontent.= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
+    $tplcontent.= '<!-- Include HTML header from page header block -->'."\n";
+    $tplcontent.= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
+    $tplcontent.= '</head>'."\n";
+
+    $tplcontent.= '<!-- File generated by Dolibarr website module editor -->'."\n";
+    $tplcontent.= '<body id="bodywebsite" class="bodywebsite">'."\n";
+    $tplcontent.= $objectpage->content."\n";
+    $tplcontent.= '</body>'."\n";
+    $tplcontent.= '</html>'."\n";
+
+    $tplcontent.= '<?php // BEGIN PHP'."\n";
+    $tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+    $tplcontent.= "// END PHP ?>"."\n";
+
+    //var_dump($filetpl);exit;
+    $result = file_put_contents($filetpl, $tplcontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+
+        return $result;
 }
 
 
@@ -717,38 +717,38 @@ 
  */
 function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 {
-	global $conf;
-
-	$result1=false;
-	$result2=false;
-
-	dol_mkdir($pathofwebsite);
-
-	dol_delete_file($fileindex);
-	$indexcontent = '<?php'."\n";
-	$indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
-	$indexcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$indexcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
-	$indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
-	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$indexcontent.= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
-	$indexcontent.= "}\n";
-	$indexcontent.= "include_once './".basename($filetpl)."'\n";
-	$indexcontent.= '// END PHP ?>'."\n";
-	$result1 = file_put_contents($fileindex, $indexcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
-
-	dol_delete_file($filewrapper);
-
-	$wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
-
-	$result2 = file_put_contents($filewrapper, $wrappercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
-
-	return ($result1 && $result2);
+    global $conf;
+
+    $result1=false;
+    $result2=false;
+
+    dol_mkdir($pathofwebsite);
+
+    dol_delete_file($fileindex);
+    $indexcontent = '<?php'."\n";
+    $indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
+    $indexcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+    $indexcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
+    $indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+    $indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+    $indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+    $indexcontent.= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
+    $indexcontent.= "}\n";
+    $indexcontent.= "include_once './".basename($filetpl)."'\n";
+    $indexcontent.= '// END PHP ?>'."\n";
+    $result1 = file_put_contents($fileindex, $indexcontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+
+    dol_delete_file($filewrapper);
+
+    $wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
+
+    $result2 = file_put_contents($filewrapper, $wrappercontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+
+    return ($result1 && $result2);
 }
 
 
@@ -761,22 +761,22 @@ 
  */
 function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
 {
-	global $conf, $pathofwebsite;
+    global $conf, $pathofwebsite;
 
-	dol_syslog("Save html header into ".$filehtmlheader);
+    dol_syslog("Save html header into ".$filehtmlheader);
 
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+    dol_mkdir($pathofwebsite);
+    $result = file_put_contents($filehtmlheader, $htmlheadercontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-			return false;
-		}
+        if (! $result)
+        {
+            setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+            return false;
+        }
 
-		return true;
+        return true;
 }
 
 /**
@@ -788,22 +788,22 @@ 
  */
 function dolSaveCssFile($filecss, $csscontent)
 {
-	global $conf, $pathofwebsite;
+    global $conf, $pathofwebsite;
 
-	dol_syslog("Save css file into ".$filecss);
+    dol_syslog("Save css file into ".$filecss);
 
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filecss, $csscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+    dol_mkdir($pathofwebsite);
+    $result = file_put_contents($filecss, $csscontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filecss, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-			return false;
-		}
+        if (! $result)
+        {
+            setEventMessages('Failed to write file '.$filecss, null, 'errors');
+            return false;
+        }
 
-		return true;
+        return true;
 }
 
 /**
@@ -815,22 +815,22 @@ 
  */
 function dolSaveJsFile($filejs, $jscontent)
 {
-	global $conf, $pathofwebsite;
+    global $conf, $pathofwebsite;
 
-	dol_syslog("Save js file into ".$filejs);
+    dol_syslog("Save js file into ".$filejs);
 
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filejs, $jscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+    dol_mkdir($pathofwebsite);
+    $result = file_put_contents($filejs, $jscontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filejs, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-			return false;
-		}
+        if (! $result)
+        {
+            setEventMessages('Failed to write file '.$filejs, null, 'errors');
+            return false;
+        }
 
-		return true;
+        return true;
 }
 
 /**
@@ -842,22 +842,22 @@ 
  */
 function dolSaveRobotFile($filerobot, $robotcontent)
 {
-	global $conf, $pathofwebsite;
+    global $conf, $pathofwebsite;
 
-	dol_syslog("Save robot file into ".$filerobot);
+    dol_syslog("Save robot file into ".$filerobot);
 
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filerobot, $robotcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+    dol_mkdir($pathofwebsite);
+    $result = file_put_contents($filerobot, $robotcontent);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filerobot, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-			return false;
-		}
+        if (! $result)
+        {
+            setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+            return false;
+        }
 
-		return true;
+        return true;
 }
 
 /**
@@ -869,20 +869,20 @@ 
  */
 function dolSaveHtaccessFile($filehtaccess, $htaccess)
 {
-	global $conf, $pathofwebsite;
+    global $conf, $pathofwebsite;
 
-	dol_syslog("Save htaccess file into ".$filehtaccess);
+    dol_syslog("Save htaccess file into ".$filehtaccess);
 
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filehtaccess, $htaccess);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+    dol_mkdir($pathofwebsite);
+    $result = file_put_contents($filehtaccess, $htaccess);
+    if (! empty($conf->global->MAIN_UMASK))
+        @chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-			return false;
-		}
+        if (! $result)
+        {
+            setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+            return false;
+        }
 
-		return true;
+        return true;
 }

Spacing +173 added lines, -173 removed lines

@@ -33,34 +33,34 @@ 
  * @return	boolean							True if OK
  * @see dolWebsiteOutput for function used to replace content in a web server context
  */
-function dolWebsiteReplacementOfLinks($website, $content, $removephppart=0)
+function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0)
 {
 	$nbrep = 0;
 
 	// Replace php code. Note $content may come from database and does not contains body tags.
-	$replacewith='...php...';
-	if ($removephppart) $replacewith='';
+	$replacewith = '...php...';
+	if ($removephppart) $replacewith = '';
 	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
 
-	$replacewith='"callto=#';
-	if ($removephppart) $replacewith='';
+	$replacewith = '"callto=#';
+	if ($removephppart) $replacewith = '';
 	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
-	$replacewith='"mailto=#';
-	if ($removephppart) $replacewith='';
+	$replacewith = '"mailto=#';
+	if ($removephppart) $replacewith = '';
 	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
-	$replacewith='src="php';
-	if ($removephppart) $replacewith='';
+	$replacewith = 'src="php';
+	if ($removephppart) $replacewith = '';
 	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
-	$replacewith='href="php';
-	if ($removephppart) $replacewith='';
+	$replacewith = 'href="php';
+	if ($removephppart) $replacewith = '';
 	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	//$replacewith='<span class="phptag">...php...</span>';
-	$replacewith='<span class="phptag">...php...</span>';
-	if ($removephppart) $replacewith='';
+	$replacewith = '<span class="phptag">...php...</span>';
+	if ($removephppart) $replacewith = '';
 	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
 	/*if ($content === null) {
 		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
@@ -80,7 +80,7 @@ 
 	// <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
 	$content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\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|\/?viewimage|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+	$content = preg_replace('/(<img[^>]*src=")(?!(http|\/?viewimage|'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 	// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
 	$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
 
@@ -88,8 +88,8 @@ 
 	$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/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('/(src=")(\/?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);
+	$content = preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
 	return $content;
 }
@@ -102,16 +102,16 @@ 
  * @param	string	$replacewith	String to use as replacement
  * @return 	string					Result string without php code
  */
-function dolStripPhpCode($str, $replacewith='')
+function dolStripPhpCode($str, $replacewith = '')
 {
 	$newstr = '';
 
 	//split on each opening tag
-	$parts = explode('<?php',$str);
+	$parts = explode('<?php', $str);
 	if (!empty($parts))
 	{
-		$i=0;
-		foreach($parts as $part)
+		$i = 0;
+		foreach ($parts as $part)
 		{
 			if ($i == 0) 	// The first part is never php code
 			{
@@ -126,7 +126,7 @@ 
 				//remove content before closing tag
 				if (count($partlings) > 1) $partlings[0] = '';
 				//append to out string
-				$newstr .= $replacewith.implode('',$partlings);
+				$newstr .= $replacewith.implode('', $partlings);
 			}
 		}
 	}
@@ -147,11 +147,11 @@ 
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;
 
-	dol_syslog("dolWebsiteOutput start (USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." (USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
+	dol_syslog("dolWebsiteOutput start (USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER') ? '1' : '')." (USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR') ? '1' : '').')');
 
 	// 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
 
 	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
@@ -166,29 +166,29 @@ 
 		global $website;
 
 		// Replace relative link / with dolibarr URL:  ...href="/"...
-		$content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
 		// Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
-		$content=preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
 		// Replace relative link /xxx with dolibarr URL:  ...href="....php"
-		$content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\?)/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\?)/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
 
 		// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  href="/document.php?modulepart=" => href="/dolibarr/document.php?modulepart="
-		$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(src=")(\/?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);
+		$content = preg_replace('/(src=")(\/?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=" => href="/dolibarr/viewimage.php?modulepart="
-		$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(src=")(\/?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);
+		$content = preg_replace('/(src=")(\/?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('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\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);
+		$content = preg_replace('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 
 		// <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
 		$content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\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|\/?viewimage|'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+		$content = preg_replace('/(<img[^>]*src=")(?!(http|\/?viewimage|'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 		// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
 		$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
 
@@ -197,44 +197,44 @@ 
 	}
 	else									// 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('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
 
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
 
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
+			$content = preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+			$content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+			$content = preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
 
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
 		}
 		else
 		{
-			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
 
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*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);
+			$content = preg_replace('/(<a[^>]*href=")[^\"]*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);
 
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+			$content = preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+			$content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
+			$content = preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
 
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
+			$content = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
 		}
 	}
 
-	$content=preg_replace('/ contenteditable="true"/', ' contenteditable="false"', $content, -1, $nbrep);
+	$content = preg_replace('/ contenteditable="true"/', ' contenteditable="false"', $content, -1, $nbrep);
 
 	dol_syslog("dolWebsiteOutput end");
 
@@ -277,18 +277,18 @@ 
  * @param 	int		$containerid		Id of container.
  * @return  void
  */
-function redirectToContainer($containerref, $containeraliasalt='',$containerid=0)
+function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0)
 {
 	global $db, $website;
 
 	$newurl = '';
-	$result=0;
+	$result = 0;
 
 	// We make redirect using the alternative alias, we must find the real $containerref
 	if ($containeraliasalt)
 	{
 		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
-		$tmpwebsitepage=new WebsitePage($db);
+		$tmpwebsitepage = new WebsitePage($db);
 		$result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt);
 		if ($result > 0)
 		{
@@ -304,10 +304,10 @@ 
 	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
 	{
 		// Check new container exists
-		if (! $containeraliasalt)	// If containeraliasalt set, we already did the test
+		if (!$containeraliasalt)	// If containeraliasalt set, we already did the test
 		{
 			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
-			$tmpwebsitepage=new WebsitePage($db);
+			$tmpwebsitepage = new WebsitePage($db);
 			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
 			unset($tmpwebsitepage);
 		}
@@ -359,17 +359,17 @@ 
  */
 function includeContainer($containerref)
 {
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs;	// Very important. Required to have var available when running inluded containers.
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
 	global $includehtmlcontentopened;
 	global $websitekey, $websitepagefile;
 
-	$MAXLEVEL=20;
+	$MAXLEVEL = 20;
 
-	if (! preg_match('/\.php$/i', $containerref)) $containerref.='.php';
+	if (!preg_match('/\.php$/i', $containerref)) $containerref .= '.php';
 
-	$fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
+	$fullpathfile = DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
+	if (empty($includehtmlcontentopened)) $includehtmlcontentopened = 0;
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL)
 	{
@@ -381,14 +381,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 '.$containerref.".\n";
 	}
@@ -412,49 +412,49 @@ 
  * @param	string		$grabimagesinto	'root' or 'subpage'
  * @return	void
  */
-function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks=0, $grabimages=1, $grabimagesinto='subpage')
+function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modifylinks = 0, $grabimages = 1, $grabimagesinto = 'subpage')
 {
 	global $conf;
 
-	$error=0;
+	$error = 0;
 
 	dol_syslog("Call getAllImages with grabimagesinto=".$grabimagesinto);
 
-	$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
 
 	// Search X in "img...src=X"
 	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
 
 		if (preg_match('/^\//', $regs[2][$key]))
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
-			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 		}
 		else
 		{
-			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
+			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
 		$linkwithoutdomain = $regs[2][$key];
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
+		if ($grabimagesinto == 'root') $dirforimages = '';
 
 		// Define $filetosave and $filename
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(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.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 		}
-		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 
 		// Clean the aa/bb/../cc into aa/cc
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
@@ -473,24 +473,24 @@ 
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-					$action='create';
+					$action = 'create';
 				}
 				elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], 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($filetosave, octdec($conf->global->MAIN_UMASK));
 				}
 			}
@@ -498,7 +498,7 @@ 
 
 		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);
 		}
 	}
 
@@ -507,33 +507,33 @@ 
 
 	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
 
 		if (preg_match('/^\//', $regs[2][$key]))
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
-			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
+			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 		}
 		else
 		{
-			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
+			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
 		$linkwithoutdomain = $regs[2][$key];
 
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
+		if ($grabimagesinto == 'root') $dirforimages = '';
 
-		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
+		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(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.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 		}
 
-		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
+		$filename = 'image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
 
 		// Clean the aa/bb/../cc into aa/cc
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
@@ -552,24 +552,24 @@ 
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-					$action='create';
+					$action = 'create';
 				}
 				elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], 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($filetosave, octdec($conf->global->MAIN_UMASK));
 				}
 			}
@@ -577,7 +577,7 @@ 
 
 		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);
 		}
 	}
 }
@@ -599,11 +599,11 @@ 
 	dol_delete_file($filemaster);
 
 	$mastercontent = '<?php'."\n";
-	$mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
-	$mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
-	$mastercontent.= '?>'."\n";
+	$mastercontent .= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
+	$mastercontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+	$mastercontent .= '?>'."\n";
 	$result = file_put_contents($filemaster, $mastercontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
 
 	return $result;
@@ -625,17 +625,17 @@ 
 	dol_syslog("We regenerate the alias page filealias=".$filealias);
 
 	$aliascontent = '<?php'."\n";
-	$aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
-	$aliascontent.= 'global $dolibarr_main_data_root;'."\n";
-	$aliascontent.= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
-	$aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
-	$aliascontent.= '?>'."\n";
+	$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
+	$aliascontent .= 'global $dolibarr_main_data_root;'."\n";
+	$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
+	$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+	$aliascontent .= '?>'."\n";
 	$result = file_put_contents($filealias, $aliascontent);
-	if (! empty($conf->global->MAIN_UMASK)) {
+	if (!empty($conf->global->MAIN_UMASK)) {
         @chmod($filealias, octdec($conf->global->MAIN_UMASK));
     }
 
-	return ($result?true:false);
+	return ($result ?true:false);
 }
 
 
@@ -657,49 +657,49 @@ 
 	dol_delete_file($filetpl);
 
 	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
-
-	$tplcontent ='';
-	$tplcontent.= "<?php // BEGIN PHP\n";
-	$tplcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$tplcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
-	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$tplcontent.= "ob_start();\n";
-	$tplcontent.= "// END PHP ?>\n";
-	$tplcontent.= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"':'').'>'."\n";
-	$tplcontent.= '<head>'."\n";
-	$tplcontent.= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
-	$tplcontent.= '<meta charset="UTF-8">'."\n";
-	$tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
-	$tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
-	$tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-	$tplcontent.= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
-	$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
-	$tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
-	$tplcontent.= '<!-- Include link to CSS file -->'."\n";
-	$tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
-	$tplcontent.= '<!-- Include HTML header from common file -->'."\n";
-	$tplcontent.= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
-	$tplcontent.= '<!-- Include HTML header from page header block -->'."\n";
-	$tplcontent.= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
-	$tplcontent.= '</head>'."\n";
-
-	$tplcontent.= '<!-- File generated by Dolibarr website module editor -->'."\n";
-	$tplcontent.= '<body id="bodywebsite" class="bodywebsite">'."\n";
-	$tplcontent.= $objectpage->content."\n";
-	$tplcontent.= '</body>'."\n";
-	$tplcontent.= '</html>'."\n";
-
-	$tplcontent.= '<?php // BEGIN PHP'."\n";
-	$tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-	$tplcontent.= "// END PHP ?>"."\n";
+	if ($objectpage->lang) $shortlangcode = preg_replace('/[_-].*$/', '', $objectpage->lang); // en_US or en-US -> en
+
+	$tplcontent = '';
+	$tplcontent .= "<?php // BEGIN PHP\n";
+	$tplcontent .= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+	$tplcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
+	$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	$tplcontent .= "ob_start();\n";
+	$tplcontent .= "// END PHP ?>\n";
+	$tplcontent .= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"' : '').'>'."\n";
+	$tplcontent .= '<head>'."\n";
+	$tplcontent .= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
+	$tplcontent .= '<meta charset="UTF-8">'."\n";
+	$tplcontent .= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
+	$tplcontent .= '<meta name="robots" content="index, follow" />'."\n";
+	$tplcontent .= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+	$tplcontent .= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
+	$tplcontent .= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
+	$tplcontent .= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
+	$tplcontent .= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
+	$tplcontent .= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
+	$tplcontent .= '<!-- Include link to CSS file -->'."\n";
+	$tplcontent .= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
+	$tplcontent .= '<!-- Include HTML header from common file -->'."\n";
+	$tplcontent .= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
+	$tplcontent .= '<!-- Include HTML header from page header block -->'."\n";
+	$tplcontent .= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
+	$tplcontent .= '</head>'."\n";
+
+	$tplcontent .= '<!-- File generated by Dolibarr website module editor -->'."\n";
+	$tplcontent .= '<body id="bodywebsite" class="bodywebsite">'."\n";
+	$tplcontent .= $objectpage->content."\n";
+	$tplcontent .= '</body>'."\n";
+	$tplcontent .= '</html>'."\n";
+
+	$tplcontent .= '<?php // BEGIN PHP'."\n";
+	$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+	$tplcontent .= "// END PHP ?>"."\n";
 
 	//var_dump($filetpl);exit;
 	$result = file_put_contents($filetpl, $tplcontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
 
 		return $result;
@@ -719,33 +719,33 @@ 
 {
 	global $conf;
 
-	$result1=false;
-	$result2=false;
+	$result1 = false;
+	$result2 = false;
 
 	dol_mkdir($pathofwebsite);
 
 	dol_delete_file($fileindex);
 	$indexcontent = '<?php'."\n";
-	$indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
-	$indexcontent.= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$indexcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
-	$indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
-	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$indexcontent.= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
-	$indexcontent.= "}\n";
-	$indexcontent.= "include_once './".basename($filetpl)."'\n";
-	$indexcontent.= '// END PHP ?>'."\n";
+	$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
+	$indexcontent .= '$websitekey=basename(dirname(__FILE__)); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+	$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
+	$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+	$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
+	$indexcontent .= "}\n";
+	$indexcontent .= "include_once './".basename($filetpl)."'\n";
+	$indexcontent .= '// END PHP ?>'."\n";
 	$result1 = file_put_contents($fileindex, $indexcontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
 
 	dol_delete_file($filewrapper);
 
-	$wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
+	$wrappercontent = file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
 
 	$result2 = file_put_contents($filewrapper, $wrappercontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
 
 	return ($result1 && $result2);
@@ -767,10 +767,10 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
+		if (!$result)
 		{
 			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
 			return false;
@@ -794,10 +794,10 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filecss, $csscontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
+		if (!$result)
 		{
 			setEventMessages('Failed to write file '.$filecss, null, 'errors');
 			return false;
@@ -821,10 +821,10 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filejs, $jscontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
+		if (!$result)
 		{
 			setEventMessages('Failed to write file '.$filejs, null, 'errors');
 			return false;
@@ -848,10 +848,10 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filerobot, $robotcontent);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
+		if (!$result)
 		{
 			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
 			return false;
@@ -875,10 +875,10 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtaccess, $htaccess);
-	if (! empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK))
 		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
+		if (!$result)
 		{
 			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
 			return false;

Braces +106 added lines, -68 removed lines

@@ -39,28 +39,40 @@ 
 
 	// Replace php code. Note $content may come from database and does not contains body tags.
 	$replacewith='...php...';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
 
 	$replacewith='"callto=#';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith='"mailto=#';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith='src="php';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith='href="php';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	//$replacewith='<span class="phptag">...php...</span>';
 	$replacewith='<span class="phptag">...php...</span>';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
 	/*if ($content === null) {
 		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
@@ -113,9 +125,11 @@ 
 		$i=0;
 		foreach($parts as $part)
 		{
-			if ($i == 0) 	// The first part is never php code
+			if ($i == 0) {
+			    // The first part is never php code
 			{
 				$i++;
+			}
 				$newstr .= $part;
 				continue;
 			}
@@ -124,7 +138,9 @@ 
 			if (!empty($partlings))
 			{
 				//remove content before closing tag
-				if (count($partlings) > 1) $partlings[0] = '';
+				if (count($partlings) > 1) {
+				    $partlings[0] = '';
+				}
 				//append to out string
 				$newstr .= $replacewith.implode('',$partlings);
 			}
@@ -154,16 +170,19 @@ 
 	$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
 
-	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
+	if (defined('USEDOLIBARREDITOR')) {
+	    // REPLACEMENT OF LINKS When page called from Dolibarr editor
 	{
 		// We remove the <head> part of content
 		$content = preg_replace('/<head>.*<\/head>/ims', '', $content);
+	}
 		$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
 		$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
-	}
-	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
+	} elseif (defined('USEDOLIBARRSERVER')) {
+	    // 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/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
@@ -194,8 +213,7 @@ 
 
 		// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
 		$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-	}
-	else									// REPLACEMENT OF LINKS When page called from virtual host
+	} else									// REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists=1;
 
@@ -217,8 +235,7 @@ 
 			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
 
 			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
-		}
-		else
+		} else
 		{
 			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
 
@@ -293,20 +310,21 @@ 
 		if ($result > 0)
 		{
 			$containerref = $tmpwebsitepage->pageurl;
-		}
-		else
+		} else
 		{
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 			exit;
 		}
 	}
 
-	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
+	if (defined('USEDOLIBARRSERVER')) {
+	    // When page called from Dolibarr server
 	{
 		// Check new container exists
 		if (! $containeraliasalt)	// If containeraliasalt set, we already did the test
 		{
 			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+	}
 			$tmpwebsitepage=new WebsitePage($db);
 			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
 			unset($tmpwebsitepage);
@@ -320,19 +338,16 @@ 
 				{
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
-				}
-				else
+				} else
 				{
 					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
-			}
-			else
+			} else
 			{
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
-	}
-	else								// When page called from virtual host server
+	} else								// When page called from virtual host server
 	{
 		$newurl = '/'.$containerref.'.php';
 	}
@@ -341,8 +356,7 @@ 
 	{
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
+	} else
 	{
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
@@ -365,11 +379,15 @@ 
 
 	$MAXLEVEL=20;
 
-	if (! preg_match('/\.php$/i', $containerref)) $containerref.='.php';
+	if (! preg_match('/\.php$/i', $containerref)) {
+	    $containerref.='.php';
+	}
 
 	$fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
+	if (empty($includehtmlcontentopened)) {
+	    $includehtmlcontentopened=0;
+	}
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL)
 	{
@@ -422,7 +440,9 @@ 
 
 	$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
 
 	// Search X in "img...src=X"
@@ -430,21 +450,25 @@ 
 
 	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
 
 		if (preg_match('/^\//', $regs[2][$key]))
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-		}
-		else
+		} else
 		{
 			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
 		}
 
 		$linkwithoutdomain = $regs[2][$key];
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
+		if ($grabimagesinto == 'root') {
+		    $dirforimages='';
+		}
 
 		// Define $filetosave and $filename
 		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
@@ -474,14 +498,12 @@ 
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action='create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action='create';
-				}
-				else
+				} else
 				{
 					$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
@@ -490,8 +512,9 @@ 
 					$fp = fopen($filetosave, "w");
 					fputs($fp, $tmpgeturl['content']);
 					fclose($fp);
-					if (! empty($conf->global->MAIN_UMASK))
-						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					if (! empty($conf->global->MAIN_UMASK)) {
+											@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					}
 				}
 			}
 		}
@@ -507,14 +530,16 @@ 
 
 	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
 
 		if (preg_match('/^\//', $regs[2][$key]))
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-		}
-		else
+		} else
 		{
 			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
 		}
@@ -522,7 +547,9 @@ 
 		$linkwithoutdomain = $regs[2][$key];
 
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
+		if ($grabimagesinto == 'root') {
+		    $dirforimages='';
+		}
 
 		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
 
@@ -553,14 +580,12 @@ 
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action='create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action='create';
-				}
-				else
+				} else
 				{
 					$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
@@ -569,8 +594,9 @@ 
 					$fp = fopen($filetosave, "w");
 					fputs($fp, $tmpgeturl['content']);
 					fclose($fp);
-					if (! empty($conf->global->MAIN_UMASK))
-						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					if (! empty($conf->global->MAIN_UMASK)) {
+											@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					}
 				}
 			}
 		}
@@ -603,8 +629,9 @@ 
 	$mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
 	$mastercontent.= '?>'."\n";
 	$result = file_put_contents($filemaster, $mastercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -657,7 +684,10 @@ 
 	dol_delete_file($filetpl);
 
 	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
+	if ($objectpage->lang) {
+	    $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);
+	}
+	// en_US or en-US -> en
 
 	$tplcontent ='';
 	$tplcontent.= "<?php // BEGIN PHP\n";
@@ -699,8 +729,9 @@ 
 
 	//var_dump($filetpl);exit;
 	$result = file_put_contents($filetpl, $tplcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	}
 
 		return $result;
 }
@@ -737,16 +768,18 @@ 
 	$indexcontent.= "include_once './".basename($filetpl)."'\n";
 	$indexcontent.= '// END PHP ?>'."\n";
 	$result1 = file_put_contents($fileindex, $indexcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+	}
 
 	dol_delete_file($filewrapper);
 
 	$wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
 
 	$result2 = file_put_contents($filewrapper, $wrappercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return ($result1 && $result2);
 }
@@ -767,8 +800,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -794,8 +828,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filecss, $csscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -821,8 +856,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filejs, $jscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -848,8 +884,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filerobot, $robotcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -875,8 +912,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtaccess, $htaccess);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{

dolibarr/htdocs/core/lib/supplier_proposal.lib.php

Indentation +54 added lines, -54 removed lines

@@ -31,28 +31,28 @@ 
  */
 function supplier_proposal_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array("supplier_proposal","compta"));
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('SupplierProposalCard');
-	$head[$h][2] = 'comm';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('SupplierProposalCard');
+    $head[$h][2] = 'comm';
+    $h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-		$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -62,35 +62,35 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/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] = 'note';
-		$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/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] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->supplier_proposal->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->supplier_proposal->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.'/supplier_proposal/document.php?id='.$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.'/supplier_proposal/document.php?id='.$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.'/supplier_proposal/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/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,'supplier_proposal','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_proposal','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -100,24 +100,24 @@ 
  */
 function supplier_proposal_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplier_proposal.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplier_proposal.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin');
+    // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
@@ -126,9 +126,9 @@ 
     $head[$h][2] = 'attributeslines';
     $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("supplier_proposal","compta"));
+    $langs->loadLangs(array("supplier_proposal", "compta"));
 
 	$h = 0;
 	$head = array();
@@ -46,10 +46,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$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.'/supplier_proposal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		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++;
 	}
@@ -58,28 +58,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,'supplier_proposal');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal');
 
     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.'/supplier_proposal/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] = 'note';
 		$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->supplier_proposal->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->supplier_proposal->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.'/supplier_proposal/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++;
 
@@ -88,7 +88,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_proposal','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal', 'remove');
 
 	return $head;
 }
@@ -114,7 +114,7 @@ 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'supplier_proposal_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -126,7 +126,7 @@ 
     $head[$h][2] = 'attributeslines';
     $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplier_proposal_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'supplier_proposal_admin', 'remove');
 
 	return $head;
 }

Braces +15 added lines, -5 removed lines

@@ -49,7 +49,9 @@ 
 		$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		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++;
 	}
@@ -63,11 +65,17 @@ 
     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.'/supplier_proposal/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] = 'note';
 		$h++;
     }
@@ -79,7 +87,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/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++;
 

dolibarr/htdocs/core/lib/date.lib.php

Indentation +519 added lines, -519 removed lines

@@ -98,8 +98,8 @@ 
     }
     else
     {
-    	$tmp=0;
-    	dol_print_error('','PHP version must be 5.3+');
+        $tmp=0;
+        dol_print_error('','PHP version must be 5.3+');
     }
     $tz=round(($tmp<0?1:-1)*abs($tmp/3600));
     return $tz;
@@ -116,29 +116,29 @@ 
  */
 function dol_time_plus_duree($time, $duration_value, $duration_unit)
 {
-	global $conf;
+    global $conf;
 
-	if ($duration_value == 0)  return $time;
-	if ($duration_unit == 'h') return $time + (3600*$duration_value);
-	if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
+    if ($duration_value == 0)  return $time;
+    if ($duration_unit == 'h') return $time + (3600*$duration_value);
+    if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
 
-	$deltastring='P';
+    $deltastring='P';
 
-	if ($duration_value > 0){ $deltastring.=abs($duration_value); $sub= false; }
-	if ($duration_value < 0){ $deltastring.=abs($duration_value); $sub= true; }
-	if ($duration_unit == 'd') { $deltastring.="D"; }
-	if ($duration_unit == 'm') { $deltastring.="M"; }
-	if ($duration_unit == 'y') { $deltastring.="Y"; }
+    if ($duration_value > 0){ $deltastring.=abs($duration_value); $sub= false; }
+    if ($duration_value < 0){ $deltastring.=abs($duration_value); $sub= true; }
+    if ($duration_unit == 'd') { $deltastring.="D"; }
+    if ($duration_unit == 'm') { $deltastring.="M"; }
+    if ($duration_unit == 'y') { $deltastring.="Y"; }
 
-	$date = new DateTime();
-	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
-	$date->setTimestamp($time);
-	$interval = new DateInterval($deltastring);
+    $date = new DateTime();
+    if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+    $date->setTimestamp($time);
+    $interval = new DateInterval($deltastring);
 
-	if($sub) $date->sub($interval);
-	else $date->add( $interval );
+    if($sub) $date->sub($interval);
+    else $date->add( $interval );
 
-	return $date->getTimestamp();
+    return $date->getTimestamp();
 }
 
 
@@ -153,8 +153,8 @@ 
  */
 function convertTime2Seconds($iHours=0, $iMinutes=0, $iSeconds=0)
 {
-	$iResult=($iHours*3600)+($iMinutes*60)+$iSeconds;
-	return $iResult;
+    $iResult=($iHours*3600)+($iMinutes*60)+$iSeconds;
+    return $iResult;
 }
 
 
@@ -180,33 +180,33 @@ 
  */
 function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengthOfWeek=7)
 {
-	global $langs;
+    global $langs;
 
-	if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
+    if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
     if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
 
-	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
-	{
-		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
+    if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
+    {
+        if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
 
         $sTime='';
         $sDay=0;
         $sWeek=0;
 
-		if ($iSecond >= $lengthOfDay)
-		{
-			for($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay )
-			{
-				$sDay++;
-				$iSecond-=$lengthOfDay;
-			}
-			$dayTranslate = $langs->trans("Day");
-			if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
-		}
-
-		if ($lengthOfWeek < 7)
-		{
-        	if ($sDay)
+        if ($iSecond >= $lengthOfDay)
+        {
+            for($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay )
+            {
+                $sDay++;
+                $iSecond-=$lengthOfDay;
+            }
+            $dayTranslate = $langs->trans("Day");
+            if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
+        }
+
+        if ($lengthOfWeek < 7)
+        {
+            if ($sDay)
             {
                 if ($sDay >= $lengthOfWeek)
                 {
@@ -217,48 +217,48 @@ 
                     $sTime.=$sWeek.' '.$weekTranslate.' ';
                 }
             }
-		}
-		if ($sDay>0)
-		{
-			$dayTranslate = $langs->trans("Day");
-			if ($sDay > 1) $dayTranslate = $langs->trans("Days");
-			$sTime.=$sDay.' '.$dayTranslate.' ';
-		}
-
-		if ($format == 'all')
-		{
-			if ($iSecond || empty($sDay))
-			{
-				$sTime.= dol_print_date($iSecond,'hourduration',true);
-			}
-		}
-		if ($format == 'allhourmin')
-		{
-		    return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d",((int) floor(($iSecond % 3600)/60)));
-		}
-		if ($format == 'allhour')
-		{
-			return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
-		}
-	}
-	else if ($format == 'hour')	// only hour part
-	{
-		$sTime=dol_print_date($iSecond,'%H',true);
-	}
-	else if ($format == 'fullhour')
-	{
-		if (!empty($iSecond)) {
-			$iSecond=$iSecond/3600;
-		}
-		else {
-			$iSecond=0;
-		}
-		$sTime=$iSecond;
-	}
-	else if ($format == 'min')	// only min part
-	{
-		$sTime=dol_print_date($iSecond,'%M',true);
-	}
+        }
+        if ($sDay>0)
+        {
+            $dayTranslate = $langs->trans("Day");
+            if ($sDay > 1) $dayTranslate = $langs->trans("Days");
+            $sTime.=$sDay.' '.$dayTranslate.' ';
+        }
+
+        if ($format == 'all')
+        {
+            if ($iSecond || empty($sDay))
+            {
+                $sTime.= dol_print_date($iSecond,'hourduration',true);
+            }
+        }
+        if ($format == 'allhourmin')
+        {
+            return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d",((int) floor(($iSecond % 3600)/60)));
+        }
+        if ($format == 'allhour')
+        {
+            return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
+        }
+    }
+    else if ($format == 'hour')	// only hour part
+    {
+        $sTime=dol_print_date($iSecond,'%H',true);
+    }
+    else if ($format == 'fullhour')
+    {
+        if (!empty($iSecond)) {
+            $iSecond=$iSecond/3600;
+        }
+        else {
+            $iSecond=0;
+        }
+        $sTime=$iSecond;
+    }
+    else if ($format == 'min')	// only min part
+    {
+        $sTime=dol_print_date($iSecond,'%M',true);
+    }
     else if ($format == 'sec')	// only sec part
     {
         $sTime=dol_print_date($iSecond,'%S',true);
@@ -286,22 +286,22 @@ 
  */
 function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date)
 {
-	global $db;
-	$sqldate="";
-	if ($month_date > 0) {
-		if ($year_date > 0 && empty($day_date)) {
-			$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
-			$sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
-		} else if ($year_date > 0 && ! empty($day_date)) {
-			$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
-			$sqldate.= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
-		} else
-			$sqldate.= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
-	} else if ($year_date > 0){
-		$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
-		$sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
-	}
-	return $sqldate;
+    global $db;
+    $sqldate="";
+    if ($month_date > 0) {
+        if ($year_date > 0 && empty($day_date)) {
+            $sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
+            $sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
+        } else if ($year_date > 0 && ! empty($day_date)) {
+            $sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
+            $sqldate.= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
+        } else
+            $sqldate.= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
+    } else if ($year_date > 0){
+        $sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
+        $sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
+    }
+    return $sqldate;
 }
 
 /**
@@ -341,9 +341,9 @@ 
         $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
     }
     else if (
-    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
-    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
-   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
+            preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+        || preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
+           || preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
     )
     {
         $syear = $reg[1];
@@ -371,10 +371,10 @@ 
  */
 function dol_get_prev_day($day, $month, $year)
 {
-	$time=dol_mktime(12,0,0,$month,$day,$year,1,0);
-	$time-=24*60*60;
-	$tmparray=dol_getdate($time,true);
-	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
+    $time=dol_mktime(12,0,0,$month,$day,$year,1,0);
+    $time-=24*60*60;
+    $tmparray=dol_getdate($time,true);
+    return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
 /** Return next day
@@ -386,10 +386,10 @@ 
  */
 function dol_get_next_day($day, $month, $year)
 {
-	$time=dol_mktime(12,0,0,$month,$day,$year,1,0);
-	$time+=24*60*60;
-	$tmparray=dol_getdate($time,true);
-	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
+    $time=dol_mktime(12,0,0,$month,$day,$year,1,0);
+    $time+=24*60*60;
+    $tmparray=dol_getdate($time,true);
+    return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
 /**	Return previous month
@@ -400,17 +400,17 @@ 
  */
 function dol_get_prev_month($month, $year)
 {
-	if ($month == 1)
-	{
-		$prev_month = 12;
-		$prev_year  = $year - 1;
-	}
-	else
-	{
-		$prev_month = $month-1;
-		$prev_year  = $year;
-	}
-	return array('year' => $prev_year, 'month' => $prev_month);
+    if ($month == 1)
+    {
+        $prev_month = 12;
+        $prev_year  = $year - 1;
+    }
+    else
+    {
+        $prev_month = $month-1;
+        $prev_year  = $year;
+    }
+    return array('year' => $prev_year, 'month' => $prev_month);
 }
 
 /**	Return next month
@@ -421,17 +421,17 @@ 
  */
 function dol_get_next_month($month, $year)
 {
-	if ($month == 12)
-	{
-		$next_month = 1;
-		$next_year  = $year + 1;
-	}
-	else
-	{
-		$next_month = $month + 1;
-		$next_year  = $year;
-	}
-	return array('year' => $next_year, 'month' => $next_month);
+    if ($month == 12)
+    {
+        $next_month = 1;
+        $next_year  = $year + 1;
+    }
+    else
+    {
+        $next_month = $month + 1;
+        $next_year  = $year;
+    }
+    return array('year' => $next_year, 'month' => $next_month);
 }
 
 /**	Return previous week
@@ -444,12 +444,12 @@ 
  */
 function dol_get_prev_week($day, $week, $month, $year)
 {
-	$tmparray = dol_get_first_day_week($day, $month, $year);
+    $tmparray = dol_get_first_day_week($day, $month, $year);
 
-	$time=dol_mktime(12,0,0,$month,$tmparray['first_day'],$year,1,0);
-	$time-=24*60*60*7;
-	$tmparray=dol_getdate($time,true);
-	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
+    $time=dol_mktime(12,0,0,$month,$tmparray['first_day'],$year,1,0);
+    $time-=24*60*60*7;
+    $tmparray=dol_getdate($time,true);
+    return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
 /**	Return next week
@@ -462,13 +462,13 @@ 
  */
 function dol_get_next_week($day, $week, $month, $year)
 {
-	$tmparray = dol_get_first_day_week($day, $month, $year);
+    $tmparray = dol_get_first_day_week($day, $month, $year);
 
-	$time=dol_mktime(12,0,0,$tmparray['first_month'],$tmparray['first_day'],$tmparray['first_year'],1,0);
-	$time+=24*60*60*7;
-	$tmparray=dol_getdate($time,true);
+    $time=dol_mktime(12,0,0,$tmparray['first_month'],$tmparray['first_day'],$tmparray['first_year'],1,0);
+    $time+=24*60*60*7;
+    $tmparray=dol_getdate($time,true);
 
-	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
+    return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
 /**	Return GMT time for first day of a month or year
@@ -482,8 +482,8 @@ 
  */
 function dol_get_first_day($year,$month=1,$gm=false)
 {
-	if ($year > 9999) return '';
-	return dol_mktime(0,0,0,$month,1,$year,$gm);
+    if ($year > 9999) return '';
+    return dol_mktime(0,0,0,$month,1,$year,$gm);
 }
 
 
@@ -496,22 +496,22 @@ 
  */
 function dol_get_last_day($year,$month=12,$gm=false)
 {
-	if ($year > 9999) return '';
-	if ($month == 12)
-	{
-		$month = 1;
-		$year += 1;
-	}
-	else
-	{
-		$month += 1;
-	}
-
-	// On se deplace au debut du mois suivant, et on retire un jour
-	$datelim=dol_mktime(23,59,59,$month,1,$year,$gm);
-	$datelim -= (3600 * 24);
-
-	return $datelim;
+    if ($year > 9999) return '';
+    if ($month == 12)
+    {
+        $month = 1;
+        $year += 1;
+    }
+    else
+    {
+        $month += 1;
+    }
+
+    // On se deplace au debut du mois suivant, et on retire un jour
+    $datelim=dol_mktime(23,59,59,$month,1,$year,$gm);
+    $datelim -= (3600 * 24);
+
+    return $datelim;
 }
 
 /**	Return first day of week for a date. First day of week may be monday if option MAIN_START_WEEK is 1.
@@ -524,69 +524,69 @@ 
  */
 function dol_get_first_day_week($day,$month,$year,$gm=false)
 {
-	global $conf;
+    global $conf;
 
-	//$day=2; $month=2; $year=2015;
-	$date = dol_mktime(0,0,0,$month,$day,$year,$gm);
+    //$day=2; $month=2; $year=2015;
+    $date = dol_mktime(0,0,0,$month,$day,$year,$gm);
 
-	//Checking conf of start week
-	$start_week = (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1);
+    //Checking conf of start week
+    $start_week = (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1);
 
-	$tmparray = dol_getdate($date,true);	// detail of current day
+    $tmparray = dol_getdate($date,true);	// detail of current day
 
-	//Calculate days = offset from current day
-	$days = $start_week - $tmparray['wday'];
- 	if ($days>=1) $days=7-$days;
- 	$days = abs($days);
+    //Calculate days = offset from current day
+    $days = $start_week - $tmparray['wday'];
+        if ($days>=1) $days=7-$days;
+        $days = abs($days);
     $seconds = $days*24*60*60;
-	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
+    //print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
     //Get first day of week
     $tmpdaytms = date($tmparray[0])-$seconds; // $tmparray[0] is day of parameters
-	$tmpday = date("d",$tmpdaytms);
+    $tmpday = date("d",$tmpdaytms);
 
-	//Check first day of week is in same month than current day or not
-	if ($tmpday>$day)
+    //Check first day of week is in same month than current day or not
+    if ($tmpday>$day)
     {
-    	$prev_month = $month-1;
-		$prev_year  = $year;
-
-    	if ($prev_month==0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year-1;
-    	}
+        $prev_month = $month-1;
+        $prev_year  = $year;
+
+        if ($prev_month==0)
+        {
+            $prev_month = 12;
+            $prev_year  = $year-1;
+        }
     }
     else
     {
-    	$prev_month = $month;
-		$prev_year  = $year;
+        $prev_month = $month;
+        $prev_year  = $year;
     }
-	$tmpmonth = $prev_month;
-	$tmpyear = $prev_year;
+    $tmpmonth = $prev_month;
+    $tmpyear = $prev_year;
 
-	//Get first day of next week
-	$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
-	$tmptime-=24*60*60*7;
-	$tmparray=dol_getdate($tmptime,true);
+    //Get first day of next week
+    $tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
+    $tmptime-=24*60*60*7;
+    $tmparray=dol_getdate($tmptime,true);
     $prev_day   = $tmparray['mday'];
 
     //Check prev day of week is in same month than first day or not
-	if ($prev_day > $tmpday)
+    if ($prev_day > $tmpday)
     {
-    	$prev_month = $month-1;
-		$prev_year  = $year;
-
-    	if ($prev_month==0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year-1;
-    	}
+        $prev_month = $month-1;
+        $prev_year  = $year;
+
+        if ($prev_month==0)
+        {
+            $prev_month = 12;
+            $prev_year  = $year-1;
+        }
     }
 
     $week = date("W",dol_mktime(0,0,0,$tmpmonth,$tmpday,$tmpyear,$gm));
 
-	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
+    return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
 
 /**
@@ -602,66 +602,66 @@ 
  */
 function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $lastday=0)
 {
-	global $conf;
-
-	$nbFerie = 0;
-
-	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
-
-	$i=0;
-	while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
-	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
-	{
-		$ferie=false;
-		$countryfound=0;
-		$includesaturdayandsunday=1;
-
-		$jour  = date("d", $timestampStart);
-		$mois  = date("m", $timestampStart);
-		$annee = date("Y", $timestampStart);
-
-
-		// Check into var $conf->global->HOLIDAY_MORE_DAYS   MM-DD,YYYY-MM-DD, ...
-		if (! empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
-		{
-			$arrayofdaystring=explode(',',$conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
-			foreach($arrayofdaystring as $daystring)
-			{
-				$tmp=explode('-',$daystring);
-				if ($tmp[2])
-				{
-					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie=true;
-				}
-				else
-				{
-					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie=true;
-				}
-			}
-		}
-
-		if ($countrycode == 'FR')
-		{
-			$countryfound=1;
-
-			// Definition of fixed working days
-			if($jour == 1 && $mois == 1)   $ferie=true; // 1er january
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1er may
-			if($jour == 8 && $mois == 5)   $ferie=true; // 5 may
-			if($jour == 14 && $mois == 7)  $ferie=true; // 14 july
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 august
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 november
-			if($jour == 11 && $mois == 11) $ferie=true; // 11 november
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 december
-
-			// Calculation for easter date
-			$date_paques = easter_date($annee);
-			$jour_paques = date("d", $date_paques);
-			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
-			// Pâques
-
-			// Calculation for the monday of easter date
+    global $conf;
+
+    $nbFerie = 0;
+
+    // Check to ensure we use correct parameters
+    if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
+
+    $i=0;
+    while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
+        && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
+    {
+        $ferie=false;
+        $countryfound=0;
+        $includesaturdayandsunday=1;
+
+        $jour  = date("d", $timestampStart);
+        $mois  = date("m", $timestampStart);
+        $annee = date("Y", $timestampStart);
+
+
+        // Check into var $conf->global->HOLIDAY_MORE_DAYS   MM-DD,YYYY-MM-DD, ...
+        if (! empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
+        {
+            $arrayofdaystring=explode(',',$conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
+            foreach($arrayofdaystring as $daystring)
+            {
+                $tmp=explode('-',$daystring);
+                if ($tmp[2])
+                {
+                    if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie=true;
+                }
+                else
+                {
+                    if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie=true;
+                }
+            }
+        }
+
+        if ($countrycode == 'FR')
+        {
+            $countryfound=1;
+
+            // Definition of fixed working days
+            if($jour == 1 && $mois == 1)   $ferie=true; // 1er january
+            if($jour == 1 && $mois == 5)   $ferie=true; // 1er may
+            if($jour == 8 && $mois == 5)   $ferie=true; // 5 may
+            if($jour == 14 && $mois == 7)  $ferie=true; // 14 july
+            if($jour == 15 && $mois == 8)  $ferie=true; // 15 august
+            if($jour == 1 && $mois == 11)  $ferie=true; // 1 november
+            if($jour == 11 && $mois == 11) $ferie=true; // 11 november
+            if($jour == 25 && $mois == 12) $ferie=true; // 25 december
+
+            // Calculation for easter date
+            $date_paques = easter_date($annee);
+            $jour_paques = date("d", $date_paques);
+            $mois_paques = date("m", $date_paques);
+            if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+            // Pâques
+
+            // Calculation for the monday of easter date
             $date_lundi_paques = mktime(
                 date("H", $date_paques),
                 date("i", $date_paques),
@@ -670,12 +670,12 @@ 
                 date("d", $date_paques) + 1,
                 date("Y", $date_paques)
             );
-			$jour_lundi_ascension = date("d", $date_lundi_paques);
-			$mois_lundi_ascension = date("m", $date_lundi_paques);
-			if($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie=true;
-			// Lundi de Pâques
+            $jour_lundi_ascension = date("d", $date_lundi_paques);
+            $mois_lundi_ascension = date("m", $date_lundi_paques);
+            if($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie=true;
+            // Lundi de Pâques
 
-			// Calcul du jour de l'ascension (38 days after easter day)
+            // Calcul du jour de l'ascension (38 days after easter day)
             $date_ascension = mktime(
                 date("H", $date_paques),
                 date("i", $date_paques),
@@ -684,12 +684,12 @@ 
                 date("d", $date_paques) + 39,
                 date("Y", $date_paques)
             );
-			$jour_ascension = date("d", $date_ascension);
-			$mois_ascension = date("m", $date_ascension);
-			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
-			// Ascension
+            $jour_ascension = date("d", $date_ascension);
+            $mois_ascension = date("m", $date_ascension);
+            if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
+            // Ascension
 
-			// Calculation of "Pentecote" (11 days after easter day)
+            // Calculation of "Pentecote" (11 days after easter day)
             $date_pentecote = mktime(
                 date("H", $date_paques),
                 date("i", $date_paques),
@@ -698,73 +698,73 @@ 
                 date("d", $date_paques) + 49,
                 date("Y", $date_paques)
             );
-			$jour_pentecote = date("d", $date_pentecote);
-			$mois_pentecote = date("m", $date_pentecote);
-			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
-			// "Pentecote"
-		}
-
-		// Pentecoste and Ascensione in Italy go to the sunday after: isn't holiday.
-		// Pentecoste is 50 days after Easter, Ascensione 40
-		if ($countrycode == 'IT')
-		{
-			$countryfound=1;
-
-			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1) $ferie=true; // Capodanno
-			if($jour == 6 && $mois == 1) $ferie=true; // Epifania
-			if($jour == 25 && $mois == 4) $ferie=true; // Anniversario Liberazione
-			if($jour == 1 && $mois == 5) $ferie=true; // Festa del Lavoro
-			if($jour == 2 && $mois == 6) $ferie=true; // Festa della Repubblica
-			if($jour == 15 && $mois == 8) $ferie=true; // Ferragosto
-			if($jour == 1 && $mois == 11) $ferie=true; // Tutti i Santi
-			if($jour == 8 && $mois == 12) $ferie=true; // Immacolata Concezione
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
-			if($jour == 26 && $mois == 12) $ferie=true; // Santo Stefano
-
-			// Calcul du jour de paques
-			$date_paques = easter_date($annee);
-			$jour_paques = date("d", $date_paques);
-			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
-			// Paques
-		}
-
-		if ($countrycode == 'IN')
-		{
-			$countryfound=1;
-
-			if($jour == 1 && $mois == 1) $ferie=true; // New Year's Day
-			if($jour == 26 && $mois == 1) $ferie=true; // Republic Day
-			if($jour == 1 && $mois == 5) $ferie=true; // May Day
-			if($jour == 15 && $mois == 8) $ferie=true; // Independence Day
-			if($jour == 2 && $mois == 10) $ferie=true; // Gandhi Jayanti
-			if($jour == 25 && $mois == 12) $ferie=true; // Christmas
-		}
-
-		if ($countrycode == 'ES')
-		{
-			$countryfound=1;
-
-			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
-			if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
-			if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
-			if($jour == 6 && $mois == 12) $ferie=true; // Constitución
-			if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
-
-			// Calcul día de Pascua
-			$date_paques = easter_date($annee);
-			$jour_paques = date("d", $date_paques);
-			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
-			// Paques
-
-			// Viernes Santo
+            $jour_pentecote = date("d", $date_pentecote);
+            $mois_pentecote = date("m", $date_pentecote);
+            if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+            // "Pentecote"
+        }
+
+        // Pentecoste and Ascensione in Italy go to the sunday after: isn't holiday.
+        // Pentecoste is 50 days after Easter, Ascensione 40
+        if ($countrycode == 'IT')
+        {
+            $countryfound=1;
+
+            // Definition des dates feriees fixes
+            if($jour == 1 && $mois == 1) $ferie=true; // Capodanno
+            if($jour == 6 && $mois == 1) $ferie=true; // Epifania
+            if($jour == 25 && $mois == 4) $ferie=true; // Anniversario Liberazione
+            if($jour == 1 && $mois == 5) $ferie=true; // Festa del Lavoro
+            if($jour == 2 && $mois == 6) $ferie=true; // Festa della Repubblica
+            if($jour == 15 && $mois == 8) $ferie=true; // Ferragosto
+            if($jour == 1 && $mois == 11) $ferie=true; // Tutti i Santi
+            if($jour == 8 && $mois == 12) $ferie=true; // Immacolata Concezione
+            if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
+            if($jour == 26 && $mois == 12) $ferie=true; // Santo Stefano
+
+            // Calcul du jour de paques
+            $date_paques = easter_date($annee);
+            $jour_paques = date("d", $date_paques);
+            $mois_paques = date("m", $date_paques);
+            if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+            // Paques
+        }
+
+        if ($countrycode == 'IN')
+        {
+            $countryfound=1;
+
+            if($jour == 1 && $mois == 1) $ferie=true; // New Year's Day
+            if($jour == 26 && $mois == 1) $ferie=true; // Republic Day
+            if($jour == 1 && $mois == 5) $ferie=true; // May Day
+            if($jour == 15 && $mois == 8) $ferie=true; // Independence Day
+            if($jour == 2 && $mois == 10) $ferie=true; // Gandhi Jayanti
+            if($jour == 25 && $mois == 12) $ferie=true; // Christmas
+        }
+
+        if ($countrycode == 'ES')
+        {
+            $countryfound=1;
+
+            // Definition des dates feriees fixes
+            if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
+            if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
+            if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
+            if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
+            if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
+            if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
+            if($jour == 6 && $mois == 12) $ferie=true; // Constitución
+            if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
+            if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
+
+            // Calcul día de Pascua
+            $date_paques = easter_date($annee);
+            $jour_paques = date("d", $date_paques);
+            $mois_paques = date("m", $date_paques);
+            if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+            // Paques
+
+            // Viernes Santo
             $date_viernes = mktime(
                 date("H", $date_paques),
                 date("i", $date_paques),
@@ -773,113 +773,113 @@ 
                 date("d", $date_paques) -2,
                 date("Y", $date_paques)
             );
-			$jour_viernes = date("d", $date_viernes);
-			$mois_viernes = date("m", $date_viernes);
-			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
-			//Viernes Santo
-		}
-
-		if ($countrycode == 'AT')
-		{
-		    $countryfound=1;
-
-		    // Definition des dates feriees fixes
-		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
-		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
-		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
-		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
-		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
-		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
-		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
-		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
-		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
-		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
-		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
-
-		    // Easter calculation
-		    $date_paques = easter_date($annee);
-		    $jour_paques = date("d", $date_paques);
-		    $mois_paques = date("m", $date_paques);
-		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
-		    // Easter sunday
-
-		    // Monday after easter
-		    $date_eastermonday = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 1,
-		        date("Y", $date_paques)
-		        );
-		    $jour_eastermonday = date("d", $date_eastermonday);
-		    $mois_eastermonday = date("m", $date_eastermonday);
-		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
-		    // Easter monday
-
-		    // Christi Himmelfahrt (39 days after easter sunday)
-		    $date_ch = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 39,
-		        date("Y", $date_paques)
-		        );
-		    $jour_ch = date("d", $date_ch);
-		    $mois_ch = date("m", $date_ch);
-		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
-		    // Christi Himmelfahrt
-
-		    // Pfingsten (50 days after easter sunday)
-		    $date_pentecote = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 50,
-		        date("Y", $date_paques)
-		        );
-		    $jour_pentecote = date("d", $date_pentecote);
-		    $mois_pentecote = date("m", $date_pentecote);
-		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
-		    // Pfingsten
-
-		    // Fronleichnam (60 days after easter sunday)
-		    $date_fronleichnam = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 60,
-		        date("Y", $date_paques)
-		        );
-		    $jour_fronleichnam = date("d", $date_fronleichnam);
-		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
-		    // Fronleichnam
-		}
-
-		// If we have to include saturday and sunday
-		if ($includesaturdayandsunday)
-		{
-			$jour_julien = unixtojd($timestampStart);
-			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
-			//Saturday (6) and Sunday (0)
-		}
-
-		// On incremente compteur
-		if ($ferie) $nbFerie++;
-
-		// Increase number of days (on go up into loop)
-		$timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
-		//var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
-
-		$i++;
-	}
-
-	return $nbFerie;
+            $jour_viernes = date("d", $date_viernes);
+            $mois_viernes = date("m", $date_viernes);
+            if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+            //Viernes Santo
+        }
+
+        if ($countrycode == 'AT')
+        {
+            $countryfound=1;
+
+            // Definition des dates feriees fixes
+            if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
+            if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
+            if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
+            if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
+            if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
+            if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
+            if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
+            if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
+            if($jour == 25 && $mois == 12) $ferie=true; // Christtag
+            if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
+            if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+
+            // Easter calculation
+            $date_paques = easter_date($annee);
+            $jour_paques = date("d", $date_paques);
+            $mois_paques = date("m", $date_paques);
+            if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+            // Easter sunday
+
+            // Monday after easter
+            $date_eastermonday = mktime(
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) + 1,
+                date("Y", $date_paques)
+                );
+            $jour_eastermonday = date("d", $date_eastermonday);
+            $mois_eastermonday = date("m", $date_eastermonday);
+            if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+            // Easter monday
+
+            // Christi Himmelfahrt (39 days after easter sunday)
+            $date_ch = mktime(
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) + 39,
+                date("Y", $date_paques)
+                );
+            $jour_ch = date("d", $date_ch);
+            $mois_ch = date("m", $date_ch);
+            if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+            // Christi Himmelfahrt
+
+            // Pfingsten (50 days after easter sunday)
+            $date_pentecote = mktime(
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) + 50,
+                date("Y", $date_paques)
+                );
+            $jour_pentecote = date("d", $date_pentecote);
+            $mois_pentecote = date("m", $date_pentecote);
+            if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+            // Pfingsten
+
+            // Fronleichnam (60 days after easter sunday)
+            $date_fronleichnam = mktime(
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) + 60,
+                date("Y", $date_paques)
+                );
+            $jour_fronleichnam = date("d", $date_fronleichnam);
+            $mois_fronleichnam = date("m", $date_fronleichnam);
+            if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+            // Fronleichnam
+        }
+
+        // If we have to include saturday and sunday
+        if ($includesaturdayandsunday)
+        {
+            $jour_julien = unixtojd($timestampStart);
+            $jour_semaine = jddayofweek($jour_julien, 0);
+            if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+            //Saturday (6) and Sunday (0)
+        }
+
+        // On incremente compteur
+        if ($ferie) $nbFerie++;
+
+        // Increase number of days (on go up into loop)
+        $timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
+        //var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
+
+        $i++;
+    }
+
+    return $nbFerie;
 }
 
 /**
@@ -894,20 +894,20 @@ 
  */
 function num_between_day($timestampStart, $timestampEnd, $lastday=0)
 {
-	if ($timestampStart < $timestampEnd)
-	{
-		if ($lastday == 1)
-		{
-			$bit = 0;
-		}
-		else
-		{
-			$bit = 1;
-		}
-		$nbjours = (int) floor(($timestampEnd - $timestampStart)/(60*60*24)) + 1 - $bit;
-	}
-	//print ($timestampEnd - $timestampStart) - $lastday;
-	return $nbjours;
+    if ($timestampStart < $timestampEnd)
+    {
+        if ($lastday == 1)
+        {
+            $bit = 0;
+        }
+        else
+        {
+            $bit = 1;
+        }
+        $nbjours = (int) floor(($timestampEnd - $timestampStart)/(60*60*24)) + 1 - $bit;
+    }
+    //print ($timestampEnd - $timestampStart) - $lastday;
+    return $nbjours;
 }
 
 /**
@@ -924,36 +924,36 @@ 
  */
 function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='')
 {
-	global $langs,$mysoc;
-
-	if (empty($country_code)) $country_code=$mysoc->country_code;
-
-	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
-
-	// Check parameters
-	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
-	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
-
-	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
-	if ($timestampStart < $timestampEnd)
-	{
-		$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
-		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
-		$nbOpenDay = $numdays - $numholidays;
-		$nbOpenDay.= " " . $langs->trans("Days");
-		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
-		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	elseif ($timestampStart == $timestampEnd)
-	{
-		$nbOpenDay=$lastday;
-		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
-		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	else
-	{
-		return $langs->trans("Error");
-	}
+    global $langs,$mysoc;
+
+    if (empty($country_code)) $country_code=$mysoc->country_code;
+
+    dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
+
+    // Check parameters
+    if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
+    if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+
+    //print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
+    if ($timestampStart < $timestampEnd)
+    {
+        $numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
+        $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
+        $nbOpenDay = $numdays - $numholidays;
+        $nbOpenDay.= " " . $langs->trans("Days");
+        if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+        return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
+    }
+    elseif ($timestampStart == $timestampEnd)
+    {
+        $nbOpenDay=$lastday;
+        if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+        return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
+    }
+    else
+    {
+        return $langs->trans("Error");
+    }
 }
 
 
@@ -968,38 +968,38 @@ 
  */
 function monthArray($outputlangs,$short=0)
 {
-	$montharray = array (
-	    1  => $outputlangs->trans("Month01"),
-	    2  => $outputlangs->trans("Month02"),
-	    3  => $outputlangs->trans("Month03"),
-	    4  => $outputlangs->trans("Month04"),
-	    5  => $outputlangs->trans("Month05"),
-	    6  => $outputlangs->trans("Month06"),
-	    7  => $outputlangs->trans("Month07"),
-	    8  => $outputlangs->trans("Month08"),
-	    9  => $outputlangs->trans("Month09"),
-	    10 => $outputlangs->trans("Month10"),
-	    11 => $outputlangs->trans("Month11"),
-	    12 => $outputlangs->trans("Month12")
+    $montharray = array (
+        1  => $outputlangs->trans("Month01"),
+        2  => $outputlangs->trans("Month02"),
+        3  => $outputlangs->trans("Month03"),
+        4  => $outputlangs->trans("Month04"),
+        5  => $outputlangs->trans("Month05"),
+        6  => $outputlangs->trans("Month06"),
+        7  => $outputlangs->trans("Month07"),
+        8  => $outputlangs->trans("Month08"),
+        9  => $outputlangs->trans("Month09"),
+        10 => $outputlangs->trans("Month10"),
+        11 => $outputlangs->trans("Month11"),
+        12 => $outputlangs->trans("Month12")
     );
 
-	if (! empty($short))
-	{
-		$montharray = array (
-		    1  => $outputlangs->trans("MonthShort01"),
-		    2  => $outputlangs->trans("MonthShort02"),
-		    3  => $outputlangs->trans("MonthShort03"),
-		    4  => $outputlangs->trans("MonthShort04"),
-		    5  => $outputlangs->trans("MonthShort05"),
-		    6  => $outputlangs->trans("MonthShort06"),
-		    7  => $outputlangs->trans("MonthShort07"),
-		    8  => $outputlangs->trans("MonthShort08"),
-		    9  => $outputlangs->trans("MonthShort09"),
-		    10 => $outputlangs->trans("MonthShort10"),
-		    11 => $outputlangs->trans("MonthShort11"),
-		    12 => $outputlangs->trans("MonthShort12")
-			);
-	}
-
-	return $montharray;
+    if (! empty($short))
+    {
+        $montharray = array (
+            1  => $outputlangs->trans("MonthShort01"),
+            2  => $outputlangs->trans("MonthShort02"),
+            3  => $outputlangs->trans("MonthShort03"),
+            4  => $outputlangs->trans("MonthShort04"),
+            5  => $outputlangs->trans("MonthShort05"),
+            6  => $outputlangs->trans("MonthShort06"),
+            7  => $outputlangs->trans("MonthShort07"),
+            8  => $outputlangs->trans("MonthShort08"),
+            9  => $outputlangs->trans("MonthShort09"),
+            10 => $outputlangs->trans("MonthShort10"),
+            11 => $outputlangs->trans("MonthShort11"),
+            12 => $outputlangs->trans("MonthShort12")
+            );
+    }
+
+    return $montharray;
 }

Spacing +204 added lines, -204 removed lines

@@ -33,7 +33,7 @@ 
  */
 function get_tz_array()
 {
-    $tzarray=array(
+    $tzarray = array(
         -11=>"Pacific/Midway",
         -10=>"Pacific/Fakaofo",
         -9=>"America/Anchorage",
@@ -80,28 +80,28 @@ 
  * @param	string	$refgmtdate		Reference period for timezone (timezone differs on winter and summer. May be 'now', 'winter' or 'summer')
  * @return 	int						An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
  */
-function getServerTimeZoneInt($refgmtdate='now')
+function getServerTimeZoneInt($refgmtdate = 'now')
 {
     global $conf;
-    if (method_exists('DateTimeZone','getOffset'))
+    if (method_exists('DateTimeZone', 'getOffset'))
     {
         // Method 1 (include daylight)
-        $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
-        if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
-        else $newrefgmtdate=$yearref.'-01-01';
-        $newrefgmtdate.='T00:00:00+00:00';
+        $gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
+        if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
+        elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
+        else $newrefgmtdate = $yearref.'-01-01';
+        $newrefgmtdate .= 'T00:00:00+00:00';
         $localtz = new DateTimeZone(getServerTimeZoneString());
         $localdt = new DateTime($newrefgmtdate, $localtz);
-        $tmp=-1*$localtz->getOffset($localdt);
+        $tmp = -1 * $localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
     }
     else
     {
-    	$tmp=0;
-    	dol_print_error('','PHP version must be 5.3+');
+    	$tmp = 0;
+    	dol_print_error('', 'PHP version must be 5.3+');
     }
-    $tz=round(($tmp<0?1:-1)*abs($tmp/3600));
+    $tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
     return $tz;
 }
 
@@ -119,24 +119,24 @@ 
 	global $conf;
 
 	if ($duration_value == 0)  return $time;
-	if ($duration_unit == 'h') return $time + (3600*$duration_value);
-	if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
+	if ($duration_unit == 'h') return $time + (3600 * $duration_value);
+	if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);
 
-	$deltastring='P';
+	$deltastring = 'P';
 
-	if ($duration_value > 0){ $deltastring.=abs($duration_value); $sub= false; }
-	if ($duration_value < 0){ $deltastring.=abs($duration_value); $sub= true; }
-	if ($duration_unit == 'd') { $deltastring.="D"; }
-	if ($duration_unit == 'm') { $deltastring.="M"; }
-	if ($duration_unit == 'y') { $deltastring.="Y"; }
+	if ($duration_value > 0) { $deltastring .= abs($duration_value); $sub = false; }
+	if ($duration_value < 0) { $deltastring .= abs($duration_value); $sub = true; }
+	if ($duration_unit == 'd') { $deltastring .= "D"; }
+	if ($duration_unit == 'm') { $deltastring .= "M"; }
+	if ($duration_unit == 'y') { $deltastring .= "Y"; }
 
 	$date = new DateTime();
-	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+	if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
 	$date->setTimestamp($time);
 	$interval = new DateInterval($deltastring);
 
-	if($sub) $date->sub($interval);
-	else $date->add( $interval );
+	if ($sub) $date->sub($interval);
+	else $date->add($interval);
 
 	return $date->getTimestamp();
 }
@@ -151,9 +151,9 @@ 
  * @return     int						Time into seconds
  * @see convertSecondToTime
  */
-function convertTime2Seconds($iHours=0, $iMinutes=0, $iSeconds=0)
+function convertTime2Seconds($iHours = 0, $iMinutes = 0, $iSeconds = 0)
 {
-	$iResult=($iHours*3600)+($iMinutes*60)+$iSeconds;
+	$iResult = ($iHours * 3600) + ($iMinutes * 60) + $iSeconds;
 	return $iResult;
 }
 
@@ -178,30 +178,30 @@ 
  * 	                                		Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00
  *      @see convertTime2Seconds
  */
-function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengthOfWeek=7)
+function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $lengthOfWeek = 7)
 {
 	global $langs;
 
-	if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
+	if (empty($lengthOfDay))  $lengthOfDay = 86400; // 1 day = 24 hours
+    if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
 	{
-		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
+		if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
 
-        $sTime='';
-        $sDay=0;
-        $sWeek=0;
+        $sTime = '';
+        $sDay = 0;
+        $sWeek = 0;
 
 		if ($iSecond >= $lengthOfDay)
 		{
-			for($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay )
+			for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay)
 			{
 				$sDay++;
-				$iSecond-=$lengthOfDay;
+				$iSecond -= $lengthOfDay;
 			}
 			$dayTranslate = $langs->trans("Day");
-			if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
+			if ($iSecond >= ($lengthOfDay * 2)) $dayTranslate = $langs->trans("Days");
 		}
 
 		if ($lengthOfWeek < 7)
@@ -210,66 +210,66 @@ 
             {
                 if ($sDay >= $lengthOfWeek)
                 {
-                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
+                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
                     $sDay = $sDay % $lengthOfWeek;
                     $weekTranslate = $langs->trans("DurationWeek");
                     if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
-                    $sTime.=$sWeek.' '.$weekTranslate.' ';
+                    $sTime .= $sWeek.' '.$weekTranslate.' ';
                 }
             }
 		}
-		if ($sDay>0)
+		if ($sDay > 0)
 		{
 			$dayTranslate = $langs->trans("Day");
 			if ($sDay > 1) $dayTranslate = $langs->trans("Days");
-			$sTime.=$sDay.' '.$dayTranslate.' ';
+			$sTime .= $sDay.' '.$dayTranslate.' ';
 		}
 
 		if ($format == 'all')
 		{
 			if ($iSecond || empty($sDay))
 			{
-				$sTime.= dol_print_date($iSecond,'hourduration',true);
+				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
 		}
 		if ($format == 'allhourmin')
 		{
-		    return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600))).':'.sprintf("%02d",((int) floor(($iSecond % 3600)/60)));
+		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
 		}
 		if ($format == 'allhour')
 		{
-			return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
 		}
 	}
 	else if ($format == 'hour')	// only hour part
 	{
-		$sTime=dol_print_date($iSecond,'%H',true);
+		$sTime = dol_print_date($iSecond, '%H', true);
 	}
 	else if ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
-			$iSecond=$iSecond/3600;
+			$iSecond = $iSecond / 3600;
 		}
 		else {
-			$iSecond=0;
+			$iSecond = 0;
 		}
-		$sTime=$iSecond;
+		$sTime = $iSecond;
 	}
 	else if ($format == 'min')	// only min part
 	{
-		$sTime=dol_print_date($iSecond,'%M',true);
+		$sTime = dol_print_date($iSecond, '%M', true);
 	}
     else if ($format == 'sec')	// only sec part
     {
-        $sTime=dol_print_date($iSecond,'%S',true);
+        $sTime = dol_print_date($iSecond, '%S', true);
     }
     else if ($format == 'month')	// only month part
     {
-        $sTime=dol_print_date($iSecond,'%m',true);
+        $sTime = dol_print_date($iSecond, '%m', true);
     }
     else if ($format == 'year')	// only year part
     {
-        $sTime=dol_print_date($iSecond,'%Y',true);
+        $sTime = dol_print_date($iSecond, '%Y', true);
     }
     return trim($sTime);
 }
@@ -287,19 +287,19 @@ 
 function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date)
 {
 	global $db;
-	$sqldate="";
+	$sqldate = "";
 	if ($month_date > 0) {
 		if ($year_date > 0 && empty($day_date)) {
-			$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
-			$sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
-		} else if ($year_date > 0 && ! empty($day_date)) {
-			$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
-			$sqldate.= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
+			$sqldate .= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));
+			$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";
+		} else if ($year_date > 0 && !empty($day_date)) {
+			$sqldate .= " AND ".$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
+			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
 		} else
-			$sqldate.= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
-	} else if ($year_date > 0){
-		$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
-		$sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
+			$sqldate .= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
+	} else if ($year_date > 0) {
+		$sqldate .= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
+		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
 	}
 	return $sqldate;
 }
@@ -322,10 +322,10 @@ 
  *
  *  @see    dol_print_date, dol_mktime, dol_getdate
  */
-function dol_stringtotime($string, $gm=1)
+function dol_stringtotime($string, $gm = 1)
 {
     // Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
-    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$string,$reg))
+    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
     {
         dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
         // Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
@@ -336,14 +336,14 @@ 
         $shour = $reg[4];
         $smin = $reg[5];
         $ssec = $reg[6];
-        if ($syear < 50) $syear+=1900;
-        if ($syear >= 50 && $syear < 100) $syear+=2000;
-        $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
+        if ($syear < 50) $syear += 1900;
+        if ($syear >= 50 && $syear < 100) $syear += 2000;
+        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
     }
     else if (
-    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
-    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
-   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
+    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
+   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
     )
     {
         $syear = $reg[1];
@@ -352,12 +352,12 @@ 
         $shour = $reg[4];
         $smin = $reg[5];
         $ssec = $reg[6];
-        $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
+        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
     }
 
-    $string=preg_replace('/([^0-9])/i','',$string);
-    $tmp=$string.'000000';
-    $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),($gm?1:0));
+    $string = preg_replace('/([^0-9])/i', '', $string);
+    $tmp = $string.'000000';
+    $date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
     return $date;
 }
 
@@ -371,9 +371,9 @@ 
  */
 function dol_get_prev_day($day, $month, $year)
 {
-	$time=dol_mktime(12,0,0,$month,$day,$year,1,0);
-	$time-=24*60*60;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
+	$time -= 24 * 60 * 60;
+	$tmparray = dol_getdate($time, true);
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
@@ -386,9 +386,9 @@ 
  */
 function dol_get_next_day($day, $month, $year)
 {
-	$time=dol_mktime(12,0,0,$month,$day,$year,1,0);
-	$time+=24*60*60;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $month, $day, $year, 1, 0);
+	$time += 24 * 60 * 60;
+	$tmparray = dol_getdate($time, true);
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
@@ -407,7 +407,7 @@ 
 	}
 	else
 	{
-		$prev_month = $month-1;
+		$prev_month = $month - 1;
 		$prev_year  = $year;
 	}
 	return array('year' => $prev_year, 'month' => $prev_month);
@@ -446,9 +446,9 @@ 
 {
 	$tmparray = dol_get_first_day_week($day, $month, $year);
 
-	$time=dol_mktime(12,0,0,$month,$tmparray['first_day'],$year,1,0);
-	$time-=24*60*60*7;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $month, $tmparray['first_day'], $year, 1, 0);
+	$time -= 24 * 60 * 60 * 7;
+	$tmparray = dol_getdate($time, true);
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
@@ -464,9 +464,9 @@ 
 {
 	$tmparray = dol_get_first_day_week($day, $month, $year);
 
-	$time=dol_mktime(12,0,0,$tmparray['first_month'],$tmparray['first_day'],$tmparray['first_year'],1,0);
-	$time+=24*60*60*7;
-	$tmparray=dol_getdate($time,true);
+	$time = dol_mktime(12, 0, 0, $tmparray['first_month'], $tmparray['first_day'], $tmparray['first_year'], 1, 0);
+	$time += 24 * 60 * 60 * 7;
+	$tmparray = dol_getdate($time, true);
 
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
@@ -480,10 +480,10 @@ 
  *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00
  *  @return		int						Date for first day, '' if error
  */
-function dol_get_first_day($year,$month=1,$gm=false)
+function dol_get_first_day($year, $month = 1, $gm = false)
 {
 	if ($year > 9999) return '';
-	return dol_mktime(0,0,0,$month,1,$year,$gm);
+	return dol_mktime(0, 0, 0, $month, 1, $year, $gm);
 }
 
 
@@ -494,7 +494,7 @@ 
  * 	@param		boolean		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
  *	@return		int						Date for first day, '' if error
  */
-function dol_get_last_day($year,$month=12,$gm=false)
+function dol_get_last_day($year, $month = 12, $gm = false)
 {
 	if ($year > 9999) return '';
 	if ($month == 12)
@@ -508,7 +508,7 @@ 
 	}
 
 	// On se deplace au debut du mois suivant, et on retire un jour
-	$datelim=dol_mktime(23,59,59,$month,1,$year,$gm);
+	$datelim = dol_mktime(23, 59, 59, $month, 1, $year, $gm);
 	$datelim -= (3600 * 24);
 
 	return $datelim;
@@ -522,69 +522,69 @@ 
  * 	@param		int		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
  *	@return		array				year,month,week,first_day,first_month,first_year,prev_day,prev_month,prev_year
  */
-function dol_get_first_day_week($day,$month,$year,$gm=false)
+function dol_get_first_day_week($day, $month, $year, $gm = false)
 {
 	global $conf;
 
 	//$day=2; $month=2; $year=2015;
-	$date = dol_mktime(0,0,0,$month,$day,$year,$gm);
+	$date = dol_mktime(0, 0, 0, $month, $day, $year, $gm);
 
 	//Checking conf of start week
-	$start_week = (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1);
+	$start_week = (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1);
 
-	$tmparray = dol_getdate($date,true);	// detail of current day
+	$tmparray = dol_getdate($date, true); // detail of current day
 
 	//Calculate days = offset from current day
 	$days = $start_week - $tmparray['wday'];
- 	if ($days>=1) $days=7-$days;
+ 	if ($days >= 1) $days = 7 - $days;
  	$days = abs($days);
-    $seconds = $days*24*60*60;
+    $seconds = $days * 24 * 60 * 60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
     //Get first day of week
-    $tmpdaytms = date($tmparray[0])-$seconds; // $tmparray[0] is day of parameters
-	$tmpday = date("d",$tmpdaytms);
+    $tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
+	$tmpday = date("d", $tmpdaytms);
 
 	//Check first day of week is in same month than current day or not
-	if ($tmpday>$day)
+	if ($tmpday > $day)
     {
-    	$prev_month = $month-1;
-		$prev_year  = $year;
+    	$prev_month = $month - 1;
+		$prev_year = $year;
 
-    	if ($prev_month==0)
+    	if ($prev_month == 0)
     	{
     		$prev_month = 12;
-    		$prev_year  = $year-1;
+    		$prev_year  = $year - 1;
     	}
     }
     else
     {
     	$prev_month = $month;
-		$prev_year  = $year;
+		$prev_year = $year;
     }
 	$tmpmonth = $prev_month;
 	$tmpyear = $prev_year;
 
 	//Get first day of next week
-	$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
-	$tmptime-=24*60*60*7;
-	$tmparray=dol_getdate($tmptime,true);
-    $prev_day   = $tmparray['mday'];
+	$tmptime = dol_mktime(12, 0, 0, $month, $tmpday, $year, 1, 0);
+	$tmptime -= 24 * 60 * 60 * 7;
+	$tmparray = dol_getdate($tmptime, true);
+    $prev_day = $tmparray['mday'];
 
     //Check prev day of week is in same month than first day or not
 	if ($prev_day > $tmpday)
     {
-    	$prev_month = $month-1;
-		$prev_year  = $year;
+    	$prev_month = $month - 1;
+		$prev_year = $year;
 
-    	if ($prev_month==0)
+    	if ($prev_month == 0)
     	{
     		$prev_month = 12;
-    		$prev_year  = $year-1;
+    		$prev_year  = $year - 1;
     	}
     }
 
-    $week = date("W",dol_mktime(0,0,0,$tmpmonth,$tmpday,$tmpyear,$gm));
+    $week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));
 
 	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
@@ -600,7 +600,7 @@ 
  *	@return   	int								Nombre de jours feries
  *  @see num_between_day, num_open_day
  */
-function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $lastday=0)
+function num_public_holiday($timestampStart, $timestampEnd, $countrycode = 'FR', $lastday = 0)
 {
 	global $conf;
 
@@ -609,13 +609,13 @@ 
 	// Check to ensure we use correct parameters
 	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
 
-	$i=0;
-	while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
+	$i = 0;
+	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
 	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
-		$ferie=false;
-		$countryfound=0;
-		$includesaturdayandsunday=1;
+		$ferie = false;
+		$countryfound = 0;
+		$includesaturdayandsunday = 1;
 
 		$jour  = date("d", $timestampStart);
 		$mois  = date("m", $timestampStart);
@@ -623,42 +623,42 @@ 
 
 
 		// Check into var $conf->global->HOLIDAY_MORE_DAYS   MM-DD,YYYY-MM-DD, ...
-		if (! empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
+		if (!empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
 		{
-			$arrayofdaystring=explode(',',$conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
-			foreach($arrayofdaystring as $daystring)
+			$arrayofdaystring = explode(',', $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
+			foreach ($arrayofdaystring as $daystring)
 			{
-				$tmp=explode('-',$daystring);
+				$tmp = explode('-', $daystring);
 				if ($tmp[2])
 				{
-					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie=true;
+					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;
 				}
 				else
 				{
-					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie=true;
+					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;
 				}
 			}
 		}
 
 		if ($countrycode == 'FR')
 		{
-			$countryfound=1;
+			$countryfound = 1;
 
 			// Definition of fixed working days
-			if($jour == 1 && $mois == 1)   $ferie=true; // 1er january
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1er may
-			if($jour == 8 && $mois == 5)   $ferie=true; // 5 may
-			if($jour == 14 && $mois == 7)  $ferie=true; // 14 july
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 august
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 november
-			if($jour == 11 && $mois == 11) $ferie=true; // 11 november
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 december
+			if ($jour == 1 && $mois == 1)   $ferie = true; // 1er january
+			if ($jour == 1 && $mois == 5)   $ferie = true; // 1er may
+			if ($jour == 8 && $mois == 5)   $ferie = true; // 5 may
+			if ($jour == 14 && $mois == 7)  $ferie = true; // 14 july
+			if ($jour == 15 && $mois == 8)  $ferie = true; // 15 august
+			if ($jour == 1 && $mois == 11)  $ferie = true; // 1 november
+			if ($jour == 11 && $mois == 11) $ferie = true; // 11 november
+			if ($jour == 25 && $mois == 12) $ferie = true; // 25 december
 
 			// Calculation for easter date
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 			// Pâques
 
 			// Calculation for the monday of easter date
@@ -672,7 +672,7 @@ 
             );
 			$jour_lundi_ascension = date("d", $date_lundi_paques);
 			$mois_lundi_ascension = date("m", $date_lundi_paques);
-			if($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie=true;
+			if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie = true;
 			// Lundi de Pâques
 
 			// Calcul du jour de l'ascension (38 days after easter day)
@@ -686,7 +686,7 @@ 
             );
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
-			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
+			if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
 			// Ascension
 
 			// Calculation of "Pentecote" (11 days after easter day)
@@ -700,7 +700,7 @@ 
             );
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
-			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
 			// "Pentecote"
 		}
 
@@ -708,60 +708,60 @@ 
 		// Pentecoste is 50 days after Easter, Ascensione 40
 		if ($countrycode == 'IT')
 		{
-			$countryfound=1;
+			$countryfound = 1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1) $ferie=true; // Capodanno
-			if($jour == 6 && $mois == 1) $ferie=true; // Epifania
-			if($jour == 25 && $mois == 4) $ferie=true; // Anniversario Liberazione
-			if($jour == 1 && $mois == 5) $ferie=true; // Festa del Lavoro
-			if($jour == 2 && $mois == 6) $ferie=true; // Festa della Repubblica
-			if($jour == 15 && $mois == 8) $ferie=true; // Ferragosto
-			if($jour == 1 && $mois == 11) $ferie=true; // Tutti i Santi
-			if($jour == 8 && $mois == 12) $ferie=true; // Immacolata Concezione
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
-			if($jour == 26 && $mois == 12) $ferie=true; // Santo Stefano
+			if ($jour == 1 && $mois == 1) $ferie = true; // Capodanno
+			if ($jour == 6 && $mois == 1) $ferie = true; // Epifania
+			if ($jour == 25 && $mois == 4) $ferie = true; // Anniversario Liberazione
+			if ($jour == 1 && $mois == 5) $ferie = true; // Festa del Lavoro
+			if ($jour == 2 && $mois == 6) $ferie = true; // Festa della Repubblica
+			if ($jour == 15 && $mois == 8) $ferie = true; // Ferragosto
+			if ($jour == 1 && $mois == 11) $ferie = true; // Tutti i Santi
+			if ($jour == 8 && $mois == 12) $ferie = true; // Immacolata Concezione
+			if ($jour == 25 && $mois == 12) $ferie = true; // 25 decembre
+			if ($jour == 26 && $mois == 12) $ferie = true; // Santo Stefano
 
 			// Calcul du jour de paques
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 			// Paques
 		}
 
 		if ($countrycode == 'IN')
 		{
-			$countryfound=1;
-
-			if($jour == 1 && $mois == 1) $ferie=true; // New Year's Day
-			if($jour == 26 && $mois == 1) $ferie=true; // Republic Day
-			if($jour == 1 && $mois == 5) $ferie=true; // May Day
-			if($jour == 15 && $mois == 8) $ferie=true; // Independence Day
-			if($jour == 2 && $mois == 10) $ferie=true; // Gandhi Jayanti
-			if($jour == 25 && $mois == 12) $ferie=true; // Christmas
+			$countryfound = 1;
+
+			if ($jour == 1 && $mois == 1) $ferie = true; // New Year's Day
+			if ($jour == 26 && $mois == 1) $ferie = true; // Republic Day
+			if ($jour == 1 && $mois == 5) $ferie = true; // May Day
+			if ($jour == 15 && $mois == 8) $ferie = true; // Independence Day
+			if ($jour == 2 && $mois == 10) $ferie = true; // Gandhi Jayanti
+			if ($jour == 25 && $mois == 12) $ferie = true; // Christmas
 		}
 
 		if ($countrycode == 'ES')
 		{
-			$countryfound=1;
+			$countryfound = 1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
-			if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
-			if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
-			if($jour == 6 && $mois == 12) $ferie=true; // Constitución
-			if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
+			if ($jour == 1 && $mois == 1)   $ferie = true; // Año nuevo
+			if ($jour == 6 && $mois == 1)   $ferie = true; // Día Reyes
+			if ($jour == 1 && $mois == 5)   $ferie = true; // 1 Mayo
+			if ($jour == 15 && $mois == 8)  $ferie = true; // 15 Agosto
+			if ($jour == 12 && $mois == 10)  $ferie = true; // Día Hispanidad
+			if ($jour == 1 && $mois == 11)  $ferie = true; // 1 noviembre
+			if ($jour == 6 && $mois == 12) $ferie = true; // Constitución
+			if ($jour == 8 && $mois == 12)  $ferie = true; // Inmaculada
+			if ($jour == 25 && $mois == 12) $ferie = true; // 25 diciembre
 
 			// Calcul día de Pascua
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 			// Paques
 
 			// Viernes Santo
@@ -770,37 +770,37 @@ 
                 date("i", $date_paques),
                 date("s", $date_paques),
                 date("m", $date_paques),
-                date("d", $date_paques) -2,
+                date("d", $date_paques) - 2,
                 date("Y", $date_paques)
             );
 			$jour_viernes = date("d", $date_viernes);
 			$mois_viernes = date("m", $date_viernes);
-			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+			if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
 			//Viernes Santo
 		}
 
 		if ($countrycode == 'AT')
 		{
-		    $countryfound=1;
+		    $countryfound = 1;
 
 		    // Definition des dates feriees fixes
-		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
-		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
-		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
-		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
-		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
-		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
-		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
-		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
-		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
-		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
-		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+		    if ($jour == 1 && $mois == 1)   $ferie = true; // Neujahr
+		    if ($jour == 6 && $mois == 1)   $ferie = true; // Hl. 3 Koenige
+		    if ($jour == 1 && $mois == 5)   $ferie = true; // 1. Mai
+		    if ($jour == 15 && $mois == 8)  $ferie = true; // Mariae Himmelfahrt
+		    if ($jour == 26 && $mois == 10) $ferie = true; // 26. Oktober
+		    if ($jour == 1 && $mois == 11)  $ferie = true; // Allerheiligen
+		    if ($jour == 8 && $mois == 12)  $ferie = true; // Mariae Empfaengnis
+		    if ($jour == 24 && $mois == 12) $ferie = true; // Heilig abend
+		    if ($jour == 25 && $mois == 12) $ferie = true; // Christtag
+		    if ($jour == 26 && $mois == 12) $ferie = true; // Stefanietag
+		    if ($jour == 31 && $mois == 12) $ferie = true; // Silvester
 
 		    // Easter calculation
 		    $date_paques = easter_date($annee);
 		    $jour_paques = date("d", $date_paques);
 		    $mois_paques = date("m", $date_paques);
-		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+		    if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
 		    // Easter sunday
 
 		    // Monday after easter
@@ -814,7 +814,7 @@ 
 		        );
 		    $jour_eastermonday = date("d", $date_eastermonday);
 		    $mois_eastermonday = date("m", $date_eastermonday);
-		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+		    if ($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie = true;
 		    // Easter monday
 
 		    // Christi Himmelfahrt (39 days after easter sunday)
@@ -828,7 +828,7 @@ 
 		        );
 		    $jour_ch = date("d", $date_ch);
 		    $mois_ch = date("m", $date_ch);
-		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+		    if ($jour_ch == $jour && $mois_ch == $mois) $ferie = true;
 		    // Christi Himmelfahrt
 
 		    // Pfingsten (50 days after easter sunday)
@@ -842,7 +842,7 @@ 
 		        );
 		    $jour_pentecote = date("d", $date_pentecote);
 		    $mois_pentecote = date("m", $date_pentecote);
-		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+		    if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
 		    // Pfingsten
 
 		    // Fronleichnam (60 days after easter sunday)
@@ -856,7 +856,7 @@ 
 		        );
 		    $jour_fronleichnam = date("d", $date_fronleichnam);
 		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+		    if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
 		    // Fronleichnam
 		}
 
@@ -865,7 +865,7 @@ 
 		{
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if ($jour_semaine == 0 || $jour_semaine == 6) $ferie = true;
 			//Saturday (6) and Sunday (0)
 		}
 
@@ -873,7 +873,7 @@ 
 		if ($ferie) $nbFerie++;
 
 		// Increase number of days (on go up into loop)
-		$timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
+		$timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');
 		//var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
 
 		$i++;
@@ -892,7 +892,7 @@ 
  *	@return    int								Number of days
  *  @see also num_public_holiday, num_open_day
  */
-function num_between_day($timestampStart, $timestampEnd, $lastday=0)
+function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 {
 	if ($timestampStart < $timestampEnd)
 	{
@@ -904,7 +904,7 @@ 
 		{
 			$bit = 1;
 		}
-		$nbjours = (int) floor(($timestampEnd - $timestampStart)/(60*60*24)) + 1 - $bit;
+		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
 	}
 	//print ($timestampEnd - $timestampStart) - $lastday;
 	return $nbjours;
@@ -922,17 +922,17 @@ 
  *	@return    	int								Number of days or hours
  *  @see also num_between_day, num_public_holiday
  */
-function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $halfday=0, $country_code='')
+function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0, $halfday = 0, $country_code = '')
 {
-	global $langs,$mysoc;
+	global $langs, $mysoc;
 
-	if (empty($country_code)) $country_code=$mysoc->country_code;
+	if (empty($country_code)) $country_code = $mysoc->country_code;
 
 	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
 
 	// Check parameters
-	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
-	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+	if (!is_int($timestampStart) && !is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
+	if (!is_int($timestampEnd) && !is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
 
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
@@ -940,14 +940,14 @@ 
 		$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
 		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
 		$nbOpenDay = $numdays - $numholidays;
-		$nbOpenDay.= " " . $langs->trans("Days");
-		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		$nbOpenDay .= " ".$langs->trans("Days");
+		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
 	elseif ($timestampStart == $timestampEnd)
 	{
-		$nbOpenDay=$lastday;
-		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		$nbOpenDay = $lastday;
+		if ($inhour == 1) $nbOpenDay = $nbOpenDay * 24.$langs->trans("HourShort");
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	}
 	else
@@ -966,9 +966,9 @@ 
  *  @param	int			$short			0=Return long label, 1=Return short label
  *	@return array						Month string or array if selected < 0
  */
-function monthArray($outputlangs,$short=0)
+function monthArray($outputlangs, $short = 0)
 {
-	$montharray = array (
+	$montharray = array(
 	    1  => $outputlangs->trans("Month01"),
 	    2  => $outputlangs->trans("Month02"),
 	    3  => $outputlangs->trans("Month03"),
@@ -983,9 +983,9 @@ 
 	    12 => $outputlangs->trans("Month12")
     );
 
-	if (! empty($short))
+	if (!empty($short))
 	{
-		$montharray = array (
+		$montharray = array(
 		    1  => $outputlangs->trans("MonthShort01"),
 		    2  => $outputlangs->trans("MonthShort02"),
 		    3  => $outputlangs->trans("MonthShort03"),

Braces +331 added lines, -119 removed lines

@@ -87,16 +87,19 @@ 
     {
         // Method 1 (include daylight)
         $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
-        if ($refgmtdate == 'now') $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate=$yearref.'-08-01';
-        else $newrefgmtdate=$yearref.'-01-01';
+        if ($refgmtdate == 'now') {
+            $newrefgmtdate=$yearref.'-'.$monthref.'-'.$dayref;
+        } elseif ($refgmtdate == 'summer') {
+            $newrefgmtdate=$yearref.'-08-01';
+        } else {
+            $newrefgmtdate=$yearref.'-01-01';
+        }
         $newrefgmtdate.='T00:00:00+00:00';
         $localtz = new DateTimeZone(getServerTimeZoneString());
         $localdt = new DateTime($newrefgmtdate, $localtz);
         $tmp=-1*$localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
-    }
-    else
+    } else
     {
     	$tmp=0;
     	dol_print_error('','PHP version must be 5.3+');
@@ -118,9 +121,15 @@ 
 {
 	global $conf;
 
-	if ($duration_value == 0)  return $time;
-	if ($duration_unit == 'h') return $time + (3600*$duration_value);
-	if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
+	if ($duration_value == 0) {
+	    return $time;
+	}
+	if ($duration_unit == 'h') {
+	    return $time + (3600*$duration_value);
+	}
+	if ($duration_unit == 'w') {
+	    return $time + (3600*24*7*$duration_value);
+	}
 
 	$deltastring='P';
 
@@ -131,12 +140,17 @@ 
 	if ($duration_unit == 'y') { $deltastring.="Y"; }
 
 	$date = new DateTime();
-	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+	if (! empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) {
+	    $date->setTimezone(new DateTimeZone('UTC'));
+	}
 	$date->setTimestamp($time);
 	$interval = new DateInterval($deltastring);
 
-	if($sub) $date->sub($interval);
-	else $date->add( $interval );
+	if($sub) {
+	    $date->sub($interval);
+	} else {
+	    $date->add( $interval );
+	}
 
 	return $date->getTimestamp();
 }
@@ -182,12 +196,21 @@ 
 {
 	global $langs;
 
-	if (empty($lengthOfDay))  $lengthOfDay = 86400;         // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7;            // 1 week = 7 days
+	if (empty($lengthOfDay)) {
+	    $lengthOfDay = 86400;
+	}
+	// 1 day = 24 hours
+    if (empty($lengthOfWeek)) {
+        $lengthOfWeek = 7;
+    }
+    // 1 week = 7 days
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin')
 	{
-		if ((int) $iSecond === 0) return '0';	// This is to avoid having 0 return a 12:00 AM for en_US
+		if ((int) $iSecond === 0) {
+		    return '0';
+		}
+		// This is to avoid having 0 return a 12:00 AM for en_US
 
         $sTime='';
         $sDay=0;
@@ -201,7 +224,9 @@ 
 				$iSecond-=$lengthOfDay;
 			}
 			$dayTranslate = $langs->trans("Day");
-			if ($iSecond >= ($lengthOfDay*2)) $dayTranslate = $langs->trans("Days");
+			if ($iSecond >= ($lengthOfDay*2)) {
+			    $dayTranslate = $langs->trans("Days");
+			}
 		}
 
 		if ($lengthOfWeek < 7)
@@ -213,7 +238,9 @@ 
                     $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
                     $sDay = $sDay % $lengthOfWeek;
                     $weekTranslate = $langs->trans("DurationWeek");
-                    if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
+                    if ($sWeek >= 2) {
+                        $weekTranslate = $langs->trans("DurationWeeks");
+                    }
                     $sTime.=$sWeek.' '.$weekTranslate.' ';
                 }
             }
@@ -221,7 +248,9 @@ 
 		if ($sDay>0)
 		{
 			$dayTranslate = $langs->trans("Day");
-			if ($sDay > 1) $dayTranslate = $langs->trans("Days");
+			if ($sDay > 1) {
+			    $dayTranslate = $langs->trans("Days");
+			}
 			$sTime.=$sDay.' '.$dayTranslate.' ';
 		}
 
@@ -240,37 +269,40 @@ 
 		{
 			return sprintf("%02d",($sWeek*$lengthOfWeek*24 + $sDay*24 + (int) floor($iSecond/3600)));
 		}
-	}
-	else if ($format == 'hour')	// only hour part
+	} else if ($format == 'hour') {
+	    // only hour part
 	{
 		$sTime=dol_print_date($iSecond,'%H',true);
 	}
-	else if ($format == 'fullhour')
+	} else if ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
 			$iSecond=$iSecond/3600;
-		}
-		else {
+		} else {
 			$iSecond=0;
 		}
 		$sTime=$iSecond;
-	}
-	else if ($format == 'min')	// only min part
+	} else if ($format == 'min') {
+	    // only min part
 	{
 		$sTime=dol_print_date($iSecond,'%M',true);
 	}
-    else if ($format == 'sec')	// only sec part
+	} else if ($format == 'sec') {
+        // only sec part
     {
         $sTime=dol_print_date($iSecond,'%S',true);
     }
-    else if ($format == 'month')	// only month part
+    } else if ($format == 'month') {
+        // only month part
     {
         $sTime=dol_print_date($iSecond,'%m',true);
     }
-    else if ($format == 'year')	// only year part
+    } else if ($format == 'year') {
+        // only year part
     {
         $sTime=dol_print_date($iSecond,'%Y',true);
     }
+    }
     return trim($sTime);
 }
 
@@ -295,8 +327,9 @@ 
 		} else if ($year_date > 0 && ! empty($day_date)) {
 			$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
 			$sqldate.= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
-		} else
-			$sqldate.= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
+		} else {
+					$sqldate.= " AND date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
+		}
 	} else if ($year_date > 0){
 		$sqldate.= " AND ".$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
 		$sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
@@ -336,11 +369,14 @@ 
         $shour = $reg[4];
         $smin = $reg[5];
         $ssec = $reg[6];
-        if ($syear < 50) $syear+=1900;
-        if ($syear >= 50 && $syear < 100) $syear+=2000;
+        if ($syear < 50) {
+            $syear+=1900;
+        }
+        if ($syear >= 50 && $syear < 100) {
+            $syear+=2000;
+        }
         $string=sprintf("%04d%02d%02d%02d%02d%02d",$syear,$smonth,$sday,$shour,$smin,$ssec);
-    }
-    else if (
+    } else if (
     	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i',$string,$reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
     	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i',$string,$reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i',$string,$reg)		// Convert date with format YYYYMMDDTHHMMSSZ
@@ -404,8 +440,7 @@ 
 	{
 		$prev_month = 12;
 		$prev_year  = $year - 1;
-	}
-	else
+	} else
 	{
 		$prev_month = $month-1;
 		$prev_year  = $year;
@@ -425,8 +460,7 @@ 
 	{
 		$next_month = 1;
 		$next_year  = $year + 1;
-	}
-	else
+	} else
 	{
 		$next_month = $month + 1;
 		$next_year  = $year;
@@ -482,7 +516,9 @@ 
  */
 function dol_get_first_day($year,$month=1,$gm=false)
 {
-	if ($year > 9999) return '';
+	if ($year > 9999) {
+	    return '';
+	}
 	return dol_mktime(0,0,0,$month,1,$year,$gm);
 }
 
@@ -496,13 +532,14 @@ 
  */
 function dol_get_last_day($year,$month=12,$gm=false)
 {
-	if ($year > 9999) return '';
+	if ($year > 9999) {
+	    return '';
+	}
 	if ($month == 12)
 	{
 		$month = 1;
 		$year += 1;
-	}
-	else
+	} else
 	{
 		$month += 1;
 	}
@@ -536,7 +573,9 @@ 
 
 	//Calculate days = offset from current day
 	$days = $start_week - $tmparray['wday'];
- 	if ($days>=1) $days=7-$days;
+ 	if ($days>=1) {
+ 	    $days=7-$days;
+ 	}
  	$days = abs($days);
     $seconds = $days*24*60*60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
@@ -556,8 +595,7 @@ 
     		$prev_month = 12;
     		$prev_year  = $year-1;
     	}
-    }
-    else
+    } else
     {
     	$prev_month = $month;
 		$prev_year  = $year;
@@ -607,13 +645,17 @@ 
 	$nbFerie = 0;
 
 	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';
+	if ((($timestampEnd - $timestampStart) % 86400) != 0) {
+	    return 'ErrorDates must use same hours and must be GMT dates';
+	}
 
 	$i=0;
 	while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) )
-	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
+	    && ($i < 50000)) {
+	    // Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie=false;
+	}
 		$countryfound=0;
 		$includesaturdayandsunday=1;
 
@@ -631,11 +673,14 @@ 
 				$tmp=explode('-',$daystring);
 				if ($tmp[2])
 				{
-					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie=true;
-				}
-				else
+					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) {
+					    $ferie=true;
+					}
+				} else
 				{
-					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie=true;
+					if ($tmp[0] == $mois && $tmp[1] == $jour) {
+					    $ferie=true;
+					}
 				}
 			}
 		}
@@ -645,20 +690,46 @@ 
 			$countryfound=1;
 
 			// Definition of fixed working days
-			if($jour == 1 && $mois == 1)   $ferie=true; // 1er january
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1er may
-			if($jour == 8 && $mois == 5)   $ferie=true; // 5 may
-			if($jour == 14 && $mois == 7)  $ferie=true; // 14 july
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 august
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 november
-			if($jour == 11 && $mois == 11) $ferie=true; // 11 november
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 december
+			if($jour == 1 && $mois == 1) {
+			    $ferie=true;
+			}
+			// 1er january
+			if($jour == 1 && $mois == 5) {
+			    $ferie=true;
+			}
+			// 1er may
+			if($jour == 8 && $mois == 5) {
+			    $ferie=true;
+			}
+			// 5 may
+			if($jour == 14 && $mois == 7) {
+			    $ferie=true;
+			}
+			// 14 july
+			if($jour == 15 && $mois == 8) {
+			    $ferie=true;
+			}
+			// 15 august
+			if($jour == 1 && $mois == 11) {
+			    $ferie=true;
+			}
+			// 1 november
+			if($jour == 11 && $mois == 11) {
+			    $ferie=true;
+			}
+			// 11 november
+			if($jour == 25 && $mois == 12) {
+			    $ferie=true;
+			}
+			// 25 december
 
 			// Calculation for easter date
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if($jour_paques == $jour && $mois_paques == $mois) {
+			    $ferie=true;
+			}
 			// Pâques
 
 			// Calculation for the monday of easter date
@@ -672,7 +743,9 @@ 
             );
 			$jour_lundi_ascension = date("d", $date_lundi_paques);
 			$mois_lundi_ascension = date("m", $date_lundi_paques);
-			if($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie=true;
+			if($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) {
+			    $ferie=true;
+			}
 			// Lundi de Pâques
 
 			// Calcul du jour de l'ascension (38 days after easter day)
@@ -686,7 +759,9 @@ 
             );
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
-			if($jour_ascension == $jour && $mois_ascension == $mois) $ferie=true;
+			if($jour_ascension == $jour && $mois_ascension == $mois) {
+			    $ferie=true;
+			}
 			// Ascension
 
 			// Calculation of "Pentecote" (11 days after easter day)
@@ -700,7 +775,9 @@ 
             );
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
-			if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+			if($jour_pentecote == $jour && $mois_pentecote == $mois) {
+			    $ferie=true;
+			}
 			// "Pentecote"
 		}
 
@@ -711,22 +788,54 @@ 
 			$countryfound=1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1) $ferie=true; // Capodanno
-			if($jour == 6 && $mois == 1) $ferie=true; // Epifania
-			if($jour == 25 && $mois == 4) $ferie=true; // Anniversario Liberazione
-			if($jour == 1 && $mois == 5) $ferie=true; // Festa del Lavoro
-			if($jour == 2 && $mois == 6) $ferie=true; // Festa della Repubblica
-			if($jour == 15 && $mois == 8) $ferie=true; // Ferragosto
-			if($jour == 1 && $mois == 11) $ferie=true; // Tutti i Santi
-			if($jour == 8 && $mois == 12) $ferie=true; // Immacolata Concezione
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 decembre
-			if($jour == 26 && $mois == 12) $ferie=true; // Santo Stefano
+			if($jour == 1 && $mois == 1) {
+			    $ferie=true;
+			}
+			// Capodanno
+			if($jour == 6 && $mois == 1) {
+			    $ferie=true;
+			}
+			// Epifania
+			if($jour == 25 && $mois == 4) {
+			    $ferie=true;
+			}
+			// Anniversario Liberazione
+			if($jour == 1 && $mois == 5) {
+			    $ferie=true;
+			}
+			// Festa del Lavoro
+			if($jour == 2 && $mois == 6) {
+			    $ferie=true;
+			}
+			// Festa della Repubblica
+			if($jour == 15 && $mois == 8) {
+			    $ferie=true;
+			}
+			// Ferragosto
+			if($jour == 1 && $mois == 11) {
+			    $ferie=true;
+			}
+			// Tutti i Santi
+			if($jour == 8 && $mois == 12) {
+			    $ferie=true;
+			}
+			// Immacolata Concezione
+			if($jour == 25 && $mois == 12) {
+			    $ferie=true;
+			}
+			// 25 decembre
+			if($jour == 26 && $mois == 12) {
+			    $ferie=true;
+			}
+			// Santo Stefano
 
 			// Calcul du jour de paques
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if($jour_paques == $jour && $mois_paques == $mois) {
+			    $ferie=true;
+			}
 			// Paques
 		}
 
@@ -734,12 +843,30 @@ 
 		{
 			$countryfound=1;
 
-			if($jour == 1 && $mois == 1) $ferie=true; // New Year's Day
-			if($jour == 26 && $mois == 1) $ferie=true; // Republic Day
-			if($jour == 1 && $mois == 5) $ferie=true; // May Day
-			if($jour == 15 && $mois == 8) $ferie=true; // Independence Day
-			if($jour == 2 && $mois == 10) $ferie=true; // Gandhi Jayanti
-			if($jour == 25 && $mois == 12) $ferie=true; // Christmas
+			if($jour == 1 && $mois == 1) {
+			    $ferie=true;
+			}
+			// New Year's Day
+			if($jour == 26 && $mois == 1) {
+			    $ferie=true;
+			}
+			// Republic Day
+			if($jour == 1 && $mois == 5) {
+			    $ferie=true;
+			}
+			// May Day
+			if($jour == 15 && $mois == 8) {
+			    $ferie=true;
+			}
+			// Independence Day
+			if($jour == 2 && $mois == 10) {
+			    $ferie=true;
+			}
+			// Gandhi Jayanti
+			if($jour == 25 && $mois == 12) {
+			    $ferie=true;
+			}
+			// Christmas
 		}
 
 		if ($countrycode == 'ES')
@@ -747,21 +874,50 @@ 
 			$countryfound=1;
 
 			// Definition des dates feriees fixes
-			if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
-			if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
-			if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
-			if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
-			if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
-			if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
-			if($jour == 6 && $mois == 12) $ferie=true; // Constitución
-			if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
-			if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
+			if($jour == 1 && $mois == 1) {
+			    $ferie=true;
+			}
+			// Año nuevo
+			if($jour == 6 && $mois == 1) {
+			    $ferie=true;
+			}
+			// Día Reyes
+			if($jour == 1 && $mois == 5) {
+			    $ferie=true;
+			}
+			// 1 Mayo
+			if($jour == 15 && $mois == 8) {
+			    $ferie=true;
+			}
+			// 15 Agosto
+			if($jour == 12 && $mois == 10) {
+			    $ferie=true;
+			}
+			// Día Hispanidad
+			if($jour == 1 && $mois == 11) {
+			    $ferie=true;
+			}
+			// 1 noviembre
+			if($jour == 6 && $mois == 12) {
+			    $ferie=true;
+			}
+			// Constitución
+			if($jour == 8 && $mois == 12) {
+			    $ferie=true;
+			}
+			// Inmaculada
+			if($jour == 25 && $mois == 12) {
+			    $ferie=true;
+			}
+			// 25 diciembre
 
 			// Calcul día de Pascua
 			$date_paques = easter_date($annee);
 			$jour_paques = date("d", $date_paques);
 			$mois_paques = date("m", $date_paques);
-			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			if($jour_paques == $jour && $mois_paques == $mois) {
+			    $ferie=true;
+			}
 			// Paques
 
 			// Viernes Santo
@@ -775,7 +931,9 @@ 
             );
 			$jour_viernes = date("d", $date_viernes);
 			$mois_viernes = date("m", $date_viernes);
-			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+			if($jour_viernes == $jour && $mois_viernes == $mois) {
+			    $ferie=true;
+			}
 			//Viernes Santo
 		}
 
@@ -784,23 +942,58 @@ 
 		    $countryfound=1;
 
 		    // Definition des dates feriees fixes
-		    if($jour == 1 && $mois == 1)   $ferie=true; // Neujahr
-		    if($jour == 6 && $mois == 1)   $ferie=true; // Hl. 3 Koenige
-		    if($jour == 1 && $mois == 5)   $ferie=true; // 1. Mai
-		    if($jour == 15 && $mois == 8)  $ferie=true; // Mariae Himmelfahrt
-		    if($jour == 26 && $mois == 10) $ferie=true; // 26. Oktober
-		    if($jour == 1 && $mois == 11)  $ferie=true; // Allerheiligen
-		    if($jour == 8 && $mois == 12)  $ferie=true; // Mariae Empfaengnis
-		    if($jour == 24 && $mois == 12) $ferie=true; // Heilig abend
-		    if($jour == 25 && $mois == 12) $ferie=true; // Christtag
-		    if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag
-		    if($jour == 31 && $mois == 12) $ferie=true; // Silvester
+		    if($jour == 1 && $mois == 1) {
+		        $ferie=true;
+		    }
+		    // Neujahr
+		    if($jour == 6 && $mois == 1) {
+		        $ferie=true;
+		    }
+		    // Hl. 3 Koenige
+		    if($jour == 1 && $mois == 5) {
+		        $ferie=true;
+		    }
+		    // 1. Mai
+		    if($jour == 15 && $mois == 8) {
+		        $ferie=true;
+		    }
+		    // Mariae Himmelfahrt
+		    if($jour == 26 && $mois == 10) {
+		        $ferie=true;
+		    }
+		    // 26. Oktober
+		    if($jour == 1 && $mois == 11) {
+		        $ferie=true;
+		    }
+		    // Allerheiligen
+		    if($jour == 8 && $mois == 12) {
+		        $ferie=true;
+		    }
+		    // Mariae Empfaengnis
+		    if($jour == 24 && $mois == 12) {
+		        $ferie=true;
+		    }
+		    // Heilig abend
+		    if($jour == 25 && $mois == 12) {
+		        $ferie=true;
+		    }
+		    // Christtag
+		    if($jour == 26 && $mois == 12) {
+		        $ferie=true;
+		    }
+		    // Stefanietag
+		    if($jour == 31 && $mois == 12) {
+		        $ferie=true;
+		    }
+		    // Silvester
 
 		    // Easter calculation
 		    $date_paques = easter_date($annee);
 		    $jour_paques = date("d", $date_paques);
 		    $mois_paques = date("m", $date_paques);
-		    if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+		    if($jour_paques == $jour && $mois_paques == $mois) {
+		        $ferie=true;
+		    }
 		    // Easter sunday
 
 		    // Monday after easter
@@ -814,7 +1007,9 @@ 
 		        );
 		    $jour_eastermonday = date("d", $date_eastermonday);
 		    $mois_eastermonday = date("m", $date_eastermonday);
-		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true;
+		    if($jour_eastermonday == $jour && $mois_eastermonday == $mois) {
+		        $ferie=true;
+		    }
 		    // Easter monday
 
 		    // Christi Himmelfahrt (39 days after easter sunday)
@@ -828,7 +1023,9 @@ 
 		        );
 		    $jour_ch = date("d", $date_ch);
 		    $mois_ch = date("m", $date_ch);
-		    if($jour_ch == $jour && $mois_ch == $mois) $ferie=true;
+		    if($jour_ch == $jour && $mois_ch == $mois) {
+		        $ferie=true;
+		    }
 		    // Christi Himmelfahrt
 
 		    // Pfingsten (50 days after easter sunday)
@@ -842,7 +1039,9 @@ 
 		        );
 		    $jour_pentecote = date("d", $date_pentecote);
 		    $mois_pentecote = date("m", $date_pentecote);
-		    if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true;
+		    if($jour_pentecote == $jour && $mois_pentecote == $mois) {
+		        $ferie=true;
+		    }
 		    // Pfingsten
 
 		    // Fronleichnam (60 days after easter sunday)
@@ -856,7 +1055,9 @@ 
 		        );
 		    $jour_fronleichnam = date("d", $date_fronleichnam);
 		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie=true;
+		    if($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {
+		        $ferie=true;
+		    }
 		    // Fronleichnam
 		}
 
@@ -865,12 +1066,16 @@ 
 		{
 			$jour_julien = unixtojd($timestampStart);
 			$jour_semaine = jddayofweek($jour_julien, 0);
-			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			if($jour_semaine == 0 || $jour_semaine == 6) {
+			    $ferie=true;
+			}
 			//Saturday (6) and Sunday (0)
 		}
 
 		// On incremente compteur
-		if ($ferie) $nbFerie++;
+		if ($ferie) {
+		    $nbFerie++;
+		}
 
 		// Increase number of days (on go up into loop)
 		$timestampStart=dol_time_plus_duree($timestampStart, 1, 'd');
@@ -899,8 +1104,7 @@ 
 		if ($lastday == 1)
 		{
 			$bit = 0;
-		}
-		else
+		} else
 		{
 			$bit = 1;
 		}
@@ -926,13 +1130,19 @@ 
 {
 	global $langs,$mysoc;
 
-	if (empty($country_code)) $country_code=$mysoc->country_code;
+	if (empty($country_code)) {
+	    $country_code=$mysoc->country_code;
+	}
 
 	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
 
 	// Check parameters
-	if (! is_int($timestampStart) && ! is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
-	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+	if (! is_int($timestampStart) && ! is_float($timestampStart)) {
+	    return 'ErrorBadParameter_num_open_day';
+	}
+	if (! is_int($timestampEnd) && ! is_float($timestampEnd)) {
+	    return 'ErrorBadParameter_num_open_day';
+	}
 
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
 	if ($timestampStart < $timestampEnd)
@@ -941,16 +1151,18 @@ 
 		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
 		$nbOpenDay = $numdays - $numholidays;
 		$nbOpenDay.= " " . $langs->trans("Days");
-		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		if ($inhour == 1 && $nbOpenDay <= 3) {
+		    $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		}
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	elseif ($timestampStart == $timestampEnd)
+	} elseif ($timestampStart == $timestampEnd)
 	{
 		$nbOpenDay=$lastday;
-		if ($inhour == 1) $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		if ($inhour == 1) {
+		    $nbOpenDay = $nbOpenDay*24 . $langs->trans("HourShort");
+		}
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	else
+	} else
 	{
 		return $langs->trans("Error");
 	}

dolibarr/htdocs/core/lib/product.lib.php

Indentation +319 added lines, -319 removed lines

@@ -34,88 +34,88 @@ 
  */
 function product_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$langs->load("products");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (! empty($object->status))
-	{
-    	$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("SellingPrices");
-    	$head[$h][2] = 'price';
-    	$h++;
-	}
-
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
-	{
-    	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
-    	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
-    	)
-    	{
-    		$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
-    		$head[$h][1] = $langs->trans("BuyingPrices");
-    		$head[$h][2] = 'suppliers';
-    		$h++;
-    	}
-	}
-
-	// Multilangs
-	if (! empty($conf->global->MAIN_MULTILANGS))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/product/traduction.php?id=".$object->id;
-		$head[$h][1] = $langs->trans("Translation");
-		$head[$h][2] = 'translation';
-		$h++;
-	}
-
-	// Sub products
-	if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
-		$head[$h][1] = $langs->trans('AssociatedProducts');
-
-		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
-		$head[$h][2] = 'subproduct';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans('Statistics');
-	$head[$h][2] = 'stats';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
-	$head[$h][1] = $langs->trans('Referers');
-	$head[$h][2] = 'referers';
-	$h++;
-
-	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
-
-		global $db;
-
-		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-
-		$prodcomb = new ProductCombination($db);
-
-		if ($prodcomb->fetchByFkProductChild($object->id) == -1)
-		{
-			$head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
-			$head[$h][1] = $langs->trans('ProductCombinations');
-			$head[$h][2] = 'combinations';
-			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
+    global $db, $langs, $conf, $user;
+    $langs->load("products");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (! empty($object->status))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("SellingPrices");
+        $head[$h][2] = 'price';
+        $h++;
+    }
+
+    if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+    {
+        if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+        || (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
+        )
+        {
+            $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
+            $head[$h][1] = $langs->trans("BuyingPrices");
+            $head[$h][2] = 'suppliers';
+            $h++;
+        }
+    }
+
+    // Multilangs
+    if (! empty($conf->global->MAIN_MULTILANGS))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/product/traduction.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("Translation");
+        $head[$h][2] = 'translation';
+        $h++;
+    }
+
+    // Sub products
+    if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
+        $head[$h][1] = $langs->trans('AssociatedProducts');
+
+        $nbFatherAndChild = $object->hasFatherOrChild();
+        if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+        $head[$h][2] = 'subproduct';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans('Statistics');
+    $head[$h][2] = 'stats';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;
+    $head[$h][1] = $langs->trans('Referers');
+    $head[$h][2] = 'referers';
+    $h++;
+
+    if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
+
+        global $db;
+
+        require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+
+        $prodcomb = new ProductCombination($db);
+
+        if ($prodcomb->fetchByFkProductChild($object->id) == -1)
+        {
+            $head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
+            $head[$h][1] = $langs->trans('ProductCombinations');
+            $head[$h][2] = 'combinations';
+            $nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
             if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
-		}
+        }
 
-		$h++;
-	}
+        $h++;
+    }
 
     if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
     {
@@ -148,7 +148,7 @@ 
     }
 
     // Attachments
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
     if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
@@ -159,11 +159,11 @@ 
         $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.'/product/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'product', 'remove');
 
@@ -172,13 +172,13 @@ 
     $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++;
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -200,19 +200,19 @@ 
     $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
-	$h++;
+    $h++;
 
-	// Attachments
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    // Attachments
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.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."/product/stock/productlot_document.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_document.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
     $head[$h][2] = 'documents';
-	$h++;
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -242,40 +242,40 @@ 
 */
 function product_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/product/admin/product.php";
-	$head[$h][1] = $langs->trans('Parameters');
-	$head[$h][2] = 'general';
-	$h++;
-
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
-	{
-		$head[$h] = array(
-			0 => DOL_URL_ROOT."/product/admin/price_rules.php",
-			1 => $langs->trans('MultipriceRules'),
-			2 => 'generator'
-		);
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    global $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT."/product/admin/product.php";
+    $head[$h][1] = $langs->trans('Parameters');
+    $head[$h][2] = 'general';
+    $h++;
+
+    if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
+    {
+        $head[$h] = array(
+            0 => DOL_URL_ROOT."/product/admin/price_rules.php",
+            1 => $langs->trans('MultipriceRules'),
+            2 => 'generator'
+        );
+        $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,null,$head,$h,'product_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -319,146 +319,146 @@ 
  */
 function show_stats_for_company($product,$socid)
 {
-	global $conf,$langs,$user,$db;
-
-	$nblines = 0;
-
-	print '<tr class="liste_titre">';
-	print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
-	print '</tr>';
-
-	// Customer proposals
-	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
-		print '<tr><td>';
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_propale['customers'];
-		print '</td><td align="right">';
-		print $product->stats_propale['nb'];
-		print '</td><td align="right">';
-		print $product->stats_propale['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier proposals
-	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
-		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['nb'];
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer orders
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_commande['customers'];
-		print '</td><td align="right">';
-		print $product->stats_commande['nb'];
-		print '</td><td align="right">';
-		print $product->stats_commande['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier orders
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['nb'];
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer invoices
-	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("bills");
-		print '<tr><td>';
-		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_facture['customers'];
-		print '</td><td align="right">';
-		print $product->stats_facture['nb'];
-		print '</td><td align="right">';
-		print $product->stats_facture['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier invoices
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("bills");
-		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['nb'];
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Contracts
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("contracts");
-		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_contrat['customers'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['nb'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-
-	return $nblines++;
+    global $conf,$langs,$user,$db;
+
+    $nblines = 0;
+
+    print '<tr class="liste_titre">';
+    print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
+    print '</tr>';
+
+    // Customer proposals
+    if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_propale($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("propal");
+        print '<tr><td>';
+        print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_propale['customers'];
+        print '</td><td align="right">';
+        print $product->stats_propale['nb'];
+        print '</td><td align="right">';
+        print $product->stats_propale['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier proposals
+    if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_proposal_supplier($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("propal");
+        print '<tr><td>';
+        print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['nb'];
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Customer orders
+    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_commande($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("orders");
+        print '<tr><td>';
+        print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_commande['customers'];
+        print '</td><td align="right">';
+        print $product->stats_commande['nb'];
+        print '</td><td align="right">';
+        print $product->stats_commande['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier orders
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_commande_fournisseur($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("orders");
+        print '<tr><td>';
+        print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['nb'];
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Customer invoices
+    if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_facture($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("bills");
+        print '<tr><td>';
+        print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_facture['customers'];
+        print '</td><td align="right">';
+        print $product->stats_facture['nb'];
+        print '</td><td align="right">';
+        print $product->stats_facture['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier invoices
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_facture_fournisseur($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("bills");
+        print '<tr><td>';
+        print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['nb'];
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Contracts
+    if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_contrat($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("contracts");
+        print '<tr><td>';
+        print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_contrat['customers'];
+        print '</td><td align="right">';
+        print $product->stats_contrat['nb'];
+        print '</td><td align="right">';
+        print $product->stats_contrat['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+
+    return $nblines++;
 }
 
 
@@ -472,50 +472,50 @@ 
  */
 function measuring_units_string($unit,$measuring_style='')
 {
-	global $langs;
-
-	$measuring_units=array();
-	if ($measuring_style == 'weight')
-	{
-		$measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
-		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
-	}
-	else if ($measuring_style == 'size')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
-		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
-		$measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
+    global $langs;
+
+    $measuring_units=array();
+    if ($measuring_style == 'weight')
+    {
+        $measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
+        $measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
+    }
+    else if ($measuring_style == 'size')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
+        $measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
+        $measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
-	}
-	else if ($measuring_style == 'surface')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
-		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
-		$measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
+    }
+    else if ($measuring_style == 'surface')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
+        $measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
+        $measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
-	}
-	else if ($measuring_style == 'volume')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
-		$measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
+    }
+    else if ($measuring_style == 'volume')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
+        $measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
         $measuring_units[88] = $langs->transnoentitiesnoconv("VolumeUnitfoot3");
         $measuring_units[89] = $langs->transnoentitiesnoconv("VolumeUnitinch3");
-		$measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
+        $measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
         $measuring_units[99] = $langs->transnoentitiesnoconv("VolumeUnitgallon");
-	}
+    }
 
-	return $measuring_units[$unit];
+    return $measuring_units[$unit];
 }
 
 /**
@@ -527,14 +527,14 @@ 
  */
 function measuring_units_squared($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m3
-	$measuring_units[-1] = -2; // dm-> dm2
-	$measuring_units[-2] = -4; // cm -> cm2
-	$measuring_units[-3] = -6; // mm -> mm2
-	$measuring_units[98] = 98; // foot -> foot2
-	$measuring_units[99] = 99; // inch -> inch2
-	return $measuring_units[$unit];
+    $measuring_units=array();
+    $measuring_units[0] = 0;   // m -> m3
+    $measuring_units[-1] = -2; // dm-> dm2
+    $measuring_units[-2] = -4; // cm -> cm2
+    $measuring_units[-3] = -6; // mm -> mm2
+    $measuring_units[98] = 98; // foot -> foot2
+    $measuring_units[99] = 99; // inch -> inch2
+    return $measuring_units[$unit];
 }
 
 
@@ -547,12 +547,12 @@ 
  */
 function measuring_units_cubed($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m2
-	$measuring_units[-1] = -3; // dm-> dm3
-	$measuring_units[-2] = -6; // cm -> cm3
-	$measuring_units[-3] = -9; // mm -> mm3
-	$measuring_units[98] = 88; // foot -> foot3
-	$measuring_units[99] = 89; // inch -> inch3
-	return $measuring_units[$unit];
+    $measuring_units=array();
+    $measuring_units[0] = 0;   // m -> m2
+    $measuring_units[-1] = -3; // dm-> dm3
+    $measuring_units[-2] = -6; // cm -> cm3
+    $measuring_units[-3] = -9; // mm -> mm3
+    $measuring_units[98] = 88; // foot -> foot3
+    $measuring_units[99] = 89; // inch -> inch3
+    return $measuring_units[$unit];
 }

Spacing +67 added lines, -67 removed lines

@@ -45,7 +45,7 @@ 
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (! empty($object->status))
+	if (!empty($object->status))
 	{
     	$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("SellingPrices");
@@ -53,10 +53,10 @@ 
     	$h++;
 	}
 
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 	{
-    	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
-    	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
+    	if ((!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+    	|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
     	)
     	{
     		$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
@@ -67,7 +67,7 @@ 
 	}
 
 	// Multilangs
-	if (! empty($conf->global->MAIN_MULTILANGS))
+	if (!empty($conf->global->MAIN_MULTILANGS))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/product/traduction.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("Translation");
@@ -76,13 +76,13 @@ 
 	}
 
 	// Sub products
-	if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+	if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 
 		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		if ($nbFatherAndChild > 0) $head[$h][1] .= ' <span class="badge">'.$nbFatherAndChild.'</span>';
 		$head[$h][2] = 'subproduct';
 		$h++;
 	}
@@ -111,15 +111,15 @@ 
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-            if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            if ($nbVariant > 0) $head[$h][1] .= ' <span class="badge">'.$nbVariant.'</span>';
 		}
 
 		$h++;
 	}
 
-    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+    if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
     {
-        if (! empty($conf->stock->enabled) && $user->rights->stock->lire)
+        if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
         {
             $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
             $head[$h][1] = $langs->trans("Stock");
@@ -132,17 +132,17 @@ 
     // 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,'product');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product');
 
     // Notes
     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.'/product/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] = 'note';
         $h++;
     }
@@ -150,30 +150,30 @@ 
     // Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
-        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
-        $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+        if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+        if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+        $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.'/product/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] = 'documents';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'product', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');
 
     // Log
     $head[$h][0] = DOL_URL_ROOT.'/product/agenda.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) ))
+    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++;
@@ -192,7 +192,7 @@ 
     global $db, $langs, $conf, $user;
 
     // Load translation files required by the page
-    $langs->loadLangs(array("products","productbatch"));
+    $langs->loadLangs(array("products", "productbatch"));
 
     $h = 0;
     $head = array();
@@ -206,11 +206,11 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $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."/product/stock/productlot_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] = 'documents';
 	$h++;
 
@@ -218,9 +218,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,'productlot');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'productlot', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');
 
     // Log
     /*
@@ -252,7 +252,7 @@ 
 	$head[$h][2] = 'general';
 	$h++;
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
+	if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
 	{
 		$head[$h] = array(
 			0 => DOL_URL_ROOT."/product/admin/price_rules.php",
@@ -266,14 +266,14 @@ 
 	// 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,'product_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_admin', 'remove');
 
 	return $head;
 }
@@ -296,14 +296,14 @@ 
     // 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,'product_lot_admin');
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');
 
     $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';
     $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
-    complete_head_from_modules($conf,$langs,null,$head,$h,'product_lot_admin','remove');
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');
 
     return $head;
 }
@@ -317,9 +317,9 @@ 
  * @param 	int			$socid		Thirdparty id
  * @return	integer					NB of lines shown into array
  */
-function show_stats_for_company($product,$socid)
+function show_stats_for_company($product, $socid)
 {
-	global $conf,$langs,$user,$db;
+	global $conf, $langs, $user, $db;
 
 	$nblines = 0;
 
@@ -331,14 +331,14 @@ 
 	print '</tr>';
 
 	// Customer proposals
-	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_propale($socid);
+		$ret = $product->load_stats_propale($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("propal");
 		print '<tr><td>';
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
+		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal').' '.$langs->trans("Proposals").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_propale['customers'];
 		print '</td><td align="right">';
@@ -349,14 +349,14 @@ 
 		print '</tr>';
 	}
 	// Supplier proposals
-	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_proposal_supplier($socid);
+		$ret = $product->load_stats_proposal_supplier($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("propal");
 		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'propal').' '.$langs->trans("SupplierProposals").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_proposal_supplier['suppliers'];
 		print '</td><td align="right">';
@@ -367,14 +367,14 @@ 
 		print '</tr>';
 	}
 	// Customer orders
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_commande($socid);
+		$ret = $product->load_stats_commande($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
+		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order').' '.$langs->trans("CustomersOrders").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_commande['customers'];
 		print '</td><td align="right">';
@@ -385,14 +385,14 @@ 
 		print '</tr>';
 	}
 	// Supplier orders
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_commande_fournisseur($socid);
+		$ret = $product->load_stats_commande_fournisseur($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
+		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'order').' '.$langs->trans("SuppliersOrders").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_commande_fournisseur['suppliers'];
 		print '</td><td align="right">';
@@ -403,14 +403,14 @@ 
 		print '</tr>';
 	}
 	// Customer invoices
-	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_facture($socid);
+		$ret = $product->load_stats_facture($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("bills");
 		print '<tr><td>';
-		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
+		print '<a href="facture.php?id='.$product->id.'">'.img_object('', 'bill').' '.$langs->trans("CustomersInvoices").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_facture['customers'];
 		print '</td><td align="right">';
@@ -421,14 +421,14 @@ 
 		print '</tr>';
 	}
 	// Supplier invoices
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_facture_fournisseur($socid);
+		$ret = $product->load_stats_facture_fournisseur($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("bills");
 		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
+		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'bill').' '.$langs->trans("SuppliersInvoices").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_facture_fournisseur['suppliers'];
 		print '</td><td align="right">';
@@ -440,14 +440,14 @@ 
 	}
 
 	// Contracts
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 	{
 		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
+		$ret = $product->load_stats_contrat($socid);
 		if ($ret < 0) dol_print_error($db);
 		$langs->load("contracts");
 		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
+		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract').' '.$langs->trans("Contracts").'</a>';
 		print '</td><td align="right">';
 		print $product->stats_contrat['customers'];
 		print '</td><td align="right">';
@@ -470,11 +470,11 @@ 
  *	@return	string	   			         Unit string
  * 	@see	formproduct->load_measuring_units
  */
-function measuring_units_string($unit,$measuring_style='')
+function measuring_units_string($unit, $measuring_style = '')
 {
 	global $langs;
 
-	$measuring_units=array();
+	$measuring_units = array();
 	if ($measuring_style == 'weight')
 	{
 		$measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
@@ -527,8 +527,8 @@ 
  */
 function measuring_units_squared($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m3
+	$measuring_units = array();
+	$measuring_units[0] = 0; // m -> m3
 	$measuring_units[-1] = -2; // dm-> dm2
 	$measuring_units[-2] = -4; // cm -> cm2
 	$measuring_units[-3] = -6; // mm -> mm2
@@ -547,8 +547,8 @@ 
  */
 function measuring_units_cubed($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m2
+	$measuring_units = array();
+	$measuring_units[0] = 0; // m -> m2
 	$measuring_units[-1] = -3; // dm-> dm3
 	$measuring_units[-2] = -6; // cm -> cm3
 	$measuring_units[-3] = -9; // mm -> mm3

Braces +63 added lines, -26 removed lines

@@ -53,13 +53,15 @@ 
     	$h++;
 	}
 
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status))) {
+	    // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 	{
     	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
     	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
     	)
     	{
     		$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
+	}
     		$head[$h][1] = $langs->trans("BuyingPrices");
     		$head[$h][2] = 'suppliers';
     		$h++;
@@ -82,7 +84,9 @@ 
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 
 		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		if ($nbFatherAndChild > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		}
 		$head[$h][2] = 'subproduct';
 		$h++;
 	}
@@ -111,17 +115,21 @@ 
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-            if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            if ($nbVariant > 0) {
+                $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            }
 		}
 
 		$h++;
 	}
 
-    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+        // If physical product we can stock (or service with option)
     {
         if (! empty($conf->stock->enabled) && $user->rights->stock->lire)
         {
             $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
+    }
             $head[$h][1] = $langs->trans("Stock");
             $head[$h][2] = 'stock';
             $h++;
@@ -138,11 +146,17 @@ 
     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.'/product/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] = 'note';
         $h++;
     }
@@ -150,18 +164,28 @@ 
     // Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) {
+        $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    }
+    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) {
+        $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    }
     $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
-        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) {
+            $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        }
+        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) {
+            $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        }
         $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.'/product/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] = 'documents';
 	$h++;
 
@@ -210,7 +234,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_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] = 'documents';
 	$h++;
 
@@ -335,7 +361,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
 		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
@@ -353,7 +381,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
 		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
@@ -371,7 +401,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
 		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
@@ -389,7 +421,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
 		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
@@ -407,7 +441,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
@@ -425,7 +461,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
@@ -444,7 +482,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("contracts");
 		print '<tr><td>';
 		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
@@ -483,8 +523,7 @@ 
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
 		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
-	}
-	else if ($measuring_style == 'size')
+	} else if ($measuring_style == 'size')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
 		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
@@ -492,8 +531,7 @@ 
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
-	}
-	else if ($measuring_style == 'surface')
+	} else if ($measuring_style == 'surface')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
 		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
@@ -501,8 +539,7 @@ 
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
-	}
-	else if ($measuring_style == 'volume')
+	} else if ($measuring_style == 'volume')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");

dolibarr/htdocs/core/lib/ecm.lib.php

Indentation +48 added lines, -48 removed lines

@@ -31,26 +31,26 @@ 
  */
 function ecm_prepare_dasboard_head($object)
 {
-	global $langs, $conf, $user, $form;
-	global $helptext1, $helptext2;
+    global $langs, $conf, $user, $form;
+    global $helptext1, $helptext2;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
     $helptext =$langs->trans("ECMAreaDesc").'<br>';
     $helptext.=$langs->trans("ECMAreaDesc2");
 
-	$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php';
-	$head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
-	$head[$h][2] = 'index';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/ecm/index.php';
+    $head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
+    $head[$h][2] = 'index';
+    $h++;
 
-	if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
-		$head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
-		$head[$h][2] = 'index_auto';
-		$h++;
-	}
+    if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
+        $head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
+        $head[$h][2] = 'index_auto';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -60,7 +60,7 @@ 
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'ecm','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -74,26 +74,26 @@ 
  */
 function ecm_prepare_head($object, $module='ecm', $section='')
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
-
-	if ($module == 'ecm')
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$object->id;
-		$head[$h][1] = $langs->trans("Card");
-		$head[$h][2] = 'card';
-		$h++;
-	}
-	else
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
-		$head[$h][1] = $langs->trans("Card");
-		$head[$h][2] = 'card';
-		$h++;
-	}
-
-	return $head;
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    if ($module == 'ecm')
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$object->id;
+        $head[$h][1] = $langs->trans("Card");
+        $head[$h][2] = 'card';
+        $h++;
+    }
+    else
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
+        $head[$h][1] = $langs->trans("Card");
+        $head[$h][2] = 'card';
+        $h++;
+    }
+
+    return $head;
 }
 
 /**
@@ -124,20 +124,20 @@ 
  */
 function ecm_prepare_head_fm($object)
 {
-	global $langs, $conf;
-	$h = 0;
-	$head = array();
+    global $langs, $conf;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php?action=file_manager';
-	$head[$h][1] = $langs->trans('ECMFileManager');
-	$head[$h][2] = 'file_manager';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/ecm/index.php?action=file_manager';
+    $head[$h][1] = $langs->trans('ECMFileManager');
+    $head[$h][2] = 'file_manager';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/ecm/search.php';
-	$head[$h][1] = $langs->trans('Search');
-	$head[$h][2] = 'search_form';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/ecm/search.php';
+    $head[$h][1] = $langs->trans('Search');
+    $head[$h][2] = 'search_form';
+    $h++;
 
-	return $head;
+    return $head;
 }
 

Spacing +6 added lines, -6 removed lines

@@ -36,15 +36,15 @@ 
 
 	$h = 0;
 	$head = array();
-    $helptext =$langs->trans("ECMAreaDesc").'<br>';
-    $helptext.=$langs->trans("ECMAreaDesc2");
+    $helptext = $langs->trans("ECMAreaDesc").'<br>';
+    $helptext .= $langs->trans("ECMAreaDesc2");
 
 	$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php';
 	$head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
 	$head[$h][2] = 'index';
 	$h++;
 
-	if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
+	if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
 		$head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
@@ -56,9 +56,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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'ecm');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ecm');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'ecm','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ecm', 'remove');
 
 	return $head;
 }
@@ -72,7 +72,7 @@ 
  * @param	string	$section	Section
  * @return  array				Array of tabs to show
  */
-function ecm_prepare_head($object, $module='ecm', $section='')
+function ecm_prepare_head($object, $module = 'ecm', $section = '')
 {
 	global $langs, $conf, $user;
 	$h = 0;

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 		$head[$h][1] = $langs->trans("Card");
 		$head[$h][2] = 'card';
 		$h++;
-	}
-	else
+	} else
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
 		$head[$h][1] = $langs->trans("Card");