jan
/
miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ask current password to change user profile

This commit is contained in:
Frederic Guillot 2017-01-03 21:44:39 -05:00
parent 99a6307415
commit 26bd973777
16 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/profile.php
View File

@ -26,7 +26,7 @@ Router\post_action('profile', function () {
$user_id = SessionStorage::getInstance()->getUserId();
$values = Request\values();
Helper\check_csrf_values($values);
list($valid, $errors) = Validator\User\validate_modification($values);
list($valid, $errors) = Validator\User\validate_profile_modification($user_id, $values);
if ($valid) {
$new_password = empty($values['password']) ? null : $values['password'];

3
app/locales/ar_AR/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/cs_CZ/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/de_DE/translations.php
View File

@ -251,4 +251,7 @@ return array(
'Edit' => 'Bearbeiten',
'The user id required' => 'Die Benutzer-ID wird benötigt',
'The username must be unique' => 'Der Benutzername muss einmalig sein',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/es_ES/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/fr_FR/translations.php
View File

@ -251,4 +251,7 @@ return array(
'Edit' => 'Modifier',
'The user id required' => 'L\'ID de l\'utilisateur est obligatoire',
'The username must be unique' => 'Le nom d\'utilisateur doit être unique',
'Current Password' => 'Mot de passe actuel',
'New Password' => 'Nouveau mot de passe',
'Wrong password' => 'Mauvais mot de passe',
);

3
app/locales/it_IT/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/ja_JP/translations.php
View File

@ -253,4 +253,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/pt_BR/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/ru_RU/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/sr_RS/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/sr_RS@latin/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/tr_TR/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

3
app/locales/zh_CN/translations.php
View File

@ -251,4 +251,7 @@ return array(
// 'Edit' => '',
// 'The user id required' => '',
// 'The username must be unique' => '',
// 'Current Password' => '',
// 'New Password' => '',
// 'Wrong password' => '',
);

11
app/templates/profile.php
View File

@ -23,13 +23,16 @@
<?php echo Miniflux\Helper\form_hidden('id', $values) ?>
<?php echo Miniflux\Helper\form_label(t('Username'), 'username') ?>
<?php echo Miniflux\Helper\form_text('username', $values, $errors, array('required')) ?><br/>
<?php echo Miniflux\Helper\form_text('username', $values, $errors, array('required')) ?>
<?php echo Miniflux\Helper\form_label(t('Password'), 'password') ?>
<?php echo Miniflux\Helper\form_password('password', $values, $errors) ?><br/>
<?php echo Miniflux\Helper\form_label(t('Current Password'), 'current_password') ?>
<?php echo Miniflux\Helper\form_password('current_password', $values, $errors, array('required')) ?>
<?php echo Miniflux\Helper\form_label(t('New Password'), 'password') ?>
<?php echo Miniflux\Helper\form_password('password', $values, $errors) ?>
<?php echo Miniflux\Helper\form_label(t('Confirmation'), 'confirmation') ?>
<?php echo Miniflux\Helper\form_password('confirmation', $values, $errors) ?><br/>
<?php echo Miniflux\Helper\form_password('confirmation', $values, $errors) ?>
</div>
<div class="form-actions">

20
app/validators/user.php
View File

@ -10,6 +10,26 @@ use PicoDb\Database;
use SimpleValidator\Validator;
use SimpleValidator\Validators;
function validate_profile_modification($user_id, array $values)
{
list($result, $errors) = validate_modification($values);
if ($result) {
$user = UserModel\get_user_by_id($user_id);
$password = ! empty($values['current_password']) ? $values['current_password'] : '';
if (! password_verify($password, $user['password'])) {
$result = false;
$errors['current_password'][] = t('Wrong password');
}
}
return array(
$result,
$errors,
);
}
function validate_modification(array $values)
{
$v = new Validator($values, array(