From 97336cb8b5ae1c241d1c4fbcde48de3f5f6fc18f Mon Sep 17 00:00:00 2001
From: Herwin <herwin.bozet@gmail.com>
Date: Wed, 21 Sep 2022 17:30:32 +0200
Subject: [PATCH] Improved caching, Fixed sitemap Update .htaccess,
 headers.php, and sitemap.txt

---
 .htaccess           | 22 +++++++++++++++++++++-
 commons/headers.php |  7 +++----
 sitemap.txt         |  3 +++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.htaccess b/.htaccess
index 3d6f24e..a554063 100644
--- a/.htaccess
+++ b/.htaccess
@@ -18,6 +18,26 @@ ServerSignature Off
 ErrorDocument 403 /403.php
 ErrorDocument 404 /404.php
 
+# Setting up browser's caching rules
+# See:
+#  * https://stackoverflow.com/a/13029007
+#  * https://www.a2hosting.com/kb/developer-corner/apache-web-server/turning-off-caching-using-htaccess
+
+# Default: 12 hours
+Header set Cache-Control "max-age=43200, public, must-revalidate"
+
+<FilesMatch "\.(?i:gif|jpe?g|png|ico|svg|woff2|otf)$">
+    # Static files: 1 Week
+    Header set Cache-Control "max-age=604800, public, must-revalidate"
+</FilesMatch>
+<FilesMatch "\.(?i:css|js)$">
+    # Semi-static files: 1 Day
+    Header set Cache-Control "max-age=86400, public, must-revalidate"
+</FilesMatch>
+
+#Header set Pragma "no-cache"
+#Header set Expires 0
+
 # Setting some headers for security.
 Header always set X-Detected-Country "NK"
 Header always set X-Frame-Options "deny"
@@ -26,7 +46,7 @@ Header always set X-XSS-Protection " 1; mode=block"
 Header always set Referrer-Policy "no-referrer"
 Header always set X-Content-Type-Options "nosniff"
 Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
-Header always set Cache-Control "max-age=300, public"
+#Header always set Cache-Control "max-age=300, public"
 Header always set Access-Control-Allow-Origin "*"
 Header unset X-Powered-By
 Header always set X-Powered-By "Amiga 1200, Kickstart 3.1"
diff --git a/commons/headers.php b/commons/headers.php
index 48d64d0..9f99dc4 100644
--- a/commons/headers.php
+++ b/commons/headers.php
@@ -9,10 +9,9 @@ if(basename(__FILE__) == basename($_SERVER["SCRIPT_FILENAME"])) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 <meta name="viewport" content="width=device-width" />
-<!-- TODO: Change to proper values once finished ! -->
-<meta content="no-cache, no-store, must-revalidate" http-equiv="Cache-Control">
-<meta content="no-cache" http-equiv="Pragma">
-<meta content="0" http-equiv="Expires">
+<meta content="cache, store" http-equiv="Cache-Control">
+<meta content="cache, store" http-equiv="Pragma">
+<meta content="3600" http-equiv="Expires">
 <meta name="theme-color" content="#1D2023">
 <link rel="icon" type="image/svg+xml" href="/favicon.svg">
 <link rel="alternate icon" href="/favicon.ico">
diff --git a/sitemap.txt b/sitemap.txt
index d02749a..27de50e 100644
--- a/sitemap.txt
+++ b/sitemap.txt
@@ -3,6 +3,7 @@ https://nibblepoker.lu/content/
 https://nibblepoker.lu/content/lscom-cli
 https://nibblepoker.lu/content/youtube-auto-archiver
 https://nibblepoker.lu/content/excel-worksheet-password-remover
+https://nibblepoker.lu/content/mc-expanded-iron-bundles
 https://nibblepoker.lu/links/
 https://nibblepoker.lu/contact/
 https://nibblepoker.lu/privacy/
@@ -11,6 +12,7 @@ https://nibblepoker.lu/en/content/
 https://nibblepoker.lu/en/content/lscom-cli
 https://nibblepoker.lu/en/content/youtube-auto-archiver
 https://nibblepoker.lu/en/content/excel-worksheet-password-remover
+https://nibblepoker.lu/en/content/mc-expanded-iron-bundles
 https://nibblepoker.lu/en/links/
 https://nibblepoker.lu/en/contact/
 https://nibblepoker.lu/en/privacy/
@@ -19,6 +21,7 @@ https://nibblepoker.lu/fr/content/
 https://nibblepoker.lu/fr/content/lscom-cli
 https://nibblepoker.lu/fr/content/youtube-auto-archiver
 https://nibblepoker.lu/fr/content/excel-worksheet-password-remover
+https://nibblepoker.lu/fr/content/mc-expanded-iron-bundles
 https://nibblepoker.lu/fr/links/
 https://nibblepoker.lu/fr/contact/
 https://nibblepoker.lu/fr/privacy/