diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 9efd98622e4..8d22e01b436 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -33,7 +33,7 @@ if (!$user->admin) accessforbidden(); $action = GETPOST('action', 'aZ09'); -if (empty($conf->modules['clicktodial'])) { +if (! in_array('clicktodial', $conf->modules)) { accessforbidden($langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module58Name"))); } diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php index 3efdd05bdc7..c700c2c9cf1 100644 --- a/htdocs/admin/resource.php +++ b/htdocs/admin/resource.php @@ -28,7 +28,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php'; -if (!empty($conf->resouce->enabled)) require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; +require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; // Load translation files required by the page $langs->loadLangs(array("admin", "resource")); diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 0b07e96ab50..96a868c4599 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -22,7 +22,7 @@ /** * \file htdocs/core/lib/usergroups.lib.php - * \brief Ensemble de fonctions de base pour la gestion des utilisaterus et groupes + * \brief Set of function to manage users, groups and permissions */ /** diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index c81e4068558..2b915fbb46f 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -164,7 +164,7 @@ if ($id > 0) } else { - print $form->textwithpicto((empty($object->clicktodial_url) ? $langs->trans("DefaultLink").': ' : '').$url, $langs->trans("ClickToDialUrlDesc")); + print $form->textwithpicto((empty($object->clicktodial_url) ? ''.$langs->trans("DefaultLink").': ' : '').$url, $langs->trans("ClickToDialUrlDesc")); } print ''; print '';