alxarafe / alixar

dolibarr/htdocs/core/lib/reception.lib.php

Indentation +53 added lines, -53 removed lines

@@ -34,45 +34,45 @@ 
  */
 function reception_prepare_head(Reception $object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$langs->load("sendings");
-	$langs->load("deliveries");
+    $langs->load("sendings");
+    $langs->load("deliveries");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/reception/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("ReceptionCard");
-	$head[$h][2] = 'reception';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/reception/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("ReceptionCard");
+    $head[$h][2] = 'reception';
+    $h++;
 
 	
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $objectsrc = $object;
-	    if ($object->origin == 'commande' && $object->origin_id > 0)
-	    {
-	        $objectsrc = new Commande($db);
-	        $objectsrc->fetch($object->origin_id);
-	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT."/reception/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))
+    {
+        $objectsrc = $object;
+        if ($object->origin == 'commande' && $object->origin_id > 0)
+        {
+            $objectsrc = new Commande($db);
+            $objectsrc->fetch($object->origin_id);
+        }
+        $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT."/reception/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++;
+    }
 	
     $nbNote = 0;
     if (!empty($object->note_private)) $nbNote++;
     if (!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT."/reception/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++;
+    $head[$h][0] = DOL_URL_ROOT."/reception/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++;
 	
 	
 	
@@ -91,39 +91,39 @@ 
  */
 function reception_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$langs->load("receptions");
+    global $langs, $conf, $user;
+    $langs->load("receptions");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 	
-	$head[$h][0] = DOL_URL_ROOT."/admin/reception_setup.php";
-	$head[$h][1] = $langs->trans("Reception");
-	$head[$h][2] = 'reception';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/reception_setup.php";
+    $head[$h][1] = $langs->trans("Reception");
+    $head[$h][2] = 'reception';
+    $h++;
 
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes_reception';
-	$h++;
-	}
+    if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes_reception';
+    $h++;
+    }
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines_reception';
-	$h++;
-	}
+    if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines_reception';
+    $h++;
+    }
 	
 	
 	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +7 added lines, -7 removed lines

@@ -57,10 +57,10 @@ 
 	        $objectsrc = new Commande($db);
 	        $objectsrc->fetch($object->origin_id);
 	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT."/reception/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++;
 	}
@@ -70,7 +70,7 @@ 
     if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT."/reception/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 +79,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;
 }
@@ -103,7 +103,7 @@ 
 	$h++;
 
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -111,7 +111,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
@@ -121,7 +121,7 @@ 
 	
 	
 	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin', 'remove');
 
 	return $head;
 }

Braces +12 added lines, -4 removed lines

@@ -60,17 +60,25 @@
 	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT."/reception/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++;
 	}
 	
     $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."/reception/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++;
 	

dolibarr/htdocs/core/lib/expensereport.lib.php

Indentation +89 added lines, -89 removed lines

@@ -29,53 +29,53 @@ 
  */
 function expensereport_prepare_head($object)
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport');
 
-	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->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->expensereport->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.'/expensereport/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++;
-
-	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.'/expensereport/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++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/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,'expensereport','remove');
-
-	return $head;
+    $head[$h][0] = DOL_URL_ROOT.'/expensereport/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++;
+
+    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.'/expensereport/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++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT . '/expensereport/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,'expensereport','remove');
+
+    return $head;
 }
 
 /**
@@ -88,15 +88,15 @@ 
 function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 {
 
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'payment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'payment';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -104,14 +104,14 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
 
-	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/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,'payment_expensereport', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -121,42 +121,42 @@ 
  */
 function expensereport_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$h = 0;
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/expensereport.php";
-	$head[$h][1] = $langs->trans("ExpenseReports");
-	$head[$h][2] = 'expensereport';
-	$h++;
-
-	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
-		$head[$h][1] = $langs->trans("ExpenseReportsIk");
-		$head[$h][2] = 'expenseik';
-		$h++;
-	}
-
-	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
-		$head[$h][1] = $langs->trans("ExpenseReportsRules");
-		$head[$h][2] = 'expenserules';
-		$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,'expensereport_admin');
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    global $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $h = 0;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/expensereport.php";
+    $head[$h][1] = $langs->trans("ExpenseReports");
+    $head[$h][2] = 'expensereport';
+    $h++;
+
+    if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
+        $head[$h][1] = $langs->trans("ExpenseReportsIk");
+        $head[$h][2] = 'expenseik';
+        $h++;
+    }
+
+    if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
+        $head[$h][1] = $langs->trans("ExpenseReportsRules");
+        $head[$h][2] = 'expenserules';
+        $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,'expensereport_admin');
+
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
@@ -167,7 +167,7 @@ 
     $h++;
 	*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
 
     return $head;
 }

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -43,37 +43,37 @@ 
 	// 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,'expensereport');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->expensereport->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->expensereport->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.'/expensereport/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++;
 
 	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.'/expensereport/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++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/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,'expensereport','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'remove');
 
 	return $head;
 }
@@ -102,14 +102,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/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,'payment_expensereport', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport', 'remove');
 
 	return $head;
 }
@@ -153,7 +153,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,'expensereport_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -167,7 +167,7 @@ 
     $h++;
 	*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
 
     return $head;
 }

Braces +12 added lines, -4 removed lines

@@ -52,18 +52,26 @@
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/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++;
 
 	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.'/expensereport/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++;
 	}

dolibarr/htdocs/core/lib/treeview.lib.php

Indentation +142 added lines, -142 removed lines

@@ -35,61 +35,61 @@ 
  */
 function tree_showpad(&$fulltree,$key,$silent=0)
 {
-	$pos=1;
-
-	// Loop on each pos, because we will output an img for each pos
-	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
-	{
-		// Process for column $pos
-
-		$atleastoneofthislevelafter=0;
-		$nbofdirinsub=0;
-		$nbofdocinsub=0;
-		$found=0;
-		//print 'x'.$key;
-		foreach($fulltree as $key2 => $val2)
-		{
+    $pos=1;
+
+    // Loop on each pos, because we will output an img for each pos
+    while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
+    {
+        // Process for column $pos
+
+        $atleastoneofthislevelafter=0;
+        $nbofdirinsub=0;
+        $nbofdocinsub=0;
+        $found=0;
+        //print 'x'.$key;
+        foreach($fulltree as $key2 => $val2)
+        {
             //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
-			if ($found == 1) // We are after the entry to show
-			{
-				if ($fulltree[$key2]['level'] > $pos)
-				{
-					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
-				}
-				if ($fulltree[$key2]['level'] == $pos)
-				{
-					$atleastoneofthislevelafter=1;
-				}
-				if ($fulltree[$key2]['level'] <= $pos)
-				{
-					break;
-				}
-			}
-			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
-			{
-				$found=1;
-			}
-		}
-		//print $atleastoneofthislevelafter;
-
-		if (! $silent)
-		{
-    		if ($atleastoneofthislevelafter)
-    		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
-    			else print img_picto_common('','treemenu/line.gif');
-    		}
-    		else
-    		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
-    			else print img_picto_common('','treemenu/linebottom.gif');
-    		}
-		}
-		$pos++;
-	}
-
-	return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
+            if ($found == 1) // We are after the entry to show
+            {
+                if ($fulltree[$key2]['level'] > $pos)
+                {
+                    $nbofdirinsub++;
+                    if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+                }
+                if ($fulltree[$key2]['level'] == $pos)
+                {
+                    $atleastoneofthislevelafter=1;
+                }
+                if ($fulltree[$key2]['level'] <= $pos)
+                {
+                    break;
+                }
+            }
+            if ($key2 == $key)    // We found ourself, so now every lower level will be counted
+            {
+                $found=1;
+            }
+        }
+        //print $atleastoneofthislevelafter;
+
+        if (! $silent)
+        {
+            if ($atleastoneofthislevelafter)
+            {
+                if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
+                else print img_picto_common('','treemenu/line.gif');
+            }
+            else
+            {
+                if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
+                else print img_picto_common('','treemenu/linebottom.gif');
+            }
+        }
+        $pos++;
+    }
+
+    return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
 }
 
 
@@ -120,9 +120,9 @@ 
     if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
 
     if ($rang == 0)
-	{
-		// Test also done with jstree and dynatree (not able to have <a> inside label)
-		print '<script type="text/javascript" language="javascript">
+    {
+        // Test also done with jstree and dynatree (not able to have <a> inside label)
+        print '<script type="text/javascript" language="javascript">
 		$(document).ready(function(){
 			$("#'.$iddivjstree.'").treeview({
 				collapsed: true,
@@ -136,94 +136,94 @@ 
 		})
 		</script>';
 
-		print '<ul id="'.$iddivjstree.'">';
-	}
-
-	if ($rang > 50)
-	{
-	    return;	// Protect against infinite loop. Max 50 depth
-	}
-
-	//ballayage du tableau
-	$sizeoftab=count($tab);
-	$ulprinted=0;
-	for ($x=0; $x < $sizeoftab; $x++)
-	{
-		//var_dump($tab[$x]);exit;
-		// If an element has $pere for parent
-		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
-		{
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && ! empty($pere['rowid']))
-			{
-    		    if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-    		    {
-    		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-    		          continue;
-    		    }
+        print '<ul id="'.$iddivjstree.'">';
+    }
+
+    if ($rang > 50)
+    {
+        return;	// Protect against infinite loop. Max 50 depth
+    }
+
+    //ballayage du tableau
+    $sizeoftab=count($tab);
+    $ulprinted=0;
+    for ($x=0; $x < $sizeoftab; $x++)
+    {
+        //var_dump($tab[$x]);exit;
+        // If an element has $pere for parent
+        if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
+        {
+            //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+            if (empty($ulprinted) && ! empty($pere['rowid']))
+            {
+                if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+                {
+                        dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+                        continue;
+                }
 
                 print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
-			}
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
-			if ($showfk)
-			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; ';
-			    print $tab[$x]['title'];
-			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td align="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
-			}
-			else
-			{
-			    print $tab[$x]['entry'];
-			}
-			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-		    $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
-			// And now we search all its sons of lower level
-			tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
-			print '</li>';
-		}
-		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
-		{
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && ! empty($pere['rowid']))
-		    {
-		        if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-		        {
-		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
+            }
+            print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+            if ($showfk)
+            {
+                print '<table class="nobordernopadding centpercent"><tr><td>';
+                print '<strong> &nbsp; ';
+                print $tab[$x]['title'];
+                print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+                print '</td><td align="right">';
+                print $tab[$x]['buttons'];
+                print '</td></tr></table>';
+            }
+            else
+            {
+                print $tab[$x]['entry'];
+            }
+            //print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
+            $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+            // And now we search all its sons of lower level
+            tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+            print '</li>';
+        }
+        elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+        {
+            //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+            if (empty($ulprinted) && ! empty($pere['rowid']))
+            {
+                if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+                {
+                    dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+                    //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
                     continue;
-		        }
-
-		        print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
-		    }
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
-			if ($showfk)
-			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">';
-			    print $tab[$x]['title'];
-			    print '</a></strong>';
-			    print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td align="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
-			}
-			else
-			{
-			    print $tab[$x]['entry'];
-			}
-			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-			$tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
-			// And now we search all its sons of lower level
-			//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
-		    tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
-			print '</li>';
-		}
-	}
-	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
+                }
+
+                print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+            }
+            print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+            if ($showfk)
+            {
+                print '<table class="nobordernopadding centpercent"><tr><td>';
+                print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">';
+                print $tab[$x]['title'];
+                print '</a></strong>';
+                print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+                print '</td><td align="right">';
+                print $tab[$x]['buttons'];
+                print '</td></tr></table>';
+            }
+            else
+            {
+                print $tab[$x]['entry'];
+            }
+            //print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
+            $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+            // And now we search all its sons of lower level
+            //print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
+            tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+            print '</li>';
+        }
+    }
+    if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
 
     if ($rang == 0) print '</ul>';
 }

Spacing +36 added lines, -36 removed lines

@@ -33,21 +33,21 @@ 
  * @param	int		$silent			Do not output indent and picto, returns only value
  * @return	integer[]					array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub)
  */
-function tree_showpad(&$fulltree,$key,$silent=0)
+function tree_showpad(&$fulltree, $key, $silent = 0)
 {
-	$pos=1;
+	$pos = 1;
 
 	// Loop on each pos, because we will output an img for each pos
 	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
 	{
 		// Process for column $pos
 
-		$atleastoneofthislevelafter=0;
-		$nbofdirinsub=0;
-		$nbofdocinsub=0;
-		$found=0;
+		$atleastoneofthislevelafter = 0;
+		$nbofdirinsub = 0;
+		$nbofdocinsub = 0;
+		$found = 0;
 		//print 'x'.$key;
-		foreach($fulltree as $key2 => $val2)
+		foreach ($fulltree as $key2 => $val2)
 		{
             //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
 			if ($found == 1) // We are after the entry to show
@@ -55,11 +55,11 @@ 
 				if ($fulltree[$key2]['level'] > $pos)
 				{
 					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];
 				}
 				if ($fulltree[$key2]['level'] == $pos)
 				{
-					$atleastoneofthislevelafter=1;
+					$atleastoneofthislevelafter = 1;
 				}
 				if ($fulltree[$key2]['level'] <= $pos)
 				{
@@ -68,28 +68,28 @@ 
 			}
 			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
 			{
-				$found=1;
+				$found = 1;
 			}
 		}
 		//print $atleastoneofthislevelafter;
 
-		if (! $silent)
+		if (!$silent)
 		{
     		if ($atleastoneofthislevelafter)
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
-    			else print img_picto_common('','treemenu/line.gif');
+    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
+    			else print img_picto_common('', 'treemenu/line.gif');
     		}
     		else
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
-    			else print img_picto_common('','treemenu/linebottom.gif');
+    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
+    			else print img_picto_common('', 'treemenu/linebottom.gif');
     		}
 		}
 		$pos++;
 	}
 
-	return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
+	return array($atleastoneofthislevelafter, $nbofdirinsub, $nbofdocinsub);
 }
 
 
@@ -113,11 +113,11 @@ 
  *  @param  int     $showfk         1=show fk_links to parent into label  (used by menu editor only)
  *  @return	void
  */
-function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetalreadyloaded=0, $showfk=0)
+function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0)
 {
     global $tree_recur_alreadyadded;
 
-    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
+    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
 
     if ($rang == 0)
 	{
@@ -141,30 +141,30 @@ 
 
 	if ($rang > 50)
 	{
-	    return;	// Protect against infinite loop. Max 50 depth
+	    return; // Protect against infinite loop. Max 50 depth
 	}
 
 	//ballayage du tableau
-	$sizeoftab=count($tab);
-	$ulprinted=0;
-	for ($x=0; $x < $sizeoftab; $x++)
+	$sizeoftab = count($tab);
+	$ulprinted = 0;
+	for ($x = 0; $x < $sizeoftab; $x++)
 	{
 		//var_dump($tab[$x]);exit;
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && ! empty($pere['rowid']))
+			if (empty($ulprinted) && !empty($pere['rowid']))
 			{
-    		    if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+    		    if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
     		    {
     		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
     		          continue;
     		    }
 
-                print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+                print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 			    print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -180,26 +180,26 @@ 
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-		    $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+		    $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
-			tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		}
-		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+		elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && ! empty($pere['rowid']))
+		    if (empty($ulprinted) && !empty($pere['rowid']))
 		    {
-		        if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+		        if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
 		        {
 		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
 		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
                     continue;
 		        }
 
-		        print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+		        print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 		    }
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 			    print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -216,14 +216,14 @@ 
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-			$tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
 			//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
-		    tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+		    tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		}
 	}
