MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

applied coding convention:

Browse source 
- replaced space -> tab (code indenting)
- added curly braces
- used dbm::is_result() if $r is no result (may happen)

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-01-23 09:44:53 +01:00 committed by Roland Haeder
parent 909e1e055f
commit 1c6535c0b4
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mod/settings.php
View file

@ -381,13 +381,15 @@ function settings_post(App $a) {
$err = true; $err = true;
} }
// check if the old password was supplied correctly before // check if the old password was supplied correctly before
// changing it to the new value // changing it to the new value
$r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user())); $r = q("SELECT `password` FROM `user`WHERE `uid` = %d LIMIT 1", intval(local_user()));
if( $oldpass != $r[0]['password'] ) { if (!dbm::is_result($r)) {
notice( t('Wrong password.') . EOL); killme();
$err = true; } elseif ( $oldpass != $r[0]['password'] ) {
} notice( t('Wrong password.') . EOL);
$err = true;
}
if(! $err) { if(! $err) {
$password = hash('whirlpool',$newpass); $password = hash('whirlpool',$newpass);
@ -395,10 +397,11 @@ function settings_post(App $a) {
dbesc($password), dbesc($password),
intval(local_user()) intval(local_user())
); );
if($r) if($r) {
info( t('Password changed.') . EOL); info( t('Password changed.') . EOL);
else } else {
notice( t('Password update failed. Please try again.') . EOL); notice( t('Password update failed. Please try again.') . EOL);
}
} }
} }