Inspection of "In very many sites, an entry point other than the..." - alxarafe/alixar - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 8f7a8e...7e4a07 )

by Alxarafe

created 2019-04-14 19:58 UTC

Status

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@
 block discarded – undo
 <?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;
 }
 
 // Loop to complete $param for extrafields
-if (! empty($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (!empty($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);
-	if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	$crit = $val;
+	$tmpkey = preg_replace('/search_options_/', '', $key);
+	if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 }
 }

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@
 block discarded – undo
  */
 
 // 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;

Please login to merge, or discard this patch.

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

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,28 +1,28 @@
 block discarded – undo
 <?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";
 			}
 		}
 	}

Please login to merge, or discard this patch.

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

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
  */
 
 // 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 @@  discard block
 block discarded – undo
 
 $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 @@  discard block
 block discarded – undo
 	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>';

Please login to merge, or discard this patch.

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

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 // 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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 	}
 	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 @@  discard block
 block discarded – undo
 	}
 	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 @@  discard block
 block discarded – undo
 	}
 	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 @@  discard block
 block discarded – undo
 	}
 	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 @@  discard block
 block discarded – undo
 	print '<br>';
 }
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {

Please login to merge, or discard this patch.

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

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -25,22 +25,22 @@  discard block
 block discarded – undo
  * $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 @@  discard block
 block discarded – undo
 		}
 		//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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 			}
 
 			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 '

Please login to merge, or discard this patch.

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

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,33 +1,33 @@
 block discarded – undo
 <?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);
 		}

Please login to merge, or discard this patch.

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

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 	$listofselectedthirdparties = array();
 	$listofselectedref = array();
 	