-	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
+	if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }
 
     if ($rang == 0) print '</ul>';
 }

Braces +30 added lines, -18 removed lines

@@ -50,12 +50,16 @@ 
 		foreach($fulltree as $key2 => $val2)
 		{
             //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
-			if ($found == 1) // We are after the entry to show
+			if ($found == 1) {
+			    // We are after the entry to show
 			{
 				if ($fulltree[$key2]['level'] > $pos)
 				{
 					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+			}
+					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) {
+					    $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+					}
 				}
 				if ($fulltree[$key2]['level'] == $pos)
 				{
@@ -66,10 +70,12 @@ 
 					break;
 				}
 			}
-			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
+			if ($key2 == $key) {
+			    // We found ourself, so now every lower level will be counted
 			{
 				$found=1;
 			}
+			}
 		}
 		//print $atleastoneofthislevelafter;
 
@@ -77,13 +83,18 @@ 
 		{
     		if ($atleastoneofthislevelafter)
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
-    			else print img_picto_common('','treemenu/line.gif');
-    		}
-    		else
+    			if ($fulltree[$key]['level'] == $pos) {
+    			    print img_picto_common('','treemenu/branch.gif');
+    			} else {
+    			    print img_picto_common('','treemenu/line.gif');
+    			}
+    		} else
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
-    			else print img_picto_common('','treemenu/linebottom.gif');
+    			if ($fulltree[$key]['level'] == $pos) {
+    			    print img_picto_common('','treemenu/branchbottom.gif');
+    			} else {
+    			    print img_picto_common('','treemenu/linebottom.gif');
+    			}
     		}
 		}
 		$pos++;
@@ -117,7 +128,9 @@ 
 {
     global $tree_recur_alreadyadded;
 
-    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
+    if ($rang == 0 && empty($donoresetalreadyloaded)) {
+        $tree_recur_alreadyadded=array();
+    }
 
     if ($rang == 0)
 	{
@@ -174,8 +187,7 @@ 
 			    print '</td><td align="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
+			} else
 			{
 			    print $tab[$x]['entry'];
 			}
@@ -184,8 +196,7 @@ 
 			// And now we search all its sons of lower level
 			tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
 			print '</li>';
-		}
-		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+		} elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 		    if (empty($ulprinted) && ! empty($pere['rowid']))
@@ -210,8 +221,7 @@ 
 			    print '</td><td align="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
+			} else
 			{
 			    print $tab[$x]['entry'];
 			}
@@ -225,6 +235,8 @@ 
 	}
 	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
 
-    if ($rang == 0) print '</ul>';
-}
+    if ($rang == 0) {
+        print '</ul>';
+    }
+    }
 

dolibarr/htdocs/core/lib/memory.lib.php

Indentation +168 added lines, -168 removed lines

@@ -24,10 +24,10 @@ 
 global $shmkeys,$shmoffset;
 
 $shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'products'=>6,
-				'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
-				'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
-				'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
-				'donations'=>25,'contracts'=>26);
+                'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
+                'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
+                'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
+                'donations'=>25,'contracts'=>26);
 $shmoffset=1000;	// Max number of entries found into a language file. If too low, some entries will be overwritten.
 
 
