diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-11-12 13:11:07 +0100 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2020-11-12 13:11:07 +0100 |
| commit | af50eba28a7bd286de4c8c9ee6dc5216b915d149 (patch) | |
| tree | ffa30a9358e82d27be75d8fc5e57f3c8820dc6d3 /application/front/controller/admin/PasswordController.php | |
| parent | b6f678a5a1d15acf284ebcec16c905e976671ce1 (diff) | |
| parent | 1409f1c89a7ca01456ae2dcd6357d296e2b99f5a (diff) | |
| download | Shaarli-af50eba28a7bd286de4c8c9ee6dc5216b915d149.tar.gz Shaarli-af50eba28a7bd286de4c8c9ee6dc5216b915d149.tar.zst Shaarli-af50eba28a7bd286de4c8c9ee6dc5216b915d149.zip | |
Merge tag 'v0.12.1' into latestlatest
v0.12.1
Diffstat (limited to 'application/front/controller/admin/PasswordController.php')
| -rw-r--r-- | application/front/controller/admin/PasswordController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/front/controller/admin/PasswordController.php b/application/front/controller/admin/PasswordController.php index 5ec0d24b..4aaf1f82 100644 --- a/application/front/controller/admin/PasswordController.php +++ b/application/front/controller/admin/PasswordController.php | |||
| @@ -25,7 +25,7 @@ class PasswordController extends ShaarliAdminController | |||
| 25 | 25 | ||
| 26 | $this->assignView( | 26 | $this->assignView( |
| 27 | 'pagetitle', | 27 | 'pagetitle', |
| 28 | t('Change password') .' - '. $this->container->conf->get('general.title', 'Shaarli') | 28 | t('Change password') . ' - ' . $this->container->conf->get('general.title', 'Shaarli') |
| 29 | ); | 29 | ); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| @@ -78,7 +78,7 @@ class PasswordController extends ShaarliAdminController | |||
| 78 | 78 | ||
| 79 | // Save new password | 79 | // Save new password |
| 80 | // Salt renders rainbow-tables attacks useless. | 80 | // Salt renders rainbow-tables attacks useless. |
| 81 | $this->container->conf->set('credentials.salt', sha1(uniqid('', true) .'_'. mt_rand())); | 81 | $this->container->conf->set('credentials.salt', sha1(uniqid('', true) . '_' . mt_rand())); |
| 82 | $this->container->conf->set( | 82 | $this->container->conf->set( |
| 83 | 'credentials.hash', | 83 | 'credentials.hash', |
| 84 | sha1( | 84 | sha1( |