diff options
| -rw-r--r-- | blob/nginx_rewrite_rules | 9 | ||||
| -rw-r--r-- | www/functions.php | 4 | ||||
| -rw-r--r-- | www/login.php | 6 | ||||
| -rw-r--r-- | www/register.php | 6 | ||||
| -rw-r--r-- | www/static/footer.html (renamed from www/footer.html) | 2 | ||||
| -rw-r--r-- | www/static/header.html (renamed from www/header.html) | 2 | ||||
| -rw-r--r-- | www/static/login.css (renamed from www/login.css) | 0 | ||||
| -rw-r--r-- | www/static/logo.png (renamed from www/logo.png) | bin | 121360 -> 121360 bytes | |||
| -rw-r--r-- | www/static/register.css (renamed from www/register.css) | 0 | ||||
| -rw-r--r-- | www/static/style.css (renamed from www/style.css) | 0 |
10 files changed, 15 insertions, 14 deletions
diff --git a/blob/nginx_rewrite_rules b/blob/nginx_rewrite_rules index 662362c..0b925f3 100644 --- a/blob/nginx_rewrite_rules +++ b/blob/nginx_rewrite_rules @@ -1,11 +1,12 @@ location /robots.txt {} #stop rewriting the robots.txt location /favicon.ico {} -location ~* ^/.+[^/].+\.css {} -location ~* ^/.+[^/].+\.png {} +location /static {} +#location ~* ^/.+[^/].+\.css {} +#location ~* ^/.+[^/].+\.png {} -location ~* ^/?login(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ { - rewrite ^/?login(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)? /index.php?task=login&arguments=$1 last; +location ~* ^/?login(/?[a-z0-9]+=[a-z0-9]+(&[a-z0-9]+=[a-z0-9]+)?)?$ { + rewrite ^/?login([?/]?.*) /index.php?task=login&arguments=$1 last; } location ~* ^/?logout(/?\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ { diff --git a/www/functions.php b/www/functions.php index ebad519..3e29ffd 100644 --- a/www/functions.php +++ b/www/functions.php @@ -232,11 +232,11 @@ function register($db){ } } } else { - foreach ($_GET as $name => $value) { + /* foreach ($_GET as $name => $value) { echo 'Name: ' . $name . ' Value: ' . $value . '<br />'; } - /*echo "<form method='post' action='register'> + echo "<form method='post' action='register'> <p>Name: <input type='text' name='name'></p> <p>pswd: <input type='password' name='pswd'></p> <p>2ndpsdw: <input type='password' name='2ndpswd'></p> diff --git a/www/login.php b/www/login.php index e28b940..fbb6356 100644 --- a/www/login.php +++ b/www/login.php @@ -12,9 +12,9 @@ */ ?> -<?php include("header.html");?> +<?php include("static/header.html");?> - <link rel="stylesheet" type="text/css" href="login.css"> + <link rel="stylesheet" type="text/css" href="static/login.css"> <div class="login-area"> <h1 class="login-area"> Log in </h1> @@ -27,4 +27,4 @@ </form> </div> -<?php include("footer.html");?> +<?php include("static/footer.html");?> diff --git a/www/register.php b/www/register.php index 670e0c4..daf6afa 100644 --- a/www/register.php +++ b/www/register.php @@ -14,8 +14,8 @@ ?> -<?php include("header.html");?> - <link rel="stylesheet" type="text/css" href="register.css"> +<?php include("static/header.html");?> + <link rel="stylesheet" type="text/css" href="static/register.css"> <div class="register-area"> <h1 class="register-area"> Register </h1> @@ -32,4 +32,4 @@ </form> </div> -<?php include("footer.html");?> +<?php include("static/footer.html");?> diff --git a/www/footer.html b/www/static/footer.html index 03128ea..f5ceae8 100644 --- a/www/footer.html +++ b/www/static/footer.html @@ -2,7 +2,7 @@ </div><!-- div content-area--> </div><!-- div page-wrap--> <footer> - <p id="copyright-text"> Copyright Maximilian Möhring und Oliver Weissbarth 2014 </p> + <p id="copyright-text"> Copyright Maximilian Möhring und Oliver Weissbarth 2014 </p> </footer> </body> </html> diff --git a/www/header.html b/www/static/header.html index 9c94d03..de1ff79 100644 --- a/www/header.html +++ b/www/static/header.html @@ -2,7 +2,7 @@ <html> <head> <title>VFS</title> - <link rel="stylesheet" href="style.css"> + <link rel="stylesheet" href="static/style.css"> </head> <body> diff --git a/www/login.css b/www/static/login.css index 6bd8a5e..6bd8a5e 100644 --- a/www/login.css +++ b/www/static/login.css diff --git a/www/logo.png b/www/static/logo.png Binary files differindex c1be2fa..c1be2fa 100644 --- a/www/logo.png +++ b/www/static/logo.png diff --git a/www/register.css b/www/static/register.css index 58f645d..58f645d 100644 --- a/www/register.css +++ b/www/static/register.css diff --git a/www/style.css b/www/static/style.css index 65c97f6..65c97f6 100644 --- a/www/style.css +++ b/www/static/style.css |
