From c0152ba8a0f1c358e598a5d8e9c15d569e996fde Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Thu, 5 Dec 2019 20:38:00 +0300
Subject: [PATCH] Sitemap 1.7.0

---
 CHANGELOG.md                          |  3 +++
 README.md                             |  4 ++--
 app/Controllers/SitemapController.php | 14 ++++++++------
 plugin.yaml                           |  2 +-
 views/templates/index.html            |  8 ++++----
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3706fb2..1b27f55 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v1.7.0, 2019-12-05
+* Updates for Flextype 0.9.6
+
 # v1.6.0, 2019-09-15
 * Updates for Flextype 0.9.4
 
diff --git a/README.md b/README.md
index e2bf061..776c502 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Sitemap Plugin for [Flextype](http://flextype.org/)
-![version](https://img.shields.io/badge/version-1.6.0-brightgreen.svg?style=flat-square "Version")
-![Flextype](https://img.shields.io/badge/Flextype-0.9.4-green.svg?style=flat-square "Flextype Version")
+![version](https://img.shields.io/badge/version-1.7.0-brightgreen.svg?style=flat-square "Version")
+![Flextype](https://img.shields.io/badge/Flextype-0.9.6-green.svg?style=flat-square "Flextype Version")
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/flextype-plugins/tiny-url/blob/master/LICENSE.txt)
 
 Sitemap plugin provide automatically generated XML sitemap for Flextype.
diff --git a/app/Controllers/SitemapController.php b/app/Controllers/SitemapController.php
index 152f548..7a66a47 100644
--- a/app/Controllers/SitemapController.php
+++ b/app/Controllers/SitemapController.php
@@ -20,12 +20,14 @@ class SitemapController extends Controller {
      */
     public function index(Request $request, Response $response) : Response
     {
-        $_entries = $this->entries->fetchAll('', ['recursive' => true, 'order_by' => ['field' => 'published_at', 'direction' => 'desc']]);
-        $entries  = [];
+        $sitemap  = [];
+        $entries = $this->entries->fetch('', ['recursive' => true, 'order_by' => ['field' => 'published_at', 'direction' => 'desc']]);
 
-        foreach ($_entries as $entry) {
-            if (!(isset($entry['visibility']) && ($entry['visibility'] === 'draft' || $entry['visibility'] === 'hidden'))) {
-                $entries[] = $entry;
+        foreach ($entries as $entry) {
+
+            if (!((isset($entry['visibility']) && ($entry['visibility'] === 'draft' || $entry['visibility'] === 'hidden')) ||
+                (isset($entry['routable']) && ($entry['routable'] === false)))) {
+                    $sitemap[] = $entry;
             }
         }
 
@@ -35,7 +37,7 @@ public function index(Request $request, Response $response) : Response
             $response,
             'plugins/sitemap/views/templates/index.html',
             [
-                'entries' => $entries
+                'sitemap' => $sitemap
             ]);
     }
 }
diff --git a/plugin.yaml b/plugin.yaml
index 8928633..2ac1830 100755
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Sitemap
-version: 1.6.0
+version: 1.7.0
 description: Provide automatically generated XML sitemap.
 author:
   name: Sergey Romanenko
diff --git a/views/templates/index.html b/views/templates/index.html
index 5cb5fec..126f6da 100644
--- a/views/templates/index.html
+++ b/views/templates/index.html
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% for entry in entries %}
+{% for page in sitemap %}
 <url>
-    <loc>{{ base_url() }}/{{ entry.slug }}</loc>
-    <lastmod>{{ entry.date }}</lastmod>
-    <changefreq>{% if entry.changefreq %}{{ entry.changefreq }}{% else %}1.0{% endif %}</changefreq>
+    <loc>{{ base_url() }}/{{ page.slug }}</loc>
+    <lastmod>{{ page.date }}</lastmod>
+    <changefreq>{% if page.changefreq %}{{ page.changefreq }}{% else %}1.0{% endif %}</changefreq>
     <priority>1.0</priority>
 </url>
 {% endfor %}