alxarafe / alixar

dolibarr/htdocs/core/tpl/extrafields_edit.tpl.php

Indentation +3 added lines, -3 removed lines

@@ -28,8 +28,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;
 }
 
 ?>
@@ -41,7 +41,7 @@ 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {
-	print $object->showOptionals($extrafields, 'edit');
+    print $object->showOptionals($extrafields, 'edit');
 }
 
 ?>

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,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;

dolibarr/htdocs/core/tpl/extrafields_list_search_title.tpl.php

Indentation +16 added lines, -16 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;
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
@@ -12,18 +12,18 @@ 
 // Loop to show all columns of extrafields for the title line
 if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-	{
-		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
-			{
-				$align=$extrafields->getAlignFlag($key);
-				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
-				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
-				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
-			}
-		}
-	}
+    if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    {
+        foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+        {
+            if (! empty($arrayfields["ef.".$key]['checked']))
+            {
+                $align=$extrafields->getAlignFlag($key);
+                $sortonfield = "ef.".$key;
+                if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
+                if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
+                else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+            }
+        }
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,28 +1,28 @@
 <?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;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
 
 // Loop to show all columns of extrafields for the title line
-if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-		foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
-			if (! empty($arrayfields["ef.".$key]['checked']))
+			if (!empty($arrayfields["ef.".$key]['checked']))
 			{
-				$align=$extrafields->getAlignFlag($key);
+				$align = $extrafields->getAlignFlag($key);
 				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
+				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
-				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'"' : ''), $sortfield, $sortorder)."\n";
 			}
 		}
 	}

Braces +14 added lines, -5 removed lines

@@ -7,10 +7,13 @@ 
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+    $extrafieldsobjectkey=$object->table_element;
+}
 
 // Loop to show all columns of extrafields for the title line
-if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (! empty($extrafieldsobjectkey)) {
+    // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
@@ -19,10 +22,16 @@ 
 			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
 				$align=$extrafields->getAlignFlag($key);
+}
 				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
-				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
-				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
+				    $sortonfield='';
+				}
+				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
+				    print '<th class="liste_titre thseparator"></th>';
+				} else {
+				    print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+				}
 			}
 		}
 	}

dolibarr/htdocs/core/tpl/commonfields_add.tpl.php

Indentation +21 added lines, -21 removed lines

@@ -25,8 +25,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;
 }
 
 ?>
@@ -37,30 +37,30 @@ 
 
 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 (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
 
-	print '<tr id="field_'.$key.'">';
-	print '<td';
-	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
-	print '"';
-	print '>';
-	print $langs->trans($val['label']);
+    print '<tr id="field_'.$key.'">';
+    print '<td';
+    print ' class="titlefieldcreate';
+    if ($val['notnull'] > 0) print ' fieldrequired';
+    if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+    print '"';
+    print '>';
+    print $langs->trans($val['label']);
     if(!empty($val['help'])){
         print $form->textwithpicto('',$langs->trans($val['help']));
     }
-	print '</td>';
-	print '<td>';
-	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');
-	else $value = GETPOST($key, 'alpha');
-	print $object->showInputField($val, $key, $value, '', '', '', 0);
-	print '</td>';
-	print '</tr>';
+    print '</td>';
+    print '<td>';
+    if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
+    elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');
+    else $value = GETPOST($key, 'alpha');
+    print $object->showInputField($val, $key, $value, '', '', '', 0);
+    print '</td>';
+    print '</tr>';
 }
 
 ?>

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,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;
@@ -35,12 +35,12 @@ 
 
 $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 (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
 
 	print '<tr id="field_'.$key.'">';
 	print '<td';
@@ -50,8 +50,8 @@ 
 	print '"';
 	print '>';
 	print $langs->trans($val['label']);
-    if(!empty($val['help'])){
-        print $form->textwithpicto('',$langs->trans($val['help']));
+    if (!empty($val['help'])) {
+        print $form->textwithpicto('', $langs->trans($val['help']));
     }
 	print '</td>';
 	print '<td>';

Braces +20 added lines, -7 removed lines

@@ -38,15 +38,24 @@ 
 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 (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) {
+	    continue;
+	}
+	// We don't want this field
 
 	print '<tr id="field_'.$key.'">';
 	print '<td';
 	print ' class="titlefieldcreate';
-	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 '"';
 	print '>';
 	print $langs->trans($val['label']);
@@ -55,9 +64,13 @@ 
     }
 	print '</td>';
 	print '<td>';
-	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');
-	else $value = GETPOST($key, 'alpha');
+	if (in_array($val['type'], array('int', 'integer'))) {
+	    $value = GETPOST($key, 'int');
+	} elseif ($val['type'] == 'text' || $val['type'] == 'html') {
+	    $value = GETPOST($key, 'none');
+	} else {
+	    $value = GETPOST($key, 'alpha');
+	}
 	print $object->showInputField($val, $key, $value, '', '', '', 0);
 	print '</td>';
 	print '</tr>';

dolibarr/htdocs/core/tpl/onlinepaymentlinks.tpl.php

Indentation +50 added lines, -50 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;
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -32,13 +32,13 @@ 
 print '<strong>'.getOnlinePaymentUrl(1,'free')."</strong><br><br>\n";
 if (! empty($conf->commande->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'order')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
-	    $langs->load("orders");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Order")).': ';
+    print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
+    print '<strong>'.getOnlinePaymentUrl(1,'order')."</strong><br>\n";
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        $langs->load("orders");
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Order")).': ';
         print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref','alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_order_ref','alpha'))
@@ -49,18 +49,18 @@ 
             print "</strong><br>\n";
         }
         print '</form>';
-	}
-	print '<br>';
+    }
+    print '<br>';
 }
 if (! empty($conf->facture->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'invoice')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
-	    $langs->load("bills");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Invoice")).': ';
+    print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
+    print '<strong>'.getOnlinePaymentUrl(1,'invoice')."</strong><br>\n";
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        $langs->load("bills");
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Invoice")).': ';
         print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref','alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_invoice_ref','alpha'))
@@ -71,18 +71,18 @@ 
             print "</strong><br>\n";
         }
         print '</form>';
-	}
-	print '<br>';
+    }
+    print '<br>';
 }
 if (! empty($conf->contrat->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'contractline')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
-	    $langs->load("contracts");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("ContractLine")).': ';
+    print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
+    print '<strong>'.getOnlinePaymentUrl(1,'contractline')."</strong><br>\n";
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        $langs->load("contracts");
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("ContractLine")).': ';
         print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref','alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_contract_ref'))
@@ -93,18 +93,18 @@ 
             print "</strong><br>\n";
         }
         print '</form>';
-	}
-	print '<br>';
+    }
+    print '<br>';
 }
 if (! empty($conf->adherent->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'membersubscription')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
-	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Member")).': ';
+    print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
+    print '<strong>'.getOnlinePaymentUrl(1,'membersubscription')."</strong><br>\n";
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        $langs->load("members");
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Member")).': ';
         print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref','alpha').'" size="10">';
         print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_member_ref'))
@@ -115,18 +115,18 @@ 
             print "</strong><br>\n";
         }
         print '</form>';
-	}
-	print '<br>';
+    }
+    print '<br>';
 }
 if (! empty($conf->don->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'donation')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
-	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Don")).': ';
+    print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation",$servicename).':<br>';
+    print '<strong>'.getOnlinePaymentUrl(1,'donation')."</strong><br>\n";
+    if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+    {
+        $langs->load("members");
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Don")).': ';
         print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref','alpha').'" size="10">';
         print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_donation_ref'))
@@ -137,14 +137,14 @@ 
             print "</strong><br>\n";
         }
         print '</form>';
-	}
-	print '<br>';
+    }
+    print '<br>';
 }
 
 if (! empty($conf->use_javascript_ajax))
 {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
+    print "\n".'<script type="text/javascript">';
+    print '$(document).ready(function () {
 		$("#generate_token").click(function() {
             	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
             		action: \'getrandompassword\',
@@ -155,7 +155,7 @@ 
 				});
             });
     	});';
-	print '</script>';
+    print '</script>';
 }
 
 print info_admin($langs->trans("YouCanAddTagOnUrl"));

Spacing +41 added lines, -41 removed lines

