From bb7a03f738c97dc225873691c459f2bf9e612ef6 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 27 Jul 2011 12:57:58 +0100
Subject: [ticket/10281] AJAXified reordering forums in the ACP.

PHPBB3-10281
---
 phpBB/includes/acp/acp_forums.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/includes/acp/acp_forums.php')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index fad22fc285..d3e2dbd904 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -255,6 +255,12 @@ class acp_forums
 					add_log('admin', 'LOG_FORUM_' . strtoupper($action), $row['forum_name'], $move_forum_name);
 					$cache->destroy('sql', FORUMS_TABLE);
 				}
+				
+				if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest')
+				{
+					echo json_encode(array('success' => ($move_forum_name !== false)));
+					exit;
+				}
 
 			break;
 
-- 
cgit v1.2.1


From 94172b54dd09b28e19b4b12933b3f96e498d264a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Fri, 19 Aug 2011 09:38:57 +0100
Subject: [ticket/10271] Changed AJAX functions to $request->is_ajax().

PHPBB3-10271
---
 phpBB/includes/acp/acp_forums.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/acp/acp_forums.php')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index d3e2dbd904..cb410e361a 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -25,7 +25,7 @@ class acp_forums
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $cache;
+		global $db, $user, $auth, $template, $cache, $request;
 		global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx;
 
 		$user->add_lang('acp/forums');
@@ -256,7 +256,7 @@ class acp_forums
 					$cache->destroy('sql', FORUMS_TABLE);
 				}
 				
-				if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest')
+				if ($request->is_ajax())
 				{
 					echo json_encode(array('success' => ($move_forum_name !== false)));
 					exit;
-- 
cgit v1.2.1


From dce38f44de04bd7a1f91f8e57f6d266bd5e1af86 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Fri, 19 Aug 2011 10:45:03 +0100
Subject: [ticket/10328] Added a JSON class.

The JSON class adds a consistent way to send JSON to the client, making
it perfect for AJAX (jQuery automatically parses it).

PHPBB3-10328
---
 phpBB/includes/acp/acp_forums.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes/acp/acp_forums.php')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index cb410e361a..6c05b1e108 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -258,8 +258,7 @@ class acp_forums
 				
 				if ($request->is_ajax())
 				{
-					echo json_encode(array('success' => ($move_forum_name !== false)));
-					exit;
+					JSON::send(array('success' => ($move_forum_name !== false)));
 				}
 
 			break;
-- 
cgit v1.2.1


From 7a933bdb5ad4a9bc4877a7d4d516fa0b21d9e4c0 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 12:25:54 +0100
Subject: [ticket/10328] Renamed the JSON class, also now using autoloading.

It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.

PHPBB3-10328
---
 phpBB/includes/acp/acp_forums.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/acp/acp_forums.php')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 6c05b1e108..3a3b2021eb 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -258,7 +258,8 @@ class acp_forums
 				
 				if ($request->is_ajax())
 				{
-					JSON::send(array('success' => ($move_forum_name !== false)));
+					$json_response = new phpbb_json_response;
+					$json_response->send(array('success' => ($move_forum_name !== false)));
 				}
 
 			break;
-- 
cgit v1.2.1