Merge pull request #49 from Dolphiq/development

Development

CHANGELOG.md

@@ -1,4 +1,9 @@
 # sitemap Changelog
+## 1.3.0 - 2030-07-03
+### Fixed
+- Fixed compatibility with Craft CMS 3.4 +
+- Added fix for deleted sites
+- Fix and/or operation order
 
 ## 1.2.0 - 2019-11-01
 ### Fixed

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.2.0",
+    "version": "1.3.0",
     "keywords": [
         "craft",
         "cms",

src/controllers/SettingsController.php

@@ -72,6 +72,7 @@ private function _createEntrySectionQuery(): Query
             ->leftJoin('{{%dolphiq_sitemap_entries}} sitemap_entries', '[[sections.id]] = [[sitemap_entries.linkId]] AND [[sitemap_entries.type]] = "section"')
 
             ->groupBy(['sections.id'])
+            ->where(['sections.dateDeleted' => null])
         ->orderBy(['type' => SORT_ASC],['name' => SORT_ASC]);
     }
 

src/controllers/SitemapController.php

@@ -165,17 +165,16 @@ private function _createEntrySectionQuery(): Query
                 '[[sections_sites.sectionId]] = [[sections.id]] AND [[sections_sites.hasUrls]] = 1')
             ->innerJoin('{{%entries}} entries', '[[sections.id]] = [[entries.sectionId]]')
             ->andWhere(['<=', 'entries.postDate', $currentDate])
-            ->andWhere(['>', 'entries.expiryDate', $currentDate])
-            ->orWhere(['entries.expiryDate'=> null])
+            ->andWhere(['or', 'entries.expiryDate > :currentDate', 'entries.expiryDate is null'], [':currentDate' => $currentDate])
             ->innerJoin('{{%elements}} elements', '[[entries.id]] = [[elements.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]]')
             ->andWhere(['elements.dateDeleted' => null])
+            ->andWhere(['sites.dateDeleted' => null])
             ->andWhere(['elements.archived' => false])
+            ->andWhere(['elements.draftId' => null])
             ->andWhere(['elements.revisionId' => null])
-
-
             ->groupBy(['elements_sites.id']);
     }
 
@@ -206,6 +205,7 @@ private function _createAlternateSectionQuery($elementId): Query
                 '[[elements_sites.elementId]] = [[elements.id]] AND [[elements_sites.enabled]] = 1')
             ->innerJoin('{{%sites}} sites', '[[elements_sites.siteId]] = [[sites.id]]')
             ->where(['=', '[[elements_sites.elementId]]', $elementId])
+            ->andWhere(['sites.dateDeleted' => null])
             ->groupBy(['elements_sites.id']);
     }
 
@@ -230,6 +230,7 @@ private function _createEntryCategoryQuery(): Query
                 '[[elements_sites.elementId]] = [[elements.id]] AND [[elements_sites.enabled]] = 1')
             ->innerJoin('{{%sites}} sites', '[[elements_sites.siteId]] = [[sites.id]]')
             ->andWhere(['elements.dateDeleted' => null])
+            ->andWhere(['sites.dateDeleted' => null])
             ->groupBy(['elements_sites.id']);
     }