@@ -16,7 +16,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;
@@ -28,23 +28,23 @@ 
 
 // Url list
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
-print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
-print '<strong>'.getOnlinePaymentUrl(1,'free')."</strong><br><br>\n";
-if (! empty($conf->commande->enabled))
+print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':<br>';
+print '<strong>'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
+if (!empty($conf->commande->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'order')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
+	print '<strong>'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("orders");
 	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Order")).': ';
-        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref','alpha').'" size="10">';
+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
+        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_order_ref','alpha'))
+        if (GETPOST('generate_order_ref', 'alpha'))
         {
             print '<br> -> <strong>';
-            $url=getOnlinePaymentUrl(0,'order',GETPOST('generate_order_ref','alpha'));
+            $url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
         }
@@ -52,21 +52,21 @@ 
 	}
 	print '<br>';
 }
-if (! empty($conf->facture->enabled))
+if (!empty($conf->facture->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'invoice')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
+	print '<strong>'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("bills");
 	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Invoice")).': ';
-        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref','alpha').'" size="10">';
+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
+        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_invoice_ref','alpha'))
+        if (GETPOST('generate_invoice_ref', 'alpha'))
         {
             print '<br> -> <strong>';
-            $url=getOnlinePaymentUrl(0,'invoice',GETPOST('generate_invoice_ref','alpha'));
+            $url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
         }
@@ -74,21 +74,21 @@ 
 	}
 	print '<br>';
 }
-if (! empty($conf->contrat->enabled))
+if (!empty($conf->contrat->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'contractline')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
+	print '<strong>'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("contracts");
 	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("ContractLine")).': ';
-        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref','alpha').'" size="10">';
+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
+        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_contract_ref'))
         {
             print '<br> -> <strong>';
-            $url=getOnlinePaymentUrl(0,'contractline',GETPOST('generate_contract_ref','alpha'));
+            $url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
         }
@@ -96,21 +96,21 @@ 
 	}
 	print '<br>';
 }
-if (! empty($conf->adherent->enabled))
+if (!empty($conf->adherent->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'membersubscription')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
+	print '<strong>'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("members");
 	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Member")).': ';
-        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref','alpha').'" size="10">';
+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
+        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_member_ref'))
         {
             print '<br> -> <strong>';
-            $url=getOnlinePaymentUrl(0,'membersubscription',GETPOST('generate_member_ref','alpha'));
+            $url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
         }
@@ -118,21 +118,21 @@ 
 	}
 	print '<br>';
 }
-if (! empty($conf->don->enabled))
+if (!empty($conf->don->enabled))
 {
-	print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation",$servicename).':<br>';
-	print '<strong>'.getOnlinePaymentUrl(1,'donation')."</strong><br>\n";
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+	print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
+	print '<strong>'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
 	    $langs->load("members");
 	    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	    print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Don")).': ';
-        print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref','alpha').'" size="10">';
+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
+        print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
         print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
         if (GETPOST('generate_donation_ref'))
         {
             print '<br> -> <strong>';
-            $url=getOnlinePaymentUrl(0,'donation',GETPOST('generate_donation_ref','alpha'));
+            $url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
             print $url;
             print "</strong><br>\n";
         }
@@ -141,7 +141,7 @@ 
 	print '<br>';
 }
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {

dolibarr/htdocs/core/tpl/extrafields_view.tpl.php

Indentation +131 added lines, -131 removed lines

@@ -27,8 +27,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;
 }
 
 if (! is_object($form)) $form=new Form($db);
@@ -50,134 +50,134 @@ 
 if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
 
 {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-	{
-		// Discard if extrafield is a hidden field on form
-
-		$enabled = 1;
-		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$key]))
-		{
-			$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1);
-		}
-		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key]))
-		{
-			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
-		}
-		$perms = 1;
-		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
-		{
-			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
-		}
-		//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
-
-		if (empty($enabled)) continue;	// 0 = Never visible field
-		if (abs($enabled) != 1 && abs($enabled) != 3) continue;  // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-		if (empty($perms)) continue;    // 0 = Not visible
-
-		// Load language if required
-		if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
-		if ($action == 'edit_extras')
-		{
-			$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
-		}
-		else
-		{
-			$value = $object->array_options["options_" . $key];
-		}
-		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
-		{
-			print $extrafields->showSeparator($key, $object);
-		}
-		else
-		{
-			print '<tr>';
-			print '<td class="titlefield">';
-			print '<table width="100%" class="nobordernopadding">';
-			print '<tr>';
-			print '<td';
-			print ' class="';
-			//var_dump($action);exit;
-
-			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
-			print '">';
-			if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
-			else print $langs->trans($label);
-			print '</td>';
-
-			//TODO Improve element and rights detection
-			//var_dump($user->rights);
-			$permok=false;
-			$keyforperm=$object->element;
-			if ($object->element == 'fichinter') $keyforperm='ficheinter';
-			if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
-			if ($object->element=='order_supplier')   $permok=$user->rights->fournisseur->commande->creer;
-			if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
-			if ($object->element=='shipping')         $permok=$user->rights->expedition->creer;
-			if ($object->element=='delivery')         $permok=$user->rights->expedition->livraison->creer;
-			if ($object->element=='productlot')       $permok=$user->rights->stock->creer;
-			if ($object->element=='facturerec') 	  $permok=$user->rights->facture->creer;
-			if (($object->statut == 0 || ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
-				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
-			    && empty($extrafields->attributes[$object->table_element]['computed'][$key]))
-			{
-			    $fieldid='id';
-			    if ($object->table_element == 'societe') $fieldid='socid';
-				print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
-			}
-			print '</tr></table>';
-			print '</td>';
-
-			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
-
-			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols?' colspan="'.$cols.'"':'').'>';
-
-			// Convert date into timestamp format
-			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime')))
-			{
-				$datenotinstring = $object->array_options['options_' . $key];
-				// print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';
-				if (! is_numeric($object->array_options['options_' . $key]))	// For backward compatibility
-				{
-					$datenotinstring = $db->jdate($datenotinstring);
-				}
-				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
-				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $datenotinstring;
-			}
-			//TODO Improve element and rights detection
-			if ($action == 'edit_extras' && $permok && GETPOST('attribute','none') == $key)
-			{
-			    $fieldid='id';
-			    if ($object->table_element == 'societe') $fieldid='socid';
-			    print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
-				print '<input type="hidden" name="action" value="update_extras">';
-				print '<input type="hidden" name="attribute" value="' . $key . '">';
-				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-				print '<input type="hidden" name="'.$fieldid.'" value="' . $object->id . '">';
-				print $extrafields->showInputField($key, $value, '', '', '', 0, $object->id);
-
-
-				print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '">';
-
-				print '</form>';
-			}
-			else
-			{
-				//print $key.'-'.$value.'-'.$object->table_element;
-				print $extrafields->showOutputField($key, $value, '', $object->table_element);
-			}
-
-			print '</td>';
-			print '</tr>' . "\n";
-		}
-	}
-
-
-	// Add code to manage list depending on others
-	// TODO Test/enhance this with a more generic solution
-	if (! empty($conf->use_javascript_ajax))
-	{
-		print "\n";
-		print '
+    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+    {
+        // Discard if extrafield is a hidden field on form
+
+        $enabled = 1;
+        if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$key]))
+        {
+            $enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1);
+        }
+        if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key]))
+        {
+            $enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
+        }
+        $perms = 1;
+        if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
+        {
+            $perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
+        }
+        //print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
+
+        if (empty($enabled)) continue;	// 0 = Never visible field
+        if (abs($enabled) != 1 && abs($enabled) != 3) continue;  // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+        if (empty($perms)) continue;    // 0 = Not visible
+
+        // Load language if required
+        if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+        if ($action == 'edit_extras')
+        {
+            $value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
+        }
+        else
+        {
+            $value = $object->array_options["options_" . $key];
+        }
+        if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
+        {
+            print $extrafields->showSeparator($key, $object);
+        }
+        else
+        {
+            print '<tr>';
+            print '<td class="titlefield">';
+            print '<table width="100%" class="nobordernopadding">';
+            print '<tr>';
+            print '<td';
+            print ' class="';
+            //var_dump($action);exit;
+
+            if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
+            print '">';
+            if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
+            else print $langs->trans($label);
+            print '</td>';
+
+            //TODO Improve element and rights detection
+            //var_dump($user->rights);
+            $permok=false;
+            $keyforperm=$object->element;
+            if ($object->element == 'fichinter') $keyforperm='ficheinter';
+            if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
+            if ($object->element=='order_supplier')   $permok=$user->rights->fournisseur->commande->creer;
+            if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
+            if ($object->element=='shipping')         $permok=$user->rights->expedition->creer;
+            if ($object->element=='delivery')         $permok=$user->rights->expedition->livraison->creer;
+            if ($object->element=='productlot')       $permok=$user->rights->stock->creer;
+            if ($object->element=='facturerec') 	  $permok=$user->rights->facture->creer;
+            if (($object->statut == 0 || ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
+                && $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
+                && empty($extrafields->attributes[$object->table_element]['computed'][$key]))
+            {
+                $fieldid='id';
+                if ($object->table_element == 'societe') $fieldid='socid';
+                print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+            }
+            print '</tr></table>';
+            print '</td>';
+
+            $html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
+
+            print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols?' colspan="'.$cols.'"':'').'>';
+
+            // Convert date into timestamp format
+            if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime')))
+            {
+                $datenotinstring = $object->array_options['options_' . $key];
+                // print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';
+                if (! is_numeric($object->array_options['options_' . $key]))	// For backward compatibility
+                {
+                    $datenotinstring = $db->jdate($datenotinstring);
+                }
+                //print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
+                $value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $datenotinstring;
+            }
+            //TODO Improve element and rights detection
+            if ($action == 'edit_extras' && $permok && GETPOST('attribute','none') == $key)
+            {
+                $fieldid='id';
+                if ($object->table_element == 'societe') $fieldid='socid';
+                print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
+                print '<input type="hidden" name="action" value="update_extras">';
+                print '<input type="hidden" name="attribute" value="' . $key . '">';
+                print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                print '<input type="hidden" name="'.$fieldid.'" value="' . $object->id . '">';
+                print $extrafields->showInputField($key, $value, '', '', '', 0, $object->id);
+
+
+                print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '">';
+
+                print '</form>';
+            }
+            else
+            {
+                //print $key.'-'.$value.'-'.$object->table_element;
+                print $extrafields->showOutputField($key, $value, '', $object->table_element);
+            }
+
+            print '</td>';
+            print '</tr>' . "\n";
+        }
+    }
+
+
+    // Add code to manage list depending on others
+    // TODO Test/enhance this with a more generic solution
+    if (! empty($conf->use_javascript_ajax))
+    {
+        print "\n";
+        print '
 				<script type="text/javascript">
 				    jQuery(document).ready(function() {
 				    	function showOptions(child_list, parent_list)
@@ -205,7 +205,7 @@ 
 						setListDependencies();
 				    });
 				</script>'."\n";
-	}
+    }
 }
 ?>
 <!-- END PHP TEMPLATE extrafields_view.tpl.php -->

