aboutsummaryrefslogtreecommitdiff
path: root/actions/user
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-08-31 19:05:21 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-08-31 19:05:21 +0000
commitc5cc2821311012a8a4385a304a043c4b41f2afbb (patch)
tree3703351e4b5d56905eb52547d6129ffa14cb2a32 /actions/user
parent775a5f08c501acc565c69659022bc31052677485 (diff)
downloadelgg-c5cc2821311012a8a4385a304a043c4b41f2afbb.tar.gz
elgg-c5cc2821311012a8a4385a304a043c4b41f2afbb.tar.bz2
All line endings are now Unix-style.
git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions/user')
-rw-r--r--actions/user/default_access.php8
-rw-r--r--actions/user/requestnewpassword.php20
-rw-r--r--actions/user/spotlight.php28
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