@@ -41,64 +41,64 @@ 
  */
 function dol_setcache($memoryid,$data)
 {
-	global $conf;
-	$result=0;
+    global $conf;
+    $result=0;
 
-	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
-	{
-	    global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
-    	{
-       	    $dolmemcache=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+    // Using a memcached server
+    if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+    {
+        global $dolmemcache;
+        if (empty($dolmemcache) || ! is_object($dolmemcache))
+        {
+                $dolmemcache=new Memcached();
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
        	
-	    $memoryid=session_name().'_'.$memoryid;
-		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		$rescode=$dolmemcache->getResultCode();
-		if ($rescode == 0)
-		{
-			return count($data);
-		}
-		else
-		{
-			return -$rescode;
-		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
-	{
-		global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
-    	{
-       	    $dolmemcache=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+        $memoryid=session_name().'_'.$memoryid;
+        //$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
+        $dolmemcache->add($memoryid,$data);    // This fails if key already exists
+        $rescode=$dolmemcache->getResultCode();
+        if ($rescode == 0)
+        {
+            return count($data);
+        }
+        else
+        {
+            return -$rescode;
+        }
+    }
+    else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+    {
+        global $dolmemcache;
+        if (empty($dolmemcache) || ! is_object($dolmemcache))
+        {
+                $dolmemcache=new Memcache();
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
 	    
-       	$memoryid=session_name().'_'.$memoryid;
-		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		if ($result)
-		{
-			return count($data);
-		}
-		else
-		{
-			return -1;
-		}
-	}
-	// Using shmop
-	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
-	{
-		$result=dol_setshmop($memoryid,$data);
-	}
+            $memoryid=session_name().'_'.$memoryid;
+        //$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
+        $result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
+        if ($result)
+        {
+            return count($data);
+        }
+        else
+        {
+            return -1;
+        }
+    }
+    // Using shmop
+    else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
+    {
+        $result=dol_setshmop($memoryid,$data);
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -109,69 +109,69 @@ 
  */
 function dol_getcache($memoryid)
 {
-	global $conf;
+    global $conf;
 
-	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
-	{
-		global $m;
-		if (empty($m) || ! is_object($m))
-    	{
+    // Using a memcached server
+    if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+    {
+        global $m;
+        if (empty($m) || ! is_object($m))
+        {
             $m=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
 	    
-		$memoryid=session_name().'_'.$memoryid;
-		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		//print "Get memoryid=".$memoryid;
-		$data=$m->get($memoryid);
-		$rescode=$m->getResultCode();
-		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
-		//var_dump($data);
-		if ($rescode == 0)
-		{
-			return $data;
-		}
-		else
-		{
-			return -$rescode;
-		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
-	{
-		global $m;
-		if (empty($m) || ! is_object($m))
-    	{
-       	    $m=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+        $memoryid=session_name().'_'.$memoryid;
+        //$m->setOption(Memcached::OPT_COMPRESSION, false);
+        //print "Get memoryid=".$memoryid;
+        $data=$m->get($memoryid);
+        $rescode=$m->getResultCode();
+        //print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
+        //var_dump($data);
+        if ($rescode == 0)
+        {
+            return $data;
+        }
+        else
+        {
+            return -$rescode;
+        }
+    }
+    else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+    {
+        global $m;
+        if (empty($m) || ! is_object($m))
+        {
+                $m=new Memcache();
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
 	    
-       	$memoryid=session_name().'_'.$memoryid;
-		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		$data=$m->get($memoryid);
-		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
-		//var_dump($data);
-		if ($data)
-		{
-			return $data;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-	// Using shmop
-	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
-	{
-		$data=dol_getshmop($memoryid);
-		return $data;
-	}
+            $memoryid=session_name().'_'.$memoryid;
+        //$m->setOption(Memcached::OPT_COMPRESSION, false);
+        $data=$m->get($memoryid);
+        //print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
+        //var_dump($data);
+        if ($data)
+        {
+            return $data;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+    // Using shmop
+    else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
+    {
+        $data=dol_getshmop($memoryid);
+        return $data;
+    }
 
-	return 0;
+    return 0;
 }
 
 
@@ -184,9 +184,9 @@ 
  */
 function dol_getshmopaddress($memoryid)
 {
-	global $shmkeys,$shmoffset;
-	if (empty($shmkeys[$memoryid])) return 0;
-	return $shmkeys[$memoryid]+$shmoffset;
+    global $shmkeys,$shmoffset;
+    if (empty($shmkeys[$memoryid])) return 0;
+    return $shmkeys[$memoryid]+$shmoffset;
 }
 
 /**
@@ -196,15 +196,15 @@ 
  */
 function dol_listshmop()
 {
-	global $shmkeys,$shmoffset;
+    global $shmkeys,$shmoffset;
 
-	$resarray=array();
-	foreach($shmkeys as $key => $val)
-	{
-		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
-	}
-	return $resarray;
+    $resarray=array();
+    foreach($shmkeys as $key => $val)
+    {
+        $result=dol_getshmop($key);
+        if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+    }
+    return $resarray;
 }
 
 /**
@@ -216,31 +216,31 @@ 
  */
 function dol_setshmop($memoryid,$data)
 {
-	global $shmkeys,$shmoffset;
+    global $shmkeys,$shmoffset;
 
-	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	$newdata=serialize($data);
-	$size=strlen($newdata);
-	//print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
-	$handle=shmop_open($shmkey,'c',0644,6+$size);
-	if ($handle)
-	{
-		$shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
-		$shm_bytes_written2=shmop_write($handle,$newdata,6);
-		if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
-		{
-   			print "Couldn't write the entire length of data\n";
-		}
-		shmop_close($handle);
-		return ($shm_bytes_written1+$shm_bytes_written2);
-	}
-	else
-	{
-		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
-		return -1;
-	}
+    //print 'dol_setshmop memoryid='.$memoryid."<br>\n";
+    if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
+    $shmkey=dol_getshmopaddress($memoryid);
+    $newdata=serialize($data);
+    $size=strlen($newdata);
+    //print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
+    $handle=shmop_open($shmkey,'c',0644,6+$size);
+    if ($handle)
+    {
+        $shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
+        $shm_bytes_written2=shmop_write($handle,$newdata,6);
+        if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
+        {
+                print "Couldn't write the entire length of data\n";
+        }
+        shmop_close($handle);
+        return ($shm_bytes_written1+$shm_bytes_written2);
+    }
+    else
+    {
+        print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
+        return -1;
+    }
 }
 
 /**
@@ -251,23 +251,23 @@ 
  */
 function dol_getshmop($memoryid)
 {
-	global $shmkeys,$shmoffset;
+    global $shmkeys,$shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
-	$handle=@shmop_open($shmkey,'a',0,0);
-	if ($handle)
-	{
-		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
-		else return -1;
-		shmop_close($handle);
-	}
-	else
-	{
-		return -2;
-	}
-	return $data;
+    if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
+    $shmkey=dol_getshmopaddress($memoryid);
+    //print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
+    $handle=@shmop_open($shmkey,'a',0,0);
+    if ($handle)
+    {
+        $size=trim(shmop_read($handle,0,6));
+        if ($size) $data=unserialize(shmop_read($handle,6,$size));
+        else return -1;
+        shmop_close($handle);
+    }
+    else
+    {
+        return -2;
+    }
+    return $data;
 }
 

Spacing +69 added lines, -69 removed lines

@@ -21,14 +21,14 @@ 
  *  \brief		Set of function for memory/cache management
  */
 
-global $shmkeys,$shmoffset;
+global $shmkeys, $shmoffset;
 
-$shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'products'=>6,
-				'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
-				'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
-				'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
-				'donations'=>25,'contracts'=>26);
-$shmoffset=1000;	// Max number of entries found into a language file. If too low, some entries will be overwritten.
+$shmkeys = array('main'=>1, 'admin'=>2, 'dict'=>3, 'companies'=>4, 'suppliers'=>5, 'products'=>6,
+				'commercial'=>7, 'compta'=>8, 'projects'=>9, 'cashdesk'=>10, 'agenda'=>11, 'bills'=>12,
+				'propal'=>13, 'boxes'=>14, 'banks'=>15, 'other'=>16, 'errors'=>17, 'members'=>18, 'ecm'=>19,
+				'orders'=>20, 'users'=>21, 'help'=>22, 'stocks'=>23, 'interventions'=>24,
+				'donations'=>25, 'contracts'=>26);
+$shmoffset = 1000; // Max number of entries found into a language file. If too low, some entries will be overwritten.
 
 
 
@@ -39,27 +39,27 @@ 
  * 	@param	string		$data			Data to save
  * 	@return	int							<0 if KO, Nb of bytes written if OK
  */
-function dol_setcache($memoryid,$data)
+function dol_setcache($memoryid, $data)
 {
 	global $conf;
-	$result=0;
+	$result = 0;
 
 	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
 	    global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
+		if (empty($dolmemcache) || !is_object($dolmemcache))
     	{
-       	    $dolmemcache=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $dolmemcache = new Memcached();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
        	
-	    $memoryid=session_name().'_'.$memoryid;
+	    $memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		$rescode=$dolmemcache->getResultCode();
+		$dolmemcache->add($memoryid, $data); // This fails if key already exists
+		$rescode = $dolmemcache->getResultCode();
 		if ($rescode == 0)
 		{
 			return count($data);
@@ -69,20 +69,20 @@ 
 			return -$rescode;
 		}
 	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	else if (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
+		if (empty($dolmemcache) || !is_object($dolmemcache))
     	{
-       	    $dolmemcache=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $dolmemcache = new Memcache();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-       	$memoryid=session_name().'_'.$memoryid;
+       	$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
+		$result = $dolmemcache->add($memoryid, $data); // This fails if key already exists
 		if ($result)
 		{
 			return count($data);
@@ -95,7 +95,7 @@ 
 	// Using shmop
 	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
-		$result=dol_setshmop($memoryid,$data);
+		$result = dol_setshmop($memoryid, $data);
 	}
 
 	return $result;
@@ -112,22 +112,22 @@ 
 	global $conf;
 
 	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
 		global $m;
-		if (empty($m) || ! is_object($m))
+		if (empty($m) || !is_object($m))
     	{
-            $m=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+            $m = new Memcached();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-		$memoryid=session_name().'_'.$memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		//print "Get memoryid=".$memoryid;
-		$data=$m->get($memoryid);
-		$rescode=$m->getResultCode();
+		$data = $m->get($memoryid);
+		$rescode = $m->getResultCode();
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
 		//var_dump($data);
 		if ($rescode == 0)
@@ -139,20 +139,20 @@ 
 			return -$rescode;
 		}
 	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	else if (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
-		if (empty($m) || ! is_object($m))
+		if (empty($m) || !is_object($m))
     	{
-       	    $m=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $m = new Memcache();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-       	$memoryid=session_name().'_'.$memoryid;
+       	$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		$data=$m->get($memoryid);
+		$data = $m->get($memoryid);
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
 		//var_dump($data);
 		if ($data)
@@ -167,7 +167,7 @@ 
 	// Using shmop
 	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
-		$data=dol_getshmop($memoryid);
+		$data = dol_getshmop($memoryid);
 		return $data;
 	}
 
@@ -184,9 +184,9 @@ 
  */
 function dol_getshmopaddress($memoryid)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 	if (empty($shmkeys[$memoryid])) return 0;
-	return $shmkeys[$memoryid]+$shmoffset;
+	return $shmkeys[$memoryid] + $shmoffset;
 }
 
 /**
@@ -196,13 +196,13 @@ 
  */
 function dol_listshmop()
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
-	$resarray=array();
-	foreach($shmkeys as $key => $val)
+	$resarray = array();
+	foreach ($shmkeys as $key => $val)
 	{
-		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+		$result = dol_getshmop($key);
+		if (!is_numeric($result) || $result > 0) $resarray[$key] = $result;
 	}
 	return $resarray;
 }
@@ -214,27 +214,27 @@ 
  * 	@param	string	$data			Data to save
  * 	@return	int						<0 if KO, Nb of bytes written if OK
  */
-function dol_setshmop($memoryid,$data)
+function dol_setshmop($memoryid, $data)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	$newdata=serialize($data);
-	$size=strlen($newdata);
+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) return 0;
+	$shmkey = dol_getshmopaddress($memoryid);
+	$newdata = serialize($data);
+	$size = strlen($newdata);
 	//print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
-	$handle=shmop_open($shmkey,'c',0644,6+$size);
+	$handle = shmop_open($shmkey, 'c', 0644, 6 + $size);
 	if ($handle)
 	{
-		$shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
-		$shm_bytes_written2=shmop_write($handle,$newdata,6);
-		if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
+		$shm_bytes_written1 = shmop_write($handle, str_pad($size, 6), 0);
+		$shm_bytes_written2 = shmop_write($handle, $newdata, 6);
+		if (($shm_bytes_written1 + $shm_bytes_written2) != (6 + dol_strlen($newdata)))
 		{
    			print "Couldn't write the entire length of data\n";
 		}
 		shmop_close($handle);
-		return ($shm_bytes_written1+$shm_bytes_written2);
+		return ($shm_bytes_written1 + $shm_bytes_written2);
 	}
 	else
 	{
@@ -251,16 +251,16 @@ 
  */
 function dol_getshmop($memoryid)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_open")) return 0;
+	$shmkey = dol_getshmopaddress($memoryid);
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
-	$handle=@shmop_open($shmkey,'a',0,0);
+	$handle = @shmop_open($shmkey, 'a', 0, 0);
 	if ($handle)
 	{
-		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
+		$size = trim(shmop_read($handle, 0, 6));
+		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
 		else return -1;
 		shmop_close($handle);
 	}

Braces +37 added lines, -26 removed lines

@@ -53,7 +53,9 @@ 
        	    $dolmemcache=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
        	
 	    $memoryid=session_name().'_'.$memoryid;
@@ -63,13 +65,11 @@ 
 		if ($rescode == 0)
 		{
 			return count($data);
-		}
-		else
+		} else
 		{
 			return -$rescode;
 		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || ! is_object($dolmemcache))
@@ -77,7 +77,9 @@ 
        	    $dolmemcache=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
@@ -86,8 +88,7 @@ 
 		if ($result)
 		{
 			return count($data);
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -120,7 +121,9 @@ 
             $m=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
 		$memoryid=session_name().'_'.$memoryid;
@@ -133,13 +136,11 @@ 
 		if ($rescode == 0)
 		{
 			return $data;
-		}
-		else
+		} else
 		{
 			return -$rescode;
 		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
 		if (empty($m) || ! is_object($m))
@@ -147,7 +148,9 @@ 
        	    $m=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
@@ -158,8 +161,7 @@ 
 		if ($data)
 		{
 			return $data;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -185,7 +187,9 @@ 
 function dol_getshmopaddress($memoryid)
 {
 	global $shmkeys,$shmoffset;
-	if (empty($shmkeys[$memoryid])) return 0;
+	if (empty($shmkeys[$memoryid])) {
+	    return 0;
+	}
 	return $shmkeys[$memoryid]+$shmoffset;
 }
 
@@ -202,7 +206,9 @@ 
 	foreach($shmkeys as $key => $val)
 	{
 		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+		if (! is_numeric($result) || $result > 0) {
+		    $resarray[$key]=$result;
+		}
 	}
 	return $resarray;
 }
@@ -219,7 +225,9 @@ 
 	global $shmkeys,$shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
+	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) {
+	    return 0;
+	}
 	$shmkey=dol_getshmopaddress($memoryid);
 	$newdata=serialize($data);
 	$size=strlen($newdata);
@@ -235,8 +243,7 @@ 
 		}
 		shmop_close($handle);
 		return ($shm_bytes_written1+$shm_bytes_written2);
-	}
-	else
+	} else
 	{
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
@@ -253,18 +260,22 @@ 
 {
 	global $shmkeys,$shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
+	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) {
+	    return 0;
+	}
 	$shmkey=dol_getshmopaddress($memoryid);
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
 	$handle=@shmop_open($shmkey,'a',0,0);
 	if ($handle)
 	{
 		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
-		else return -1;
+		if ($size) {
+		    $data=unserialize(shmop_read($handle,6,$size));
+		} else {
+		    return -1;
+		}
 		shmop_close($handle);
-	}
-	else
+	} else
 	{
 		return -2;
 	}

dolibarr/htdocs/core/lib/xcal.lib.php

Indentation +311 added lines, -311 removed lines

@@ -34,78 +34,78 @@ 
  */
 function build_calfile($format,$title,$desc,$events_array,$outputfile)
 {
-	global $conf,$langs;
+    global $conf,$langs;
 
-	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
+    dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+    if (empty($outputfile)) return -1;
 
     // Note: A cal file is an UTF8 encoded file
-	$calfileh=fopen($outputfile,'w');
-	if ($calfileh)
-	{
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$now=dol_now();
-
-		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
-
-		// Print header
-		fwrite($calfileh,"BEGIN:VCALENDAR\n");
-		fwrite($calfileh,"VERSION:2.0\n");
-		fwrite($calfileh,"METHOD:PUBLISH\n");
-		//fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
-		fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
-		fwrite($calfileh,"CALSCALE:GREGORIAN\n");
-		fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
+    $calfileh=fopen($outputfile,'w');
+    if ($calfileh)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+        $now=dol_now();
+
+        $encoding='';
+        if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+
+        // Print header
+        fwrite($calfileh,"BEGIN:VCALENDAR\n");
+        fwrite($calfileh,"VERSION:2.0\n");
+        fwrite($calfileh,"METHOD:PUBLISH\n");
+        //fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
+        fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+        fwrite($calfileh,"CALSCALE:GREGORIAN\n");
+        fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
         fwrite($calfileh,"X-WR-CALDESC:".$encoding.format_cal($format,$desc)."\n");
         //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
         if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
         && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
-	        $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
-	        $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
-	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
-	        fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+            $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
+            $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
+            $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
+            fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
         }
 
-		foreach ($events_array as $key => $event)
-		{
-			$eventqualified=true;
-			if ($eventqualified)
-			{
-				// See http://fr.wikipedia.org/wiki/ICalendar for format
-				// See http://www.ietf.org/rfc/rfc2445.txt for RFC
-				$uid 		  = $event['uid'];
-				$type         = $event['type'];
+        foreach ($events_array as $key => $event)
+        {
+            $eventqualified=true;
+            if ($eventqualified)
+            {
+                // See http://fr.wikipedia.org/wiki/ICalendar for format
+                // See http://www.ietf.org/rfc/rfc2445.txt for RFC
+                $uid 		  = $event['uid'];
+                $type         = $event['type'];
                 $startdate    = $event['startdate'];
-				$duration	  = $event['duration'];
-				$enddate	  = $event['enddate'];
-				$summary  	  = $event['summary'];
-				$category	  = $event['category'];
+                $duration	  = $event['duration'];
+                $enddate	  = $event['enddate'];
+                $summary  	  = $event['summary'];
+                $category	  = $event['category'];
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
-				$location     = $event['location'];
-				$email 		  = $event['email'];
-				$url		  = $event['url'];
-				$transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
+                $location     = $event['location'];
+                $email 		  = $event['email'];
+                $url		  = $event['url'];
+                $transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
+                $description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
+                    $description=dol_string_nohtmltag($description,0);	// Remove html tags
                 $created      = $event['created'];
- 				$modified     = $event['modified'];
+                    $modified     = $event['modified'];
 
-				// Uncomment for tests
-				//$summary="Resume";
-				//$description="Description";
-				//$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
+                // Uncomment for tests
+                //$summary="Resume";
+                //$description="Description";
+                //$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
 
-				// Format
-				$summary=format_cal($format,$summary);
-				$description=format_cal($format,$description);
-				$category=format_cal($format,$category);
-				$location=format_cal($format,$location);
+                // Format
+                $summary=format_cal($format,$summary);
+                $description=format_cal($format,$description);
+                $category=format_cal($format,$category);
+                $location=format_cal($format,$location);
 
-				// Output the vCard/iCal VEVENT object
-				/*
+                // Output the vCard/iCal VEVENT object
+                /*
 				Example from Google ical export for a 1 hour event:
                 BEGIN:VEVENT
                 DTSTART:20101103T120000Z
@@ -138,26 +138,26 @@ 
                 TRANSP:TRANSPARENT
                 END:VEVENT
                 */
-				if ($type == 'event')
-				{
-					fwrite($calfileh,"BEGIN:VEVENT\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
-					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
-					}
-					if (! empty($url))
-					{
-						fwrite($calfileh,"URL:".$url."\n");
-					};
+                if ($type == 'event')
+                {
+                    fwrite($calfileh,"BEGIN:VEVENT\n");
+                    fwrite($calfileh,"UID:".$uid."\n");
+                    if (! empty($email))
+                    {
+                        fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
+                        fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+                    }
+                    if (! empty($url))
+                    {
+                        fwrite($calfileh,"URL:".$url."\n");
+                    };
 
                     if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
                     if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
                     fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
+                    fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 
-					/* Other keys:
+                    /* Other keys:
 					// Status values for a "VEVENT"
 					statvalue  = "TENTATIVE"           ;Indicates event is
 				                                        ;tentative.
@@ -174,86 +174,86 @@ 
 				                / "FINAL"               ;Indicates journal is final.
 				                / "CANCELLED"           ;Indicates journal is removed.
 					*/
-					//fwrite($calfileh,"CLASS:PUBLIC\n");				// PUBLIC, PRIVATE, CONFIDENTIAL
+                    //fwrite($calfileh,"CLASS:PUBLIC\n");				// PUBLIC, PRIVATE, CONFIDENTIAL
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
                     if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
+                    if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
                     if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
 
-					// Date must be GMT dates
-					// Current date
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
-					// Start date
+                    // Date must be GMT dates
+                    // Current date
+                    fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
+                    // Start date
                     $prefix='';
                     $startdatef = dol_print_date($startdate,'dayhourxcard',true);
                     if ($fulldayevent)
-					{
+                    {
                         $prefix=';VALUE=DATE';
-					    $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
-					}
-					fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
+                        $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
+                    }
+                    fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
                     // End date
-					if ($fulldayevent)
-					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
-					}
-					else
-					{
+                    if ($fulldayevent)
+                    {
+                        if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
+                    }
+                    else
+                    {
                         if (empty($enddate)) $enddate=$startdate+$duration;
-					}
+                    }
                     $prefix='';
-					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
-					if ($fulldayevent)
-					{
+                    $enddatef = dol_print_date($enddate,'dayhourxcard',true);
+                    if ($fulldayevent)
+                    {
                         $prefix=';VALUE=DATE';
-					    $enddatef = dol_print_date($enddate+1,'dayxcard',false);
-					    //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
-					}
+                        $enddatef = dol_print_date($enddate+1,'dayxcard',false);
+                        //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
+                    }
                     fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
-					fwrite($calfileh,"END:VEVENT\n");
-				}
-
-				// Output the vCard/iCal VTODO object
-				// ...
-				//PERCENT-COMPLETE:39
-
-				// Output the vCard/iCal VJOURNAL object
-				if ($type == 'journal')
-				{
-					fwrite($calfileh,"BEGIN:VJOURNAL\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
-					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
-					}
-					if (! empty($url))
-					{
-						fwrite($calfileh,"URL:".$url."\n");
-					};
+                    fwrite($calfileh,'STATUS:CONFIRMED'."\n");
+                    if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
+                    if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+                    fwrite($calfileh,"END:VEVENT\n");
+                }
+
+                // Output the vCard/iCal VTODO object
+                // ...
+                //PERCENT-COMPLETE:39
+
+                // Output the vCard/iCal VJOURNAL object
+                if ($type == 'journal')
+                {
+                    fwrite($calfileh,"BEGIN:VJOURNAL\n");
+                    fwrite($calfileh,"UID:".$uid."\n");
+                    if (! empty($email))
+                    {
+                        fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
+                        fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+                    }
+                    if (! empty($url))
+                    {
+                        fwrite($calfileh,"URL:".$url."\n");
+                    };
 
                     if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
                     if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
-					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					fwrite($calfileh,"CATEGORIES:".$category."\n");
-					fwrite($calfileh,"LOCATION:".$location."\n");
-					fwrite($calfileh,"TRANSP:OPAQUE\n");
-					fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
+                    fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
+                    fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
+                    fwrite($calfileh,'STATUS:CONFIRMED'."\n");
+                    fwrite($calfileh,"CATEGORIES:".$category."\n");
+                    fwrite($calfileh,"LOCATION:".$location."\n");
+                    fwrite($calfileh,"TRANSP:OPAQUE\n");
+                    fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
+                    fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
 
-					fwrite($calfileh,"END:VJOURNAL\n");
-				}
+                    fwrite($calfileh,"END:VJOURNAL\n");
+                }
 
 
-				// Put other info in comment
-				/*
+                // Put other info in comment
+                /*
 				$comment=array();
 				$comment ['eid']			= $eid;
 				$comment ['url']			= $linktoevent;
@@ -263,21 +263,21 @@ 
 				$comment ['enddate']		= $enddate;
 				fwrite($calfileh,"COMMENT:" . serialize ($comment) . "\n");
 				*/
-			}
-		}
-
-		// Footer
-		fwrite($calfileh,"END:VCALENDAR");
-
-		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
-	else
-	{
-		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
-		return -2;
-	}
+            }
+        }
+
+        // Footer
+        fwrite($calfileh,"END:VCALENDAR");
+
+        fclose($calfileh);
+        if (! empty($conf->global->MAIN_UMASK))
+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+    }
+    else
+    {
+        dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
+        return -2;
+    }
 }
 
 /**
@@ -294,97 +294,97 @@ 
  */
 function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter='')
 {
-	global $user,$conf,$langs;
-	global $dolibarr_main_url_root;
+    global $user,$conf,$langs;
+    global $dolibarr_main_url_root;
 
-	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
+    dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+    if (empty($outputfile)) return -1;
 
-	$fichier=fopen($outputfile,'w');
-	if ($fichier)
-	{
-		$date=date("r");
+    $fichier=fopen($outputfile,'w');
+    if ($fichier)
+    {
+        $date=date("r");
 
-		// Print header
-		$form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
-		fwrite($fichier, $form);
-		fwrite($fichier, "\n");
-		$form='<rss version="2.0">';
-		fwrite($fichier, $form);
-		fwrite($fichier, "\n");
+        // Print header
+        $form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
+        fwrite($fichier, $form);
+        fwrite($fichier, "\n");
+        $form='<rss version="2.0">';
+        fwrite($fichier, $form);
+        fwrite($fichier, "\n");
 
-		$form="<channel>\n<title>".$title."</title>\n";
-		fwrite($fichier, $form);
+        $form="<channel>\n<title>".$title."</title>\n";
+        fwrite($fichier, $form);
 
-		$form='<description><![CDATA['.$desc.'.]]></description>'."\n".
+        $form='<description><![CDATA['.$desc.'.]]></description>'."\n".
 //		'<language>fr</language>'."\n".
-		'<copyright>Dolibarr</copyright>'."\n".
-		'<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
-		'<generator>Dolibarr</generator>'."\n";
-
-		// 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
-  		$url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
-		$form.='<link><![CDATA['.$url.']]></link>'."\n";
-
-		//print $form;
-		fwrite($fichier, $form);
-
-
-		foreach ($events_array as $key => $event)
-		{
-			$eventqualified=true;
-			if ($filter)
-			{
-				// TODO Add a filter
-
-				$eventqualified=false;
-			}
-
-			if ($eventqualified)
-			{
-				$uid		  = $event['uid'];
-				$startdate	  = $event['startdate'];
-				$summary  	  = $event['summary'];
-				$url		  = $event['url'];
-				$author		  = $event['author'];
-				$category	  = $event['category'];
-				/* No place inside a RSS
+        '<copyright>Dolibarr</copyright>'."\n".
+        '<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
+        '<generator>Dolibarr</generator>'."\n";
+
+        // 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
+            $url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+        $form.='<link><![CDATA['.$url.']]></link>'."\n";
+
+        //print $form;
+        fwrite($fichier, $form);
+
+
+        foreach ($events_array as $key => $event)
+        {
+            $eventqualified=true;
+            if ($filter)
+            {
+                // TODO Add a filter
+
+                $eventqualified=false;
+            }
+
+            if ($eventqualified)
+            {
+                $uid		  = $event['uid'];
+                $startdate	  = $event['startdate'];
+                $summary  	  = $event['summary'];
+                $url		  = $event['url'];
+                $author		  = $event['author'];
+                $category	  = $event['category'];
+                /* No place inside a RSS
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
                 $location     = $event['location'];
                 $email        = $event['email'];
                 */
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
-
-				fwrite($fichier, "<item>\n");
-				fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
-				fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
-				fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
-				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
-				fwrite($fichier, "<description><![CDATA[");
-				if ($description) fwrite($fichier, $description);
-				//else fwrite($fichier, 'NoDesc');
-				fwrite($fichier, "]]></description>\n");
-				fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
-				fwrite($fichier, "<guid isPermaLink=\"true\"><![CDATA[".$uid."]]></guid>\n");
-				fwrite($fichier, "<source><![CDATA[Dolibarr]]></source>\n");
-				fwrite($fichier, "</item>\n");
-			}
-		}
-
-		fwrite($fichier, '</channel>');
-		fwrite($fichier, "\n");
-		fwrite($fichier, '</rss>');
-
-		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
+                $description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
+                    $description=dol_string_nohtmltag($description,0);	// Remove html tags
+
+                fwrite($fichier, "<item>\n");
+                fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
+                fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
+                fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
+                fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
+                fwrite($fichier, "<description><![CDATA[");
+                if ($description) fwrite($fichier, $description);
+                //else fwrite($fichier, 'NoDesc');
+                fwrite($fichier, "]]></description>\n");
+                fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
+                fwrite($fichier, "<guid isPermaLink=\"true\"><![CDATA[".$uid."]]></guid>\n");
+                fwrite($fichier, "<source><![CDATA[Dolibarr]]></source>\n");
+                fwrite($fichier, "</item>\n");
+            }
+        }
+
+        fwrite($fichier, '</channel>');
+        fwrite($fichier, "\n");
+        fwrite($fichier, '</rss>');
+
+        fclose($fichier);
+        if (! empty($conf->global->MAIN_UMASK))
+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+    }
 }
 
 
@@ -397,25 +397,25 @@ 
  */
 function format_cal($format,$string)
 {
-	global $conf;
-
-	$newstring=$string;
-
-	if ($format == 'vcal')
-	{
-		$newstring=quotedPrintEncode($newstring);
-	}
-	if ($format == 'ical')
-	{
-		// Replace new lines chars by '\n'
-		$newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n".'/i','\n',$newstring);
-		// Must not exceed 75 char. Cut with "\r\n"+Space
-		$newstring=calEncode($newstring);
-	}
-
-	return $newstring;
+    global $conf;
+
+    $newstring=$string;
+
+    if ($format == 'vcal')
+    {
+        $newstring=quotedPrintEncode($newstring);
+    }
+    if ($format == 'ical')
+    {
+        // Replace new lines chars by '\n'
+        $newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
+        $newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
+        $newstring=preg_replace('/'."\n".'/i','\n',$newstring);
+        // Must not exceed 75 char. Cut with "\r\n"+Space
+        $newstring=calEncode($newstring);
+    }
+
+    return $newstring;
 }
 
 /**
@@ -427,45 +427,45 @@ 
  */
 function calEncode($line)
 {
-	$out = '';
-
-	$newpara = '';
-
-	// If mb_ functions exists, it's better to use them
-	if (function_exists('mb_strlen'))
-	{
-	    $strlength=mb_strlen($line, 'UTF-8');
-		for ($j = 0; $j <= ($strlength - 1); $j++)
-		{
-			$char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
-
-			if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
-			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
-				$newpara = '';
-			}
-			$newpara .= $char;
-		}
-		$out .= $newpara;
-	}
-	else
-	{
-	    $strlength=dol_strlen($line);
-		for ($j = 0; $j <= ($strlength - 1); $j++)
-		{
-			$char = substr($line, $j, 1);	// Take char at position $j
-
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
-			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
-				$newpara = '';
-			}
-			$newpara .= $char;
-		}
-		$out .= $newpara;
-	}
-
-	return trim($out);
+    $out = '';
+
+    $newpara = '';
+
+    // If mb_ functions exists, it's better to use them
+    if (function_exists('mb_strlen'))
+    {
+        $strlength=mb_strlen($line, 'UTF-8');
+        for ($j = 0; $j <= ($strlength - 1); $j++)
+        {
+            $char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
+
+            if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
+            {
+                $out .= $newpara . "\r\n ";	// CRLF + Space for cal
+                $newpara = '';
+            }
+            $newpara .= $char;
+        }
+        $out .= $newpara;
+    }
+    else
+    {
+        $strlength=dol_strlen($line);
+        for ($j = 0; $j <= ($strlength - 1); $j++)
+        {
+            $char = substr($line, $j, 1);	// Take char at position $j
+
+            if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
+            {
+                $out .= $newpara . "\r\n ";	// CRLF + Space for cal
+                $newpara = '';
+            }
+            $newpara .= $char;
+        }
+        $out .= $newpara;
+    }
+
+    return trim($out);
 }
 
 
@@ -478,33 +478,33 @@ 
  */
 function quotedPrintEncode($str,$forcal=0)
 {
-	$lines = preg_split("/\r\n/", $str);
-	$out = '';
-
-	foreach ($lines as $line)
-	{
-		$newpara = '';
-
-		$strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
-		for ($j = 0; $j <= ($strlength - 1); $j++)
-		{
-			$char = substr($line, $j, 1);
-			$ascii = ord($char);
-
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
-
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
-			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
-				$newpara = '';
-			}
-			$newpara .= $char;
-		}
-		$out .= $newpara;
-	}
-	return trim($out);
+    $lines = preg_split("/\r\n/", $str);
+    $out = '';
+
+    foreach ($lines as $line)
+    {
+        $newpara = '';
+
+        $strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
+        for ($j = 0; $j <= ($strlength - 1); $j++)
+        {
+            $char = substr($line, $j, 1);
+            $ascii = ord($char);
+
+            if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
+            $char = '=' . strtoupper(sprintf("%02X", $ascii));
+
+            if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+            {
+                $out .= $newpara . '=' . "\r\n";	// CRLF
+                if ($forcal) $out .= " ";		// + Space for cal
+                $newpara = '';
+            }
+            $newpara .= $char;
+        }
+        $out .= $newpara;
+    }
+    return trim($out);
 }
 
 /**
@@ -515,7 +515,7 @@ 
  */
 function quotedPrintDecode($str)
 {
-	$out = preg_replace('/=\r?\n/', '', $str);
-	$out = quoted_printable_decode($out);	// Available with PHP 4+
-	return trim($out);
+    $out = preg_replace('/=\r?\n/', '', $str);
+    $out = quoted_printable_decode($out);	// Available with PHP 4+
+    return trim($out);
 }

Spacing +129 added lines, -129 removed lines

@@ -32,66 +32,66 @@ 
  *	@param		string	$outputfile			Output file
  *	@return		int							<0 if ko, Nb of events in file if ok
  */
-function build_calfile($format,$title,$desc,$events_array,$outputfile)
+function build_calfile($format, $title, $desc, $events_array, $outputfile)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) return -1;
 
     // Note: A cal file is an UTF8 encoded file
-	$calfileh=fopen($outputfile,'w');
+	$calfileh = fopen($outputfile, 'w');
 	if ($calfileh)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$now=dol_now();
+		$now = dol_now();
 
-		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+		$encoding = '';
+		if ($format == 'vcal') $encoding = 'ENCODING=QUOTED-PRINTABLE:';
 
 		// Print header
-		fwrite($calfileh,"BEGIN:VCALENDAR\n");
-		fwrite($calfileh,"VERSION:2.0\n");
-		fwrite($calfileh,"METHOD:PUBLISH\n");
+		fwrite($calfileh, "BEGIN:VCALENDAR\n");
+		fwrite($calfileh, "VERSION:2.0\n");
+		fwrite($calfileh, "METHOD:PUBLISH\n");
 		//fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
-		fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
-		fwrite($calfileh,"CALSCALE:GREGORIAN\n");
-		fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
-        fwrite($calfileh,"X-WR-CALDESC:".$encoding.format_cal($format,$desc)."\n");
+		fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+		fwrite($calfileh, "CALSCALE:GREGORIAN\n");
+		fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
+        fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
         //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
-        if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
-        && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
-	        $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
-	        $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
-	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
-	        fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+        if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
+        && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60) {
+	        $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'hour');
+	        $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'min');
+	        $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'sec');
+	        fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
         }
 
 		foreach ($events_array as $key => $event)
 		{
-			$eventqualified=true;
+			$eventqualified = true;
 			if ($eventqualified)
 			{
 				// See http://fr.wikipedia.org/wiki/ICalendar for format
 				// See http://www.ietf.org/rfc/rfc2445.txt for RFC
-				$uid 		  = $event['uid'];
-				$type         = $event['type'];
-                $startdate    = $event['startdate'];
+				$uid = $event['uid'];
+				$type = $event['type'];
+                $startdate = $event['startdate'];
 				$duration	  = $event['duration'];
-				$enddate	  = $event['enddate'];
-				$summary  	  = $event['summary'];
+				$enddate = $event['enddate'];
+				$summary = $event['summary'];
 				$category	  = $event['category'];
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
 				$location     = $event['location'];
-				$email 		  = $event['email'];
-				$url		  = $event['url'];
-				$transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
-                $created      = $event['created'];
- 				$modified     = $event['modified'];
+				$email = $event['email'];
+				$url = $event['url'];
+				$transparency = $event['transparency']; // OPAQUE (busy) or TRANSPARENT (not busy)
+				$description = preg_replace('/<br[\s\/]?>/i', "\n", $event['desc']);
+ 				$description = dol_string_nohtmltag($description, 0); // Remove html tags
+                $created = $event['created'];
+ 				$modified = $event['modified'];
 
 				// Uncomment for tests
 				//$summary="Resume";
@@ -99,10 +99,10 @@ 
 				//$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
 
 				// Format
-				$summary=format_cal($format,$summary);
-				$description=format_cal($format,$description);
-				$category=format_cal($format,$category);
-				$location=format_cal($format,$location);
+				$summary = format_cal($format, $summary);
+				$description = format_cal($format, $description);
+				$category = format_cal($format, $category);
+				$location = format_cal($format, $location);
 
 				// Output the vCard/iCal VEVENT object
 				/*
@@ -140,22 +140,22 @@ 
                 */
 				if ($type == 'event')
 				{
-					fwrite($calfileh,"BEGIN:VEVENT\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
+					fwrite($calfileh, "BEGIN:VEVENT\n");
+					fwrite($calfileh, "UID:".$uid."\n");
+					if (!empty($email))
 					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+						fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+						fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 					}
-					if (! empty($url))
+					if (!empty($url))
 					{
-						fwrite($calfileh,"URL:".$url."\n");
+						fwrite($calfileh, "URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
-                    fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
+                    if ($created)  fwrite($calfileh, "CREATED:".dol_print_date($created, 'dayhourxcard', true)."\n");
+                    if ($modified) fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, 'dayhourxcard', true)."\n");
+                    fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+					fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
 
 					/* Other keys:
 					// Status values for a "VEVENT"
@@ -178,44 +178,44 @@ 
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
-                    if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
-                    if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    if (!empty($location)) fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
+					if ($fulldayevent) fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
+                    if ($fulldayevent) fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
 
 					// Date must be GMT dates
 					// Current date
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
+					fwrite($calfileh, "DTSTAMP:".dol_print_date($now, 'dayhourxcard', true)."\n");
 					// Start date
-                    $prefix='';
-                    $startdatef = dol_print_date($startdate,'dayhourxcard',true);
+                    $prefix = '';
+                    $startdatef = dol_print_date($startdate, 'dayhourxcard', true);
                     if ($fulldayevent)
 					{
-                        $prefix=';VALUE=DATE';
-					    $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
+                        $prefix = ';VALUE=DATE';
+					    $startdatef = dol_print_date($startdate, 'dayxcard', false); // Local time
 					}
-					fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
+					fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
                     // End date
 					if ($fulldayevent)
 					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
+    					if (empty($enddate)) $enddate = dol_time_plus_duree($startdate, 1, 'd');
 					}
 					else
 					{
-                        if (empty($enddate)) $enddate=$startdate+$duration;
+                        if (empty($enddate)) $enddate = $startdate + $duration;
 					}
-                    $prefix='';
-					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
+                    $prefix = '';
+					$enddatef = dol_print_date($enddate, 'dayhourxcard', true);
 					if ($fulldayevent)
 					{
-                        $prefix=';VALUE=DATE';
-					    $enddatef = dol_print_date($enddate+1,'dayxcard',false);
+                        $prefix = ';VALUE=DATE';
+					    $enddatef = dol_print_date($enddate + 1, 'dayxcard', false);
 					    //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
 					}
-                    fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
-					fwrite($calfileh,"END:VEVENT\n");
+                    fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
+					fwrite($calfileh, 'STATUS:CONFIRMED'."\n");
+					if (!empty($transparency)) fwrite($calfileh, "TRANSP:".$transparency."\n");
+					if (!empty($category)) fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
+					fwrite($calfileh, "END:VEVENT\n");
 				}
 
 				// Output the vCard/iCal VTODO object
@@ -225,30 +225,30 @@ 
 				// Output the vCard/iCal VJOURNAL object
 				if ($type == 'journal')
 				{
-					fwrite($calfileh,"BEGIN:VJOURNAL\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
+					fwrite($calfileh, "BEGIN:VJOURNAL\n");
+					fwrite($calfileh, "UID:".$uid."\n");
+					if (!empty($email))
 					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+						fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+						fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 					}
-					if (! empty($url))
+					if (!empty($url))
 					{
-						fwrite($calfileh,"URL:".$url."\n");
+						fwrite($calfileh, "URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
-					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					fwrite($calfileh,"CATEGORIES:".$category."\n");
-					fwrite($calfileh,"LOCATION:".$location."\n");
-					fwrite($calfileh,"TRANSP:OPAQUE\n");
-					fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
-
-					fwrite($calfileh,"END:VJOURNAL\n");
+                    if ($created)  fwrite($calfileh, "CREATED:".dol_print_date($created, 'dayhourxcard', true)."\n");
+                    if ($modified) fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, 'dayhourxcard', true)."\n");
+					fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+					fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+					fwrite($calfileh, 'STATUS:CONFIRMED'."\n");
+					fwrite($calfileh, "CATEGORIES:".$category."\n");
+					fwrite($calfileh, "LOCATION:".$location."\n");
+					fwrite($calfileh, "TRANSP:OPAQUE\n");
+					fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
+					fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, 'dayhourxcard', true)."\n");
+
+					fwrite($calfileh, "END:VJOURNAL\n");
 				}
 
 
@@ -267,10 +267,10 @@ 
 		}
 
 		// Footer
-		fwrite($calfileh,"END:VCALENDAR");
+		fwrite($calfileh, "END:VCALENDAR");
 
 		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 	}
 	else
@@ -292,43 +292,43 @@ 
  *	@param		string	$filter				Filter
  *	@return		int							<0 if ko, Nb of events in file if ok
  */
-function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter='')
+function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '')
 {
-	global $user,$conf,$langs;
+	global $user, $conf, $langs;
 	global $dolibarr_main_url_root;
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) return -1;
 
-	$fichier=fopen($outputfile,'w');
+	$fichier = fopen($outputfile, 'w');
 	if ($fichier)
 	{
-		$date=date("r");
+		$date = date("r");
 
 		// Print header
-		$form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
+		$form = '<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
 		fwrite($fichier, $form);
 		fwrite($fichier, "\n");
-		$form='<rss version="2.0">';
+		$form = '<rss version="2.0">';
 		fwrite($fichier, $form);
 		fwrite($fichier, "\n");
 
-		$form="<channel>\n<title>".$title."</title>\n";
+		$form = "<channel>\n<title>".$title."</title>\n";
 		fwrite($fichier, $form);
 
-		$form='<description><![CDATA['.$desc.'.]]></description>'."\n".
+		$form = '<description><![CDATA['.$desc.'.]]></description>'."\n".
 //		'<language>fr</language>'."\n".
 		'<copyright>Dolibarr</copyright>'."\n".
 		'<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
 		'<generator>Dolibarr</generator>'."\n";
 
 		// 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
-  		$url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
-		$form.='<link><![CDATA['.$url.']]></link>'."\n";
+  		$url = $urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+		$form .= '<link><![CDATA['.$url.']]></link>'."\n";
 
 		//print $form;
 		fwrite($fichier, $form);
@@ -336,12 +336,12 @@ 
 
 		foreach ($events_array as $key => $event)
 		{
-			$eventqualified=true;
+			$eventqualified = true;
 			if ($filter)
 			{
 				// TODO Add a filter
 
-				$eventqualified=false;
+				$eventqualified = false;
 			}
 
 			if ($eventqualified)
@@ -350,16 +350,16 @@ 
 				$startdate	  = $event['startdate'];
 				$summary  	  = $event['summary'];
 				$url		  = $event['url'];
-				$author		  = $event['author'];
-				$category	  = $event['category'];
+				$author = $event['author'];
+				$category = $event['category'];
 				/* No place inside a RSS
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
                 $location     = $event['location'];
                 $email        = $event['email'];
                 */
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
+				$description = preg_replace('/<br[\s\/]?>/i', "\n", $event['desc']);
+ 				$description = dol_string_nohtmltag($description, 0); // Remove html tags
 
 				fwrite($fichier, "<item>\n");
 				fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
@@ -382,7 +382,7 @@ 
 		fwrite($fichier, '</rss>');
 
 		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 	}
 }
@@ -395,24 +395,24 @@ 
  * 	@param 		string	$string		string to encode
  * 	@return		string				string encoded
  */
-function format_cal($format,$string)
+function format_cal($format, $string)
 {
 	global $conf;
 
-	$newstring=$string;
+	$newstring = $string;
 
 	if ($format == 'vcal')
 	{
-		$newstring=quotedPrintEncode($newstring);
+		$newstring = quotedPrintEncode($newstring);
 	}
 	if ($format == 'ical')
 	{
 		// Replace new lines chars by '\n'
-		$newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n".'/i','\n',$newstring);
+		$newstring = preg_replace('/'."\r\n".'/i', "\n", $newstring);
+		$newstring = preg_replace('/'."\n\r".'/i', "\n", $newstring);
+		$newstring = preg_replace('/'."\n".'/i', '\n', $newstring);
 		// Must not exceed 75 char. Cut with "\r\n"+Space
-		$newstring=calEncode($newstring);
+		$newstring = calEncode($newstring);
 	}
 
 	return $newstring;
@@ -434,14 +434,14 @@ 
 	// If mb_ functions exists, it's better to use them
 	if (function_exists('mb_strlen'))
 	{
-	    $strlength=mb_strlen($line, 'UTF-8');
+	    $strlength = mb_strlen($line, 'UTF-8');
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
-			$char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
+			$char = mb_substr($line, $j, 1, 'UTF-8'); // Take char at position $j
 
 			if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
 			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
+				$out .= $newpara."\r\n "; // CRLF + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -450,14 +450,14 @@ 
 	}
 	else
 	{
-	    $strlength=dol_strlen($line);
+	    $strlength = dol_strlen($line);
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
-			$char = substr($line, $j, 1);	// Take char at position $j
+			$char = substr($line, $j, 1); // Take char at position $j
 
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
+			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)
 			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
+				$out .= $newpara."\r\n "; // CRLF + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -476,7 +476,7 @@ 
  *	@param		int		$forcal		1=For cal
  *	@return		string 				String converted
  */
-function quotedPrintEncode($str,$forcal=0)
+function quotedPrintEncode($str, $forcal = 0)
 {
 	$lines = preg_split("/\r\n/", $str);
 	$out = '';
@@ -485,19 +485,19 @@ 
 	{
 		$newpara = '';
 
-		$strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
+		$strlength = strlen($line); // Do not use dol_strlen here, we need number of bytes
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
 			$char = substr($line, $j, 1);
 			$ascii = ord($char);
 
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			if ($ascii < 32 || $ascii == 61 || $ascii > 126)
+			$char = '='.strtoupper(sprintf("%02X", $ascii));
 
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+			if ((strlen($newpara) + strlen($char)) >= 76)	// Do not use dol_strlen here, we need number of bytes
 			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
+				$out .= $newpara.'='."\r\n"; // CRLF
+				if ($forcal) $out .= " "; // + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -516,6 +516,6 @@ 
 function quotedPrintDecode($str)
 {
 	$out = preg_replace('/=\r?\n/', '', $str);
-	$out = quoted_printable_decode($out);	// Available with PHP 4+
+	$out = quoted_printable_decode($out); // Available with PHP 4+
 	return trim($out);
 }

Braces +66 added lines, -30 removed lines

@@ -38,7 +38,9 @@ 
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+	if (empty($outputfile)) {
+	    return -1;
+	}
 
     // Note: A cal file is an UTF8 encoded file
 	$calfileh=fopen($outputfile,'w');
@@ -48,7 +50,9 @@ 
 		$now=dol_now();
 
 		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+		if ($format == 'vcal') {
+		    $encoding='ENCODING=QUOTED-PRINTABLE:';
+		}
 
 		// Print header
 		fwrite($calfileh,"BEGIN:VCALENDAR\n");
@@ -152,8 +156,12 @@ 
 						fwrite($calfileh,"URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    if ($created) {
+                        fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
+                    }
+                    if ($modified) {
+                        fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    }
                     fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 
@@ -178,9 +186,15 @@ 
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
-                    if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
-                    if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    if (! empty($location)) {
+                        fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
+                    }
+					if ($fulldayevent) {
+					    fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
+					}
+                    if ($fulldayevent) {
+                        fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    }
 
 					// Date must be GMT dates
 					// Current date
@@ -197,11 +211,14 @@ 
                     // End date
 					if ($fulldayevent)
 					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
-					}
-					else
+    					if (empty($enddate)) {
+    					    $enddate=dol_time_plus_duree($startdate,1,'d');
+    					}
+					} else
 					{
-                        if (empty($enddate)) $enddate=$startdate+$duration;
+                        if (empty($enddate)) {
+                            $enddate=$startdate+$duration;
+                        }
 					}
                     $prefix='';
 					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
@@ -213,8 +230,12 @@ 
 					}
                     fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
 					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+					if (! empty($transparency)) {
+					    fwrite($calfileh,"TRANSP:".$transparency."\n");
+					}
+					if (! empty($category)) {
+					    fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+					}
 					fwrite($calfileh,"END:VEVENT\n");
 				}
 
@@ -237,8 +258,12 @@ 
 						fwrite($calfileh,"URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    if ($created) {
+                        fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
+                    }
+                    if ($modified) {
+                        fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    }
 					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
@@ -270,10 +295,10 @@ 
 		fwrite($calfileh,"END:VCALENDAR");
 
 		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
-	else
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
+	} else
 	{
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
@@ -299,7 +324,9 @@ 
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+	if (empty($outputfile)) {
+	    return -1;
+	}
 
 	$fichier=fopen($outputfile,'w');
 	if ($fichier)
@@ -367,7 +394,9 @@ 
 				fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
 				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
 				fwrite($fichier, "<description><![CDATA[");
-				if ($description) fwrite($fichier, $description);
+				if ($description) {
+				    fwrite($fichier, $description);
+				}
 				//else fwrite($fichier, 'NoDesc');
 				fwrite($fichier, "]]></description>\n");
 				fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
@@ -382,8 +411,9 @@ 
 		fwrite($fichier, '</rss>');
 
 		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
 	}
 }
 
@@ -447,8 +477,7 @@ 
 			$newpara .= $char;
 		}
 		$out .= $newpara;
-	}
-	else
+	} else
 	{
 	    $strlength=dol_strlen($line);
 		for ($j = 0; $j <= ($strlength - 1); $j++)
@@ -491,13 +520,20 @@ 
 			$char = substr($line, $j, 1);
 			$ascii = ord($char);
 
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 ) {
+						$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			}
 
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+			if ((strlen($newpara) + strlen($char)) >= 76 ) {
+			    // Do not use dol_strlen here, we need number of bytes
 			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
+				$out .= $newpara . '=' . "\r\n";
+			}
+			// CRLF
+				if ($forcal) {
+				    $out .= " ";
+				}
+				// + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;

