Merge branch 'master' into remotefork

[phorkie.git] / www / .htaccess

diff --git a/www/.htaccess b/www/.htaccess
index c1d339d65c02dfa5f4a39eb097533a2688e5a9d0..03bbf60fc5d26d5231538b3d36355584643c9f37 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -5,6 +5,7 @@ RewriteBase /
 RewriteRule ^([0-9]+)$ /display.php?id=$1
 RewriteRule ^([0-9]+)/delete$ /delete.php?id=$1
 RewriteRule ^([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1
+RewriteRule ^([0-9]+)/doap$ /doap.php?id=$1
 RewriteRule ^([0-9]+)/edit$ /edit.php?id=$1
 RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1
 RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2
@@ -12,6 +13,7 @@ RewriteRule ^([0-9]+)/rev/(.+)$ /revision.php?id=$1&rev=$2
 RewriteRule ^([0-9]+)/rev-raw/(.+)/(.+)$ /raw.php?id=$1&rev=$2&file=$3
 RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3
 
+RewriteRule ^fork-remote$ /fork-remote.php
 RewriteRule ^new$ /new.php
 
 RewriteRule ^list$ /list.php
@@ -20,7 +22,5 @@ RewriteRule ^list/([0-9]+)$ /list.php?page=$1
 RewriteRule ^search$ /search.php
 RewriteRule ^search/([0-9]+)$ /search.php?page=$1
 
-RewriteRule ^auth$ /auth.php
 RewriteRule ^login$ /login.php
-RewriteRule ^forbidden$ /forbidden.php
 RewriteRule ^user$ /user.php