Fix support domains with 3 levels

Dolibarr · Jun 19, 2019 · d6b6f77 · d6b6f77
1 parent 7c4cddf
commit d6b6f77
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
@@ -172,14 +172,21 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
  * For example: https://www.abc.mydomain.com/dir/page.html return 'mydomain'
  *
  * @param	string	  $url 				    Full URL.
- * @param	int	 	  $mode					0=return 'mydomain', 1=return 'mydomain.com'
+ * @param	int	 	  $mode					0=return 'mydomain', 1=return 'mydomain.com', 2=return 'abc.mydomain.com'
  * @return	string						    Returns domaine name
  */
 function getDomainFromURL($url, $mode = 0)
 {
 	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
 	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain);				// Remove part www.abc before domain name
+	if ($mode == 2)
+	{
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain);	// Remove part 'www.' before 'abc.mydomain.com'
+	}
+	else
+	{
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain);				// Remove part 'www.abc.' before 'mydomain.com'
+	}
 	if (empty($mode))
 	{
 		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)