dolibarr/htdocs/core/lib/ticket.lib.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
     	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
     	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_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++;
     }

Indentation +19 added lines, -19 removed lines

@@ -78,12 +78,12 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
     {
-    	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-    	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
-    	$head[$h][1] = $langs->trans('ContactsAddresses');
-    	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
     }
 
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
@@ -107,8 +107,8 @@ 
     $head[$h][1] = $langs->trans('Events');
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
     {
-    	$head[$h][1].= '/';
-    	$head[$h][1].= $langs->trans("Agenda");
+        $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
     }
     $head[$h][2] = 'tabTicketLogs';
     $h++;
@@ -156,21 +156,21 @@ 
     print '<body id="mainbody" class="publicnewticketform" style="margin-top: 10px;">';
 
     if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
-    	// Print logo
-    	$urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+        // Print logo
+        $urllogo = DOL_BASE_URI . '/theme/login_logo.png';
 
         if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
-    	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/'.$mysoc->logo);
-    		$width = 128;
-    	} elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
+        } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
+            $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/'.$mysoc->logo);
+            $width = 128;
+        } elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
             $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
         }
-    	print '<center>';
-    	print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
-    	print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
-    	print '</center><br>';
+        print '<center>';
+        print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
+        print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
+        print '</center><br>';
     }
 
     print '<div style="margin-left: 50px; margin-right: 50px;">';

