From 45900052e8c8007f88820cc8537ad84520e828cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 9 Feb 2023 13:54:39 +0100
Subject: [PATCH] Debug v17

---
 htdocs/adherents/list.php     |  2 +-
 htdocs/public/members/new.php | 18 +++++-------------
 htdocs/public/project/new.php |  1 -
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c2b81860210..64cc4fa8dc4 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("members", "companies"));
+$langs->loadLangs(array("members", "companies", "categories"));
 
 
 // Get parameters
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 7c3e5754b23..33bbe59f118 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -34,7 +34,7 @@
  *  MEMBER_MIN_AMOUNT                   Minimum amount
  *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
  *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
- *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
+ *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once registration form has been submitted (hidden option, by default we just show a message on same page or redirect to the payment page)
  *  MEMBER_NEWFORM_FORCETYPE            Force type of member
  *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
  *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
@@ -73,11 +73,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Init vars
+$backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
 $errmsg = '';
 $num = 0;
 $error = 0;
-$backtopage = GETPOST('backtopage', 'alpha');
-$action = GETPOST('action', 'aZ09');
 
 // Load translation files
 $langs->loadLangs(array("main", "members", "companies", "install", "other"));
@@ -448,15 +449,6 @@ if (empty($reshook) && $action == 'add') {
 						$urlback .= '&entity='.((int) $entity);
 					}
 				}
-			}
-
-			if (!empty($backtopage)) {
-				$urlback = $backtopage;
-				dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-			} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
-				$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-				// TODO Make replacement of __AMOUNT__, etc...
-				dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
 			} else {
 				$error++;
 				$errmsg .= join('<br>', $adh->errors);
@@ -476,7 +468,7 @@ if (empty($reshook) && $action == 'add') {
 }
 
 // Action called after a submitted was send and member created successfully
-// If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
+// If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to an url, we never go here because a redirect was done to this url. Same if we ask to redirect to the payment page.
 // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
 
 if (empty($reshook) && $action == 'added') {
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 778fc860e90..108f8d13771 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -416,7 +416,6 @@ if (empty($reshook) && $action == 'add') {
 }
 
 // Action called after a submitted was send and member created successfully
-// If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
 // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
 if (empty($reshook) && $action == 'added') {
 	llxHeaderVierge($langs->trans("NewLeadForm"));