From 682da1fabe42f86ef5ecd56ecde185c48e6d67c0 Mon Sep 17 00:00:00 2001 From: Quentin VIAL-GOUTEYRON Date: Wed, 1 Jun 2022 11:33:15 +0200 Subject: [PATCH 1/3] FIX if password doesnt match rule it created a user without password --- htdocs/user/card.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 821d6748eb6..cc32cba558c 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -333,18 +333,26 @@ if (empty($reshook)) { $id = $object->create($user); if ($id > 0) { + $resPass = ''; if (GETPOST('password', 'none')) { - $object->setPassword($user, GETPOST('password', 'none')); + $resPass = $object->setPassword($user, GETPOST('password', 'none')); } - if (!empty($conf->categorie->enabled)) { - // Categories association - $usercats = GETPOST('usercats', 'array'); - $object->setCategories($usercats); - } - $db->commit(); + if($resPass < 0) { + $langs->load("errors"); + $db->rollback(); + setEventMessages($object->error, $object->errors, 'errors'); + $action = "create"; // Go back to create page + } else { + if(! empty($conf->categorie->enabled)) { + // Categories association + $usercats = GETPOST('usercats', 'array'); + $object->setCategories($usercats); + } + $db->commit(); - header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); - exit; + header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); + exit; + } } else { $langs->load("errors"); $db->rollback(); From adb37a5f5f7fe1962f27e4c9ebc5cdb5d6efb043 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 1 Jun 2022 09:53:51 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/user/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index cc32cba558c..b7c30417a71 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -337,13 +337,13 @@ if (empty($reshook)) { if (GETPOST('password', 'none')) { $resPass = $object->setPassword($user, GETPOST('password', 'none')); } - if($resPass < 0) { + if ($resPass < 0) { $langs->load("errors"); $db->rollback(); setEventMessages($object->error, $object->errors, 'errors'); $action = "create"; // Go back to create page } else { - if(! empty($conf->categorie->enabled)) { + if (! empty($conf->categorie->enabled)) { // Categories association $usercats = GETPOST('usercats', 'array'); $object->setCategories($usercats); From 1ef66c208fad2260cb2a4814585d952dff8e5cf5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Jun 2022 19:34:29 +0200 Subject: [PATCH 3/3] Update card.php --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index b7c30417a71..f0b362b383e 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -333,7 +333,7 @@ if (empty($reshook)) { $id = $object->create($user); if ($id > 0) { - $resPass = ''; + $resPass = 0; if (GETPOST('password', 'none')) { $resPass = $object->setPassword($user, GETPOST('password', 'none')); }