Clean code

htdocs/admin/multicurrency.php

@@ -156,8 +156,9 @@ if ($resql) {
 $form = new Form($db);
 
 $page_name = "MultiCurrencySetup";
+$help_url = '';
 
-llxHeader('', $langs->trans($page_name));
+llxHeader('', $langs->trans($page_name), $help_url);
 
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -165,7 +166,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
 $head = multicurrencyAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency");
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "multicurrency");
 
 
 print '<table class="noborder centpercent">';
@@ -303,7 +304,7 @@ print '<input type="hidden" name="action" value="add_currency">';
 print '<tr class="oddeven">';
 print '<td>'.$form->selectCurrency('', 'code', 1).'</td>';
 print '<td class="right">';
-print '<input type="text" name="rate" value="" size="13" placeholder="'.$langs->trans('Rate').'" />&nbsp;';
+print '<input type="text" name="rate" value="" class="width75 right" placeholder="'.$langs->trans('Rate').'" />&nbsp;';
 print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 print '</td>';
 print '</tr>';
@@ -328,7 +329,7 @@ foreach ($TCurrency as &$currency) {
 	print '<input type="hidden" name="action" value="update_currency">';
 	print '<input type="hidden" name="fk_multicurrency" value="'.$currency->id.'">';
 	print '1 '.$conf->currency.' = ';
-	print '<input type="text" name="rate" value="'.($currency->rate->rate ? $currency->rate->rate : '').'" size="13" />&nbsp;'.$currency->code.'&nbsp;';
+	print '<input type="text" name="rate" class="width75 right" value="'.($currency->rate->rate ? $currency->rate->rate : '').'" size="13">&nbsp;'.$currency->code.'&nbsp;';
 	print '<input type="submit" name="updatecurrency" class="button" value="'.$langs->trans("Modify").'">&nbsp;';
 	print '<input type="submit" name="deletecurrency" class="button" value="'.$langs->trans("Delete").'">';
 	print '</form>';

htdocs/multicurrency/multicurrency_rate.php

@@ -232,7 +232,7 @@ if (empty($reshook)) {
 $htmlother = new FormOther($db);
 
 $title = $langs->trans("CurrencyRate");
-$page_name = "ListCurrencyRate";
+$page_name = "MultiCurrencySetup";
 $help_url = '';
 
 llxHeader('', $title, $help_url, '');
@@ -417,24 +417,24 @@ if ($resql) {
 	print '<tr class="liste_titre_filter">';
 
 	// date
-if (!empty($arrayfields['cr.date_sync']['checked'])) {
-	print '<td class="liste_titre" align="left">';
-	print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
-	print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
-	print '</td>';
-}
-	// code
-if (!empty($arrayfields['m.code']['checked'])) {
-	print '<td class="liste_titre" align="left">';
-	print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
-	print '</td>';
-}
-	// rate
-if (!empty($arrayfields['cr.rate']['checked'])) {
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
-	print '</td>';
-}
+	if (!empty($arrayfields['cr.date_sync']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
+		print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
+		print '</td>';
+	}
+		// code
+	if (!empty($arrayfields['m.code']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
+		print '</td>';
+	}
+		// rate
+	if (!empty($arrayfields['cr.rate']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
+		print '</td>';
+	}
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -469,74 +469,75 @@ if (!empty($arrayfields['cr.rate']['checked'])) {
 
 	$i = 0;
 	$totalarray = array();
-while ($i < min($num, $limit)) {
-	$obj = $db->fetch_object($resql);
-
-	print '<tr class="oddeven">';
-
-	// USER REQUEST UPDATE FOR THIS LINE
-	if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
-		//  var_dump($obj);
-		print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
-		print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-		print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
-
-		print '<td class="center nowrap ">';
-		print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-		print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
-		print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
-		print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
-		print '</td>';
-	} else {
-		// date_sync
-		if (!empty($arrayfields['cr.date_sync']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->date_sync;
-			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-		}
-
-		// code
-		if (! empty($arrayfields['m.code']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->code." ".$obj->name;
-			print "</td>\n";
+	while ($i < min($num, $limit)) {
+		$obj = $db->fetch_object($resql);
+
+		print '<tr class="oddeven">';
+
+		// USER REQUEST UPDATE FOR THIS LINE
+		if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
+			//  var_dump($obj);
+			print ' <td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
+			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
+			print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
+
+			print '<td class="center nowrap ">';
+			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
+			print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
+			print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
+			print '</td>';
+		} else {
+			// date_sync
+			if (!empty($arrayfields['cr.date_sync']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->date_sync;
+				print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+			}
 
-			if (! $i) $totalarray['nbfield']++;
-		}
+			// code
+			if (! empty($arrayfields['m.code']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->code." ".$obj->name;
+				print "</td>\n";
 
-		// rate
-		if (! empty($arrayfields['cr.rate']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print $obj->rate;
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
-		}
+				if (! $i) $totalarray['nbfield']++;
+			}
 
+			// rate
+			if (! empty($arrayfields['cr.rate']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $obj->rate;
+				print "</td>\n";
+				if (! $i) $totalarray['nbfield']++;
+			}
 
-		// Fields from hook
-		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
 
-		// Action
-		print '<td class="nowrap" align="center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+			// Fields from hook
+			$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+
+			// Action
+			print '<td class="nowrap" align="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
 
-		print "</tr>\n";
-		$i++;
+			print "</tr>\n";
+			$i++;
+		}
 	}
 
 	$db->free($resql);