From 4af70fef6d3b18b6936b05c3936b5866fd8ad6fe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 14 Jan 2022 05:22:46 +0100 Subject: [PATCH] Fix sitemap Most importantly, make it work globally. --- .htaccess | 4 +++- 2010/.htaccess | 1 - 2010/sitemap.php | 31 ------------------------------- 2012-prosinec/sitemap.php | 31 ------------------------------- 2012/.htaccess | 1 - 2012/sitemap.php | 31 ------------------------------- 2014/sitemap.php | 31 ------------------------------- 2015-prosinec/sitemap.php | 31 ------------------------------- 2015/sitemap.php | 31 ------------------------------- load.lib.php | 8 ++++---- sitemap.php | 26 ++++++++++++++++++++++++++ 11 files changed, 33 insertions(+), 193 deletions(-) delete mode 100644 2010/sitemap.php delete mode 100644 2012-prosinec/sitemap.php delete mode 100644 2012/sitemap.php delete mode 100644 2014/sitemap.php delete mode 100644 2015-prosinec/sitemap.php delete mode 100644 2015/sitemap.php create mode 100644 sitemap.php diff --git a/.htaccess b/.htaccess index 25d720b..b485443 100644 --- a/.htaccess +++ b/.htaccess @@ -5,4 +5,6 @@ RewriteEngine on -RewriteRule ^$ /2015-prosinec [R=302] +RewriteRule ^$ /2015-prosinec [R=302,L] +RewriteRule ^/sitemap.php$ [F] +RewriteRule ^sitemap\.txt$ /sitemap.php diff --git a/2010/.htaccess b/2010/.htaccess index 01a9d82..e79f589 100644 --- a/2010/.htaccess +++ b/2010/.htaccess @@ -9,7 +9,6 @@ RewriteRule ^de$ /2010/de/ [R,QSA] RewriteRule ^cs/$ /2010/index.php?page=main&lang=cs [QSA] RewriteRule ^en/$ /2010/index.php?page=main&lang=en [QSA] RewriteRule ^de/$ /2010/index.php?page=main&lang=de [QSA] -RewriteRule ^/sitemap\.txt$ /2010/sitemap.php RewriteRule (.*)\.pg$ [F] RewriteRule (.*)\.pgc[1-9]$ [F] RewriteRule (.*)\.mn$ [F] diff --git a/2010/sitemap.php b/2010/sitemap.php deleted file mode 100644 index 6ff9216..0000000 --- a/2010/sitemap.php +++ /dev/null @@ -1,31 +0,0 @@ -current()->getPathname(), 4); + return ($this->current()->isDir() && !isset($components[2])) || (isset($components[2]) && $components[2] === 'pages'); + } +}; +$iterator = new \RecursiveIteratorIterator($filter); + +$isHttps = isHttps(); +foreach ($iterator as $info) { + if ($info->isFile()) { + [, $year, $pages, $page] = explode('/', $info->getPathname(), 4); + if (str_ends_with($page, '.pg') && !str_starts_with($page, 'cs/error/') && !str_starts_with($page, 'en/error/') && !str_starts_with($page, 'de/error/')) { + $file = substr($page, 0, -3); + $file = str_replace('/pages', '', $file); + echo ($isHttps ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . '/' . $year . '/' . $file . "\n"; + } + } +}