From 6f56dc8568da4cdf6e1fce0dc46f8174ce58b5fd Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 16 Feb 2015 19:51:09 +0100 Subject: [PATCH 1/2] [ticket/11424] Handle race condition properly for Quick-Mod Tools PHPBB3-11424 --- phpBB/includes/mcp/mcp_main.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 1241b8bd0e..8933a6f2ac 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -226,6 +226,31 @@ class mcp_main break; default: + if($quickmod) + { + switch($action) + { + case 'lock': + case 'unlock': + case 'make_announce': + case 'make_sticky': + case 'make_global': + case 'make_normal': + case 'make_onindex': + case 'move': + case 'fork': + case 'delete_topic': + trigger_error('TOPIC_NOT_EXIST'); + break; + + case 'lock_post': + case 'unlock_post': + case 'delete_post': + trigger_error('POST_NOT_EXIST'); + break; + } + } + trigger_error('NO_MODE', E_USER_ERROR); break; } From 8d6ab63fea22edd6b57435891cd0cd28c9774b20 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Thu, 19 Feb 2015 22:07:26 +0100 Subject: [PATCH 2/2] [ticket/11424] Add space between control flow keywords and parenthesis PHPBB3-11424 --- phpBB/includes/mcp/mcp_main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 8933a6f2ac..10f1a5b8c1 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -226,9 +226,9 @@ class mcp_main break; default: - if($quickmod) + if ($quickmod) { - switch($action) + switch ($action) { case 'lock': case 'unlock':