Spacing +43 added lines, -43 removed lines

@@ -25,22 +25,22 @@ 
  * $cols
  */
 // 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;
 }
 
-if (! is_object($form)) $form=new Form($db);
+if (!is_object($form)) $form = new Form($db);
 
 
 ?>
 <!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
-if (! is_array($parameters)) $parameters = array();
-if (! empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
-if (! empty($cols)) $parameters['cols'] = $cols;
-if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
+if (!is_array($parameters)) $parameters = array();
+if (!empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
+if (!empty($cols)) $parameters['cols'] = $cols;
+if (!empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 print $hookmanager->resPrint;
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -70,19 +70,19 @@ 
 		}
 		//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
 
-		if (empty($enabled)) continue;	// 0 = Never visible field
-		if (abs($enabled) != 1 && abs($enabled) != 3) continue;  // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-		if (empty($perms)) continue;    // 0 = Not visible
+		if (empty($enabled)) continue; // 0 = Never visible field
+		if (abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+		if (empty($perms)) continue; // 0 = Not visible
 
 		// Load language if required
-		if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
 		if ($action == 'edit_extras')
 		{
-			$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
+			$value = (isset($_POST["options_".$key]) ? $_POST["options_".$key] : $object->array_options["options_".$key]);
 		}
 		else
 		{
-			$value = $object->array_options["options_" . $key];
+			$value = $object->array_options["options_".$key];
 		}
 		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
@@ -98,65 +98,65 @@ 
 			print ' class="';
 			//var_dump($action);exit;
 
-			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
+			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
 			print '">';
-			if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
+			if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
 			else print $langs->trans($label);
 			print '</td>';
 
 			//TODO Improve element and rights detection
 			//var_dump($user->rights);
-			$permok=false;
-			$keyforperm=$object->element;
-			if ($object->element == 'fichinter') $keyforperm='ficheinter';
-			if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
-			if ($object->element=='order_supplier')   $permok=$user->rights->fournisseur->commande->creer;
-			if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
-			if ($object->element=='shipping')         $permok=$user->rights->expedition->creer;
-			if ($object->element=='delivery')         $permok=$user->rights->expedition->livraison->creer;
-			if ($object->element=='productlot')       $permok=$user->rights->stock->creer;
-			if ($object->element=='facturerec') 	  $permok=$user->rights->facture->creer;
-			if (($object->statut == 0 || ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
+			$permok = false;
+			$keyforperm = $object->element;
+			if ($object->element == 'fichinter') $keyforperm = 'ficheinter';
+			if (isset($user->rights->$keyforperm)) $permok = $user->rights->$keyforperm->creer || $user->rights->$keyforperm->create || $user->rights->$keyforperm->write;
+			if ($object->element == 'order_supplier')   $permok = $user->rights->fournisseur->commande->creer;
+			if ($object->element == 'invoice_supplier') $permok = $user->rights->fournisseur->facture->creer;
+			if ($object->element == 'shipping')         $permok = $user->rights->expedition->creer;
+			if ($object->element == 'delivery')         $permok = $user->rights->expedition->livraison->creer;
+			if ($object->element == 'productlot')       $permok = $user->rights->stock->creer;
+			if ($object->element == 'facturerec') 	  $permok = $user->rights->facture->creer;
+			if (($object->statut == 0 || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
 				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
 			    && empty($extrafields->attributes[$object->table_element]['computed'][$key]))
 			{
-			    $fieldid='id';
-			    if ($object->table_element == 'societe') $fieldid='socid';
-				print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+			    $fieldid = 'id';
+			    if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<td align="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$key.'">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
 
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
 
-			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols?' colspan="'.$cols.'"':'').'>';
+			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols ? ' colspan="'.$cols.'"' : '').'>';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime')))
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date', 'datetime')))
 			{
-				$datenotinstring = $object->array_options['options_' . $key];
+				$datenotinstring = $object->array_options['options_'.$key];
 				// print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';
-				if (! is_numeric($object->array_options['options_' . $key]))	// For backward compatibility
+				if (!is_numeric($object->array_options['options_'.$key]))	// For backward compatibility
 				{
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
-				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $datenotinstring;
+				$value = isset($_POST["options_".$key]) ? dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]) : $datenotinstring;
 			}
 			//TODO Improve element and rights detection
-			if ($action == 'edit_extras' && $permok && GETPOST('attribute','none') == $key)
+			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $key)
 			{
-			    $fieldid='id';
-			    if ($object->table_element == 'societe') $fieldid='socid';
-			    print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
+			    $fieldid = 'id';
+			    if ($object->table_element == 'societe') $fieldid = 'socid';
+			    print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
-				print '<input type="hidden" name="attribute" value="' . $key . '">';
-				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-				print '<input type="hidden" name="'.$fieldid.'" value="' . $object->id . '">';
+				print '<input type="hidden" name="attribute" value="'.$key.'">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="'.$fieldid.'" value="'.$object->id.'">';
 				print $extrafields->showInputField($key, $value, '', '', '', 0, $object->id);
 
 
-				print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '">';
+				print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Modify')).'">';
 
 				print '</form>';
 			}
@@ -167,14 +167,14 @@ 
 			}
 
 			print '</td>';
-			print '</tr>' . "\n";
+			print '</tr>'."\n";
 		}
 	}
 
 
 	// Add code to manage list depending on others
 	// TODO Test/enhance this with a more generic solution
-	if (! empty($conf->use_javascript_ajax))
+	if (!empty($conf->use_javascript_ajax))
 	{
 		print "\n";
 		print '

Braces +77 added lines, -30 removed lines

@@ -31,19 +31,31 @@ 
 	exit;
 }
 
