lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

bug changement de mot de passe

Browse Source
This commit is contained in:
Fred Tempez 2020-10-07 19:01:57 +02:00
parent fe7a6f3ca0
commit 5a151c577c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@ class user extends common {
'delete' => self::GROUP_ADMIN, 'delete' => self::GROUP_ADMIN,
'import' => self::GROUP_ADMIN, 'import' => self::GROUP_ADMIN,
'index' => self::GROUP_ADMIN, 'index' => self::GROUP_ADMIN,
'csvstring_to_array' => self::GROUP_ADMIN,
'edit' => self::GROUP_MEMBER, 'edit' => self::GROUP_MEMBER,
'logout' => self::GROUP_MEMBER, 'logout' => self::GROUP_MEMBER,
'forgot' => self::GROUP_VISITOR, 'forgot' => self::GROUP_VISITOR,
@ -61,7 +60,7 @@ class user extends common {
$userFirstname = $this->getInput('userAddFirstname', helper::FILTER_STRING_SHORT, true); $userFirstname = $this->getInput('userAddFirstname', helper::FILTER_STRING_SHORT, true);
$userLastname = $this->getInput('userAddLastname', helper::FILTER_STRING_SHORT, true); $userLastname = $this->getInput('userAddLastname', helper::FILTER_STRING_SHORT, true);
$userMail = $this->getInput('userAddMail', helper::FILTER_MAIL, true); $userMail = $this->getInput('userAddMail', helper::FILTER_MAIL, true);
// Stockage des données // Stockage des données
$this->setData([ $this->setData([
'user', 'user',
@ -424,7 +423,8 @@ class user extends common {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'notification' => 'Connexion réussie', 'notification' => 'Connexion réussie',
'redirect' => helper::baseUrl() . str_replace('_', '/', str_replace('__', '#', $this->getUrl(2))), //'redirect' => helper::baseUrl() . str_replace('_', '/', str_replace('__', '#', $this->getUrl(2))),
'redirect' => helper::baseUrl(),
'state' => true 'state' => true
]); ]);
} }
@ -540,7 +540,8 @@ class user extends common {
} }
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'title' => 'Réinitialisation du mot de passe', 'display' => self::DISPLAY_LAYOUT_LIGHT,
'title' => 'Réinitialisation de votre mot de passe',
'view' => 'reset' 'view' => 'reset'
]); ]);
} }
@ -568,14 +569,14 @@ class user extends common {
foreach($csv as $item ) { foreach($csv as $item ) {
// Nettoyage de l'identifiant // Nettoyage de l'identifiant
$userId = helper::filter($item['id'] , helper::FILTER_ID); $userId = helper::filter($item['id'] , helper::FILTER_ID);
// N'insére que les utilisateurs dont l'id n'existe pas // N'insére que les utilisateurs dont l'id n'existe pas
// Vérifier la présence des champs // Vérifier la présence des champs
if( !$this->getData(['user', $userId]) if( !$this->getData(['user', $userId])
AND $item['prenom'] AND $item['prenom']
AND $item['nom'] AND $item['nom']
AND $item['groupe'] AND $item['groupe']
AND $item['email'] AND $item['email']
AND $userId ) AND $userId )
{ {
// Enregistre le user // Enregistre le user
$this->setData([ $this->setData([
@ -583,14 +584,19 @@ class user extends common {
$userId, [ $userId, [
'firstname' => $item['prenom'], 'firstname' => $item['prenom'],
'forgot' => 0, 'forgot' => 0,
'group' => $item['groupe'], 'group' => (int) $item['groupe'],
'lastname' => $item['nom'], 'lastname' => $item['nom'],
'mail' => $item['email'], 'mail' => $item['email'],
'pseudo' => $item['prenom'], 'pseudo' => $item['prenom'],
'signature' => 1, // Pseudo 'signature' => 1, // Pseudo
'password' => uniqid() // A modifier à la première connexion 'password' => uniqid(), // A modifier à la première connexion
"connectFail" => null,
"connectTimeout" => null,
"accessUrl" => null,
"accessTimer" => null,
"accessCsrf" => null
]]); ]]);
$item['notification'] = template::ico('check'); $item['notification'] = template::ico('check');
} else { } else {
$item['notification'] = template::ico('cancel'); $item['notification'] = template::ico('cancel');
} }