diff options
Diffstat (limited to 'modules/user.module')
| -rw-r--r-- | modules/user.module | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/modules/user.module b/modules/user.module index 669a244d7..35c8fcf61 100644 --- a/modules/user.module +++ b/modules/user.module @@ -427,15 +427,11 @@ function user_block($op = "list", $delta = 0) { break; case 1: if ($user->uid) { - $output = "<div class=\"user-information-block\">\n"; - $output .= theme("theme_menu_list", module_invoke_all("link", "menu.create")); - $output .= theme("theme_menu_list", module_invoke_all("link", "menu.view")); - $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings")); - $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc")); - $output .= "</div>\n"; $block["subject"] = $user->name; - $block["content"] = "<div class=\"user-login-link\">$output</div>"; + menu_build("system"); + $block["content"] .= "<div id=\"menu\">". menu_tree()."</div>"; + return $block; } break; @@ -472,35 +468,27 @@ function user_link($type) { $links[] = l(t("user account"), "user", array("title" => t("Create a user account, request a new password or edit your account settings."))); } - if ($type == "menu.settings") { - $links[] = l(t("edit account"), "user/edit", array("title" => t("View and edit your account information."))); - } - - if ($type == "menu.misc") { - if (user_access("access administration pages")) { - $links[] = l(t("administer %a", array("%a" => variable_get("site_name", "drupal"))), "admin", array("title" => t("Access administration pages."))); - } - - $links[] = l(t("logout"), "user/logout", array("title" => t("Logout."))); - } - - if ($type == "admin" && user_access("administer users")) { - menu("admin/user", "user management", "user_admin", user_help("admin/user"), 2); - menu("admin/user/create", "create new account", "user_admin", user_help("admin/user/create"), 1); - menu("admin/user/account", "view user accounts", "user_admin", user_help("admin/user/account"), 2); - menu("admin/user/access", "access rules", NULL, user_help("admin/user/access"), 3); - menu("admin/user/access/mail", "e-mail rules", "user_admin", user_help("admin/user/access/mail")); - menu("admin/user/access/user", "username rules", "user_admin", user_help("admin/user/access/user")); - menu("admin/user/role", "user roles", "user_admin", user_help("admin/user/role"), 4); - menu("admin/user/permission", "user permissions", "user_admin", user_help("admin/user/permission"), 5); - menu("admin/user/search", "search accounts", "user_admin", user_help("admin/user/search"), 8); - menu("admin/user/help", "help", "user_help", NULL, 9); - menu("admin/user/edit", "edit user account", "user_admin", NULL, 0, 1); // hidden menu - menu("admin/user/account/1", "blocked users", "user_admin", user_help("admin/user/account/1"), 3); - - $i = 2; - foreach (user_roles(1) as $key => $value) { - menu("admin/user/account/". $i++, "users with role '$value'", "user_admin", NULL, 4); + if ($type == "system") { + menu("user/edit", t("edit account"), NULL, NULL, 8); + menu("user/logout", t("logout"), NULL, NULL, 10); + if (user_access("administer users")) { + menu("admin/user", "user management", "user_admin", user_help("admin/user"), 2); + menu("admin/user/create", "create new account", "user_admin", user_help("admin/user/create"), 1); + menu("admin/user/account", "view user accounts", "user_admin", user_help("admin/user/account"), 2); + menu("admin/user/access", "access rules", NULL, user_help("admin/user/access"), 3); + menu("admin/user/access/mail", "e-mail rules", "user_admin", user_help("admin/user/access/mail")); + menu("admin/user/access/user", "username rules", "user_admin", user_help("admin/user/access/user")); + menu("admin/user/role", "user roles", "user_admin", user_help("admin/user/role"), 4); + menu("admin/user/permission", "user permissions", "user_admin", user_help("admin/user/permission"), 5); + menu("admin/user/search", "search accounts", "user_admin", user_help("admin/user/search"), 8); + menu("admin/user/help", "help", "user_help", NULL, 9); + menu("admin/user/edit", "edit user account", "user_admin", NULL, 0, 1); // hidden menu + menu("admin/user/account/1", "blocked users", "user_admin", user_help("admin/user/account/1"), 3); + + $i = 2; + foreach (user_roles(1) as $key => $value) { + menu("admin/user/account/". $i++, "users with role '$value'", "user_admin", NULL, 4); + } } } |