harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #287 require old password to change password

Browse Source
This commit is contained in:
redmatrix 2016-02-19 13:18:51 -08:00
parent 50c7c33ed1
commit 8e586008dd
2 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
mod/settings.php
View File

@ -225,10 +225,44 @@ function settings_post(&$a) {
$errs = array(); $errs = array();
$email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : '');
$account = $a->get_account();
if($email != $account['account_email']) {
if(! valid_email($email))
$errs[] = t('Not valid email.');
$adm = trim(get_config('system','admin_email'));
if(($adm) && (strcasecmp($email,$adm) == 0)) {
$errs[] = t('Protected email address. Cannot change to that email.');
$email = $a->user['email'];
}
if(! $errs) {
$r = q("update account set account_email = '%s' where account_id = %d",
dbesc($email),
intval($account['account_id'])
);
if(! $r)
$errs[] = t('System failure storing new email. Please try again.');
}
}
if($errs) {
foreach($errs as $err)
notice($err . EOL);
$errs = array();
}
if((x($_POST,'npassword')) || (x($_POST,'confirm'))) { if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
$newpass = $_POST['npassword']; $origpass = trim($_POST['origpass']);
$confirm = $_POST['confirm'];
require_once('include/auth.php');
if(! account_verify_password($email,$origpass)) {
$errs[] = t('Password verification failed.');
}
$newpass = trim($_POST['npassword']);
$confirm = trim($_POST['confirm']);
if($newpass != $confirm ) { if($newpass != $confirm ) {
$errs[] = t('Passwords do not match. Password unchanged.'); $errs[] = t('Passwords do not match. Password unchanged.');
@ -255,31 +289,6 @@ function settings_post(&$a) {
} }
} }
if($errs) {
foreach($errs as $err)
notice($err . EOL);
$errs = array();
}
$email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : '');
$account = $a->get_account();
if($email != $account['account_email']) {
if(! valid_email($email))
$errs[] = t('Not valid email.');
$adm = trim(get_config('system','admin_email'));
if(($adm) && (strcasecmp($email,$adm) == 0)) {
$errs[] = t('Protected email address. Cannot change to that email.');
$email = $a->user['email'];
}
if(! $errs) {
$r = q("update account set account_email = '%s' where account_id = %d",
dbesc($email),
intval($account['account_id'])
);
if(! $r)
$errs[] = t('System failure storing new email. Please try again.');
}
}
if($errs) { if($errs) {
foreach($errs as $err) foreach($errs as $err)
@ -695,8 +704,9 @@ function settings_content(&$a) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_account"), '$form_security_token' => get_form_security_token("settings_account"),
'$title' => t('Account Settings'), '$title' => t('Account Settings'),
'$password1'=> array('npassword', t('Enter New Password:'), '', ''), '$origpass' => array('origpass', t('Current Password'), ' ',''),
'$password2'=> array('confirm', t('Confirm New Password:'), '', t('Leave password fields blank unless changing')), '$password1'=> array('npassword', t('Enter New Password'), '', ''),
'$password2'=> array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')),
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''), '$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'), '$removeme' => t('Remove Account'),

1
view/tpl/settings_account.tpl
View File

@ -8,6 +8,7 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$email}} {{include file="field_input.tpl" field=$email}}
{{include file="field_password.tpl" field=$origpass}}
{{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password1}}
{{include file="field_password.tpl" field=$password2}} {{include file="field_password.tpl" field=$password2}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >