mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1762 from owncloud/user_password_fix 

Fix changing user password at 'Personal' page. Ref #1693
This commit is contained in:
Thomas Müller 2013-02-18 10:54:27 -08:00
parent f554347db5 06dbcec5a1
commit c8e02060c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/ajax/changepassword.php
View File

@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
OC_APP::loadApps();
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
$password = $_POST["password"];
$password = isset($_POST["password"]) ? $_POST["password"] : null;
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
$userstatus = null;
@ -28,7 +28,7 @@ if(is_null($userstatus)) {
}
// Return Success story
if( OC_User::setPassword( $username, $password )) {
if(!is_null($password) && OC_User::setPassword( $username, $password )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
else{

2
settings/templates/personal.php
View File

@ -37,7 +37,7 @@ if($_['passwordChangeSupported']) {
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
<input type="password" id="pass2" name="personal-password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
</fieldset>