diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 7b6d57f81a9..a869097f629 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -83,6 +83,7 @@ if ($user->id <> $id && ! $canreaduser) accessforbidden(); $langs->load("users"); $langs->load("companies"); $langs->load("ldap"); +$langs->load("admin"); $object = new User($db); $extrafields = new ExtraFields($db); @@ -824,59 +825,61 @@ if (($action == 'create') || ($action == 'adduserldap')) } print ''; - // API key - $generated_api_key = ''; - require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; - $generated_password=getRandomPassword(false); - print ''.$langs->trans("ApiKey").''; - print ''; - print ''; - if (! empty($conf->use_javascript_ajax)) - print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"'); - print ''; - - // Administrator - if (! empty($user->admin)) - { - print ''.$langs->trans("Administrator").''; + if(! empty($conf->api->enabled)) { + // API key + $generated_api_key = ''; + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; + $generated_password=getRandomPassword(false); + print ''.$langs->trans("ApiKey").''; print ''; - print $form->selectyesno('admin',GETPOST('admin'),1); + print ''; + if (! empty($conf->use_javascript_ajax)) + print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"'); + print ''; - if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode)) + // Administrator + if (! empty($user->admin)) { - if (! empty($conf->use_javascript_ajax)) + print ''.$langs->trans("Administrator").''; + print ''; + print $form->selectyesno('admin',GETPOST('admin'),1); + + if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode)) { - print ''; + if (! empty($conf->use_javascript_ajax)) + { + print ''; + } + $checked=($_POST["superadmin"]?' checked':''); + $disabled=($_POST["superadmin"]?'':' disabled'); + print ' '.$langs->trans("SuperAdministrator"); } - $checked=($_POST["superadmin"]?' checked':''); - $disabled=($_POST["superadmin"]?'':' disabled'); - print ' '.$langs->trans("SuperAdministrator"); + print "\n"; } - print "\n"; } // Type @@ -1270,7 +1273,7 @@ else print ''."\n"; // API key - if($user->admin) { + if(! empty($conf->api->enabled) && $user->admin) { print ''.$langs->trans("ApiKey").''; print ''; if (! empty($object->api_key)) @@ -1849,7 +1852,7 @@ else print "\n"; // API key - if($user->admin) { + if(! empty($conf->api->enabled) && $user->admin) { print ''.$langs->trans("ApiKey").''; print ''; print ''; @@ -2230,7 +2233,7 @@ else } } -if (! empty($conf->use_javascript_ajax)) +if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax)) { print "\n".'