diff options
Diffstat (limited to 'actions/user')
| -rw-r--r-- | actions/user/default_access.php | 8 | ||||
| -rw-r--r-- | actions/user/requestnewpassword.php | 20 | ||||
| -rw-r--r-- | actions/user/spotlight.php | 28 |
3 files changed, 28 insertions, 28 deletions
diff --git a/actions/user/default_access.php b/actions/user/default_access.php index 0f062ed19..b79200ad0 100644 --- a/actions/user/default_access.php +++ b/actions/user/default_access.php @@ -9,8 +9,8 @@ */ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - global $CONFIG;
-
+ global $CONFIG; + if ($CONFIG->allow_user_default_access) { gatekeeper(); @@ -25,7 +25,7 @@ $user = get_entity($user_id); if ($user) - {
+ { $current_default_access = $user->getPrivateSetting('elgg_default_access'); if ($default_access != $current_default_access) { @@ -36,7 +36,7 @@ } } else - register_error(elgg_echo('user:default_access:fail'));
+ register_error(elgg_echo('user:default_access:fail')); } //forward($_SERVER['HTTP_REFERER']); diff --git a/actions/user/requestnewpassword.php b/actions/user/requestnewpassword.php index 2dff5f34d..a54e71b7e 100644 --- a/actions/user/requestnewpassword.php +++ b/actions/user/requestnewpassword.php @@ -14,26 +14,26 @@ action_gatekeeper(); $username = get_input('username'); -
- $access_status = access_get_show_hidden_status();
+ + $access_status = access_get_show_hidden_status(); access_show_hidden_entities(true); $user = get_user_by_username($username); if ($user) - {
+ { if ($user->validated) { if (send_new_password_request($user->guid)) system_message(elgg_echo('user:password:resetreq:success')); else - register_error(elgg_echo('user:password:resetreq:fail'));
- } else if (!trigger_plugin_hook('unvalidated_requestnewpassword','user',array('entity'=>$user))) {
- // if plugins have not registered an action, the default action is to
- // trigger the validation event again and assume that the validation
- // event will display an appropriate message
- trigger_elgg_event('validate', 'user', $user);
+ register_error(elgg_echo('user:password:resetreq:fail')); + } else if (!trigger_plugin_hook('unvalidated_requestnewpassword','user',array('entity'=>$user))) { + // if plugins have not registered an action, the default action is to + // trigger the validation event again and assume that the validation + // event will display an appropriate message + trigger_elgg_event('validate', 'user', $user); } } else - register_error(sprintf(elgg_echo('user:username:notfound'), $username));
+ register_error(sprintf(elgg_echo('user:username:notfound'), $username)); access_show_hidden_entities($access_status); forward(); diff --git a/actions/user/spotlight.php b/actions/user/spotlight.php index b43af2f16..8f50df2c8 100644 --- a/actions/user/spotlight.php +++ b/actions/user/spotlight.php @@ -1,15 +1,15 @@ -<?php
-
- gatekeeper();
-
- $closed = get_input('closed','true');
- if ($closed != 'true') {
- $closed = false;
- } else {
- $closed = true;
- }
-
- $_SESSION['user']->spotlightclosed = $closed;
- exit;
-
+<?php + + gatekeeper(); + + $closed = get_input('closed','true'); + if ($closed != 'true') { + $closed = false; + } else { + $closed = true; + } + + $_SESSION['user']->spotlightclosed = $closed; + exit; + ?>
\ No newline at end of file |