alxarafe / alixar

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/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");

dolibarr/htdocs/core/lib/functionsnumtoword.lib.php

Indentation +159 added lines, -159 removed lines

@@ -35,31 +35,31 @@ 
  */
 function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
 {
-	global $conf;
+    global $conf;
 
     $num = str_replace(array(',', ' '), '', trim($num));
     if(! $num) {
         return false;
     }
-	if($centimes && strlen($num) == 1) {
-		$num = $num*10;
-	}
-	$TNum = explode('.',$num);
+    if($centimes && strlen($num) == 1) {
+        $num = $num*10;
+    }
+    $TNum = explode('.',$num);
     $num = (int) $TNum[0];
     $words = array();
     $list1 = array(
-    	'',
-    	$langs->transnoentitiesnoconv('one'),
-    	$langs->transnoentitiesnoconv('two'),
-    	$langs->transnoentitiesnoconv('three'),
-    	$langs->transnoentitiesnoconv('four'),
-    	$langs->transnoentitiesnoconv('five'),
-    	$langs->transnoentitiesnoconv('six'),
-    	$langs->transnoentitiesnoconv('seven'),
-    	$langs->transnoentitiesnoconv('eight'),
-    	$langs->transnoentitiesnoconv('nine'),
-    	$langs->transnoentitiesnoconv('ten'),
-    	$langs->transnoentitiesnoconv('eleven'),
+        '',
+        $langs->transnoentitiesnoconv('one'),
+        $langs->transnoentitiesnoconv('two'),
+        $langs->transnoentitiesnoconv('three'),
+        $langs->transnoentitiesnoconv('four'),
+        $langs->transnoentitiesnoconv('five'),
+        $langs->transnoentitiesnoconv('six'),
+        $langs->transnoentitiesnoconv('seven'),
+        $langs->transnoentitiesnoconv('eight'),
+        $langs->transnoentitiesnoconv('nine'),
+        $langs->transnoentitiesnoconv('ten'),
+        $langs->transnoentitiesnoconv('eleven'),
         $langs->transnoentitiesnoconv('twelve'),
         $langs->transnoentitiesnoconv('thirteen'),
         $langs->transnoentitiesnoconv('fourteen'),
@@ -70,25 +70,25 @@ 
         $langs->transnoentitiesnoconv('nineteen')
     );
     $list2 = array(
-    	'',
-	    $langs->transnoentitiesnoconv('ten'),
-	    $langs->transnoentitiesnoconv('twenty'),
-	    $langs->transnoentitiesnoconv('thirty'),
-	    $langs->transnoentitiesnoconv('forty'),
-	    $langs->transnoentitiesnoconv('fifty'),
-	    $langs->transnoentitiesnoconv('sixty'),
-	    $langs->transnoentitiesnoconv('seventy'),
-	    $langs->transnoentitiesnoconv('eighty'),
-	    $langs->transnoentitiesnoconv('ninety'),
-	    $langs->transnoentitiesnoconv('hundred')
-	);
+        '',
+        $langs->transnoentitiesnoconv('ten'),
+        $langs->transnoentitiesnoconv('twenty'),
+        $langs->transnoentitiesnoconv('thirty'),
+        $langs->transnoentitiesnoconv('forty'),
+        $langs->transnoentitiesnoconv('fifty'),
+        $langs->transnoentitiesnoconv('sixty'),
+        $langs->transnoentitiesnoconv('seventy'),
+        $langs->transnoentitiesnoconv('eighty'),
+        $langs->transnoentitiesnoconv('ninety'),
+        $langs->transnoentitiesnoconv('hundred')
+    );
     $list3 = array(
-    	'',
-    	$langs->transnoentitiesnoconv('thousand'),
-    	$langs->transnoentitiesnoconv('million'),
-    	$langs->transnoentitiesnoconv('billion'),
-    	$langs->transnoentitiesnoconv('trillion'),
-    	$langs->transnoentitiesnoconv('quadrillion')
+        '',
+        $langs->transnoentitiesnoconv('thousand'),
+        $langs->transnoentitiesnoconv('million'),
+        $langs->transnoentitiesnoconv('billion'),
+        $langs->transnoentitiesnoconv('trillion'),
+        $langs->transnoentitiesnoconv('quadrillion')
     );
 
     $num_length = strlen($num);
@@ -117,20 +117,20 @@ 
     if ($commas > 1) {
         $commas = $commas - 1;
     }
-	$concatWords = implode(' ', $words);
-	// Delete multi whitespaces
-	$concatWords = trim(preg_replace('/[ ]+/', ' ', $concatWords));
+    $concatWords = implode(' ', $words);
+    // Delete multi whitespaces
+    $concatWords = trim(preg_replace('/[ ]+/', ' ', $concatWords));
 
-	if(!empty($currency)) {
-		$concatWords .= ' '.$currency;
-	}
+    if(!empty($currency)) {
+        $concatWords .= ' '.$currency;
+    }
 
-	// If we need to write cents call again this function for cents
-	if(!empty($TNum[1])) {
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
-		$concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
-	}
+    // If we need to write cents call again this function for cents
+    if(!empty($TNum[1])) {
+        if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
+        $concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);
+        if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
+    }
     return $concatWords;
 }
 
