vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2024-02-08 02:21:03 +01:00
commit 2d18a083fe
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/core/lib/geturl.lib.php
View file

@ -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);
}
/**