Create item hashes from only the menu path

MAP-383
joomlashack · Feb 6, 2018 · 686248c · 686248c
1 parent 3876c01
commit 686248c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/admin/library/alledia/osmap/Router.php b/src/admin/library/alledia/osmap/Router.php
@@ -187,4 +187,17 @@ public function removeHashFromURL($url)
 
         return $url;
     }
+
+    /**
+     * Create a consistent url hash regardless of scheme or site root.
+     * 
+     * @param string $url
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function createUrlHash($url)
+    {
+        return md5(str_replace(Factory::getContainer()->uri->root(), '', $url));
+    }
 }
diff --git a/src/admin/library/alledia/osmap/Sitemap/Collector.php b/src/admin/library/alledia/osmap/Sitemap/Collector.php
@@ -444,7 +444,7 @@ protected function checkDuplicatedURLToIgnore($item)
 
             // We need to make sure to have an URL free of hash chars
             $url  = $container->router->removeHashFromURL($item->fullLink);
-            $hash = md5($url);
+            $hash = $container->router->createUrlHash($url);
 
             if (isset($this->urlHashList[$hash])) {
                 $item->duplicate = true;

diff --git a/src/admin/library/alledia/osmap/Sitemap/Item.php b/src/admin/library/alledia/osmap/Sitemap/Item.php
@@ -63,7 +63,7 @@ public function __construct($itemData, $currentMenuItemId)
         $this->fullLink = $container->router->removeHashFromURL($this->fullLink);
 
         // Make sure to have a unique hash for the settings
-        $this->settingsHash = md5($this->fullLink . $currentMenuItemId);
+        $this->settingsHash = $container->router->createUrlHash($this->fullLink . $currentMenuItemId);
 
         /*
          * Do not use a "prepare" method because we need to make sure it will