alxarafe / alixar

dolibarr/htdocs/core/tpl/contacts.tpl.php

Indentation +76 added lines, -76 removed lines

@@ -24,8 +24,8 @@ 
 // Protection to avoid direct call of template
 if (empty($object) || ! is_object($object))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -46,11 +46,11 @@ 
 elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
 elseif (! isset($permission) && isset($user->rights->$module->creer))
 {
-	$permission=$user->rights->$module->creer;
+    $permission=$user->rights->$module->creer;
 }
 elseif (! isset($permission)  && isset($user->rights->$module->write))
 {
-	$permission=$user->rights->$module->write;
+    $permission=$user->rights->$module->write;
 }
 
 $formcompany= new FormCompany($db);
@@ -79,10 +79,10 @@ 
 
 	<?php
 
-	if (empty($hideaddcontactforuser))
-	{
+    if (empty($hideaddcontactforuser))
+    {
 
-	?>
+    ?>
 	<form class="tagtr impair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
@@ -94,21 +94,21 @@ 
 		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
-		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
-		?></div>
+        $tmpobject=$object;
+        if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+        echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
+        ?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
 
 	<?php
-	}
+    }
 
-	if (empty($hideaddcontactforthirdparty))
-	{
+    if (empty($hideaddcontactforthirdparty))
+    {
 
-	?>
+    ?>
 
 	<form class="tagtr pair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -120,12 +120,12 @@ 
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
 			<?php
-			// add company icon before select list
-			if ($selectedCompany)
-			{
-			    echo img_object('', 'company', 'class="hideonsmartphone"');
-			}
-			?>
+            // add company icon before select list
+            if ($selectedCompany)
+            {
+                echo img_object('', 'company', 'class="hideonsmartphone"');
+            }
+            ?>
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
@@ -133,9 +133,9 @@ 
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
-			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
+            $tmpobject=$object;
+            if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+            $formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
@@ -144,7 +144,7 @@ 
 	</form>
 
 <?php
-	}
+    }
 }
 ?>
 
@@ -158,18 +158,18 @@ 
 	</form>
 
 	<?php
-	$arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
-	foreach($arrayofsource as $source) {
+    $arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
+    foreach($arrayofsource as $source) {
 
-		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+        $tmpobject=$object;
+        if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
 
-		$tab = $tmpobject->liste_contact(-1,$source);
-		$num=count($tab);
+        $tab = $tmpobject->liste_contact(-1,$source);
+        $num=count($tab);
 
-		$i = 0;
-		while ($i < $num) {
-	?>
+        $i = 0;
+        while ($i < $num) {
+    ?>
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
@@ -178,50 +178,50 @@ 
 		</div>
 		<div class="tagtd" align="left">
 			<?php
-			if ($tab[$i]['socid'] > 0)
-			{
-				$companystatic->fetch($tab[$i]['socid']);
-				echo $companystatic->getNomUrl(1);
-			}
-			if ($tab[$i]['socid'] < 0)
-			{
-				echo $conf->global->MAIN_INFO_SOCIETE_NOM;
-			}
-			if (! $tab[$i]['socid'])
-			{
-				echo '&nbsp;';
-			}
-			?>
+            if ($tab[$i]['socid'] > 0)
+            {
+                $companystatic->fetch($tab[$i]['socid']);
+                echo $companystatic->getNomUrl(1);
+            }
+            if ($tab[$i]['socid'] < 0)
+            {
+                echo $conf->global->MAIN_INFO_SOCIETE_NOM;
+            }
+            if (! $tab[$i]['socid'])
+            {
+                echo '&nbsp;';
+            }
+            ?>
 		</div>
 		<div class="tagtd">
 			<?php
-			$statusofcontact = $tab[$i]['status'];
-
-			if ($tab[$i]['source']=='internal')
-			{
-				$userstatic->fetch($tab[$i]['id']);
-				echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
-			}
-			if ($tab[$i]['source']=='external')
-			{
-				$contactstatic->fetch($tab[$i]['id']);
-				echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
-			}
-			?>
+            $statusofcontact = $tab[$i]['status'];
+
+            if ($tab[$i]['source']=='internal')
+            {
+                $userstatic->fetch($tab[$i]['id']);
+                echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
+            }
+            if ($tab[$i]['source']=='external')
+            {
+                $contactstatic->fetch($tab[$i]['id']);
+                echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
+            }
+            ?>
 		</div>
 		<div class="tagtd"><?php echo $tab[$i]['libelle']; ?></div>
 		<div class="tagtd center">
 			<?php //if ($object->statut >= 0) echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">'; ?>
 			<?php
-			if ($tab[$i]['source']=='internal')
-			{
-				echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
-			}
-			if ($tab[$i]['source']=='external')
-			{
-				echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
-			}
-			?>
+            if ($tab[$i]['source']=='internal')
+            {
+                echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
+            }
+            if ($tab[$i]['source']=='external')
+            {
+                echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
+            }
+            ?>
 			<?php //if ($object->statut >= 0) echo '</a>'; ?>
 		</div>
 		<div class="tagtd nowrap right">
@@ -238,11 +238,11 @@ 
 </div>
 <!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->
 <?php
-	if (is_object($hookmanager))
-	{
-		$hookmanager->initHooks(array('contacttpl'));
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
-	}
+    if (is_object($hookmanager))
+    {
+        $hookmanager->initHooks(array('contacttpl'));
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
+    }
 ?>
 <!-- END PHP TEMPLATE CONTACTS -->

Spacing +47 added lines, -47 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -35,28 +35,28 @@ 
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal')				{ $permission=$user->rights->propale->creer; }
-elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; }
-elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; }
-elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; }
-elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
-elseif (! isset($permission) && isset($user->rights->$module->creer))
+if ($module == 'propal') { $permission = $user->rights->propale->creer; }
+elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
+elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
+elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
+elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
+elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; }
+elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
+elseif ($module == 'reception') { $permission = $user->rights->reception->creer; }
+elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
+elseif (!isset($permission) && isset($user->rights->$module->creer))
 {
-	$permission=$user->rights->$module->creer;
+	$permission = $user->rights->$module->creer;
 }
-elseif (! isset($permission)  && isset($user->rights->$module->write))
+elseif (!isset($permission) && isset($user->rights->$module->write))
 {
-	$permission=$user->rights->$module->write;
+	$permission = $user->rights->$module->write;
 }
 
-$formcompany= new FormCompany($db);
-$companystatic=new Societe($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$formcompany = new FormCompany($db);
+$companystatic = new Societe($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 ?>
 
@@ -89,14 +89,14 @@ 
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="internal" />
 	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="nowrap tagtd"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></div>
+		<div class="nowrap tagtd"><?php echo img_object('', 'user').' '.$langs->trans("Users"); ?></div>
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
-		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
+		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
-		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
+		$tmpobject = $object;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
+		echo $formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
@@ -116,9 +116,9 @@ 
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
 	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="tagtd nowrap noborderbottom"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
+		<div class="tagtd nowrap noborderbottom"><?php echo img_object('', 'contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
-			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
+			<?php $selectedCompany = isset($_GET["newcompany"]) ? $_GET["newcompany"] : $object->socid; ?>
 			<?php
 			// add company icon before select list
 			if ($selectedCompany)
@@ -129,17 +129,17 @@ 
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
-			<?php $nbofcontacts=$form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 0, 'minwidth100imp'); ?>
+			<?php $nbofcontacts = $form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
-			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
-			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
+			$tmpobject = $object;
+			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
+			$formcompany->selectTypeContact($tmpobject, '', 'type', 'external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>>
+			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) echo ' disabled'; ?>>
 		</div>
 	</form>
 
@@ -158,14 +158,14 @@ 
 	</form>
 
 	<?php
-	$arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
-	foreach($arrayofsource as $source) {
+	$arrayofsource = array('internal', 'external'); // Show both link to user and thirdparties contacts
+	foreach ($arrayofsource as $source) {
 
-		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		$tmpobject = $object;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
 
-		$tab = $tmpobject->liste_contact(-1,$source);
-		$num=count($tab);
+		$tab = $tmpobject->liste_contact(-1, $source);
+		$num = count($tab);
 
 		$i = 0;
 		while ($i < $num) {
@@ -173,8 +173,8 @@ 
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
-			<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
-			<?php if ($tab[$i]['source']=='external') echo $langs->trans("ThirdPartyContact"); ?>
+			<?php if ($tab[$i]['source'] == 'internal') echo $langs->trans("User"); ?>
+			<?php if ($tab[$i]['source'] == 'external') echo $langs->trans("ThirdPartyContact"); ?>
 		</div>
 		<div class="tagtd" align="left">
 			<?php
@@ -187,7 +187,7 @@ 
 			{
 				echo $conf->global->MAIN_INFO_SOCIETE_NOM;
 			}
-			if (! $tab[$i]['socid'])
+			if (!$tab[$i]['socid'])
 			{
 				echo '&nbsp;';
 			}
@@ -197,12 +197,12 @@ 
 			<?php
 			$statusofcontact = $tab[$i]['status'];
 
-			if ($tab[$i]['source']=='internal')
+			if ($tab[$i]['source'] == 'internal')
 			{
 				$userstatic->fetch($tab[$i]['id']);
 				echo $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			}
-			if ($tab[$i]['source']=='external')
+			if ($tab[$i]['source'] == 'external')
 			{
 				$contactstatic->fetch($tab[$i]['id']);
 				echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle');
@@ -213,13 +213,13 @@ 
 		<div class="tagtd center">
 			<?php //if ($object->statut >= 0) echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">'; ?>
 			<?php
-			if ($tab[$i]['source']=='internal')
+			if ($tab[$i]['source'] == 'internal')
 			{
-				echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
+				echo $userstatic->LibStatut($tab[$i]['statuscontact'], 3);
 			}
-			if ($tab[$i]['source']=='external')
+			if ($tab[$i]['source'] == 'external')
 			{
-				echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
+				echo $contactstatic->LibStatut($tab[$i]['statuscontact'], 3);
 			}
 			?>
 			<?php //if ($object->statut >= 0) echo '</a>'; ?>
@@ -241,8 +241,8 @@ 
 	if (is_object($hookmanager))
 	{
 		$hookmanager->initHooks(array('contacttpl'));
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
 	}
 ?>
 <!-- END PHP TEMPLATE CONTACTS -->

Braces +31 added lines, -20 removed lines

@@ -35,20 +35,10 @@ 
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal')				{ $permission=$user->rights->propale->creer; }
-elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; }
-elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; }
-elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; }
-elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; }
-elseif (! isset($permission) && isset($user->rights->$module->creer))
+if ($module == 'propal')				{ $permission=$user->rights->propale->creer; } elseif ($module == 'fichinter')			{ $permission=$user->rights->ficheinter->creer; } elseif ($module == 'order_supplier')	{ $permission=$user->rights->fournisseur->commande->creer; } elseif ($module == 'invoice_supplier')	{ $permission=$user->rights->fournisseur->facture->creer; } elseif ($module == 'project')		{ $permission=$user->rights->projet->creer; } elseif ($module == 'action')		{ $permission=$user->rights->agenda->myactions->create; } elseif ($module == 'shipping')		{ $permission=$user->rights->expedition->creer; } elseif ($module == 'reception')		{ $permission=$user->rights->reception->creer; } elseif ($module == 'project_task')	{ $permission=$user->rights->projet->creer; } elseif (! isset($permission) && isset($user->rights->$module->creer))
 {
 	$permission=$user->rights->$module->creer;
-}
-elseif (! isset($permission)  && isset($user->rights->$module->write))
+} elseif (! isset($permission)  && isset($user->rights->$module->write))
 {
 	$permission=$user->rights->$module->write;
 }
@@ -88,14 +78,19 @@ 
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="internal" />
-	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+	<?php if ($withproject) {
+    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+}
+?>
 		<div class="nowrap tagtd"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></div>
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
 		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (! empty($userAlreadySelected)?$userAlreadySelected:null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
 		$tmpobject=$object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
+		    $tmpobject=$objectsrc;
+		}
 		echo $formcompany->selectTypeContact($tmpobject, '', 'type','internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
@@ -115,7 +110,10 @@ 
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 	<input type="hidden" name="action" value="addcontact" />
 	<input type="hidden" name="source" value="external" />
-	<?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+	<?php if ($withproject) {
+    print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+}
+?>
 		<div class="tagtd nowrap noborderbottom"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
@@ -134,12 +132,17 @@ 
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
 			$tmpobject=$object;
-			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+			if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) {
+			    $tmpobject=$objectsrc;
+			}
 			$formcompany->selectTypeContact($tmpobject, '', 'type','external', 'position', 0, 'minwidth100imp'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) echo ' disabled'; ?>>
+			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (! $nbofcontacts) {
+    echo ' disabled';
+}
+?>>
 		</div>
 	</form>
 
@@ -162,7 +165,9 @@ 
 	foreach($arrayofsource as $source) {
 
 		$tmpobject=$object;
-		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+		if (($object->element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) {
+		    $tmpobject=$objectsrc;
+		}
 
 		$tab = $tmpobject->liste_contact(-1,$source);
 		$num=count($tab);
@@ -173,8 +178,14 @@ 
 
 	<form class="tagtr oddeven">
 		<div class="tagtd" align="left">
-			<?php if ($tab[$i]['source']=='internal') echo $langs->trans("User"); ?>
-			<?php if ($tab[$i]['source']=='external') echo $langs->trans("ThirdPartyContact"); ?>
+			<?php if ($tab[$i]['source']=='internal') {
+    echo $langs->trans("User");
+}
+?>
+			<?php if ($tab[$i]['source']=='external') {
+    echo $langs->trans("ThirdPartyContact");
+}
+?>
 		</div>
 		<div class="tagtd" align="left">
 			<?php

dolibarr/htdocs/core/tpl/card_presend.tpl.php

Indentation +185 added lines, -185 removed lines

@@ -29,203 +29,203 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
 if ($action == 'presend')
 {
-	$langs->load("mails");
-
-	$titreform='SendMail';
-
-	$object->fetch_projet();
-
-	if (! in_array($object->element, array('societe', 'user', 'member')))
-	{
-		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		//
-		if ($object->element == 'invoice_supplier')
-		{
-			$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
-		}
-
-		$file = $fileparams['fullname'];
-	}
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-	{
-		$newlang = $_REQUEST['lang_id'];
-	}
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-	{
-		$newlang = $object->thirdparty->default_lang;
-	}
-
-	if (!empty($newlang))
-	{
-		$outputlangs = new Translate('', $conf);
-		$outputlangs->setDefaultLang($newlang);
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
-	}
-
-	$topicmail='';
-	if (empty($object->ref_client)) {
-		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
-	} else if (! empty($object->ref_client)) {
-		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
-	}
-
-	// Build document if it not exists
-	if (! in_array($object->element, array('societe', 'user', 'member')))
-	{
-		if ((! $file || ! is_readable($file)) && method_exists($object, 'generateDocument'))
-		{
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-	}
-
-	print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-	print '<div class="clearboth"></div>';
-	print '<br>';
-	print load_fiche_titre($langs->trans($titreform));
-
-	dol_fiche_head('');
-
-	// Create form for email
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-
-	$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-	$formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-	if ($formmail->fromtype === 'user')
-	{
-		$formmail->fromid = $user->id;
-	}
-	$formmail->trackid=$trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-	{
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
-	$formmail->withfrom = 1;
-
-	// Fill list of recipient with email inside <>.
-	$liste = array();
-	if ($object->element == 'expensereport')
-	{
-		$fuser = new User($db);
-		$fuser->fetch($object->fk_user_author);
-		$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
-	{
-		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
-			$liste[$key] = $value;
-		}
-	}
-	elseif ($object->element == 'contact')
-	{
-		$liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
-	{
-		$liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	else
-	{
-		if (is_object($object->thirdparty))
-		{
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
-				$liste[$key] = $value;
-			}
-		}
-	}
-	if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-		$listeuser=array();
-		$fuserdest = new User($db);
-
-		$result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
-		if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
-			foreach($fuserdest->users as $uuserdest) {
-				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
-			}
-		} elseif ($result<0) {
-			setEventMessages(null, $fuserdest->errors,'errors');
-		}
-		if (count($listeuser)>0) {
-			$formmail->withtouser = $listeuser;
-			$formmail->withtoccuser = $listeuser;
-		}
-	}
-
-	$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-	$formmail->withtocc = $liste;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $topicmail;
-	$formmail->withfile = 2;
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
-	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
-
-	// Make substitution in email content
-	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-	$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['__PERSONALIZED__'] = '';	// deprecated
-	$substitutionarray['__CONTACTCIVNAME__'] = '';
-	$parameters = array(
-		'mode' => 'formemail'
-	);
-	complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
-
-	// Find the good contact adress
-	$custcontact = '';
-	$contactarr = array();
-	$contactarr = $object->liste_contact(- 1, 'external');
-
-	if (is_array($contactarr) && count($contactarr) > 0) {
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+    $langs->load("mails");
+
+    $titreform='SendMail';
+
+    $object->fetch_projet();
+
+    if (! in_array($object->element, array('societe', 'user', 'member')))
+    {
+        // TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
+
+        $ref = dol_sanitizeFileName($object->ref);
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+        //
+        if ($object->element == 'invoice_supplier')
+        {
+            $fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+        }
+
+        $file = $fileparams['fullname'];
+    }
+
+    // Define output language
+    $outputlangs = $langs;
+    $newlang = '';
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+    {
+        $newlang = $_REQUEST['lang_id'];
+    }
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+    {
+        $newlang = $object->thirdparty->default_lang;
+    }
+
+    if (!empty($newlang))
+    {
+        $outputlangs = new Translate('', $conf);
+        $outputlangs->setDefaultLang($newlang);
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
+    }
+
+    $topicmail='';
+    if (empty($object->ref_client)) {
+        $topicmail = $outputlangs->trans($defaulttopic, '__REF__');
+    } else if (! empty($object->ref_client)) {
+        $topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
+    }
+
+    // Build document if it not exists
+    if (! in_array($object->element, array('societe', 'user', 'member')))
+    {
+        if ((! $file || ! is_readable($file)) && method_exists($object, 'generateDocument'))
+        {
+            $result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            if ($result <= 0) {
+                dol_print_error($db, $object->error, $object->errors);
+                exit();
+            }
+            $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+            $file = $fileparams['fullname'];
+        }
+    }
+
+    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+    print '<div class="clearboth"></div>';
+    print '<br>';
+    print load_fiche_titre($langs->trans($titreform));
+
+    dol_fiche_head('');
+
+    // Create form for email
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+
+    $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+    if ($formmail->fromtype === 'user')
+    {
+        $formmail->fromid = $user->id;
+    }
+    $formmail->trackid=$trackid;
+    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+    {
+        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, $trackid);
+    }
+    $formmail->withfrom = 1;
+
+    // Fill list of recipient with email inside <>.
+    $liste = array();
+    if ($object->element == 'expensereport')
+    {
+        $fuser = new User($db);
+        $fuser->fetch($object->fk_user_author);
+        $liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
+    }
+    elseif ($object->element == 'societe')
+    {
+        foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
+            $liste[$key] = $value;
+        }
+    }
+    elseif ($object->element == 'contact')
+    {
+        $liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
+    }
+    elseif ($object->element == 'user' || $object->element == 'member')
+    {
+        $liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
+    }
+    else
+    {
+        if (is_object($object->thirdparty))
+        {
+            foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
+                $liste[$key] = $value;
+            }
+        }
+    }
+    if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+        $listeuser=array();
+        $fuserdest = new User($db);
+
+        $result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
+        if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
+            foreach($fuserdest->users as $uuserdest) {
+                $listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
+            }
+        } elseif ($result<0) {
+            setEventMessages(null, $fuserdest->errors,'errors');
+        }
+        if (count($listeuser)>0) {
+            $formmail->withtouser = $listeuser;
+            $formmail->withtoccuser = $listeuser;
+        }
+    }
+
+    $formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+    $formmail->withtocc = $liste;
+    $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+    $formmail->withtopic = $topicmail;
+    $formmail->withfile = 2;
+    $formmail->withbody = 1;
+    $formmail->withdeliveryreceipt = 1;
+    $formmail->withcancel = 1;
+
+    //$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
+    if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+
+    // Make substitution in email content
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
+    $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['__PERSONALIZED__'] = '';	// deprecated
+    $substitutionarray['__CONTACTCIVNAME__'] = '';
+    $parameters = array(
+        'mode' => 'formemail'
+    );
+    complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
+
+    // Find the good contact adress
+    $custcontact = '';
+    $contactarr = array();
+    $contactarr = $object->liste_contact(- 1, 'external');
+
+    if (is_array($contactarr) && count($contactarr) > 0) {
+        require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
         $contactstatic = new Contact($db);
 
-		foreach ($contactarr as $contact) {
+        foreach ($contactarr as $contact) {
             $contactstatic->fetch($contact['id']);
             $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($langs, 1);
-		}
-	}
+        }
+    }
 
