From c3dcfd136bea8ec4b627a7d38f618ac97c9ea4a0 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 31 Oct 2009 14:41:55 -0700 Subject: Move the identity provider menu item under the settings menu and make the User/Groups administration a first level menu item. As discussed via -devel mailing list. --- modules/user/helpers/user_event.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'modules/user/helpers/user_event.php') diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php index e3dbacb7..11b9c56c 100644 --- a/modules/user/helpers/user_event.php +++ b/modules/user/helpers/user_event.php @@ -20,11 +20,10 @@ class user_event_Core { static function admin_menu($menu, $theme) { - $menu->get("identity_menu") - ->append(Menu::factory("link") - ->id("users_groups") - ->label(t("Users/Groups")) - ->url(url::site("admin/users"))); + $menu->add_after("appearance_menu", Menu::factory("link") + ->id("users_groups") + ->label(t("Users/Groups")) + ->url(url::site("admin/users"))); return $menu; } -- cgit v1.2.3 From 1c428df9e090b8e7e9dfa3ec5d924b8169190b42 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 31 Oct 2009 16:16:47 -0700 Subject: Revert "Use an event 'check_user_name_exists' to validate the input name is already in use. The parameter is a standard class with the name and an exists flag. Any event handler should or their result with the exists flag." This reverts commit 04bf50bfb4241f7c814782c516732d927ff1f457. --- modules/user/controllers/admin_users.php | 4 +--- modules/user/helpers/user_event.php | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'modules/user/helpers/user_event.php') diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 209ce8ae..54541e90 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -36,9 +36,7 @@ class Admin_Users_Controller extends Admin_Controller { $form = $this->_get_user_add_form_admin(); $valid = $form->validate(); $name = $form->add_user->inputs["name"]->value; - $user_exists_data = (object)array("name" => $name); - module::event("check_username_exists", $user_exists_data); - if ($user_exists_data->exists) { + if ($user = user::lookup_by_name($name)) { $form->add_user->inputs["name"]->add_error("in_use", 1); $valid = false; } diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php index 11b9c56c..cf91812e 100644 --- a/modules/user/helpers/user_event.php +++ b/modules/user/helpers/user_event.php @@ -27,9 +27,4 @@ class user_event_Core { return $menu; } - - static function check_username_exists($data) { - $user = user::lookup_by_name($data->name); - $data->exists |= $user ? true : false; - } } -- cgit v1.2.3