From 83c82085c294d6cdb0bbf25b8c1cbb122afcb67b Mon Sep 17 00:00:00 2001
From: melina <melina.joum@altairis.net>
Date: Tue, 20 Sep 2022 14:29:28 +0200
Subject: [PATCH 1/2] Add url public interface

---
 htdocs/admin/ticket_public.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 8693da8deb2..4b5ca649ffc 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -53,8 +53,10 @@ $errors = array();
 if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	if (GETPOST('value')) {
 		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', DOL_MAIN_URL_ROOT.'/public/ticket', 'chaine', 0, '', $conf->entity);
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
 	}
 	if (!($res > 0)) {
 		$error++;
@@ -137,8 +139,8 @@ if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	$url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
 	if (!empty($url_interface)) {
 		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
-	} else {
-		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
+	} elseif ($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', DOL_MAIN_URL_ROOT.'/public/ticket', 'chaine', 0, '', $conf->entity);
 	}
 	if (!($res > 0)) {
 		$error++;

From cb55095ca28628dac64171c03a4c9402bfac606d Mon Sep 17 00:00:00 2001
From: melina <melina.joum@altairis.net>
Date: Tue, 20 Sep 2022 14:52:34 +0200
Subject: [PATCH 2/2] Complete ticket public url

---
 htdocs/admin/ticket_public.php       | 6 ++----
 htdocs/ticket/class/ticket.class.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 4b5ca649ffc..8693da8deb2 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -53,10 +53,8 @@ $errors = array();
 if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	if (GETPOST('value')) {
 		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
-		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', DOL_MAIN_URL_ROOT.'/public/ticket', 'chaine', 0, '', $conf->entity);
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
-		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
 	}
 	if (!($res > 0)) {
 		$error++;
@@ -139,8 +137,8 @@ if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	$url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
 	if (!empty($url_interface)) {
 		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
-	} elseif ($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
-		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', DOL_MAIN_URL_ROOT.'/public/ticket', 'chaine', 0, '', $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
 	}
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4994faf5230..09ff042b41b 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1629,7 +1629,7 @@ class Ticket extends CommonObject
 					$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$this->track_id;
 					$tmpmessage .= "\n".$langs->transnoentities('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$this->track_id.'</a>'."\n";
 				} else {
-					$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$this->track_id;
+					$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$this->track_id;
 					$tmpmessage .= "\n".$langs->transnoentities('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$this->track_id.'</a>'."\n";
 				}