clean and update code

This commit is contained in:
Philippe GRAND 2018-04-20 11:30:40 +02:00
parent 33505411a7
commit 1ebdcae538
4 changed files with 9 additions and 17 deletions

View File

@ -30,11 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
$langs->load('admin'); // Load traductions files requiredby by page
$langs->load('other'); $langs->loadLangs(array("admin","trips","errors","other","dict"));
$langs->load('trips');
$langs->load('errors');
$langs->load('dict');
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
@ -129,7 +126,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
if ($Tab['active'] == 0) continue; if ($Tab['active'] == 0) continue;
$tranche=1; $tranche=1;
$var = true;
foreach ($Tab['ranges'] as $k => $range) foreach ($Tab['ranges'] as $k => $range)
{ {
if (isset($Tab['ranges'][$k+1])) $label = $langs->trans('expenseReportRangeFromTo', $range->range_ik, ($Tab['ranges'][$k+1]->range_ik-1)); if (isset($Tab['ranges'][$k+1])) $label = $langs->trans('expenseReportRangeFromTo', $range->range_ik, ($Tab['ranges'][$k+1]->range_ik-1));
@ -137,7 +134,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
if ($range->range_active == 0) $label = $form->textwithpicto($label, $langs->trans('expenseReportRangeDisabled'), 1, 'help', '', 0, 3); if ($range->range_active == 0) $label = $form->textwithpicto($label, $langs->trans('expenseReportRangeDisabled'), 1, 'help', '', 0, 3);
echo '<tr '.$bc[$var].'>'; echo '<tr class="oddeven">';
// Label // Label
echo '<td width="20%"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>'; echo '<td width="20%"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>';
@ -175,7 +172,6 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
$var=!$var;
} }
} }

View File

@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.p
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("admin"); // Load traductions files requiredby by page
$langs->load("withdrawals"); $langs->loadLangs(array("admin","withdrawals"));
// Security check // Security check
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
@ -417,7 +417,6 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$var = true;
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {

View File

@ -31,8 +31,8 @@ global $conf;
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
$langs->load("admin"); // Load traductions files requiredby by page
$langs->load("other"); $langs->loadLangs(array("admin","other"));
$error=0; $error=0;
$action = GETPOST('action','aZ09'); $action = GETPOST('action','aZ09');
@ -50,7 +50,6 @@ foreach ($dirsyslogs as $reldir) {
$handle = opendir($newdir); $handle = opendir($newdir);
if (is_resource($handle)) { if (is_resource($handle)) {
$var = true;
while (($file = readdir($handle)) !== false) { while (($file = readdir($handle)) !== false) {
if (substr($file, 0, 11) == 'mod_syslog_' && substr($file, dol_strlen($file) - 3, 3) == 'php') { if (substr($file, 0, 11) == 'mod_syslog_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {

View File

@ -269,7 +269,6 @@ foreach ($dirmodels as $reldir) {
if (is_dir($dir)) { if (is_dir($dir)) {
$handle = opendir($dir); $handle = opendir($dir);
if (is_resource($handle)) { if (is_resource($handle)) {
$var = true;
while (($file = readdir($handle)) !== false) { while (($file = readdir($handle)) !== false) {
if (preg_match('/^(mod_.*)\.php$/i', $file, $reg)) { if (preg_match('/^(mod_.*)\.php$/i', $file, $reg)) {
@ -290,8 +289,7 @@ foreach ($dirmodels as $reldir) {
} }
if ($module->isEnabled()) { if ($module->isEnabled()) {
$var = !$var; print '<tr class="oddeven"><td>' . $module->name . "</td><td>\n";
print '<tr ' . $bc[$var] . '><td>' . $module->name . "</td><td>\n";
print $module->info(); print $module->info();
print '</td>'; print '</td>';