@@ -146,85 +146,85 @@ 
  */
 function dolNumberToWord($numero, $langs, $numorcurrency='number')
 {
-	// If the number is negative convert to positive and return -1 if is too long
-	if ($numero < 0) $numero *= -1;
-	if ($numero >= 1000000000001)
-		return -1;
-	// Get 2 decimals to cents, another functions round or truncate
-	$strnumber = number_format ($numero,10);
-	$len=strlen($strnumber);
-	for ($i=0; $i<$len; $i++)
-	{
-		if ($strnumber[$i]=='.') {
-			$parte_decimal = $strnumber[$i+1].$strnumber[$i+2];
-			break;
-		}
-	}
+    // If the number is negative convert to positive and return -1 if is too long
+    if ($numero < 0) $numero *= -1;
+    if ($numero >= 1000000000001)
+        return -1;
+    // Get 2 decimals to cents, another functions round or truncate
+    $strnumber = number_format ($numero,10);
+    $len=strlen($strnumber);
+    for ($i=0; $i<$len; $i++)
+    {
+        if ($strnumber[$i]=='.') {
+            $parte_decimal = $strnumber[$i+1].$strnumber[$i+2];
+            break;
+        }
+    }
 
-	/*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
+    /*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
 	in case exist why ask $lang like a parameter?*/
-	if (((is_object($langs) && $langs->default == 'es_MX') || (! is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
-	{
-		if ($numero>=1 && $numero<2) {
-			return ("UN PESO ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=0 && $numero<1){
-			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=1000000 && $numero<1000001){
-			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=1000000000000 && $numero<1000000000001){
-			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		else {
-			$entexto ="";
-			$number = $numero;
-			if ($number >= 1000000000){
-				$CdMMillon = (int) ($numero / 100000000000);
-				$numero = $numero - $CdMMillon * 100000000000;
-				$DdMMillon = (int) ($numero / 10000000000);
-				$numero = $numero - $DdMMillon * 10000000000;
-				$UdMMillon = (int) ($numero / 1000000000);
-				$numero = $numero - $UdMMillon * 1000000000;
-				$entexto .= hundreds2text ($CdMMillon, $DdMMillon, $UdMMillon);
-				$entexto .= " MIL ";
-			}
-			if ($number >= 1000000){
-				$CdMILLON = (int) ($numero / 100000000);
-				$numero = $numero - $CdMILLON * 100000000;
-				$DdMILLON = (int) ($numero / 10000000);
-				$numero = $numero - $DdMILLON * 10000000;
-				$udMILLON = (int) ($numero / 1000000);
-				$numero = $numero - $udMILLON * 1000000;
-				$entexto .= hundreds2text ($CdMILLON, $DdMILLON, $udMILLON);
-				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1)
-					$entexto .= " MILL&OacuteN ";
-				else
-					$entexto .= " MILLONES ";
-			}
-			if ($number >= 1000) {
-				$cdm = (int) ($numero / 100000);
-				$numero = $numero - $cdm * 100000;
-				$ddm = (int) ($numero / 10000);
-				$numero = $numero - $ddm * 10000;
-				$udm = (int) ($numero / 1000);
-				$numero = $numero - $udm * 1000;
-				$entexto .= hundreds2text ($cdm, $ddm, $udm);
-				if ($cdm || $ddm || $udm)
-					$entexto .= " MIL ";
-			}
-			$c = (int) ($numero / 100);
-			$numero = $numero - $c * 100;
-			$d = (int) ($numero / 10);
-			$u = (int) $numero - $d * 10;
-			$entexto .= hundreds2text ($c, $d, $u);
-			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000)
-				$entexto .= " DE";
-			$entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
-		}
-		return $entexto;
-	}
+    if (((is_object($langs) && $langs->default == 'es_MX') || (! is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
+    {
+        if ($numero>=1 && $numero<2) {
+            return ("UN PESO ".$parte_decimal." / 100 M.N.");
+        }
+        elseif ($numero>=0 && $numero<1){
+            return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
+        }
+        elseif ($numero>=1000000 && $numero<1000001){
+            return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
+        }
+        elseif ($numero>=1000000000000 && $numero<1000000000001){
+            return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
+        }
+        else {
+            $entexto ="";
+            $number = $numero;
+            if ($number >= 1000000000){
+                $CdMMillon = (int) ($numero / 100000000000);
+                $numero = $numero - $CdMMillon * 100000000000;
+                $DdMMillon = (int) ($numero / 10000000000);
+                $numero = $numero - $DdMMillon * 10000000000;
+                $UdMMillon = (int) ($numero / 1000000000);
+                $numero = $numero - $UdMMillon * 1000000000;
+                $entexto .= hundreds2text ($CdMMillon, $DdMMillon, $UdMMillon);
+                $entexto .= " MIL ";
+            }
+            if ($number >= 1000000){
+                $CdMILLON = (int) ($numero / 100000000);
+                $numero = $numero - $CdMILLON * 100000000;
+                $DdMILLON = (int) ($numero / 10000000);
+                $numero = $numero - $DdMILLON * 10000000;
+                $udMILLON = (int) ($numero / 1000000);
+                $numero = $numero - $udMILLON * 1000000;
+                $entexto .= hundreds2text ($CdMILLON, $DdMILLON, $udMILLON);
+                if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1)
+                    $entexto .= " MILL&OacuteN ";
+                else
+                    $entexto .= " MILLONES ";
+            }
+            if ($number >= 1000) {
+                $cdm = (int) ($numero / 100000);
+                $numero = $numero - $cdm * 100000;
+                $ddm = (int) ($numero / 10000);
+                $numero = $numero - $ddm * 10000;
+                $udm = (int) ($numero / 1000);
+                $numero = $numero - $udm * 1000;
+                $entexto .= hundreds2text ($cdm, $ddm, $udm);
+                if ($cdm || $ddm || $udm)
+                    $entexto .= " MIL ";
+            }
+            $c = (int) ($numero / 100);
+            $numero = $numero - $c * 100;
+            $d = (int) ($numero / 10);
+            $u = (int) $numero - $d * 10;
+            $entexto .= hundreds2text ($c, $d, $u);
+            if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000)
+                $entexto .= " DE";
+            $entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
+        }
+        return $entexto;
+    }
 }
 
 /**
@@ -237,40 +237,40 @@ 
  */
 function hundreds2text($hundreds, $tens, $units)
 {
-	if ($hundreds==1 && $tens==0 && $units==0){
-		return "CIEN";
-	}
-	$centenas = array("CIENTO","DOSCIENTOS","TRESCIENTOS","CUATROCIENTOS","QUINIENTOS","SEISCIENTOS","SETECIENTOS","OCHOCIENTOS","NOVECIENTOS");
-	$decenas = array("","","TREINTA ","CUARENTA ","CINCUENTA ","SESENTA ","SETENTA ","OCHENTA ","NOVENTA ");
-	$veintis = array("VEINTE","VEINTIUN","VEINTID&OacuteS","VEINTITR&EacuteS","VEINTICUATRO","VEINTICINCO","VEINTIS&EacuteIS","VEINTISIETE","VEINTIOCHO","VEINTINUEVE");
-	$diecis = array("DIEZ","ONCE","DOCE","TRECE","CATORCE","QUINCE","DIECIS&EacuteIS","DIECISIETE","DIECIOCHO","DIECINUEVE");
+    if ($hundreds==1 && $tens==0 && $units==0){
+        return "CIEN";
+    }
+    $centenas = array("CIENTO","DOSCIENTOS","TRESCIENTOS","CUATROCIENTOS","QUINIENTOS","SEISCIENTOS","SETECIENTOS","OCHOCIENTOS","NOVECIENTOS");
+    $decenas = array("","","TREINTA ","CUARENTA ","CINCUENTA ","SESENTA ","SETENTA ","OCHENTA ","NOVENTA ");
+    $veintis = array("VEINTE","VEINTIUN","VEINTID&OacuteS","VEINTITR&EacuteS","VEINTICUATRO","VEINTICINCO","VEINTIS&EacuteIS","VEINTISIETE","VEINTIOCHO","VEINTINUEVE");
+    $diecis = array("DIEZ","ONCE","DOCE","TRECE","CATORCE","QUINCE","DIECIS&EacuteIS","DIECISIETE","DIECIOCHO","DIECINUEVE");
     $unidades = array("UN","DOS","TRES","CUATRO","CINCO","SEIS","SIETE","OCHO","NUEVE");
-	$entexto = "";
-	if ($hundreds!=0){
-		$entexto .= $centenas[$hundreds-1];
-	}
-	if ($tens>2){
-		if ($hundreds!=0) $entexto .= " ";
-		$entexto .= $decenas[$tens-1];
-		if ($units!=0){
-			$entexto .= " Y ";
-			$entexto .= $unidades[$units-1];
-		}
-		return $entexto;
-	}
-	elseif ($tens==2){
-		if ($hundreds!=0) $entexto .= " ";
-		$entexto .= " ".$veintis[$units];
-		return $entexto;
-	}
-	elseif ($tens==1){
-		if ($hundreds!=0) $entexto .= " ";
-		$entexto .= $diecis[$units];
-		return $entexto;
-	}
-	if ($units!=0) {
-		if ($hundreds!=0 || $tens!=0) $entexto .= " ";
-		$entexto .= $unidades[$units-1];
-	}
-	return $entexto;
+    $entexto = "";
+    if ($hundreds!=0){
+        $entexto .= $centenas[$hundreds-1];
+    }
+    if ($tens>2){
+        if ($hundreds!=0) $entexto .= " ";
+        $entexto .= $decenas[$tens-1];
+        if ($units!=0){
+            $entexto .= " Y ";
+            $entexto .= $unidades[$units-1];
+        }
+        return $entexto;
+    }
+    elseif ($tens==2){
+        if ($hundreds!=0) $entexto .= " ";
+        $entexto .= " ".$veintis[$units];
+        return $entexto;
+    }
+    elseif ($tens==1){
+        if ($hundreds!=0) $entexto .= " ";
+        $entexto .= $diecis[$units];
+        return $entexto;
+    }
+    if ($units!=0) {
+        if ($hundreds!=0 || $tens!=0) $entexto .= " ";
+        $entexto .= $unidades[$units-1];
+    }
+    return $entexto;
 }

Spacing +56 added lines, -56 removed lines

@@ -33,18 +33,18 @@ 
  * @param	boolean	$centimes		0=no centimes | 1=centimes to translate
  * @return 	string  				Text of the number
  */
-function dol_convertToWord($num, $langs, $currency=false, $centimes=false)
+function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
 {
 	global $conf;
 
     $num = str_replace(array(',', ' '), '', trim($num));
-    if(! $num) {
+    if (!$num) {
         return false;
     }
-	if($centimes && strlen($num) == 1) {
-		$num = $num*10;
+	if ($centimes && strlen($num) == 1) {
+		$num = $num * 10;
 	}
-	$TNum = explode('.',$num);
+	$TNum = explode('.', $num);
     $num = (int) $TNum[0];
     $words = array();
     $list1 = array(
@@ -94,24 +94,24 @@ 
     $num_length = strlen($num);
     $levels = (int) (($num_length + 2) / 3);
     $max_length = $levels * 3;
-    $num = substr('00' . $num, -$max_length);
+    $num = substr('00'.$num, -$max_length);
     $num_levels = str_split($num, 3);
     $nboflevels = count($num_levels);
     for ($i = 0; $i < $nboflevels; $i++) {
         $levels--;
         $hundreds = (int) ($num_levels[$i] / 100);
-        $hundreds = ($hundreds ? ' ' . $list1[$hundreds] . ' '.$langs->transnoentities('hundred') . ( $hundreds == 1 ? '' : 's' ) . ' ': '');
+        $hundreds = ($hundreds ? ' '.$list1[$hundreds].' '.$langs->transnoentities('hundred').($hundreds == 1 ? '' : 's').' ' : '');
         $tens = (int) ($num_levels[$i] % 100);
         $singles = '';
-        if ( $tens < 20 ) {
-            $tens = ($tens ? ' ' . $list1[$tens] . ' ' : '' );
+        if ($tens < 20) {
+            $tens = ($tens ? ' '.$list1[$tens].' ' : '');
         } else {
             $tens = (int) ($tens / 10);
-            $tens = ' ' . $list2[$tens] . ' ';
+            $tens = ' '.$list2[$tens].' ';
             $singles = (int) ($num_levels[$i] % 10);
-            $singles = ' ' . $list1[$singles] . ' ';
+            $singles = ' '.$list1[$singles].' ';
         }
-        $words[] = $hundreds . $tens . $singles . ( ( $levels && ( int ) ( $num_levels[$i] ) ) ? ' ' . $list3[$levels] . ' ' : '' );
+        $words[] = $hundreds.$tens.$singles.(($levels && (int) ($num_levels[$i])) ? ' '.$list3[$levels].' ' : '');
     } //end for loop
     $commas = count($words);
     if ($commas > 1) {
@@ -121,15 +121,15 @@ 
 	// Delete multi whitespaces
 	$concatWords = trim(preg_replace('/[ ]+/', ' ', $concatWords));
 
-	if(!empty($currency)) {
+	if (!empty($currency)) {
 		$concatWords .= ' '.$currency;
 	}
 
 	// If we need to write cents call again this function for cents
-	if(!empty($TNum[1])) {
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
+	if (!empty($TNum[1])) {
+		if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
 		$concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
+		if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
 	}
     return $concatWords;
 }
@@ -144,61 +144,61 @@ 
  * @param	string	$numorcurrency	'number' or 'amount'
  * @return 	string  				Text of the number or -1 in case TOO LONG (more than 1000000000000.99)
  */
-function dolNumberToWord($numero, $langs, $numorcurrency='number')
+function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 {
 	// If the number is negative convert to positive and return -1 if is too long
 	if ($numero < 0) $numero *= -1;
 	if ($numero >= 1000000000001)
 		return -1;
 	// Get 2 decimals to cents, another functions round or truncate
-	$strnumber = number_format ($numero,10);
-	$len=strlen($strnumber);
-	for ($i=0; $i<$len; $i++)
+	$strnumber = number_format($numero, 10);
+	$len = strlen($strnumber);
+	for ($i = 0; $i < $len; $i++)
 	{
-		if ($strnumber[$i]=='.') {
-			$parte_decimal = $strnumber[$i+1].$strnumber[$i+2];
+		if ($strnumber[$i] == '.') {
+			$parte_decimal = $strnumber[$i + 1].$strnumber[$i + 2];
 			break;
 		}
 	}
 
 	/*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
 	in case exist why ask $lang like a parameter?*/
-	if (((is_object($langs) && $langs->default == 'es_MX') || (! is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
+	if (((is_object($langs) && $langs->default == 'es_MX') || (!is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
 	{
-		if ($numero>=1 && $numero<2) {
+		if ($numero >= 1 && $numero < 2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
 		}
-		elseif ($numero>=0 && $numero<1){
+		elseif ($numero >= 0 && $numero < 1) {
 			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
 		}
-		elseif ($numero>=1000000 && $numero<1000001){
+		elseif ($numero >= 1000000 && $numero < 1000001) {
 			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
 		}
-		elseif ($numero>=1000000000000 && $numero<1000000000001){
+		elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
 			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
 		}
 		else {
-			$entexto ="";
+			$entexto = "";
 			$number = $numero;
-			if ($number >= 1000000000){
+			if ($number >= 1000000000) {
 				$CdMMillon = (int) ($numero / 100000000000);
 				$numero = $numero - $CdMMillon * 100000000000;
 				$DdMMillon = (int) ($numero / 10000000000);
 				$numero = $numero - $DdMMillon * 10000000000;
 				$UdMMillon = (int) ($numero / 1000000000);
 				$numero = $numero - $UdMMillon * 1000000000;
-				$entexto .= hundreds2text ($CdMMillon, $DdMMillon, $UdMMillon);
+				$entexto .= hundreds2text($CdMMillon, $DdMMillon, $UdMMillon);
 				$entexto .= " MIL ";
 			}
-			if ($number >= 1000000){
+			if ($number >= 1000000) {
 				$CdMILLON = (int) ($numero / 100000000);
 				$numero = $numero - $CdMILLON * 100000000;
 				$DdMILLON = (int) ($numero / 10000000);
 				$numero = $numero - $DdMILLON * 10000000;
 				$udMILLON = (int) ($numero / 1000000);
 				$numero = $numero - $udMILLON * 1000000;
-				$entexto .= hundreds2text ($CdMILLON, $DdMILLON, $udMILLON);
-				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1)
+				$entexto .= hundreds2text($CdMILLON, $DdMILLON, $udMILLON);
+				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1)
 					$entexto .= " MILL&OacuteN ";
 				else
 					$entexto .= " MILLONES ";
@@ -210,7 +210,7 @@ 
 				$numero = $numero - $ddm * 10000;
 				$udm = (int) ($numero / 1000);
 				$numero = $numero - $udm * 1000;
-				$entexto .= hundreds2text ($cdm, $ddm, $udm);
+				$entexto .= hundreds2text($cdm, $ddm, $udm);
 				if ($cdm || $ddm || $udm)
 					$entexto .= " MIL ";
 			}
@@ -218,8 +218,8 @@ 
 			$numero = $numero - $c * 100;
 			$d = (int) ($numero / 10);
 			$u = (int) $numero - $d * 10;
-			$entexto .= hundreds2text ($c, $d, $u);
-			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000)
+			$entexto .= hundreds2text($c, $d, $u);
+			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number > 1000000)
 				$entexto .= " DE";
 			$entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
 		}
@@ -237,40 +237,40 @@ 
  */
 function hundreds2text($hundreds, $tens, $units)
 {
-	if ($hundreds==1 && $tens==0 && $units==0){
+	if ($hundreds == 1 && $tens == 0 && $units == 0) {
 		return "CIEN";
 	}
-	$centenas = array("CIENTO","DOSCIENTOS","TRESCIENTOS","CUATROCIENTOS","QUINIENTOS","SEISCIENTOS","SETECIENTOS","OCHOCIENTOS","NOVECIENTOS");
-	$decenas = array("","","TREINTA ","CUARENTA ","CINCUENTA ","SESENTA ","SETENTA ","OCHENTA ","NOVENTA ");
-	$veintis = array("VEINTE","VEINTIUN","VEINTID&OacuteS","VEINTITR&EacuteS","VEINTICUATRO","VEINTICINCO","VEINTIS&EacuteIS","VEINTISIETE","VEINTIOCHO","VEINTINUEVE");
-	$diecis = array("DIEZ","ONCE","DOCE","TRECE","CATORCE","QUINCE","DIECIS&EacuteIS","DIECISIETE","DIECIOCHO","DIECINUEVE");
-    $unidades = array("UN","DOS","TRES","CUATRO","CINCO","SEIS","SIETE","OCHO","NUEVE");
+	$centenas = array("CIENTO", "DOSCIENTOS", "TRESCIENTOS", "CUATROCIENTOS", "QUINIENTOS", "SEISCIENTOS", "SETECIENTOS", "OCHOCIENTOS", "NOVECIENTOS");
+	$decenas = array("", "", "TREINTA ", "CUARENTA ", "CINCUENTA ", "SESENTA ", "SETENTA ", "OCHENTA ", "NOVENTA ");
+	$veintis = array("VEINTE", "VEINTIUN", "VEINTID&OacuteS", "VEINTITR&EacuteS", "VEINTICUATRO", "VEINTICINCO", "VEINTIS&EacuteIS", "VEINTISIETE", "VEINTIOCHO", "VEINTINUEVE");
+	$diecis = array("DIEZ", "ONCE", "DOCE", "TRECE", "CATORCE", "QUINCE", "DIECIS&EacuteIS", "DIECISIETE", "DIECIOCHO", "DIECINUEVE");
+    $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE");
 	$entexto = "";
-	if ($hundreds!=0){
-		$entexto .= $centenas[$hundreds-1];
+	if ($hundreds != 0) {
+		$entexto .= $centenas[$hundreds - 1];
 	}
-	if ($tens>2){
-		if ($hundreds!=0) $entexto .= " ";
-		$entexto .= $decenas[$tens-1];
-		if ($units!=0){
+	if ($tens > 2) {
+		if ($hundreds != 0) $entexto .= " ";
+		$entexto .= $decenas[$tens - 1];
+		if ($units != 0) {
 			$entexto .= " Y ";
-			$entexto .= $unidades[$units-1];
+			$entexto .= $unidades[$units - 1];
 		}
 		return $entexto;
 	}
-	elseif ($tens==2){
-		if ($hundreds!=0) $entexto .= " ";
+	elseif ($tens == 2) {
+		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
 	}
-	elseif ($tens==1){
-		if ($hundreds!=0) $entexto .= " ";
+	elseif ($tens == 1) {
+		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= $diecis[$units];
 		return $entexto;
 	}
-	if ($units!=0) {
-		if ($hundreds!=0 || $tens!=0) $entexto .= " ";
-		$entexto .= $unidades[$units-1];
+	if ($units != 0) {
+		if ($hundreds != 0 || $tens != 0) $entexto .= " ";
+		$entexto .= $unidades[$units - 1];
 	}
 	return $entexto;
 }

Braces +41 added lines, -29 removed lines

@@ -127,9 +127,13 @@ 
 
 	// If we need to write cents call again this function for cents
 	if(!empty($TNum[1])) {
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
+		if(!empty($currency)) {
+		    $concatWords .= ' '.$langs->transnoentities('and');
+		}
 		$concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);
-		if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
+		if(!empty($currency)) {
+		    $concatWords .= ' '.$langs->transnoentities('centimes');
+		}
 	}
     return $concatWords;
 }
@@ -147,9 +151,12 @@ 
 function dolNumberToWord($numero, $langs, $numorcurrency='number')
 {
 	// If the number is negative convert to positive and return -1 if is too long
-	if ($numero < 0) $numero *= -1;
-	if ($numero >= 1000000000001)
-		return -1;
+	if ($numero < 0) {
+	    $numero *= -1;
+	}
+	if ($numero >= 1000000000001) {
+			return -1;
+	}
 	// Get 2 decimals to cents, another functions round or truncate
 	$strnumber = number_format ($numero,10);
 	$len=strlen($strnumber);
@@ -167,17 +174,13 @@ 
 	{
 		if ($numero>=1 && $numero<2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=0 && $numero<1){
+		} elseif ($numero>=0 && $numero<1){
 			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=1000000 && $numero<1000001){
+		} elseif ($numero>=1000000 && $numero<1000001){
 			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero>=1000000000000 && $numero<1000000000001){
+		} elseif ($numero>=1000000000000 && $numero<1000000000001){
 			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		else {
+		} else {
 			$entexto ="";
 			$number = $numero;
 			if ($number >= 1000000000){
@@ -198,10 +201,11 @@ 
 				$udMILLON = (int) ($numero / 1000000);
 				$numero = $numero - $udMILLON * 1000000;
 				$entexto .= hundreds2text ($CdMILLON, $DdMILLON, $udMILLON);
-				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1)
-					$entexto .= " MILL&OacuteN ";
-				else
-					$entexto .= " MILLONES ";
+				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1) {
+									$entexto .= " MILL&OacuteN ";
+				} else {
+									$entexto .= " MILLONES ";
+				}
 			}
 			if ($number >= 1000) {
 				$cdm = (int) ($numero / 100000);
@@ -211,16 +215,18 @@ 
 				$udm = (int) ($numero / 1000);
 				$numero = $numero - $udm * 1000;
 				$entexto .= hundreds2text ($cdm, $ddm, $udm);
-				if ($cdm || $ddm || $udm)
-					$entexto .= " MIL ";
+				if ($cdm || $ddm || $udm) {
+									$entexto .= " MIL ";
+				}
 			}
 			$c = (int) ($numero / 100);
 			$numero = $numero - $c * 100;
 			$d = (int) ($numero / 10);
 			$u = (int) $numero - $d * 10;
 			$entexto .= hundreds2text ($c, $d, $u);
-			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000)
-				$entexto .= " DE";
+			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000) {
+							$entexto .= " DE";
+			}
 			$entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
 		}
 		return $entexto;
@@ -250,26 +256,32 @@ 
 		$entexto .= $centenas[$hundreds-1];
 	}
 	if ($tens>2){
-		if ($hundreds!=0) $entexto .= " ";
+		if ($hundreds!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= $decenas[$tens-1];
 		if ($units!=0){
 			$entexto .= " Y ";
 			$entexto .= $unidades[$units-1];
 		}
 		return $entexto;
-	}
-	elseif ($tens==2){
-		if ($hundreds!=0) $entexto .= " ";
+	} elseif ($tens==2){
+		if ($hundreds!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
-	}
-	elseif ($tens==1){
-		if ($hundreds!=0) $entexto .= " ";
+	} elseif ($tens==1){
+		if ($hundreds!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= $diecis[$units];
 		return $entexto;
 	}
 	if ($units!=0) {
-		if ($hundreds!=0 || $tens!=0) $entexto .= " ";
+		if ($hundreds!=0 || $tens!=0) {
+		    $entexto .= " ";
+		}
 		$entexto .= $unidades[$units-1];
 	}
 	return $entexto;

dolibarr/htdocs/core/lib/files.lib.php

Indentation +2345 added lines, -2345 removed lines

@@ -34,7 +34,7 @@ 
  */
 function dol_basename($pathfile)
 {
-	return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
+    return preg_replace('/^.*\/([^\/]+)$/','$1',rtrim($pathfile,'/'));
 }
 
 /**
@@ -58,158 +58,158 @@ 
  */
 function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0, $nohook=0, $relativename="", $donotfollowsymlinks=0)
 {
-	global $db, $hookmanager;
-	global $object;
-
-	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
-	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
-
-	$loaddate=($mode==1||$mode==2)?true:false;
-	$loadsize=($mode==1||$mode==3)?true:false;
-
-	// Clean parameters
-	$path=preg_replace('/([\\/]+)$/i','',$path);
-	$newpath=dol_osencode($path);
-
-	$reshook = 0;
-	$file_list = array();
-
-	if (is_object($hookmanager) && ! $nohook)
-	{
-		$hookmanager->resArray=array();
-
-		$hookmanager->initHooks(array('fileslib'));
-
-		$parameters=array(
-				'path' => $newpath,
-				'types'=> $types,
-				'recursive' => $recursive,
-				'filter' => $filter,
-				'excludefilter' => $excludefilter,
-				'sortcriteria' => $sortcriteria,
-				'sortorder' => $sortorder,
-				'loaddate' => $loaddate,
-				'loadsize' => $loadsize,
-				'mode' => $mode
-		);
-		$reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
-	}
-
-	// $hookmanager->resArray may contain array stacked by other modules
-	if (empty($reshook))
-	{
-		if (! is_dir($newpath)) return array();
-
-		if ($dir = opendir($newpath))
-		{
-			$filedate='';
-			$filesize='';
-
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
-			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
-				$fullpathfile=($newpath?$newpath.'/':'').$file;
-
-				$qualified=1;
-
-				// Define excludefilterarray
-				$excludefilterarray=array('^\.');
-				if (is_array($excludefilter))
-				{
-					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
-				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
-				// Check if file is qualified
-				foreach($excludefilterarray as $filt)
-				{
-					if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
-						$qualified=0; break;
-					}
-				}
-				//print $fullpathfile.' '.$file.' '.$qualified.'<br>';
-
-				if ($qualified)
-				{
-					$isdir=is_dir(dol_osencode($path."/".$file));
-					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
-					{
-						// Add entry into file_list array
-						if (($types=="directories") || ($types=="all"))
-						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
-
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
-							{
-								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-								$level1name=(isset($reg[1])?$reg[1]:'');
-								$file_list[] = array(
-										"name" => $file,
-										"path" => $path,
-										"level1name" => $level1name,
-										"relativename" => ($relativename?$relativename.'/':'').$file,
-										"fullname" => $path.'/'.$file,
-										"date" => $filedate,
-										"size" => $filesize,
-										"type" => 'dir'
-								);
-							}
-						}
-
-						// if we're in a directory and we want recursive behavior, call this function again
-						if ($recursive)
-						{
-							if (empty($donotfollowsymlinks) || ! is_link($path."/".$file))
-							{
-								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
-								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
-							}
-						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
-					{
-						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
-
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
-						{
-							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
-							$level1name=(isset($reg[1])?$reg[1]:'');
-							$file_list[] = array(
-									"name" => $file,
-									"path" => $path,
-									"level1name" => $level1name,
-									"relativename" => ($relativename?$relativename.'/':'').$file,
-									"fullname" => $path.'/'.$file,
-									"date" => $filedate,
-									"size" => $filesize,
-									"type" => 'file'
-							);
-						}
-					}
-				}
-			}
-			closedir($dir);
-
-			// Obtain a list of columns
-			if (! empty($sortcriteria))
-			{
-				$myarray=array();
-				foreach ($file_list as $key => $row)
-				{
-					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
-				}
-				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
-			}
-		}
-	}
-
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
-
-	return $file_list;
+    global $db, $hookmanager;
+    global $object;
+
+    dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));
+    //print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
+
+    $loaddate=($mode==1||$mode==2)?true:false;
+    $loadsize=($mode==1||$mode==3)?true:false;
+
+    // Clean parameters
+    $path=preg_replace('/([\\/]+)$/i','',$path);
+    $newpath=dol_osencode($path);
+
+    $reshook = 0;
+    $file_list = array();
+
+    if (is_object($hookmanager) && ! $nohook)
+    {
+        $hookmanager->resArray=array();
+
+        $hookmanager->initHooks(array('fileslib'));
+
+        $parameters=array(
+                'path' => $newpath,
+                'types'=> $types,
+                'recursive' => $recursive,
+                'filter' => $filter,
+                'excludefilter' => $excludefilter,
+                'sortcriteria' => $sortcriteria,
+                'sortorder' => $sortorder,
+                'loaddate' => $loaddate,
+                'loadsize' => $loadsize,
+                'mode' => $mode
+        );
+        $reshook=$hookmanager->executeHooks('getDirList', $parameters, $object);
+    }
+
+    // $hookmanager->resArray may contain array stacked by other modules
+    if (empty($reshook))
+    {
+        if (! is_dir($newpath)) return array();
+
+        if ($dir = opendir($newpath))
+        {
+            $filedate='';
+            $filesize='';
+
+            while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+            {
+                if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+                $fullpathfile=($newpath?$newpath.'/':'').$file;
+
+                $qualified=1;
+
+                // Define excludefilterarray
+                $excludefilterarray=array('^\.');
+                if (is_array($excludefilter))
+                {
+                    $excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+                }
+                else if ($excludefilter) $excludefilterarray[]=$excludefilter;
+                // Check if file is qualified
+                foreach($excludefilterarray as $filt)
+                {
+                    if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
+                        $qualified=0; break;
+                    }
+                }
+                //print $fullpathfile.' '.$file.' '.$qualified.'<br>';
+
+                if ($qualified)
+                {
+                    $isdir=is_dir(dol_osencode($path."/".$file));
+                    // Check whether this is a file or directory and whether we're interested in that type
+                    if ($isdir && (($types=="directories") || ($types=="all") || $recursive))
+                    {
+                        // Add entry into file_list array
+                        if (($types=="directories") || ($types=="all"))
+                        {
+                            if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
+                            if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+
+                            if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+                            {
+                                preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+                                $level1name=(isset($reg[1])?$reg[1]:'');
+                                $file_list[] = array(
+                                        "name" => $file,
+                                        "path" => $path,
+                                        "level1name" => $level1name,
+                                        "relativename" => ($relativename?$relativename.'/':'').$file,
+                                        "fullname" => $path.'/'.$file,
+                                        "date" => $filedate,
+                                        "size" => $filesize,
+                                        "type" => 'dir'
+                                );
+                            }
+                        }
+
+                        // if we're in a directory and we want recursive behavior, call this function again
+                        if ($recursive)
+                        {
+                            if (empty($donotfollowsymlinks) || ! is_link($path."/".$file))
+                            {
+                                //var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
+                                $file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
+                            }
+                        }
+                    }
+                    else if (! $isdir && (($types == "files") || ($types == "all")))
+                    {
+                        // Add file into file_list array
+                        if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
+                        if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+
+                        if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+                        {
+                            preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+                            $level1name=(isset($reg[1])?$reg[1]:'');
+                            $file_list[] = array(
+                                    "name" => $file,
+                                    "path" => $path,
+                                    "level1name" => $level1name,
+                                    "relativename" => ($relativename?$relativename.'/':'').$file,
+                                    "fullname" => $path.'/'.$file,
+                                    "date" => $filedate,
+                                    "size" => $filesize,
+                                    "type" => 'file'
+                            );
+                        }
+                    }
+                }
+            }
+            closedir($dir);
+
+            // Obtain a list of columns
+            if (! empty($sortcriteria))
+            {
+                $myarray=array();
+                foreach ($file_list as $key => $row)
+                {
+                    $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+                }
+                // Sort the data
+                if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+            }
+        }
+    }
+
+    if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+
+    return $file_list;
 }
 
 
@@ -228,68 +228,68 @@ 
  */
 function dol_dir_list_in_database($path, $filter="", $excludefilter=null, $sortcriteria="name", $sortorder=SORT_ASC, $mode=0)
 {
-	global $conf, $db;
-
-	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
-	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
-	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql.=" WHERE filepath = '".$db->escape($path)."'";
-	$sql.=" AND entity = ".$conf->entity;
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$file_list=array();
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
-				$level1name=(isset($reg[1])?$reg[1]:'');
-				$file_list[] = array(
-					"rowid" => $obj->rowid,
-					"label" => $obj->label,         // md5
-					"name" => $obj->filename,
-					"path" => DOL_DATA_ROOT.'/'.$obj->filepath,
-					"level1name" => $level1name,
-					"fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
-					"fullpath_orig" => $obj->fullpath_orig,
-					"date_c" => $db->jdate($obj->date_c),
-					"date_m" => $db->jdate($obj->date_m),
-					"type" => 'file',
-					"keywords" => $obj->keywords,
-					"cover" => $obj->cover,
-					"position" => (int) $obj->position,
-					"acl" => $obj->acl,
-					"share" => $obj->share
-				);
-			}
-			$i++;
-		}
-
-		// Obtain a list of columns
-		if (! empty($sortcriteria))
-		{
-			$myarray=array();
-			foreach ($file_list as $key => $row)
-			{
-				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
-			}
-			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
-		}
-
-		return $file_list;
-	}
-	else
-	{
-		dol_print_error($db);
-		return array();
-	}
+    global $conf, $db;
+
+    $sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
+    $sql.=" acl, position, share";
+    if ($mode) $sql.=", description";
+    $sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
+    $sql.=" WHERE filepath = '".$db->escape($path)."'";
+    $sql.=" AND entity = ".$conf->entity;
+
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $file_list=array();
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                preg_match('/([^\/]+)\/[^\/]+$/',DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,$reg);
+                $level1name=(isset($reg[1])?$reg[1]:'');
+                $file_list[] = array(
+                    "rowid" => $obj->rowid,
+                    "label" => $obj->label,         // md5
+                    "name" => $obj->filename,
+                    "path" => DOL_DATA_ROOT.'/'.$obj->filepath,
+                    "level1name" => $level1name,
+                    "fullname" => DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename,
+                    "fullpath_orig" => $obj->fullpath_orig,
+                    "date_c" => $db->jdate($obj->date_c),
+                    "date_m" => $db->jdate($obj->date_m),
+                    "type" => 'file',
+                    "keywords" => $obj->keywords,
+                    "cover" => $obj->cover,
+                    "position" => (int) $obj->position,
+                    "acl" => $obj->acl,
+                    "share" => $obj->share
+                );
+            }
+            $i++;
+        }
+
+        // Obtain a list of columns
+        if (! empty($sortcriteria))
+        {
+            $myarray=array();
+            foreach ($file_list as $key => $row)
+            {
+                $myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
+            }
+            // Sort the data
+            if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+        }
+
+        return $file_list;
+    }
+    else
+    {
+        dol_print_error($db);
+        return array();
+    }
 }
 
 
@@ -303,94 +303,94 @@ 
  */
 function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 {
-	global $conf, $db, $user;
-
-	$filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
-
-	// TODO Remove this when PRODUCT_USE_OLD_PATH_FOR_PHOTO will be removed
-	global $modulepart;
-	if ($modulepart == 'produit' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-		global $object;
-		if (! empty($object->id))
-		{
-			if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-
-			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
-			$relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
-
-			$filearrayindatabase = array_merge($filearrayindatabase, dol_dir_list_in_database($relativedirold, '', null, 'name', SORT_ASC));
-		}
-	}
-
-	//var_dump($filearray);
-	//var_dump($filearrayindatabase);
-
-	// Complete filearray with properties found into $filearrayindatabase
-	foreach($filearray as $key => $val)
-	{
-		$found=0;
-		// Search if it exists into $filearrayindatabase
-		foreach($filearrayindatabase as $key2 => $val2)
-		{
-			if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
-			{
-				$filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
-				$filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
-				$filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
-				$filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
-				$filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
-				$filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
-				$filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
-				$found=1;
-				break;
-			}
-		}
-
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
-		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
-			$filearray[$key]['cover']=0;
-			$filearray[$key]['acl']='';
-
-			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
-			{
-				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
-				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-				$ecmfile=new EcmFiles($db);
-
-				// Add entry into database
-				$filename = basename($rel_filename);
-				$rel_dir = dirname($rel_filename);
-				$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-				$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-				$ecmfile->filepath = $rel_dir;
-				$ecmfile->filename = $filename;
-				$ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
-				$ecmfile->fullpath_orig = $filearray[$key]['fullname'];
-				$ecmfile->gen_or_uploaded = 'unknown';
-				$ecmfile->description = '';    // indexed content
-				$ecmfile->keyword = '';        // keyword content
-				$result = $ecmfile->create($user);
-				if ($result < 0)
-				{
-					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
-				{
-					$filearray[$key]['rowid']=$result;
-				}
-			}
-			else
-			{
-				$filearray[$key]['rowid']=0;     // Should not happened
-			}
-		}
-	}
-
-	/*var_dump($filearray);*/
+    global $conf, $db, $user;
+
+    $filearrayindatabase = dol_dir_list_in_database($relativedir, '', null, 'name', SORT_ASC);
+
+    // TODO Remove this when PRODUCT_USE_OLD_PATH_FOR_PHOTO will be removed
+    global $modulepart;
+    if ($modulepart == 'produit' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+        global $object;
+        if (! empty($object->id))
+        {
+            if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+            else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+
+            $relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
+            $relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
+
+            $filearrayindatabase = array_merge($filearrayindatabase, dol_dir_list_in_database($relativedirold, '', null, 'name', SORT_ASC));
+        }
+    }
+
+    //var_dump($filearray);
+    //var_dump($filearrayindatabase);
+
+    // Complete filearray with properties found into $filearrayindatabase
+    foreach($filearray as $key => $val)
+    {
+        $found=0;
+        // Search if it exists into $filearrayindatabase
+        foreach($filearrayindatabase as $key2 => $val2)
+        {
+            if ($filearrayindatabase[$key2]['name'] == $filearray[$key]['name'])
+            {
+                $filearray[$key]['position_name']=($filearrayindatabase[$key2]['position']?$filearrayindatabase[$key2]['position']:'0').'_'.$filearrayindatabase[$key2]['name'];
+                $filearray[$key]['position']=$filearrayindatabase[$key2]['position'];
+                $filearray[$key]['cover']=$filearrayindatabase[$key2]['cover'];
+                $filearray[$key]['acl']=$filearrayindatabase[$key2]['acl'];
+                $filearray[$key]['rowid']=$filearrayindatabase[$key2]['rowid'];
+                $filearray[$key]['label']=$filearrayindatabase[$key2]['label'];
+                $filearray[$key]['share']=$filearrayindatabase[$key2]['share'];
+                $found=1;
+                break;
+            }
+        }
+
+        if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+        {
+            $filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+            $filearray[$key]['cover']=0;
+            $filearray[$key]['acl']='';
+
+            $rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
+            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            {
+                dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                $ecmfile=new EcmFiles($db);
+
+                // Add entry into database
+                $filename = basename($rel_filename);
+                $rel_dir = dirname($rel_filename);
+                $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                $ecmfile->filepath = $rel_dir;
+                $ecmfile->filename = $filename;
+                $ecmfile->label = md5_file(dol_osencode($filearray[$key]['fullname']));        // $destfile is a full path to file
+                $ecmfile->fullpath_orig = $filearray[$key]['fullname'];
+                $ecmfile->gen_or_uploaded = 'unknown';
+                $ecmfile->description = '';    // indexed content
+                $ecmfile->keyword = '';        // keyword content
+                $result = $ecmfile->create($user);
+                if ($result < 0)
+                {
+                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                }
+                else
+                {
+                    $filearray[$key]['rowid']=$result;
+                }
+            }
+            else
+            {
+                $filearray[$key]['rowid']=0;     // Should not happened
+            }
+        }
+    }
+
+    /*var_dump($filearray);*/
 }
 
 
@@ -403,29 +403,29 @@ 
  */
 function dol_compare_file($a, $b)
 {
-	global $sortorder;
-	global $sortfield;
-
-	$sortorder=strtoupper($sortorder);
-
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
-
-	if ($sortfield == 'name')
-	{
-		if ($a->name == $b->name) return 0;
-		return ($a->name < $b->name) ? $retup : $retdown;
-	}
-	if ($sortfield == 'date')
-	{
-		if ($a->date == $b->date) return 0;
-		return ($a->date < $b->date) ? $retup : $retdown;
-	}
-	if ($sortfield == 'size')
-	{
-		if ($a->size == $b->size) return 0;
-		return ($a->size < $b->size) ? $retup : $retdown;
-	}
+    global $sortorder;
+    global $sortfield;
+
+    $sortorder=strtoupper($sortorder);
+
+    if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
+    else { $retup=1; $retdown=-1; }
+
+    if ($sortfield == 'name')
+    {
+        if ($a->name == $b->name) return 0;
+        return ($a->name < $b->name) ? $retup : $retdown;
+    }
+    if ($sortfield == 'date')
+    {
+        if ($a->date == $b->date) return 0;
+        return ($a->date < $b->date) ? $retup : $retdown;
+    }
+    if ($sortfield == 'size')
+    {
+        if ($a->size == $b->size) return 0;
+        return ($a->size < $b->size) ? $retup : $retdown;
+    }
 }
 
 
@@ -437,9 +437,9 @@ 
  */
 function dol_is_dir($folder)
 {
-	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
+    $newfolder=dol_osencode($folder);
+    if (is_dir($newfolder)) return true;
+    else return false;
 }
 
 /**
@@ -450,8 +450,8 @@ 
  */
 function dol_is_file($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return is_file($newpathoffile);
+    $newpathoffile=dol_osencode($pathoffile);
+    return is_file($newpathoffile);
 }
 
 /**
@@ -462,8 +462,8 @@ 
  */
 function dol_is_link($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return is_link($newpathoffile);
+    $newpathoffile=dol_osencode($pathoffile);
+    return is_link($newpathoffile);
 }
 
 /**
@@ -474,12 +474,12 @@ 
  */
 function dol_is_url($url)
 {
-	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
-	foreach($tmpprot as $prot)
-	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
-	}
-	return false;
+    $tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
+    foreach($tmpprot as $prot)
+    {
+        if (preg_match('/^'.$prot.':/i',$url)) return true;
+    }
+    return false;
 }
 
 /**
@@ -490,24 +490,24 @@ 
  */
 function dol_dir_is_emtpy($folder)
 {
-	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder))
-	{
-		$handle = opendir($newfolder);
-		$folder_content = '';
-		while ((gettype($name = readdir($handle)) != "boolean"))
-		{
-			$name_array[] = $name;
-		}
-		foreach($name_array as $temp) $folder_content .= $temp;
-
-		closedir($handle);
-
-		if ($folder_content == "...") return true;
-		else return false;
-	}
-	else
-	return true; // Dir does not exists
+    $newfolder=dol_osencode($folder);
+    if (is_dir($newfolder))
+    {
+        $handle = opendir($newfolder);
+        $folder_content = '';
+        while ((gettype($name = readdir($handle)) != "boolean"))
+        {
+            $name_array[] = $name;
+        }
+        foreach($name_array as $temp) $folder_content .= $temp;
+
+        closedir($handle);
+
+        if ($folder_content == "...") return true;
+        else return false;
+    }
+    else
+    return true; // Dir does not exists
 }
 
 /**
@@ -519,27 +519,27 @@ 
  */
 function dol_count_nb_of_line($file)
 {
-	$nb=0;
-
-	$newfile=dol_osencode($file);
-	//print 'x'.$file;
-	$fp=fopen($newfile,'r');
-	if ($fp)
-	{
-		while (!feof($fp))
-		{
-			$line=fgets($fp);
-			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$nb=-1;
-	}
-
-	return $nb;
+    $nb=0;
+
+    $newfile=dol_osencode($file);
+    //print 'x'.$file;
+    $fp=fopen($newfile,'r');
+    if ($fp)
+    {
+        while (!feof($fp))
+        {
+            $line=fgets($fp);
+            // We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
+            if (! $line === false) $nb++;
+        }
+        fclose($fp);
+    }
+    else
+    {
+        $nb=-1;
+    }
+
+    return $nb;
 }
 
 
@@ -551,8 +551,8 @@ 
  */
 function dol_filesize($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return filesize($newpathoffile);
+    $newpathoffile=dol_osencode($pathoffile);
+    return filesize($newpathoffile);
 }
 
 /**
@@ -563,8 +563,8 @@ 
  */
 function dol_filemtime($pathoffile)
 {
-	$newpathoffile=dol_osencode($pathoffile);
-	return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
+    $newpathoffile=dol_osencode($pathoffile);
+    return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
 }
 
 /**
@@ -580,61 +580,61 @@ 
  */
 function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
-	global $conf;
+    global $conf;
 
-	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
+    dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+    if (empty($srcfile)) return -1;
+    if (empty($destfile)) $destfile=$srcfile;
 
-	$destexists=dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+    $destexists=dol_is_file($destfile);
+    if (($destfile != $srcfile) && $destexists) return 0;
 
-	$tmpdestfile=$destfile.'.tmp';
+    $tmpdestfile=$destfile.'.tmp';
 
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathoftmpdestfile=dol_osencode($tmpdestfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
+    $newpathofsrcfile=dol_osencode($srcfile);
+    $newpathoftmpdestfile=dol_osencode($tmpdestfile);
+    $newpathofdestfile=dol_osencode($destfile);
+    $newdirdestfile=dirname($newpathofdestfile);
 
-	if ($destexists && ! is_writable($newpathofdestfile))
-	{
-		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
-		return -1;
-	}
-	if (! is_writable($newdirdestfile))
-	{
-		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
-		return -2;
-	}
+    if ($destexists && ! is_writable($newpathofdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
+        return -1;
+    }
+    if (! is_writable($newdirdestfile))
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+        return -2;
+    }
 
-	dol_delete_file($tmpdestfile);
+    dol_delete_file($tmpdestfile);
 
-	// Create $newpathoftmpdestfile from $newpathofsrcfile
-	$content = file_get_contents($newpathofsrcfile, 'r');
+    // Create $newpathoftmpdestfile from $newpathofsrcfile
+    $content = file_get_contents($newpathofsrcfile, 'r');
 
-	$content = make_substitutions($content, $arrayreplacement, null);
+    $content = make_substitutions($content, $arrayreplacement, null);
 
-	file_put_contents($newpathoftmpdestfile, $content);
-	@chmod($newpathoftmpdestfile, octdec($newmask));
+    file_put_contents($newpathoftmpdestfile, $content);
+    @chmod($newpathoftmpdestfile, octdec($newmask));
 
-	// Rename
-	$result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
-	if (! $result)
-	{
-		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
-		return -3;
-	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
-	{
-		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
-	}
+    // Rename
+    $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0), 0, $indexdatabase);
+    if (! $result)
+    {
+        dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
+        return -3;
+    }
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask))	// This should no happen
+    {
+        dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+        $newmask='0664';
+    }
 
-	@chmod($newpathofdestfile, octdec($newmask));
+    @chmod($newpathofdestfile, octdec($newmask));
 
-	return 1;
+    return 1;
 }
 
 /**
@@ -650,7 +650,7 @@ 
  */
 function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
-	// TODO
+    // TODO
 }
 
 /**
@@ -665,47 +665,47 @@ 
  */
 function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
 {
-	global $conf;
-
-	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
-
-	if (empty($srcfile) || empty($destfile)) return -1;
-
-	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
-
-	$newpathofsrcfile=dol_osencode($srcfile);
-	$newpathofdestfile=dol_osencode($destfile);
-	$newdirdestfile=dirname($newpathofdestfile);
-
-	if ($destexists && ! is_writable($newpathofdestfile))
-	{
-		dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
-		return -1;
-	}
-	if (! is_writable($newdirdestfile))
-	{
-		dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
-		return -2;
-	}
-	// Copy with overwriting if exists
-	$result=@copy($newpathofsrcfile, $newpathofdestfile);
-	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
-	if (! $result)
-	{
-		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
-		return -3;
-	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
-	{
-		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
-		$newmask='0664';
-	}
-
-	@chmod($newpathofdestfile, octdec($newmask));
-
-	return 1;
+    global $conf;
+
+    dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
+
+    if (empty($srcfile) || empty($destfile)) return -1;
+
+    $destexists=dol_is_file($destfile);
+    if (! $overwriteifexists && $destexists) return 0;
+
+    $newpathofsrcfile=dol_osencode($srcfile);
+    $newpathofdestfile=dol_osencode($destfile);
+    $newdirdestfile=dirname($newpathofdestfile);
+
+    if ($destexists && ! is_writable($newpathofdestfile))
+    {
+        dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
+        return -1;
+    }
+    if (! is_writable($newdirdestfile))
+    {
+        dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+        return -2;
+    }
+    // Copy with overwriting if exists
+    $result=@copy($newpathofsrcfile, $newpathofdestfile);
+    //$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
+    if (! $result)
+    {
+        dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
+        return -3;
+    }
+    if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+    if (empty($newmask))	// This should no happen
+    {
+        dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+        $newmask='0664';
+    }
+
+    @chmod($newpathofdestfile, octdec($newmask));
+
+    return 1;
 }
 
 /**
@@ -721,77 +721,77 @@ 
  */
 function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement=null)
 {
-	global $conf;
-
-	$result=0;
-
-	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
-
-	if (empty($srcfile) || empty($destfile)) return -1;
-
-	$destexists=dol_is_dir($destfile);
-	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
-
-	if (! $destexists)
-	{
-		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
-		umask(0);
-		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
-		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
-		dol_mkdir($destfile, '', decoct($dirmaskdec));
-	}
-
-	$ossrcfile=dol_osencode($srcfile);
-	$osdestfile=dol_osencode($destfile);
-
-	// Recursive function to copy all subdirectories and contents:
-	if (is_dir($ossrcfile))
-	{
-		$dir_handle=opendir($ossrcfile);
-		while ($file=readdir($dir_handle))
-		{
-			if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
-			{
-				if (is_dir($ossrcfile."/".$file))
-				{
-					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-				}
-				else
-				{
-					$newfile = $file;
-					// Replace destination filename with a new one
-					if (is_array($arrayreplacement))
-					{
-						foreach($arrayreplacement as $key => $val)
-						{
-							$newfile = str_replace($key, $val, $newfile);
-						}
-					}
-					$tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
-				}
-				// Set result
-				if ($result > 0 && $tmpresult >= 0)
-				{
-					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
-				{
-					$result=$tmpresult;
-				}
-				if ($result < 0) break;
-			}
-		}
-		closedir($dir_handle);
-	}
-	else
-	{
-		// Source directory does not exists
-		$result = -2;
-	}
-
-	return $result;
+    global $conf;
+
+    $result=0;
+
+    dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
+
+    if (empty($srcfile) || empty($destfile)) return -1;
+
+    $destexists=dol_is_dir($destfile);
+    //if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
+
+    if (! $destexists)
+    {
+        // We must set mask just before creating dir, becaause it can be set differently by dol_copy
+        umask(0);
+        $dirmaskdec=octdec($newmask);
+        if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+        $dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
+        dol_mkdir($destfile, '', decoct($dirmaskdec));
+    }
+
+    $ossrcfile=dol_osencode($srcfile);
+    $osdestfile=dol_osencode($destfile);
+
+    // Recursive function to copy all subdirectories and contents:
+    if (is_dir($ossrcfile))
+    {
+        $dir_handle=opendir($ossrcfile);
+        while ($file=readdir($dir_handle))
+        {
+            if ($file != "." && $file != ".." && ! is_link($ossrcfile."/".$file))
+            {
+                if (is_dir($ossrcfile."/".$file))
+                {
+                    //var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
+                    $tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+                }
+                else
+                {
+                    $newfile = $file;
+                    // Replace destination filename with a new one
+                    if (is_array($arrayreplacement))
+                    {
+                        foreach($arrayreplacement as $key => $val)
+                        {
+                            $newfile = str_replace($key, $val, $newfile);
+                        }
+                    }
+                    $tmpresult=dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
+                }
+                // Set result
+                if ($result > 0 && $tmpresult >= 0)
+                {
+                    // Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
+                }
+                else
+                {
+                    $result=$tmpresult;
+                }
+                if ($result < 0) break;
+            }
+        }
+        closedir($dir_handle);
+    }
+    else
+    {
+        // Source directory does not exists
+        $result = -2;
+    }
+
+    return $result;
 }
 
 
@@ -813,123 +813,123 @@ 
  */
 function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1, $testvirus=0, $indexdatabase=1)
 {
-	global $user, $db, $conf;
-	$result=false;
-
-	dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
-	$srcexists=dol_is_file($srcfile);
-	$destexists=dol_is_file($destfile);
-
-	if (! $srcexists)
-	{
-		dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
-		return false;
-	}
-
-	if ($overwriteifexists || ! $destexists)
-	{
-		$newpathofsrcfile=dol_osencode($srcfile);
-		$newpathofdestfile=dol_osencode($destfile);
-
-		// Check virus
-		$testvirusarray=array();
-		if ($testvirus)
-		{
-			$testvirusarray=dolCheckVirus($newpathofsrcfile);
-			if (count($testvirusarray))
-			{
-				dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
-				return false;
-			}
-		}
-
-		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-		if (! $result)
-		{
-			if ($destexists)
-			{
-				dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
-				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
-				dol_delete_file($destfile);
-				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
-		}
-
-		// Move ok
-		if ($result && $indexdatabase)
-		{
-			// Rename entry into ecm database
-			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
-			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
-			{
-				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
-				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
-				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
-
-				dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
-				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-
-				$ecmfiletarget=new EcmFiles($db);
-				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
-				{
-					$ecmfiletarget->delete($user);
-				}
-
-				$ecmfile=new EcmFiles($db);
-				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
-				{
-					$filename = basename($rel_filetorenameafter);
-					$rel_dir = dirname($rel_filetorenameafter);
-					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-					$ecmfile->filepath = $rel_dir;
-					$ecmfile->filename = $filename;
-					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
-				{
-					$filename = basename($rel_filetorenameafter);
-					$rel_dir = dirname($rel_filetorenameafter);
-					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-					$ecmfile->filepath = $rel_dir;
-					$ecmfile->filename = $filename;
-					$ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
-					$ecmfile->fullpath_orig = $srcfile;
-					$ecmfile->gen_or_uploaded = 'unknown';
-					$ecmfile->description = '';    // indexed content
-					$ecmfile->keyword = '';        // keyword content
-					$resultecm = $ecmfile->create($user);
-					if ($resultecm < 0)
-					{
-						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-					}
-				}
-				elseif ($resultecm < 0)
-				{
-					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-
-				if ($resultecm > 0) $result=true;
-				else $result = false;
-			}
-		}
-
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
-		$newmaskdec=octdec($newmask);
-		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
-		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
-		// if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
-		@chmod($newpathofdestfile, $newmaskdec);
-	}
-
-	return $result;
+    global $user, $db, $conf;
+    $result=false;
+
+    dol_syslog("files.lib.php::dol_move srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwritifexists=".$overwriteifexists);
+    $srcexists=dol_is_file($srcfile);
+    $destexists=dol_is_file($destfile);
+
+    if (! $srcexists)
+    {
+        dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
+        return false;
+    }
+
+    if ($overwriteifexists || ! $destexists)
+    {
+        $newpathofsrcfile=dol_osencode($srcfile);
+        $newpathofdestfile=dol_osencode($destfile);
+
+        // Check virus
+        $testvirusarray=array();
+        if ($testvirus)
+        {
+            $testvirusarray=dolCheckVirus($newpathofsrcfile);
+            if (count($testvirusarray))
+            {
+                dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
+                return false;
+            }
+        }
+
+        $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+        if (! $result)
+        {
+            if ($destexists)
+            {
+                dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
+                // We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
+                dol_delete_file($destfile);
+                $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+            }
+            else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+        }
+
+        // Move ok
+        if ($result && $indexdatabase)
+        {
+            // Rename entry into ecm database
+            $rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
+            $rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
+            if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+            {
+                $rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+                $rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
+                //var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
+
+                dol_syslog("Try to rename also entries in database for full relative path before = ".$rel_filetorenamebefore." after = ".$rel_filetorenameafter, LOG_DEBUG);
+                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+
+                $ecmfiletarget=new EcmFiles($db);
+                $resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
+                if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+                {
+                    $ecmfiletarget->delete($user);
+                }
+
+                $ecmfile=new EcmFiles($db);
+                $resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
+                if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+                {
+                    $filename = basename($rel_filetorenameafter);
+                    $rel_dir = dirname($rel_filetorenameafter);
+                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                    $ecmfile->filepath = $rel_dir;
+                    $ecmfile->filename = $filename;
+                    $resultecm = $ecmfile->update($user);
+                }
+                elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+                {
+                    $filename = basename($rel_filetorenameafter);
+                    $rel_dir = dirname($rel_filetorenameafter);
+                    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+                    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+                    $ecmfile->filepath = $rel_dir;
+                    $ecmfile->filename = $filename;
+                    $ecmfile->label = md5_file(dol_osencode($destfile));        // $destfile is a full path to file
+                    $ecmfile->fullpath_orig = $srcfile;
+                    $ecmfile->gen_or_uploaded = 'unknown';
+                    $ecmfile->description = '';    // indexed content
+                    $ecmfile->keyword = '';        // keyword content
+                    $resultecm = $ecmfile->create($user);
+                    if ($resultecm < 0)
+                    {
+                        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                    }
+                }
+                elseif ($resultecm < 0)
+                {
+                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                }
+
+                if ($resultecm > 0) $result=true;
+                else $result = false;
+            }
+        }
+
+        if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+        $newmaskdec=octdec($newmask);
+        // Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
+        // to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
+        // if ($isdir) $newmaskdec |= octdec('0111');  // Set x bit required for directories
+        @chmod($newpathofdestfile, $newmaskdec);
+    }
+
+    return $result;
 }
 
 /**
@@ -941,10 +941,10 @@ 
  */
 function dol_unescapefile($filename)
 {
-	// Remove path information and dots around the filename, to prevent uploading
-	// into different directories or replacing hidden system files.
-	// Also remove control characters and spaces (\x00..\x20) around the filename:
-	return trim(basename($filename), ".\x00..\x20");
+    // Remove path information and dots around the filename, to prevent uploading
+    // into different directories or replacing hidden system files.
+    // Also remove control characters and spaces (\x00..\x20) around the filename:
+    return trim(basename($filename), ".\x00..\x20");
 }
 
 
@@ -956,22 +956,22 @@ 
  */
 function dolCheckVirus($src_file)
 {
-	global $conf;
-
-	if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-	{
-		if (! class_exists('AntiVir')) {
-			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
-		}
-		$antivir=new AntiVir($db);
-		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
-		{
-			$reterrors=$antivir->errors;
-			return $reterrors;
-		}
-	}
-	return array();
+    global $conf;
+
+    if (! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
+    {
+        if (! class_exists('AntiVir')) {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
+        }
+        $antivir=new AntiVir($db);
+        $result = $antivir->dol_avscan_file($src_file);
+        if ($result < 0)	// If virus or error, we stop here
+        {
+            $reterrors=$antivir->errors;
+            return $reterrors;
+        }
+    }
+    return array();
 }
 
 
@@ -995,131 +995,131 @@ 
  */
 function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $nohook=0, $varfiles='addedfile')
 {
-	global $conf, $db, $user, $langs;
-	global $object, $hookmanager;
-
-	$reshook=0;
-	$file_name = $dest_file;
-
-	if (empty($nohook))
-	{
-		$reshook=$hookmanager->initHooks(array('fileslib'));
-
-		$parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
-		$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
-	}
-
-	if (empty($reshook))
-	{
-		// If an upload error has been reported
-		if ($uploaderrorcode)
-		{
-			switch($uploaderrorcode)
-			{
-				case UPLOAD_ERR_INI_SIZE:	// 1
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_FORM_SIZE:	// 2
-					return 'ErrorFileSizeTooLarge';
-					break;
-				case UPLOAD_ERR_PARTIAL:	// 3
-					return 'ErrorPartialFile';
-					break;
-				case UPLOAD_ERR_NO_TMP_DIR:	//
-					return 'ErrorNoTmpDir';
-					break;
-				case UPLOAD_ERR_CANT_WRITE:
-					return 'ErrorFailedToWriteInDir';
-					break;
-				case UPLOAD_ERR_EXTENSION:
-					return 'ErrorUploadBlockedByAddon';
-					break;
-				default:
-					break;
-			}
-		}
-
-		// If we need to make a virus scan
-		if (empty($disablevirusscan) && file_exists($src_file))
-		{
-			$checkvirusarray=dolCheckVirus($src_file);
-			if (count($checkvirusarray))
-			{
-			   dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
-			   return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
-			}
-		}
-
-		// Security:
-		// Disallow file with some extensions. We rename them.
-		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (preg_match('/(\.htm|\.html|\.php|\.pl|\.cgi)$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-		{
-			$file_name.= '.noexe';
-		}
-
-		// Security:
-		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
-		{
-			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
-			return -1;
-		}
-
-		// Security:
-		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
-		{
-			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
-			return -2;
-		}
-	}
-
-	if ($reshook < 0)	// At least one blocking error returned by one hook
-	{
-		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
-	}
-	elseif (empty($reshook))
-	{
-		// The file functions must be in OS filesystem encoding.
-		$src_file_osencoded=dol_osencode($src_file);
-		$file_name_osencoded=dol_osencode($file_name);
-
-		// Check if destination dir is writable
-		if (! is_writable(dirname($file_name_osencoded)))
-		{
-			dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
-			return 'ErrorDirNotWritable';
-		}
-
-		// Check if destination file already exists
-		if (! $allowoverwrite)
-		{
-			if (file_exists($file_name_osencoded))
-			{
-				dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
-				return 'ErrorFileAlreadyExists';
-			}
-		}
-
-		// Move file
-		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
-		if ($return)
-		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
-			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
-			return 1;	// Success
-		}
-		else
-		{
-			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
-			return -3;	// Unknown error
-		}
-	}
-
-	return 1;	// Success
+    global $conf, $db, $user, $langs;
+    global $object, $hookmanager;
+
+    $reshook=0;
+    $file_name = $dest_file;
+
+    if (empty($nohook))
+    {
+        $reshook=$hookmanager->initHooks(array('fileslib'));
+
+        $parameters=array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
+        $reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
+    }
+
+    if (empty($reshook))
+    {
+        // If an upload error has been reported
+        if ($uploaderrorcode)
+        {
+            switch($uploaderrorcode)
+            {
+                case UPLOAD_ERR_INI_SIZE:	// 1
+                    return 'ErrorFileSizeTooLarge';
+                    break;
+                case UPLOAD_ERR_FORM_SIZE:	// 2
+                    return 'ErrorFileSizeTooLarge';
+                    break;
+                case UPLOAD_ERR_PARTIAL:	// 3
+                    return 'ErrorPartialFile';
+                    break;
+                case UPLOAD_ERR_NO_TMP_DIR:	//
+                    return 'ErrorNoTmpDir';
+                    break;
+                case UPLOAD_ERR_CANT_WRITE:
+                    return 'ErrorFailedToWriteInDir';
+                    break;
+                case UPLOAD_ERR_EXTENSION:
+                    return 'ErrorUploadBlockedByAddon';
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // If we need to make a virus scan
+        if (empty($disablevirusscan) && file_exists($src_file))
+        {
+            $checkvirusarray=dolCheckVirus($src_file);
+            if (count($checkvirusarray))
+            {
+                dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$checkvirusarray), LOG_WARNING);
+                return 'ErrorFileIsInfectedWithAVirus: '.join(',',$checkvirusarray);
+            }
+        }
+
+        // Security:
+        // Disallow file with some extensions. We rename them.
+        // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+        if (preg_match('/(\.htm|\.html|\.php|\.pl|\.cgi)$/i',$dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+        {
+            $file_name.= '.noexe';
+        }
+
+        // Security:
+        // We refuse cache files/dirs, upload using .. and pipes into filenames.
+        if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
+        {
+            dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
+            return -1;
+        }
+
+        // Security:
+        // On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
+        if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
+        {
+            dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
+            return -2;
+        }
+    }
+
+    if ($reshook < 0)	// At least one blocking error returned by one hook
+    {
+        $errmsg = join(',', $hookmanager->errors);
+        if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+        return $errmsg;
+    }
+    elseif (empty($reshook))
+    {
+        // The file functions must be in OS filesystem encoding.
+        $src_file_osencoded=dol_osencode($src_file);
+        $file_name_osencoded=dol_osencode($file_name);
+
+        // Check if destination dir is writable
+        if (! is_writable(dirname($file_name_osencoded)))
+        {
+            dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
+            return 'ErrorDirNotWritable';
+        }
+
+        // Check if destination file already exists
+        if (! $allowoverwrite)
+        {
+            if (file_exists($file_name_osencoded))
+            {
+                dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
+                return 'ErrorFileAlreadyExists';
+            }
+        }
+
+        // Move file
+        $return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
+        if ($return)
+        {
+            if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+            dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
+            return 1;	// Success
+        }
+        else
+        {
+            dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
+            return -3;	// Unknown error
+        }
+    }
+
+    return 1;	// Success
 }
 
 /**
@@ -1138,103 +1138,103 @@ 
  */
 function dol_delete_file($file, $disableglob=0, $nophperrors=0, $nohook=0, $object=null, $allowdotdot=false, $indexdatabase=1)
 {
-	global $db, $conf, $user, $langs;
-	global $hookmanager;
+    global $db, $conf, $user, $langs;
+    global $hookmanager;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array('other', 'errors'));
 
-	dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);
-
-	// Security:
-	// We refuse transversal using .. and pipes into filenames.
-	if ((! $allowdotdot && preg_match('/\.\./',$file)) || preg_match('/[<>|]/',$file))
-	{
-		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
-		return false;
-	}
-
-	if (empty($nohook))
-	{
-		$hookmanager->initHooks(array('fileslib'));
-
-		$parameters=array(
-				'GET' => $_GET,
-				'file' => $file,
-				'disableglob'=> $disableglob,
-				'nophperrors' => $nophperrors
-		);
-		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
-	}
-
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
-	{
-		if ($reshook < 0) return false;
-		return true;
-	}
-	else
-	{
-		$error=0;
-
-		//print "x".$file." ".$disableglob;exit;
-		$file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
-		if (empty($disableglob) && ! empty($file_osencoded))
-		{
-			$ok=true;
-			$globencoded=str_replace('[','\[',$file_osencoded);
-			$globencoded=str_replace(']','\]',$globencoded);
-			$listofdir=glob($globencoded);
-			if (! empty($listofdir) && is_array($listofdir))
-			{
-				foreach ($listofdir as $filename)
-				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
-					if ($ok)
-					{
-						dol_syslog("Removed file ".$filename, LOG_DEBUG);
-
-						// Delete entry into ecm database
-						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
-						{
-							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
-
-							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
-							{
-								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
-								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-								$ecmfile=new EcmFiles($db);
-								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
-								if ($result >= 0 && $ecmfile->id > 0)
-								{
-									$result = $ecmfile->delete($user);
-								}
-								if ($result < 0)
-								{
-									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-								}
-							}
-						}
-					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
-					// TODO Failure to remove can be because file was already removed or because of permission
-					// If error because it does not exists, we should return true, and we should return false if this is a permission problem
-				}
-			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
-		{
-			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
-		}
-
-		return $ok;
-	}
+    dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);
+
+    // Security:
+    // We refuse transversal using .. and pipes into filenames.
+    if ((! $allowdotdot && preg_match('/\.\./',$file)) || preg_match('/[<>|]/',$file))
+    {
+        dol_syslog("Refused to delete file ".$file, LOG_WARNING);
+        return false;
+    }
+
+    if (empty($nohook))
+    {
+        $hookmanager->initHooks(array('fileslib'));
+
+        $parameters=array(
+                'GET' => $_GET,
+                'file' => $file,
+                'disableglob'=> $disableglob,
+                'nophperrors' => $nophperrors
+        );
+        $reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
+    }
+
+    if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+    {
+        if ($reshook < 0) return false;
+        return true;
+    }
+    else
+    {
+        $error=0;
+
+        //print "x".$file." ".$disableglob;exit;
+        $file_osencoded=dol_osencode($file);    // New filename encoded in OS filesystem encoding charset
+        if (empty($disableglob) && ! empty($file_osencoded))
+        {
+            $ok=true;
+            $globencoded=str_replace('[','\[',$file_osencoded);
+            $globencoded=str_replace(']','\]',$globencoded);
+            $listofdir=glob($globencoded);
+            if (! empty($listofdir) && is_array($listofdir))
+            {
+                foreach ($listofdir as $filename)
+                {
+                    if ($nophperrors) $ok=@unlink($filename);
+                    else $ok=unlink($filename);
+                    if ($ok)
+                    {
+                        dol_syslog("Removed file ".$filename, LOG_DEBUG);
+
+                        // Delete entry into ecm database
+                        $rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
+                        if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+                        {
+                            $rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+
+                            if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
+                            {
+                                dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+                                include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+                                $ecmfile=new EcmFiles($db);
+                                $result = $ecmfile->fetch(0, '', $rel_filetodelete);
+                                if ($result >= 0 && $ecmfile->id > 0)
+                                {
+                                    $result = $ecmfile->delete($user);
+                                }
+                                if ($result < 0)
+                                {
+                                    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+                                }
+                            }
+                        }
+                    }
+                    else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
+                    // TODO Failure to remove can be because file was already removed or because of permission
+                    // If error because it does not exists, we should return true, and we should return false if this is a permission problem
+                }
+            }
+            else dol_syslog("No files to delete found", LOG_DEBUG);
+        }
+        else
+        {
+            $ok=false;
+            if ($nophperrors) $ok=@unlink($file_osencoded);
+            else $ok=unlink($file_osencoded);
+            if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+            else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+        }
+
+        return $ok;
+    }
 }
 
 /**
@@ -1248,16 +1248,16 @@ 
  */
 function dol_delete_dir($dir,$nophperrors=0)
 {
-	// Security:
-	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
-	{
-		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
-		return false;
-	}
-
-	$dir_osencoded=dol_osencode($dir);
-	return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
+    // Security:
+    // We refuse transversal using .. and pipes into filenames.
+    if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
+    {
+        dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
+        return false;
+    }
+
+    $dir_osencoded=dol_osencode($dir);
+    return ($nophperrors?@rmdir($dir_osencoded):rmdir($dir_osencoded));
 }
 
 /**
@@ -1272,44 +1272,44 @@ 
  */
 function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$countdeleted=0)
 {
-	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
-	if (dol_is_dir($dir))
-	{
-		$dir_osencoded=dol_osencode($dir);
-		if ($handle = opendir("$dir_osencoded"))
-		{
-			while (false !== ($item = readdir($handle)))
-			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
-
-				if ($item != "." && $item != "..")
-				{
-					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
-					{
-						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
-					{
-						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
-						$count++;
-						if ($result) $countdeleted++;
-						//else print 'Error on '.$item."\n";
-					}
-				}
-			}
-			closedir($handle);
-
-			if (empty($onlysub))
-			{
-				$result=dol_delete_dir($dir, $nophperrors);
-				$count++;
-				if ($result) $countdeleted++;
-				//else print 'Error on '.$dir."\n";
-			}
-		}
-	}
-
-	return $count;
+    dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
+    if (dol_is_dir($dir))
+    {
+        $dir_osencoded=dol_osencode($dir);
+        if ($handle = opendir("$dir_osencoded"))
+        {
+            while (false !== ($item = readdir($handle)))
+            {
+                if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+
+                if ($item != "." && $item != "..")
+                {
+                    if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
+                    {
+                        $count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
+                    }
+                    else
+                    {
+                        $result=dol_delete_file("$dir/$item", 1, $nophperrors);
+                        $count++;
+                        if ($result) $countdeleted++;
+                        //else print 'Error on '.$item."\n";
+                    }
+                }
+            }
+            closedir($handle);
+
+            if (empty($onlysub))
+            {
+                $result=dol_delete_dir($dir, $nophperrors);
+                $count++;
+                if ($result) $countdeleted++;
+                //else print 'Error on '.$dir."\n";
+            }
+        }
+    }
+
+    return $count;
 }
 
 
@@ -1323,72 +1323,72 @@ 
  */
 function dol_delete_preview($object)
 {
-	global $langs,$conf;
-
-	// Define parent dir of elements
-	$element = $object->element;
-
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
-
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
-
-	$refsan = dol_sanitizeFileName($object->ref);
-	$dir = $dir . "/" . $refsan ;
-	$filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png";
-	$filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png";
-	$filepreviewold = $dir . "/" . $refsan . ".pdf.png";
-
-	// For new preview files
-	if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
-	{
-		if (! dol_delete_file($filepreviewnew,1))
-		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew);
-			return 0;
-		}
-	}
-	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
-	{
-		if (! dol_delete_file($filepreviewnewbis,1))
-		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis);
-			return 0;
-		}
-	}
-	// For old preview files
-	if (file_exists($filepreviewold) && is_writable($filepreviewold))
-	{
-		if (! dol_delete_file($filepreviewold,1))
-		{
-			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
-			return 0;
-		}
-	}
-	else
-	{
-		$multiple = $filepreviewold . ".";
-		for ($i = 0; $i < 20; $i++)
-		{
-			$preview = $multiple.$i;
-
-			if (file_exists($preview) && is_writable($preview))
-			{
-				if ( ! dol_delete_file($preview,1) )
-				{
-					$object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
-					return 0;
-				}
-			}
-		}
-	}
-
-	return 1;
+    global $langs,$conf;
+
+    // Define parent dir of elements
+    $element = $object->element;
+
+    if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
+    elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
+    elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
+    elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
+    elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
+    elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
+    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+
+    if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+
+    $refsan = dol_sanitizeFileName($object->ref);
+    $dir = $dir . "/" . $refsan ;
+    $filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png";
+    $filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png";
+    $filepreviewold = $dir . "/" . $refsan . ".pdf.png";
+
+    // For new preview files
+    if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
+    {
+        if (! dol_delete_file($filepreviewnew,1))
+        {
+            $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew);
+            return 0;
+        }
+    }
+    if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
+    {
+        if (! dol_delete_file($filepreviewnewbis,1))
+        {
+            $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis);
+            return 0;
+        }
+    }
+    // For old preview files
+    if (file_exists($filepreviewold) && is_writable($filepreviewold))
+    {
+        if (! dol_delete_file($filepreviewold,1))
+        {
+            $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
+            return 0;
+        }
+    }
+    else
+    {
+        $multiple = $filepreviewold . ".";
+        for ($i = 0; $i < 20; $i++)
+        {
+            $preview = $multiple.$i;
+
+            if (file_exists($preview) && is_writable($preview))
+            {
+                if ( ! dol_delete_file($preview,1) )
+                {
+                    $object->error=$langs->trans("ErrorFailedToOpenFile",$preview);
+                    return 0;
+                }
+            }
+        }
+    }
+
+    return 1;
 }
 
 /**
@@ -1401,71 +1401,71 @@ 
  */
 function dol_meta_create($object)
 {
-	global $conf;
-
-	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
-
-	// Define parent dir of elements
-	$element=$object->element;
-
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
-
-	if ($dir)
-	{
-		$object->fetch_thirdparty();
-
-		$objectref = dol_sanitizeFileName($object->ref);
-		$dir = $dir . "/" . $objectref;
-		$file = $dir . "/" . $objectref . ".meta";
-
-		if (! is_dir($dir))
-		{
-			dol_mkdir($dir);
-		}
-
-		if (is_dir($dir))
-		{
-			$nblignes = count($object->lines);
-			$client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
-			$meta = "REFERENCE=\"" . $object->ref . "\"
+    global $conf;
+
+    // Create meta file
+    if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+
+    // Define parent dir of elements
+    $element=$object->element;
+
+    if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
+    elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
+    elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
+    elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
+    elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
+    elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
+    else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+
+    if ($dir)
+    {
+        $object->fetch_thirdparty();
+
+        $objectref = dol_sanitizeFileName($object->ref);
+        $dir = $dir . "/" . $objectref;
+        $file = $dir . "/" . $objectref . ".meta";
+
+        if (! is_dir($dir))
+        {
+            dol_mkdir($dir);
+        }
+
+        if (is_dir($dir))
+        {
+            $nblignes = count($object->lines);
+            $client = $object->thirdparty->name . " " . $object->thirdparty->address . " " . $object->thirdparty->zip . " " . $object->thirdparty->town;
+            $meta = "REFERENCE=\"" . $object->ref . "\"
 			DATE=\"" . dol_print_date($object->date,'') . "\"
 			NB_ITEMS=\"" . $nblignes . "\"
 			CLIENT=\"" . $client . "\"
 			AMOUNT_EXCL_TAX=\"" . $object->total_ht . "\"
 			AMOUNT=\"" . $object->total_ttc . "\"\n";
 
-			for ($i = 0 ; $i < $nblignes ; $i++)
-			{
-				//Pour les articles
-				$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
+            for ($i = 0 ; $i < $nblignes ; $i++)
+            {
+                //Pour les articles
+                $meta .= "ITEM_" . $i . "_QUANTITY=\"" . $object->lines[$i]->qty . "\"
 				ITEM_" . $i . "_AMOUNT_WO_TAX=\"" . $object->lines[$i]->total_ht . "\"
 				ITEM_" . $i . "_VAT=\"" .$object->lines[$i]->tva_tx . "\"
 				ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($object->lines[$i]->desc)) . "\"
 				";
-			}
-		}
-
-		$fp = fopen($file,"w");
-		fputs($fp,$meta);
-		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
-		@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-		return 1;
-	}
-	else
-	{
-		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
-	}
-
-	return 0;
+            }
+        }
+
+        $fp = fopen($file,"w");
+        fputs($fp,$meta);
+        fclose($fp);
+        if (! empty($conf->global->MAIN_UMASK))
+        @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+        return 1;
+    }
+    else
+    {
+        dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
+    }
+
+    return 0;
 }
 
 
@@ -1480,24 +1480,24 @@ 
  */
 function dol_init_file_process($pathtoscan='', $trackid='')
 {
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-
-	if ($pathtoscan)
-	{
-		$listoffiles=dol_dir_list($pathtoscan,'files');
-		foreach($listoffiles as $key => $val)
-		{
-			$listofpaths[]=$val['fullname'];
-			$listofnames[]=$val['name'];
-			$listofmimes[]=dol_mimetype($val['name']);
-		}
-	}
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-	$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-	$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+    $listofpaths=array();
+    $listofnames=array();
+    $listofmimes=array();
+
+    if ($pathtoscan)
+    {
+        $listoffiles=dol_dir_list($pathtoscan,'files');
+        foreach($listoffiles as $key => $val)
+        {
+            $listofpaths[]=$val['fullname'];
+            $listofnames[]=$val['name'];
+            $listofmimes[]=dol_mimetype($val['name']);
+        }
+    }
+    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+    $_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
+    $_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
+    $_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
 }
 
 
@@ -1518,135 +1518,135 @@ 
  */
 function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesession=0, $varfiles='addedfile', $savingdocmask='', $link=null, $trackid='', $generatethumbs=1)
 {
-	global $db,$user,$conf,$langs;
-
-	$res = 0;
-
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
-	{
-		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
-		if (dol_mkdir($upload_dir) >= 0)
-		{
-			$TFile = $_FILES[$varfiles];
-			if (!is_array($TFile['name']))
-			{
-				foreach ($TFile as $key => &$val)
-				{
-					$val = array($val);
-				}
-			}
-
-			$nbfile = count($TFile['name']);
-			$nbok = 0;
-			for ($i = 0; $i < $nbfile; $i++)
-			{
-				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull=$upload_dir . "/" . $TFile['name'][$i];
-				$destfile=$TFile['name'][$i];
-
-				if ($savingdocmask)
-				{
-					$destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-					$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
-				}
-
-				// dol_sanitizeFileName the file name and lowercase extension
-				$info = pathinfo($destfull);
-				$destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
-				$info = pathinfo($destfile);
-				$destfile = dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
-
-				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
-
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
-				{
-					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
-
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-					// Generate thumbs.
-					if ($generatethumbs)
-					{
-						if (image_format_supported($destfull) == 1)
-						{
-							// Create thumbs
-							// We can't use $object->addThumbs here because there is no $object known
-
-							// Used on logon for example
-							$imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-							// Create mini thumbs for image (Ratio is near 16/9)
-							// Used on menu or for setup page for example
-							$imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-						}
-					}
-
-					// Update session
-					if (empty($donotupdatesession))
-					{
-						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-						$formmail = new FormMail($db);
-						$formmail->trackid = $trackid;
-						$formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
-					}
-
-					// Update table of files
-					if ($donotupdatesession == 1)
-					{
-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
-						if ($result < 0)
-						{
-							setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
-						}
-					}
-
-					$nbok++;
-				}
-				else
-				{
-					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
-					{
-						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
-					{
-						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-					}
-					else	// Known error
-					{
-						setEventMessages($langs->trans($resupload), null, 'errors');
-					}
-				}
-			}
-			if ($nbok > 0)
-			{
-				$res = 1;
-				setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
-			}
-		}
-	} elseif ($link) {
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-		$linkObject = new Link($db);
-		$linkObject->entity = $conf->entity;
-		$linkObject->url = $link;
-		$linkObject->objecttype = GETPOST('objecttype', 'alpha');
-		$linkObject->objectid = GETPOST('objectid', 'int');
-		$linkObject->label = GETPOST('label', 'alpha');
-		$res = $linkObject->create($user);
-		$langs->load('link');
-		if ($res > 0) {
-			setEventMessages($langs->trans("LinkComplete"), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
-		}
-	}
-	else
-	{
-		$langs->load("errors");
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
-	}
-
-	return $res;
+    global $db,$user,$conf,$langs;
+
+    $res = 0;
+
+    if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+    {
+        dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+        if (dol_mkdir($upload_dir) >= 0)
+        {
+            $TFile = $_FILES[$varfiles];
+            if (!is_array($TFile['name']))
+            {
+                foreach ($TFile as $key => &$val)
+                {
+                    $val = array($val);
+                }
+            }
+
+            $nbfile = count($TFile['name']);
+            $nbok = 0;
+            for ($i = 0; $i < $nbfile; $i++)
+            {
+                // Define $destfull (path to file including filename) and $destfile (only filename)
+                $destfull=$upload_dir . "/" . $TFile['name'][$i];
+                $destfile=$TFile['name'][$i];
+
+                if ($savingdocmask)
+                {
+                    $destfull=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+                    $destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
+                }
+
+                // dol_sanitizeFileName the file name and lowercase extension
+                $info = pathinfo($destfull);
+                $destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
+                $info = pathinfo($destfile);
+                $destfile = dol_sanitizeFileName($info['filename'].'.'.strtolower($info['extension']));
+
+                $resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
+
+                if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+                {
+                    global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+
+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+                    // Generate thumbs.
+                    if ($generatethumbs)
+                    {
+                        if (image_format_supported($destfull) == 1)
+                        {
+                            // Create thumbs
+                            // We can't use $object->addThumbs here because there is no $object known
+
+                            // Used on logon for example
+                            $imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+                            // Create mini thumbs for image (Ratio is near 16/9)
+                            // Used on menu or for setup page for example
+                            $imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+                        }
+                    }
+
+                    // Update session
+                    if (empty($donotupdatesession))
+                    {
+                        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                        $formmail = new FormMail($db);
+                        $formmail->trackid = $trackid;
+                        $formmail->add_attached_files($destfull, $destfile, $TFile['type'][$i]);
+                    }
+
+                    // Update table of files
+                    if ($donotupdatesession == 1)
+                    {
+                        $result = addFileIntoDatabaseIndex($upload_dir, basename($destfile), $TFile['name'][$i], 'uploaded', 0);
+                        if ($result < 0)
+                        {
+                            setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
+                        }
+                    }
+
+                    $nbok++;
+                }
+                else
+                {
+                    $langs->load("errors");
+                    if ($resupload < 0)	// Unknown error
+                    {
+                        setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
+                    }
+                    else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+                    {
+                        setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
+                    }
+                    else	// Known error
+                    {
+                        setEventMessages($langs->trans($resupload), null, 'errors');
+                    }
+                }
+            }
+            if ($nbok > 0)
+            {
+                $res = 1;
+                setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
+            }
+        }
+    } elseif ($link) {
+        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+        $linkObject = new Link($db);
+        $linkObject->entity = $conf->entity;
+        $linkObject->url = $link;
+        $linkObject->objecttype = GETPOST('objecttype', 'alpha');
+        $linkObject->objectid = GETPOST('objectid', 'int');
+        $linkObject->label = GETPOST('label', 'alpha');
+        $res = $linkObject->create($user);
+        $langs->load('link');
+        if ($res > 0) {
+            setEventMessages($langs->trans("LinkComplete"), null, 'mesgs');
+        } else {
+            setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
+        }
+    }
+    else
+    {
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
+    }
+
+    return $res;
 }
 
 
@@ -1662,41 +1662,41 @@ 
  */
 function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=1,$trackid='')
 {
-	global $db,$user,$conf,$langs,$_FILES;
-
-	$keytodelete=$filenb;
-	$keytodelete--;
-
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-
-	if ($keytodelete >= 0)
-	{
-		$pathtodelete=$listofpaths[$keytodelete];
-		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
-		if ($result >= 0)
-		{
-			if (empty($donotdeletefile))
-			{
-				$langs->load("other");
-				setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
-			}
-			if (empty($donotupdatesession))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				$formmail->trackid = $trackid;
-				$formmail->remove_attached_files($keytodelete);
-			}
-		}
-	}
+    global $db,$user,$conf,$langs,$_FILES;
+
+    $keytodelete=$filenb;
+    $keytodelete--;
+
+    $listofpaths=array();
+    $listofnames=array();
+    $listofmimes=array();
+    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+    if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+    if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+    if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+
+    if ($keytodelete >= 0)
+    {
+        $pathtodelete=$listofpaths[$keytodelete];
+        $filetodelete=$listofnames[$keytodelete];
+        if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
+        else $result=0;
+        if ($result >= 0)
+        {
+            if (empty($donotdeletefile))
+            {
+                $langs->load("other");
+                setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+            }
+            if (empty($donotupdatesession))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+                $formmail->trackid = $trackid;
+                $formmail->remove_attached_files($keytodelete);
+            }
+        }
+    }
 }
 
 
@@ -1714,41 +1714,41 @@ 
  */
 function addFileIntoDatabaseIndex($dir, $file, $fullpathorig='', $mode='uploaded', $setsharekey=0)
 {
-	global $db, $user;
-
-	$result = 0;
-
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
-
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-	{
-		$filename = basename($file);
-		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
-		$ecmfile->filepath = $rel_dir;
-		$ecmfile->filename = $filename;
-		$ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
-		$ecmfile->fullpath_orig = $fullpathorig;
-		$ecmfile->gen_or_uploaded = $mode;
-		$ecmfile->description = '';    // indexed content
-		$ecmfile->keyword = '';        // keyword content
-		if ($setsharekey)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$ecmfile->share = getRandomPassword(true);
-		}
-
-		$result = $ecmfile->create($user);
-		if ($result < 0)
-		{
-			dol_syslog($ecmfile->error);
-		}
-	}
-
-	return $result;
+    global $db, $user;
+
+    $result = 0;
+
+    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+
+    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+    {
+        $filename = basename($file);
+        $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+        $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+        $ecmfile=new EcmFiles($db);
+        $ecmfile->filepath = $rel_dir;
+        $ecmfile->filename = $filename;
+        $ecmfile->label = md5_file(dol_osencode($dir.'/'.$file));	// MD5 of file content
+        $ecmfile->fullpath_orig = $fullpathorig;
+        $ecmfile->gen_or_uploaded = $mode;
+        $ecmfile->description = '';    // indexed content
+        $ecmfile->keyword = '';        // keyword content
+        if ($setsharekey)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+            $ecmfile->share = getRandomPassword(true);
+        }
+
+        $result = $ecmfile->create($user);
+        if ($result < 0)
+        {
+            dol_syslog($ecmfile->error);
+        }
+    }
+
+    return $result;
 }
 
 
