' . sprintf($user->lang['Click_return_mcp'], '', '');
-// Check destination forum or topic if applicable
+// Build up return links and acl list
+// $acl_list_src contains the acl list for source forum(s)
+// $acl_list_trg contains the acl list for destination forum(s)
+
+$acl_list_src = array('m_', 'a_');
+$acl_list_trg = array('m_', 'a_');
+$return_mode = '
' . sprintf($user->lang['Click_return_mcp'], '', '');
if ($forum_id)
@@ -421,15 +437,22 @@ if (!$mode)
{
$mode = 'front';
}
-
}
+switch ($mode)
+{
+ case 'merge':
+ case 'split':
+ $tabs[$mode] = $mcp_url . '&=' . $mode;
+ break;
+}
// Get the current tab from the mode
+// TODO: find a better way to handle this
$tabs_mode = array(
'mod_queue' => 'mod_queue',
'post_reports' => 'post_reports',
- 'split' => 'topic_view',
- 'merge' => (empty($_GET['post_id_list'])) ? 'topic_view' : 'merge',
+ 'split' => 'split',
+ 'merge' => 'merge',
'ip' => 'post_details',
'forum_view' => 'forum_view',
'topic_view' => 'topic_view',
@@ -453,11 +476,11 @@ foreach ($tabs as $tab_name => $tab_link)
// Current modes:
// - resync Resyncs topics
// - delete_posts Delete posts, displays confirmation if unconfirmed
-// - delete Delete topics, displays confirmation
+// - delete_topics Delete topics, displays confirmation
// - select_topic Forward the user to forum view to select a destination topic for the merge
// - merge Topic view, only displays the Merge button
// - split Topic view, only displays the split buttons
-// - massdelete Topic view, only displays the Delete button
+// - delete Topic view, only displays the Delete button
// - topic_view Topic view, similar to viewtopic.php
// - forum_view Forum view, similar to viewforum.php
// - move Move selected topic(s), displays the forums list for confirmation. Used for quickmod as well
@@ -468,7 +491,7 @@ foreach ($tabs as $tab_name => $tab_link)
// TODO:
// - split_all Actually split selected topic
// - split_beyond Actually split selected topic
-// - post_details Displays post details. Has quick links to (un)approve post.
+// - post_details Displays post details. Has quick links to (un)approve post.
// - mod_queue Displays a list or unapproved posts and/or topics. I haven't designed the interface yet but it will have to be able to filter/order them by type (posts/topics), by timestamp or by forum.
// - post_reports Displays a list of reported posts. No interface yet, must be able to order them by priority(?), type, timestamp or forum. Action: view all (default), read, delete.
// - approve/unapprove Actually un/approve selected topic(s) or post(s). NOTE: after some second thoughts we'll need three modes: (which names are still to be decided) the first to approve items, the second to set them back as "unapproved" and a third one to "disapprove" them. (IOW, delete them and eventually send a notification to the user)
@@ -539,7 +562,7 @@ switch ($mode)
));
break;
- case 'delete':
+ case 'delete_topics':
if (!$topic_id_list)
{
trigger_error('Line : ' . __LINE__ . '