From db458d28984cd47fde7844155cfa59bf06fb3ffa Mon Sep 17 00:00:00 2001
From: edsea <edsea@localhost.localdomain>
Date: Thu, 26 Dec 2024 01:10:08 +0100
Subject: [PATCH] Adding correct url for canonical as well as 301 to https

---
 .htaccess                   | 4 ++++
 rss/php/includes/header.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 802933b..1920cfd 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,9 @@
 RewriteEngine On
 
+RewriteCond %{HTTPS} off
+RewriteRule ^(.*)$ https://%{HTTP_HOST}/$1 [R=301,L]
+
+
 RewriteCond %{THE_REQUEST} ^[A-Z]{3,}\s/index\.php[\s?/] [NC]
 RewriteRule ^index\.php$ / [R=301,L]
 RewriteCond %{REQUEST_FILENAME}.php -f
diff --git a/rss/php/includes/header.php b/rss/php/includes/header.php
index a201106..2df7c3a 100644
--- a/rss/php/includes/header.php
+++ b/rss/php/includes/header.php
@@ -32,7 +32,7 @@
     <link rel="manifest" href="/rss/favicon/site.webmanifest" />
     
     <!-- Canonical Link (for duplicate pages) -->
-    <link rel="canonical" href="https://stellaamor.com<?php echo $_SERVER['REQUEST_URI'];?>">
+    <link rel="canonical" href="https://stellaamor.com<?php echo stripslashes($_SERVER['REQUEST_URI']);?>">
 
     <!-- Favicon -->
     <link rel="icon" href="/favicon.ico" type="image/x-icon">