-	// Tableau des substitutions
-	$formmail->substit = $substitutionarray;
+    // Tableau des substitutions
+    $formmail->substit = $substitutionarray;
 
-	// Tableau des parametres complementaires
-	$formmail->param['action'] = 'send';
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id']=GETPOST('modelmailselected','int');
-	$formmail->param['id'] = $object->id;
-	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-	$formmail->param['fileinit'] = array($file);
+    // Tableau des parametres complementaires
+    $formmail->param['action'] = 'send';
+    $formmail->param['models'] = $modelmail;
+    $formmail->param['models_id']=GETPOST('modelmailselected','int');
+    $formmail->param['id'] = $object->id;
+    $formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+    $formmail->param['fileinit'] = array($file);
 
-	// Show form
-	print $formmail->get_form();
+    // Show form
+    print $formmail->get_form();
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 

Spacing +34 added lines, -34 removed lines

@@ -27,7 +27,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -38,21 +38,21 @@ 
 {
 	$langs->load("mails");
 
-	$titreform='SendMail';
+	$titreform = 'SendMail';
 
 	$object->fetch_projet();
 
-	if (! in_array($object->element, array('societe', 'user', 'member')))
+	if (!in_array($object->element, array('societe', 'user', 'member')))
 	{
 		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
 
 		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		//
 		if ($object->element == 'invoice_supplier')
 		{
-			$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 		}
 
 		$file = $fileparams['fullname'];
@@ -61,7 +61,7 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id']))
 	{
 		$newlang = $_REQUEST['lang_id'];
 	}
@@ -75,27 +75,27 @@ 
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
 		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
+		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions'));
 	}
 
-	$topicmail='';
+	$topicmail = '';
 	if (empty($object->ref_client)) {
 		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
-	} else if (! empty($object->ref_client)) {
+	} else if (!empty($object->ref_client)) {
 		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
 	}
 
 	// Build document if it not exists
-	if (! in_array($object->element, array('societe', 'user', 'member')))
+	if (!in_array($object->element, array('societe', 'user', 'member')))
 	{
-		if ((! $file || ! is_readable($file)) && method_exists($object, 'generateDocument'))
+		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument'))
 		{
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				dol_print_error($db, $object->error, $object->errors);
 				exit();
 			}
-			$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			$file = $fileparams['fullname'];
 		}
 	}
@@ -108,21 +108,21 @@ 
 	dol_fiche_head('');
 
 	// Create form for email
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 
-	$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-	$formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+	$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
+	$formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
 	if ($formmail->fromtype === 'user')
 	{
 		$formmail->fromid = $user->id;
 	}
-	$formmail->trackid=$trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	$formmail->trackid = $trackid;
+	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, $trackid);
+		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
 
@@ -158,18 +158,18 @@ 
 		}
 	}
 	if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-		$listeuser=array();
+		$listeuser = array();
 		$fuserdest = new User($db);
 
-		$result= $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
-		if ($result>0 && is_array($fuserdest->users) && count($fuserdest->users)>0) {
-			foreach($fuserdest->users as $uuserdest) {
-				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id,'email');
+		$result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>'t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email<>\'\''));
+		if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) {
+			foreach ($fuserdest->users as $uuserdest) {
+				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email');
 			}
-		} elseif ($result<0) {
-			setEventMessages(null, $fuserdest->errors,'errors');
+		} elseif ($result < 0) {
+			setEventMessages(null, $fuserdest->errors, 'errors');
 		}
-		if (count($listeuser)>0) {
+		if (count($listeuser) > 0) {
 			$formmail->withtouser = $listeuser;
 			$formmail->withtoccuser = $listeuser;
 		}
@@ -185,12 +185,12 @@ 
 	$formmail->withcancel = 1;
 
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+	if (!isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude = null;
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-	$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['__PERSONALIZED__'] = '';	// deprecated
+	$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['__PERSONALIZED__'] = ''; // deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 	$parameters = array(
 		'mode' => 'formemail'
@@ -200,10 +200,10 @@ 
 	// Find the good contact adress
 	$custcontact = '';
 	$contactarr = array();
-	$contactarr = $object->liste_contact(- 1, 'external');
+	$contactarr = $object->liste_contact(-1, 'external');
 
 	if (is_array($contactarr) && count($contactarr) > 0) {
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contactstatic = new Contact($db);
 
 		foreach ($contactarr as $contact) {
@@ -218,9 +218,9 @@ 
 	// Tableau des parametres complementaires
 	$formmail->param['action'] = 'send';
 	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id']=GETPOST('modelmailselected','int');
+	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
 	$formmail->param['id'] = $object->id;
-	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"].'?id='.$object->id;
 	$formmail->param['fileinit'] = array($file);
 
 	// Show form

Braces +10 added lines, -10 removed lines

@@ -119,9 +119,11 @@ 
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid=$trackid;
-	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {
+	    // If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	}
 		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
@@ -133,22 +135,18 @@ 
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
+	} elseif ($object->element == 'societe')
 	{
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
 		}
-	}
-	elseif ($object->element == 'contact')
+	} elseif ($object->element == 'contact')
 	{
 		$liste['contact'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
+	} elseif ($object->element == 'user' || $object->element == 'member')
 	{
 		$liste['thirdparty'] = $object->getFullName($langs)." <".$object->email.">";
-	}
-	else
+	} else
 	{
 		if (is_object($object->thirdparty))
 		{
@@ -185,7 +183,9 @@ 
 	$formmail->withcancel = 1;
 
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (! isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude=null;
+	if (! isset($arrayoffamiliestoexclude)) {
+	    $arrayoffamiliestoexclude=null;
+	}
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);

dolibarr/htdocs/core/tpl/admin_extrafields_add.tpl.php

Indentation +13 added lines, -13 removed lines

@@ -30,8 +30,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -55,17 +55,17 @@ 
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type','alpha') != "select") && (GETPOST('type','alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
-
-    		if (GETPOST('type','alpha') == "separate")
-    		{
-				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+            if ((GETPOST('type','alpha') != "select") && (GETPOST('type','alpha') != "sellist"))
+            {
+                print 'jQuery("#value_choice").hide();';
+            }
+
+            if (GETPOST('type','alpha') == "separate")
+            {
+                print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
+                print 'jQuery("#value_choice").hide();';
+            }
+            ?>
 
     		// Case of computed field
     		console.log(type);

Spacing +24 added lines, -24 removed lines

@@ -28,7 +28,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -55,12 +55,12 @@ 
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type','alpha') != "select") && (GETPOST('type','alpha') != "sellist"))
+    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
     		{
     			print 'jQuery("#value_choice").hide();';
     		}
 
-    		if (GETPOST('type','alpha') == "separate")
+    		if (GETPOST('type', 'alpha') == "separate")
     		{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
     			print 'jQuery("#value_choice").hide();';
@@ -126,7 +126,7 @@ 
 				langfile.removeAttr('disabled');required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
     	}
-    	init_typeoffields('<?php echo GETPOST('type','alpha'); ?>');
+    	init_typeoffields('<?php echo GETPOST('type', 'alpha'); ?>');
     	jQuery("#type").change(function() {
     		init_typeoffields($(this).val());
     	});
@@ -146,15 +146,15 @@ 
 
 <table summary="listofattributes" class="border centpercent">
 <!-- Label -->
-<tr><td class="titlefield fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label','alpha'); ?>"></td></tr>
+<tr><td class="titlefield fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label', 'alpha'); ?>"></td></tr>
 <!-- Code -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname','alpha'); ?>"> (<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</td></tr>
+<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>"> (<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</td></tr>
 <!-- Type -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
-<?php print $form->selectarray('type',$type2label,GETPOST('type','alpha')); ?>
+<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha')); ?>
 </td></tr>
 <!-- Size -->
-<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size','alpha')?GETPOST('size','alpha'):''); ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size', 'alpha') ?GETPOST('size', 'alpha') : ''); ?>"></td></tr>
 <!-- Default Value (for select list / radio/ checkbox) -->
 <tr id="value_choice">
 <td>
@@ -163,41 +163,41 @@ 
 <td>
     <table class="nobordernopadding">
     <tr><td>
-    	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param','alpha'); ?></textarea>
+    	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></textarea>
     </td><td>
-    <span id="helpselect"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"),1,0,'', 0, 2, 'helpvalue1')?></span>
-    <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0,'', 0, 2, 'helpvalue2')?></span>
-    <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"),1,0,'', 0, 2, 'helpvalue3')?></span>
-    <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"),1,0,'', 0, 2, 'helpvalue4')?></span>
-    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"),1,0,'', 0, 2, 'helpvalue5')?></span>
+    <span id="helpselect"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
+    <span id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
+    <span id="helpchkbxlst"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
+    <span id="helplink"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?></span>
+    <span id="helppassword"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
     </td></tr>
     </table>
 </td>
 </tr>
 <!-- Position -->
-<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos')?GETPOST('pos','int'):100; ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ?GETPOST('pos', 'int') : 100; ?>"></td></tr>
 <!-- Language file -->
-<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile','alpha')); ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>
 <!-- Computed Value -->
-<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value','none')?GETPOST('computed_value','none'):''); ?>"></td></tr>
+<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?>"></td></tr>
 <!-- Default Value (at sql setup level) -->
-<tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value','alpha')?GETPOST('default_value','alpha'):''); ?>"></td></tr>
+<tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
 <!-- Unique -->
-<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique','alpha')?' checked':''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <!-- Required -->
-<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required','alpha')?' checked':''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <!-- Always editable -->
-<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable','alpha') || ! GETPOST('button','alpha'))?' checked':''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable', 'alpha') || !GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
 <!-- Visibility -->
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc")); ?>
-</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list','int')!='' ? GETPOST('list','int') : '1'; ?>"></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list', 'int') != '' ? GETPOST('list', 'int') : '1'; ?>"></td></tr>
 <!-- Totalizable -->