-if (! is_object($form)) $form=new Form($db);
+if (! is_object($form)) {
+    $form=new Form($db);
+}
 
 
 ?>
 <!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
-if (! is_array($parameters)) $parameters = array();
-if (! empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
-if (! empty($cols)) $parameters['cols'] = $cols;
-if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
+if (! is_array($parameters)) {
+    $parameters = array();
+}
+if (! empty($cols)) {
+    $parameters['colspan'] = ' colspan="'.$cols.'"';
+}
+if (! empty($cols)) {
+    $parameters['cols'] = $cols;
+}
+if (! empty($object->fk_soc)) {
+    $parameters['socid'] = $object->fk_soc;
+}
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 print $hookmanager->resPrint;
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 //var_dump($extrafields->attributes[$object->table_element]);
@@ -70,25 +82,34 @@ 
 		}
 		//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
 
-		if (empty($enabled)) continue;	// 0 = Never visible field
-		if (abs($enabled) != 1 && abs($enabled) != 3) continue;  // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-		if (empty($perms)) continue;    // 0 = Not visible
+		if (empty($enabled)) {
+		    continue;
+		}
+		// 0 = Never visible field
+		if (abs($enabled) != 1 && abs($enabled) != 3) {
+		    continue;
+		}
+		// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+		if (empty($perms)) {
+		    continue;
+		}
+		// 0 = Not visible
 
 		// Load language if required
-		if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+		if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) {
+		    $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+		}
 		if ($action == 'edit_extras')
 		{
 			$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
-		}
-		else
+		} else
 		{
 			$value = $object->array_options["options_" . $key];
 		}
 		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
 		{
 			print $extrafields->showSeparator($key, $object);
-		}
-		else
+		} else
 		{
 			print '<tr>';
 			print '<td class="titlefield">';
@@ -98,30 +119,53 @@ 
 			print ' class="';
 			//var_dump($action);exit;
 
-			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
+			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) {
+			    print ' fieldrequired';
+			}
 			print '">';
-			if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
-			else print $langs->trans($label);
+			if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) {
+			    print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
+			} else {
+			    print $langs->trans($label);
+			}
 			print '</td>';
 
 			//TODO Improve element and rights detection
 			//var_dump($user->rights);
 			$permok=false;
 			$keyforperm=$object->element;
-			if ($object->element == 'fichinter') $keyforperm='ficheinter';
-			if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
-			if ($object->element=='order_supplier')   $permok=$user->rights->fournisseur->commande->creer;
-			if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
-			if ($object->element=='shipping')         $permok=$user->rights->expedition->creer;
-			if ($object->element=='delivery')         $permok=$user->rights->expedition->livraison->creer;
-			if ($object->element=='productlot')       $permok=$user->rights->stock->creer;
-			if ($object->element=='facturerec') 	  $permok=$user->rights->facture->creer;
+			if ($object->element == 'fichinter') {
+			    $keyforperm='ficheinter';
+			}
+			if (isset($user->rights->$keyforperm)) {
+			    $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
+			}
+			if ($object->element=='order_supplier') {
+			    $permok=$user->rights->fournisseur->commande->creer;
+			}
+			if ($object->element=='invoice_supplier') {
+			    $permok=$user->rights->fournisseur->facture->creer;
+			}
+			if ($object->element=='shipping') {
+			    $permok=$user->rights->expedition->creer;
+			}
+			if ($object->element=='delivery') {
+			    $permok=$user->rights->expedition->livraison->creer;
+			}
+			if ($object->element=='productlot') {
+			    $permok=$user->rights->stock->creer;
+			}
+			if ($object->element=='facturerec') {
+			    $permok=$user->rights->facture->creer;
+			}
 			if (($object->statut == 0 || ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
 				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)
 			    && empty($extrafields->attributes[$object->table_element]['computed'][$key]))
 			{
 			    $fieldid='id';
-			    if ($object->table_element == 'societe') $fieldid='socid';
+			    if ($object->table_element == 'societe') {
+			        $fieldid='socid';
+			    }
 				print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
 			}
 			print '</tr></table>';
@@ -136,10 +180,12 @@ 
 			{
 				$datenotinstring = $object->array_options['options_' . $key];
 				// print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';
-				if (! is_numeric($object->array_options['options_' . $key]))	// For backward compatibility
+				if (! is_numeric($object->array_options['options_' . $key])) {
+				    // For backward compatibility
 				{
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
+				}
 				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
 				$value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $datenotinstring;
 			}
@@ -147,7 +193,9 @@ 
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute','none') == $key)
 			{
 			    $fieldid='id';
-			    if ($object->table_element == 'societe') $fieldid='socid';
+			    if ($object->table_element == 'societe') {
+			        $fieldid='socid';
+			    }
 			    print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="' . $key . '">';
@@ -159,8 +207,7 @@ 
 				print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '">';
 
 				print '</form>';
-			}
-			else
+			} else
 			{
 				//print $key.'-'.$value.'-'.$object->table_element;
 				print $extrafields->showOutputField($key, $value, '', $object->table_element);

dolibarr/htdocs/core/tpl/extrafields_list_search_sql.tpl.php

Indentation +20 added lines, -20 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;
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
@@ -12,24 +12,24 @@ 
 // Loop to complete the sql search criterias from extrafields
 if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	foreach ($search_array_options as $key => $val)
-	{
-		$crit=$val;
-		$tmpkey=preg_replace('/search_options_/','',$key);
-		$typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
+    foreach ($search_array_options as $key => $val)
+    {
+        $crit=$val;
+        $tmpkey=preg_replace('/search_options_/','',$key);
+        $typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
 
-		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
-		{
-			$sql .= " AND ef.".$tmpkey." = '".$db->idate($crit)."'";
-		}
-		elseif ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
-		{
-			$mode_search=0;
-			if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
-			if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
-			if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
+        if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
+        {
+            $sql .= " AND ef.".$tmpkey." = '".$db->idate($crit)."'";
+        }
+        elseif ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+        {
+            $mode_search=0;
+            if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+            if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+            if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
 
-			$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
-		}
-	}
+            $sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+        }
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -1,33 +1,33 @@
 <?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;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
 
 // Loop to complete the sql search criterias from extrafields
-if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	foreach ($search_array_options as $key => $val)
 	{
-		$crit=$val;
-		$tmpkey=preg_replace('/search_options_/','',$key);
-		$typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
+		$crit = $val;
+		$tmpkey = preg_replace('/search_options_/', '', $key);
+		$typ = $extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
 			$sql .= " AND ef.".$tmpkey." = '".$db->idate($crit)."'";
 		}
-		elseif ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+		elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
 		{
-			$mode_search=0;
-			if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
-			if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
-			if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
+			$mode_search = 0;
+			if (in_array($typ, array('int', 'double', 'real'))) $mode_search = 1; // Search on a numeric
+			if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
+			if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search = 4; // Search on a multiselect field with sql type = text
 
 			$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 		}

Braces +19 added lines, -7 removed lines

@@ -7,27 +7,39 @@
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+    $extrafieldsobjectkey=$object->table_element;
+}
 
 // Loop to complete the sql search criterias from extrafields
-if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array($search_array_options)) {
+    // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	foreach ($search_array_options as $key => $val)
 	{
 		$crit=$val;
+}
 		$tmpkey=preg_replace('/search_options_/','',$key);
 		$typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
 			$sql .= " AND ef.".$tmpkey." = '".$db->idate($crit)."'";
-		}
-		elseif ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+		} elseif ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 		{
 			$mode_search=0;
-			if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
-			if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
-			if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4;	                            // Search on a multiselect field with sql type = text
+			if (in_array($typ, array('int','double','real'))) {
+			    $mode_search=1;
+			}
+			// Search on a numeric
+			if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') {
+			    $mode_search=2;
+			}
+			// Search on a foreign key int
+			if (in_array($typ, array('chkbxlst','checkbox'))) {
+			    $mode_search=4;
+			}
+			// Search on a multiselect field with sql type = text
 
 			$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 		}

dolibarr/htdocs/core/tpl/massactions_pre.tpl.php

Indentation +123 added lines, -123 removed lines

@@ -29,138 +29,138 @@
 
 if ($massaction == 'predeletedraft')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
 if ($massaction == 'predelete')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
 if ($massaction == 'presend')
 {
-	$langs->load("mails");
+    $langs->load("mails");
 
-	$listofselectedid = array();
-	$listofselectedthirdparties = array();
-	$listofselectedref = array();
+    $listofselectedid = array();
+    $listofselectedthirdparties = array();
+    $listofselectedref = array();
 	
-	if (! GETPOST('cancel', 'alpha'))
-	{
-		foreach ($arrayofselected as $toselectid)
-		{
-			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
-				$listofselectedid[$toselectid] = $toselectid;
-				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe')
-					$thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport')
-					$thirdpartyid = $objecttmp->fk_user_author;
-				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
-				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
-			}
-		}
-	}
-
-	print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-
-	dol_fiche_head(null, '', '');
-
-	// Cree l'objet formulaire mail
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->withform = -1;
-	$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;
-	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
-	{
-		$liste = array();
-		$thirdpartyid = array_shift($listofselectedthirdparties);
-		if ($objecttmp->element == 'expensereport')
-		{
-			$fuser = new User($db);
-			$fuser->fetch($thirdpartyid);
-			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
-		}
-		else
-		{
-			$soc = new Societe($db);
-			$soc->fetch($thirdpartyid);
-			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
-				$liste[$key] = $value;
-			}
-		}
-		$formmail->withtoreadonly = 0;
-	} else {
-		$formmail->withtoreadonly = 1;
-	}
+    if (! GETPOST('cancel', 'alpha'))
+    {
+        foreach ($arrayofselected as $toselectid)
+        {
+            $result = $objecttmp->fetch($toselectid);
+            if ($result > 0)
+            {
+                $listofselectedid[$toselectid] = $toselectid;
+                $thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
+                if ($objecttmp->element == 'societe')
+                    $thirdpartyid = $objecttmp->id;
+                if ($objecttmp->element == 'expensereport')
+                    $thirdpartyid = $objecttmp->fk_user_author;
+                $listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
+                $listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
+            }
+        }
+    }
+
+    print '<input type="hidden" name="massaction" value="confirm_presend">';
+
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+
+    dol_fiche_head(null, '', '');
+
+    // Cree l'objet formulaire mail
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+    $formmail->withform = -1;
+    $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;
+    $liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
+    if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
+    {
+        $liste = array();
+        $thirdpartyid = array_shift($listofselectedthirdparties);
+        if ($objecttmp->element == 'expensereport')
+        {
+            $fuser = new User($db);
+            $fuser->fetch($thirdpartyid);
+            $liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+        }
+        else
+        {
+            $soc = new Societe($db);
+            $soc->fetch($thirdpartyid);
+            foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
+                $liste[$key] = $value;
+            }
+        }
+        $formmail->withtoreadonly = 0;
+    } else {
+        $formmail->withtoreadonly = 1;
+    }
 	
-	$formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
-	$formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
-	$formmail->withtofree = empty($liste)?1:0;
-	$formmail->withtocc = 1;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	$formmail->withfile = 1;
-	// $formmail->withfile = 2; Not yet supported in mass action
-	$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
-	if ($objecttmp->element != 'societe') {
-		$formmail->withfile = '<span class="hideonsmartphone">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
-		$formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
-	}
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
-	// Make substitution in email content
-	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
-	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-	$substitutionarray['__PERSONALIZED__'] = '';	// deprecated
-	$substitutionarray['__CONTACTCIVNAME__'] = '';
-
-	$parameters = array(
-		'mode' => 'formemail'
-	);
-	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
-
-	// Tableau des substitutions
-	$formmail->substit = $substitutionarray;
-
-	// Tableau des parametres complementaires du post
-	$formmail->param['action'] = $action;
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
-	$formmail->param['id'] = join(',', $arrayofselected);
-	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
-	{
-		$langs->load("errors");
-		print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
-		$arrayofmassactions = array();
-	}
-	else
-	{
-		print $formmail->get_form();
-	}
-
-	dol_fiche_end();
+    $formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
+    $formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
+    $formmail->withtofree = empty($liste)?1:0;
+    $formmail->withtocc = 1;
+    $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+    $formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+    $formmail->withfile = 1;
+    // $formmail->withfile = 2; Not yet supported in mass action
+    $formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
+    if ($objecttmp->element != 'societe') {
+        $formmail->withfile = '<span class="hideonsmartphone">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
+        $formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
+    }
+    $formmail->withbody = 1;
+    $formmail->withdeliveryreceipt = 1;
+    $formmail->withcancel = 1;
+
+    // Make substitution in email content
+    $substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
+    $substitutionarray['__EMAIL__'] = $sendto;
+    $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+    $substitutionarray['__PERSONALIZED__'] = '';	// deprecated
+    $substitutionarray['__CONTACTCIVNAME__'] = '';
+
+    $parameters = array(
+        'mode' => 'formemail'
+    );
+    complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
+
+    // Tableau des substitutions
+    $formmail->substit = $substitutionarray;
+
+    // Tableau des parametres complementaires du post
+    $formmail->param['action'] = $action;
+    $formmail->param['models'] = $modelmail;
+    $formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+    $formmail->param['id'] = join(',', $arrayofselected);
+    // $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+    if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
+    {
+        $langs->load("errors");
+        print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+        print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
+        $arrayofmassactions = array();
+    }
+    else
+    {
+        print $formmail->get_form();
+    }
+
+    dol_fiche_end();
 }

Spacing +14 added lines, -14 removed lines

@@ -45,7 +45,7 @@ 
 	$listofselectedthirdparties = array();
 	$listofselectedref = array();
 	
-	if (! GETPOST('cancel', 'alpha'))
+	if (!GETPOST('cancel', 'alpha'))
 	{
 		foreach ($arrayofselected as $toselectid)
 		{
@@ -66,25 +66,25 @@ 
 
 	print '<input type="hidden" name="massaction" value="confirm_presend">';
 
-	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);
 
 	dol_fiche_head(null, '', '');
 
 	// Cree l'objet formulaire mail
-	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->withform = -1;
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+	$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
+	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';
+		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
 	}
 	$formmail->withfrom = 1;
@@ -112,9 +112,9 @@ 
 		$formmail->withtoreadonly = 1;
 	}
 	
-	$formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
-	$formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
-	$formmail->withtofree = empty($liste)?1:0;
+	$formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
+	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
+	$formmail->withtofree = empty($liste) ? 1 : 0;
 	$formmail->withtocc = 1;
 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
 	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
@@ -132,8 +132,8 @@ 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-	$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(
@@ -150,11 +150,11 @@ 
 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
 	$formmail->param['id'] = join(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
 	{
 		$langs->load("errors");
-		print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
+		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
 	}
 	else

Braces +14 added lines, -10 removed lines

@@ -54,10 +54,12 @@ 
 			{
 				$listofselectedid[$toselectid] = $toselectid;
 				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe')
-					$thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport')
-					$thirdpartyid = $objecttmp->fk_user_author;
+				if ($objecttmp->element == 'societe') {
+									$thirdpartyid = $objecttmp->id;
+				}
+				if ($objecttmp->element == 'expensereport') {
+									$thirdpartyid = $objecttmp->fk_user_author;
+				}
 				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
 				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 			}
@@ -82,24 +84,27 @@ 
 		$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;
 	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
+	if (count($listofselectedthirdparties) == 1) {
+	    // Only 1 different recipient selected, we can suggest contacts
 	{
 		$liste = array();
+	}
 		$thirdpartyid = array_shift($listofselectedthirdparties);
 		if ($objecttmp->element == 'expensereport')
 		{
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." <".$fuser->email.">";
-		}
-		else
+		} else
 		{
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
@@ -156,8 +161,7 @@ 
 		print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
 		$arrayofmassactions = array();
-	}
-	else
+	} else
 	{
 		print $formmail->get_form();
 	}

dolibarr/htdocs/core/tpl/passwordforgotten.tpl.php

Indentation +37 added lines, -37 removed lines

@@ -19,8 +19,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;
 }
 
 
@@ -111,28 +111,28 @@ 
 
 <?php
 if (! empty($morelogincontent)) {
-	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option)
-		{
-			if ($format == 'table') {
-				echo '<!-- Option by hook -->';
-				echo $option;
-			}
-		}
-	}
-	else {
-		echo '<!-- Option by hook -->';
-		echo $morelogincontent;
-	}
+    if (is_array($morelogincontent)) {
+        foreach ($morelogincontent as $format => $option)
+        {
+            if ($format == 'table') {
+                echo '<!-- Option by hook -->';
+                echo $option;
+            }
+        }
+    }
+    else {
+        echo '<!-- Option by hook -->';
+        echo $morelogincontent;
+    }
 }
 ?>
 
 <?php if ($captcha) {
-		// Add a variable param to force not using cache (jmobile)
-		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
-		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
-		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
-	?>
+        // Add a variable param to force not using cache (jmobile)
+        $php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
+        if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
+        else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+    ?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
 	<div class="tdinputlogin nowraponall none center valignmiddle tdinputlogin">
@@ -167,14 +167,14 @@ 
 <br>
 <div align="center" style="margin-top: 15px;">
 	<?php
-	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
-
-	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
-	?>
+    $moreparam='';
+    if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+    if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+    if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+    if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+
+    print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
+    ?>
 </div>
 
 </div>
@@ -206,17 +206,17 @@ 
 <?php } ?>
 
 <?php if (! empty($morelogincontent) && is_array($morelogincontent)) {
-	foreach ($morelogincontent as $format => $option)
-	{
-		if ($format == 'js') {
-			echo "\n".'<!-- Javascript by hook -->';
-			echo $option."\n";
-		}
-	}
+    foreach ($morelogincontent as $format => $option)
+    {
+        if ($format == 'js') {
+            echo "\n".'<!-- Javascript by hook -->';
+            echo $option."\n";
+        }
+    }
 }
 else if (! empty($moreloginextracontent)) {
-	echo '<!-- Javascript by hook -->';
-	echo $moreloginextracontent;
+    echo '<!-- Javascript by hook -->';
+    echo $moreloginextracontent;
 }
 ?>
 

Spacing +30 added lines, -30 removed lines

@@ -17,7 +17,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;
@@ -29,32 +29,32 @@ 
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu = 1;
+if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu = 1;
+if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen = 1;
+if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile = 1;
 
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 
 $php_self = $_SERVER['PHP_SELF'];
-$php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
+$php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
 
-$titleofpage=$langs->trans('SendNewPassword');
+$titleofpage = $langs->trans('SendNewPassword');
 
 print top_htmlhead('', $titleofpage);
 
 
-$colorbackhmenu1='60,70,100';      // topmenu
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
-$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
+$colorbackhmenu1 = '60,70,100'; // topmenu
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
 
-<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
+<body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script type="text/javascript">
@@ -66,7 +66,7 @@ 
 <?php } ?>
 
 
-<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND)?' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"':'' ?>>
+<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"' : '' ?>>
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">
@@ -110,7 +110,7 @@ 
 </div>
 
 <?php
-if (! empty($morelogincontent)) {
+if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
 		foreach ($morelogincontent as $format => $option)
 		{
@@ -129,9 +129,9 @@ 
 
 <?php if ($captcha) {
 		// Add a variable param to force not using cache (jmobile)
-		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
-		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
-		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
+		if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
+		else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
 	?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
@@ -167,11 +167,11 @@ 
 <br>
 <div align="center" style="margin-top: 15px;">
 	<?php
-	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	$moreparam = '';
+	if (!empty($conf->dol_hide_topmenu))   $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+	if (!empty($conf->dol_hide_leftmenu))  $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+	if (!empty($conf->dol_no_mouse_hover)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+	if (!empty($conf->dol_use_jmobile))    $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$conf->dol_use_jmobile;
 
 	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
 	?>
@@ -184,12 +184,12 @@ 
 </form>
 
 
-<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' backgroundsemitransparent'; ?>" style="max-width: 70%">
-<?php if ($mode == 'dolibarr' || ! $disabled) { ?>
+<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent'; ?>" style="max-width: 70%">
+<?php if ($mode == 'dolibarr' || !$disabled) { ?>
 	<span class="passwordmessagedesc">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
 	</span>
-<?php }else{ ?>
+<?php } else { ?>
 	<div class="warning" align="center">
 	<?php echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode); ?>
 	</div>
@@ -201,11 +201,11 @@ 
 
 <?php if ($message) { ?>
 	<div class="center login_main_message">
-	<?php echo dol_htmloutput_mesg($message,'','',1); ?>
+	<?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
 	</div>
 <?php } ?>
 
-<?php if (! empty($morelogincontent) && is_array($morelogincontent)) {
+<?php if (!empty($morelogincontent) && is_array($morelogincontent)) {
 	foreach ($morelogincontent as $format => $option)
 	{
 		if ($format == 'js') {
@@ -214,7 +214,7 @@ 
 		}
 	}
 }
-else if (! empty($moreloginextracontent)) {
+else if (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }

Braces +47 added lines, -20 removed lines

@@ -29,14 +29,26 @@ 
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
+if (GETPOST('dol_hide_topmenu')) {
+    $conf->dol_hide_topmenu=1;
+}
+if (GETPOST('dol_hide_leftmenu')) {
+    $conf->dol_hide_leftmenu=1;
+}
+if (GETPOST('dol_optimize_smallscreen')) {
+    $conf->dol_optimize_smallscreen=1;
+}
+if (GETPOST('dol_no_mouse_hover')) {
+    $conf->dol_no_mouse_hover=1;
+}
+if (GETPOST('dol_use_jmobile')) {
+    $conf->dol_use_jmobile=1;
+}
 
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (! empty($conf->dol_use_jmobile)) {
+    $conf->use_javascript_ajax=1;
+}
 
 $php_self = $_SERVER['PHP_SELF'];
 $php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
@@ -47,7 +59,9 @@ 
 
 
 $colorbackhmenu1='60,70,100';      // topmenu
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+    $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
+}
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
 
@@ -77,9 +91,13 @@ 
 <!-- Title with version -->
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+if ($disablenofollow) {
+    echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+}
 echo dol_escape_htmltag($title);
-if ($disablenofollow) echo '</a>';
+if ($disablenofollow) {
+    echo '</a>';
+}
 ?>
 </div>
 
@@ -119,8 +137,7 @@ 
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -130,8 +147,11 @@ 
 <?php if ($captcha) {
 		// Add a variable param to force not using cache (jmobile)
 		$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self);	// Remove param time
-		if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
-		else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		if (preg_match('/\?/',$php_self)) {
+		    $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
+		} else {
+		    $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
+		}
 	?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
@@ -168,10 +188,18 @@ 
 <div align="center" style="margin-top: 15px;">
 	<?php
 	$moreparam='';
-	if (! empty($conf->dol_hide_topmenu))   $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (! empty($conf->dol_hide_leftmenu))  $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (! empty($conf->dol_use_jmobile))    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	if (! empty($conf->dol_hide_topmenu)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+	}
+	if (! empty($conf->dol_hide_leftmenu)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+	}
+	if (! empty($conf->dol_no_mouse_hover)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+	}
+	if (! empty($conf->dol_use_jmobile)) {
+	    $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	}
 
 	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
 	?>
@@ -189,7 +217,7 @@ 
 	<span class="passwordmessagedesc">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
 	</span>
-<?php }else{ ?>
+<?php } else{ ?>
 	<div class="warning" align="center">
 	<?php echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode); ?>
 	</div>
@@ -213,8 +241,7 @@ 
 			echo $option."\n";
 		}
 	}
-}
-else if (! empty($moreloginextracontent)) {
+} else if (! empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }

dolibarr/htdocs/core/tpl/objectline_edit.tpl.php

Indentation +145 added lines, -145 removed lines

@@ -34,8 +34,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;
 }
 
 
@@ -78,129 +78,129 @@ 
 
 		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
-		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
-		else print img_object($langs->trans('ShowProduct'),'product');
-		echo ' '.$line->ref;
-		?>
+        if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
+        else print img_object($langs->trans('ShowProduct'),'product');
+        echo ' '.$line->ref;
+        ?>
 		</a>
 		<?php
-		echo ' - '.nl2br($line->product_label);
-		?>
+        echo ' - '.nl2br($line->product_label);
+        ?>
 
 		<br><br>
 
 	<?php }	?>
 
 	<?php
