From eb110f66c2483dbbdab80a3ebc7d2104df3b967f Mon Sep 17 00:00:00 2001 From: Libre Master <55919603+libremaster@users.noreply.github.com> Date: Thu, 8 Feb 2024 02:08:18 +0100 Subject: [PATCH] Simpler version of getRootURLFromURL (#27927) * Simpler version * Simpler version * Simpler version * Try more complete enhancement * Update geturl.lib.php * Simpler version --------- Co-authored-by: Christophe TREMBLAY-GUILLOUX Co-authored-by: Laurent Destailleur --- htdocs/core/lib/geturl.lib.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php index ab6d878809b..132e77773b7 100644 --- a/htdocs/core/lib/geturl.lib.php +++ b/htdocs/core/lib/geturl.lib.php @@ -390,23 +390,15 @@ function getDomainFromURL($url, $mode = 0) /** * Function root url from a long url * For example: https://www.abc.mydomain.com/dir/page.html return 'https://www.abc.mydomain.com' - * For example: http://www.abc.mydomain.com/ return 'https://www.abc.mydomain.com' + * For example: https://www.abc.mydomain.com/ return 'https://www.abc.mydomain.com' + * For example: http://www.abc.mydomain.com/ return 'http://www.abc.mydomain.com' * * @param string $url Full URL. * @return string Returns root url */ function getRootURLFromURL($url) { - $prefix = ''; - $tmpurl = $url; - $reg = null; - if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) { - $prefix = $reg[1]; - } - $tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl); // Remove http(s):// - $tmpurl = preg_replace('/\/.*$/i', '', $tmpurl); // Remove part after domain - - return $prefix.$tmpurl; + return preg_replace('/^([a-z]*:\/\/[^\/]*).*/i', '$1', $url); } /**