aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-26 15:48:28 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-26 15:48:28 +0000
commit31c5b57b92b2b2442527cc601eab113e047b0e93 (patch)
tree7cae2e88ab91dde44dce8fbdaded4e1e977b0cf8 /engine
parent6bb9e16e357eb718e954255b59681d519cda57ae (diff)
downloadelgg-31c5b57b92b2b2442527cc601eab113e047b0e93.tar.gz
elgg-31c5b57b92b2b2442527cc601eab113e047b0e93.tar.bz2
Unified user settings form
git-svn-id: https://code.elgg.org/elgg/trunk@1149 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/notification.php12
-rw-r--r--engine/lib/users.php25
2 files changed, 31 insertions, 6 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index aa2ecbfdd..c5b3cacf1 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -250,7 +250,17 @@
// Add settings view to user settings & register action
extend_elgg_settings_page('notifications/settings/usersettings', 'usersettings/user');
- register_action("notifications/settings/usersettings/save");
+
+ register_plugin_hook('usersettings:save','user','notification_user_settings_save');
+
+ //register_action("notifications/settings/usersettings/save");
+ }
+
+ function notification_user_settings_save() {
+
+ global $CONFIG;
+ @include($CONFIG->path . "actions/notifications/settings/usersettings/save.php");
+
}
// Register a startup event
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 644c5000b..d8fc53f79 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -914,22 +914,37 @@
register_action("friends/add");
register_action("friends/remove");
register_action("email/confirm");
-
+
+ register_action("usersettings/save");
+
// User name change
extend_elgg_settings_page('user/settings/name', 'usersettings/user', 1);
- register_action("user/name");
+ //register_action("user/name");
// User password change
extend_elgg_settings_page('user/settings/password', 'usersettings/user', 1);
- register_action("user/password");
+ //register_action("user/password");
// Add email settings
extend_elgg_settings_page('user/settings/email', 'usersettings/user', 1);
- register_action("email/save");
+ //register_action("email/save");
// Add language settings
extend_elgg_settings_page('user/settings/language', 'usersettings/user', 1);
- register_action("user/language");
+ //register_action("user/language");
+
+ register_plugin_hook('usersettings:save','user','users_settings_save');
+
+ }
+
+ function users_settings_save() {
+
+ global $CONFIG;
+ @include($CONFIG->path . "actions/user/name.php");
+ @include($CONFIG->path . "actions/user/password.php");
+ @include($CONFIG->path . "actions/email/save.php");
+ @include($CONFIG->path . "actions/user/language.php");
+
}
//register actions *************************************************************