alxarafe / alixar

dolibarr/htdocs/core/tpl/extrafields_list_search_param.tpl.php

Braces +7 added lines, -3 removed lines

@@ -8,12 +8,16 @@
 }
 
 // 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);
 }
+	$tmpkey=preg_replace('/search_options_/','',$key);
+	if ($val != '') {
+	    $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+	}
+	}
 }

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

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

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/extrafields_view.tpl.php

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

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

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

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

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++;
 				  }
 			  }

dolibarr/htdocs/core/tpl/admin_extrafields_edit.tpl.php

Braces +10 added lines, -7 removed lines

@@ -172,8 +172,7 @@ 
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
-}
-elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
+} elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password'))
 {
 	$paramlist=array_keys($param['options']);
 	$param_chain = $paramlist[0];
@@ -204,13 +203,17 @@ 
     foreach($type2label as $key => $val)
     {
         $selected='';
-        if ($key == (GETPOST('type','alpha')?GETPOST('type','alpha'):$type)) $selected=' selected="selected"';
-        if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
-        else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+        if ($key == (GETPOST('type','alpha')?GETPOST('type','alpha'):$type)) {
+            $selected=' selected="selected"';
+        }
+        if (in_array($key, $typewecanchangeinto[$type])) {
+            print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
+        } else {
+            print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+        }
     }
     print '</select>';
-}
-else
+} else
 {
 	print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';