-	if (is_object($hookmanager))
-	{
-		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-	    $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
-	    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
-	}
-
-	// Do not allow editing during a situation cycle
-	if (empty($this->situation_cycle_ref) || $this->situation_counter == 1)
-	{
-		// editeur wysiwyg
-		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-		$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
-		$doleditor->Create();
-	} else {
-		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
-	}
-
-	// Show autofill date for recuring invoices
-	if (! empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
-	{
-		echo '<br>';
-		echo $langs->trans('AutoFillDateFrom').' ';
-		echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
-		echo ' - ';
-		echo $langs->trans('AutoFillDateTo').' ';
-		echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
-	}
-
-	?>
+    if (is_object($hookmanager))
+    {
+        $fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
+        $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
+        $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
+    }
+
+    // Do not allow editing during a situation cycle
+    if (empty($this->situation_cycle_ref) || $this->situation_counter == 1)
+    {
+        // editeur wysiwyg
+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+        $nbrows=ROWS_2;
+        if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+        $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+        $toolbarname='dolibarr_details';
+        if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+        $doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
+        $doleditor->Create();
+    } else {
+        print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
+    }
+
+    // Show autofill date for recuring invoices
+    if (! empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
+    {
+        echo '<br>';
+        echo $langs->trans('AutoFillDateFrom').' ';
+        echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
+        echo ' - ';
+        echo $langs->trans('AutoFillDateTo').' ';
+        echo $form->selectyesno('date_end_fill', $line->date_end_fill, 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 align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 	<?php
-	}
-
-	$coldisplay++;
-	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
-		print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
-	} else {
-		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
-	}
-
-	$coldisplay++;
-	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
-	if ($this->situation_counter > 1) print ' readonly';
-	print '></td>';
-
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
-		print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
-	}
-
-	if ($inputalsopricewithtax)
-	{
-		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
-		if ($this->situation_counter > 1) print ' readonly';
-		print '></td>';
-	}
-	?>
+    }
+
+    $coldisplay++;
+    if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
+        print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
+    } else {
+        print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
+    }
+
+    $coldisplay++;
+    print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
+    if ($this->situation_counter > 1) print ' readonly';
+    print '></td>';
+
+    if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+        print '<td align="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
+    }
+
+    if ($inputalsopricewithtax)
+    {
+        $coldisplay++;
+        print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
+        if ($this->situation_counter > 1) print ' readonly';
+        print '></td>';
+    }
+    ?>
 	<td align="right"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		// 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;"')." ";
-		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
-		if ($this->situation_counter > 1) print ' readonly';
-		print '>';
-	} else { ?>
+        // 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;"')." ";
+        print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
+        if ($this->situation_counter > 1) print ' readonly';
+        print '>';
+    } else { ?>
 		&nbsp;
 	<?php } ?>
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
-	{
-		print '<td align="left">';
-		print $form->selectUnits($line->fk_unit, "units");
-		print '</td>';
-	}
-	?>
+    if($conf->global->PRODUCT_USE_UNITS)
+    {
+        print '<td align="left">';
+        print $form->selectUnits($line->fk_unit, "units");
+        print '</td>';
+    }
+    ?>
 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
-		if ($this->situation_counter > 1) print ' readonly';
-		print '>%';
-	} else { ?>
+        print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
+        if ($this->situation_counter > 1) print ' readonly';
+        print '>%';
+    } else { ?>
 		&nbsp;
 	<?php } ?>
 	</td>
 	<?php
-	if ($this->situation_cycle_ref) {
-		$coldisplay++;
-		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
-	}
-	if (! empty($usemargins))
-	{
-	?>
+    if ($this->situation_cycle_ref) {
+        $coldisplay++;
+        print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
+    }
+    if (! empty($usemargins))
+    {
+    ?>
 		<?php if (!empty($user->rights->margins->creer)) { ?>
 		<td align="right" class="margininfos"><?php $coldisplay++; ?>
 			<!-- For predef product -->
@@ -212,29 +212,29 @@ 
 		</td>
 		<?php } ?>
 	    <?php if ($user->rights->margins->creer) {
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				  {
-				    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
-				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
-					$coldisplay++;
-				  }
-				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
-				  {
-				    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
-				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
-					$coldisplay++;
-				  }
-			  }
-	}
-	?>
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                    {
+                    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
+                    // if credit note, dont allow to modify margin
+                    if ($line->subprice < 0)
+                        echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
+                    else
+                        echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+                    $coldisplay++;
+                    }
+                elseif (! empty($conf->global->DISPLAY_MARK_RATES))
+                    {
+                    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
+                    // if credit note, dont allow to modify margin
+                    if ($line->subprice < 0)
+                        echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
+                    else
+                        echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+                    $coldisplay++;
+                    }
+                }
+    }
+    ?>
 
 	<!-- colspan=4 for this td because it replace total_ht+3 td for buttons -->
 	<td align="center" colspan="<?php echo $colspan; ?>" valign="middle"><?php $coldisplay+=4; ?>
@@ -247,7 +247,7 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+    print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 
@@ -258,29 +258,29 @@ 
 	<?php } ?>
 	<td colspan="<?php echo 7+$colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
-	$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
-	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
-	print ' '.$langs->trans('to').' ';
-	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
-	print '<script type="text/javascript">';
-	if (!$line->date_start) {
-		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
-			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
-		}
-		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
-			print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
-		}
-	}
-	if (!$line->date_end) {
-		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
-			print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
-		}
-		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
-			print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
-		}
-	}
-	print '</script>'
-	?>
+    $hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
+    print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
+    print ' '.$langs->trans('to').' ';
+    print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
+    print '<script type="text/javascript">';
+    if (!$line->date_start) {
+        if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
+            print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
+        }
+        if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
+            print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
+        }
+    }
+    if (!$line->date_end) {
+        if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
+            print 'jQuery("#date_endhour").val("'.$conf->global->MAIN_DEFAULT_DATE_END_HOUR.'");';
+        }
+        if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
+            print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
+        }
+    }
+    print '</script>'
+    ?>
 	</td>
 </tr>
 <?php }

Spacing +52 added lines, -52 removed lines

@@ -32,54 +32,54 @@ 
  */
 
 // 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;
 }
 
 
-$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;
 
 global $forceall, $senderissupplier, $inputalsopricewithtax;
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (empty($dateSelector)) $dateSelector = 0;
+if (empty($forceall)) $forceall = 0;
+if (empty($senderissupplier)) $senderissupplier = 0;
+if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
 
 
 // Define colspan for button Add
-$colspan = 3;	// Col total ht + col edit + col delete
-if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
-if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
+$colspan = 3; // Col total ht + col edit + col delete
+if (!empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc
+if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier'))) $colspan++; // With this, there is a column move button
 if (empty($user->rights->margins->creer)) $colspan++;
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan += 2;
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
 
 <?php
-$coldisplay=-1; // We remove first td
+$coldisplay = -1; // We remove first td
 ?>
 <tr <?php echo $bc[$var]; ?>>
-	<?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>
 	<div id="line_<?php echo $line->id; ?>"></div>
 
 	<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
 	<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">
-	<input type="hidden" id="product_id" name="productid" value="<?php echo (! empty($line->fk_product)?$line->fk_product:0); ?>" />
+	<input type="hidden" id="product_id" name="productid" value="<?php echo (!empty($line->fk_product) ? $line->fk_product : 0); ?>" />
 	<input type="hidden" id="special_code" name="special_code" value="<?php echo $line->special_code; ?>">
 
 	<?php if ($line->fk_product > 0) { ?>
 
 		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
-		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
-		else print img_object($langs->trans('ShowProduct'),'product');
+		if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');
+		else print img_object($langs->trans('ShowProduct'), 'product');
 		echo ' '.$line->ref;
 		?>
 		</a>
@@ -95,8 +95,8 @@ 
 	if (is_object($hookmanager))
 	{
 		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-	    $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
-	    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$this,$action);
+	    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+	    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
 
 	// Do not allow editing during a situation cycle
@@ -104,19 +104,19 @@ 
 	{
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-		$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
+		$nbrows = ROWS_2;
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+		$toolbarname = 'dolibarr_details';
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+		$doleditor = new DolEditor('product_desc', $line->description, '', 164, $toolbarname, '', false, true, $enable, $nbrows, '98%');
 		$doleditor->Create();
 	} else {
-		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
+		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">'.$line->description.'</textarea>';
 	}
 
 	// Show autofill date for recuring invoices
-	if (! empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
+	if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
 	{
 		echo '<br>';
 		echo $langs->trans('AutoFillDateFrom').' ';
@@ -139,13 +139,13 @@ 
 
 	$coldisplay++;
 	if ($this->situation_counter == 1 || !$this->situation_cycle_ref) {
-		print '<td align="right">' . $form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1) . '</td>';
+		print '<td align="right">'.$form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : ''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1).'</td>';
 	} else {
-		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="' . price($line->tva_tx) . '" readonly />%</td>';
+		print '<td align="right"><input size="1" type="text" class="flat right" name="tva_tx" value="'.price($line->tva_tx).'" readonly />%</td>';
 	}
 
 	$coldisplay++;
-	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
+	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="'.(isset($line->pu_ht) ?price($line->pu_ht, 0, '', 0) : price($line->subprice, 0, '', 0)).'"';
 	if ($this->situation_counter > 1) print ' readonly';
 	print '></td>';
 
@@ -156,7 +156,7 @@ 
 	if ($inputalsopricewithtax)
 	{
 		$coldisplay++;
-		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
+		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc) ?price($line->pu_ttc, 0, '', 0) : '').'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '></td>';
 	}
