From f742310fdc783dfb98f9359e578d028c12b05d41 Mon Sep 17 00:00:00 2001
From: Yandols ZeonX <cs_aero2@yahoo.com>
Date: Sun, 14 Apr 2019 22:01:34 +0800
Subject: [PATCH] Cleanup .htaccess files.

---
 .htaccess        | 10 ++--------
 public/.htaccess | 10 ----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/.htaccess b/.htaccess
index f2fc95d..43d71ec 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,19 +9,13 @@ RewriteEngine On
 RewriteCond %{HTTPS} off
 RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 
-# Force Uploaded Imejis to load via HTTP instead of HTTPS due to backwards compatibility problem on some platforms.
-# SHOULD no longer be needed after the switch to LetsEncrypt on 31/07/2016
-#RewriteCond %{HTTPS} on
-#ReWriteCond %{REQUEST_URI} \w(\.png|\.jpeg|\.jpg|\.gif)$
-#RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI} [R,L]
-
 # Hackerbots Prevention
 RewriteEngine on
 RewriteCond %{HTTP_USER_AGENT} ^ZmEu [OR]
 RewriteCond %{HTTP_USER_AGENT} (.*)Msqq(.*)
 RewriteRule .* http://www.urbandictionary.com/define.php?term=fuck+you [R=301,L]
 
-#Preventing Public Access to Logs file
+# Prevent public access to the logs
 <FilesMatch "(logs.php|uploads.log)$">
 AuthType Basic
 AuthName "Restricted Area"
@@ -29,7 +23,7 @@ AuthUserFile /var/www/passes/imeji/.htpasswd
 Require valid-user
 </FilesMatch>
 
-#Allow linking asset elemets across subdomains
+# Allow linking asset elemets across subdomains
 <IfModule mod_headers.c>
     Header set Access-Control-Allow-Origin "*"
 </IfModule>
diff --git a/public/.htaccess b/public/.htaccess
index d8b6422..f2d1424 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -3,27 +3,17 @@ ErrorDocument 403 /403.php
 ErrorDocument 404 /404.php
 Options -Indexes
 
-
 # HTTPS Redirection
 RewriteEngine On
 RewriteCond %{HTTPS} off
 RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 
-# Force Uploaded Imejis to load via HTTP instead of HTTPS due to backwards compatibility problem on some platforms.
-# SHOULD no longer be needed after the switch to LetsEncrypt on 31/07/2016
-#RewriteCond %{HTTPS} on
-#ReWriteCond %{REQUEST_URI} \w(\.png|\.jpeg|\.jpg|\.gif)$
-#RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI} [R,L]
-
 # Hackerbots Prevention
 RewriteEngine on
 RewriteCond %{HTTP_USER_AGENT} ^ZmEu [OR]
 RewriteCond %{HTTP_USER_AGENT} (.*)Msqq(.*)
 RewriteRule .* http://www.urbandictionary.com/define.php?term=fuck+you [R=301,L]
 
-#Preventing Public Access to assets folder
-#RedirectMatch 403 ^/assets/?$
-
 #Allow linking asset elemets across subdomains
 <IfModule mod_headers.c>
     Header set Access-Control-Allow-Origin "*"