Spacing +23 added lines, -23 removed lines

@@ -70,7 +70,7 @@ 
 
     $h = 0;
     $head = array();
-    $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id=' . $object->track_id;
+    $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'tabTicket';
     $h++;
@@ -78,10 +78,10 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
     {
-    	$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.'/ticket/contact.php?track_id='.$object->track_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++;
     }
@@ -89,13 +89,13 @@ 
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
 
     // Attached files
-    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-    $upload_dir = $conf->ticket->dir_output . "/" . $object->track_id;
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    $upload_dir = $conf->ticket->dir_output."/".$object->track_id;
     $nbFiles = count(dol_dir_list($upload_dir, 'files'));
-    $head[$h][0] = dol_buildpath('/ticket/document.php', 1) . '?track_id=' . $object->track_id;
+    $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?track_id='.$object->track_id;
     $head[$h][1] = $langs->trans("Documents");
     if ($nbFiles > 0) {
-        $head[$h][1] .= ' <span class="badge">' . $nbFiles . '</span>';
+        $head[$h][1] .= ' <span class="badge">'.$nbFiles.'</span>';
     }
 
     $head[$h][2] = 'tabTicketDocument';
@@ -103,18 +103,18 @@ 
 
 
     // History
-    $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id=' . $object->track_id;
+    $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
     $head[$h][1] = $langs->trans('Events');
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
     {
-    	$head[$h][1].= '/';
-    	$head[$h][1].= $langs->trans("Agenda");
+    	$head[$h][1] .= '/';
+    	$head[$h][1] .= $langs->trans("Agenda");
     }
     $head[$h][2] = 'tabTicketLogs';
     $h++;
 
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');
 
 
     return $head;
@@ -126,7 +126,7 @@ 
  *    @param  string $car Char to generate key
  *     @return void
  */
-function generate_random_id($car=16)
+function generate_random_id($car = 16)
 {
     $string = "";
     $chaine = "abcdefghijklmnopqrstuvwxyz123456789";
@@ -155,21 +155,21 @@ 
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
     print '<body id="mainbody" class="publicnewticketform" style="margin-top: 10px;">';
 
-    if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
+    if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
     	// Print logo
-    	$urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+    	$urllogo = DOL_BASE_URI.'/theme/login_logo.png';
 
-        if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
-    	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/'.$mysoc->logo);
+        if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+    		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+    	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+    		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);
     		$width = 128;
-    	} elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
-            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
+    	} elseif (is_readable(DOL_BASE_URI.'/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';
         }
     	print '<center>';
-    	print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
-    	print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
+    	print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'"><img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" style="max-width: 440px" /></a><br>';
+    	print '<strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';
     	print '</center><br>';
     }
 

dolibarr/htdocs/core/lib/cron.lib.php

Indentation +57 added lines, -57 removed lines

