From d0e51959b0b699d7beb58d7ea8310c58f4cdc92a Mon Sep 17 00:00:00 2001
From: Sudaraka Wijesinghe <sudaraka.wijesinghe@gmail.com>
Date: Sun, 19 Aug 2012 04:04:52 +0530
Subject: [PATCH] * Added acronym for AGPL. * Blocked all actions except for
 displaying content.

---
 .gitignore               |  1 +
 .htaccess                |  6 +++++-
 conf/acl.auth.php.dist   | 21 ---------------------
 conf/acronyms.conf       |  3 ++-
 conf/users.auth.php.dist | 10 ----------
 doku.php                 |  3 +++
 6 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100644 conf/acl.auth.php.dist
 delete mode 100644 conf/users.auth.php.dist

diff --git a/.gitignore b/.gitignore
index 0df62b5..c9a9dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 data
 conf/local.php
+.dropbox
 lib/tpl/*
 !lib/tpl/index.php
diff --git a/.htaccess b/.htaccess
index 06d1551..32a1af0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -27,7 +27,10 @@ RewriteEngine on
 #RewriteRule ^lib/exe/xmlrpc.php$      https://%{SERVER_NAME}%{REQUEST_URI} [L,R=301]
 ##
 
-RewriteRule ^category/(.*)$				/$1 [R=302,L]
+RewriteRule ^(category|tag|about-the-web-site|about-sudaraka-wijesinghe)/(.+)$			/$2 [R=302,L]
+RewriteRule ^(projects|project-gallery)/(.*)$				/portfolio/$2 [R=302,L]
+RewriteRule ^testimonials/(.*)			/testimonials [R=302,L]
+RewriteRule ^(.+)/page/(\d*)			/$1 [R=302,L]
 RewriteRule ^n2s/?$						/note-to-self [R=302,L]
 RewriteRule ^n2s/(.*)$					/note-to-self/$1 [R=302,L]
 RewriteRule ^(.*/)?snippets/(.*)$		/code-snippets/$2 [R=302,L]
@@ -35,6 +38,7 @@ RewriteRule ^(.*/)?snippets/(.*)$		/code-snippets/$2 [R=302,L]
 RewriteRule ^_media/(.*)				lib/exe/fetch.php?media=$1  [QSA,L]
 RewriteRule ^_detail/(.*)				lib/exe/detail.php?media=$1  [QSA,L]
 RewriteRule ^_export/([^/]+)/(.*)		doku.php?do=export_$1&id=$2  [QSA,L]
+RewriteRule ^sitemap\.xml				doku.php?do=sitemap  [QSA,L]
 RewriteRule (.+)\/$						/$1 [R,QSA,L]
 RewriteRule ^$							doku.php  [L]
 RewriteCond %{REQUEST_FILENAME}			!-f
diff --git a/conf/acl.auth.php.dist b/conf/acl.auth.php.dist
deleted file mode 100644
index 14344d7..0000000
--- a/conf/acl.auth.php.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-# acl.auth.php
-# <?php exit()?>
-# Don't modify the lines above
-#
-# Access Control Lists
-#
-# Editing this file by hand shouldn't be necessary. Use the ACL
-# Manager interface instead.
-#
-# If your auth backend allows special char like spaces in groups
-# or user names you need to urlencode them (only chars <128, leave
-# UTF-8 multibyte chars as is)
-#
-# none   0
-# read   1
-# edit   2
-# create 4
-# upload 8
-# delete 16
-
-*               @ALL        8
diff --git a/conf/acronyms.conf b/conf/acronyms.conf
index 0ff1a3b..a8d3c5f 100644
--- a/conf/acronyms.conf
+++ b/conf/acronyms.conf
@@ -5,6 +5,7 @@ ACL          Access Control List
 AFAICS       As far as I can see
 AFAIK        As far as I know
 AFAIR        As far as I remember
+AGPL         Affero General Public License
 AJAX         Asynchronous JavaScript and XML
 AIM          AOL (America Online) Instant Messenger
 AOL          America Online
@@ -41,7 +42,7 @@ GCE			 General Certificate of Education
 GHz          Gigahertz
 GIF          Graphics Interchange Format
 GNU			 GNU is Not Unix
-GPL          GNU General Public License
+GPL          General Public License
 GUI          Graphical User Interface
 HTML         HyperText Markup Language
 HTTP         Hyper Text Transfer Protocol
diff --git a/conf/users.auth.php.dist b/conf/users.auth.php.dist
deleted file mode 100644
index 6576eeb..0000000
--- a/conf/users.auth.php.dist
+++ /dev/null
@@ -1,10 +0,0 @@
-# users.auth.php
-# <?php exit()?>
-# Don't modify the lines above
-#
-# Userfile
-#
-# Format:
-#
-# user:MD5password:Real Name:email:groups,comma,seperated
-
diff --git a/doku.php b/doku.php
index 9cc0cf8..9f3acc4 100644
--- a/doku.php
+++ b/doku.php
@@ -23,6 +23,9 @@ if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){
     $ACT = 'show';
 }
 
+//Disable over HTTP edits
+if(!in_array($ACT, array('show', 'sitemap', 'export'))) $ACT = 'show';
+
 // load and initialize the core system
 require_once(DOKU_INC.'inc/init.php');
 
-- 
2.1.4