@@ -167,7 +167,7 @@ 
 		// 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;"')." ";
-		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
+		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="'.$line->qty.'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '>';
 	} else { ?>
@@ -176,7 +176,7 @@ 
 	</td>
 
 	<?php
-	if($conf->global->PRODUCT_USE_UNITS)
+	if ($conf->global->PRODUCT_USE_UNITS)
 	{
 		print '<td align="left">';
 		print $form->selectUnits($line->fk_unit, "units");
@@ -186,7 +186,7 @@ 
 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
-		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
+		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="'.$line->remise_percent.'"';
 		if ($this->situation_counter > 1) print ' readonly';
 		print '>%';
 	} else { ?>
@@ -196,25 +196,25 @@ 
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="' . $line->situation_percent . '" name="progress">%</td>';
+		print '<td align="right" class="nowrap"><input class="right" type="text" size="1" value="'.$line->situation_percent.'" name="progress">%</td>';
 	}
-	if (! empty($usemargins))
+	if (!empty($usemargins))
 	{
 	?>
 		<?php if (!empty($user->rights->margins->creer)) { ?>
 		<td align="right" class="margininfos"><?php $coldisplay++; ?>
 			<!-- For predef product -->
-			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
+			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat right" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input class="flat right" type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht,0,'',0); ?>">
+			<input class="flat right" type="text" size="5" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht, 0, '', 0); ?>">
 		</td>
 		<?php } ?>
 	    <?php if ($user->rights->margins->creer) {
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 				  {
-				    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
+				    $margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
 				    // if credit note, dont allow to modify margin
 					if ($line->subprice < 0)
 						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
@@ -222,9 +222,9 @@ 
 						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 					$coldisplay++;
 				  }
-				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
+				elseif (!empty($conf->global->DISPLAY_MARK_RATES))
 				  {
-				    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
+				    $mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				    // if credit note, dont allow to modify margin
 					if ($line->subprice < 0)
 						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
@@ -237,7 +237,7 @@ 
 	?>
 
 	<!-- colspan=4 for this td because it replace total_ht+3 td for buttons -->
-	<td align="center" colspan="<?php echo $colspan; ?>" valign="middle"><?php $coldisplay+=4; ?>
+	<td align="center" colspan="<?php echo $colspan; ?>" valign="middle"><?php $coldisplay += 4; ?>
 		<input type="submit" class="button" id="savelinebutton" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>
 		<input type="submit" class="button" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 	</td>
@@ -247,21 +247,21 @@ 
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 }
 ?>
 
-<?php if (! empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector)	 { ?>
+<?php if (!empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector) { ?>
 <tr id="service_duration_area" <?php echo $bc[$var]; ?>>
-	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 		<td class="linecolnum" align="center"><?php $coldisplay++; ?></td>
 	<?php } ?>
-	<td colspan="<?php echo 7+$colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
+	<td colspan="<?php echo 7 + $colspan ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
-	$hourmin=(isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:'');
-	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0);
+	$hourmin = (isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : '');
+	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);
 	print ' '.$langs->trans('to').' ';
-	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end?0:1, "updateline", 1, 0);
+	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end ? 0 : 1, "updateline", 1, 0);
 	print '<script type="text/javascript">';
 	if (!$line->date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
@@ -314,7 +314,7 @@ 
 	});
 
     <?php
-    if (! empty($conf->margin->enabled))
+    if (!empty($conf->margin->enabled))
     {
     ?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
@@ -344,7 +344,7 @@ 
 		});
 
 		/* Init field buying_price and fournprice */
-		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product?$line->fk_product:0; ?>}, function(data) {
+		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>}, function(data) {
           if (data && data.length > 0) {
 			var options = '';
 			var trouve=false;

Braces +68 added lines, -29 removed lines

@@ -40,21 +40,41 @@ 
 
 
 $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;
+}
 
 global $forceall, $senderissupplier, $inputalsopricewithtax;
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+if (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
 
 
 // Define colspan for button Add
 $colspan = 3;	// Col total ht + col edit + col delete
-if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
-if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
-if (empty($user->rights->margins->creer)) $colspan++;
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan+=2;
+if (! empty($inputalsopricewithtax)) {
+    $colspan++;
+}
+// We add 1 if col total ttc
+if (in_array($object->element,array('propal','supplier_proposal','facture','invoice','commande','order','order_supplier','invoice_supplier'))) {
+    $colspan++;
+}
+// With this, there is a column move button
+if (empty($user->rights->margins->creer)) {
+    $colspan++;
+}
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+    $colspan+=2;
+}
 ?>
 
 <!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->
@@ -78,8 +98,11 @@ 
 
 		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
-		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
-		else print img_object($langs->trans('ShowProduct'),'product');
+		if ($line->product_type==1) {
+		    echo img_object($langs->trans('ShowService'),'service');
+		} else {
+		    print img_object($langs->trans('ShowProduct'),'product');
+		}
 		echo ' '.$line->ref;
 		?>
 		</a>
@@ -105,10 +128,14 @@ 
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+		    $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		}
 		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+		    $toolbarname='dolibarr_notes';
+		}
 		$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
 		$doleditor->Create();
 	} else {
@@ -130,10 +157,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 align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
+		<td align="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn);
+	}
+	?>"></td>
 	<?php
 	}
 
@@ -146,7 +176,9 @@ 
 
 	$coldisplay++;
 	print '<td align="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="' . (isset($line->pu_ht)?price($line->pu_ht,0,'',0):price($line->subprice,0,'',0)) . '"';
-	if ($this->situation_counter > 1) print ' readonly';
+	if ($this->situation_counter > 1) {
+	    print ' readonly';
+	}
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -157,7 +189,9 @@ 
 	{
 		$coldisplay++;
 		print '<td align="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
-		if ($this->situation_counter > 1) print ' readonly';
+		if ($this->situation_counter > 1) {
+		    print ' readonly';
+		}
 		print '></td>';
 	}
 	?>
@@ -168,7 +202,9 @@ 
 		// 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;"')." ";
 		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="' . $line->qty . '"';
-		if ($this->situation_counter > 1) print ' readonly';
+		if ($this->situation_counter > 1) {
+		    print ' readonly';
+		}
 		print '>';
 	} else { ?>
 		&nbsp;
@@ -187,7 +223,9 @@ 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) {
 		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="' . $line->remise_percent . '"';
-		if ($this->situation_counter > 1) print ' readonly';
+		if ($this->situation_counter > 1) {
+		    print ' readonly';
+		}
 		print '>%';
 	} else { ?>
 		&nbsp;
@@ -216,20 +254,21 @@ 
 				  {
 				    $margin_rate = (isset($_POST["np_marginRate"])?GETPOST("np_marginRate","alpha",2):(($line->pa_ht == 0)?'':price($line->marge_tx)));
 				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+					if ($line->subprice < 0) {
+											echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
+					} else {
+											echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+					}
 					$coldisplay++;
-				  }
-				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
+				  } elseif (! empty($conf->global->DISPLAY_MARK_RATES))
 				  {
 				    $mark_rate = (isset($_POST["np_markRate"])?GETPOST("np_markRate",'alpha',2):price($line->marque_tx));
 				    // if credit note, dont allow to modify margin
-					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-					else
-						echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+					if ($line->subprice < 0) {
+											echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
+					} else {
+											echo '<td align="right" class="nowrap margininfos"><input class="right" type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+					}
 					$coldisplay++;
 				  }
 			  }