summaryrefslogtreecommitdiff
path: root/modules/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-04-15 20:49:42 +0000
committerDries Buytaert <dries@buytaert.net>2004-04-15 20:49:42 +0000
commit10bdb51c37dd832f6bddd3364c19973a7540dda1 (patch)
treeee44dadbbf67e90a9c30bd709888add4c2503c67 /modules/user.module
parenta083daf8418d1dc6e0cbc5b41924c9d364815f9e (diff)
downloadbrdo-10bdb51c37dd832f6bddd3364c19973a7540dda1.tar.gz
brdo-10bdb51c37dd832f6bddd3364c19973a7540dda1.tar.bz2
- Patch by JonBob/Jonathan: reworked the menu system so that menus are
configurable! Menu items can be disabled, repositioned, added and so on. Upgrading to requires you to run update.php. This functionality depricates some of the 'navigation modules' in the contributions repository. Furthermore, modules can now 'suggest' menu items and site adminstrators can choose to enable them. Modules in the contributions repository should try to take advantage of this.
Diffstat (limited to 'modules/user.module')
-rw-r--r--modules/user.module10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/user.module b/modules/user.module
index 01ba43601..e6a940f2c 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -539,8 +539,10 @@ function user_link($type) {
menu("logout", t("log out"), "user_logout", 10);
}
else {
- menu('user', t("my account"), "user_page", 8, MENU_HIDE);
+ menu("user/login", t("log in"), "user_page", 0, MENU_HIDE);
}
+ menu("user/password", t("e-mail new password"), "user_page", 0, MENU_HIDE);
+ menu("user/register", t("create new account"), "user_page", 0, MENU_HIDE);
if (user_access("administer users")) {
menu("admin/user", t("accounts"), "user_admin", 2);
@@ -551,7 +553,7 @@ function user_link($type) {
menu("admin/user/role", t("roles"), "user_admin", 4);
menu("admin/user/permission", t("permissions"), "user_admin", 5);
menu("admin/user/help", t("help"), "user_help_page", 9);
- menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE);
+ menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE, MENU_LOCKED);
if (module_exist('search')) {
menu("admin/user/search", t("search"), "user_admin", 8);
}
@@ -764,7 +766,7 @@ function user_login($edit = array(), $msg = "") {
$output = form_group(t('User login'), $output);
- return form($output, "post", url('user'));
+ return form($output, "post", url('user/login'));
}
function _user_authenticated_id() {
@@ -851,7 +853,7 @@ function user_pass($edit = array()) {
}
$output .= theme("item_list", $items);
$output = form_group(t('Request new password'), $output);
- return form($output, "post", url('user'));
+ return form($output, "post", url('user/password'));
}
}