From 8bee5cc9a8c10a68f08cc6b6743ca4fafece882b Mon Sep 17 00:00:00 2001
From: Yandols ZeonX <cs_aero2@yahoo.com>
Date: Fri, 22 May 2020 03:10:37 +0800
Subject: [PATCH] Removed apache .htaccess files. Updated README.md and
 LICENSE.md

---
 .htaccess        | 34 ----------------------------------
 LICENSE.md       |  2 +-
 README.md        | 11 +++++------
 public/.htaccess | 21 ---------------------
 4 files changed, 6 insertions(+), 62 deletions(-)
 delete mode 100644 .htaccess
 delete mode 100644 public/.htaccess

diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 216f0ca..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,34 +0,0 @@
-# Standard Declaration Procedures for Imeji System
-ErrorDocument 403 /public/403.php
-ErrorDocument 404 /public/404.php
-IndexOptions +FancyIndexing
-IndexIgnore *
-
-# HTTPS Redirection
-RewriteEngine On
-RewriteCond %{HTTPS} off
-RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,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]
-
-# Prevent public access to the logs, requires login through HTTPS
-<FilesMatch "(logs.php|uploads.log)$">
-    SSLOptions +StrictRequire
-    SSLRequireSSL
-    SSLRequire %{HTTP_HOST} eq "%{HTTP_HOST}%{REQUEST_URI}"
-    ErrorDocument 403 https://%{HTTP_HOST}%{REQUEST_URI}
-    AuthType Basic
-    AuthName "Restricted Area"
-    AuthUserFile /var/www/passes/imeji/.htpasswd
-    Require valid-user
-</FilesMatch>
-
-# Allow linking asset elemets across subdomains
-<IfModule mod_headers.c>
-    Header set Access-Control-Allow-Origin "*"
-</IfModule>
-
diff --git a/LICENSE.md b/LICENSE.md
index a5b6afd..ba71e3a 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2019 Yandols ZeonX, Locaria Technologies.
+Copyright (c) 2016-2020 Yandols ZeonX, Locaria Technologies.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 2224075..8b3dfab 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,12 @@
 # Icarus Imeji Uploader Service
 
-Imeji (for short) is a form of PHP image uploader system that you can use to host a simple image uploader service on your server. It utilizes the [dropzone.js](https://github.com/enyo/dropzone) library and also includes a basic POST uploader for clients incompatible with the aforementioned dropzone.js library.
+Imeji (for short) is a form of PHP image uploader system that you can use to host a simple image uploader service on your server. It utilizes the [dropzone.js](https://gitlab.com/meno/dropzone) library and also includes a basic POST uploader for clients incompatible with the aforementioned dropzone.js library.
 
-This repository is used for development and project tracking of the code we use on our [live image uploader](https://imeji.yandols.xyz). However, you a free to download a copy of it for yourself and alter it to use within the limits of our [license](/LICENSE.md).
+This repository is used for development and project tracking of the code we use on our [live image uploader](https://imeji.yandols.xyz). However, you a free to download a copy of it for yourself and alter it to use within the limits of our [license](./LICENSE.md).
 
 # Requirements
 
-* A server running Apache *(or anything else really, should work fine as well.)*
-* mod_rewrite for Apache
+* A server running [Caddy Webserver](https://caddyserver.com/) v2.
 * PHP 7.1 or greater
 
 That's about it.
@@ -22,11 +21,11 @@ Anything else such as the front-end design of pages is completely up to you to c
 
 # Contributing
 
-You can use our [issue tracker](https://dev.zxicar.us/YandolsZX/Icarus-Imeji/issues) to help report problems or suggest enhancements on the Imeji system. [Merge requests](https://dev.zxicar.us/YandolsZX/Icarus-Imeji/merge_requests) are also welcome.
+You can use our [issue tracker](https://git.yandols.xyz/LocariaTechnologies/IcarusImeji-Caddy/issues) to help report problems or suggest enhancements on the Imeji system. [Pull requests](https://git.yandols.xyz/LocariaTechnologies/IcarusImeji-Caddy/pulls) are also welcome.
 
 # License
 
-See the [LICENSE.md](/LICENSE.md) file.
+See the [LICENSE.md](./LICENSE.md) file.
 
 # Third Party Code Attribution
 
diff --git a/public/.htaccess b/public/.htaccess
deleted file mode 100644
index f2d1424..0000000
--- a/public/.htaccess
+++ /dev/null
@@ -1,21 +0,0 @@
-# Standard Declaration Procedures for Imeji System
-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]
-
-# 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]
-
-#Allow linking asset elemets across subdomains
-<IfModule mod_headers.c>
-    Header set Access-Control-Allow-Origin "*"
-</IfModule>
-