diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php index 7277fa9f03b..0dd5cf9ce7e 100644 --- a/htdocs/user/admin/group_extrafields.php +++ b/htdocs/user/admin/group_extrafields.php @@ -29,8 +29,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("users"); -$langs->load("admin"); +// Load translation files required by page +$langs->loadLangs(array('users', 'admin')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php index c6b55d760f3..bf704af2003 100644 --- a/htdocs/user/admin/user_extrafields.php +++ b/htdocs/user/admin/user_extrafields.php @@ -28,8 +28,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$langs->load("users"); -$langs->load("admin"); +// Load translation files required by page +$langs->loadLangs(array('users', 'admin')); $extrafields = new ExtraFields($db); $form = new Form($db); diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index ced0e759f31..1764ab5baf4 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -33,9 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -$langs->load("agenda"); -$langs->load("admin"); -$langs->load("other"); +// Load translation files required by page +$langs->loadLangs(array('agenda', 'admin', 'other')); $def = array(); $actiontest=GETPOST('test','alpha'); diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 9356828f884..7f11911a46b 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -36,13 +36,8 @@ if (! empty($conf->holiday->enabled)) require_once DOL_DOCUMENT_ROOT.'/holiday/c if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; if (! empty($conf->salaries->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php'; -$langs->load("companies"); -$langs->load("commercial"); -$langs->load("banks"); -$langs->load("bills"); -$langs->load("trips"); -$langs->load("holiday"); -$langs->load("salaries"); +// Load translation files required by page +$langs->loadLangs(array('companies', 'commercial', 'banks', 'bills', 'trips', 'holiday', 'salaries')); $id = GETPOST('id','int'); $bankid = GETPOST('bankid','int'); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index ddab0daed0c..e58b7154487 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -89,11 +89,8 @@ if (!$canreaduser) { } if ($user->id <> $id && ! $canreaduser) accessforbidden(); -$langs->load("users"); -$langs->load("companies"); -$langs->load("ldap"); -$langs->load("admin"); -$langs->load('hrm'); +// Load translation files required by page +$langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm')); $object = new User($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 51e4364e2ba..16c5b4e0e73 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -25,8 +25,8 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; -$langs->load("users"); -$langs->load("admin"); +// Load translation files required by page +$langs->loadLangs(array('users', 'admin')); $action=GETPOST('action','alpha'); $id=GETPOST('id','int'); diff --git a/htdocs/user/document.php b/htdocs/user/document.php index 9e665bd563b..a917a972ddc 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -$langs->load("users"); -$langs->load('other'); +// Load translation files required by page +$langs->loadLangs(array('users', 'other')); $action=GETPOST('action','aZ09'); $confirm=GETPOST('confirm'); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 11850940f85..47a5a5df9eb 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -42,8 +42,8 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $candisableperms=($user->admin || $user->rights->user->group_advance->delete); } -$langs->load("users"); -$langs->load("other"); +// Load translation files required by page +$langs->loadLangs(array('users', 'other')); $id = GETPOST('id', 'int'); $action = GETPOST('action', 'alpha'); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 2deab4b56a2..bb9d05d59f1 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -29,10 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; -$langs->load("companies"); -$langs->load("ldap"); -$langs->load("users"); -$langs->load("admin"); +// Load translation files required by page +$langs->loadLangs(array('companies', 'ldap', 'users', 'admin')); // Users/Groups management only in master entity if transverse mode if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index c5dcb7a53bd..a76d6efd457 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -39,6 +39,7 @@ if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global- accessforbidden(); } +// Load translation files required by page $langs->load("users"); $sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml')); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index ef5d286ca11..c1f8d1fe5b0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -$langs->load("users"); -$langs->load("admin"); +// Load translation files required by page +$langs->loadLangs(array('users', 'admin')); $id=GETPOST('id','int'); $action=GETPOST('action', 'alpha'); diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index 930e911afaa..0b1842dabde 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; if (! $user->rights->user->user->lire && ! $user->admin) accessforbidden(); -$langs->load("users"); -$langs->load("companies"); +// Load translation files required by page +$langs->loadLangs(array('users', 'companies')); // Security check (for external users) $socid=0; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 64162d47a8f..5dbec430687 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -33,6 +33,7 @@ if (! $user->rights->user->user->lire && ! $user->admin) exit; } +// Load translation files required by page $langs->load("users"); $canreadperms=true; diff --git a/htdocs/user/info.php b/htdocs/user/info.php index 9e349675625..19ecf15eb65 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +// Load translation files required by page $langs->load("users"); // Security check diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 79a1fd38bb5..4f9eac61d9f 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -27,10 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; -$langs->load("users"); -$langs->load("admin"); -$langs->load("companies"); -$langs->load("ldap"); +// Load translation files required by page +$langs->loadLangs(array('users', 'admin', 'companies', 'ldap')); $id = GETPOST('id', 'int'); $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'userldap'; // To manage different context of search diff --git a/htdocs/user/list.php b/htdocs/user/list.php index b3b0ff91ff8..77e52f1f6a2 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -30,9 +30,8 @@ require '../main.inc.php'; if (! $user->rights->user->user->lire && ! $user->admin) accessforbidden(); -$langs->load("users"); -$langs->load("companies"); -$langs->load('hrm'); + // Load translation files required by page +$langs->loadLangs(array('users', 'companies', 'hrm')); $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'userlist'; // To manage different context of search diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 2f027f38504..5b787ded7b0 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -31,10 +31,8 @@ $id = GETPOST('id','int'); $action = GETPOST('action','aZ09'); $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'usernote'; // To manage different context of search -$langs->load("companies"); -$langs->load("members"); -$langs->load("bills"); -$langs->load("users"); +// Load translation files required by page +$langs->loadLangs(array('companies', 'members', 'bills', 'users')); $object = new User($db); $object->fetch($id, '', '', 1); diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index 2bcf4fc0663..cac9a3d476b 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -31,10 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php'; -$langs->load("companies"); -$langs->load("mails"); -$langs->load("admin"); -$langs->load("other"); +// Load translation files required by page +$langs->loadLangs(array('companies', 'mails', 'admin', 'other')); $id = GETPOST("id",'int'); $action = GETPOST('action','aZ09'); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index c797a11ccad..b0473e15c49 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -27,13 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; -$langs->load("companies"); -$langs->load("products"); -$langs->load("admin"); -$langs->load("users"); -$langs->load("languages"); -$langs->load("projects"); -$langs->load("members"); +// Load translation files required by page +$langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members')); // Defini si peux lire/modifier permisssions $canreaduser=($user->admin || $user->rights->user->user->lire); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 584fa6f2427..cf13529d23a 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -31,11 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; -$langs->load("errors"); -$langs->load("users"); -$langs->load("companies"); -$langs->load("ldap"); -$langs->load("other"); +// Load translation files required by page +$langs->loadLangs(array('errors', 'users', 'companies', 'ldap', 'other')); // Security check if (! empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 77277b54102..0a8e2bbbb80 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -$langs->load("users"); -$langs->load("admin"); +// Load translation files required by page +$langs->loadLangs(array('users', 'admin')); $id=GETPOST('id', 'int'); $action=GETPOST('action', 'alpha');