summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorus32014-03-30 00:05:53 +0100
committerHorus32014-03-30 00:05:53 +0100
commit68b22caf30f9be7451c3f1473827e65737b1c1f7 (patch)
tree308cabf6b1a8f89d3f8060af0d55205312def596
parentf471b2130461efa25c62dbe8b015da6219cf3498 (diff)
downloadfiles.iamfabulous.de-68b22caf30f9be7451c3f1473827e65737b1c1f7.tar.gz
Removed nonsense. Also cleaned the index.php
-rwxr-xr-xblob/nginx_rewrite_rules10
-rwxr-xr-xwww/include.php2
-rwxr-xr-xwww/index.php2
3 files changed, 9 insertions, 5 deletions
diff --git a/blob/nginx_rewrite_rules b/blob/nginx_rewrite_rules
index eb6b0a2..e6783f0 100755
--- a/blob/nginx_rewrite_rules
+++ b/blob/nginx_rewrite_rules
@@ -1,11 +1,15 @@
-error_page 401 403 404 /httperror.php?e=40x;
-error_page 500 502 504 /httperror.php?e=50x;
+error_page 401 /httperror.php?e=401;
+error_page 403 /httperror.php?e=403;
+error_page 404 /httperror.php?e=404;
+
+error_page 500 /httperror.php?e=500;
+error_page 502 /httperror.php?e=502;
+error_page 504 /httperror.php?e=504;
location /robots.txt {} #stop rewriting the robots.txt
location /favicon.ico {}
location /static {}
-#location ~* ^/.+[^/].+\.css {}
location ~* ^/?login/?([a-z0-9]+=[a-z0-9]+(&[a-z0-9]+=[a-z0-9]+)?)?$ {
rewrite ^/?login([?/]?.*) /index.php?task=login&arguments=$1 last;
diff --git a/www/include.php b/www/include.php
index 69e6227..e24a0c3 100755
--- a/www/include.php
+++ b/www/include.php
@@ -1,5 +1,7 @@
<?php
+$db = new SQLite3("../database/sqlite.db");
+
$scheme="http://";
if(isset($_SERVER["HTTPS"])){
diff --git a/www/index.php b/www/index.php
index 841cf12..73c9b5d 100755
--- a/www/index.php
+++ b/www/index.php
@@ -3,8 +3,6 @@ session_start();
require_once("include.php"); // handles all the stuff that needs to be included
-$db = new SQLite3("../database/sqlite.db");
-
if(!isset($_SESSION["login"])){
$_SESSION["login"] = false;
}