Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-07-28 15:27:25 +02:00
parent 96e38e6584 29f54fd50e
commit d96d61d161
7 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/geturl.lib.php
View File

@@ -377,9 +377,10 @@ function isIPAllowed($iptocheck, $localurl)
/**
* Function get second level domain name.
* For example: https://www.abc.mydomain.com/dir/page.html return 'mydomain'
* For example: https://www.abc.mydomain.com/dir/page.html returns 'mydomain' with mode 0, 'mydomain.om' with mode 1, 'abc.mydomain.com' with mode 2.
* For example: part1@mydomain.com returns 'mydomain.com' with mode 1
*
* @param string $url Full URL.
* @param string $url Full URL or Email.
* @param int $mode 0=return 'mydomain', 1=return 'mydomain.com', 2=return 'abc.mydomain.com'
* @return string Returns domaine name
*/
@@ -404,8 +405,10 @@ function getDomainFromURL($url, $mode = 0)
$mode++;
}
$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after /
$tmpdomain = preg_replace('/^https?:\/\/[^:]+:[^@]+@/i', '', $url); // Remove http(s)://login@pass in https://login@pass:mydomain.com/path, so we now got mydomain.com/path
$tmpdomain = preg_replace('/^https?:\/\//i', '', $tmpdomain); // Remove http(s)://
$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after /
$tmpdomain = preg_replace('/^[^@]+@/i', '', $tmpdomain); // Remove part1@ in part1@part2 (for emails)
if ($mode == 3) {
$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3.\4', $tmpdomain);
} elseif ($mode == 2) {