google does not support openid anymore; remove the openid provider buttons

[phorkie.git] / www / .htaccess

diff --git a/www/.htaccess b/www/.htaccess
index 60419bb2f9deebe018170b457fa3d9969150df22..7ab636477d96a4c82d6358dd7c9add81950f2f68 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -1,19 +1,28 @@
+# http://serverfault.com/questions/57243/apache-mod-rewrite-fails-when-file-by-same-name-exists
+Options -MultiViews
+
 RewriteEngine On
 RewriteBase /
 #RewriteCond %{REQUEST_FILENAME} -f
 
 RewriteRule ^([0-9]+)$ display.php?id=$1
+RewriteRule ^([0-9]+)/$ $1 [R]
 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]+)/edit/(.+)$ edit.php?id=$1&file=$2
+RewriteRule ^([0-9]+)/embed$ embed.php?id=$1
+RewriteRule ^([0-9]+)/embed/(.+)$ embed-file.php?id=$1&file=$2
 RewriteRule ^([0-9]+)/fork$ fork.php?id=$1
+RewriteRule ^([0-9]+)/linkback$ linkback.php?id=$1
 RewriteRule ^([0-9]+)/raw/(.+)$ raw.php?id=$1&file=$2
 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 ^help$ help.php
 RewriteRule ^new$ new.php
 
 RewriteRule ^feed/new$ feed-new.php
@@ -26,4 +35,5 @@ RewriteRule ^search$ search.php
 RewriteRule ^search/([0-9]+)$ search.php?page=$1
 
 RewriteRule ^login$ login.php
+RewriteRule ^setup$ setup.php
 RewriteRule ^user$ user.php