From 8223faeddad7da792e577184187ce219548ea5b5 Mon Sep 17 00:00:00 2001
From: icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 2 Jun 2008 13:56:08 +0000
Subject: Marcus Povey <marcus@dushka.co.uk> * Moved handlers to
 engine/handlers/ to avoid them running foul of the callpath_gatekeeper..
 UPDATE YOUR .htaccess!

git-svn-id: https://code.elgg.org/elgg/trunk@770 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/handlers/action_handler.php | 20 ++++++++++++++++++++
 engine/handlers/pagehandler.php    | 26 ++++++++++++++++++++++++++
 htaccess_dist                      |  6 +++---
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 engine/handlers/action_handler.php
 create mode 100644 engine/handlers/pagehandler.php

diff --git a/engine/handlers/action_handler.php b/engine/handlers/action_handler.php
new file mode 100644
index 000000000..bdb21bbdf
--- /dev/null
+++ b/engine/handlers/action_handler.php
@@ -0,0 +1,20 @@
+<?php
+
+    /**
+	 * Elgg action handler
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+    /**
+     *  Load Elgg framework
+     */
+        require_once("../start.php");
+        $action = get_input("action");
+        action($action);
+    
+?>
diff --git a/engine/handlers/pagehandler.php b/engine/handlers/pagehandler.php
new file mode 100644
index 000000000..ba882a276
--- /dev/null
+++ b/engine/handlers/pagehandler.php
@@ -0,0 +1,26 @@
+<?php
+
+	/**
+	 * Elgg page handler
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// Load Elgg engine
+		require_once("../start.php");
+
+	// Get input
+		$handler = get_input('handler');
+		$page = get_input('page');
+		
+	// Call the page handler functions
+		if (!page_handler($handler, $page)) {
+			forward();
+		}
+
+?>
\ No newline at end of file
diff --git a/htaccess_dist b/htaccess_dist
index 10bfb1d5e..f44966365 100644
--- a/htaccess_dist
+++ b/htaccess_dist
@@ -7,8 +7,8 @@ php_flag magic_quotes_gpc off
 
 RewriteEngine on
 
-RewriteRule ^action\/([A-Za-z\_\-\/]+)$ action_handler.php?action=$1
-RewriteRule ^actions\/([A-Za-z\_\-\/]+)$ action_handler.php?action=$1
+RewriteRule ^action\/([A-Za-z\_\-\/]+)$ engine/handlers/action_handler.php?action=$1
+RewriteRule ^actions\/([A-Za-z\_\-\/]+)$ engine/handlers/action_handler.php?action=$1
 
 RewriteRule ^odd\/([0-9]+)\/$ services/export/handler.php?view=odd&guid=$1
 RewriteRule ^odd\/([0-9]+)\/([A-Za-z]+)\/([A-Za-z]+)\/$ services/export/handler.php?view=odd&guid=$1&type=$2&idname=$3
@@ -19,4 +19,4 @@ RewriteRule ^json\/([0-9]+)\/([A-Za-z]+)\/([A-Za-z]+)\/$ services/export/handler
 
 RewriteRule ^\_css\/css\.css$ _css/css.php
 
-RewriteRule ^pg\/([A-Za-z]+)\/(.*)$ pagehandler.php?handler=$1&page=$2
+RewriteRule ^pg\/([A-Za-z]+)\/(.*)$ engine/handlers/pagehandler.php?handler=$1&page=$2
-- 
cgit v1.2.3