-<tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ((GETPOST('totalizable','alpha') || GETPOST('button','alpha'))?' checked':''); ?>></td></tr>
+<tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ((GETPOST('totalizable', 'alpha') || GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
 <!-- Help tooltip -->
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag($help); ?>"></td></tr>
 <?php if ($conf->multicompany->enabled) { ?>
 	<!-- Multicompany entity -->
-    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall','alpha') ? '':' checked'); ?>></td></tr>
+    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall', 'alpha') ? '' : ' checked'); ?>></td></tr>
 <?php } ?>
 </table>
 

dolibarr/htdocs/core/tpl/bloc_comment.tpl.php

Indentation +55 added lines, -55 removed lines

@@ -3,8 +3,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 // Require
@@ -56,59 +56,59 @@ 
 // List of comments
 if (!empty($object->comments))
 {
-	// Default color for current user
-	$TColors = array($user->id => array('bgcolor'=>'efefef','color'=>'555'));
-	$first = true;
-	foreach($object->comments as $comment)
-	{
-		$fk_user = $comment->fk_user_author;
-		$userstatic->fetch($fk_user);
-
-		if(empty($TColors[$fk_user])) {
-			$bgcolor = random_color(180,240);
-			if(!empty($userstatic->color)) {
-				$bgcolor = $userstatic->color;
-			}
-			$color = (colorIsLight($bgcolor))?'555':'fff';
-			$TColors[$fk_user] = array('bgcolor'=>$bgcolor,'color'=>$color);
-		}
-		print '<div class="width100p" style="color:#'.$TColors[$fk_user]['color'].'">';
-		if ($fk_user != $user->id) {
-			print '<div class="width25p float">&nbsp;</div>';
-		}
-
-		print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
-		print '<div class="comment-info comment-cell">';
-		if (! empty($user->photo))
-		{
-			print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
-		}
-		print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
-		print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
-		print '</div>'; // End comment-info
-
-		print '<div class="comment-cell comment-right">';
-		print '<div class="comment-table width100p">';
-		print '<div class="comment-description comment-cell">';
-		print $comment->description;
-		print '</div>'; // End comment-description
-		if(($first && $fk_user == $user->id) || $user->admin == 1) {
-			print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
-			print img_picto('', 'delete.png');
-			print '</a>';
-		}
-		print '</div>'; // End comment-table
-		print '</div>'; // End comment-right
-		print '</div>'; // End comment
-
-		if($fk_user == $user->id) {
-			print '<div class="width25p float">&nbsp;</div>';
-		}
-		print '<div class="clearboth"></div>';
-		print '</div>'; // end 100p
-
-		$first = false;
-	}
+    // Default color for current user
+    $TColors = array($user->id => array('bgcolor'=>'efefef','color'=>'555'));
+    $first = true;
+    foreach($object->comments as $comment)
+    {
+        $fk_user = $comment->fk_user_author;
+        $userstatic->fetch($fk_user);
+
+        if(empty($TColors[$fk_user])) {
+            $bgcolor = random_color(180,240);
+            if(!empty($userstatic->color)) {
+                $bgcolor = $userstatic->color;
+            }
+            $color = (colorIsLight($bgcolor))?'555':'fff';
+            $TColors[$fk_user] = array('bgcolor'=>$bgcolor,'color'=>$color);
+        }
+        print '<div class="width100p" style="color:#'.$TColors[$fk_user]['color'].'">';
+        if ($fk_user != $user->id) {
+            print '<div class="width25p float">&nbsp;</div>';
+        }
+
+        print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
+        print '<div class="comment-info comment-cell">';
+        if (! empty($user->photo))
+        {
+            print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
+        }
+        print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
+        print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
+        print '</div>'; // End comment-info
+
+        print '<div class="comment-cell comment-right">';
+        print '<div class="comment-table width100p">';
+        print '<div class="comment-description comment-cell">';
+        print $comment->description;
+        print '</div>'; // End comment-description
+        if(($first && $fk_user == $user->id) || $user->admin == 1) {
+            print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
+            print img_picto('', 'delete.png');
+            print '</a>';
+        }
+        print '</div>'; // End comment-table
+        print '</div>'; // End comment-right
+        print '</div>'; // End comment
+
+        if($fk_user == $user->id) {
+            print '<div class="width25p float">&nbsp;</div>';
+        }
+        print '<div class="clearboth"></div>';
+        print '</div>'; // end 100p
+
+        $first = false;
+    }
 }
 
 print '<br>';

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -14,7 +14,7 @@ 
 
 // Vars
 $userstatic = new User($db);
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
 
 // Add comment
@@ -57,20 +57,20 @@ 
 if (!empty($object->comments))
 {
 	// Default color for current user
-	$TColors = array($user->id => array('bgcolor'=>'efefef','color'=>'555'));
+	$TColors = array($user->id => array('bgcolor'=>'efefef', 'color'=>'555'));
 	$first = true;
-	foreach($object->comments as $comment)
+	foreach ($object->comments as $comment)
 	{
 		$fk_user = $comment->fk_user_author;
 		$userstatic->fetch($fk_user);
 
-		if(empty($TColors[$fk_user])) {
-			$bgcolor = random_color(180,240);
-			if(!empty($userstatic->color)) {
+		if (empty($TColors[$fk_user])) {
+			$bgcolor = random_color(180, 240);
+			if (!empty($userstatic->color)) {
 				$bgcolor = $userstatic->color;
 			}
-			$color = (colorIsLight($bgcolor))?'555':'fff';
-			$TColors[$fk_user] = array('bgcolor'=>$bgcolor,'color'=>$color);
+			$color = (colorIsLight($bgcolor)) ? '555' : 'fff';
+			$TColors[$fk_user] = array('bgcolor'=>$bgcolor, 'color'=>$color);
 		}
 		print '<div class="width100p" style="color:#'.$TColors[$fk_user]['color'].'">';
 		if ($fk_user != $user->id) {
@@ -79,12 +79,12 @@ 
 
 		print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
 		print '<div class="comment-info comment-cell">';
-		if (! empty($user->photo))
+		if (!empty($user->photo))
 		{
 			print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
 		}
 		print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
-		print $langs->trans('Date').' : '.dol_print_date($comment->datec,'dayhoursec');
+		print $langs->trans('Date').' : '.dol_print_date($comment->datec, 'dayhoursec');
 		print '</div>'; // End comment-info
 
 		print '<div class="comment-cell comment-right">';
@@ -92,7 +92,7 @@ 
 		print '<div class="comment-description comment-cell">';
 		print $comment->description;
 		print '</div>'; // End comment-description
-		if(($first && $fk_user == $user->id) || $user->admin == 1) {
+		if (($first && $fk_user == $user->id) || $user->admin == 1) {
 			print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
 			print img_picto('', 'delete.png');
 			print '</a>';
@@ -101,7 +101,7 @@ 
 		print '</div>'; // End comment-right
 		print '</div>'; // End comment
 
-		if($fk_user == $user->id) {
+		if ($fk_user == $user->id) {
 			print '<div class="width25p float">&nbsp;</div>';
 		}
 		print '<div class="clearboth"></div>';

dolibarr/htdocs/core/tpl/advtarget.tpl.php

Indentation +475 added lines, -475 removed lines

@@ -47,484 +47,484 @@
 </script>';
 
 
-		print_fiche_titre($langs->trans("AdvTgtTitle"));
-
-		print '<div class="tabBar">' . "\n";
-		print '<form name="find_customer" id="find_customer" action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '"  method="POST">' . "\n";
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
-		print '<input type="hidden" name="action" value="">' . "\n";
-		print '<table class="border" width="100%">' . "\n";
-
-		print '<tr>' . "\n";
-		print '<td colspan="3" align="right">' . "\n";
-
-		print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
-
-		print '</td>' . "\n";
-		print '</tr>' . "\n";
-
-		print '<tr><td>' . $langs->trans('AdvTgtNameTemplate') . '</td><td>';
-		if (! empty($template_id)) {
-			$default_template = $template_id;
-		} else {
-			$default_template = $advTarget->id;
-		}
-		print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template,0,$advTarget->type_element);
-		print '<input type="button" name="loadfilter" id="loadfilter" value="' . $langs->trans('AdvTgtLoadFilter') . '" class="butAction"/>';
-		print '<input type="button" name="deletefilter" id="deletefilter" value="' . $langs->trans('AdvTgtDeleteFilter') . '" class="butAction"/>';
-		print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
-		print $langs->trans('AdvTgtOrCreateNewFilter');
-		print '<input type="text" name="template_name" id="template_name" value=""/>';
-		print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		print '<tr><td>' . $langs->trans('AdvTgtTypeOfIncude') . '</td><td>';
-		print $form->selectarray('type_of_target', $advTarget->select_target_type, $array_query['type_of_target']);
-		print '</td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtTypeOfIncudeHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Customer name
-		print '<tr><td>' . $langs->trans('ThirdPartyName');
-		if (! empty($array_query['cust_name'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_name" value="' . $array_query['cust_name'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Code Client
-		print '<tr><td>' . $langs->trans('CustomerCode');
-		if (! empty($array_query['cust_code'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_code" value="' . $array_query['cust_code'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Address Client
-		print '<tr><td>' . $langs->trans('Address');
-		if (! empty($array_query['cust_adress'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_adress" value="' . $array_query['cust_adress'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Zip Client
-		print '<tr><td>' . $langs->trans('Zip');
-		if (! empty($array_query['cust_zip'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_zip" value="' . $array_query['cust_zip'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// City Client
-		print '<tr><td>' . $langs->trans('Town');
-		if (! empty($array_query['cust_city'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="cust_city" value="' . $array_query['cust_city'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Customer Country
-		print '<tr><td>' . $langs->trans("Country");
-		if (count($array_query['cust_country']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->multiselectCountry('cust_country', $array_query['cust_country']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// State Customer
-		print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('ThirdParty');
-		if (count($array_query['cust_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('cust_status', array (
-				'0' => $langs->trans('ActivityCeased'),
-				'1' => $langs->trans('InActivity')
-		), $array_query['cust_status']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Mother Company
-		print '<tr><td>' . $langs->trans("Maison mère");
-		if (! empty($array_query['cust_mothercompany'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print '<input type="text" name="cust_mothercompany" value="' . $array_query['cust_mothercompany'] . '"/>';
-		print '</td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Prospect/Customer
-		$selected = $array_query['cust_typecust'];
-		print '<tr><td>' . $langs->trans('ProspectCustomer') . ' ' . $langs->trans('ThirdParty');
-		if (count($array_query['cust_typecust']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		$options_array = array (
-				2 => $langs->trans('Prospect'),
-				3 => $langs->trans('ProspectCustomer'),
-				1 => $langs->trans('Customer'),
-				0 => $langs->trans('NorProspectNorCustomer')
-		);
-		print $formadvtargetemaling->advMultiselectarray('cust_typecust', $options_array, $array_query['cust_typecust']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Prospection status
-		print '<tr><td>' . $langs->trans('ProspectLevel');
-		if (count($array_query['cust_prospect_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Prospection comm status
-		print '<tr><td>' . $langs->trans('StatusProsp');
-		if (count($array_query['cust_comm_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('cust_comm_status', $advTarget->type_statuscommprospect, $array_query['cust_comm_status']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Customer Type
-		print '<tr><td>' . $langs->trans("ThirdPartyType");
-		if (count($array_query['cust_typeent']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->advMultiselectarray('cust_typeent', $formcompany->typent_array(0, " AND id <> 0"), $array_query['cust_typeent']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Staff number
-		print '<td>' . $langs->trans("Staff");
-		if (count($array_query['cust_effectif_id']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray("cust_effectif_id", $formcompany->effectif_array(0, " AND id <> 0"), $array_query['cust_effectif_id']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Sales manager
-		print '<tr><td>' . $langs->trans("SalesRepresentatives");
-		if (count($array_query['cust_saleman']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman', $array_query['cust_saleman'], $user);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Customer Default Langauge
-		if (! empty($conf->global->MAIN_MULTILANGS)) {
-
-			print '<tr><td>' . $langs->trans("DefaultLang");
-			if (count($array_query['cust_language']) > 0) {
-				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-			}
-			print '</td><td>' . "\n";
-			print $formadvtargetemaling->multiselectselectLanguage('cust_language', $array_query['cust_language']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
-		}
-
-		if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
-			// Customer Categories
-			print '<tr><td>' . $langs->trans("CustomersCategoryShort");
-			if (count($array_query['cust_categ']) > 0) {
-				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-			}
-			print '</td><td>' . "\n";
-			print $formadvtargetemaling->multiselectCustomerCategories('cust_categ', $array_query['cust_categ']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
-		}
-
-		// Standard Extrafield feature
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
-			// fetch optionals attributes and labels
-			dol_include_once('/core/class/extrafields.class.php');
-			$extrafields = new ExtraFields($db);
-			$extralabels = $extrafields->fetch_name_optionals_label('societe');
-			foreach ( $extralabels as $key => $val ) {
-				if ($key != 'ts_nameextra' && $key != 'ts_payeur') {
-					print '<tr><td>' . $extrafields->attribute_label[$key];
-					if (! empty($array_query['options_' . $key]) || (is_array($array_query['options_' . $key]) && count($array_query['options_' . $key]) > 0)) {
-						print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-					}
-					print '</td><td>';
-					if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
-						print '<input type="text" name="options_' . $key . '"/></td><td>' . "\n";
-						print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-					} elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
-						print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options' . $key . '_min"/>';
-						print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options' . $key . '_max"/>';
-						print '</td><td>' . "\n";
-						print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
-					} elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
-
-						print '<table class="nobordernopadding"><tr>';
-						print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-						print $form->selectDate('', 'options_' . $key . '_st_dt');
-						print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-						print $form->selectDate('', 'options_' . $key . '_end_dt');
-						print '</td></tr></table>';
-
-						print '</td><td>' . "\n";
-						print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
-					} elseif (($extrafields->attribute_type[$key] == 'boolean')) {
-						print $form->selectarray('options_' . $key, array (
-								'' => '',
-								'1' => $langs->trans('Yes'),
-								'0' => $langs->trans('No')
-						), $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
-					} elseif (($extrafields->attribute_type[$key] == 'select')) {
-						print $formadvtargetemaling->advMultiselectarray('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
-					} elseif (($extrafields->attribute_type[$key] == 'sellist')) {
-						print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
-					} else {
-
-						print '<table class="nobordernopadding"><tr>';
-						print '<td></td><td>';
-						if (is_array($array_query['options_' . $key])) {
-							print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key]));
-						} else {
-							print $extrafields->showInputField($key, $array_query['options_' . $key]);
-						}
-						print '</td></tr></table>';
-
-						print '</td><td>' . "\n";
-					}
-					print '</td></tr>' . "\n";
-				}
-			}
-		} else {
-			$std_soc = new Societe($db);
-			$action_search = 'query';
-
-			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
-			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array ('thirdpartycard'));
-
-			$parameters=array();
-			if (! empty($advTarget->id)) {
-				$parameters = array('array_query' => $advTarget->filtervalue);
-			}
-			// Other attributes
-			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
+        print_fiche_titre($langs->trans("AdvTgtTitle"));
+
+        print '<div class="tabBar">' . "\n";
+        print '<form name="find_customer" id="find_customer" action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '"  method="POST">' . "\n";
+        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
+        print '<input type="hidden" name="action" value="">' . "\n";
+        print '<table class="border" width="100%">' . "\n";
+
+        print '<tr>' . "\n";
+        print '<td colspan="3" align="right">' . "\n";
+
+        print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
+
+        print '</td>' . "\n";
+        print '</tr>' . "\n";
+
+        print '<tr><td>' . $langs->trans('AdvTgtNameTemplate') . '</td><td>';
+        if (! empty($template_id)) {
+            $default_template = $template_id;
+        } else {
+            $default_template = $advTarget->id;
+        }
+        print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template,0,$advTarget->type_element);
+        print '<input type="button" name="loadfilter" id="loadfilter" value="' . $langs->trans('AdvTgtLoadFilter') . '" class="butAction"/>';
+        print '<input type="button" name="deletefilter" id="deletefilter" value="' . $langs->trans('AdvTgtDeleteFilter') . '" class="butAction"/>';
+        print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
+        print $langs->trans('AdvTgtOrCreateNewFilter');
+        print '<input type="text" name="template_name" id="template_name" value=""/>';
+        print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        print '<tr><td>' . $langs->trans('AdvTgtTypeOfIncude') . '</td><td>';
+        print $form->selectarray('type_of_target', $advTarget->select_target_type, $array_query['type_of_target']);
+        print '</td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtTypeOfIncudeHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Customer name
+        print '<tr><td>' . $langs->trans('ThirdPartyName');
+        if (! empty($array_query['cust_name'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_name" value="' . $array_query['cust_name'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Code Client
+        print '<tr><td>' . $langs->trans('CustomerCode');
+        if (! empty($array_query['cust_code'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_code" value="' . $array_query['cust_code'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Address Client
+        print '<tr><td>' . $langs->trans('Address');
+        if (! empty($array_query['cust_adress'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_adress" value="' . $array_query['cust_adress'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Zip Client
+        print '<tr><td>' . $langs->trans('Zip');
+        if (! empty($array_query['cust_zip'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_zip" value="' . $array_query['cust_zip'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // City Client
+        print '<tr><td>' . $langs->trans('Town');
+        if (! empty($array_query['cust_city'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="cust_city" value="' . $array_query['cust_city'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Customer Country
+        print '<tr><td>' . $langs->trans("Country");
+        if (count($array_query['cust_country']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->multiselectCountry('cust_country', $array_query['cust_country']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // State Customer
+        print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('ThirdParty');
+        if (count($array_query['cust_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray('cust_status', array (
+                '0' => $langs->trans('ActivityCeased'),
+                '1' => $langs->trans('InActivity')
+        ), $array_query['cust_status']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Mother Company
+        print '<tr><td>' . $langs->trans("Maison mère");
+        if (! empty($array_query['cust_mothercompany'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print '<input type="text" name="cust_mothercompany" value="' . $array_query['cust_mothercompany'] . '"/>';
+        print '</td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Prospect/Customer
+        $selected = $array_query['cust_typecust'];
+        print '<tr><td>' . $langs->trans('ProspectCustomer') . ' ' . $langs->trans('ThirdParty');
+        if (count($array_query['cust_typecust']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        $options_array = array (
+                2 => $langs->trans('Prospect'),
+                3 => $langs->trans('ProspectCustomer'),
+                1 => $langs->trans('Customer'),
+                0 => $langs->trans('NorProspectNorCustomer')
+        );
+        print $formadvtargetemaling->advMultiselectarray('cust_typecust', $options_array, $array_query['cust_typecust']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Prospection status
+        print '<tr><td>' . $langs->trans('ProspectLevel');
+        if (count($array_query['cust_prospect_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Prospection comm status
+        print '<tr><td>' . $langs->trans('StatusProsp');
+        if (count($array_query['cust_comm_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray('cust_comm_status', $advTarget->type_statuscommprospect, $array_query['cust_comm_status']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Customer Type
+        print '<tr><td>' . $langs->trans("ThirdPartyType");
+        if (count($array_query['cust_typeent']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->advMultiselectarray('cust_typeent', $formcompany->typent_array(0, " AND id <> 0"), $array_query['cust_typeent']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Staff number
+        print '<td>' . $langs->trans("Staff");
+        if (count($array_query['cust_effectif_id']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray("cust_effectif_id", $formcompany->effectif_array(0, " AND id <> 0"), $array_query['cust_effectif_id']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Sales manager
+        print '<tr><td>' . $langs->trans("SalesRepresentatives");
+        if (count($array_query['cust_saleman']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman', $array_query['cust_saleman'], $user);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Customer Default Langauge
+        if (! empty($conf->global->MAIN_MULTILANGS)) {
+
+            print '<tr><td>' . $langs->trans("DefaultLang");
+            if (count($array_query['cust_language']) > 0) {
+                print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+            }
+            print '</td><td>' . "\n";
+            print $formadvtargetemaling->multiselectselectLanguage('cust_language', $array_query['cust_language']);
+            print '</td><td>' . "\n";
+            print '</td></tr>' . "\n";
+        }
+
+        if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+            // Customer Categories
+            print '<tr><td>' . $langs->trans("CustomersCategoryShort");
+            if (count($array_query['cust_categ']) > 0) {
+                print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+            }
+            print '</td><td>' . "\n";
+            print $formadvtargetemaling->multiselectCustomerCategories('cust_categ', $array_query['cust_categ']);
+            print '</td><td>' . "\n";
+            print '</td></tr>' . "\n";
+        }
+
+        // Standard Extrafield feature
+        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            // fetch optionals attributes and labels
+            dol_include_once('/core/class/extrafields.class.php');
+            $extrafields = new ExtraFields($db);
+            $extralabels = $extrafields->fetch_name_optionals_label('societe');
+            foreach ( $extralabels as $key => $val ) {
+                if ($key != 'ts_nameextra' && $key != 'ts_payeur') {
+                    print '<tr><td>' . $extrafields->attribute_label[$key];
+                    if (! empty($array_query['options_' . $key]) || (is_array($array_query['options_' . $key]) && count($array_query['options_' . $key]) > 0)) {
+                        print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+                    }
+                    print '</td><td>';
+                    if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
+                        print '<input type="text" name="options_' . $key . '"/></td><td>' . "\n";
+                        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+                    } elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
+                        print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options' . $key . '_min"/>';
+                        print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options' . $key . '_max"/>';
+                        print '</td><td>' . "\n";
+                        print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
+                    } elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
+
+                        print '<table class="nobordernopadding"><tr>';
+                        print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+                        print $form->selectDate('', 'options_' . $key . '_st_dt');
+                        print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+                        print $form->selectDate('', 'options_' . $key . '_end_dt');
+                        print '</td></tr></table>';
+
+                        print '</td><td>' . "\n";
+                        print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
+                    } elseif (($extrafields->attribute_type[$key] == 'boolean')) {
+                        print $form->selectarray('options_' . $key, array (
+                                '' => '',
+                                '1' => $langs->trans('Yes'),
+                                '0' => $langs->trans('No')
+                        ), $array_query['options_' . $key]);
+                        print '</td><td>' . "\n";
+                    } elseif (($extrafields->attribute_type[$key] == 'select')) {
+                        print $formadvtargetemaling->advMultiselectarray('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
+                        print '</td><td>' . "\n";
+                    } elseif (($extrafields->attribute_type[$key] == 'sellist')) {
+                        print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
+                        print '</td><td>' . "\n";
+                    } else {
+
+                        print '<table class="nobordernopadding"><tr>';
+                        print '<td></td><td>';
+                        if (is_array($array_query['options_' . $key])) {
+                            print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key]));
+                        } else {
+                            print $extrafields->showInputField($key, $array_query['options_' . $key]);
+                        }
+                        print '</td></tr></table>';
+
+                        print '</td><td>' . "\n";
+                    }
+                    print '</td></tr>' . "\n";
+                }
+            }
+        } else {
+            $std_soc = new Societe($db);
+            $action_search = 'query';
+
+            // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+            include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+            $hookmanager = new HookManager($db);
+            $hookmanager->initHooks(array ('thirdpartycard'));
+
+            $parameters=array();
+            if (! empty($advTarget->id)) {
+                $parameters = array('array_query' => $advTarget->filtervalue);
+            }
+            // Other attributes
+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
             print $hookmanager->resPrint;
-		}
-
-		// State Contact
-		print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('Contact');
-		if (count($array_query['contact_status']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('contact_status', array (
-				'0' => $langs->trans('ActivityCeased'),
-				'1' => $langs->trans('InActivity')
-		), $array_query['contact_status']);
-		print '</td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Civility
-		print '<tr><td width="15%">' . $langs->trans("UserTitle");
-		if (count($array_query['contact_civility']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>';
-		print $formadvtargetemaling->multiselectCivility('contact_civility', $array_query['contact_civility']);
-		print '</td></tr>';
-
-		// contact name
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Lastname');
-		if (! empty($array_query['contact_lastname'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="contact_lastname" value="' . $array_query['contact_lastname'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Firstname');
-		if (! empty($array_query['contact_firstname'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td><input type="text" name="contact_firstname" value="' . $array_query['contact_firstname'] . '"/></td><td>' . "\n";
-		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-
-		// Contact Country
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("Country");
-		if (count($array_query['contact_country']) > 0) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $formadvtargetemaling->multiselectCountry('contact_country', $array_query['contact_country']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Never send mass mailing
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("No_Email");
-		if (! empty($array_query['contact_no_email'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print $form->selectarray('contact_no_email', array (
-				'' => '',
-				'1' => $langs->trans('Yes'),
-				'0' => $langs->trans('No')
-		), $array_query['contact_no_email']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Contact Date Create
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateCreation");
-		if (! empty($array_query['contact_create_st_dt'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print '<table class="nobordernopadding"><tr>';
-		print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_create_st_dt'], 'contact_create_st_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_create_end_dt'], 'contact_create_end_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td></tr></table>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		// Contact update Create
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateLastModification");
-		if (! empty($array_query['contact_update_st_dt'])) {
-			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-		}
-		print '</td><td>' . "\n";
-		print '<table class="nobordernopadding"><tr>';
-		print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_update_st_dt'], 'contact_update_st_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-		print $form->selectDate($array_query['contact_update_end_dt'], 'contact_update_end_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td></tr></table>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
-
-		if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
-			// Customer Categories
-			print '<tr><td>' . $langs->trans("ContactCategoriesShort");
-			if (count($array_query['contact_categ']) > 0) {
-				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-			}
-			print '</td><td>' . "\n";
-			print $formadvtargetemaling->multiselectContactCategories('contact_categ', $array_query['contact_categ']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
-		}
-
-		// Standard Extrafield feature
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
-			// fetch optionals attributes and labels
-			dol_include_once('/core/class/extrafields.class.php');
-			$extrafields = new ExtraFields($db);
-			$extralabels = $extrafields->fetch_name_optionals_label('socpeople');
+        }
+
+        // State Contact
+        print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('Contact');
+        if (count($array_query['contact_status']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->advMultiselectarray('contact_status', array (
+                '0' => $langs->trans('ActivityCeased'),
+                '1' => $langs->trans('InActivity')
+        ), $array_query['contact_status']);
+        print '</td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Civility
+        print '<tr><td width="15%">' . $langs->trans("UserTitle");
+        if (count($array_query['contact_civility']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>';
+        print $formadvtargetemaling->multiselectCivility('contact_civility', $array_query['contact_civility']);
+        print '</td></tr>';
+
+        // contact name
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Lastname');
+        if (! empty($array_query['contact_lastname'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="contact_lastname" value="' . $array_query['contact_lastname'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Firstname');
+        if (! empty($array_query['contact_firstname'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td><input type="text" name="contact_firstname" value="' . $array_query['contact_firstname'] . '"/></td><td>' . "\n";
+        print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+        print '</td></tr>' . "\n";
+
+        // Contact Country
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("Country");
+        if (count($array_query['contact_country']) > 0) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $formadvtargetemaling->multiselectCountry('contact_country', $array_query['contact_country']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Never send mass mailing
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("No_Email");
+        if (! empty($array_query['contact_no_email'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print $form->selectarray('contact_no_email', array (
+                '' => '',
+                '1' => $langs->trans('Yes'),
+                '0' => $langs->trans('No')
+        ), $array_query['contact_no_email']);
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Contact Date Create
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateCreation");
+        if (! empty($array_query['contact_create_st_dt'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print '<table class="nobordernopadding"><tr>';
+        print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_create_st_dt'], 'contact_create_st_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_create_end_dt'], 'contact_create_end_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td></tr></table>';
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        // Contact update Create
+        print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateLastModification");
+        if (! empty($array_query['contact_update_st_dt'])) {
+            print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+        }
+        print '</td><td>' . "\n";
+        print '<table class="nobordernopadding"><tr>';
+        print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_update_st_dt'], 'contact_update_st_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+        print $form->selectDate($array_query['contact_update_end_dt'], 'contact_update_end_dt', 0, 0, 1, 'find_customer', 1, 1);
+        print '</td></tr></table>';
+        print '</td><td>' . "\n";
+        print '</td></tr>' . "\n";
+
+        if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+            // Customer Categories
+            print '<tr><td>' . $langs->trans("ContactCategoriesShort");
+            if (count($array_query['contact_categ']) > 0) {
+                print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+            }
+            print '</td><td>' . "\n";
+            print $formadvtargetemaling->multiselectContactCategories('contact_categ', $array_query['contact_categ']);
+            print '</td><td>' . "\n";
+            print '</td></tr>' . "\n";
+        }
+
+        // Standard Extrafield feature
+        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+            // fetch optionals attributes and labels
+            dol_include_once('/core/class/extrafields.class.php');
+            $extrafields = new ExtraFields($db);
+            $extralabels = $extrafields->fetch_name_optionals_label('socpeople');
             foreach($extrafields->attribute_type as $key=>&$value) {
                 if($value == 'radio')$value = 'select';
             }
 
 
-			foreach ( $extralabels as $key => $val ) {
-
-				print '<tr><td>' . $extrafields->attribute_label[$key];
-				if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
-					print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
-				}
-				print '</td><td>';
-				if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
-					print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
-					print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-				} elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
-					print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
-					print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
-					print '</td><td>' . "\n";
-					print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
-				} elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
-
-					print '<table class="nobordernopadding"><tr>';
-					print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-					print $form->selectDate('', 'options_' . $key . '_st_dt' . '_cnct');
-					print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-					print $form->selectDate('', 'options_' . $key . '_end_dt' . '_cnct');
-					print '</td></tr></table>';
-
-					print '</td><td>' . "\n";
-					print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
-				} elseif (($extrafields->attribute_type[$key] == 'boolean')) {
-					print $form->selectarray('options_' . $key . '_cnct', array (
-							'' => '',
-							'1' => $langs->trans('Yes'),
-							'0' => $langs->trans('No')
-					), $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
-				} elseif (($extrafields->attribute_type[$key] == 'select')) {
-					print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
-				} elseif (($extrafields->attribute_type[$key] == 'sellist')) {
-					print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
-				} else {
-
-					print '<table class="nobordernopadding"><tr>';
-					print '<td></td><td>';
-					if (is_array($array_query['options_' . $key . '_cnct'])) {
-						print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
-					} else {
-						print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
-					}
-					print '</td></tr></table>';
-
-					print '</td><td>' . "\n";
-				}
-				print '</td></tr>' . "\n";
-			}
-		}
-
-		print '<tr>' . "\n";
-		print '<td colspan="3" align="right">' . "\n";
-
-		print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
-
-		print '</td>' . "\n";
-		print '</tr>' . "\n";
-		print '</table>' . "\n";
-		print '</form>' . "\n";
-		print '</div>' . "\n";
-
-		print '<form action="' . $_SERVER['PHP_SELF'] . '?action=clear&id=' . $object->id . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-		print_titre($langs->trans("ToClearAllRecipientsClickHere"));
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre" align="right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
-		print '</tr>';
-		print '</table>';
-		print '</form>';
-		print '<br>';
\ No newline at end of file
+            foreach ( $extralabels as $key => $val ) {
+
+                print '<tr><td>' . $extrafields->attribute_label[$key];
+                if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
+                    print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+                }
+                print '</td><td>';
+                if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
+                    print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
+                    print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
+                } elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
+                    print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
+                    print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
+                    print '</td><td>' . "\n";
+                    print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
+                } elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
+
+                    print '<table class="nobordernopadding"><tr>';
+                    print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+                    print $form->selectDate('', 'options_' . $key . '_st_dt' . '_cnct');
+                    print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+                    print $form->selectDate('', 'options_' . $key . '_end_dt' . '_cnct');
+                    print '</td></tr></table>';
+
+                    print '</td><td>' . "\n";
+                    print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
+                } elseif (($extrafields->attribute_type[$key] == 'boolean')) {
+                    print $form->selectarray('options_' . $key . '_cnct', array (
+                            '' => '',
+                            '1' => $langs->trans('Yes'),
+                            '0' => $langs->trans('No')
+                    ), $array_query['options_' . $key . '_cnct']);
+                    print '</td><td>' . "\n";
+                } elseif (($extrafields->attribute_type[$key] == 'select')) {
+                    print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
+                    print '</td><td>' . "\n";
+                } elseif (($extrafields->attribute_type[$key] == 'sellist')) {
+                    print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
+                    print '</td><td>' . "\n";
+                } else {
+
+                    print '<table class="nobordernopadding"><tr>';
+                    print '<td></td><td>';
+                    if (is_array($array_query['options_' . $key . '_cnct'])) {
+                        print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
+                    } else {
+                        print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
+                    }
+                    print '</td></tr></table>';
+
+                    print '</td><td>' . "\n";
+                }
+                print '</td></tr>' . "\n";
+            }
+        }
+
+        print '<tr>' . "\n";
+        print '<td colspan="3" align="right">' . "\n";
+
+        print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
+
+        print '</td>' . "\n";
+        print '</tr>' . "\n";
+        print '</table>' . "\n";
+        print '</form>' . "\n";
+        print '</div>' . "\n";
+
+        print '<form action="' . $_SERVER['PHP_SELF'] . '?action=clear&id=' . $object->id . '" method="POST">';
+        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        print_titre($langs->trans("ToClearAllRecipientsClickHere"));
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td class="liste_titre" align="right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
+        print '</tr>';
+        print '</table>';
+        print '</form>';
+        print '<br>';
\ No newline at end of file

Spacing +194 added lines, -194 removed lines

@@ -49,211 +49,211 @@ 
 
 		print_fiche_titre($langs->trans("AdvTgtTitle"));
 
-		print '<div class="tabBar">' . "\n";
-		print '<form name="find_customer" id="find_customer" action="' . $_SERVER['PHP_SELF'] . '?id=' . $id . '"  method="POST">' . "\n";
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
-		print '<input type="hidden" name="action" value="">' . "\n";
-		print '<table class="border" width="100%">' . "\n";
+		print '<div class="tabBar">'."\n";
+		print '<form name="find_customer" id="find_customer" action="'.$_SERVER['PHP_SELF'].'?id='.$id.'"  method="POST">'."\n";
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+		print '<input type="hidden" name="action" value="">'."\n";
+		print '<table class="border" width="100%">'."\n";
 
-		print '<tr>' . "\n";
-		print '<td colspan="3" align="right">' . "\n";
+		print '<tr>'."\n";
+		print '<td colspan="3" align="right">'."\n";
 
-		print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
+		print '<input type="button" name="addcontact" id="addcontact" value="'.$langs->trans('AdvTgtAddContact').'" class="butAction"/>'."\n";
 
-		print '</td>' . "\n";
-		print '</tr>' . "\n";
+		print '</td>'."\n";
+		print '</tr>'."\n";
 
-		print '<tr><td>' . $langs->trans('AdvTgtNameTemplate') . '</td><td>';
-		if (! empty($template_id)) {
+		print '<tr><td>'.$langs->trans('AdvTgtNameTemplate').'</td><td>';
+		if (!empty($template_id)) {
 			$default_template = $template_id;
 		} else {
 			$default_template = $advTarget->id;
 		}
-		print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template,0,$advTarget->type_element);
-		print '<input type="button" name="loadfilter" id="loadfilter" value="' . $langs->trans('AdvTgtLoadFilter') . '" class="butAction"/>';
-		print '<input type="button" name="deletefilter" id="deletefilter" value="' . $langs->trans('AdvTgtDeleteFilter') . '" class="butAction"/>';
-		print '<input type="button" name="savefilter" id="savefilter" value="' . $langs->trans('AdvTgtSaveFilter') . '" class="butAction"/>';
+		print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template, 0, $advTarget->type_element);
+		print '<input type="button" name="loadfilter" id="loadfilter" value="'.$langs->trans('AdvTgtLoadFilter').'" class="butAction"/>';
+		print '<input type="button" name="deletefilter" id="deletefilter" value="'.$langs->trans('AdvTgtDeleteFilter').'" class="butAction"/>';
+		print '<input type="button" name="savefilter" id="savefilter" value="'.$langs->trans('AdvTgtSaveFilter').'" class="butAction"/>';
 		print $langs->trans('AdvTgtOrCreateNewFilter');
 		print '<input type="text" name="template_name" id="template_name" value=""/>';
-		print '<input type="button" name="createfilter" id="createfilter" value="' . $langs->trans('AdvTgtCreateFilter') . '" class="butAction"/>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '<input type="button" name="createfilter" id="createfilter" value="'.$langs->trans('AdvTgtCreateFilter').'" class="butAction"/>';
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
-		print '<tr><td>' . $langs->trans('AdvTgtTypeOfIncude') . '</td><td>';
+		print '<tr><td>'.$langs->trans('AdvTgtTypeOfIncude').'</td><td>';
 		print $form->selectarray('type_of_target', $advTarget->select_target_type, $array_query['type_of_target']);
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtTypeOfIncudeHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Customer name
-		print '<tr><td>' . $langs->trans('ThirdPartyName');
-		if (! empty($array_query['cust_name'])) {
+		print '<tr><td>'.$langs->trans('ThirdPartyName');
+		if (!empty($array_query['cust_name'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="cust_name" value="' . $array_query['cust_name'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="cust_name" value="'.$array_query['cust_name'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Code Client
-		print '<tr><td>' . $langs->trans('CustomerCode');
-		if (! empty($array_query['cust_code'])) {
+		print '<tr><td>'.$langs->trans('CustomerCode');
+		if (!empty($array_query['cust_code'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="cust_code" value="' . $array_query['cust_code'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="cust_code" value="'.$array_query['cust_code'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Address Client
-		print '<tr><td>' . $langs->trans('Address');
-		if (! empty($array_query['cust_adress'])) {
+		print '<tr><td>'.$langs->trans('Address');
+		if (!empty($array_query['cust_adress'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="cust_adress" value="' . $array_query['cust_adress'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="cust_adress" value="'.$array_query['cust_adress'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Zip Client
-		print '<tr><td>' . $langs->trans('Zip');
-		if (! empty($array_query['cust_zip'])) {
+		print '<tr><td>'.$langs->trans('Zip');
+		if (!empty($array_query['cust_zip'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="cust_zip" value="' . $array_query['cust_zip'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="cust_zip" value="'.$array_query['cust_zip'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// City Client
-		print '<tr><td>' . $langs->trans('Town');
-		if (! empty($array_query['cust_city'])) {
+		print '<tr><td>'.$langs->trans('Town');
+		if (!empty($array_query['cust_city'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="cust_city" value="' . $array_query['cust_city'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="cust_city" value="'.$array_query['cust_city'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Customer Country
-		print '<tr><td>' . $langs->trans("Country");
+		print '<tr><td>'.$langs->trans("Country");
 		if (count($array_query['cust_country']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print $formadvtargetemaling->multiselectCountry('cust_country', $array_query['cust_country']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// State Customer
-		print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('ThirdParty');
+		print '<tr><td>'.$langs->trans('Status').' '.$langs->trans('ThirdParty');
 		if (count($array_query['cust_status']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
 		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('cust_status', array (
+		print $formadvtargetemaling->advMultiselectarray('cust_status', array(
 				'0' => $langs->trans('ActivityCeased'),
 				'1' => $langs->trans('InActivity')
 		), $array_query['cust_status']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Mother Company
-		print '<tr><td>' . $langs->trans("Maison mère");
-		if (! empty($array_query['cust_mothercompany'])) {
+		print '<tr><td>'.$langs->trans("Maison mère");
+		if (!empty($array_query['cust_mothercompany'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
-		print '<input type="text" name="cust_mothercompany" value="' . $array_query['cust_mothercompany'] . '"/>';
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
+		print '<input type="text" name="cust_mothercompany" value="'.$array_query['cust_mothercompany'].'"/>';
+		print '</td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Prospect/Customer
 		$selected = $array_query['cust_typecust'];
-		print '<tr><td>' . $langs->trans('ProspectCustomer') . ' ' . $langs->trans('ThirdParty');
+		print '<tr><td>'.$langs->trans('ProspectCustomer').' '.$langs->trans('ThirdParty');
 		if (count($array_query['cust_typecust']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
 		print '</td><td>';
-		$options_array = array (
+		$options_array = array(
 				2 => $langs->trans('Prospect'),
 				3 => $langs->trans('ProspectCustomer'),
 				1 => $langs->trans('Customer'),
 				0 => $langs->trans('NorProspectNorCustomer')
 		);
 		print $formadvtargetemaling->advMultiselectarray('cust_typecust', $options_array, $array_query['cust_typecust']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Prospection status
-		print '<tr><td>' . $langs->trans('ProspectLevel');
+		print '<tr><td>'.$langs->trans('ProspectLevel');
 		if (count($array_query['cust_prospect_status']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
 		print '</td><td>';
 		print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Prospection comm status
-		print '<tr><td>' . $langs->trans('StatusProsp');
+		print '<tr><td>'.$langs->trans('StatusProsp');
 		if (count($array_query['cust_comm_status']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
 		print '</td><td>';
 		print $formadvtargetemaling->advMultiselectarray('cust_comm_status', $advTarget->type_statuscommprospect, $array_query['cust_comm_status']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Customer Type
-		print '<tr><td>' . $langs->trans("ThirdPartyType");
+		print '<tr><td>'.$langs->trans("ThirdPartyType");
 		if (count($array_query['cust_typeent']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print $formadvtargetemaling->advMultiselectarray('cust_typeent', $formcompany->typent_array(0, " AND id <> 0"), $array_query['cust_typeent']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Staff number
-		print '<td>' . $langs->trans("Staff");
+		print '<td>'.$langs->trans("Staff");
 		if (count($array_query['cust_effectif_id']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
 		print '</td><td>';
 		print $formadvtargetemaling->advMultiselectarray("cust_effectif_id", $formcompany->effectif_array(0, " AND id <> 0"), $array_query['cust_effectif_id']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Sales manager
-		print '<tr><td>' . $langs->trans("SalesRepresentatives");
+		print '<tr><td>'.$langs->trans("SalesRepresentatives");
 		if (count($array_query['cust_saleman']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman', $array_query['cust_saleman'], $user);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Customer Default Langauge
-		if (! empty($conf->global->MAIN_MULTILANGS)) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 
-			print '<tr><td>' . $langs->trans("DefaultLang");
+			print '<tr><td>'.$langs->trans("DefaultLang");
 			if (count($array_query['cust_language']) > 0) {
 				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 			}
-			print '</td><td>' . "\n";
+			print '</td><td>'."\n";
 			print $formadvtargetemaling->multiselectselectLanguage('cust_language', $array_query['cust_language']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
+			print '</td><td>'."\n";
+			print '</td></tr>'."\n";
 		}
 
-		if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+		if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 			// Customer Categories
-			print '<tr><td>' . $langs->trans("CustomersCategoryShort");
+			print '<tr><td>'.$langs->trans("CustomersCategoryShort");
 			if (count($array_query['cust_categ']) > 0) {
 				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 			}
-			print '</td><td>' . "\n";
+			print '</td><td>'."\n";
 			print $formadvtargetemaling->multiselectCustomerCategories('cust_categ', $array_query['cust_categ']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
+			print '</td><td>'."\n";
+			print '</td></tr>'."\n";
 		}
 
 		// Standard Extrafield feature
@@ -262,59 +262,59 @@ 
 			dol_include_once('/core/class/extrafields.class.php');
 			$extrafields = new ExtraFields($db);
 			$extralabels = $extrafields->fetch_name_optionals_label('societe');
-			foreach ( $extralabels as $key => $val ) {
+			foreach ($extralabels as $key => $val) {
 				if ($key != 'ts_nameextra' && $key != 'ts_payeur') {
-					print '<tr><td>' . $extrafields->attribute_label[$key];
-					if (! empty($array_query['options_' . $key]) || (is_array($array_query['options_' . $key]) && count($array_query['options_' . $key]) > 0)) {
+					print '<tr><td>'.$extrafields->attribute_label[$key];
+					if (!empty($array_query['options_'.$key]) || (is_array($array_query['options_'.$key]) && count($array_query['options_'.$key]) > 0)) {
 						print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 					}
 					print '</td><td>';
 					if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
-						print '<input type="text" name="options_' . $key . '"/></td><td>' . "\n";
+						print '<input type="text" name="options_'.$key.'"/></td><td>'."\n";
 						print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
 					} elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
-						print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options' . $key . '_min"/>';
-						print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options' . $key . '_max"/>';
-						print '</td><td>' . "\n";
+						print $langs->trans("AdvTgtMinVal").'<input type="text" name="options'.$key.'_min"/>';
+						print $langs->trans("AdvTgtMaxVal").'<input type="text" name="options'.$key.'_max"/>';
+						print '</td><td>'."\n";
 						print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
 					} elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
 
 						print '<table class="nobordernopadding"><tr>';
-						print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-						print $form->selectDate('', 'options_' . $key . '_st_dt');
-						print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-						print $form->selectDate('', 'options_' . $key . '_end_dt');
+						print '<td>'.$langs->trans("AdvTgtStartDt").'</td><td>';
+						print $form->selectDate('', 'options_'.$key.'_st_dt');
+						print '</td><td>'.$langs->trans("AdvTgtEndDt").'</td><td>';
+						print $form->selectDate('', 'options_'.$key.'_end_dt');
 						print '</td></tr></table>';
 
-						print '</td><td>' . "\n";
+						print '</td><td>'."\n";
 						print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
 					} elseif (($extrafields->attribute_type[$key] == 'boolean')) {
-						print $form->selectarray('options_' . $key, array (
+						print $form->selectarray('options_'.$key, array(
 								'' => '',
 								'1' => $langs->trans('Yes'),
 								'0' => $langs->trans('No')
-						), $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
+						), $array_query['options_'.$key]);
+						print '</td><td>'."\n";
 					} elseif (($extrafields->attribute_type[$key] == 'select')) {
-						print $formadvtargetemaling->advMultiselectarray('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
+						print $formadvtargetemaling->advMultiselectarray('options_'.$key, $extrafields->attribute_param[$key]['options'], $array_query['options_'.$key]);
+						print '</td><td>'."\n";
 					} elseif (($extrafields->attribute_type[$key] == 'sellist')) {
-						print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]);
-						print '</td><td>' . "\n";
+						print $formadvtargetemaling->advMultiselectarraySelllist('options_'.$key, $extrafields->attribute_param[$key]['options'], $array_query['options_'.$key]);
+						print '</td><td>'."\n";
 					} else {
 
 						print '<table class="nobordernopadding"><tr>';
 						print '<td></td><td>';
-						if (is_array($array_query['options_' . $key])) {
-							print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key]));
+						if (is_array($array_query['options_'.$key])) {
+							print $extrafields->showInputField($key, implode(',', $array_query['options_'.$key]));
 						} else {
-							print $extrafields->showInputField($key, $array_query['options_' . $key]);
+							print $extrafields->showInputField($key, $array_query['options_'.$key]);
 						}
 						print '</td></tr></table>';
 
-						print '</td><td>' . "\n";
+						print '</td><td>'."\n";
 					}
-					print '</td></tr>' . "\n";
+					print '</td></tr>'."\n";
 				}
 			}
 		} else {
@@ -322,12 +322,12 @@ 
 			$action_search = 'query';
 
 			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array ('thirdpartycard'));
+			$hookmanager->initHooks(array('thirdpartycard'));
 
-			$parameters=array();
-			if (! empty($advTarget->id)) {
+			$parameters = array();
+			if (!empty($advTarget->id)) {
 				$parameters = array('array_query' => $advTarget->filtervalue);
 			}
 			// Other attributes
@@ -336,21 +336,21 @@ 
 		}
 
 		// State Contact
-		print '<tr><td>' . $langs->trans('Status') . ' ' . $langs->trans('Contact');
+		print '<tr><td>'.$langs->trans('Status').' '.$langs->trans('Contact');
 		if (count($array_query['contact_status']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
 		print '</td><td>';
-		print $formadvtargetemaling->advMultiselectarray('contact_status', array (
+		print $formadvtargetemaling->advMultiselectarray('contact_status', array(
 				'0' => $langs->trans('ActivityCeased'),
 				'1' => $langs->trans('InActivity')
 		), $array_query['contact_status']);
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Civility
-		print '<tr><td width="15%">' . $langs->trans("UserTitle");
+		print '<tr><td width="15%">'.$langs->trans("UserTitle");
 		if (count($array_query['contact_civility']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
@@ -359,85 +359,85 @@ 
 		print '</td></tr>';
 
 		// contact name
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Lastname');
-		if (! empty($array_query['contact_lastname'])) {
+		print '<tr><td>'.$langs->trans('Contact').' '.$langs->trans('Lastname');
+		if (!empty($array_query['contact_lastname'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="contact_lastname" value="' . $array_query['contact_lastname'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="contact_lastname" value="'.$array_query['contact_lastname'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans('Firstname');
-		if (! empty($array_query['contact_firstname'])) {
+		print '</td></tr>'."\n";
+		print '<tr><td>'.$langs->trans('Contact').' '.$langs->trans('Firstname');
+		if (!empty($array_query['contact_firstname'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td><input type="text" name="contact_firstname" value="' . $array_query['contact_firstname'] . '"/></td><td>' . "\n";
+		print '</td><td><input type="text" name="contact_firstname" value="'.$array_query['contact_firstname'].'"/></td><td>'."\n";
 		print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
-		print '</td></tr>' . "\n";
+		print '</td></tr>'."\n";
 
 		// Contact Country
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("Country");
+		print '<tr><td>'.$langs->trans('Contact').' '.$langs->trans("Country");
 		if (count($array_query['contact_country']) > 0) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print $formadvtargetemaling->multiselectCountry('contact_country', $array_query['contact_country']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Never send mass mailing
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("No_Email");
-		if (! empty($array_query['contact_no_email'])) {
+		print '<tr><td>'.$langs->trans('Contact').' '.$langs->trans("No_Email");
+		if (!empty($array_query['contact_no_email'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
-		print $form->selectarray('contact_no_email', array (
+		print '</td><td>'."\n";
+		print $form->selectarray('contact_no_email', array(
 				'' => '',
 				'1' => $langs->trans('Yes'),
 				'0' => $langs->trans('No')
 		), $array_query['contact_no_email']);
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Contact Date Create
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateCreation");
-		if (! empty($array_query['contact_create_st_dt'])) {
+		print '<tr><td>'.$langs->trans('Contact').' '.$langs->trans("DateCreation");
+		if (!empty($array_query['contact_create_st_dt'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print '<table class="nobordernopadding"><tr>';
-		print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+		print '<td>'.$langs->trans("AdvTgtStartDt").'</td><td>';
 		print $form->selectDate($array_query['contact_create_st_dt'], 'contact_create_st_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+		print '</td><td>'.$langs->trans("AdvTgtEndDt").'</td><td>';
 		print $form->selectDate($array_query['contact_create_end_dt'], 'contact_create_end_dt', 0, 0, 1, 'find_customer', 1, 1);
 		print '</td></tr></table>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
 		// Contact update Create
-		print '<tr><td>' . $langs->trans('Contact') . ' ' . $langs->trans("DateLastModification");
-		if (! empty($array_query['contact_update_st_dt'])) {
+		print '<tr><td>'.$langs->trans('Contact').' '.$langs->trans("DateLastModification");
+		if (!empty($array_query['contact_update_st_dt'])) {
 			print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 		}
-		print '</td><td>' . "\n";
+		print '</td><td>'."\n";
 		print '<table class="nobordernopadding"><tr>';
-		print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
+		print '<td>'.$langs->trans("AdvTgtStartDt").'</td><td>';
 		print $form->selectDate($array_query['contact_update_st_dt'], 'contact_update_st_dt', 0, 0, 1, 'find_customer', 1, 1);
-		print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
+		print '</td><td>'.$langs->trans("AdvTgtEndDt").'</td><td>';
 		print $form->selectDate($array_query['contact_update_end_dt'], 'contact_update_end_dt', 0, 0, 1, 'find_customer', 1, 1);
 		print '</td></tr></table>';
-		print '</td><td>' . "\n";
-		print '</td></tr>' . "\n";
+		print '</td><td>'."\n";
+		print '</td></tr>'."\n";
 
-		if (! empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+		if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 			// Customer Categories
-			print '<tr><td>' . $langs->trans("ContactCategoriesShort");
+			print '<tr><td>'.$langs->trans("ContactCategoriesShort");
 			if (count($array_query['contact_categ']) > 0) {
 				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 			}
-			print '</td><td>' . "\n";
+			print '</td><td>'."\n";
 			print $formadvtargetemaling->multiselectContactCategories('contact_categ', $array_query['contact_categ']);
-			print '</td><td>' . "\n";
-			print '</td></tr>' . "\n";
+			print '</td><td>'."\n";
+			print '</td></tr>'."\n";
 		}
 
 		// Standard Extrafield feature
@@ -446,84 +446,84 @@ 
 			dol_include_once('/core/class/extrafields.class.php');
 			$extrafields = new ExtraFields($db);
 			$extralabels = $extrafields->fetch_name_optionals_label('socpeople');
-            foreach($extrafields->attribute_type as $key=>&$value) {
-                if($value == 'radio')$value = 'select';
+            foreach ($extrafields->attribute_type as $key=>&$value) {
+                if ($value == 'radio')$value = 'select';
             }
 
 
-			foreach ( $extralabels as $key => $val ) {
+			foreach ($extralabels as $key => $val) {
 
-				print '<tr><td>' . $extrafields->attribute_label[$key];
-				if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
+				print '<tr><td>'.$extrafields->attribute_label[$key];
+				if ($array_query['options_'.$key.'_cnct'] != '' || (is_array($array_query['options_'.$key.'_cnct']) && count($array_query['options_'.$key.'_cnct']) > 0)) {
 					print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 				}
 				print '</td><td>';
 				if (($extrafields->attribute_type[$key] == 'varchar') || ($extrafields->attribute_type[$key] == 'text')) {
-					print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
+					print '<input type="text" name="options_'.$key.'_cnct"/></td><td>'."\n";
 					print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
 				} elseif (($extrafields->attribute_type[$key] == 'int') || ($extrafields->attribute_type[$key] == 'double')) {
-					print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
-					print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
-					print '</td><td>' . "\n";
+					print $langs->trans("AdvTgtMinVal").'<input type="text" name="options_'.$key.'_min_cnct"/>';
+					print $langs->trans("AdvTgtMaxVal").'<input type="text" name="options_'.$key.'_max_cnct"/>';
+					print '</td><td>'."\n";
 					print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
 				} elseif (($extrafields->attribute_type[$key] == 'date') || ($extrafields->attribute_type[$key] == 'datetime')) {
 
 					print '<table class="nobordernopadding"><tr>';
-					print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-					print $form->selectDate('', 'options_' . $key . '_st_dt' . '_cnct');
-					print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-					print $form->selectDate('', 'options_' . $key . '_end_dt' . '_cnct');
+					print '<td>'.$langs->trans("AdvTgtStartDt").'</td><td>';
+					print $form->selectDate('', 'options_'.$key.'_st_dt'.'_cnct');
+					print '</td><td>'.$langs->trans("AdvTgtEndDt").'</td><td>';
+					print $form->selectDate('', 'options_'.$key.'_end_dt'.'_cnct');
 					print '</td></tr></table>';
 
-					print '</td><td>' . "\n";
+					print '</td><td>'."\n";
 					print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
 				} elseif (($extrafields->attribute_type[$key] == 'boolean')) {
-					print $form->selectarray('options_' . $key . '_cnct', array (
+					print $form->selectarray('options_'.$key.'_cnct', array(
 							'' => '',
 							'1' => $langs->trans('Yes'),
 							'0' => $langs->trans('No')
-					), $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
+					), $array_query['options_'.$key.'_cnct']);
+					print '</td><td>'."\n";
 				} elseif (($extrafields->attribute_type[$key] == 'select')) {
-					print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
+					print $formadvtargetemaling->advMultiselectarray('options_'.$key.'_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_'.$key.'_cnct']);
+					print '</td><td>'."\n";
 				} elseif (($extrafields->attribute_type[$key] == 'sellist')) {
-					print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']);
-					print '</td><td>' . "\n";
+					print $formadvtargetemaling->advMultiselectarraySelllist('options_'.$key.'_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_'.$key.'_cnct']);
+					print '</td><td>'."\n";
 				} else {
 
 					print '<table class="nobordernopadding"><tr>';
 					print '<td></td><td>';
-					if (is_array($array_query['options_' . $key . '_cnct'])) {
-						print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
+					if (is_array($array_query['options_'.$key.'_cnct'])) {
+						print $extrafields->showInputField($key, implode(',', $array_query['options_'.$key.'_cnct']), '', '_cnct');
 					} else {
-						print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
+						print $extrafields->showInputField($key, $array_query['options_'.$key.'_cnct'], '', '_cnct');
 					}
 					print '</td></tr></table>';
 
-					print '</td><td>' . "\n";
+					print '</td><td>'."\n";
 				}
-				print '</td></tr>' . "\n";
+				print '</td></tr>'."\n";
 			}
 		}
 
-		print '<tr>' . "\n";
-		print '<td colspan="3" align="right">' . "\n";
+		print '<tr>'."\n";
+		print '<td colspan="3" align="right">'."\n";
 
-		print '<input type="button" name="addcontact" id="addcontact" value="' . $langs->trans('AdvTgtAddContact') . '" class="butAction"/>' . "\n";
+		print '<input type="button" name="addcontact" id="addcontact" value="'.$langs->trans('AdvTgtAddContact').'" class="butAction"/>'."\n";
 
-		print '</td>' . "\n";
-		print '</tr>' . "\n";
-		print '</table>' . "\n";
-		print '</form>' . "\n";
-		print '</div>' . "\n";
+		print '</td>'."\n";
+		print '</tr>'."\n";
+		print '</table>'."\n";
+		print '</form>'."\n";
+		print '</div>'."\n";
 
-		print '<form action="' . $_SERVER['PHP_SELF'] . '?action=clear&id=' . $object->id . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+		print '<form action="'.$_SERVER['PHP_SELF'].'?action=clear&id='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print_titre($langs->trans("ToClearAllRecipientsClickHere"));
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td class="liste_titre" align="right"><input type="submit" class="button" value="' . $langs->trans("TargetsReset") . '"></td>';
+		print '<td class="liste_titre" align="right"><input type="submit" class="button" value="'.$langs->trans("TargetsReset").'"></td>';
 		print '</tr>';
 		print '</table>';
 		print '</form>';

Braces +3 added lines, -1 removed lines

@@ -447,7 +447,9 @@
 			$extrafields = new ExtraFields($db);
 			$extralabels = $extrafields->fetch_name_optionals_label('socpeople');
             foreach($extrafields->attribute_type as $key=>&$value) {
-                if($value == 'radio')$value = 'select';
+                if($value == 'radio') {
+                    $value = 'select';
+                }
             }
 
 

dolibarr/htdocs/core/tpl/filemanager.tpl.php

Indentation +50 added lines, -50 removed lines

@@ -21,8 +21,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page filemanager.tpl.php can't be called as URL";
-	exit;
+    print "Error, template page filemanager.tpl.php can't be called as URL";
+    exit;
 }
 
 ?>
@@ -41,15 +41,15 @@ 
 $showroot = 0;
 if ($module == 'ecm')
 {
-	$permtoadd = $user->rights->ecm->setup;
-	$permtoupload = $user->rights->ecm->upload;
-	$showroot = 0;
+    $permtoadd = $user->rights->ecm->setup;
+    $permtoupload = $user->rights->ecm->upload;
+    $showroot = 0;
 }
 if ($module == 'medias')
 {
-	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
-	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
-	$showroot = 1;
+    $permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
+    $permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
+    $showroot = 1;
 }
 
 
@@ -57,8 +57,8 @@ 
 // Confirm remove file (for non javascript users)
 if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax))
 {
-	// TODO Add website, pageid, filemanager if defined
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+    // TODO Add website, pageid, filemanager if defined
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
 }
 
 // Start container of all panels
@@ -74,7 +74,7 @@ 
 // Toolbar
 if ($permtoadd)
 {
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+    print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
 }
@@ -86,10 +86,10 @@ 
 }
 if ($module == 'ecm')
 {
-	$tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;module='.$module:'').($section?'&amp;section='.$section:'')));
-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
-	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
-	print '</a>';
+    $tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;module='.$module:'').($section?'&amp;section='.$section:'')));
+    print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
+    print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
+    print '</a>';
 }
 
 // Start "Add new file" area
@@ -100,20 +100,20 @@ 
 // To attach new file
 if ((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || ! empty($section))
 {
-	if ((empty($section) || $section == -1) && ($module != 'medias'))
-	{
-		?>
+    if ((empty($section) || $section == -1) && ($module != 'medias'))
+    {
+        ?>
 		<script type="text/javascript">
     	jQuery(document).ready(function() {
 			jQuery('#<?php echo $nameforformuserfile ?>').hide();
     	});
     	</script>
 		<?php
-	}
+    }
 
-	$sectiondir=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
-	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+    $sectiondir=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
+    print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile=new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
 }
@@ -143,39 +143,39 @@ 
 
 if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
 {
-	$langs->load("ecm");
+    $langs->load("ecm");
 
-	print '<table width="100%" class="liste noborderbottom">'."\n";
+    print '<table width="100%" class="liste noborderbottom">'."\n";
 
-	print '<!-- Title for manual directories -->'."\n";
-	print '<tr class="liste_titre">'."\n";
+    print '<!-- Title for manual directories -->'."\n";
+    print '<tr class="liste_titre">'."\n";
     print '<th class="liste_titre" align="left">';
     print '&nbsp;'.$langs->trans("ECMSections");
-	print '</th></tr>';
+    print '</th></tr>';
 
     $showonrightsize='';
 
-	// Manual section
-	$htmltooltip=$langs->trans("ECMAreaDesc2");
+    // Manual section
+    $htmltooltip=$langs->trans("ECMAreaDesc2");
 
     if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
     {
-    	// Show the link to "Root"
-    	if ($showroot)
-    	{
-    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">'.$langs->trans("Root").'</a></div></td></tr>';
-    	}
+        // Show the link to "Root"
+        if ($showroot)
+        {
+            print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">'.$langs->trans("Root").'</a></div></td></tr>';
+        }
 
 
 
-    	print '<tr><td>';
+        print '<tr><td>';
 
-    	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
-	    print '<div id="filetree" class="ecmfiletree"></div>';
+        // Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
+        print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+        if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
-	    print '</td></tr>';
+        print '</td></tr>';
     }
     else	// Show filtree when ajax is disabled (rare)
     {
@@ -195,12 +195,12 @@ 
         if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
         include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
-    	print '</div>';
-    	print '</td></tr>';
+        print '</div>';
+        print '</td></tr>';
     }
 
 
-	print "</table>";
+    print "</table>";
 }
 
 
@@ -231,14 +231,14 @@ 
 
 if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
 {
-	//var_dump($modulepart);
-	// Variables that may be defined:
-	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
-	// $_POST['dir']
-	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
-
-	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
+    //var_dump($modulepart);
+    // Variables that may be defined:
+    // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
+    // $_POST['dir']
+    // $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
+    if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
+
+    include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }
 
 ?>

Spacing +22 added lines, -22 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page filemanager.tpl.php can't be called as URL";
 	exit;
@@ -34,7 +34,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-if (empty($module)) $module='ecm';
+if (empty($module)) $module = 'ecm';
 
 $permtoadd = 0;
 $permtoupload = 0;
@@ -58,7 +58,7 @@ 
 if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax))
 {
 	// TODO Add website, pageid, filemanager if defined
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 }
 
 // Start container of all panels
@@ -74,7 +74,7 @@ 
 // Toolbar
 if ($permtoadd)
 {
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
 }
@@ -86,7 +86,7 @@ 
 }
 if ($module == 'ecm')
 {
-	$tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&amp;module='.$module:'').($section?'&amp;section='.$section:'')));
+	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
 	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 	print '</a>';
@@ -98,7 +98,7 @@ 
 print '<div class="inline-block valignmiddle floatright">';
 
 // To attach new file
-if ((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || ! empty($section))
+if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || !empty($section))
 {
 	if ((empty($section) || $section == -1) && ($module != 'medias'))
 	{
@@ -111,11 +111,11 @@ 
 		<?php
 	}
 
-	$sectiondir=GETPOST('file','alpha')?GETPOST('file','alpha'):GETPOST('section_dir','alpha');
+	$sectiondir = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile=new FormFile($db);
-    $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+    $formfile = new FormFile($db);
+    $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
 }
 else print '&nbsp;';
 
@@ -136,12 +136,12 @@ 
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_section')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
 
-if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
+if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete')
 {
 	$langs->load("ecm");
 
@@ -153,12 +153,12 @@ 
     print '&nbsp;'.$langs->trans("ECMSections");
 	print '</th></tr>';
 
-    $showonrightsize='';
+    $showonrightsize = '';
 
 	// Manual section
-	$htmltooltip=$langs->trans("ECMAreaDesc2");
+	$htmltooltip = $langs->trans("ECMAreaDesc2");
 
-    if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
+    if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
     {
     	// Show the link to "Root"
     	if ($showroot)
@@ -183,7 +183,7 @@ 
 
         $_POST['modulepart'] = $module;
         $_POST['openeddir'] = GETPOST('openeddir');
-        $_POST['dir'] = empty($_POST['dir'])?'/':$_POST['dir'];
+        $_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
 
         // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
         print '<div id="filetree" class="ecmfiletree">';
@@ -191,8 +191,8 @@ 
         // Variables that may be defined:
         // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
         // $_POST['dir']
-        $mode='noajax';
-        if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+        $mode = 'noajax';
+        if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
         include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
     	print '</div>';
@@ -214,9 +214,9 @@ 
 // Start right panel
 
 
-$mode='noajax';
-if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
-include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';	// Show content of a directory on right side
+$mode = 'noajax';
+if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; // Show content of a directory on right side
 
 
 // End right panel
@@ -229,14 +229,14 @@ 
 <?php
 
 
-if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
+if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
 {
 	//var_dump($modulepart);
 	// Variables that may be defined:
 	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
 	// $_POST['dir']
 	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
+	if (GETPOST('section_dir', 'alpha')) { $preopened = GETPOST('section_dir', 'alpha'); }
 
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }

Braces +21 added lines, -11 removed lines

@@ -34,7 +34,9 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-if (empty($module)) $module='ecm';
+if (empty($module)) {
+    $module='ecm';
+}
 
 $permtoadd = 0;
 $permtoupload = 0;
@@ -77,8 +79,7 @@ 
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
-}
-else
+} else
 {
     print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
@@ -116,8 +117,9 @@ 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile=new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+} else {
+    print '&nbsp;';
 }
-else print '&nbsp;';
 
 print '</div>';
 // End "Add new file" area
@@ -173,11 +175,12 @@ 
     	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
 	    print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+	    if ($action == 'deletefile') {
+	        print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+	    }
 
 	    print '</td></tr>';
-    }
-    else	// Show filtree when ajax is disabled (rare)
+    } else	// Show filtree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
@@ -192,7 +195,9 @@ 
         // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
         // $_POST['dir']
         $mode='noajax';
-        if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+        if (empty($url)) {
+            $url=DOL_URL_ROOT.'/ecm/index.php';
+        }
         include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
     	print '</div>';
@@ -215,7 +220,9 @@ 
 
 
 $mode='noajax';
-if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) {
+    $url=DOL_URL_ROOT.'/ecm/index.php';
+}
 include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';	// Show content of a directory on right side
 
 
@@ -229,14 +236,17 @@ 
 <?php
 
 
-if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
+if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+    // Show filtree when ajax is enabled
 {
 	//var_dump($modulepart);
 	// Variables that may be defined:
 	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
 	// $_POST['dir']
 	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
+	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha');
+}
+}
 
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }

dolibarr/htdocs/core/tpl/commonfields_view.tpl.php

Indentation +43 added lines, -43 removed lines

@@ -26,8 +26,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 if (! is_object($form)) $form=new Form($db);
 
@@ -39,29 +39,29 @@ 
 
 foreach($object->fields as $key => $val)
 {
-	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+    // Discard if extrafield is a hidden field on form
+    if (abs($val['visible']) != 1) continue;
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+    if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
+    if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
 
-	$value=$object->$key;
+    $value=$object->$key;
 
-	print '<tr><td';
-	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
-	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
-	print '</td>';
-	print '<td>';
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
-	print '</td>';
-	print '</tr>';
+    print '<tr><td';
+    print ' class="titlefield';
+    if ($val['notnull'] > 0) print ' fieldrequired';
+    if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+    print '">';
+    if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+    else print $langs->trans($val['label']);
+    print '</td>';
+    print '<td>';
+    print $object->showOutputField($val, $key, $value, '', '', '', 0);
+    //print dol_escape_htmltag($object->$key, 1, 1);
+    print '</td>';
+    print '</tr>';
 
-	if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
+    if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
 }
 
 print '</table>';
@@ -74,31 +74,31 @@ 
 $alreadyoutput = 1;
 foreach($object->fields as $key => $val)
 {
-	if ($alreadyoutput)
-	{
-		if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
-		continue;
-	}
+    if ($alreadyoutput)
+    {
+        if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
+        continue;
+    }
 
-	if (abs($val['visible']) != 1) continue;	// Discard such field from form
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+    if (abs($val['visible']) != 1) continue;	// Discard such field from form
+    if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
+    if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
 
-	$value=$object->$key;
+    $value=$object->$key;
 
-	print '<tr><td';
-	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
-	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
-	print '</td>';
-	print '<td>';
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
-	print '</td>';
-	print '</tr>';
+    print '<tr><td';
+    print ' class="titlefield';
+    if ($val['notnull'] > 0) print ' fieldrequired';
+    if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+    print '">';
+    if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+    else print $langs->trans($val['label']);
+    print '</td>';
+    print '<td>';
+    print $object->showOutputField($val, $key, $value, '', '', '', 0);
+    //print dol_escape_htmltag($object->$key, 1, 1);
+    print '</td>';
+    print '</tr>';
 }
 
 ?>

Spacing +15 added lines, -15 removed lines

@@ -24,12 +24,12 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (! is_object($form)) $form=new Form($db);
+if (!is_object($form)) $form = new Form($db);
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_view.tpl.php -->
@@ -37,22 +37,22 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
 	// Discard if extrafield is a hidden field on form
 	if (abs($val['visible']) != 1) continue;
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
+	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
 
-	$value=$object->$key;
+	$value = $object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
 	if ($val['notnull'] > 0) print ' fieldrequired';
 	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
 	else print $langs->trans($val['label']);
 	print '</td>';
 	print '<td>';
@@ -61,7 +61,7 @@ 
 	print '</td>';
 	print '</tr>';
 
-	if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
+	if (!empty($keyforbreak) && $key == $keyforbreak) break; // key used for break on second column
 }
 
 print '</table>';
@@ -72,26 +72,26 @@ 
 print '<table class="border centpercent">';
 
 $alreadyoutput = 1;
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
 	if ($alreadyoutput)
 	{
-		if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
+		if (!empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0; // key used for break on second column
 		continue;
 	}
 
-	if (abs($val['visible']) != 1) continue;	// Discard such field from form
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (abs($val['visible']) != 1) continue; // Discard such field from form
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) continue; // We don't want this field
+	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
 
-	$value=$object->$key;
+	$value = $object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
 	if ($val['notnull'] > 0) print ' fieldrequired';
 	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
 	else print $langs->trans($val['label']);
 	print '</td>';
 	print '<td>';

Braces +56 added lines, -17 removed lines

@@ -29,7 +29,9 @@ 
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (! is_object($form)) $form=new Form($db);
+if (! is_object($form)) {
+    $form=new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_view.tpl.php -->
@@ -40,20 +42,35 @@ 
 foreach($object->fields as $key => $val)
 {
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) {
+	    continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref','status'))) {
+	    continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value=$object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
@@ -61,7 +78,10 @@ 
 	print '</td>';
 	print '</tr>';
 
-	if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
+	if (! empty($keyforbreak) && $key == $keyforbreak) {
+	    break;
+	}
+	// key used for break on second column
 }
 
 print '</table>';
@@ -76,23 +96,42 @@ 
 {
 	if ($alreadyoutput)
 	{
-		if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
+		if (! empty($keyforbreak) && $key == $keyforbreak) {
+		    $alreadyoutput = 0;
+		}
+		// key used for break on second column
 		continue;
 	}
 
-	if (abs($val['visible']) != 1) continue;	// Discard such field from form
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
+	// Discard such field from form
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) {
+	    continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref','status'))) {
+	    continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value=$object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);

dolibarr/htdocs/core/tpl/resource_add.tpl.php

Spacing +8 added lines, -8 removed lines

@@ -2,7 +2,7 @@ 
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -16,7 +16,7 @@ 
 
 $out  = '<div class="tagtable centpercent noborder allwidth nohover">';
 
-$out .= '<form class="tagtr nohover '.($var==true?'pair':'impair').'" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+$out .= '<form class="tagtr nohover '.($var == true ? 'pair' : 'impair').'" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 $out .= '<input type="hidden" name="action" value="add_element_resource">';
 $out .= '<input type="hidden" name="element" value="'.$element.'">';
@@ -27,18 +27,18 @@ 
 // Place
 $out .= '<div class="tagtd">'.$langs->trans("SelectResource").'</div>';
 $out .= '<div class="tagtd">';
-$events=array();
-$out .= $formresources->select_resource_list('','fk_resource','',1,1,0,$events,'',2,null);
+$events = array();
+$out .= $formresources->select_resource_list('', 'fk_resource', '', 1, 1, 0, $events, '', 2, null);
 $out .= '</div>';
 
-$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy',(isset($_POST['busy'])?$_POST['busy']:1),1).'</div>';
-$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory',(isset($_POST['mandatory'])?$_POST['mandatory']:0),1).'</div>';
+$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (isset($_POST['busy']) ? $_POST['busy'] : 1), 1).'</div>';
+$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (isset($_POST['mandatory']) ? $_POST['mandatory'] : 0), 1).'</div>';
 
 $out .= '<div class="tagtd" align="right">';
-$out .='<input type="submit" id="add-resource-place" class="button" value="'.$langs->trans("Add").'"/>';
+$out .= '<input type="submit" id="add-resource-place" class="button" value="'.$langs->trans("Add").'"/>';
 $out .= '</div>';
 
-$out .='</form>';
+$out .= '</form>';
 
 $out .= '</div>';
 $out .= '<br>';

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 

dolibarr/htdocs/core/tpl/objectline_view.tpl.php

Indentation +146 added lines, -146 removed lines

@@ -40,8 +40,8 @@ 
 // Protection to avoid direct call of template
 if (empty($object) || ! is_object($object))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -72,126 +72,126 @@ 
 	<?php } ?>
 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php echo $line->id; ?>"></div>
 	<?php
-	if (($line->info_bits & 2) == 2) {
-	?>
+    if (($line->info_bits & 2) == 2) {
+    ?>
 		<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
 		<?php
-		$txt='';
-		print img_object($langs->trans("ShowReduc"),'reduc').' ';
-		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
-		//else $txt=$langs->trans("Discount");
-		print $txt;
-		?>
+        $txt='';
+        print img_object($langs->trans("ShowReduc"),'reduc').' ';
+        if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
+        elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+        elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+        //else $txt=$langs->trans("Discount");
+        print $txt;
+        ?>
 		</a>
 		<?php
-		if ($line->description)
-		{
-			if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
-				// Add date of deposit
-				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-				    echo ' ('.dol_print_date($discount->datec).')';
-			}
-			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
-			{
-				$discount=new DiscountAbsolute($this->db);
-				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
-			{
-				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
-			}
-		}
-	}
-	else
-	{
-		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
+        if ($line->description)
+        {
+            if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+            }
+            elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+                // Add date of deposit
+                if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
+                    echo ' ('.dol_print_date($discount->datec).')';
+            }
+            elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+            }
+            elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+            {
+                $discount=new DiscountAbsolute($this->db);
+                $discount->fetch($line->fk_remise_except);
+                echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+            }
+            else
+            {
+                echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
+            }
+        }
+    }
+    else
+    {
+        $format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
 
-	    if ($line->fk_product > 0)
-		{
-			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-		}
-		else
-		{
-			if ($type==1) $text = img_object($langs->trans('Service'),'service');
-			else $text = img_object($langs->trans('Product'),'product');
+        if ($line->fk_product > 0)
+        {
+            echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+        }
+        else
+        {
+            if ($type==1) $text = img_object($langs->trans('Service'),'service');
+            else $text = img_object($langs->trans('Product'),'product');
 
-			if (! empty($line->label)) {
-				$text.= ' <strong>'.$line->label.'</strong>';
-				echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-			} else {
-				if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
-				echo $text.' '.dol_htmlentitiesbr($line->description);
-			}
-		}
+            if (! empty($line->label)) {
+                $text.= ' <strong>'.$line->label.'</strong>';
+                echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+            } else {
+                if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+                echo $text.' '.dol_htmlentitiesbr($line->description);
+            }
+        }
 
-		// Show date range
-		if ($line->element == 'facturedetrec') {
-			if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
-			if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
-			if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
-			if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
-			if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
-		}
-		else {
-			if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
-			//echo get_date_range($line->date_start, $line->date_end, $format);
-		}
+        // Show date range
+        if ($line->element == 'facturedetrec') {
+            if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
+            if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+            if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
+            if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+            if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
+        }
+        else {
+            if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+            //echo get_date_range($line->date_start, $line->date_end, $format);
+        }
 
-		// Add description in form
-		if ($line->fk_product > 0 && ! empty($conf->global->PRODUIT_DESC_IN_FORM))
-		{
-			print (! empty($line->description) && $line->description!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->description):'';
-		}
-	}
+        // Add description in form
+        if ($line->fk_product > 0 && ! empty($conf->global->PRODUIT_DESC_IN_FORM))
+        {
+            print (! empty($line->description) && $line->description!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->description):'';
+        }
+    }
 
-	if (! empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
-	{
-		$accountingaccount=new AccountingAccount($this->db);
-		$accountingaccount->fetch($line->fk_accounting_account);
-		echo '<div class="clearboth"></div><br><span class="opacitymedium">' . $langs->trans('AccountingAffectation') . ' : </span>' . $accountingaccount->getNomUrl(0,1,1);
-	}
+    if (! empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
+    {
+        $accountingaccount=new AccountingAccount($this->db);
+        $accountingaccount->fetch($line->fk_accounting_account);
+        echo '<div class="clearboth"></div><br><span class="opacitymedium">' . $langs->trans('AccountingAffectation') . ' : </span>' . $accountingaccount->getNomUrl(0,1,1);
+    }
 
-	?>
+    ?>
 	</td>
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-	{
-	?>
+    if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+    {
+    ?>
 		<td class="linecolrefsupplier"><?php
-		echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
-		?></td>
+        echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
+        ?></td>
 	<?php
-	}
-	// VAT Rate
-	?>
+    }
+    // VAT Rate
+    ?>
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php
-	$positiverates='';
-	if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
-	if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
-	if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
-	if (empty($positiverates)) $positiverates='0';
-	echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
-	//echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
-	?></td>
+    $positiverates='';
+    if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
+    if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
+    if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
+    if (empty($positiverates)) $positiverates='0';
+    echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
+    //echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
+    ?></td>
 
 	<td align="right" class="linecoluht nowrap"><?php $coldisplay++; ?><?php echo price($line->subprice); ?></td>
 
@@ -205,45 +205,45 @@ 
 
 	<td align="right" class="linecolqty nowrap"><?php $coldisplay++; ?>
 	<?php if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
-			// I comment this because it shows info even when not required
-			// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
-			// must also not be output for most entities (proposal, intervention, ...)
-			//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
-			echo $line->qty;
-		} else echo '&nbsp;';	?>
+            // I comment this because it shows info even when not required
+            // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
+            // must also not be output for most entities (proposal, intervention, ...)
+            //if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
+            echo $line->qty;
+        } else echo '&nbsp;';	?>
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
-	{
-		print '<td align="left" class="linecoluseunit nowrap">';
-		$label = $line->getLabelOfUnit('short');
-		if ($label !== '') {
-			print $langs->trans($label);
-		}
-		print '</td>';
-	}
-	?>
+    if($conf->global->PRODUCT_USE_UNITS)
+    {
+        print '<td align="left" class="linecoluseunit nowrap">';
+        $label = $line->getLabelOfUnit('short');
+        if ($label !== '') {
+            print $langs->trans($label);
+        }
+        print '</td>';
+    }
+    ?>
 
 	<?php if (!empty($line->remise_percent) && $line->special_code != 3) { ?>
 	<td class="linecoldiscount" align="right"><?php
-		$coldisplay++;
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		echo dol_print_reduction($line->remise_percent,$langs);
-	?></td>
+        $coldisplay++;
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        echo dol_print_reduction($line->remise_percent,$langs);
+    ?></td>
 	<?php } else { ?>
 	<td class="linecoldiscount"><?php $coldisplay++; ?>&nbsp;</td>
 	<?php }
 
-	if ($this->situation_cycle_ref) {
-		$coldisplay++;
-		print '<td align="right" class="linecolcycleref nowrap">' . $line->situation_percent . '%</td>';
-	}
+    if ($this->situation_cycle_ref) {
+        $coldisplay++;
+        print '<td align="right" class="linecolcycleref nowrap">' . $line->situation_percent . '%</td>';
+    }
 
-  	if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
-  	{
-		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-  		?>
+        if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+        {
+        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+            ?>
 
   	<?php if (!empty($user->rights->margins->creer)) { ?>
   	<td align="right" class="linecolmargin1 nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->pa_ht); ?></td>
@@ -254,8 +254,8 @@ 
     if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
   	  <td align="right" class="linecolmargin2 nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->marque_tx, null, null, null, null, $rounding).'%'; ?></td>
     <?php }
-  	}
-  	?>
+        }
+        ?>
 
 	<?php if ($line->special_code == 3)	{ ?>
 	<td align="right" class="linecoloption nowrap"><?php $coldisplay++; ?><?php echo $langs->trans('Option'); ?></td>
@@ -271,7 +271,7 @@ 
 
 
 	<?php
-	if ($this->statut == 0  && ($object_rights->creer) && $action != 'selectlines' ) { ?>
+    if ($this->statut == 0  && ($object_rights->creer) && $action != 'selectlines' ) { ?>
 	<td class="linecoledit" align="center"><?php $coldisplay++; ?>
 		<?php if (($line->info_bits & 2) == 2 || ! empty($disableedit)) { ?>
 		<?php } else { ?>
@@ -283,16 +283,16 @@ 
 
 	<td class="linecoldelete" align="center"><?php $coldisplay++; ?>
 		<?php
-		if (($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disableremove)) {
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
-			print img_delete();
-			print '</a>';
-		}
-		?>
+        if (($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disableremove)) {
+            print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
+            print img_delete();
+            print '</a>';
+        }
+        ?>
 	</td>
 
 	<?php
-	if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) { ?>
+    if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) { ?>
 	<td align="center" class="linecolmove tdlineupdown"><?php $coldisplay++; ?>
 		<?php if ($i > 0) { ?>
 		<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
@@ -321,7 +321,7 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+    print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 

Spacing +68 added lines, -68 removed lines

@@ -38,7 +38,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -47,14 +47,14 @@ 
 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
-$usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+$usemargins = 0;
+if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
 
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
-if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
+if (empty($dateSelector)) $dateSelector = 0;
+if (empty($forceall)) $forceall = 0;
+if (empty($senderissupplier)) $senderissupplier = 0;
+if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
+if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax = 0;
 
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
@@ -64,11 +64,11 @@ 
 
 
 ?>
-<?php $coldisplay=0; ?>
+<?php $coldisplay = 0; ?>
 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
 <tr  id="row-<?php echo $line->id?>" class="drag drop oddeven" <?php echo $domData; ?> >
-	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
-	<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
+	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i + 1); ?></td>
 	<?php } ?>
 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php echo $line->id; ?>"></div>
 	<?php
@@ -76,11 +76,11 @@ 
 	?>
 		<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
 		<?php
-		$txt='';
-		print img_object($langs->trans("ShowReduc"),'reduc').' ';
-		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+		$txt = '';
+		print img_object($langs->trans("ShowReduc"), 'reduc').' ';
+		if ($line->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
+		elseif ($line->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived");
+		elseif ($line->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -90,55 +90,55 @@ 
 		{
 			if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+				echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 			}
 			elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+				echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 				// Add date of deposit
-				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
+				if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
 				    echo ' ('.dol_print_date($discount->datec).')';
 			}
 			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+				echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 			}
 			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
-				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+				echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 			}
 			else
 			{
-				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
+				echo ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
 			}
 		}
 	}
 	else
 	{
-		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
+		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
 	    if ($line->fk_product > 0)
 		{
-			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+			echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 		}
 		else
 		{
-			if ($type==1) $text = img_object($langs->trans('Service'),'service');
-			else $text = img_object($langs->trans('Product'),'product');
+			if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+			else $text = img_object($langs->trans('Product'), 'product');
 
-			if (! empty($line->label)) {
-				$text.= ' <strong>'.$line->label.'</strong>';
-				echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
+			if (!empty($line->label)) {
+				$text .= ' <strong>'.$line->label.'</strong>';
+				echo $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 			} else {
-				if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+				if (!empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
 				echo $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
@@ -157,17 +157,17 @@ 
 		}
 
 		// Add description in form
-		if ($line->fk_product > 0 && ! empty($conf->global->PRODUIT_DESC_IN_FORM))
+		if ($line->fk_product > 0 && !empty($conf->global->PRODUIT_DESC_IN_FORM))
 		{
-			print (! empty($line->description) && $line->description!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->description):'';
+			print (!empty($line->description) && $line->description != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->description) : '';
 		}
 	}
 
-	if (! empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
+	if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
 	{
-		$accountingaccount=new AccountingAccount($this->db);
+		$accountingaccount = new AccountingAccount($this->db);
 		$accountingaccount->fetch($line->fk_accounting_account);
-		echo '<div class="clearboth"></div><br><span class="opacitymedium">' . $langs->trans('AccountingAffectation') . ' : </span>' . $accountingaccount->getNomUrl(0,1,1);
+		echo '<div class="clearboth"></div><br><span class="opacitymedium">'.$langs->trans('AccountingAffectation').' : </span>'.$accountingaccount->getNomUrl(0, 1, 1);
 	}
 
 	?>
@@ -177,19 +177,19 @@ 
 	{
 	?>
 		<td class="linecolrefsupplier"><?php
-		echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
+		echo ($line->ref_fourn ? $line->ref_fourn : $line->ref_supplier);
 		?></td>
 	<?php
 	}
 	// VAT Rate
 	?>
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php
-	$positiverates='';
-	if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
-	if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
-	if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
-	if (empty($positiverates)) $positiverates='0';
-	echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
+	$positiverates = '';
+	if (price2num($line->tva_tx))          $positiverates .= ($positiverates ? '/' : '').price2num($line->tva_tx);
+	if (price2num($line->total_localtax1)) $positiverates .= ($positiverates ? '/' : '').price2num($line->localtax1_tx);
+	if (price2num($line->total_localtax2)) $positiverates .= ($positiverates ? '/' : '').price2num($line->localtax2_tx);
+	if (empty($positiverates)) $positiverates = '0';
+	echo vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), '%', $line->info_bits);
 	//echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 	?></td>
 
@@ -200,7 +200,7 @@ 
 	<?php } ?>
 
 	<?php if ($inputalsopricewithtax) { ?>
-	<td align="right" class="linecoluttc nowrap"><?php $coldisplay++; ?><?php echo (isset($line->pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?></td>
+	<td align="right" class="linecoluttc nowrap"><?php $coldisplay++; ?><?php echo (isset($line->pu_ttc) ?price($line->pu_ttc) : price($line->subprice)); ?></td>
 	<?php } ?>
 
 	<td align="right" class="linecolqty nowrap"><?php $coldisplay++; ?>
@@ -210,11 +210,11 @@ 
 			// must also not be output for most entities (proposal, intervention, ...)
 			//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 			echo $line->qty;
-		} else echo '&nbsp;';	?>
+		} else echo '&nbsp;'; ?>
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
+	if ($conf->global->PRODUCT_USE_UNITS)
 	{
 		print '<td align="left" class="linecoluseunit nowrap">';
 		$label = $line->getLabelOfUnit('short');
@@ -229,7 +229,7 @@ 
 	<td class="linecoldiscount" align="right"><?php
 		$coldisplay++;
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		echo dol_print_reduction($line->remise_percent,$langs);
+		echo dol_print_reduction($line->remise_percent, $langs);
 	?></td>
 	<?php } else { ?>
 	<td class="linecoldiscount"><?php $coldisplay++; ?>&nbsp;</td>
@@ -237,27 +237,27 @@ 
 
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td align="right" class="linecolcycleref nowrap">' . $line->situation_percent . '%</td>';
+		print '<td align="right" class="linecolcycleref nowrap">'.$line->situation_percent.'%</td>';
 	}
 
-  	if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
+  	if ($usemargins && !empty($conf->margin->enabled) && empty($user->societe_id))
   	{
-		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
   		?>
 
   	<?php if (!empty($user->rights->margins->creer)) { ?>
   	<td align="right" class="linecolmargin1 nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->pa_ht); ?></td>
   	<?php } ?>
-  	<?php if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?>
-  	  <td align="right" class="linecolmargin2 nowrap margininfos"><?php $coldisplay++; ?><?php echo (($line->pa_ht == 0)?'n/a':price($line->marge_tx, null, null, null, null, $rounding).'%'); ?></td>
+  	<?php if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?>
+  	  <td align="right" class="linecolmargin2 nowrap margininfos"><?php $coldisplay++; ?><?php echo (($line->pa_ht == 0) ? 'n/a' : price($line->marge_tx, null, null, null, null, $rounding).'%'); ?></td>
   	<?php }
-    if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
+    if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
   	  <td align="right" class="linecolmargin2 nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->marque_tx, null, null, null, null, $rounding).'%'; ?></td>
     <?php }
   	}
   	?>
 
-	<?php if ($line->special_code == 3)	{ ?>
+	<?php if ($line->special_code == 3) { ?>
 	<td align="right" class="linecoloption nowrap"><?php $coldisplay++; ?><?php echo $langs->trans('Option'); ?></td>
 	<?php } else { ?>
 	<td align="right" class="linecolht nowrap"><?php $coldisplay++; ?><?php echo price($line->total_ht); ?></td>
@@ -271,9 +271,9 @@ 
 
 
 	<?php
-	if ($this->statut == 0  && ($object_rights->creer) && $action != 'selectlines' ) { ?>
+	if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') { ?>
 	<td class="linecoledit" align="center"><?php $coldisplay++; ?>
-		<?php if (($line->info_bits & 2) == 2 || ! empty($disableedit)) { ?>
+		<?php if (($line->info_bits & 2) == 2 || !empty($disableedit)) { ?>
 		<?php } else { ?>
 		<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>">
 		<?php echo img_edit(); ?>
@@ -284,7 +284,7 @@ 
 	<td class="linecoldelete" align="center"><?php $coldisplay++; ?>
 		<?php
 		if (($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disableremove)) {
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=ask_deleteline&amp;lineid=' . $line->id . '">';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=ask_deleteline&amp;lineid='.$line->id.'">';
 			print img_delete();
 			print '</a>';
 		}
@@ -296,23 +296,23 @@ 
 	<td align="center" class="linecolmove tdlineupdown"><?php $coldisplay++; ?>
 		<?php if ($i > 0) { ?>
 		<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
-		<?php echo img_up('default',0,'imgupforline'); ?>
+		<?php echo img_up('default', 0, 'imgupforline'); ?>
 		</a>
 		<?php } ?>
-		<?php if ($i < $num-1) { ?>
+		<?php if ($i < $num - 1) { ?>
 		<a class="lineupdown" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id; ?>">
-		<?php echo img_down('default',0,'imgdownforline'); ?>
+		<?php echo img_down('default', 0, 'imgdownforline'); ?>
 		</a>
 		<?php } ?>
 	</td>
     <?php } else { ?>
-    <td align="center"<?php echo (($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"'); ?>><?php $coldisplay++; ?></td>
+    <td align="center"<?php echo (($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown"' : ' class="linecolmove"'); ?>><?php $coldisplay++; ?></td>
 	<?php } ?>
 <?php } else { ?>
-	<td colspan="3"><?php $coldisplay=$coldisplay+3; ?></td>
+	<td colspan="3"><?php $coldisplay = $coldisplay + 3; ?></td>
 <?php } ?>
-	<?php  if($action == 'selectlines'){ ?>
-	<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i+1; ?>]" value="<?php echo $line->id; ?>" ></td>
+	<?php  if ($action == 'selectlines') { ?>
+	<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i + 1; ?>]" value="<?php echo $line->id; ?>" ></td>
 	<?php } ?>
 
 </tr>
@@ -321,7 +321,7 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 }
 ?>
 

Braces +80 added lines, -40 removed lines

@@ -48,13 +48,25 @@ 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
 $usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) {
+    $usemargins=1;
+}
 
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
-if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
+if (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
+if (empty($outputalsopricetotalwithtax)) {
+    $outputalsopricetotalwithtax=0;
+}
 
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
@@ -78,9 +90,13 @@ 
 		<?php
 		$txt='';
 		print img_object($langs->trans("ShowReduc"),'reduc').' ';
-		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+		if ($line->description == '(DEPOSIT)') {
+		    $txt=$langs->trans("Deposit");
+		} elseif ($line->description == '(EXCESS RECEIVED)') {
+		    $txt=$langs->trans("ExcessReceived");
+		} elseif ($line->description == '(EXCESS PAID)') {
+		    $txt=$langs->trans("ExcessPaid");
+		}
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -93,66 +109,77 @@ 
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+			} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 				// Add date of deposit
-				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-				    echo ' ('.dol_print_date($discount->datec).')';
-			}
-			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+								    echo ' ('.dol_print_date($discount->datec).')';
+				}
+			} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+			} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
+			} else
 			{
 				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
 			}
 		}
-	}
-	else
+	} else
 	{
 		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
 
 	    if ($line->fk_product > 0)
 		{
 			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-		}
-		else
+		} else
 		{
-			if ($type==1) $text = img_object($langs->trans('Service'),'service');
-			else $text = img_object($langs->trans('Product'),'product');
+			if ($type==1) {
+			    $text = img_object($langs->trans('Service'),'service');
+			} else {
+			    $text = img_object($langs->trans('Product'),'product');
+			}
 
 			if (! empty($line->label)) {
 				$text.= ' <strong>'.$line->label.'</strong>';
 				echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
 			} else {
-				if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+				if (! empty($line->fk_parent_line)) {
+				    echo img_picto('', 'rightarrow');
+				}
 				echo $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
 
 		// Show date range
 		if ($line->element == 'facturedetrec') {
-			if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
-			if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
-			if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
-			if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
-			if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
-		}
-		else {
-			if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			if ($line->date_start_fill || $line->date_end_fill) {
+			    echo '<br><div class="clearboth nowraponall">';
+			}
+			if ($line->date_start_fill) {
+			    echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+			}
+			if ($line->date_start_fill && $line->date_end_fill) {
+			    echo ' - ';
+			}
+			if ($line->date_end_fill) {
+			    echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+			}
+			if ($line->date_start_fill || $line->date_end_fill) {
+			    echo '</div>';
+			}
+		} else {
+			if ($line->date_start || $line->date_end) {
+			    echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			}
 			//echo get_date_range($line->date_start, $line->date_end, $format);
 		}
 
@@ -173,11 +200,13 @@ 
 	?>
 	</td>
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	    // We must have same test in printObjectLines
 	{
 	?>
 		<td class="linecolrefsupplier"><?php
 		echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
+	}
 		?></td>
 	<?php
 	}
@@ -185,10 +214,18 @@ 
 	?>
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php
 	$positiverates='';
-	if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
-	if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
-	if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
-	if (empty($positiverates)) $positiverates='0';
+	if (price2num($line->tva_tx)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
+	}
+	if (price2num($line->total_localtax1)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
+	}
+	if (price2num($line->total_localtax2)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
+	}
+	if (empty($positiverates)) {
+	    $positiverates='0';
+	}
 	echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
 	//echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 	?></td>
@@ -210,7 +247,10 @@ 
 			// must also not be output for most entities (proposal, intervention, ...)
 			//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 			echo $line->qty;
-		} else echo '&nbsp;';	?>
+		} else {
+		    echo '&nbsp;';
+		}
+		?>
 	</td>
 
 	<?php