diff --git a/system/Controllers/SettingsController.php b/system/Controllers/SettingsController.php index 7352d77..dfdbe75 100644 --- a/system/Controllers/SettingsController.php +++ b/system/Controllers/SettingsController.php @@ -615,7 +615,7 @@ class SettingsController extends Controller # set navigation active $navigation['Users']['active'] = true; - + return $this->render($response, 'settings/user.twig', array( 'settings' => $settings, 'acl' => $this->c->acl, @@ -624,7 +624,7 @@ class SettingsController extends Controller 'userform' => $userform, // field model, needed to generate frontend-field 'userdata' => $userdata, // needed to fill form with data 'route' => $route->getName() // needed to set link active - )); + )); } public function listUser($request, $response) diff --git a/system/Models/Validation.php b/system/Models/Validation.php index 33c51ab..712c6db 100644 --- a/system/Models/Validation.php +++ b/system/Models/Validation.php @@ -58,8 +58,9 @@ class Validation # checks if username is free when create new user Validator::addRule('userAvailable', function($field, $value, array $params, array $fields) use ($user) { - $userdata = $user->getUser($value); - if($userdata){ return false; } + $activeUser = $user->getUser($value); + $inactiveUser = $user->getUser("_" . $value); + if($activeUser OR $inactiveUser){ return false; } return true; }, 'taken'); diff --git a/system/author/settings/user.twig b/system/author/settings/user.twig index dc9efa1..bfbce1d 100644 --- a/system/author/settings/user.twig +++ b/system/author/settings/user.twig @@ -34,6 +34,15 @@ {% endfor %} + {% if is_role('administrator') %} +
+ {% endif %} +