diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php index adf18433caa..bb68ea2182e 100644 --- a/htdocs/admin/expensereport_ik.php +++ b/htdocs/admin/expensereport_ik.php @@ -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_ik.class.php'; -$langs->load('admin'); -$langs->load('other'); -$langs->load('trips'); -$langs->load('errors'); -$langs->load('dict'); +// Load traductions files requiredby by page +$langs->loadLangs(array("admin","trips","errors","other","dict")); if (!$user->admin) accessforbidden(); @@ -129,7 +126,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) if ($Tab['active'] == 0) continue; $tranche=1; - $var = true; + 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)); @@ -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); - echo ''; + echo ''; // Label echo '['.$langs->trans('RangeNum', $tranche++).'] - '.$label.''; @@ -175,7 +172,6 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) echo ''; echo ''; - $var=!$var; } } diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 602b80c3855..21f34f2a770 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -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.'/compta/bank/class/account.class.php'; -$langs->load("admin"); -$langs->load("withdrawals"); +// Load traductions files requiredby by page +$langs->loadLangs(array("admin","withdrawals")); // Security check if (!$user->admin) accessforbidden(); @@ -417,7 +417,6 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION)) if ($resql) { $num = $db->num_rows($resql); - $var = true; $i = 0; while ($i < $num) { diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index e434f669f45..bd2e07ef97d 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -31,8 +31,8 @@ global $conf; if (!$user->admin) accessforbidden(); -$langs->load("admin"); -$langs->load("other"); +// Load traductions files requiredby by page +$langs->loadLangs(array("admin","other")); $error=0; $action = GETPOST('action','aZ09'); @@ -50,7 +50,6 @@ foreach ($dirsyslogs as $reldir) { $handle = opendir($newdir); if (is_resource($handle)) { - $var = true; while (($file = readdir($handle)) !== false) { if (substr($file, 0, 11) == 'mod_syslog_' && substr($file, dol_strlen($file) - 3, 3) == 'php') { diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php index 4040964d2fe..0d1ecd31dd1 100644 --- a/htdocs/admin/ticketsup.php +++ b/htdocs/admin/ticketsup.php @@ -269,7 +269,6 @@ foreach ($dirmodels as $reldir) { if (is_dir($dir)) { $handle = opendir($dir); if (is_resource($handle)) { - $var = true; while (($file = readdir($handle)) !== false) { if (preg_match('/^(mod_.*)\.php$/i', $file, $reg)) { @@ -290,8 +289,7 @@ foreach ($dirmodels as $reldir) { } if ($module->isEnabled()) { - $var = !$var; - print '' . $module->name . "\n"; + print '' . $module->name . "\n"; print $module->info(); print '';