Merge branch 'master' of git.iamfabulous.de:files.iamfabulous.de

1 files changed, 13 insertions, 10 deletions

diff --git a/blob/nginx_rewrite_rules b/blob/nginx_rewrite_rules
index 34a4f20..eb6b0a2 100755
--- a/blob/nginx_rewrite_rules
+++ b/blob/nginx_rewrite_rules
@@ -8,35 +8,38 @@ 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;
+	rewrite ^/?login([?/]?.*) 					/index.php?task=login&arguments=$1	last;
 }
 
 location ~* ^/?logout/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-	rewrite ^/?logout([?/]?.*)                              /index.php?task=logout&arguments=$1	last;
+	rewrite ^/?logout([?/]?.*)                              	/index.php?task=logout&arguments=$1	last;
 }
 
 
 location ~* ^/?register/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-	rewrite ^/?register(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?	/index.php?task=register&arguments=$1	last;
+	rewrite ^/?register(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=register&arguments=$1	last;
 }
 
 location ~* ^/?invite/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-	rewrite ^/?invite(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?	/index.php?task=invite&arguments=$1	last;
+	rewrite ^/?invite(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=invite&arguments=$1	last;
 }
 
 location ~* ^/?user/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-        rewrite ^/?user(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?	/index.php?task=user&arguments=$1     	last;
+        rewrite ^/?user(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=user&arguments=$1     	last;
 }
 
 location ~* ^/?download/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
-        rewrite ^/?download(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?	/index.php?task=download&arguments=$1    last;
+        rewrite ^/?download(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?		/index.php?task=download&arguments=$1    last;
 }
 
-#location ~* \.php(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {}		#empty block to catch all
+location ~* ^/password_recover/?(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {
+        rewrite ^/?password_recover(\?[0-9a-zA-Z]*(=[0-9a-zA-Z]*)?)?	/index.php?task=password_recover&arguments=$1    last;
+}
+#location ~* \.php(\?[0-9a-zA-Z]+(=[0-9a-zA-Z]*)?)?$ {}			#empty block to catch all
 
 location / {
-	rewrite ^/([0-9a-zA-Z-_]+)/(.*)				/index.php?name=$1&folder=$2 		last;
-	rewrite ^/([0-9a-zA-Z-_]+)$				/index.php?name=$1&folder=		last;
-	rewrite ^/$						/index.php 				last;
+	rewrite ^/([0-9a-zA-Z-_]+)/(.*)					/index.php?name=$1&folder=$2 		last;
+	rewrite ^/([0-9a-zA-Z-_]+)$					/index.php?name=$1&folder=		last;
+	rewrite ^/$							/index.php 				last;
 	break;
 }