Remove webfolders and merge Apache config files

daniel-lerch · Jul 27, 2020 · 332728b · 332728b
1 parent 41a9a3e
commit 332728b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,9 @@
 /download/
 /my_images/
 /templates_c/
-/.webfolders/
-/webfolders/
 
 # Development files
+/.vs/
 /vendor/
 *.phar
 

diff --git a/.htaccess b/.htaccess
@@ -1,6 +1,7 @@
 # Prevent access to some application files
 <ifModule mod_rewrite.c>
     RewriteEngine on
+
     RewriteCond "%{REQUEST_URI}" "^\/.git" [OR]
     RewriteCond "%{REQUEST_URI}" "^\/.docker" [OR]
     RewriteCond "%{REQUEST_URI}" "^\/config" [OR]
@@ -16,5 +17,7 @@
     RewriteCond "%{REQUEST_URI}" "^\/LICENSE$" [OR]
     RewriteCond "%{REQUEST_URI}" "^\/README\.md$" [OR]
     RewriteCond "%{REQUEST_URI}" "\.inc$"
-    RewriteRule .* - [R=404]
+    RewriteRule .* - [L,R=404]
+
+    RewriteRule ^form/([^/]*)(?:/([^/]*))?(?:/([^/]*))?$ subscription/form.php?form=$1&action=$2&key=$3 [L,QSA]
 </ifModule>
diff --git a/_.htaccess b/_.htaccess