1 files changed, 37 insertions, 42 deletions

diff --git a/actions/user/password.php b/actions/user/password.php
index e8d67a87b..d2fcb95d8 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -1,48 +1,43 @@
 <?php
-	/**
-	 * Action for changing a user's password
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Action for changing a user's password
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-	global $CONFIG;
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+global $CONFIG;
 
-	gatekeeper();
-	
-	$password = get_input('password');
-	$password2 = get_input('password2');
-	$user_id = get_input('guid');
-	$user = "";
-	
-	if (!$user_id)
-		$user = $_SESSION['user'];
-	else
-		$user = get_entity($user_id);
-		
-	if (($user) && ($password!=""))
-	{
-		if (strlen($password)>=4)
-		{
-			if ($password == $password2)
-			{
-				$user->salt = generate_random_cleartext_password(); // Reset the salt
-				$user->password = generate_user_password($user, $password);
-				if ($user->save())
-					system_message(elgg_echo('user:password:success'));
-				else
-					register_error(elgg_echo('user:password:fail'));
+gatekeeper();
+
+$password = get_input('password');
+$password2 = get_input('password2');
+$user_id = get_input('guid');
+$user = "";
+
+if (!$user_id) {
+	$user = $_SESSION['user'];
+} else {
+	$user = get_entity($user_id);
+}
+
+if (($user) && ($password!="")) {
+	if (strlen($password)>=4) {
+		if ($password == $password2) {
+			$user->salt = generate_random_cleartext_password(); // Reset the salt
+			$user->password = generate_user_password($user, $password);
+			if ($user->save()) {
+				system_message(elgg_echo('user:password:success'));
+			} else {
+				register_error(elgg_echo('user:password:fail'));
 			}
-			else
-				register_error(elgg_echo('user:password:fail:notsame'));
+		} else {
+			register_error(elgg_echo('user:password:fail:notsame'));
 		}
-		else
-			register_error(elgg_echo('user:password:fail:tooshort'));
+	} else {
+		register_error(elgg_echo('user:password:fail:tooshort'));
 	}
-	
-	//forward($_SERVER['HTTP_REFERER']);
-	//exit;
-?>
\ No newline at end of file
+}
\ No newline at end of file