-	if (! GETPOST('cancel', 'alpha'))
+	if (!GETPOST('cancel', 'alpha'))
 	{
 		foreach ($arrayofselected as $toselectid)
 		{
@@ -66,25 +66,25 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	$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

Please login to merge, or discard this patch.

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

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  */
 
 // 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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 </div>
 
 <?php
-if (! empty($morelogincontent)) {
+if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
 		foreach ($morelogincontent as $format => $option)
 		{
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
 
 <?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 @@  discard block
 block discarded – undo
 <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 @@  discard block
 block discarded – undo
 </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 @@  discard block
 block discarded – undo
 
 <?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 @@  discard block
 block discarded – undo
 		}
 	}
 }
-else if (! empty($moreloginextracontent)) {
+else if (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }

Please login to merge, or discard this patch.

		@@ -25,22 +25,22 @@ discard block
		block discarded – undo
25	25	* $cols
26	26	*/
27	27	// Protection to avoid direct call of template
28		-if (empty($object) \|\| ! is_object($object))
	28	+if (empty($object) \|\| !is_object($object))
29	29	{
30	30	print "Error, template page can't be called as URL";
31	31	exit;
32	32	}
33	33
34		-if (! is_object($form)) $form=new Form($db);
	34	+if (!is_object($form)) $form = new Form($db);
35	35
36	36
37	37	?>
38	38	<!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
39	39	<?php
40		-if (! is_array($parameters)) $parameters = array();
41		-if (! empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
42		-if (! empty($cols)) $parameters['cols'] = $cols;
43		-if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
	40	+if (!is_array($parameters)) $parameters = array();
	41	+if (!empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
	42	+if (!empty($cols)) $parameters['cols'] = $cols;
	43	+if (!empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
44	44	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
45	45	print $hookmanager->resPrint;
46	46	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
		@@ -70,19 +70,19 @@ discard block
		block discarded – undo
70	70	}
71	71	//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";
72	72
73		- if (empty($enabled)) continue; // 0 = Never visible field
74		- if (abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
75		- if (empty($perms)) continue; // 0 = Not visible
	73	+ if (empty($enabled)) continue; // 0 = Never visible field
	74	+ if (abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
	75	+ if (empty($perms)) continue; // 0 = Not visible
76	76
77	77	// Load language if required
78		- if (! empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
	78	+ if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
79	79	if ($action == 'edit_extras')
80	80	{
81		- $value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
	81	+ $value = (isset($_POST["options_".$key]) ? $_POST["options_".$key] : $object->array_options["options_".$key]);
82	82	}
83	83	else
84	84	{
85		- $value = $object->array_options["options_" . $key];
	85	+ $value = $object->array_options["options_".$key];
86	86	}
87	87	if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
88	88	{
		@@ -98,65 +98,65 @@ discard block
		block discarded – undo
98	98	print ' class="';
99	99	//var_dump($action);exit;
100	100
101		- if ((! empty($action) && ($action == 'create' \|\| $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
	101	+ if ((!empty($action) && ($action == 'create' \|\| $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
102	102	print '">';
103		- if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
	103	+ if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));
104	104	else print $langs->trans($label);
105	105	print '</td>';
106	106
107	107	//TODO Improve element and rights detection
108	108	//var_dump($user->rights);
109		- $permok=false;
110		- $keyforperm=$object->element;
111		- if ($object->element == 'fichinter') $keyforperm='ficheinter';
112		- if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer\|\|$user->rights->$keyforperm->create\|\|$user->rights->$keyforperm->write;
113		- if ($object->element=='order_supplier') $permok=$user->rights->fournisseur->commande->creer;
114		- if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
115		- if ($object->element=='shipping') $permok=$user->rights->expedition->creer;
116		- if ($object->element=='delivery') $permok=$user->rights->expedition->livraison->creer;
117		- if ($object->element=='productlot') $permok=$user->rights->stock->creer;
118		- if ($object->element=='facturerec') $permok=$user->rights->facture->creer;
119		- if (($object->statut == 0 \|\| ! empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
	109	+ $permok = false;
	110	+ $keyforperm = $object->element;
	111	+ if ($object->element == 'fichinter') $keyforperm = 'ficheinter';
	112	+ if (isset($user->rights->$keyforperm)) $permok = $user->rights->$keyforperm->creer \|\| $user->rights->$keyforperm->create \|\| $user->rights->$keyforperm->write;
	113	+ if ($object->element == 'order_supplier') $permok = $user->rights->fournisseur->commande->creer;
	114	+ if ($object->element == 'invoice_supplier') $permok = $user->rights->fournisseur->facture->creer;
	115	+ if ($object->element == 'shipping') $permok = $user->rights->expedition->creer;
	116	+ if ($object->element == 'delivery') $permok = $user->rights->expedition->livraison->creer;
	117	+ if ($object->element == 'productlot') $permok = $user->rights->stock->creer;
	118	+ if ($object->element == 'facturerec') $permok = $user->rights->facture->creer;
	119	+ if (($object->statut == 0 \|\| !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))
120	120	&& $permok && ($action != 'edit_extras' \|\| GETPOST('attribute') != $key)
121	121	&& empty($extrafields->attributes[$object->table_element]['computed'][$key]))
122	122	{
123		- $fieldid='id';
124		- if ($object->table_element == 'societe') $fieldid='socid';
125		- print '<td align="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
	123	+ $fieldid = 'id';
	124	+ if ($object->table_element == 'societe') $fieldid = 'socid';
	125	+ print '<td align="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$key.'">'.img_edit().'</a></td>';
126	126	}
127	127	print '</tr></table>';
128	128	print '</td>';
129	129
130	130	$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';
131	131
132		- print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols?' colspan="'.$cols.'"':'').'>';
	132	+ print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols ? ' colspan="'.$cols.'"' : '').'>';
133	133
134	134	// Convert date into timestamp format
135		- if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime')))
	135	+ if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date', 'datetime')))
136	136	{
137		- $datenotinstring = $object->array_options['options_' . $key];
	137	+ $datenotinstring = $object->array_options['options_'.$key];
138	138	// print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';
139		- if (! is_numeric($object->array_options['options_' . $key])) // For backward compatibility
	139	+ if (!is_numeric($object->array_options['options_'.$key])) // For backward compatibility
140	140	{
141	141	$datenotinstring = $db->jdate($datenotinstring);
142	142	}
143	143	//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
144		- $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;
	144	+ $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;
145	145	}
146	146	//TODO Improve element and rights detection
147		- if ($action == 'edit_extras' && $permok && GETPOST('attribute','none') == $key)
	147	+ if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $key)
148	148	{
149		- $fieldid='id';
150		- if ($object->table_element == 'societe') $fieldid='socid';
151		- print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
	149	+ $fieldid = 'id';
	150	+ if ($object->table_element == 'societe') $fieldid = 'socid';
	151	+ print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
152	152	print '<input type="hidden" name="action" value="update_extras">';
153		- print '<input type="hidden" name="attribute" value="' . $key . '">';
154		- print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
155		- print '<input type="hidden" name="'.$fieldid.'" value="' . $object->id . '">';
	153	+ print '<input type="hidden" name="attribute" value="'.$key.'">';
	154	+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
	155	+ print '<input type="hidden" name="'.$fieldid.'" value="'.$object->id.'">';
156	156	print $extrafields->showInputField($key, $value, '', '', '', 0, $object->id);
157	157
158	158
159		- print '<input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '">';
	159	+ print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Modify')).'">';
160	160
161	161	print '</form>';
162	162	}
		@@ -167,14 +167,14 @@ discard block
		block discarded – undo
167	167	}
168	168
169	169	print '</td>';
170		- print '</tr>' . "\n";
	170	+ print '</tr>'."\n";
171	171	}
172	172	}
173	173
174	174
175	175	// Add code to manage list depending on others
176	176	// TODO Test/enhance this with a more generic solution
177		- if (! empty($conf->use_javascript_ajax))
	177	+ if (!empty($conf->use_javascript_ajax))
178	178	{
179	179	print "\n";
180	180	print '

		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	$listofselectedthirdparties = array();
46	46	$listofselectedref = array();
47	47
48		- if (! GETPOST('cancel', 'alpha'))
	48	+ if (!GETPOST('cancel', 'alpha'))
49	49	{
50	50	foreach ($arrayofselected as $toselectid)
51	51	{
		@@ -66,25 +66,25 @@ discard block
		block discarded – undo
66	66
67	67	print '<input type="hidden" name="massaction" value="confirm_presend">';
68	68
69		- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
	69	+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
70	70	$formmail = new FormMail($db);
71	71
72	72	dol_fiche_head(null, '', '');
73	73
74	74	// Cree l'objet formulaire mail
75		- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
	75	+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
76	76	$formmail = new FormMail($db);
77	77	$formmail->withform = -1;
78		- $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
	78	+ $formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
79	79
80	80	if ($formmail->fromtype === 'user')
81	81	{
82	82	$formmail->fromid = $user->id;
83	83	}
84	84	$formmail->trackid = $trackid;
85		- if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
	85	+ if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
86	86	{
87		- include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
	87	+ include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
88	88	$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
89	89	}
90	90	$formmail->withfrom = 1;
		@@ -112,9 +112,9 @@ discard block
		block discarded – undo
112	112	$formmail->withtoreadonly = 1;
113	113	}
114	114
115		- $formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 \|\| empty($liste))? 0 : ((GETPOST('oneemailperrecipient')=='on')?1:-1);
116		- $formmail->withto = empty($liste)?(GETPOST('sendto','alpha')?GETPOST('sendto','alpha'):array()):$liste;
117		- $formmail->withtofree = empty($liste)?1:0;
	115	+ $formmail->withoptiononeemailperrecipient = (count($listofselectedref) == 1 \|\| empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
	116	+ $formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
	117	+ $formmail->withtofree = empty($liste) ? 1 : 0;
118	118	$formmail->withtocc = 1;
119	119	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
120	120	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
		@@ -132,8 +132,8 @@ discard block
		block discarded – undo
132	132	// Make substitution in email content
133	133	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
134	134	$substitutionarray['__EMAIL__'] = $sendto;
135		- $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"/>' : '';
136		- $substitutionarray['__PERSONALIZED__'] = ''; // deprecated
	135	+ $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"/>' : '';
	136	+ $substitutionarray['__PERSONALIZED__'] = ''; // deprecated
137	137	$substitutionarray['__CONTACTCIVNAME__'] = '';
138	138
139	139	$parameters = array(
		@@ -150,11 +150,11 @@ discard block
		block discarded – undo
150	150	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
151	151	$formmail->param['id'] = join(',', $arrayofselected);
152	152	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
153		- if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
	153	+ if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
154	154	{
155	155	$langs->load("errors");
156		- print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
157		- print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
	156	+ print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
	157	+ print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
158	158	$arrayofmassactions = array();
159	159	}
160	160	else

		@@ -1,19 +1,19 @@
		block discarded – undo
1	1	<?php
2	2
3	3	// Protection to avoid direct call of template
4		-if (empty($conf) \|\| ! is_object($conf))
	4	+if (empty($conf) \|\| !is_object($conf))
5	5	{
6	6	print "Error, template page can't be called as URL";
7	7	exit;
8	8	}
9	9
10	10	// Loop to complete $param for extrafields
11		-if (! empty($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
	11	+if (!empty($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
12	12	{
13	13	foreach ($search_array_options as $key => $val)
14	14	{
15		- $crit=$val;
16		- $tmpkey=preg_replace('/search_options_/','',$key);
17		- if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
	15	+ $crit = $val;
	16	+ $tmpkey = preg_replace('/search_options_/', '', $key);
	17	+ if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
18	18	}
19	19	}

		@@ -26,7 +26,7 @@
		block discarded – undo
26	26	*/
27	27
28	28	// Protection to avoid direct call of template
29		-if (empty($conf) \|\| ! is_object($conf))
	29	+if (empty($conf) \|\| !is_object($conf))
30	30	{
31	31	print "Error, template page can't be called as URL";
32	32	exit;

		@@ -1,28 +1,28 @@
		block discarded – undo
1	1	<?php
2	2
3	3	// Protection to avoid direct call of template
4		-if (empty($conf) \|\| ! is_object($conf))
	4	+if (empty($conf) \|\| !is_object($conf))
5	5	{
6	6	print "Error, template page can't be called as URL";
7	7	exit;
8	8	}
9	9
10		-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
	10	+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
11	11
12	12	// Loop to show all columns of extrafields for the title line
13		-if (! empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
	13	+if (!empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
14	14	{
15	15	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
16	16	{
17		- foreach($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
	17	+ foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
18	18	{
19		- if (! empty($arrayfields["ef.".$key]['checked']))
	19	+ if (!empty($arrayfields["ef.".$key]['checked']))
20	20	{
21		- $align=$extrafields->getAlignFlag($key);
	21	+ $align = $extrafields->getAlignFlag($key);
22	22	$sortonfield = "ef.".$key;
23		- if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
	23	+ if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';
24	24	if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
25		- else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
	25	+ else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'"' : ''), $sortfield, $sortorder)."\n";
26	26	}
27	27	}
28	28	}

		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	*/
24	24
25	25	// Protection to avoid direct call of template
26		-if (empty($conf) \|\| ! is_object($conf))
	26	+if (empty($conf) \|\| !is_object($conf))
27	27	{
28	28	print "Error, template page can't be called as URL";
29	29	exit;
		@@ -35,12 +35,12 @@ discard block
		block discarded – undo
35	35
36	36	$object->fields = dol_sort_array($object->fields, 'position');
37	37
38		-foreach($object->fields as $key => $val)
	38	+foreach ($object->fields as $key => $val)
39	39	{
40	40	// Discard if extrafield is a hidden field on form
41	41	if (abs($val['visible']) != 1) continue;
42	42
43		- if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue; // We don't want this field
	43	+ if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
44	44
45	45	print '<tr id="field_'.$key.'">';
46	46	print '<td';
		@@ -50,8 +50,8 @@ discard block
		block discarded – undo
50	50	print '"';
51	51	print '>';
52	52	print $langs->trans($val['label']);
53		- if(!empty($val['help'])){
54		- print $form->textwithpicto('',$langs->trans($val['help']));
	53	+ if (!empty($val['help'])) {
	54	+ print $form->textwithpicto('', $langs->trans($val['help']));
55	55	}
56	56	print '</td>';
57	57	print '<td>';

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	*/
17	17
18	18	// Protection to avoid direct call of template
19		-if (empty($conf) \|\| ! is_object($conf))
	19	+if (empty($conf) \|\| !is_object($conf))
20	20	{
21	21	print "Error, template page can't be called as URL";
22	22	exit;
		@@ -28,23 +28,23 @@ discard block
		block discarded – undo
28	28
29	29	// Url list
30	30	print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
31		-print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount",$servicename).':<br>';
32		-print '<strong>'.getOnlinePaymentUrl(1,'free')."</strong><br><br>\n";
33		-if (! empty($conf->commande->enabled))
	31	+print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':<br>';
	32	+print '<strong>'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
	33	+if (!empty($conf->commande->enabled))
34	34	{
35		- print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder",$servicename).':<br>';
36		- print '<strong>'.getOnlinePaymentUrl(1,'order')."</strong><br>\n";
37		- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
	35	+ print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
	36	+ print '<strong>'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
	37	+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
38	38	{
39	39	$langs->load("orders");
40	40	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
41		- print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Order")).': ';
42		- print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref','alpha').'" size="10">';
	41	+ print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
	42	+ print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
43	43	print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
44		- if (GETPOST('generate_order_ref','alpha'))
	44	+ if (GETPOST('generate_order_ref', 'alpha'))
45	45	{
46	46	print '<br> -> <strong>';
47		- $url=getOnlinePaymentUrl(0,'order',GETPOST('generate_order_ref','alpha'));
	47	+ $url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
48	48	print $url;
49	49	print "</strong><br>\n";
50	50	}
		@@ -52,21 +52,21 @@ discard block
		block discarded – undo
52	52	}
53	53	print '<br>';
54	54	}
55		-if (! empty($conf->facture->enabled))
	55	+if (!empty($conf->facture->enabled))
56	56	{
57		- print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice",$servicename).':<br>';
58		- print '<strong>'.getOnlinePaymentUrl(1,'invoice')."</strong><br>\n";
59		- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
	57	+ print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
	58	+ print '<strong>'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
	59	+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
60	60	{
61	61	$langs->load("bills");
62	62	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
63		- print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Invoice")).': ';
64		- print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref','alpha').'" size="10">';
	63	+ print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
	64	+ print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
65	65	print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
66		- if (GETPOST('generate_invoice_ref','alpha'))
	66	+ if (GETPOST('generate_invoice_ref', 'alpha'))
67	67	{
68	68	print '<br> -> <strong>';
69		- $url=getOnlinePaymentUrl(0,'invoice',GETPOST('generate_invoice_ref','alpha'));
	69	+ $url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
70	70	print $url;
71	71	print "</strong><br>\n";
72	72	}
		@@ -74,21 +74,21 @@ discard block
		block discarded – undo
74	74	}
75	75	print '<br>';
76	76	}
77		-if (! empty($conf->contrat->enabled))
	77	+if (!empty($conf->contrat->enabled))
78	78	{
79		- print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine",$servicename).':<br>';
80		- print '<strong>'.getOnlinePaymentUrl(1,'contractline')."</strong><br>\n";
81		- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
	79	+ print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
	80	+ print '<strong>'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
	81	+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
82	82	{
83	83	$langs->load("contracts");
84	84	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
85		- print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("ContractLine")).': ';
86		- print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref','alpha').'" size="10">';
	85	+ print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
	86	+ print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
87	87	print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
88	88	if (GETPOST('generate_contract_ref'))
89	89	{
90	90	print '<br> -> <strong>';
91		- $url=getOnlinePaymentUrl(0,'contractline',GETPOST('generate_contract_ref','alpha'));
	91	+ $url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
92	92	print $url;
93	93	print "</strong><br>\n";
94	94	}
		@@ -96,21 +96,21 @@ discard block
		block discarded – undo
96	96	}
97	97	print '<br>';
98	98	}
99		-if (! empty($conf->adherent->enabled))
	99	+if (!empty($conf->adherent->enabled))
100	100	{
101		- print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription",$servicename).':<br>';
102		- print '<strong>'.getOnlinePaymentUrl(1,'membersubscription')."</strong><br>\n";
103		- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
	101	+ print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
	102	+ print '<strong>'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
	103	+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
104	104	{
105	105	$langs->load("members");
106	106	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
107		- print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Member")).': ';
108		- print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref','alpha').'" size="10">';
	107	+ print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
	108	+ print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
109	109	print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
110	110	if (GETPOST('generate_member_ref'))
111	111	{
112	112	print '<br> -> <strong>';
113		- $url=getOnlinePaymentUrl(0,'membersubscription',GETPOST('generate_member_ref','alpha'));
	113	+ $url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
114	114	print $url;
115	115	print "</strong><br>\n";
116	116	}
		@@ -118,21 +118,21 @@ discard block
		block discarded – undo
118	118	}
119	119	print '<br>';
120	120	}
121		-if (! empty($conf->don->enabled))
	121	+if (!empty($conf->don->enabled))
122	122	{
123		- print img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation",$servicename).':<br>';
124		- print '<strong>'.getOnlinePaymentUrl(1,'donation')."</strong><br>\n";
125		- if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
	123	+ print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
	124	+ print '<strong>'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
	125	+ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
126	126	{
127	127	$langs->load("members");
128	128	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
129		- print $langs->trans("EnterRefToBuildUrl",$langs->transnoentitiesnoconv("Don")).': ';
130		- print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref','alpha').'" size="10">';
	129	+ print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
	130	+ print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
131	131	print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
132	132	if (GETPOST('generate_donation_ref'))
133	133	{
134	134	print '<br> -> <strong>';
135		- $url=getOnlinePaymentUrl(0,'donation',GETPOST('generate_donation_ref','alpha'));
	135	+ $url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
136	136	print $url;
137	137	print "</strong><br>\n";
138	138	}
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141	print '<br>';
142	142	}
143	143
144		-if (! empty($conf->use_javascript_ajax))
	144	+if (!empty($conf->use_javascript_ajax))
145	145	{
146	146	print "\n".'<script type="text/javascript">';
147	147	print '$(document).ready(function () {

		@@ -1,33 +1,33 @@
		block discarded – undo
1	1	<?php
2	2
3	3	// Protection to avoid direct call of template
4		-if (empty($conf) \|\| ! is_object($conf))
	4	+if (empty($conf) \|\| !is_object($conf))
5	5	{
6	6	print "Error, template page can't be called as URL";
7	7	exit;
8	8	}
9	9
10		-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
	10	+if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
11	11
12	12	// Loop to complete the sql search criterias from extrafields
13		-if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
	13	+if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
14	14	{
15	15	foreach ($search_array_options as $key => $val)
16	16	{
17		- $crit=$val;
18		- $tmpkey=preg_replace('/search_options_/','',$key);
19		- $typ=$extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
	17	+ $crit = $val;
	18	+ $tmpkey = preg_replace('/search_options_/', '', $key);
	19	+ $typ = $extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
20	20
21	21	if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
22	22	{
23	23	$sql .= " AND ef.".$tmpkey." = '".$db->idate($crit)."'";
24	24	}
25		- elseif ($crit != '' && (! in_array($typ, array('select','sellist')) \|\| $crit != '0') && (! in_array($typ, array('link')) \|\| $crit != '-1'))
	25	+ elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) \|\| $crit != '0') && (!in_array($typ, array('link')) \|\| $crit != '-1'))
26	26	{
27		- $mode_search=0;
28		- if (in_array($typ, array('int','double','real'))) $mode_search=1; // Search on a numeric
29		- if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2; // Search on a foreign key int
30		- if (in_array($typ, array('chkbxlst','checkbox'))) $mode_search=4; // Search on a multiselect field with sql type = text
	27	+ $mode_search = 0;
	28	+ if (in_array($typ, array('int', 'double', 'real'))) $mode_search = 1; // Search on a numeric
	29	+ if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
	30	+ if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search = 4; // Search on a multiselect field with sql type = text
31	31
32	32	$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
33	33	}

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	*/
18	18
19	19	// Protection to avoid direct call of template
20		-if (empty($conf) \|\| ! is_object($conf))
	20	+if (empty($conf) \|\| !is_object($conf))
21	21	{
22	22	print "Error, template page can't be called as URL";
23	23	exit;
		@@ -29,32 +29,32 @@ discard block
		block discarded – undo
29	29	header('Cache-Control: Public, must-revalidate');
30	30	header("Content-type: text/html; charset=".$conf->file->character_set_client);
31	31
32		-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu=1;
33		-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu=1;
34		-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1;
35		-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1;
36		-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
	32	+if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu = 1;
	33	+if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu = 1;
	34	+if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen = 1;
	35	+if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover = 1;
	36	+if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile = 1;
37	37
38	38	// If we force to use jmobile, then we reenable javascript
39		-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
	39	+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
40	40
41	41	$php_self = $_SERVER['PHP_SELF'];
42		-$php_self.= dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'';
	42	+$php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
43	43
44		-$titleofpage=$langs->trans('SendNewPassword');
	44	+$titleofpage = $langs->trans('SendNewPassword');
45	45
46	46	print top_htmlhead('', $titleofpage);
47	47
48	48
49		-$colorbackhmenu1='60,70,100'; // topmenu
50		-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
51		-$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);
52		-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
	49	+$colorbackhmenu1 = '60,70,100'; // topmenu
	50	+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
	51	+$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);
	52	+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
53	53
54	54	?>
55	55	<!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
56	56
57		-<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).'\')"'; ?>>
	57	+<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).'\')"'; ?>>
58	58
59	59	<?php if (empty($conf->dol_use_jmobile)) { ?>
60	60	<script type="text/javascript">
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	<?php } ?>
67	67
68	68
69		-<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));"':'' ?>>
	69	+<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));"' : '' ?>>
70	70	<div class="login_vertical_align">
71	71
72	72	<form id="login" name="login" method="POST" action="<?php echo $php_self; ?>">
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	</div>
111	111
112	112	<?php
113		-if (! empty($morelogincontent)) {
	113	+if (!empty($morelogincontent)) {
114	114	if (is_array($morelogincontent)) {
115	115	foreach ($morelogincontent as $format => $option)
116	116	{
		@@ -129,9 +129,9 @@ discard block
		block discarded – undo
129	129
130	130	<?php if ($captcha) {
131	131	// Add a variable param to force not using cache (jmobile)
132		- $php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self); // Remove param time
133		- if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
134		- else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
	132	+ $php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
	133	+ if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
	134	+ else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
135	135	?>
136	136	<!-- Captcha -->
137	137	<div class="trinputlogin">
		@@ -167,11 +167,11 @@ discard block
		block discarded – undo
167	167	<br>
168	168	<div align="center" style="margin-top: 15px;">
169	169	<?php
170		- $moreparam='';
171		- if (! empty($conf->dol_hide_topmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
172		- if (! empty($conf->dol_hide_leftmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
173		- if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
174		- if (! empty($conf->dol_use_jmobile)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile;
	170	+ $moreparam = '';
	171	+ if (!empty($conf->dol_hide_topmenu)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
	172	+ if (!empty($conf->dol_hide_leftmenu)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
	173	+ if (!empty($conf->dol_no_mouse_hover)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
	174	+ if (!empty($conf->dol_use_jmobile)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$conf->dol_use_jmobile;
175	175
176	176	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
177	177	?>
		@@ -184,12 +184,12 @@ discard block
		block discarded – undo
184	184	</form>
185	185
186	186
187		-<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND)?'':' backgroundsemitransparent'; ?>" style="max-width: 70%">
188		-<?php if ($mode == 'dolibarr' \|\| ! $disabled) { ?>
	187	+<div class="center login_main_home divpasswordmessagedesc paddingtopbottom<?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent'; ?>" style="max-width: 70%">
	188	+<?php if ($mode == 'dolibarr' \|\| !$disabled) { ?>
189	189	<span class="passwordmessagedesc">
190	190	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
191	191	</span>
192		-<?php }else{ ?>
	192	+<?php } else { ?>
193	193	<div class="warning" align="center">
194	194	<?php echo $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode); ?>
195	195	</div>
		@@ -201,11 +201,11 @@ discard block
		block discarded – undo
201	201
202	202	<?php if ($message) { ?>
203	203	<div class="center login_main_message">
204		- <?php echo dol_htmloutput_mesg($message,'','',1); ?>
	204	+ <?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
205	205	</div>
206	206	<?php } ?>
207	207
208		-<?php if (! empty($morelogincontent) && is_array($morelogincontent)) {
	208	+<?php if (!empty($morelogincontent) && is_array($morelogincontent)) {
209	209	foreach ($morelogincontent as $format => $option)
210	210	{
211	211	if ($format == 'js') {
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	}
215	215	}
216	216	}
217		-else if (! empty($moreloginextracontent)) {
	217	+else if (!empty($moreloginextracontent)) {
218	218	echo '<!-- Javascript by hook -->';
219	219	echo $moreloginextracontent;
220	220	}

alxarafe / alixar

Push — master ( 8f7a8e...7e4a07 )

Status

Category

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch