From eb76ff75052d9184ba1aaa7b4c7e0cb1acae2287 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 22 Nov 2021 11:52:25 +0100 Subject: [PATCH 1/3] NEW hidden configuration to modify the link to return on dolibarr. Used for externalaccess --- htdocs/user/class/user.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 18cfb950619..318c50d70a7 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2264,6 +2264,8 @@ class User extends CommonObject if (!$changelater) { $url = $urlwithroot.'/'; + if(!empty($conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD)) + $url = $conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD; $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived").".\n"; $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs")." :\n\n"; $mesg .= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n"; From 690466506ec9ad98d06ec5f927cff1f6d2b127e6 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 22 Nov 2021 12:01:20 +0100 Subject: [PATCH 2/3] NEW new hidden option to change the link of authentication in the mail after changing password --- htdocs/user/class/user.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 318c50d70a7..1fad896633b 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -11,7 +11,7 @@ * Copyright (C) 2013-2015 Alexandre Spangaro * Copyright (C) 2015 Marcos García * Copyright (C) 2018 charlene Benke - * Copyright (C) 2018 Nicolas ZABOURI + * Copyright (C) 2018-2021 Nicolas ZABOURI * Copyright (C) 2019-2020 Frédéric France * Copyright (C) 2019 Abbes Bahfir * From 0388a12a4bbf7b0a95447e95f02d9b33ce3af84d Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 22 Nov 2021 13:07:05 +0100 Subject: [PATCH 3/3] Stickler --- htdocs/user/class/user.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 1fad896633b..1780c73fc69 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2264,7 +2264,7 @@ class User extends CommonObject if (!$changelater) { $url = $urlwithroot.'/'; - if(!empty($conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD)) + if (!empty($conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD)) $url = $conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD; $mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived").".\n"; $mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs")." :\n\n";