Merge pull request #12 from Dolphiq/development

Development

CHANGELOG.md

@@ -1,4 +1,11 @@
 # sitemap Changelog
+## 1.0.7 - 2018-01-18
+
+### Fixed
+- Fixed bug with multi-site setup configured in de config files
+
+### Changed
+- Make more use of the Craft framework for future compatibility
 
 ## 1.0.6 - 2018-01-18
 ### Changed

README.md

@@ -34,6 +34,7 @@ To install the plugin, follow these instructions.
 
 
 ## XML-sitemap Roadmap
+- Settings to enable /disable and split the entries in the xml on a site basis (for multi site setup)
 - User (custom) url entry section
 - Provide a way hide entries from the list
 - Add a Ping for search engines

composer.json

@@ -2,7 +2,7 @@
     "name": "dolphiq/sitemap",
     "description": "Craft 3 plugin that provides an easy way to provide and manage a XML sitemap for search engines like Google and Bing",
     "type": "craft-plugin",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "keywords": [
         "craft",
         "cms",

src/controllers/SitemapController.php

@@ -18,6 +18,7 @@
 use Craft;
 use craft\db\Query;
 use craft\web\Controller;
+use craft\helpers\UrlHelper;
 
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 
@@ -48,6 +49,20 @@ class SitemapController extends Controller
     // Public Methods
 // =========================================================================
 
+
+    /**
+     * @inheritdoc
+     */
+    private function getUrl($uri, $siteId)
+    {
+        if ($uri !== null) {
+            $path = ($uri === '__home__') ? '' : $uri;
+            return UrlHelper::siteUrl($path, null, null, $siteId);
+        }
+
+        return null;
+    }
+
     /**
      * Handle a request going to our plugin's index action URL,
      * e.g.: actions/sitemap/default
@@ -82,15 +97,10 @@ public function actionIndex()
         $urlset->setAttribute('xmlns', 'http://www.sitemaps.org/schemas/sitemap/0.9');
         $dom->appendChild($urlset);
 
-        $siteurl = isset(Craft::$app->config->general)
-                && isset(Craft::$app->config->general->siteUrl)
-            ? Craft::$app->config->general->siteUrl
-            : null;
-
         foreach($this->_createEntrySectionQuery()->all() as $item) {
-            $baseurl = rtrim($siteurl ?: $item['baseurl'], '/') . '/';
-            $loc = $baseurl . ($item['uri'] === '__home__' ? '' : $item['uri']);
-
+            $loc = $this->getUrl($item['uri'], $item['siteId']);
+            if($loc === null) continue;
+            
             $url = $dom->createElement('url');
             $urlset->appendChild($url);
             $url->appendChild($dom->createElement('loc', $loc));
@@ -102,8 +112,8 @@ public function actionIndex()
         }
 
         foreach($this->_createEntryCategoryQuery()->all() as $item) {
-            $baseurl = rtrim($siteurl ?: $item['baseurl'], '/') . '/';
-            $loc = $baseurl . ($item['uri'] === '__home__' ? '' : $item['uri']);
+            $loc = $this->getUrl($item['uri'], $item['siteId']);
+            if($loc === null) continue;
 
             $url = $dom->createElement('url');
             $urlset->appendChild($url);
@@ -123,9 +133,7 @@ private function _createEntrySectionQuery(): Query
             ->select([
                 'elements_sites.uri uri',
                 'elements_sites.dateUpdated dateUpdated',
-                'sites.baseurl',
-
-                'sitemap_entries.id sitemapEntryId',
+                'elements_sites.siteId',
                 'sitemap_entries.changefreq changefreq',
                 'sitemap_entries.priority priority',
             ])
@@ -148,9 +156,7 @@ private function _createEntryCategoryQuery(): Query
 
                 'elements_sites.uri uri',
                 'elements_sites.dateUpdated dateUpdated',
-                'sites.baseurl',
-
-                'sitemap_entries.id sitemapEntryId',
+                'elements_sites.siteId',
                 'sitemap_entries.changefreq changefreq',
                 'sitemap_entries.priority priority',
             ])
@@ -160,11 +166,9 @@ private function _createEntryCategoryQuery(): Query
             ->innerJoin('{{%elements}} elements', '[[elements.id]] = [[categories.id]] AND [[elements.enabled]] = 1')
             ->innerJoin('{{%elements_sites}} elements_sites', '[[elements_sites.elementId]] = [[elements.id]] AND [[elements_sites.enabled]] = 1')
             ->innerJoin('{{%sites}} sites', '[[elements_sites.siteId]] = [[sites.id]]')
-
             ->groupBy(['elements_sites.id']);
     }
 
-
 }
 
 ?>