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

Revert "Remove old password check from changepassword and use verifyUser instead" 

This reverts commit e6b8153865.
This commit is contained in:
Lukas Reschke 2012-10-15 23:49:49 +02:00
parent c9ac1364d1
commit f475ed5cc1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
settings/ajax/changepassword.php
View File

@ -10,6 +10,7 @@ OC_JSON::verifyUser();
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
$password = $_POST["password"];
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
$userstatus = null;
if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
@ -18,7 +19,7 @@ if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
$userstatus = 'subadmin';
}
if(OC_User::getUser() == $username) {
if(OC_User::getUser() == $username && OC_User::checkPassword($username, $oldPassword)) {
$userstatus = 'user';
}

5
settings/templates/personal.php
View File

@ -18,8 +18,9 @@
<fieldset class="personalblock">
<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="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('Verify password');?>" data-typetoggle="#show" />
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
</fieldset>
</form>