@@ -1762,48 +1762,48 @@ 
  */
 function deleteFilesIntoDatabaseIndex($dir, $file, $mode='uploaded')
 {
-	global $conf, $db, $user;
-
-	$error = 0;
-
-	if (empty($dir))
-	{
-		dol_syslog("deleteFilesIntoDatabaseIndex: dir parameter can't be empty", LOG_ERR);
-		return -1;
-	}
-
-	$db->begin();
-
-	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
-
-	$filename = basename($file);
-	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-	if (! $error)
-	{
-		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
-		$sql.= ' WHERE entity = '.$conf->entity;
-		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
-
-		$resql = $db->query($sql);
-		if (!$resql)
-		{
-			$error++;
-			dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
-		}
-	}
-
-	// Commit or rollback
-	if ($error) {
-		$db->rollback();
-		return - 1 * $error;
-	} else {
-		$db->commit();
-		return 1;
-	}
+    global $conf, $db, $user;
+
+    $error = 0;
+
+    if (empty($dir))
+    {
+        dol_syslog("deleteFilesIntoDatabaseIndex: dir parameter can't be empty", LOG_ERR);
+        return -1;
+    }
+
+    $db->begin();
+
+    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
+
+    $filename = basename($file);
+    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+    if (! $error)
+    {
+        $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
+        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
+        if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
+        if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+
+        $resql = $db->query($sql);
+        if (!$resql)
+        {
+            $error++;
+            dol_syslog(__METHOD__ . ' ' . $db->lasterror(), LOG_ERR);
+        }
+    }
+
+    // Commit or rollback
+    if ($error) {
+        $db->rollback();
+        return - 1 * $error;
+    } else {
+        $db->commit();
+        return 1;
+    }
 }
 
 
