From 6807e139d2bcb6b0607b52e093f4130a51d1ef4d Mon Sep 17 00:00:00 2001
From: b_b <bruno@eliaz.fr>
Date: Tue, 7 Sep 2021 17:48:41 +0200
Subject: [PATCH] utiliser charger_fonction() avant d'appeler generer_htpass()
ref #4497
---
ecrire/auth/spip.php | 4 +++-
ecrire/install/etape_3b.php | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ecrire/auth/spip.php b/ecrire/auth/spip.php
index 637d57f188..3296f5c1a7 100644
--- a/ecrire/auth/spip.php
+++ b/ecrire/auth/spip.php
@@ -411,7 +411,9 @@ function auth_spip_modifier_pass($login, $new_pass, $id_auteur, $serveur = '') {
$c = [];
include_spip('inc/acces');
include_spip('auth/sha256.inc');
- $htpass = generer_htpass($new_pass);
+ if ($generer_htpass = charger_fonction('generer_htpass', 'inc', true)) {
+ $htpass = $generer_htpass($new_pass);
+ }
$alea_actuel = creer_uniqid();
$alea_futur = creer_uniqid();
$pass = spip_sha256($alea_actuel . $new_pass);
diff --git a/ecrire/install/etape_3b.php b/ecrire/install/etape_3b.php
index 1f95af2d84..498ab6f479 100644
--- a/ecrire/install/etape_3b.php
+++ b/ecrire/install/etape_3b.php
@@ -83,7 +83,9 @@ function install_etape_3b_dist() {
$pass = unicode2charset(utf_8_to_unicode($pass), 'iso-8859-1');
include_spip('auth/sha256.inc');
include_spip('inc/acces');
- $htpass = generer_htpass($pass);
+ if ($generer_htpass = charger_fonction('generer_htpass', 'inc', true)) {
+ $htpass = $generer_htpass($new_pass);
+ }
$alea_actuel = creer_uniqid();
$alea_futur = creer_uniqid();
$shapass = spip_sha256($alea_actuel . $pass);
--
GitLab