From c22ef109ac55d5bfa8d43df787de3839b8f61460 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 24 Apr 2018 17:42:13 +0200 Subject: [PATCH] clean and add new code --- htdocs/admin/ecm.php | 1 - htdocs/admin/events.php | 11 +++-------- htdocs/admin/expensereport_rules.php | 15 ++++----------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php index 2d8bd936b50..cf1992dce5f 100644 --- a/htdocs/admin/ecm.php +++ b/htdocs/admin/ecm.php @@ -80,7 +80,6 @@ print ' '; print ''.$langs->trans("Value").''."\n"; print ''; -$var=true; $form = new Form($db); // Mail required for members diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index b2d9bd97980..6f4dce93e8c 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -31,9 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php'; if (!$user->admin) accessforbidden(); -$langs->load("users"); -$langs->load("admin"); -$langs->load("other"); +// Load traductions files requiredby by page +$langs->loadLangs(array("users","admin","other")); $action=GETPOST('action','aZ09'); @@ -42,7 +41,6 @@ $securityevent=new Events($db); $eventstolog=$securityevent->eventstolog; - /* * Actions */ @@ -88,8 +86,6 @@ $head=security_prepare_head(); dol_fiche_head($head, 'audit', $langs->trans("Security"), -1); - -$var=true; print ""; print ""; print ""; @@ -98,8 +94,7 @@ print "\n"; foreach ($eventstolog as $key => $arr) { if ($arr['id']) - { - + { print ''; print ''; print ''; echo ''; - $var=true; - echo ''; + echo ''; echo ''; echo ''; echo ''; -$var=true; foreach ($rules as $rule) { - echo ''; + echo ''; echo ''; - echo ''; echo ''; - $var=!$var; }
".$langs->trans("LogEvents")."
'.$arr['id'].''; diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index bf615676f81..ef915e196a2 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.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_rule.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","other","trips","errors","dict")); if (!$user->admin) accessforbidden(); @@ -176,8 +173,7 @@ if ($action != 'edit') echo ' 
'; echo '
'.$form->selectarray('apply_to', $tab_apply, '', 0).'
'; echo '
'.$form->select_dolusers('', 'fk_user').'
'; @@ -220,10 +216,9 @@ echo '
'.$langs->trans('ExpenseReportRestrictive').' 
'; if ($action == 'edit' && $object->id == $rule->id) @@ -260,7 +255,6 @@ foreach ($rules as $rule) echo ''; if ($action == 'edit' && $object->id == $rule->id) { @@ -335,7 +329,6 @@ foreach ($rules as $rule) echo '