diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-09-26 23:05:14 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-09-26 23:05:14 +0000 |
| commit | 0ff789c61d1c2ed332064d1af928fb3dfb4800af (patch) | |
| tree | 25954cee35e9a5cff3018bcef4a162e61850dd63 /modules/user.module | |
| parent | 36b90c05e30db562b52f4b278e418e6605fcb4b9 (diff) | |
| download | brdo-0ff789c61d1c2ed332064d1af928fb3dfb4800af.tar.gz brdo-0ff789c61d1c2ed332064d1af928fb3dfb4800af.tar.bz2 | |
- Patch by Kjartan:
+ Fixed CSS to use the same format as the rest of drupal.css.
+ Added fallback routine for menu icons.
+ Fixed anonymous users not seeing the menu.
+ Added proper access checks for admin and help menu items.
Diffstat (limited to 'modules/user.module')
| -rw-r--r-- | modules/user.module | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/modules/user.module b/modules/user.module index 35c8fcf61..0ec7d834a 100644 --- a/modules/user.module +++ b/modules/user.module @@ -373,7 +373,10 @@ function user_block($op = "list", $delta = 0) { else { switch ($delta) { case 0: - if (!$user->uid) { + if ($user->uid) { + $block["subject"] = $user->name; + } + else { /* ** For usability's sake, avoid showing two login forms on one ** page. @@ -422,18 +425,11 @@ function user_block($op = "list", $delta = 0) { $block["subject"] = t("User login"); $block["content"] = "<div class=\"user-login-link\">$output</div>"; - return $block; } - break; - case 1: - if ($user->uid) { - $block["subject"] = $user->name; - menu_build("system"); - $block["content"] .= "<div id=\"menu\">". menu_tree()."</div>"; - - return $block; - } + menu_build("system"); + $block["content"] .= "<div id=\"menu\">". menu_tree()."</div>"; + return $block; break; case 2: if (user_access("access content")) { @@ -469,8 +465,11 @@ function user_link($type) { } if ($type == "system") { - menu("user/edit", t("edit account"), NULL, NULL, 8); - menu("user/logout", t("logout"), NULL, NULL, 10); + global $user; + if ($user->uid) { + 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); |