' . $return_link);
}
}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 4b97375367..7a4c424192 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -441,6 +441,7 @@ $lang = array_merge($lang, array(
'VIEWING_UCP' => 'Viewing user control panel',
'VIEWS' => 'Views',
'VIEW_BOOKMARKS' => 'View bookmarks',
+ 'VIEW_FORUM_LOGS' => 'View Logs',
'VIEW_LATEST_POST' => 'View latest post',
'VIEW_NEWEST_POST' => 'View newest post',
'VIEW_NOTES' => 'View user notes',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 850dee2c23..23e6099e12 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -18,7 +18,7 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -30,10 +30,10 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACTION' => 'Action',
- 'ADD_FEEDBACK' => 'Add feedback',
- 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
- 'ADD_WARNING' => 'Add warning',
- 'ADD_WARNING_EXPLAIN' => 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
+ 'ADD_FEEDBACK' => 'Add feedback',
+ 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
+ 'ADD_WARNING' => 'Add warning',
+ 'ADD_WARNING_EXPLAIN' => 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
'ALL_ENTRIES' => 'All entries',
'ALREADY_REPORTED' => 'This post has already been reported',
'ALREADY_WARNED' => 'A warning has already been issued for this post',
@@ -75,7 +75,7 @@ $lang = array_merge($lang, array(
'FORUM_STYLE' => 'Forum Style',
'GLOBAL_ANNOUNCEMENT' => 'Global Announcement',
-
+
'IP_INFO' => 'IP Information',
'LATEST_LOGS' => 'Latest 5 logged actions',
@@ -112,6 +112,7 @@ $lang = array_merge($lang, array(
'LOG_USER_LOCK' => 'User locked own topic » %s',
'LOG_USER_MOVE_POSTS_USER' => 'Moved all posts to forum "%s"',
'LOG_USER_REACTIVATE_USER' => 'Forced user account re-activation',
+ 'LOGIN_EXPLAIN_MCP' => 'To moderate this forum you must login.',
'LOGVIEW_VIEWTOPIC' => 'View Topic',
'LOGVIEW_VIEWLOGS' => 'View Topic Log',
'LOGVIEW_VIEWFORUM' => 'View Forum',
@@ -201,10 +202,10 @@ $lang = array_merge($lang, array(
'POST_APPROVED_SUCCESS' => 'The selected post has been approved',
'POST_DELETED_SUCCESS' => 'The selected post has been successfully removed from the database',
'POST_DETAILS' => 'Post details',
- 'POST_LOCKED_SUCCESS' => 'Post locked successsfully',
+ 'POST_LOCKED_SUCCESS' => 'Post locked successfully',
'POST_NOT_EXIST' => 'The post you requested does not exist',
'POST_REPORTED_SUCCESS' => 'This post has been successfully reported',
- 'POST_UNLOCKED_SUCCESS' => 'Post unlocked successsfully',
+ 'POST_UNLOCKED_SUCCESS' => 'Post unlocked successfully',
'POST_UNRATED_SUCCESS' => 'Post unrated successfully',
'READ_USERNOTES' => 'User notes',
@@ -274,7 +275,7 @@ $lang = array_merge($lang, array(
'UNLOCK_TOPIC' => 'Unlock Topic',
'UNLOCK_TOPIC_CONFIRM' => 'Are you sure you want to unlock this topic?',
'UNLOCK_TOPICS' => 'Unlock selected topics',
- 'UNLOCK_TOPICS_CONFIRM' => 'Are you sure you want to unlock all selected topics?',
+ 'UNLOCK_TOPICS_CONFIRM' => 'Are you sure you want to unlock all selected topics?',
'UNRATE_POST' => 'Unrate post',
'UNRATE_POST_EXPLAIN' => 'Reset post rating',
'USER_CANNOT_POST' => 'You cannot post in this forum',
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index a89b1c9172..2f00a0ab26 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -31,7 +31,7 @@ $module = new p_master();
// Basic parameter data
$id = request_var('i', '');
-if (is_array($_REQUEST['mode']))
+if (isset($_REQUEST['mode']) && is_array($_REQUEST['mode']))
{
list($mode, ) = each(request_var('mode', array('')));
}
@@ -40,12 +40,6 @@ else
$mode = request_var('mode', '');
}
-if (isset($_REQUEST['quick']))
-{
- $mode = request_var('mode2', '');
- $action = '';
-}
-
// Make sure we are using the correct module
if ($mode == 'approve' || $mode == 'disapprove')
{
@@ -69,161 +63,141 @@ $action_ary = request_var('action', array('' => 0));
if (sizeof($action_ary))
{
- list($action, ) = each($action);
+ list($action, ) = each($action_ary);
}
unset($action_ary);
-if ($action == 'merge_select')
-{
- $mode = 'forum_view';
-}
-
if ($mode == 'topic_logs')
{
$id = 'logs';
$quickmod = false;
}
-// Topic view modes
-if (in_array($mode, array('split', 'split_all', 'split_beyond', 'merge', 'merge_posts')))
+$post_id = request_var('p', 0);
+$topic_id = request_var('t', 0);
+$forum_id = request_var('f', 0);
+$user_id = request_var('u', 0);
+$username = request_var('username', '');
+
+if ($post_id)
{
- $_REQUEST['action'] = $action = $mode;
- $mode = 'topic_view';
- $quickmod = false;
+ // We determine the topic and forum id here, to make sure the moderator really has moderative rights on this post
+ $sql = 'SELECT topic_id, forum_id
+ FROM ' . POSTS_TABLE . "
+ WHERE post_id = $post_id";
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ $topic_id = (int) $row['topic_id'];
+ $forum_id = (int) $row['forum_id'];
}
-// Forum view modes
-if (in_array($mode, array('resync')))
+if ($topic_id && !$forum_id)
{
- $_REQUEST['action'] = $action = $mode;
- $mode = 'forum_view';
- $quickmod = false;
+ $sql = 'SELECT forum_id
+ FROM ' . TOPICS_TABLE . "
+ WHERE topic_id = $topic_id";
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ $forum_id = (int) $row['forum_id'];
}
-if (!$quickmod)
+// If we do not have a forum id and the user is not a super moderator (global options are set to false, even if the user is able to moderator at least one forum
+if (!$forum_id && !$auth->acl_get('m_'))
{
- $post_id = request_var('p', 0);
- $topic_id = request_var('t', 0);
- $forum_id = request_var('f', 0);
- $user_id = request_var('u', 0);
- $username = request_var('username', '');
+ $forum_list = get_forum_list('m_');
-
- if ($post_id)
+ if (!sizeof($forum_list))
{
- // We determine the topic and forum id here, to make sure the moderator really has moderative rights on this post
- $sql = 'SELECT topic_id, forum_id
- FROM ' . POSTS_TABLE . "
- WHERE post_id = $post_id";
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
-
- $topic_id = (int) $row['topic_id'];
- $forum_id = (int) $row['forum_id'];
+ trigger_error('MODULE_NOT_EXIST');
}
- if ($topic_id && !$forum_id)
+ // We do not check all forums, only the first one should be sufficiant.
+ $forum_id = $forum_list[0];
+}
+
+if($forum_id)
+{
+ $module->acl_forup_id = $forum_id;
+}
+
+// Instantiate module system and generate list of available modules
+$module->list_modules('mcp');
+
+if ($quickmod)
+{
+ $mode = 'quickmod';
+
+ switch ($action)
{
- $sql = 'SELECT forum_id
- FROM ' . TOPICS_TABLE . "
- WHERE topic_id = $topic_id";
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
+ case 'lock':
+ case 'unlock':
+ case 'lock_post':
+ case 'unlock_post':
+ case 'make_sticky':
+ case 'make_announce':
+ case 'make_global':
+ case 'make_normal':
+ case 'fork':
+ case 'move':
+ case 'delete_post':
+ case 'delete_topic':
+ $module->load('mcp', 'main', 'quickmod');
+ exit;
- $forum_id = (int) $row['forum_id'];
+ case 'topic_logs':
+ $module->set_active('logs', 'topic_logs');
+ break;
+
+ default:
+ trigger_error("$action not allowed as quickmod");
}
-
- // If we do not have a forum id and the user is not a super moderator (global options are set to false, even if the user is able to moderator at least one forum
- if (!$forum_id && !$auth->acl_get('m_'))
- {
- $forum_list = get_forum_list('m_');
-
- if (!sizeof($forum_list))
- {
- trigger_error('MODULE_NOT_EXIST');
- }
-
- // We do not check all forums, only the first one should be sufficiant.
- $forum_id = $forum_list[0];
- }
-
- if($forum_id)
- {
- $module->acl_forup_id = $forum_id;
- }
-
- // Instantiate module system and generate list of available modules
- $module->list_modules('mcp');
-
+}
+else
+{
// Select the active module
$module->set_active($id, $mode);
-
- // Hide some of the options if we don't have the relevant information to use them
- if (!$post_id)
- {
- $module->set_display('post_details', false);
- $module->set_display('warn_post', false);
- }
- if (!$topic_id)
- {
- $module->set_display('topic_view', false);
- $module->set_display('topic_logs', false);
- }
- if (!$forum_id)
- {
- $module->set_display('forum_view', false);
- $module->set_display('forum_logs', false);
- }
- if (!$user_id && $username == '')
- {
- $module->set_display('user_notes', false);
- $module->set_display('warn_user', false);
- }
-
- // Load and execute the relevant module
- $module->load_active();
-
- // Assign data to the template engine for the list of modules
- $module->assign_tpl_vars("mcp.$phpEx$SID");
-
- // Generate the page
- page_header($user->lang['MCP_MAIN']);
-
- $template->set_filenames(array(
- 'body' => $module->get_tpl_name())
- );
-
- page_footer();
-
}
-switch ($mode)
+// Hide some of the options if we don't have the relevant information to use them
+if (!$post_id)
{
- case 'lock':
- case 'unlock':
- case 'lock_post':
- case 'unlock_post':
- $module->load('mcp', 'main', $mode);
- break;
- case 'make_sticky':
- case 'make_announce':
- case 'make_global':
- case 'make_normal':
- $module->load('mcp', 'main', $mode);
- break;
- case 'fork':
- case 'move':
- $module->load('mcp', 'main', $mode);
- break;
- case 'delete_post':
- case 'delete_topic':
- $module->load('mcp', 'main', $mode);
- break;
- default:
- trigger_error("$mode not allowed as quickmod");
+ $module->set_display('post_details', false);
+ $module->set_display('warn_post', false);
}
+if (!$topic_id)
+{
+ $module->set_display('topic_view', false);
+ $module->set_display('topic_logs', false);
+}
+if (!$forum_id)
+{
+ $module->set_display('forum_view', false);
+ $module->set_display('forum_logs', false);
+}
+if (!$user_id && $username == '')
+{
+ $module->set_display('user_notes', false);
+ $module->set_display('warn_user', false);
+}
+
+// Load and execute the relevant module
+$module->load_active();
+
+// Assign data to the template engine for the list of modules
+$module->assign_tpl_vars("mcp.$phpEx$SID");
+
+// Generate the page
+page_header($user->lang['MCP_MAIN']);
+
+$template->set_filenames(array(
+ 'body' => $module->get_tpl_name())
+);
+
+page_footer();
/**
* Functions used to generate additional URL paramters
@@ -573,7 +547,4 @@ function check_ids(&$ids, $table, $sql_id, $acl_list = false)
return $forum_id;
}
-// LITTLE HELPER
-//
-
?>
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html
index cd5e368e79..834e7852e5 100644
--- a/phpBB/styles/subSilver/template/mcp_forum.html
+++ b/phpBB/styles/subSilver/template/mcp_forum.html
@@ -2,6 +2,8 @@
+ {L_VIEW_FORUM_LOGS}
+