ZwiiCMS-Team/ZwiiCampus
ZwiiCMS-Team/ZwiiCampus
8
6
Fork 1
Code Releases 69 Activity

Merge branch 'master' of https://forge.chapril.org/fredtempez/ZwiiLMS

Browse Source
This commit is contained in:
Fred Tempez 2023-11-08 09:05:41 +01:00
commit dca5418647
4 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -50,7 +50,7 @@ class common
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '1.0.65'; const ZWII_VERSION = '1.0.66';
// URL autoupdate // URL autoupdate
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';

12
core/module/user/user.php
View File

@ -266,6 +266,7 @@ class user extends common
$this->isPost() $this->isPost()
) { ) {
// Double vérification pour le mot de passe // Double vérification pour le mot de passe
if ($this->getUser('group') < self::GROUP_ADMIN) {
$newPassword = $this->getData(['user', $this->getUrl(2), 'password']); $newPassword = $this->getData(['user', $this->getUrl(2), 'password']);
if ($this->getInput('userEditNewPassword')) { if ($this->getInput('userEditNewPassword')) {
// L'ancien mot de passe est correct // L'ancien mot de passe est correct
@ -285,6 +286,17 @@ class user extends common
self::$inputNotices['userEditOldPassword'] = helper::translate('Incorrect'); self::$inputNotices['userEditOldPassword'] = helper::translate('Incorrect');
} }
} }
} else {
if ($this->getInput('userEditNewPassword') === $this->getInput('userEditConfirmPassword')) {
$newPassword = $this->getInput('userEditNewPassword', helper::FILTER_PASSWORD, true);
// Déconnexion de l'utilisateur si il change le mot de passe de son propre compte
if ($this->getUser('id') === $this->getUrl(2)) {
helper::deleteCookie('ZWII_USER_ID');
helper::deleteCookie('ZWII_USER_PASSWORD');
}
}
}
// Modification du groupe // Modification du groupe
if ( if (
$this->getUser('group') === self::GROUP_ADMIN $this->getUser('group') === self::GROUP_ADMIN

6
core/module/user/view/edit/edit.php
View File

@ -81,11 +81,15 @@
'readonly' => true, 'readonly' => true,
'value' => $this->getUrl(2) 'value' => $this->getUrl(2)
]); ?> ]); ?>
<?php
// Les admins ont le pouvoir de forcer le changement de mot de passe
if ($this->getUser('group') < self::GROUP_ADMIN): ?>
<?php echo template::password('userEditOldPassword', [ <?php echo template::password('userEditOldPassword', [
'autocomplete' => 'new-password', 'autocomplete' => 'new-password',
// remplace 'off' pour éviter le pré remplissage auto // remplace 'off' pour éviter le pré remplissage auto
'label' => 'Ancien mot de passe' 'label' => 'Ancien mot de passe',
]); ?> ]); ?>
<?php endif; ?>
<?php echo template::password('userEditNewPassword', [ <?php echo template::password('userEditNewPassword', [
'autocomplete' => 'off', 'autocomplete' => 'off',
'label' => 'Nouveau mot de passe' 'label' => 'Nouveau mot de passe'

2
core/module/user/view/reset/reset.php
View File

@ -12,7 +12,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col2 offset10"> <div class="col3 offset9">
<?php echo template::submit('userResetSubmit', [ <?php echo template::submit('userResetSubmit', [
'value' => 'Valider' 'value' => 'Valider'
]); ?> ]); ?>