@@ -55,25 +55,25 @@ 
  */
 function cron_prepare_head(Cronjob $object)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = dol_buildpath('/cron/card.php', 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("CronTask");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = dol_buildpath('/cron/card.php', 1).'?id='.$object->id;
+    $head[$h][1] = $langs->trans("CronTask");
+    $head[$h][2] = 'card';
+    $h++;
 
-	$head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -83,54 +83,54 @@ 
  */
 function dol_print_cron_urls()
 {
-	global $conf, $langs, $user;
-	global $dolibarr_main_url_root;
-
-	// 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
-
-	// Cron launch
-	print '<div class="div-table-responsive-no-min">';
-	print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+    global $conf, $langs, $user;
+    global $dolibarr_main_url_root;
+
+    // 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
+
+    // Cron launch
+    print '<div class="div-table-responsive-no-min">';
+    print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
+    $url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
+    print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+    print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
+    $url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
+    print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
     print '</div>';
     print '<br>';
     
-	$logintouse = 'firstadmin';
-	if ($user->admin) $logintouse = $user->login;
+    $logintouse = 'firstadmin';
+    if ($user->admin) $logintouse = $user->login;
 	
-	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
-
-	$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
-	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
-	print '<br>';
-
-	// Add note
-	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
-	{
-    	$linuxlike=1;
-    	if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-    	if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-    	print $langs->trans("Note").': ';
-    	if ($linuxlike)
-    	{
-    		print $langs->trans("CronExplainHowToRunUnix");
-    		print '<br>';
-    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	}
-    	else
-    	{
-    		print $langs->trans("CronExplainHowToRunWin");
-    	}
-	}
+    print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
+
+    $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+    print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
+    print '<br>';
+
+    // Add note
+    if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
+    {
+        $linuxlike=1;
+        if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
+        if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+        print $langs->trans("Note").': ';
+        if ($linuxlike)
+        {
+            print $langs->trans("CronExplainHowToRunUnix");
+            print '<br>';
+            print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+        }
+        else
+        {
+            print $langs->trans("CronExplainHowToRunWin");
+        }
+    }
 	
-	return 0;
+    return 0;
 }
 
 

Spacing +11 added lines, -11 removed lines

@@ -87,18 +87,18 @@ 
 	global $dolibarr_main_url_root;
 
 	// 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
 
 	// Cron launch
 	print '<div class="div-table-responsive-no-min">';
 	print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
+	print img_picto('', 'object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
+	print img_picto('', 'object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
     print '</div>';
     print '<br>';
     
@@ -107,22 +107,22 @@ 
 	
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
-	$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+	$file = '/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
 	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
 	print '<br>';
 
 	// Add note
 	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
 	{
-    	$linuxlike=1;
-    	if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-    	if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+    	$linuxlike = 1;
+    	if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+    	if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
     	print $langs->trans("Note").': ';
     	if ($linuxlike)
     	{
     		print $langs->trans("CronExplainHowToRunUnix");
     		print '<br>';
-    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
     	}
     	else
     	{

Braces +10 added lines, -5 removed lines

@@ -103,7 +103,9 @@ 
     print '<br>';
     
 	$logintouse = 'firstadmin';
-	if ($user->admin) $logintouse = $user->login;
+	if ($user->admin) {
+	    $logintouse = $user->login;
+	}
 	
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
@@ -115,16 +117,19 @@ 
 	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
 	{
     	$linuxlike=1;
-    	if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-    	if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+    	if (preg_match('/^win/i',PHP_OS)) {
+    	    $linuxlike=0;
+    	}
+    	if (preg_match('/^mac/i',PHP_OS)) {
+    	    $linuxlike=0;
+    	}
     	print $langs->trans("Note").': ';
     	if ($linuxlike)
     	{
     		print $langs->trans("CronExplainHowToRunUnix");
     		print '<br>';
     		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	}
-    	else
+    	} else
     	{
     		print $langs->trans("CronExplainHowToRunWin");
     	}

dolibarr/htdocs/core/lib/report.lib.php

Indentation +81 added lines, -81 removed lines

@@ -40,86 +40,86 @@
  */
 function report_header($reportname,$notused,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
 {
-	global $langs;
-
-	if (empty($hselected)) $hselected='report';
-
-	print "\n\n<!-- start banner of report -->\n";
-
-	if(! empty($varlink)) $varlink = '?'.$varlink;
-
-	$h=0;
-	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
-	$head[$h][1] = $langs->trans("Report");
-	$head[$h][2] = 'report';
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
-
-	dol_fiche_head($head, 'report');
-
-	foreach($moreparam as $key => $value)
-	{
-		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
-	}
-	print '<table width="100%" class="border">';
-
-	$variante = ($periodlink || $exportlink);
-
-	// Ligne de titre
-	print '<tr>';
-	print '<td width="110">'.$langs->trans("ReportName").'</td>';
-	print '<td>';
-	print $reportname;
-	print '</td>';
-	if ($variante) print '<td></td>';
-	print '</tr>';
-
-	// Calculation mode
-	if ($calcmode)
-	{
-		print '<tr>';
-		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-		print '<td>';
-		print $calcmode;
-		if ($variante) print '<td></td>';
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Ligne de la periode d'analyse du rapport
-	print '<tr>';
-	print '<td>'.$langs->trans("ReportPeriod").'</td>';
-	print '<td>';
-	if ($period) print $period;
-	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
-	print '</td>';
-	print '</tr>';
-
-	// Ligne de description
-	print '<tr>';
-	print '<td>'.$langs->trans("ReportDescription").'</td>';
-	print '<td>'.$description.'</td>';
-	if ($variante) print '<td></td>';
-	print '</tr>';
-
-	// Ligne d'export
-	print '<tr>';
-	print '<td>'.$langs->trans("GeneratedOn").'</td>';
-	print '<td>';
-	print dol_print_date($builddate, 'dayhour');
-	print '</td>';
-	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
-	print '</tr>';
-
-	print '</table>';
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
-
-	print '</form>';
-	print '<br>';
-
-	print "\n<!-- end banner of report -->\n\n";
+    global $langs;
+
+    if (empty($hselected)) $hselected='report';
+
+    print "\n\n<!-- start banner of report -->\n";
+
+    if(! empty($varlink)) $varlink = '?'.$varlink;
+
+    $h=0;
+    $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
+    $head[$h][1] = $langs->trans("Report");
+    $head[$h][2] = 'report';
+
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
+
+    dol_fiche_head($head, 'report');
+
+    foreach($moreparam as $key => $value)
+    {
+            print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+    }
+    print '<table width="100%" class="border">';
+
+    $variante = ($periodlink || $exportlink);
+
+    // Ligne de titre
+    print '<tr>';
+    print '<td width="110">'.$langs->trans("ReportName").'</td>';
+    print '<td>';
+    print $reportname;
+    print '</td>';
+    if ($variante) print '<td></td>';
+    print '</tr>';
+
+    // Calculation mode
+    if ($calcmode)
+    {
+        print '<tr>';
+        print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
+        print '<td>';
+        print $calcmode;
+        if ($variante) print '<td></td>';
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Ligne de la periode d'analyse du rapport
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportPeriod").'</td>';
+    print '<td>';
+    if ($period) print $period;
+    if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
+    print '</td>';
+    print '</tr>';
+
+    // Ligne de description
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportDescription").'</td>';
+    print '<td>'.$description.'</td>';
+    if ($variante) print '<td></td>';
+    print '</tr>';
+
+    // Ligne d'export
+    print '<tr>';
+    print '<td>'.$langs->trans("GeneratedOn").'</td>';
+    print '<td>';
+    print dol_print_date($builddate, 'dayhour');
+    print '</td>';
+    if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+    print '</tr>';
+
+    print '</table>';
+
+    dol_fiche_end();
+
+    print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
+
+    print '</form>';
+    print '<br>';
+
+    print "\n<!-- end banner of report -->\n\n";
 }
 

Spacing +5 added lines, -5 removed lines

@@ -38,17 +38,17 @@ 
  *  @param  string              $varlink        Add a variable into the address of the page
  *	@return	void
  */
-function report_header($reportname,$notused,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
+function report_header($reportname, $notused, $period, $periodlink, $description, $builddate, $exportlink = '', $moreparam = array(), $calcmode = '', $varlink = '')
 {
 	global $langs;
 
-	if (empty($hselected)) $hselected='report';
+	if (empty($hselected)) $hselected = 'report';
 
 	print "\n\n<!-- start banner of report -->\n";
 
-	if(! empty($varlink)) $varlink = '?'.$varlink;
+	if (!empty($varlink)) $varlink = '?'.$varlink;
 
-	$h=0;
+	$h = 0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
 	$head[$h][1] = $langs->trans("Report");
 	$head[$h][2] = 'report';
@@ -57,7 +57,7 @@ 
 
 	dol_fiche_head($head, 'report');
 
-	foreach($moreparam as $key => $value)
+	foreach ($moreparam as $key => $value)
 	{
 		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}

Braces +24 added lines, -8 removed lines

@@ -42,11 +42,15 @@ 
 {
 	global $langs;
 
-	if (empty($hselected)) $hselected='report';
+	if (empty($hselected)) {
+	    $hselected='report';
+	}
 
 	print "\n\n<!-- start banner of report -->\n";
 
-	if(! empty($varlink)) $varlink = '?'.$varlink;
+	if(! empty($varlink)) {
+	    $varlink = '?'.$varlink;
+	}
 
 	$h=0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
@@ -71,7 +75,9 @@ 
 	print '<td>';
 	print $reportname;
 	print '</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+	    print '<td></td>';
+	}
 	print '</tr>';
 
 	// Calculation mode
@@ -81,7 +87,9 @@ 
 		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
 		print '<td>';
 		print $calcmode;
-		if ($variante) print '<td></td>';
+		if ($variante) {
+		    print '<td></td>';
+		}
 		print '</td>';
 		print '</tr>';
 	}
@@ -90,8 +98,12 @@ 
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
 	print '<td>';
-	if ($period) print $period;
-	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
+	if ($period) {
+	    print $period;
+	}
+	if ($variante) {
+	    print '<td class="nowraponall">'.$periodlink.'</td>';
+	}
 	print '</td>';
 	print '</tr>';
 
@@ -99,7 +111,9 @@ 
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportDescription").'</td>';
 	print '<td>'.$description.'</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+	    print '<td></td>';
+	}
 	print '</tr>';
 
 	// Ligne d'export
@@ -108,7 +122,9 @@ 
 	print '<td>';
 	print dol_print_date($builddate, 'dayhour');
 	print '</td>';
-	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	if ($variante) {
+	    print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	}
 	print '</tr>';
 
 	print '</table>';

dolibarr/htdocs/core/actions_sendmails.inc.php

Indentation +394 added lines, -394 removed lines

@@ -34,16 +34,16 @@ 
  */
 if (GETPOST('addfile','alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
+    $trackid = GETPOST('trackid','aZ09');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
 
-	dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, $trackid, 0);
-	$action='presend';
+    dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, $trackid, 0);
+    $action='presend';
 }
 
 /*
@@ -51,18 +51,18 @@ 
  */
 if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
 {
-	$trackid = GETPOST('trackid','aZ09');
+    $trackid = GETPOST('trackid','aZ09');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
 
-	// TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
-	// GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
-	dol_remove_file_process(GETPOST('removedfile','alpha'), 0, 1, $trackid);   // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
-	$action='presend';
+    // TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
+    // GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
+    dol_remove_file_process(GETPOST('removedfile','alpha'), 0, 1, $trackid);   // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
+    $action='presend';
 }
 
 /*
@@ -70,31 +70,31 @@ 
  */
 if (GETPOST('removAll','alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
-
-	$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]);
-
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->trackid = $trackid;
-
-	foreach($listofpaths as $key => $value)
-	{
-		$pathtodelete = $value;
-		$filetodelete = $listofnames[$key];
-		$result = dol_delete_file($pathtodelete,1); // Delete uploded Files
-
-		$langs->load("other");
-		setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
-
-		$formmail->remove_attached_files($key); // Update Session
-	}
+    $trackid = GETPOST('trackid','aZ09');
+
+    $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]);
+
+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+    $formmail->trackid = $trackid;
+
+    foreach($listofpaths as $key => $value)
+    {
+        $pathtodelete = $value;
+        $filetodelete = $listofnames[$key];
+        $result = dol_delete_file($pathtodelete,1); // Delete uploded Files
+
+        $langs->load("other");
+        setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+
+        $formmail->remove_attached_files($key); // Update Session
+    }
 }
 
 /*
@@ -102,244 +102,244 @@ 
  */
 if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
 {
-	if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
-
-	$subject='';$actionmsg='';$actionmsg2='';
-
-	$langs->load('mails');
-
-	if (is_object($object))
-	{
-		$result=$object->fetch($id);
-
-		$sendtosocid=0;    // Thirdparty on object
-		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
-		{
-			$result=$object->fetch_thirdparty();
-			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
-			$thirdparty=$object->thirdparty;
-			$sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'member' || $object->element == 'user')
-		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'societe')
-		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'contact')
-		{
-			$contact=$object;
-			if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
-		}
-		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
-
-		if (is_object($hookmanager))
-		{
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		}
-	}
-	else $thirdparty = $mysoc;
-
-	if ($result > 0)
-	{
-		$sendto='';
-		$sendtocc='';
-		$sendtobcc='';
-		$sendtoid = array();
-		$sendtouserid=array();
-		$sendtoccuserid=array();
-
-		// Define $sendto
-		$receiver=$_POST['receiver'];
-		if (! is_array($receiver))
-		{
-			if ($receiver == '-1') $receiver=array();
-			else $receiver=array($receiver);
-		}
-		$tmparray=array();
-		if (trim($_POST['sendto']))
-		{
-			// Recipients are provided into free text
-			$tmparray[] = trim($_POST['sendto']);
-		}
-		if (count($receiver)>0)
-		{
-			foreach($receiver as $key=>$val)
-			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
-				{
-					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
-				{
-					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// Id du contact
-				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
-					$sendtoid[] = $val;
-				}
-			}
-		}
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-		{
-			$receiveruser=$_POST['receiveruser'];
-			if (is_array($receiveruser) && count($receiveruser)>0)
-			{
-				$fuserdest = new User($db);
-				foreach($receiveruser as $key=>$val)
-				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
-					$sendtouserid[] = $val;
-				}
-			}
-		}
-
-		$sendto=implode(',',$tmparray);
-
-		// Define $sendtocc
-		$receivercc=$_POST['receivercc'];
-		if (! is_array($receivercc))
-		{
-			if ($receivercc == '-1') $receivercc=array();
-			else $receivercc=array($receivercc);
-		}
-		$tmparray=array();
-		if (trim($_POST['sendtocc']))
-		{
-			$tmparray[] = trim($_POST['sendtocc']);
-		}
-		if (count($receivercc) > 0)
-		{
-			foreach($receivercc as $key=>$val)
-			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
-				{
-					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
-				{
-					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// Id du contact
-				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
-					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
-				}
-			}
-		}
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-			$receiverccuser=$_POST['receiverccuser'];
-
-			if (is_array($receiverccuser) && count($receiverccuser)>0)
-			{
-				$fuserdest = new User($db);
-				foreach($receiverccuser as $key=>$val)
-				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
-					$sendtoccuserid[] = $val;
-				}
-			}
-		}
-		$sendtocc=implode(',',$tmparray);
-
-		if (dol_strlen($sendto))
-		{
+    if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
+
+    $subject='';$actionmsg='';$actionmsg2='';
+
+    $langs->load('mails');
+
+    if (is_object($object))
+    {
+        $result=$object->fetch($id);
+
+        $sendtosocid=0;    // Thirdparty on object
+        if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
+        {
+            $result=$object->fetch_thirdparty();
+            if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
+            $thirdparty=$object->thirdparty;
+            $sendtosocid=$thirdparty->id;
+        }
+        else if ($object->element == 'member' || $object->element == 'user')
+        {
+            $thirdparty=$object;
+            if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+        }
+        else if ($object->element == 'societe')
+        {
+            $thirdparty=$object;
+            if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+        }
+        else if ($object->element == 'contact')
+        {
+            $contact=$object;
+            if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+        }
+        else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
+
+        if (is_object($hookmanager))
+        {
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        }
+    }
+    else $thirdparty = $mysoc;
+
+    if ($result > 0)
+    {
+        $sendto='';
+        $sendtocc='';
+        $sendtobcc='';
+        $sendtoid = array();
+        $sendtouserid=array();
+        $sendtoccuserid=array();
+
+        // Define $sendto
+        $receiver=$_POST['receiver'];
+        if (! is_array($receiver))
+        {
+            if ($receiver == '-1') $receiver=array();
+            else $receiver=array($receiver);
+        }
+        $tmparray=array();
+        if (trim($_POST['sendto']))
+        {
+            // Recipients are provided into free text
+            $tmparray[] = trim($_POST['sendto']);
+        }
+        if (count($receiver)>0)
+        {
+            foreach($receiver as $key=>$val)
+            {
+                // Recipient was provided from combo list
+                if ($val == 'thirdparty') // Id of third party
+                {
+                    $tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
+                }
+                // Recipient was provided from combo list
+                elseif ($val == 'contact') // Id of contact
+                {
+                    $tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
+                }
+                elseif ($val)	// Id du contact
+                {
+                    $tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+                    $sendtoid[] = $val;
+                }
+            }
+        }
+        if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+        {
+            $receiveruser=$_POST['receiveruser'];
+            if (is_array($receiveruser) && count($receiveruser)>0)
+            {
+                $fuserdest = new User($db);
+                foreach($receiveruser as $key=>$val)
+                {
+                    $tmparray[] = $fuserdest->user_get_property($val,'email');
+                    $sendtouserid[] = $val;
+                }
+            }
+        }
+
+        $sendto=implode(',',$tmparray);
+
+        // Define $sendtocc
+        $receivercc=$_POST['receivercc'];
+        if (! is_array($receivercc))
+        {
+            if ($receivercc == '-1') $receivercc=array();
+            else $receivercc=array($receivercc);
+        }
+        $tmparray=array();
+        if (trim($_POST['sendtocc']))
+        {
+            $tmparray[] = trim($_POST['sendtocc']);
+        }
+        if (count($receivercc) > 0)
+        {
+            foreach($receivercc as $key=>$val)
+            {
+                // Recipient was provided from combo list
+                if ($val == 'thirdparty') // Id of third party
+                {
+                    $tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
+                }
+                // Recipient was provided from combo list
+                elseif ($val == 'contact') // Id of contact
+                {
+                    $tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
+                }
+                elseif ($val)	// Id du contact
+                {
+                    $tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+                    //$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+                }
+            }
+        }
+        if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+            $receiverccuser=$_POST['receiverccuser'];
+
+            if (is_array($receiverccuser) && count($receiverccuser)>0)
+            {
+                $fuserdest = new User($db);
+                foreach($receiverccuser as $key=>$val)
+                {
+                    $tmparray[] = $fuserdest->user_get_property($val,'email');
+                    $sendtoccuserid[] = $val;
+                }
+            }
+        }
+        $sendtocc=implode(',',$tmparray);
+
+        if (dol_strlen($sendto))
+        {
             // 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
 
-		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-
-			$langs->load("commercial");
-
-			$fromtype = GETPOST('fromtype','alpha');
-			if ($fromtype === 'robot') {
-				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
-				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
-				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $user->email_aliases);
-				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
-				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
-				$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
-				$resql = $db->query($sql);
-				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
-					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
-				}
-			}
-			else {
-				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
-			}
-
-			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
-			$message = GETPOST('message','none');
-			$subject = GETPOST('subject','none');
-
-			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
-			// <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.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
-
-			$sendtobcc= GETPOST('sendtoccc');
-			// Autocomplete the $sendtobcc
-			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if (! empty($autocopy))
-			{
-				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
-			}
-
-			$deliveryreceipt = $_POST['deliveryreceipt'];
-
-			if ($action == 'send' || $action == 'relance')
-			{
-				$actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
-				if ($message)
-				{
-					$actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
-					$actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-					$actionmsg = dol_concatdesc($actionmsg, $message);
-				}
-			}
-
-			// Create form object
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			$formmail->trackid = $trackid;      // $trackid must be defined
-
-			$attachedfiles=$formmail->get_attached_files();
-			$filepath = $attachedfiles['paths'];
-			$filename = $attachedfiles['names'];
-			$mimetype = $attachedfiles['mimes'];
-
-			// Feature to push mail sent into Sent folder
-			/* This code must be now included into the hook mail, method sendMailAfter
+            require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+
+            $langs->load("commercial");
+
+            $fromtype = GETPOST('fromtype','alpha');
+            if ($fromtype === 'robot') {
+                $from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
+            }
+            elseif ($fromtype === 'user') {
+                $from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
+            }
+            elseif ($fromtype === 'company') {
+                $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+            }
+            elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+                $tmp=explode(',', $user->email_aliases);
+                $from = trim($tmp[($reg[1] - 1)]);
+            }
+            elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+                $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+                $from = trim($tmp[($reg[1] - 1)]);
+            }
+            elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+                $sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
+                $resql = $db->query($sql);
+                $obj = $db->fetch_object($resql);
+                if ($obj)
+                {
+                    $from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
+                }
+            }
+            else {
+                $from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
+            }
+
+            $replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
+            $message = GETPOST('message','none');
+            $subject = GETPOST('subject','none');
+
+            // Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
+            // <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.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+            $message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
+
+            $sendtobcc= GETPOST('sendtoccc');
+            // Autocomplete the $sendtobcc
+            // $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
+            if (! empty($autocopy))
+            {
+                $sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
+            }
+
+            $deliveryreceipt = $_POST['deliveryreceipt'];
+
+            if ($action == 'send' || $action == 'relance')
+            {
+                $actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
+                if ($message)
+                {
+                    $actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
+                    $actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
+                    if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+                    $actionmsg = dol_concatdesc($actionmsg, $message);
+                }
+            }
+
+            // Create form object
+            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+            $formmail = new FormMail($db);
+            $formmail->trackid = $trackid;      // $trackid must be defined
+
+            $attachedfiles=$formmail->get_attached_files();
+            $filepath = $attachedfiles['paths'];
+            $filename = $attachedfiles['names'];
+            $mimetype = $attachedfiles['mimes'];
+
+            // Feature to push mail sent into Sent folder
+            /* This code must be now included into the hook mail, method sendMailAfter
 			if (! empty($conf->dolimail->enabled))
 			{
 				$mailfromid = explode("#", $_POST['frommail'],3);	// $_POST['frommail'] = 'aaa#Sent# <aaa@aaa.com>'	// TODO Use a better way to define Sent dir.
@@ -382,39 +382,39 @@ 
 			}
 			*/
 
-			// Make substitution in email content
-			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
-			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
-
-			$parameters=array('mode'=>'formemail');
-			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
-
-			$subject=make_substitutions($subject, $substitutionarray);
-			$message=make_substitutions($message, $substitutionarray);
-
-			if (method_exists($object, 'makeSubstitution'))
-			{
-				$subject = $object->makeSubstitution($subject);
-				$message = $object->makeSubstitution($message);
-			}
-
-			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
-			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
-
-			if ($mailfile->error)
-			{
-				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-				$action='presend';
-			}
-			else
-			{
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					// Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
-					/*
+            // Make substitution in email content
+            $substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
+            $substitutionarray['__EMAIL__'] = $sendto;
+            $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
+
+            $parameters=array('mode'=>'formemail');
+            complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
+
+            $subject=make_substitutions($subject, $substitutionarray);
+            $message=make_substitutions($message, $substitutionarray);
+
+            if (method_exists($object, 'makeSubstitution'))
+            {
+                $subject = $object->makeSubstitution($subject);
+                $message = $object->makeSubstitution($message);
+            }
+
+            // Send mail (substitutionarray must be done just before this)
+            if (empty($sendcontext)) $sendcontext = 'standard';
+            $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
+
+            if ($mailfile->error)
+            {
+                setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+                $action='presend';
+            }
+            else
+            {
+                $result=$mailfile->sendfile();
+                if ($result)
+                {
+                    // Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
+                    /*
 					if (! empty($conf->dolimail->enabled))
 					{
 						$mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0);	// Original mail id is set ?
@@ -434,91 +434,91 @@ 
 						}
 					}*/
 
-					// Initialisation of datas of object to call trigger
-					if (is_object($object))
-					{
-					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
-
-						$object->socid			= $sendtosocid;	   // To link to a company
-						$object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
-						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-						$object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
-						$object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
-
-						$object->trackid        = $trackid;
-						$object->fk_element		= $object->id;
-						$object->elementtype	= $object->element;
-						if (is_array($attachedfiles) && count($attachedfiles)>0) {
-							$object->attachedfiles	= $attachedfiles;
-						}
-						if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-							$object->sendtouserid	= $sendtouserid;
-						}
-
-						$object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
-						$object->email_from = $from;
-						$object->email_subject = $subject;
-						$object->email_to = $sendto;
-						$object->email_tocc = $sendtocc;
-						$object->email_tobcc = $sendtobcc;
-						$object->email_subject = $subject;
-						$object->email_msgid = $mailfile->msgid;
-
-						// Call of triggers
-						if (! empty($trigger_name))
-						{
-    						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    						$interface=new Interfaces($db);
-    						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-							if ($result < 0) {
-    							setEventMessages($interface->error, $interface->errors, 'errors');
-    						}
-						}
-					}
-
-					// Redirect here
-					// This avoid sending mail twice if going out and then back to page
-					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
-					setEventMessages($mesg, null, 'mesgs');
-
-  					$moreparam='';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
-		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
-			  		exit;
-				}
-				else
-				{
-					$langs->load("other");
-					$mesg='<div class="error">';
-					if ($mailfile->error)
-					{
-						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-						$mesg.='<br>'.$mailfile->error;
-					}
-					else
-					{
-						$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-					}
-					$mesg.='</div>';
-
-					setEventMessages($mesg, null, 'warnings');
-					$action = 'presend';
-				}
-			}
-		}
-		else
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
-			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
-			$action = 'presend';
-		}
-	}
-	else
-	{
-		$langs->load("other");
-		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
-		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
-		$action = 'presend';
-	}
+                    // Initialisation of datas of object to call trigger
+                    if (is_object($object))
+                    {
+                        if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+
+                        $object->socid			= $sendtosocid;	   // To link to a company
+                        $object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
+                        $object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+                        $object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
+                        $object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
+
+                        $object->trackid        = $trackid;
+                        $object->fk_element		= $object->id;
+                        $object->elementtype	= $object->element;
+                        if (is_array($attachedfiles) && count($attachedfiles)>0) {
+                            $object->attachedfiles	= $attachedfiles;
+                        }
+                        if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+                            $object->sendtouserid	= $sendtouserid;
+                        }
+
+                        $object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
+                        $object->email_from = $from;
+                        $object->email_subject = $subject;
+                        $object->email_to = $sendto;
+                        $object->email_tocc = $sendtocc;
+                        $object->email_tobcc = $sendtobcc;
+                        $object->email_subject = $subject;
+                        $object->email_msgid = $mailfile->msgid;
+
+                        // Call of triggers
+                        if (! empty($trigger_name))
+                        {
+                            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                            $interface=new Interfaces($db);
+                            $result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+                            if ($result < 0) {
+                                setEventMessages($interface->error, $interface->errors, 'errors');
+                            }
+                        }
+                    }
+
+                    // Redirect here
+                    // This avoid sending mail twice if going out and then back to page
+                    $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+                    setEventMessages($mesg, null, 'mesgs');
+
+                        $moreparam='';
+                        if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+                        header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
+                        exit;
+                }
+                else
+                {
+                    $langs->load("other");
+                    $mesg='<div class="error">';
+                    if ($mailfile->error)
+                    {
+                        $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                        $mesg.='<br>'.$mailfile->error;
+                    }
+                    else
+                    {
+                        $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                    }
+                    $mesg.='</div>';
+
+                    setEventMessages($mesg, null, 'warnings');
+                    $action = 'presend';
+                }
+            }
+        }
+        else
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
+            dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
+            $action = 'presend';
+        }
+    }
+    else
+    {
+        $langs->load("other");
+        setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
+        dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
+        $action = 'presend';
+    }
 }

