diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin.module | 2 | ||||
| -rw-r--r-- | modules/help.module | 2 | ||||
| -rw-r--r-- | modules/help/help.module | 2 | ||||
| -rw-r--r-- | modules/user.module | 25 | ||||
| -rw-r--r-- | modules/user/user.module | 25 |
5 files changed, 27 insertions, 29 deletions
diff --git a/modules/admin.module b/modules/admin.module index 1f2994d0f..5057c1f60 100644 --- a/modules/admin.module +++ b/modules/admin.module @@ -36,7 +36,7 @@ function admin_system($field){ } function admin_link($type) { - if ($type == "system") { + if ($type == "system" && user_access("access administration pages")) { menu("admin", t("administer %a", array("%a" => variable_get("site_name", "drupal"))) , NULL, NULL, 9); menu("admin/overview", "sitemap", "overview_callback", admin_help("admin/overview"), 8); } diff --git a/modules/help.module b/modules/help.module index 9719ba9e9..cb1bb4a73 100644 --- a/modules/help.module +++ b/modules/help.module @@ -7,7 +7,7 @@ function help_system($field){ } function help_link($type) { - if ($type == "system") { + if ($type == "system" && user_access("access administration pages")) { menu("admin/help/glossary", "glossary", "help_glossary", NULL, 8); menu("admin/help", "help", "help_admin", NULL, 9); } diff --git a/modules/help/help.module b/modules/help/help.module index 9719ba9e9..cb1bb4a73 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -7,7 +7,7 @@ function help_system($field){ } function help_link($type) { - if ($type == "system") { + if ($type == "system" && user_access("access administration pages")) { menu("admin/help/glossary", "glossary", "help_glossary", NULL, 8); menu("admin/help", "help", "help_admin", NULL, 9); } 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); diff --git a/modules/user/user.module b/modules/user/user.module index 35c8fcf61..0ec7d834a 100644 --- a/modules/user/user.module +++ b/modules/user/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); |