@@ -1818,51 +1818,51 @@ 
  */
 function dol_convert_file($fileinput, $ext='png', $fileoutput='')
 {
-	global $langs;
-
-	if (class_exists('Imagick'))
-	{
-		$image=new Imagick();
-		try {
-			$ret = $image->readImage($fileinput);
-		} catch(Exception $e) {
-			dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
-			return 0;
-		}
-		if ($ret)
-		{
-			$ret = $image->setImageFormat($ext);
-			if ($ret)
-			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
-
-				$count = $image->getNumberImages();
-
-				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
-				{
-					$ret = $image->writeImages($fileoutput, true);
-				}
-				else
-				{
-					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
-				}
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
-			{
-				return -2;
-			}
-		}
-		else
-		{
-			return -1;
-		}
-	}
-	else
-	{
-		return 0;
-	}
+    global $langs;
+
+    if (class_exists('Imagick'))
+    {
+        $image=new Imagick();
+        try {
+            $ret = $image->readImage($fileinput);
+        } catch(Exception $e) {
+            dol_syslog("Failed to read image using Imagick. Try to install package 'apt-get install ghostscript'.", LOG_WARNING);
+            return 0;
+        }
+        if ($ret)
+        {
+            $ret = $image->setImageFormat($ext);
+            if ($ret)
+            {
+                if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+
+                $count = $image->getNumberImages();
+
+                if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
+                {
+                    $ret = $image->writeImages($fileoutput, true);
+                }
+                else
+                {
+                    dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
+                }
+                if ($ret) return $count;
+                else return -3;
+            }
+            else
+            {
+                return -2;
+            }
+        }
+        else
+        {
+            return -1;
+        }
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 
@@ -1876,48 +1876,48 @@ 
  */
 function dol_compress_file($inputfile, $outputfile, $mode="gz")
 {
-	$foundhandler=0;
-
-	try
-	{
-		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
-		{
-			if (defined('ODTPHP_PATHTOPCLZIP'))
-			{
-				$foundhandler=1;
-
-				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
-				$archive = new PclZip($outputfile);
-				$archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
-				//$archive->add($inputfile);
-				return 1;
-			}
-		}
-
-		if ($foundhandler)
-		{
-			$fp = fopen($outputfile, "w");
-			fwrite($fp, $compressdata);
-			fclose($fp);
-			return 1;
-		}
-		else
-		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
-			return -2;
-		}
-	}
-	catch (Exception $e)
-	{
-		global $langs, $errormsg;
-		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-		return -1;
-	}
+    $foundhandler=0;
+
+    try
+    {
+        $data = implode("", file(dol_osencode($inputfile)));
+        if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
+        elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
+        elseif ($mode == 'zip')
+        {
+            if (defined('ODTPHP_PATHTOPCLZIP'))
+            {
+                $foundhandler=1;
+
+                include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+                $archive = new PclZip($outputfile);
+                $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
+                //$archive->add($inputfile);
+                return 1;
+            }
+        }
+
+        if ($foundhandler)
+        {
+            $fp = fopen($outputfile, "w");
+            fwrite($fp, $compressdata);
+            fclose($fp);
+            return 1;
+        }
+        else
+        {
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            return -2;
+        }
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+        return -1;
+    }
 }
 
 /**
@@ -1929,54 +1929,54 @@ 
  */
 function dol_uncompress($inputfile,$outputdir)
 {
-	global $langs;
-
-	if (defined('ODTPHP_PATHTOPCLZIP'))
-	{
-		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
-		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
-		$archive = new PclZip($inputfile);
-		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
-		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
-		{
-			$ok=1; $errmsg='';
-			// Loop on each file to check result for unzipping file
-			foreach($result as $key => $val)
-			{
-				if ($val['status'] == 'path_creation_fail')
-				{
-					$langs->load("errors");
-					$ok=0;
-					$errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
-					break;
-				}
-			}
-
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
-		}
-	}
-
-	if (class_exists('ZipArchive'))
-	{
-		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
-		$zip = new ZipArchive;
-		$res = $zip->open($inputfile);
-		if ($res === true)
-		{
-			$zip->extractTo($outputdir.'/');
-			$zip->close();
-			return array();
-		}
-		else
-		{
-			return array('error'=>'ErrUnzipFails');
-		}
-	}
-
-	return array('error'=>'ErrNoZipEngine');
+    global $langs;
+
+    if (defined('ODTPHP_PATHTOPCLZIP'))
+    {
+        dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+        include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+        $archive = new PclZip($inputfile);
+        $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
+        //var_dump($result);
+        if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
+        else
+        {
+            $ok=1; $errmsg='';
+            // Loop on each file to check result for unzipping file
+            foreach($result as $key => $val)
+            {
+                if ($val['status'] == 'path_creation_fail')
+                {
+                    $langs->load("errors");
+                    $ok=0;
+                    $errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']);
+                    break;
+                }
+            }
+
+            if ($ok) return array();
+            else return array('error'=>$errmsg);
+        }
+    }
+
+    if (class_exists('ZipArchive'))
+    {
+        dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
+        $zip = new ZipArchive;
+        $res = $zip->open($inputfile);
+        if ($res === true)
+        {
+            $zip->extractTo($outputdir.'/');
+            $zip->close();
+            return array();
+        }
+        else
+        {
+            return array('error'=>'ErrUnzipFails');
+        }
+    }
+
+    return array('error'=>'ErrNoZipEngine');
 }
 
 
@@ -1990,25 +1990,25 @@ 
  */
 function dol_compress_dir($inputdir, $outputfile, $mode="zip")
 {
-	$foundhandler=0;
-
-	dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
-
-	if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
-	{
-		global $langs, $errormsg;
-		$langs->load("errors");
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
-		return -3;
-	}
-
-	try
-	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
-		elseif ($mode == 'zip')
-		{
-			/*if (defined('ODTPHP_PATHTOPCLZIP'))
+    $foundhandler=0;
+
+    dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
+
+    if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        return -3;
+    }
+
+    try
+    {
+        if ($mode == 'gz')     { $foundhandler=0; }
+        elseif ($mode == 'bz') { $foundhandler=0; }
+        elseif ($mode == 'zip')
+        {
+            /*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
                 $foundhandler=0;        // TODO implement this
 
@@ -2019,61 +2019,61 @@ 
                 return 1;
             }
             else*/
-			if (class_exists('ZipArchive'))
-			{
-				$foundhandler=1;
-
-				// Initialize archive object
-				$zip = new ZipArchive();
-				$result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-				// Create recursive directory iterator
-				/** @var SplFileInfo[] $files */
-				$files = new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator($inputdir),
-					RecursiveIteratorIterator::LEAVES_ONLY
-					);
-
-				foreach ($files as $name => $file)
-				{
-					// Skip directories (they would be added automatically)
-					if (!$file->isDir())
-					{
-						// Get real and relative path for current file
-						$filePath = $file->getRealPath();
-						$relativePath = substr($filePath, strlen($inputdir) + 1);
-
-						// Add current file to archive
-						$zip->addFile($filePath, $relativePath);
-					}
-				}
-
-				// Zip archive will be created only after closing object
-				$zip->close();
-
-				return 1;
-			}
-		}
-
-		if (! $foundhandler)
-		{
-			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
-			return -2;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	catch (Exception $e)
-	{
-		global $langs, $errormsg;
-		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
-		dol_syslog($e->getMessage(), LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
-		return -1;
-	}
+            if (class_exists('ZipArchive'))
+            {
+                $foundhandler=1;
+
+                // Initialize archive object
+                $zip = new ZipArchive();
+                $result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+
+                // Create recursive directory iterator
+                /** @var SplFileInfo[] $files */
+                $files = new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($inputdir),
+                    RecursiveIteratorIterator::LEAVES_ONLY
+                    );
+
+                foreach ($files as $name => $file)
+                {
+                    // Skip directories (they would be added automatically)
+                    if (!$file->isDir())
+                    {
+                        // Get real and relative path for current file
+                        $filePath = $file->getRealPath();
+                        $relativePath = substr($filePath, strlen($inputdir) + 1);
+
+                        // Add current file to archive
+                        $zip->addFile($filePath, $relativePath);
+                    }
+                }
+
+                // Zip archive will be created only after closing object
+                $zip->close();
+
+                return 1;
+            }
+        }
+
+        if (! $foundhandler)
+        {
+            dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
+            return -2;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+        dol_syslog($e->getMessage(), LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir",$outputfile);
+        return -1;
+    }
 }
 
 
@@ -2090,8 +2090,8 @@ 
  */
 function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta|_preview.*\.png)$','^\.'),$nohook=false,$mode='')
 {
-	$tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
-	return $tmparray[0];
+    $tmparray=dol_dir_list($dir,'files',0,$regexfilter,$excludefilter,'date',SORT_DESC,$mode,$nohook);
+    return $tmparray[0];
 }
 
 /**
@@ -2108,770 +2108,770 @@ 
  */
 function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read')
 {
-	global $conf, $db, $user;
-	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
-
-	if (! is_object($fuser)) $fuser=$user;
-
-	if (empty($modulepart)) return 'ErrorBadParameter';
-	if (empty($entity))
-	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
-	}
-	// Fix modulepart
-	if ($modulepart == 'users') $modulepart='user';
-
-	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
-	// We define $accessallowed and $sqlprotectagainstexternals
-	$accessallowed=0;
-	$sqlprotectagainstexternals='';
-	$ret=array();
-
-	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
-
-	$relative_original_file = $original_file;
-
-	// Define possible keys to use for permission check
-	$lire='lire'; $read='read'; $download='download';
-	if ($mode == 'write')
-	{
-		$lire='creer'; $read='write'; $download='upload';
-	}
-
-	// Wrapping for miscellaneous medias files
-	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
-	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		$accessallowed=1;
-		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
-	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
-	{
-		$accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
-		$original_file=$dolibarr_main_data_root.'/'.$original_file;
-	}
-	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
-	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
-	{
-		// Dir for custom dirs
-		$tmp=explode(',', $dolibarr_main_document_root_alt);
-		$dirins = $tmp[0];
-
-		$accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
-		$original_file=$dirins.'/'.$original_file;
-	}
-	// Wrapping for some images
-	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->mycompany->dir_output.'/'.$original_file;
-	}
-	// Wrapping for users photos
-	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->user->dir_output.'/'.$original_file;
-	}
-	// Wrapping for members photos
-	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu factures
-	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu propal
-	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu commande
-	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
-	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu intervention
-	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
-	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu conat
-	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier proposal
-	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
-	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
-		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier order
-	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
-	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
-	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
-	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
-		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats propales
-	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
-		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les images des stats commandes
-	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
-	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats factures
-	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
-	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
-	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
-		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
-	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
-		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
-	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
-		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
-	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
-		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
-	}
-	// Wrapping for taxes
-	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
-	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
-		$original_file=$conf->tax->dir_output.'/'.$original_file;
-	}
-	// Wrapping for events
-	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
-	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
-	}
-	// Wrapping for categories
-	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
-	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
-		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les prelevements
-	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
-	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
-		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les graph energie
-	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->stock->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph fournisseurs
-	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph des produits
-	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les code barre
-	elseif ($modulepart == 'barcode')
-	{
-		$accessallowed=1;
-		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
-		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
-		$original_file='';
-	}
-	// Wrapping pour les icones de background des mailings
-	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour le scanner
-	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-	// Wrapping pour les images fckeditor
-	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for users
-	else if ($modulepart == 'user' && !empty($conf->user->dir_output))
-	{
-		$canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-		if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
-		if ($canreaduser || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->user->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for third parties
-	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
-	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
-	}
-
-	// Wrapping for contact
-	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
-	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire})
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
-	}
-
-	// Wrapping for invoices
-	else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping for mass actions
-	else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
-	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
-	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
-	{
-		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-
-	// Wrapping for interventions
-	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
-	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les deplacements et notes de frais
-	else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
-	{
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->deplacement->dir_output.'/'.$original_file;
-		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les propales
-	else if (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les commandes
-	else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
-	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les projets
-	else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
-	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
-	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->projet->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-
-	// Wrapping pour les commandes fournisseurs
-	else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les factures fournisseurs
-	else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les rapport de paiements
-	else if ($modulepart == 'supplier_payment')
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les rapport de paiements
-	else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
-	}
-
-	// Wrapping for accounting exports
-	else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
-	{
-		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->accounting->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les expedition
-	else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
-	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->expedition->dir_output."/sending/".$original_file;
-	}
-	// Wrapping pour les bons de livraison
-	else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
-	{
-		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->expedition->dir_output."/receipt/".$original_file;
-	}
-
-	// Wrapping pour les actions
-	else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
-	{
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->agenda->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les actions
-	else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
-	{
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file = $conf->agenda->dir_temp."/".$original_file;
-	}
-
-	// Wrapping pour les produits et services
-	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
-	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les lots produits
-	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
-	{
-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les contrats
-	else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->contrat->dir_output.'/'.$original_file;
-		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
-	}
-
-	// Wrapping pour les dons
-	else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
-	{
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->don->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les dons
-	else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
-	{
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->resource->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les remises de cheques
-	else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
-	{
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-
-		$original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
-	}
-
-	// Wrapping for bank
-	else if ($modulepart == 'bank' && !empty($conf->bank->dir_output))
-	{
-		if ($fuser->rights->banque->{$lire})
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->bank->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for export module
-	else if ($modulepart == 'export' && !empty($conf->export->dir_temp))
-	{
-		// Aucun test necessaire car on force le rep de download sur
-		// le rep export qui est propre a l'utilisateur
-		$accessallowed=1;
-		$original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// Wrapping for import module
-	else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->import->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour l'editeur wysiwyg
-	else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
-	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for backups
-	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
-	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for upload file test
-	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
-	{
-		if ($fuser->admin) $accessallowed=1;
-		$original_file=$conf->admin->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour BitTorrent
-	else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
-	{
-		$accessallowed=1;
-		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
-		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
-	}
-
-	// Wrapping pour Foundation module
-	else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
-	{
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
-		{
-			$accessallowed=1;
-		}
-		$original_file=$conf->adherent->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for Scanner
-	else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
-	{
-		$accessallowed=1;
-		$original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// GENERIC Wrapping
-	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
-	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
-	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
-	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
-	else
-	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
-
-		// Define $accessallowed
-		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
-			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
-			{
-				$accessallowed=1;
-			}
-			$original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
-		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
-			{
-				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
-				exit;
-			}
-
-			$perm=GETPOST('perm');
-			$subperm=GETPOST('subperm');
-			if ($perm || $subperm)
-			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
-			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
-				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-		}
-
-		// For modules who wants to manage different levels of permissions for documents
-		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (! empty($conf->global->$subPermCategoryConstName))
-		{
-			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
-			{
-				$accessallowed=1;
-			}
-		}
-
-		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
-		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
-		{
-			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
-		}
-	}
-
-	$ret = array(
-		'accessallowed' => $accessallowed,
-		'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,
-		'original_file'=>$original_file
-	);
-
-	return $ret;
+    global $conf, $db, $user;
+    global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
+
+    if (! is_object($fuser)) $fuser=$user;
+
+    if (empty($modulepart)) return 'ErrorBadParameter';
+    if (empty($entity))
+    {
+        if (empty($conf->multicompany->enabled)) $entity=1;
+        else $entity=0;
+    }
+    // Fix modulepart
+    if ($modulepart == 'users') $modulepart='user';
+
+    dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
+    // We define $accessallowed and $sqlprotectagainstexternals
+    $accessallowed=0;
+    $sqlprotectagainstexternals='';
+    $ret=array();
+
+    // Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
+    if (empty($refname)) $refname=basename(dirname($original_file)."/");
+
+    $relative_original_file = $original_file;
+
+    // Define possible keys to use for permission check
+    $lire='lire'; $read='read'; $download='download';
+    if ($mode == 'write')
+    {
+        $lire='creer'; $read='write'; $download='upload';
+    }
+
+    // Wrapping for miscellaneous medias files
+    if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
+    {
+        if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        $accessallowed=1;
+        $original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
+    }
+    // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+    elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
+    {
+        $accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
+        $original_file=$dolibarr_main_data_root.'/'.$original_file;
+    }
+    // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+    elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
+    {
+        // Dir for custom dirs
+        $tmp=explode(',', $dolibarr_main_document_root_alt);
+        $dirins = $tmp[0];
+
+        $accessallowed=($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
+        $original_file=$dirins.'/'.$original_file;
+    }
+    // Wrapping for some images
+    elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->mycompany->dir_output.'/'.$original_file;
+    }
+    // Wrapping for users photos
+    elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->user->dir_output.'/'.$original_file;
+    }
+    // Wrapping for members photos
+    elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->adherent->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu factures
+    elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
+    {
+        if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->facture->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu propal
+    elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
+    {
+        if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+        $original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les apercu commande
+    elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
+    {
+        if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->commande->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu intervention
+    elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
+    {
+        if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+        $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu conat
+    elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
+    {
+        if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+        $original_file=$conf->contrat->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier proposal
+    elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
+    {
+        if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+        $original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier order
+    elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier invoice
+    elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les apercu supplier invoice
+    elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
+    {
+        if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+        $original_file=$conf->expensereport->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats propales
+    elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
+    {
+        if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+        $original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les images des stats commandes
+    elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
+    {
+        if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->commande->dir_temp.'/'.$original_file;
+    }
+    elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats factures
+    elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
+    {
+        if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->facture->dir_temp.'/'.$original_file;
+    }
+    elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+        $original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats expeditions
+    elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
+    {
+        if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+        $original_file=$conf->expedition->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats expeditions
+    elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
+    {
+        if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+        $original_file=$conf->deplacement->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats expeditions
+    elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
+    {
+        if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+        $original_file=$conf->adherent->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les images des stats produits
+    elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
+    {
+        if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+        $original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
+    }
+    // Wrapping for taxes
+    elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
+    {
+        if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+        $original_file=$conf->tax->dir_output.'/'.$original_file;
+    }
+    // Wrapping for events
+    elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
+    {
+        if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+        $original_file=$conf->agenda->dir_output.'/'.$original_file;
+    }
+    // Wrapping for categories
+    elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
+    {
+        if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+        $original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les prelevements
+    elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
+    {
+        if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+        $original_file=$conf->prelevement->dir_output.'/'.$original_file;
+    }
+    // Wrapping pour les graph energie
+    elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->stock->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les graph fournisseurs
+    elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->fournisseur->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour les graph des produits
+    elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->product->multidir_temp[$entity].'/'.$original_file;
+    }
+    // Wrapping pour les code barre
+    elseif ($modulepart == 'barcode')
+    {
+        $accessallowed=1;
+        // If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
+        //$original_file=$conf->barcode->dir_temp.'/'.$original_file;
+        $original_file='';
+    }
+    // Wrapping pour les icones de background des mailings
+    elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->mailing->dir_temp.'/'.$original_file;
+    }
+    // Wrapping pour le scanner
+    elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+    }
+    // Wrapping pour les images fckeditor
+    elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for users
+    else if ($modulepart == 'user' && !empty($conf->user->dir_output))
+    {
+        $canreaduser=(! empty($fuser->admin) || $fuser->rights->user->user->{$lire});
+        if ($fuser->id == (int) $refname) { $canreaduser=1; } // A user can always read its own card
+        if ($canreaduser || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->user->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for third parties
+    else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
+    {
+        if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->societe->multidir_output[$entity].'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
+    }
+
+    // Wrapping for contact
+    else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
+    {
+        if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if ($fuser->rights->societe->{$lire})
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->societe->multidir_output[$entity].'/contact/'.$original_file;
+    }
+
+    // Wrapping for invoices
+    else if (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->facture->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+    // Wrapping for mass actions
+    else if ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
+    {
+        if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_orders')
+    {
+        if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_invoices')
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_expensereport')
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_interventions')
+    {
+        if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+    {
+        if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_supplier_order')
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_supplier_invoice')
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+    else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+    {
+        if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
+
+    // Wrapping for interventions
+    else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
+    {
+        if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les deplacements et notes de frais
+    else if ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
+    {
+        if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->deplacement->dir_output.'/'.$original_file;
+        //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+    // Wrapping pour les propales
+    else if (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
+    {
+        if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les commandes
+    else if (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
+    {
+        if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->commande->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les projets
+    else if ($modulepart == 'project' && !empty($conf->projet->dir_output))
+    {
+        if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->projet->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
+    }
+    else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+    {
+        if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->projet->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
+    }
+
+    // Wrapping pour les commandes fournisseurs
+    else if (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
+    {
+        if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les factures fournisseurs
+    else if (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+    // Wrapping pour les rapport de paiements
+    else if ($modulepart == 'supplier_payment')
+    {
+        if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->fournisseur->payment->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+    }
+
+    // Wrapping pour les rapport de paiements
+    else if ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
+    {
+        if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+        else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+    }
+
+    // Wrapping for accounting exports
+    else if ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
+    {
+        if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->accounting->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les expedition
+    else if ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
+    {
+        if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expedition->dir_output."/sending/".$original_file;
+    }
+    // Wrapping pour les bons de livraison
+    else if ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
+    {
+        if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expedition->dir_output."/receipt/".$original_file;
+    }
+
+    // Wrapping pour les actions
+    else if ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
+    {
+        if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->agenda->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les actions
+    else if ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
+    {
+        if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file = $conf->agenda->dir_temp."/".$original_file;
+    }
+
+    // Wrapping pour les produits et services
+    else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
+    {
+        if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+        elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+    }
+
+    // Wrapping pour les lots produits
+    else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
+    {
+        if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+        if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+    }
+
+    // Wrapping pour les contrats
+    else if ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
+    {
+        if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->contrat->dir_output.'/'.$original_file;
+        $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
+    }
+
+    // Wrapping pour les dons
+    else if ($modulepart == 'donation' && !empty($conf->don->dir_output))
+    {
+        if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->don->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les dons
+    else if ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
+    {
+        if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->resource->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping pour les remises de cheques
+    else if ($modulepart == 'remisecheque' && !empty($conf->banque->dir_output))
+    {
+        if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+
+        $original_file=$conf->bank->dir_output.'/checkdeposits/'.$original_file;		// original_file should contains relative path so include the get_exdir result
+    }
+
+    // Wrapping for bank
+    else if ($modulepart == 'bank' && !empty($conf->bank->dir_output))
+    {
+        if ($fuser->rights->banque->{$lire})
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->bank->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for export module
+    else if ($modulepart == 'export' && !empty($conf->export->dir_temp))
+    {
+        // Aucun test necessaire car on force le rep de download sur
+        // le rep export qui est propre a l'utilisateur
+        $accessallowed=1;
+        $original_file=$conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
+    }
+
+    // Wrapping for import module
+    else if ($modulepart == 'import' && !empty($conf->import->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->import->dir_temp.'/'.$original_file;
+    }
+
+    // Wrapping pour l'editeur wysiwyg
+    else if ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
+    {
+        $accessallowed=1;
+        $original_file=$conf->fckeditor->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for backups
+    else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
+    {
+        if ($fuser->admin) $accessallowed=1;
+        $original_file=$conf->admin->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for upload file test
+    else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
+    {
+        if ($fuser->admin) $accessallowed=1;
+        $original_file=$conf->admin->dir_temp.'/'.$original_file;
+    }
+
+    // Wrapping pour BitTorrent
+    else if ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
+    {
+        $accessallowed=1;
+        $dir='files';
+        if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+        $original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
+    }
+
+    // Wrapping pour Foundation module
+    else if ($modulepart == 'member' && !empty($conf->adherent->dir_output))
+    {
+        if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i',$original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->adherent->dir_output.'/'.$original_file;
+    }
+
+    // Wrapping for Scanner
+    else if ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
+    {
+        $accessallowed=1;
+        $original_file=$conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
+    }
+
+    // GENERIC Wrapping
+    // If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
+    // If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
+    // If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
+    // If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
+    else
+    {
+        if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
+        if ($fuser->admin) $accessallowed=1;    // If user is admin
+
+        // Define $accessallowed
+        if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+            $original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
+        }
+        else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+            $original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
+        }
+        else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+            $original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
+        }
+        else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+        {
+            if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+            if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
+            {
+                $accessallowed=1;
+            }
+            $original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+        }
+        else
+        {
+            if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+            {
+                dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+                exit;
+            }
+
+            $perm=GETPOST('perm');
+            $subperm=GETPOST('subperm');
+            if ($perm || $subperm)
+            {
+                if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+                $original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+            }
+            else
+            {
+                if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+                $original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+            }
+        }
+
+        // For modules who wants to manage different levels of permissions for documents
+        $subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
+        if (! empty($conf->global->$subPermCategoryConstName))
+        {
+            $subPermCategory = $conf->global->$subPermCategoryConstName;
+            if (! empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
+            {
+                $accessallowed=1;
+            }
+        }
+
+        // Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
+        $sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
+        if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+        {
+            // Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+            eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
+        }
+    }
+
+    $ret = array(
+        'accessallowed' => $accessallowed,
+        'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,
+        'original_file'=>$original_file
+    );
+
+    return $ret;
 }
 
 /**
@@ -2884,10 +2884,10 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
-	$cachefile = $directory . $filename;
-	file_put_contents($cachefile, serialize($object), LOCK_EX);
-	@chmod($cachefile, 0644);
+    if (! dol_is_dir($directory)) dol_mkdir($directory);
+    $cachefile = $directory . $filename;
+    file_put_contents($cachefile, serialize($object), LOCK_EX);
+    @chmod($cachefile, 0644);
 }
 
 /**
@@ -2900,10 +2900,10 @@ 
  */
 function dol_cache_refresh($directory, $filename, $cachetime)
 {
-	$now = dol_now();
-	$cachefile = $directory . $filename;
-	$refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
-	return $refresh;
+    $now = dol_now();
+    $cachefile = $directory . $filename;
+    $refresh = !file_exists($cachefile) || ($now-$cachetime) > dol_filemtime($cachefile);
+    return $refresh;
 }
 
 /**
@@ -2915,9 +2915,9 @@ 
  */
 function dol_readcachefile($directory, $filename)
 {
-	$cachefile = $directory . $filename;
-	$object = unserialize(file_get_contents($cachefile));
-	return $object;
+    $cachefile = $directory . $filename;
+    $object = unserialize(file_get_contents($cachefile));
+    return $object;
 }
 
 
@@ -2934,43 +2934,43 @@ 
  */
 function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathref = '', &$checksumconcat = array())
 {
-	global $conffile;
-
-	$exclude = 'install';
-
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
-	{
-		$filename = $path.$file['name'];
-		$file_list['insignature'][] = $filename;
-		$expectedmd5 = (string) $file;
-
-		//if (preg_match('#'.$exclude.'#', $filename)) continue;
-
-		if (!file_exists($pathref.'/'.$filename))
-		{
-			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
-		}
-		else
-		{
-			$md5_local = md5_file($pathref.'/'.$filename);
-
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
-			{
-				$checksumconcat[] = $expectedmd5;
-			}
-			else
-			{
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
-				$checksumconcat[] = $md5_local;
-			}
-		}
-	}
-
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
-	{
-		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
-	}
-
-	return $file_list;
+    global $conffile;
+
+    $exclude = 'install';
+
+    foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
+    {
+        $filename = $path.$file['name'];
+        $file_list['insignature'][] = $filename;
+        $expectedmd5 = (string) $file;
+
+        //if (preg_match('#'.$exclude.'#', $filename)) continue;
+
+        if (!file_exists($pathref.'/'.$filename))
+        {
+            $file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
+        }
+        else
+        {
+            $md5_local = md5_file($pathref.'/'.$filename);
+
+            if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
+            {
+                $checksumconcat[] = $expectedmd5;
+            }
+            else
+            {
+                if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+                $checksumconcat[] = $md5_local;
+            }
+        }
+    }
+
+    foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
+    {
+        getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
+    }
+
+    return $file_list;
 }
 

Spacing +595 added lines, -595 removed lines

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

Braces +512 added lines, -266 removed lines

@@ -98,16 +98,21 @@ 
 	// $hookmanager->resArray may contain array stacked by other modules
 	if (empty($reshook))
 	{
-		if (! is_dir($newpath)) return array();
+		if (! is_dir($newpath)) {
+		    return array();
+		}
 
 		if ($dir = opendir($newpath))
 		{
 			$filedate='';
 			$filesize='';
 
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
+			while (false !== ($file = readdir($dir))) {
+			    // $file is always a basename (into directory $newpath)
 			{
-				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure data is stored in utf8 in memory
+				if (! utf8_check($file)) $file=utf8_encode($file);
+			}
+			// To be sure data is stored in utf8 in memory
 				$fullpathfile=($newpath?$newpath.'/':'').$file;
 
 				$qualified=1;
@@ -117,8 +122,9 @@ 
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray=array_merge($excludefilterarray,$excludefilter);
+				} else if ($excludefilter) {
+				    $excludefilterarray[]=$excludefilter;
 				}
-				else if ($excludefilter) $excludefilterarray[]=$excludefilter;
 				// Check if file is qualified
 				foreach($excludefilterarray as $filt)
 				{
@@ -137,12 +143,18 @@ 
 						// Add entry into file_list array
 						if (($types=="directories") || ($types=="all"))
 						{
-							if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+							if ($loaddate || $sortcriteria == 'date') {
+							    $filedate=dol_filemtime($path."/".$file);
+							}
+							if ($loadsize || $sortcriteria == 'size') {
+							    $filesize=dol_filesize($path."/".$file);
+							}
 
-							if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into all $path, only into $file part
+							if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+							    // We do not search key $filter into all $path, only into $file part
 							{
 								preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+							}
 								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
@@ -166,16 +178,21 @@ 
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file, $donotfollowsymlinks));
 							}
 						}
-					}
-					else if (! $isdir && (($types == "files") || ($types == "all")))
+					} else if (! $isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate=dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize=dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') {
+						    $filedate=dol_filemtime($path."/".$file);
+						}
+						if ($loadsize || $sortcriteria == 'size') {
+						    $filesize=dol_filesize($path."/".$file);
+						}
 
-						if (! $filter || preg_match('/'.$filter.'/i',$file))	// We do not search key $filter into $path, only into $file
+						if (! $filter || preg_match('/'.$filter.'/i',$file)) {
+						    // We do not search key $filter into $path, only into $file
 						{
 							preg_match('/([^\/]+)\/[^\/]+$/',$path.'/'.$file,$reg);
+						}
 							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
@@ -202,12 +219,16 @@ 
 					$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 				}
 				// Sort the data
-				if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+				if ($sortorder) {
+				    array_multisort($myarray, $sortorder, $file_list);
+				}
 			}
 		}
 	}
 
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {
+	    $file_list = array_merge($file_list, $hookmanager->resArray);
+	}
 
 	return $file_list;
 }
@@ -232,7 +253,9 @@ 
 
 	$sql =" SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
 	$sql.=" acl, position, share";
-	if ($mode) $sql.=", description";
+	if ($mode) {
+	    $sql.=", description";
+	}
 	$sql.=" FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql.=" WHERE filepath = '".$db->escape($path)."'";
 	$sql.=" AND entity = ".$conf->entity;
@@ -280,12 +303,13 @@ 
 				$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
 			}
 			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+			if ($sortorder) {
+			    array_multisort($myarray, $sortorder, $file_list);
+			}
 		}
 
 		return $file_list;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 		return array();
@@ -313,8 +337,11 @@ 
 		global $object;
 		if (! empty($object->id))
 		{
-			if (! empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			if (! empty($conf->product->enabled)) {
+			    $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			} else {
+			    $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+			}
 
 			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dirold);
 			$relativedirold = preg_replace('/^[\\/]/','',$relativedirold);
@@ -347,16 +374,21 @@ 
 			}
 		}
 
-		if (! $found)    // This happen in transition toward version 6, or if files were added manually into os dir.
+		if (! $found) {
+		    // This happen in transition toward version 6, or if files were added manually into os dir.
 		{
-			$filearray[$key]['position']='999999';     // File not indexed are at end. So if we add a file, it will not replace an existing position
+			$filearray[$key]['position']='999999';
+		}
+		// File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover']=0;
 			$filearray[$key]['acl']='';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filearray[$key]['fullname']);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+			    // If not a tmp file
 			{
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
+			}
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile=new EcmFiles($db);
 
@@ -377,13 +409,11 @@ 
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
+				} else
 				{
 					$filearray[$key]['rowid']=$result;
 				}
-			}
-			else
+			} else
 			{
 				$filearray[$key]['rowid']=0;     // Should not happened
 			}
@@ -408,22 +438,27 @@ 
 
 	$sortorder=strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; }
-	else { $retup=1; $retdown=-1; }
+	if ($sortorder == 'ASC') { $retup=-1; $retdown=1; } else { $retup=1; $retdown=-1; }
 
 	if ($sortfield == 'name')
 	{
-		if ($a->name == $b->name) return 0;
+		if ($a->name == $b->name) {
+		    return 0;
+		}
 		return ($a->name < $b->name) ? $retup : $retdown;
 	}
 	if ($sortfield == 'date')
 	{
-		if ($a->date == $b->date) return 0;
+		if ($a->date == $b->date) {
+		    return 0;
+		}
 		return ($a->date < $b->date) ? $retup : $retdown;
 	}
 	if ($sortfield == 'size')
 	{
-		if ($a->size == $b->size) return 0;
+		if ($a->size == $b->size) {
+		    return 0;
+		}
 		return ($a->size < $b->size) ? $retup : $retdown;
 	}
 }
@@ -438,9 +473,12 @@ 
 function dol_is_dir($folder)
 {
 	$newfolder=dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
-}
+	if (is_dir($newfolder)) {
+	    return true;
+	} else {
+	    return false;
+	}
+	}
 
 /**
  * Return if path is a file
@@ -477,7 +515,9 @@ 
 	$tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
 	foreach($tmpprot as $prot)
 	{
-		if (preg_match('/^'.$prot.':/i',$url)) return true;
+		if (preg_match('/^'.$prot.':/i',$url)) {
+		    return true;
+		}
 	}
 	return false;
 }
@@ -499,15 +539,21 @@ 
 		{
 			$name_array[] = $name;
 		}
-		foreach($name_array as $temp) $folder_content .= $temp;
+		foreach($name_array as $temp) {
+		    $folder_content .= $temp;
+		}
 
 		closedir($handle);
 
-		if ($folder_content == "...") return true;
-		else return false;
+		if ($folder_content == "...") {
+		    return true;
+		} else {
+		    return false;
+		}
+	} else {
+		return true;
 	}
-	else
-	return true; // Dir does not exists
+	// Dir does not exists
 }
 
 /**
@@ -530,11 +576,12 @@ 
 		{
 			$line=fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (! $line === false) $nb++;
+			if (! $line === false) {
+			    $nb++;
+			}
 		}
 		fclose($fp);
-	}
-	else
+	} else
 	{
 		$nb=-1;
 	}
@@ -584,11 +631,17 @@ 
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile=$srcfile;
+	if (empty($srcfile)) {
+	    return -1;
+	}
+	if (empty($destfile)) {
+	    $destfile=$srcfile;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+	if (($destfile != $srcfile) && $destexists) {
+	    return 0;
+	}
 
 	$tmpdestfile=$destfile.'.tmp';
 
@@ -625,10 +678,14 @@ 
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+	    $newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+	    // This should no happen
 	{
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -669,10 +726,14 @@ 
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+	    return -1;
+	}
 
 	$destexists=dol_is_file($destfile);
-	if (! $overwriteifexists && $destexists) return 0;
+	if (! $overwriteifexists && $destexists) {
+	    return 0;
+	}
 
 	$newpathofsrcfile=dol_osencode($srcfile);
 	$newpathofdestfile=dol_osencode($destfile);
@@ -696,10 +757,14 @@ 
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
+	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+	    $newmask=$conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {
+	    // This should no happen
 	{
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
+	}
 		$newmask='0664';
 	}
 
@@ -727,7 +792,9 @@ 
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+	    return -1;
+	}
 
 	$destexists=dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
@@ -737,7 +804,9 @@ 
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec=octdec($newmask);
-		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+		    $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+		}
 		$dirmaskdec |= octdec('0200');  // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
@@ -757,8 +826,7 @@ 
 				{
 					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 					$tmpresult=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
-				}
-				else
+				} else
 				{
 					$newfile = $file;
 					// Replace destination filename with a new one
@@ -775,17 +843,17 @@ 
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
+				} else
 				{
 					$result=$tmpresult;
 				}
-				if ($result < 0) break;
+				if ($result < 0) {
+				    break;
+				}
 			}
 		}
 		closedir($dir_handle);
-	}
-	else
+	} else
 	{
 		// Source directory does not exists
 		$result = -2;
@@ -852,8 +920,9 @@ 
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
+			} else {
+			    dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -862,9 +931,11 @@ 
 			// Rename entry into ecm database
 			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $srcfile);
 			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $destfile);
-			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
+			if (! preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {
+			    // If not a tmp file
 			{
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
+			}
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
 				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);
 
@@ -873,16 +944,20 @@ 
 
 				$ecmfiletarget=new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
+				if ($resultecmtarget > 0) {
+				    // An entry for target name already exists for target, we delete it, a new one will be created.
 				{
 					$ecmfiletarget->delete($user);
 				}
+				}
 
 				$ecmfile=new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
+				if ($resultecm > 0) {
+				    // If an entry was found for src file, we use it to move entry
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -890,10 +965,11 @@ 
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0) {
+				    // If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
+				}
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 					$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -910,18 +986,22 @@ 
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result=true;
-				else $result = false;
+				if ($resultecm > 0) {
+				    $result=true;
+				} else {
+				    $result = false;
+				}
 			}
 		}
 
-		if (empty($newmask)) $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		if (empty($newmask)) {
+		    $newmask=empty($conf->global->MAIN_UMASK)?'0755':$conf->global->MAIN_UMASK;
+		}
 		$newmaskdec=octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
@@ -965,9 +1045,11 @@ 
 		}
 		$antivir=new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
+		if ($result < 0) {
+		    // If virus or error, we stop here
 		{
 			$reterrors=$antivir->errors;
+		}
 			return $reterrors;
 		}
 	}
@@ -1075,13 +1157,17 @@ 
 		}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
+	if ($reshook < 0) {
+	    // At least one blocking error returned by one hook
 	{
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks';	// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
-		return $errmsg;
 	}
-	elseif (empty($reshook))
+		if (empty($errmsg)) {
+		    $errmsg = 'ErrorReturnedBySomeHooks';
+		}
+		// Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		return $errmsg;
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded=dol_osencode($src_file);
@@ -1108,11 +1194,12 @@ 
 		$return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
 		if ($return)
 		{
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			}
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1;	// Success
-		}
-		else
+		} else
 		{
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3;	// Unknown error
@@ -1167,12 +1254,13 @@ 
 		$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+	if (empty($nohook) && $reshook != 0) {
+	    // reshook = 0 to do standard actions, 1 = ok, -1 = ko
 	{
 		if ($reshook < 0) return false;
-		return true;
 	}
-	else
+		return true;
+	} else
 	{
 		$error=0;
 
@@ -1188,21 +1276,28 @@ 
 			{
 				foreach ($listofdir as $filename)
 				{
-					if ($nophperrors) $ok=@unlink($filename);
-					else $ok=unlink($filename);
+					if ($nophperrors) {
+					    $ok=@unlink($filename);
+					} else {
+					    $ok=unlink($filename);
+					}
 					if ($ok)
 					{
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
 						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $filename);
-						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
+						if (! preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {
+						    // If not a tmp file
 						{
 							$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
+						}
 
-							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
+							if (is_object($db) && $indexdatabase) {
+							    // $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
 							{
 								dol_syslog("Try to remove also entries in database for full relative path = ".$rel_filetodelete, LOG_DEBUG);
+							}
 								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfile=new EcmFiles($db);
 								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
@@ -1216,21 +1311,28 @@ 
 								}
 							}
 						}
+					} else {
+					    dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 					// TODO Failure to remove can be because file was already removed or because of permission
 					// If error because it does not exists, we should return true, and we should return false if this is a permission problem
 				}
+			} else {
+			    dol_syslog("No files to delete found", LOG_DEBUG);
 			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$ok=false;
-			if ($nophperrors) $ok=@unlink($file_osencoded);
-			else $ok=unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			if ($nophperrors) {
+			    $ok=@unlink($file_osencoded);
+			} else {
+			    $ok=unlink($file_osencoded);
+			}
+			if ($ok) {
+			    dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+			} else {
+			    dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			}
 		}
 
 		return $ok;
@@ -1280,19 +1382,23 @@ 
 		{
 			while (false !== ($item = readdir($handle)))
 			{
-				if (! utf8_check($item)) $item=utf8_encode($item);  // should be useless
+				if (! utf8_check($item)) {
+				    $item=utf8_encode($item);
+				}
+				// should be useless
 
 				if ($item != "." && $item != "..")
 				{
 					if (is_dir(dol_osencode("$dir/$item")) && ! is_link(dol_osencode("$dir/$item")))
 					{
 						$count=dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
+					} else
 					{
 						$result=dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
-						if ($result) $countdeleted++;
+						if ($result) {
+						    $countdeleted++;
+						}
 						//else print 'Error on '.$item."\n";
 					}
 				}
@@ -1303,7 +1409,9 @@ 
 			{
 				$result=dol_delete_dir($dir, $nophperrors);
 				$count++;
-				if ($result) $countdeleted++;
+				if ($result) {
+				    $countdeleted++;
+				}
 				//else print 'Error on '.$dir."\n";
 			}
 		}
@@ -1328,15 +1436,25 @@ 
 	// Define parent dir of elements
 	$element = $object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+	    $dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($object->element == 'invoice_supplier') {
+	    $dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($object->element == 'project') {
+	    $dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+	    $dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+	    $dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+	    $dir = $conf->ficheinter->dir_output;
+	} else {
+	    $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+	if (empty($dir)) {
+	    return 'ErrorObjectNoSupportedByFunction';
+	}
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
@@ -1369,8 +1487,7 @@ 
 			$object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		$multiple = $filepreviewold . ".";
 		for ($i = 0; $i < 20; $i++)
@@ -1404,18 +1521,29 @@ 
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0;	// By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+	    return 0;
+	}
+	// By default, no metafile.
 
 	// Define parent dir of elements
 	$element=$object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+	    $dir = $conf->fournisseur->dir_output.'/commande';
+	} elseif ($object->element == 'invoice_supplier') {
+	    $dir = $conf->fournisseur->dir_output.'/facture';
+	} elseif ($object->element == 'project') {
+	    $dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+	    $dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+	    $dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+	    $dir = $conf->ficheinter->dir_output;
+	} else {
+	    $dir=empty($conf->$element->dir_output)?'':$conf->$element->dir_output;
+	}
 
 	if ($dir)
 	{
@@ -1455,12 +1583,12 @@ 
 		$fp = fopen($file,"w");
 		fputs($fp,$meta);
 		fclose($fp);
-		if (! empty($conf->global->MAIN_UMASK))
-		@chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+				@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return 1;
-	}
-	else
+	} else
 	{
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
@@ -1522,9 +1650,11 @@ 
 
 	$res = 0;
 
-	if (! empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
+	if (! empty($_FILES[$varfiles])) {
+	    // For view $_FILES[$varfiles]['error']
 	{
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+	}
 		if (dol_mkdir($upload_dir) >= 0)
 		{
 			$TFile = $_FILES[$varfiles];
@@ -1558,9 +1688,11 @@ 
 
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
 
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
+				if (is_numeric($resupload) && $resupload > 0) {
+				    // $resupload can be 'ErrorFileAlreadyExists'
 				{
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+				}
 
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
@@ -1600,19 +1732,20 @@ 
 					}
 
 					$nbok++;
-				}
-				else
+				} else
 				{
 					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
+					if ($resupload < 0) {
+					    // Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					}
-					else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+					} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+					    // Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					}
-					else	// Known error
+					} else	// Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1639,8 +1772,7 @@ 
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
@@ -1671,16 +1803,27 @@ 
 	$listofnames=array();
 	$listofmimes=array();
 	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+	    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+	    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+	    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	if ($keytodelete >= 0)
 	{
 		$pathtodelete=$listofpaths[$keytodelete];
 		$filetodelete=$listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete,1);  // The delete of ecm database is inside the function dol_delete_file
-		else $result=0;
+		if (empty($donotdeletefile)) {
+		    $result = dol_delete_file($pathtodelete,1);
+		}
+		// The delete of ecm database is inside the function dol_delete_file
+		else {
+		    $result=0;
+		}
 		if ($result >= 0)
 		{
 			if (empty($donotdeletefile))
@@ -1720,9 +1863,11 @@ 
 
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $dir);
 
-	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+	if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+	    // If not a tmp dir
 	{
 		$filename = basename($file);
+	}
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -1785,8 +1930,12 @@ 
 		$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . 'ecm_files';
 		$sql.= ' WHERE entity = '.$conf->entity;
 		$sql.= " AND filepath = '" . $db->escape($rel_dir) . "'";
-		if ($file) $sql.= " AND filename = '" . $db->escape($file) . "'";
-		if ($mode) $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		if ($file) {
+		    $sql.= " AND filename = '" . $db->escape($file) . "'";
+		}
+		if ($mode) {
+		    $sql.= " AND gen_or_uploaded = '" . $db->escape($mode) . "'";
+		}
 
 		$resql = $db->query($sql);
 		if (!$resql)
@@ -1834,32 +1983,33 @@ 
 			$ret = $image->setImageFormat($ext);
 			if ($ret)
 			{
-				if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
+				if (empty($fileoutput)) {
+				    $fileoutput=$fileinput.".".$ext;
+				}
 
 				$count = $image->getNumberImages();
 
 				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 					$ret = $image->writeImages($fileoutput, true);
-				}
-				else
+				} else
 				{
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
-				if ($ret) return $count;
-				else return -3;
-			}
-			else
+				if ($ret) {
+				    return $count;
+				} else {
+				    return -3;
+				}
+			} else
 			{
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		return 0;
 	}
@@ -1881,9 +2031,7 @@ 
 	try
 	{
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
@@ -1903,14 +2051,12 @@ 
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -1938,8 +2084,9 @@ 
 		$archive = new PclZip($inputfile);
 		$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
-		if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
+		if (! is_array($result) && $result <= 0) {
+		    return array('error'=>$archive->errorInfo(true));
+		} else
 		{
 			$ok=1; $errmsg='';
 			// Loop on each file to check result for unzipping file
@@ -1954,8 +2101,11 @@ 
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+			    return array();
+			} else {
+			    return array('error'=>$errmsg);
+			}
 		}
 	}
 
@@ -1969,8 +2119,7 @@ 
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else
+		} else
 		{
 			return array('error'=>'ErrUnzipFails');
 		}
@@ -2004,9 +2153,7 @@ 
 
 	try
 	{
-		if ($mode == 'gz')     { $foundhandler=0; }
-		elseif ($mode == 'bz') { $foundhandler=0; }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz')     { $foundhandler=0; } elseif ($mode == 'bz') { $foundhandler=0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
             {
@@ -2059,13 +2206,11 @@ 
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format",LOG_ERR);
 			return -2;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2111,16 +2256,25 @@ 
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (! is_object($fuser)) $fuser=$user;
+	if (! is_object($fuser)) {
+	    $fuser=$user;
+	}
 
-	if (empty($modulepart)) return 'ErrorBadParameter';
+	if (empty($modulepart)) {
+	    return 'ErrorBadParameter';
+	}
 	if (empty($entity))
 	{
-		if (empty($conf->multicompany->enabled)) $entity=1;
-		else $entity=0;
+		if (empty($conf->multicompany->enabled)) {
+		    $entity=1;
+		} else {
+		    $entity=0;
+		}
 	}
 	// Fix modulepart
-	if ($modulepart == 'users') $modulepart='user';
+	if ($modulepart == 'users') {
+	    $modulepart='user';
+	}
 
 	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 	// We define $accessallowed and $sqlprotectagainstexternals
@@ -2129,7 +2283,9 @@ 
 	$ret=array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname=basename(dirname($original_file)."/");
+	if (empty($refname)) {
+	    $refname=basename(dirname($original_file)."/");
+	}
 
 	$relative_original_file = $original_file;
 
@@ -2143,7 +2299,9 @@ 
 	// Wrapping for miscellaneous medias files
 	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
 	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		$accessallowed=1;
 		$original_file=$conf->medias->multidir_output[$entity].'/'.$original_file;
 	}
@@ -2184,132 +2342,176 @@ 
 	// Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed=1;
+		if ($fuser->rights->ficheinter->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed=1;
+		if ($fuser->rights->contrat->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->contrat->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed=1;
+		if ($fuser->rights->supplier_proposal->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->supplier_proposal->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expensereport->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->expensereport->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed=1;
+		if ($fuser->rights->propale->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->propal->multidir_temp[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed=1;
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed=1;
+		if ($fuser->rights->expedition->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->expedition->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed=1;
+		if ($fuser->rights->deplacement->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->deplacement->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed=1;
+		if ($fuser->rights->adherent->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->adherent->dir_temp.'/'.$original_file;
 	}
 	// Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i',$modulepart) && !empty($conf->product->dir_temp))
 	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed=1;
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=(!empty($conf->product->multidir_temp[$entity])?$conf->product->multidir_temp[$entity]:$conf->service->multidir_temp[$entity]).'/'.$original_file;
 	}
 	// Wrapping for taxes
 	elseif ($modulepart == 'tax' && !empty($conf->tax->dir_output))
 	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed=1;
+		if ($fuser->rights->tax->charges->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->tax->dir_output.'/'.$original_file;
 	}
 	// Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed=1;
+		if ($fuser->rights->agenda->myactions->{$read}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->agenda->dir_output.'/'.$original_file;
 	}
 	// Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output))
 	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed=1;
+		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->categorie->{$lire}) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) $accessallowed=1;
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i',$original_file)) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->prelevement->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les graph energie
@@ -2372,7 +2574,9 @@ 
 	// Wrapping for third parties
 	else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
@@ -2384,7 +2588,9 @@ 
 	// Wrapping for contact
 	else if ($modulepart == 'contact' && !empty($conf->societe->dir_output))
 	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if ($fuser->rights->societe->{$lire})
 		{
 			$accessallowed=1;
@@ -2410,64 +2616,56 @@ 
 			$accessallowed=1;
 		}
 		$original_file=$conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_orders')
+	} else if ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_invoices')
+	} else if ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_expensereport')
+	} else if ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_interventions')
+	} else if ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+	} else if ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_order')
+	} else if ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_supplier_invoice')
+	} else if ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
 		$original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2528,8 +2726,7 @@ 
 		}
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} else if ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i',$original_file))
 		{
@@ -2578,8 +2775,11 @@ 
 		{
 			$accessallowed=1;
 		}
-		if ($fuser->societe_id > 0) $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) {
+		    $original_file=$conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		} else {
+		    $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
+		}
 	}
 
 	// Wrapping for accounting exports
@@ -2634,24 +2834,33 @@ 
 	// Wrapping pour les produits et services
 	else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->product->enabled)) $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (! empty($conf->service->enabled)) $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->product->enabled)) {
+		    $original_file=$conf->product->multidir_output[$entity].'/'.$original_file;
+		} elseif (! empty($conf->service->enabled)) {
+		    $original_file=$conf->service->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les lots produits
 	else if ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) {
+		    return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		if (! empty($conf->productbatch->enabled)) $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		if (! empty($conf->productbatch->enabled)) {
+		    $original_file=$conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		}
 	}
 
 	// Wrapping pour les contrats
@@ -2732,14 +2941,18 @@ 
 	// Wrapping for backups
 	else if ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping for upload file test
 	else if ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
-		if ($fuser->admin) $accessallowed=1;
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
 		$original_file=$conf->admin->dir_temp.'/'.$original_file;
 	}
 
@@ -2748,7 +2961,9 @@ 
 	{
 		$accessallowed=1;
 		$dir='files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir='torrents';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') {
+		    $dir='torrents';
+		}
 		$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	}
 
@@ -2776,45 +2991,62 @@ 
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		if (preg_match('/^specimen/i',$original_file))	$accessallowed=1;    // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed=1;    // If user is admin
+		if (preg_match('/^specimen/i',$original_file)) {
+		    $accessallowed=1;
+		}
+		// If link to a file called specimen. Test must be done before changing $original_file int full path.
+		if ($fuser->admin) {
+		    $accessallowed=1;
+		}
+		// If user is admin
 
 		// Define $accessallowed
 		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_temp)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		} else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed=1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+			    $accessallowed=1;
+			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+		} else if (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
+			if (empty($conf->{$reg[1]}->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2822,12 +3054,13 @@ 
 				$accessallowed=1;
 			}
 			$original_file=$conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
+		} else
 		{
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
+			if (empty($conf->$modulepart->dir_output)) {
+			    // modulepart not supported
 			{
 				dol_print_error('','Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+			}
 				exit;
 			}
 
@@ -2835,12 +3068,15 @@ 
 			$subperm=GETPOST('subperm');
 			if ($perm || $subperm)
 			{
-				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) $accessallowed=1;
+				if (($perm && ! $subperm && $fuser->rights->$modulepart->$perm) || ($perm && $subperm && $fuser->rights->$modulepart->$perm->$subperm)) {
+				    $accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
-			}
-			else
+			} else
 			{
-				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed=1;
+				if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) {
+				    $accessallowed=1;
+				}
 				$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
 			}
 		}
@@ -2858,11 +3094,13 @@ 
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (! empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
+		if (! empty($conf->global->$sqlProtectConstName)) {
+		    // If module want to define its own $sqlprotectagainstexternals
 		{
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
+		}
 	}
 
 	$ret = array(
@@ -2884,7 +3122,9 @@ 
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (! dol_is_dir($directory)) dol_mkdir($directory);
+	if (! dol_is_dir($directory)) {
+	    dol_mkdir($directory);
+	}
 	$cachefile = $directory . $filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
@@ -2938,9 +3178,11 @@ 
 
 	$exclude = 'install';
 
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
+	foreach ($dir->md5file as $file) {
+	    // $file is a simpleXMLElement
 	{
 		$filename = $path.$file['name'];
+	}
 		$file_list['insignature'][] = $filename;
 		$expectedmd5 = (string) $file;
 
@@ -2949,27 +3191,31 @@ 
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5);
-		}
-		else
+		} else
 		{
 			$md5_local = md5_file($pathref.'/'.$filename);
 
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
+			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php') {
+			    // For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
 			}
-			else
+			} else
 			{
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				if ($md5_local != $expectedmd5) {
+				    $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'md5'=>(string) $md5_local);
+				}
 				$checksumconcat[] = $md5_local;
 			}
 		}
 	}
 
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
+	foreach ($dir->dir as $subdir) {
+	    // $subdir['name'] is  '' or '/accountancy/admin' for example
 	{
 		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
 	}
+	}
 
 	return $file_list;
 }

dolibarr/htdocs/core/lib/expedition.lib.php

Indentation +86 added lines, -86 removed lines

@@ -34,29 +34,29 @@ 
  */
 function expedition_prepare_head(Expedition $object)
 {
-	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
-	$langs->load("orders");
+    global $langs, $conf, $user;
+    if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+    $langs->load("orders");
 
-	$h = 0;
-	$head = array();
-	$h = 0;
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
-	$head[$h][1] = $langs->trans("Setup");
-	$h++;
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-	$head[$h][1] = $langs->trans("Shipment");
-	$hselected=$h;
-	$h++;
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
-		$head[$h][1] = $langs->trans("Receivings");
-		$h++;
-	}
+    $h = 0;
+    $head = array();
+    $h = 0;
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+    $head[$h][1] = $langs->trans("Setup");
+    $h++;
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+    $head[$h][1] = $langs->trans("Shipment");
+    $hselected=$h;
+    $h++;
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+        $head[$h][1] = $langs->trans("Receivings");
+        $h++;
+    }
 	
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
@@ -71,72 +71,72 @@ 
  */
 function expedition_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$langs->load("sendings");
+    global $langs, $conf, $user;
+    $langs->load("sendings");
 
-	$h = 0;
-	$head = array();
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
-	$head[$h][1] = $langs->trans("Setup");
-	$head[$h][2] = 'general';
-	$h++;
-	
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-		$head[$h][1] = $langs->trans("Shipment");
-		$head[$h][2] = 'shipment';
-		$h++;
-	}
-	
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes_shipment';
-	$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines_shipment';
-	$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
-		$head[$h][1] = $langs->trans("Receivings");
-		$head[$h][2] = 'receivings';
-		$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
-		$head[$h][1] = $langs->trans("ExtraFields");
-		$head[$h][2] = 'attributes_receivings';
-		$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
-		$head[$h][1] = $langs->trans("ExtraFieldsLines");
-		$head[$h][2] = 'attributeslines_receivings';
-		$h++;
-	}
-	
-	
-	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
+    $h = 0;
+    $head = array();
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+    $head[$h][1] = $langs->trans("Setup");
+    $head[$h][2] = 'general';
+    $h++;
+	
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+        $head[$h][1] = $langs->trans("Shipment");
+        $head[$h][2] = 'shipment';
+        $h++;
+    }
+	
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes_shipment';
+    $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines_shipment';
+    $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+        $head[$h][1] = $langs->trans("Receivings");
+        $head[$h][2] = 'receivings';
+        $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
+        $head[$h][1] = $langs->trans("ExtraFields");
+        $head[$h][2] = 'attributes_receivings';
+        $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
+        $head[$h][1] = $langs->trans("ExtraFieldsLines");
+        $head[$h][2] = 'attributeslines_receivings';
+        $h++;
+    }
+	
+	
+	
+    complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (!empty($conf->expedition->enabled)) $langs->load("sendings");
 	$langs->load("orders");
 
 	$h = 0;
@@ -48,10 +48,10 @@ 
 	
 	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
 	$head[$h][1] = $langs->trans("Shipment");
-	$hselected=$h;
+	$hselected = $h;
 	$h++;
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
 		$head[$h][1] = $langs->trans("Receivings");
@@ -59,7 +59,7 @@ 
 	}
 	
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
     return $head;
 }
@@ -83,7 +83,7 @@ 
 	$h++;
 	
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
 		$head[$h][1] = $langs->trans("Shipment");
@@ -92,7 +92,7 @@ 
 	}
 	
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -100,7 +100,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -108,7 +108,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
 		$head[$h][1] = $langs->trans("Receivings");
@@ -116,7 +116,7 @@ 
 		$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
@@ -124,7 +124,7 @@ 
 		$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -134,7 +134,7 @@ 
 	
 	
 	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expedition_admin', 'remove');
 
 	return $head;
 }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (! empty($conf->expedition->enabled)) {
+	    $langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;