Improve support for sites that have multiple domains

bearcms · Oct 25, 2020 · 64fe63b · 64fe63b
1 parent 54957af
commit 64fe63b
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/classes/Utilities.php b/classes/Utilities.php
@@ -27,7 +27,7 @@ static function updateIndex(): void
     {
         $app = App::get();
 
-        $paths = null;
+        $urls = null;
         $robotsURL = $app->urls->get('/robots.txt');
         $result = self::makeRequest($robotsURL);
         if ($result['status'] === 200) {
@@ -47,7 +47,7 @@ static function updateIndex(): void
                         $dom->loadXML($result['content']);
                         $elements = $dom->getElementsByTagName('url');
                         if ($elements->length > 0) {
-                            $paths = [];
+                            $urls = [];
                             foreach ($elements as $element) {
                                 $lastModDate = '';
                                 $lastmodElements = $element->getElementsByTagName('lastmod');
@@ -56,8 +56,7 @@ static function updateIndex(): void
                                 }
                                 $locationElements = $element->getElementsByTagName('loc');
                                 if ($locationElements->length === 1) {
-                                    $locationPath = str_replace($app->request->base, '', $locationElements->item(0)->nodeValue);
-                                    $paths[$locationPath] = $lastModDate;
+                                    $urls[$locationElements->item(0)->nodeValue] = $lastModDate;
                                 }
                             }
                         }
@@ -66,9 +65,21 @@ static function updateIndex(): void
                 }
             }
         }
-        if ($paths === null) {
+        if ($urls === null) {
             return;
         }
+        // Find the base URL. Dont get if from $app->request->base because the site may be served by multiple domains
+        $shortestURL = null;
+        foreach ($urls as $url => $lastModDate) {
+            if ($shortestURL === null || strlen($url) < strlen($shortestURL)) {
+                $shortestURL = $url;
+            }
+        }
+        $baseURL = rtrim($shortestURL, '\/');
+        $paths = [];
+        foreach ($urls as $url => $lastModDate) {
+            $paths[str_replace($baseURL, '', $url)] = $lastModDate;
+        }
 
         $data = self::getData();
         $hasChange = false;