Spacing +132 added lines, -132 removed lines

@@ -32,66 +32,66 @@ 
 /*
  * Add file in email form
  */
-if (GETPOST('addfile','alpha'))
+if (GETPOST('addfile', 'alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
+	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+	$vardir = $conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
 
 	dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, $trackid, 0);
-	$action='presend';
+	$action = 'presend';
 }
 
 /*
  * Remove file in email form
  */
-if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
+if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
 {
-	$trackid = GETPOST('trackid','aZ09');
+	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+	$vardir = $conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
 
 	// TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
 	// GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
-	dol_remove_file_process(GETPOST('removedfile','alpha'), 0, 1, $trackid);   // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
-	$action='presend';
+	dol_remove_file_process(GETPOST('removedfile', 'alpha'), 0, 1, $trackid); // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
+	$action = 'presend';
 }
 
 /*
  * Remove all files in email form
  */
-if (GETPOST('removAll','alpha'))
+if (GETPOST('removAll', 'alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
+	$trackid = GETPOST('trackid', 'aZ09');
 
-	$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]);
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->trackid = $trackid;
 
-	foreach($listofpaths as $key => $value)
+	foreach ($listofpaths as $key => $value)
 	{
 		$pathtodelete = $value;
 		$filetodelete = $listofnames[$key];
-		$result = dol_delete_file($pathtodelete,1); // Delete uploded Files
+		$result = dol_delete_file($pathtodelete, 1); // Delete uploded Files
 
 		$langs->load("other");
-		setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+		setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 
 		$formmail->remove_attached_files($key); // Update Session
 	}
@@ -100,76 +100,76 @@ 
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
+if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected'])
 {
-	if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
+	if (empty($trackid)) $trackid = GETPOST('trackid', 'aZ09');
 
-	$subject='';$actionmsg='';$actionmsg2='';
+	$subject = ''; $actionmsg = ''; $actionmsg2 = '';
 
 	$langs->load('mails');
 
 	if (is_object($object))
 	{
-		$result=$object->fetch($id);
+		$result = $object->fetch($id);
 
-		$sendtosocid=0;    // Thirdparty on object
-		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
+		$sendtosocid = 0; // Thirdparty on object
+		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('societe', 'member', 'user', 'expensereport', 'contact')))
 		{
-			$result=$object->fetch_thirdparty();
-			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
-			$thirdparty=$object->thirdparty;
-			$sendtosocid=$thirdparty->id;
+			$result = $object->fetch_thirdparty();
+			if ($object->element == 'user' && $result == 0) $result = 1; // Even if not found, we consider ok
+			$thirdparty = $object->thirdparty;
+			$sendtosocid = $thirdparty->id;
 		}
 		else if ($object->element == 'member' || $object->element == 'user')
 		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+			$thirdparty = $object;
