From d47cdc3c18dc20ce4644a7778bf944f27f19949a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 12 Aug 2011 14:09:43 +0200
Subject: [PATCH] fix changing passwords
---
settings/ajax/changepassword.php | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 750edf1769..b9b2417ad9 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -6,33 +6,32 @@ require_once('../../lib/base.php');
$l=new OC_L10N('settings');
// We send json data
-header( "Content-Type: application/jsonrequest" );
+header("Content-Type: application/jsonrequest");
// Check if we are a user
-if( !OC_User::isLoggedIn()){
- echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t( "Authentication error" ) )));
+if(!OC_User::isLoggedIn()){
+ echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Authentication error"))));
exit();
}
// Get data
-if( !isset( $_POST["password"] ) && !isset( $_POST["oldpassword"] )){
- echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t( "You have to enter the old and the new password!" ) )));
+if(!isset($_POST["password"]) && !isset($_POST["oldpassword"])){
+ echo json_encode(array("status" => "error", "data" => array("message" => $l->t("You have to enter the old and the new password!"))));
exit();
}
// Check if the old password is correct
-if( !OC_User::checkPassword( $_SESSION["user_id"], $_POST["oldpassword"] )){
- echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Your old password is wrong!") )));
+if(!OC_User::checkPassword($_SESSION["user_id"], $_POST["oldpassword"])){
+ echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Your old password is wrong!"))));
exit();
}
// Change password
-if( OC_User::setPassword( $_SESSION["user_id"], $_POST["password"] )){
- echo json_encode( array( "status" => "success", "data" => array( "message" => $l->t("Password changed") )));
- OC_Crypt::changekeypasscode( $_POST["password"]) {
-}
-else{
- echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Unable to change password") )));
+if(OC_User::setPassword($_SESSION["user_id"], $_POST["password"])){
+ echo json_encode(array("status" => "success", "data" => array("message" => $l->t("Password changed"))));
+ OC_Crypt::changekeypasscode($_POST["password"]);
+}else{
+ echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Unable to change password"))));
}
?>
--
GitLab