+			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
 		}
 		else if ($object->element == 'societe')
 		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+			$thirdparty = $object;
+			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
 		}
 		else if ($object->element == 'contact')
 		{
-			$contact=$object;
-			if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+			$contact = $object;
+			if ($contact->id > 0) $sendtosocid = $contact->fetch_thirdparty()->id;
 		}
-		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
+		else dol_print_error('', 'Use actions_sendmails.in.php for an element/object that is not supported');
 
 		if (is_object($hookmanager))
 		{
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
 	}
 	else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
-		$sendto='';
-		$sendtocc='';
-		$sendtobcc='';
+		$sendto = '';
+		$sendtocc = '';
+		$sendtobcc = '';
 		$sendtoid = array();
-		$sendtouserid=array();
-		$sendtoccuserid=array();
+		$sendtouserid = array();
+		$sendtoccuserid = array();
 
 		// Define $sendto
-		$receiver=$_POST['receiver'];
-		if (! is_array($receiver))
+		$receiver = $_POST['receiver'];
+		if (!is_array($receiver))
 		{
-			if ($receiver == '-1') $receiver=array();
-			else $receiver=array($receiver);
+			if ($receiver == '-1') $receiver = array();
+			else $receiver = array($receiver);
 		}
-		$tmparray=array();
+		$tmparray = array();
 		if (trim($_POST['sendto']))
 		{
 			// Recipients are provided into free text
 			$tmparray[] = trim($_POST['sendto']);
 		}
-		if (count($receiver)>0)
+		if (count($receiver) > 0)
 		{
-			foreach($receiver as $key=>$val)
+			foreach ($receiver as $key=>$val)
 			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
@@ -183,42 +183,42 @@ 
 				}
 				elseif ($val)	// Id du contact
 				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
 				}
 			}
 		}
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
 		{
-			$receiveruser=$_POST['receiveruser'];
-			if (is_array($receiveruser) && count($receiveruser)>0)
+			$receiveruser = $_POST['receiveruser'];
+			if (is_array($receiveruser) && count($receiveruser) > 0)
 			{
 				$fuserdest = new User($db);
-				foreach($receiveruser as $key=>$val)
+				foreach ($receiveruser as $key=>$val)
 				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
+					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtouserid[] = $val;
 				}
 			}
 		}
 
-		$sendto=implode(',',$tmparray);
+		$sendto = implode(',', $tmparray);
 
 		// Define $sendtocc
-		$receivercc=$_POST['receivercc'];
-		if (! is_array($receivercc))
+		$receivercc = $_POST['receivercc'];
+		if (!is_array($receivercc))
 		{
-			if ($receivercc == '-1') $receivercc=array();
-			else $receivercc=array($receivercc);
+			if ($receivercc == '-1') $receivercc = array();
+			else $receivercc = array($receivercc);
 		}
-		$tmparray=array();
+		$tmparray = array();
 		if (trim($_POST['sendtocc']))
 		{
 			$tmparray[] = trim($_POST['sendtocc']);
 		}
 		if (count($receivercc) > 0)
 		{
-			foreach($receivercc as $key=>$val)
+			foreach ($receivercc as $key=>$val)
 			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
@@ -232,57 +232,57 @@ 
 				}
 				elseif ($val)	// Id du contact
 				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 				}
 			}
 		}
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-			$receiverccuser=$_POST['receiverccuser'];
+			$receiverccuser = $_POST['receiverccuser'];
 
-			if (is_array($receiverccuser) && count($receiverccuser)>0)
+			if (is_array($receiverccuser) && count($receiverccuser) > 0)
 			{
 				$fuserdest = new User($db);
-				foreach($receiverccuser as $key=>$val)
+				foreach ($receiverccuser as $key=>$val)
 				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
+					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtoccuserid[] = $val;
 				}
 			}
 		}
-		$sendtocc=implode(',',$tmparray);
+		$sendtocc = implode(',', $tmparray);
 
 		if (dol_strlen($sendto))
 		{
             // 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
 
 		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 			$langs->load("commercial");
 
-			$fromtype = GETPOST('fromtype','alpha');
+			$fromtype = GETPOST('fromtype', 'alpha');
 			if ($fromtype === 'robot') {
-				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
+				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
 			}
 			elseif ($fromtype === 'user') {
-				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
+				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
 			}
 			elseif ($fromtype === 'company') {
-				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
 			}
 			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $user->email_aliases);
+				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
 			}
 			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
 			}
 			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
-				$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
+				$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
 				if ($obj)
@@ -291,39 +291,39 @@ 
 				}
 			}
 			else {
-				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
+				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
 			}
 
-			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
-			$message = GETPOST('message','none');
-			$subject = GETPOST('subject','none');
+			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")).' <'.$_POST['replytomail'].'>';
+			$message = GETPOST('message', 'none');
+			$subject = GETPOST('subject', 'none');
 
 			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
 			// <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.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
+			$message = preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
 
-			$sendtobcc= GETPOST('sendtoccc');
+			$sendtobcc = GETPOST('sendtoccc');
 			// Autocomplete the $sendtobcc
 			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if (! empty($autocopy))
+			if (!empty($autocopy))
 			{
-				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
+				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc ? ", " : "").$conf->global->$autocopy));
 			}
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
 			if ($action == 'send' || $action == 'relance')
 			{
-				$actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
+				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
 				if ($message)
 				{
-					$actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
-					$actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
+					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
 				}
 			}
@@ -331,9 +331,9 @@ 
 			// Create form object
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$formmail = new FormMail($db);
-			$formmail->trackid = $trackid;      // $trackid must be defined
+			$formmail->trackid = $trackid; // $trackid must be defined
 
-			$attachedfiles=$formmail->get_attached_files();
+			$attachedfiles = $formmail->get_attached_files();
 			$filepath = $attachedfiles['paths'];
 			$filename = $attachedfiles['names'];
 			$mimetype = $attachedfiles['mimes'];
@@ -383,15 +383,15 @@ 
 			*/
 
 			// Make substitution in email content
-			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
+			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
+			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 
-			$parameters=array('mode'=>'formemail');
+			$parameters = array('mode'=>'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
 
-			$subject=make_substitutions($subject, $substitutionarray);
-			$message=make_substitutions($message, $substitutionarray);
+			$subject = make_substitutions($subject, $substitutionarray);
+			$message = make_substitutions($message, $substitutionarray);
 
 			if (method_exists($object, 'makeSubstitution'))
 			{
@@ -401,16 +401,16 @@ 
 
 			// Send mail (substitutionarray must be done just before this)
 			if (empty($sendcontext)) $sendcontext = 'standard';
-			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
+			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 
 			if ($mailfile->error)
 			{
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-				$action='presend';
+				$action = 'presend';
 			}
 			else
 			{
-				$result=$mailfile->sendfile();
+				$result = $mailfile->sendfile();
 				if ($result)
 				{
 					// Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
@@ -437,25 +437,25 @@ 
 					// Initialisation of datas of object to call trigger
 					if (is_object($object))
 					{
-					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+					    if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
 
-						$object->socid			= $sendtosocid;	   // To link to a company
-						$object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
-						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-						$object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
-						$object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
+						$object->socid = $sendtosocid; // To link to a company
+						$object->sendtoid = $sendtoid; // To link to contact addresses. This is an array.
+						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+						$object->actionmsg = $actionmsg; // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
+						$object->actionmsg2		= $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
 
-						$object->trackid        = $trackid;
+						$object->trackid = $trackid;
 						$object->fk_element		= $object->id;
 						$object->elementtype	= $object->element;
-						if (is_array($attachedfiles) && count($attachedfiles)>0) {
-							$object->attachedfiles	= $attachedfiles;
+						if (is_array($attachedfiles) && count($attachedfiles) > 0) {
+							$object->attachedfiles = $attachedfiles;
 						}
-						if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-							$object->sendtouserid	= $sendtouserid;
+						if (is_array($sendtouserid) && count($sendtouserid) > 0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+							$object->sendtouserid = $sendtouserid;
 						}
 
-						$object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
+						$object->email_msgid = $mailfile->msgid; // @TODO Set msgid into $mailfile after sending
 						$object->email_from = $from;
 						$object->email_subject = $subject;
 						$object->email_to = $sendto;
@@ -465,11 +465,11 @@ 
 						$object->email_msgid = $mailfile->msgid;
 
 						// Call of triggers
-						if (! empty($trigger_name))
+						if (!empty($trigger_name))
 						{
-    						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    						$interface=new Interfaces($db);
-    						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+    						include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+    						$interface = new Interfaces($db);
+    						$result = $interface->run_triggers($trigger_name, $object, $user, $langs, $conf);
 							if ($result < 0) {
     							setEventMessages($interface->error, $interface->errors, 'errors');
     						}
@@ -478,28 +478,28 @@ 
 
 					// Redirect here
 					// This avoid sending mail twice if going out and then back to page
-					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
 					setEventMessages($mesg, null, 'mesgs');
 
-  					$moreparam='';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
-		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
+  					$moreparam = '';
+	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
+		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 			  		exit;
 				}
 				else
 				{
 					$langs->load("other");
-					$mesg='<div class="error">';
+					$mesg = '<div class="error">';
 					if ($mailfile->error)
 					{
-						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-						$mesg.='<br>'.$mailfile->error;
+						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
+						$mesg .= '<br>'.$mailfile->error;
 					}
 					else
 					{
-						$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
-					$mesg.='</div>';
+					$mesg .= '</div>';
 
 					setEventMessages($mesg, null, 'warnings');
 					$action = 'presend';
@@ -509,7 +509,7 @@ 
 		else
 		{
 			$langs->load("errors");
-			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
@@ -517,7 +517,7 @@ 
 	else
 	{
 		$langs->load("other");
-		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
+		setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
 		$action = 'presend';
 	}

Braces +82 added lines, -52 removed lines

@@ -76,9 +76,15 @@ 
 	$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]);
+	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
@@ -102,7 +108,9 @@ 
  */
 if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
 {
-	if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
+	if (empty($trackid)) {
+	    $trackid = GETPOST('trackid','aZ09');
+	}
 
 	$subject='';$actionmsg='';$actionmsg2='';
 
@@ -116,34 +124,42 @@ 
 		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
 		{
 			$result=$object->fetch_thirdparty();
-			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
+			if ($object->element == 'user' && $result == 0) {
+			    $result=1;
+			}
+			// Even if not found, we consider ok
 			$thirdparty=$object->thirdparty;
 			$sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'member' || $object->element == 'user')
+		} else if ($object->element == 'member' || $object->element == 'user')
 		{
 			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'societe')
+			if ($thirdparty->id > 0) {
+			    $sendtosocid=$thirdparty->id;
+			}
+		} else if ($object->element == 'societe')
 		{
 			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'contact')
+			if ($thirdparty->id > 0) {
+			    $sendtosocid=$thirdparty->id;
+			}
+		} else if ($object->element == 'contact')
 		{
 			$contact=$object;
-			if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+			if ($contact->id > 0) {
+			    $sendtosocid=$contact->fetch_thirdparty()->id;
+			}
+		} else {
+		    dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
 		}
-		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
 
 		if (is_object($hookmanager))
 		{
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
+	} else {
+	    $thirdparty = $mysoc;
 	}
-	else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
@@ -158,8 +174,11 @@ 
 		$receiver=$_POST['receiver'];
 		if (! is_array($receiver))
 		{
-			if ($receiver == '-1') $receiver=array();
-			else $receiver=array($receiver);
+			if ($receiver == '-1') {
+			    $receiver=array();
+			} else {
+			    $receiver=array($receiver);
+			}
 		}
 		$tmparray=array();
 		if (trim($_POST['sendto']))
@@ -172,18 +191,23 @@ 
 			foreach($receiver as $key=>$val)
 			{
 				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
+				if ($val == 'thirdparty') {
+				    // Id of third party
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
+				}
 				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
+				elseif ($val == 'contact') {
+				    // Id of contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)	// Id du contact
+				} elseif ($val) {
+				    // Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+				}
 					$sendtoid[] = $val;
 				}
 			}
@@ -208,8 +232,11 @@ 
 		$receivercc=$_POST['receivercc'];
 		if (! is_array($receivercc))
 		{
-			if ($receivercc == '-1') $receivercc=array();
-			else $receivercc=array($receivercc);
+			if ($receivercc == '-1') {
+			    $receivercc=array();
+			} else {
+			    $receivercc=array($receivercc);
+			}
 		}
 		$tmparray=array();
 		if (trim($_POST['sendtocc']))
@@ -221,18 +248,23 @@ 
 			foreach($receivercc as $key=>$val)
 			{
 				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
+				if ($val == 'thirdparty') {
+				    // Id of third party
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
+				}
 				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
+				elseif ($val == 'contact') {
+				    // Id of contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)	// Id du contact
+				} elseif ($val) {
+				    // Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+				}
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 				}
 			}
@@ -266,22 +298,17 @@ 
 			$fromtype = GETPOST('fromtype','alpha');
 			if ($fromtype === 'robot') {
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
+			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
+			} elseif ($fromtype === 'company') {
 				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp=explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 				$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
@@ -289,8 +316,7 @@ 
 				{
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
-			}
-			else {
+			} else {
 				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
 			}
 
@@ -321,7 +347,9 @@ 
 				{
 					$actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
 					$actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+					    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+					}
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -400,15 +428,16 @@ 
 			}
 
 			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
+			if (empty($sendcontext)) {
+			    $sendcontext = 'standard';
+			}
 			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
 
 			if ($mailfile->error)
 			{
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action='presend';
-			}
-			else
+			} else
 			{
 				$result=$mailfile->sendfile();
 				if ($result)
@@ -437,7 +466,10 @@ 
 					// Initialisation of datas of object to call trigger
 					if (is_object($object))
 					{
-					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+					    if (empty($actiontypecode)) {
+					        $actiontypecode='AC_OTH_AUTO';
+					    }
+					    // Event insert into agenda automatically
 
 						$object->socid			= $sendtosocid;	   // To link to a company
 						$object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
@@ -482,11 +514,12 @@ 
 					setEventMessages($mesg, null, 'mesgs');
 
   					$moreparam='';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+	  				if (isset($paramname2) || isset($paramval2)) {
+	  				    $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+	  				}
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
 			  		exit;
-				}
-				else
+				} else
 				{
 					$langs->load("other");
 					$mesg='<div class="error">';
@@ -494,8 +527,7 @@ 
 					{
 						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
 						$mesg.='<br>'.$mailfile->error;
-					}
-					else
+					} else
 					{
 						$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
@@ -505,16 +537,14 @@ 
 					$action = 'presend';
 				}
 			}
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("other");
 		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');