- added splitting of topics to mcp

- added merging of posts to mcp - fixed parsing of acl_getf results - adjusted tracking code for important announcements (seems to work now) git-svn-id: file:///svn/phpbb/trunk@4923 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-31 22:10:45 +02:00 · 2004-07-09 12:31:33 +00:00
parent e083255f66
commit bdd1643a7d
10 changed files with 427 additions and 61 deletions
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -186,4 +186,6 @@ function mcp_front_view($id, $mode, $action, $url)

 	$template->assign_var('S_MCP_ACTION', $url);
 	make_jumpbox($url . '&amp;mode=forum_view', 0, false, 'm_');
-}
+}
+
+?>
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -104,7 +104,7 @@ class mcp_main extends module
 		
 				if (!$post_ids)
 				{
-					trigger_error('NO_TOPIC_SELECTED');
+					trigger_error('NO_POST_SELECTED');
 				}

 				mcp_delete_post($post_ids);
@@ -211,13 +211,23 @@ function get_array($var, $default_value)
 // LITTLE HELPER

 // Build simple hidden fields from array
-function build_hidden_fields($name, $vars)
+function build_hidden_fields($field_ary)
 {
 	$s_hidden_fields = '';

-	foreach ($vars as $key => $value)
+	foreach ($field_ary as $name => $vars)
 	{
-		$s_hidden_fields .= '<input type="hidden" name="' . $name . '[' . $key . ']" value="' . ((is_string($value)) ? htmlspecialchars($value) : (int) $value) . '" />';
+		if (is_array($vars))
+		{
+			foreach ($vars as $key => $value)
+			{
+				$s_hidden_fields .= '<input type="hidden" name="' . $name . '[' . $key . ']" value="' . $value . '" />';
+			}
+		}
+		else
+		{
+			$s_hidden_fields .= '<input type="hidden" name="' . $name . '" value="' . $vars . '" />';
+		}
 	}

 	return $s_hidden_fields;
@@ -552,9 +562,11 @@ function lock_unlock($mode, $ids)
 	
 	$redirect = request_var('redirect', $user->data['session_page']);

-	$s_hidden_fields = build_hidden_fields($sql_id . '_list', $ids);
-	$s_hidden_fields .= '<input type="hidden" name="mode" value="' . $mode . '" />';
-	$s_hidden_fields .= '<input type="hidden" name="redirect" value="' . $redirect . '" />';
+	$s_hidden_fields = build_hidden_fields(array(
+		$sql_id . '_list'	=> $ids,
+		'mode'				=> $mode,
+		'redirect'			=> $redirect)
+	);
 	$success_msg = '';

 	if (confirm_box(true))
@@ -632,10 +644,12 @@ function change_topic_type($mode, $topic_ids)

 	$redirect = request_var('redirect', $user->data['session_page']);

-	$s_hidden_fields = build_hidden_fields('topic_id_list', $topic_ids);
-	$s_hidden_fields .= '<input type="hidden" name="f" value="' . $forum_id . '" />';
-	$s_hidden_fields .= '<input type="hidden" name="mode" value="' . $mode . '" />';
-	$s_hidden_fields .= '<input type="hidden" name="redirect" value="' . $redirect . '" />';
+	$s_hidden_fields = build_hidden_fields(array(
+		'topic_id_list'	=> $topic_ids,
+		'f'				=> $forum_id,
+		'mode'			=> $mode,
+		'redirect'		=> $redirect)
+	);
 	$success_msg = '';

 	if (confirm_box(true))
@@ -713,10 +727,12 @@ function mcp_move_topic($topic_ids)
 	$redirect = request_var('redirect', $user->data['session_page']);
 	$additional_msg = $success_msg = '';

-	$s_hidden_fields = build_hidden_fields('topic_id_list', $topic_ids);
-	$s_hidden_fields .= '<input type="hidden" name="f" value="' . $forum_id . '" />';
-	$s_hidden_fields .= '<input type="hidden" name="mode" value="move" />';
-	$s_hidden_fields .= '<input type="hidden" name="redirect" value="' . $redirect . '" />';
+	$s_hidden_fields = build_hidden_fields(array(
+		'topic_id_list'	=> $topic_ids,
+		'f'				=> $forum_id,
+		'mode'			=> 'move',
+		'redirect'		=> $redirect)
+	);

 	if ($to_forum_id)
 	{
@@ -855,10 +871,12 @@ function mcp_delete_topic($topic_ids)

 	$redirect = request_var('redirect', $user->data['session_page']);

-	$s_hidden_fields = build_hidden_fields('topic_id_list', $topic_ids);
-	$s_hidden_fields .= '<input type="hidden" name="f" value="' . $forum_id . '" />';
-	$s_hidden_fields .= '<input type="hidden" name="mode" value="delete_topic" />';
-	$s_hidden_fields .= '<input type="hidden" name="redirect" value="' . $redirect . '" />';
+	$s_hidden_fields = build_hidden_fields(array(
+		'topic_id_list'	=> $topic_ids,
+		'f'				=> $forum_id,
+		'mode'			=> 'delete_topic',
+		'redirect'		=> $redirect)
+	);
 	$success_msg = '';

 	if (confirm_box(true))
@@ -911,10 +929,12 @@ function mcp_delete_post($post_ids)

 	$redirect = request_var('redirect', $user->data['session_page']);

-	$s_hidden_fields = build_hidden_fields('post_id_list', $post_ids);
-	$s_hidden_fields .= '<input type="hidden" name="f" value="' . $forum_id . '" />';
-	$s_hidden_fields .= '<input type="hidden" name="mode" value="delete_post" />';
-	$s_hidden_fields .= '<input type="hidden" name="redirect" value="' . $redirect . '" />';
+	$s_hidden_fields = build_hidden_fields(array(
+		'post_id_list'	=> $post_ids,
+		'f'				=> $forum_id,
+		'mode'			=> 'delete_post',
+		'redirect'		=> $redirect)
+	);
 	$success_msg = '';

 	if (confirm_box(true))
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -84,6 +84,35 @@ function mcp_post_details($id, $mode, $action, $url)
 			);
 			break;

+		case 'chgposter':
+
+			$new_user = request_var('u', 0);
+
+			if ($new_user && $auth->acl_get('m_', $post_info['forum_id']) && $new_user != $post_info['user_id'])
+			{
+				$sql = 'UPDATE ' . POSTS_TABLE . "
+					SET poster_id = $new_user
+					WHERE post_id = $post_id";
+				$db->sql_query($sql);
+
+				if ($post_info['topic_last_post_id'] == $post_info['post_id'] || $post_info['forum_last_post_id'] == $post_info['post_id'])
+				{
+					sync('topic', 'topic_id', $post_info['topic_id'], false, false);
+					sync('forum', 'forum_id', $post_info['forum_id'], false, false);
+				}
+				
+				// Renew post info
+				$post_info = get_post_data(array($post_id));
+
+				if (!sizeof($post_info))
+				{
+					trigger_error($user->lang['POST_NOT_EXIST']);
+				}
+
+				$post_info = $post_info[$post_id];
+			}
+			break;
+
 		default:
 	}

@@ -215,4 +244,6 @@ function mcp_post_details($id, $mode, $action, $url)
 		}
 	}

-}
+}
+
+?>
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -23,7 +23,6 @@ function mcp_topic_view($id, $mode, $action, $url)
 	$user->add_lang('viewtopic');

 	$topic_id = request_var('t', 0);
-	
 	$topic_info = get_topic_data(array($topic_id));

 	if (!sizeof($topic_info))
@@ -42,8 +41,25 @@ function mcp_topic_view($id, $mode, $action, $url)

 	$post_id_list = get_array('post_id_list', 0);

+	// Split Topic?
+	if ($action == 'split_all' || $action == 'split_beyond')
+	{
+		split_topic($action, $topic_id, $to_forum_id, $subject);
+	}
+
+	// Merge Posts?
+	if ($action == 'merge_posts')
+	{
+		merge_posts($topic_id, $to_topic_id);
+	}
+	
 	$topics_per_page = ($topic_info['forum_topics_per_page']) ? $topic_info['forum_topics_per_page'] : $config['topics_per_page'];

+	if ($action == 'split' && !$subject)
+	{
+		$subject = $topic_info['topic_title'];
+	}
+
 	// Jumpbox, sort selects and that kind of things
 	make_jumpbox($url . '&amp;mode=forum_view', $topic_info['forum_id'], false, 'm_');
 	mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id);
@@ -176,8 +192,8 @@ function mcp_topic_view($id, $mode, $action, $url)

 		'S_MCP_ACTION'		=> "$url&amp;mode=$mode&amp;start=$start",
 		'S_FORUM_SELECT'	=> '<select name="to_forum_id">' . (($to_forum_id) ? make_forum_select($to_forum_id) : make_forum_select($topic_info['forum_id'])) . '</select>',
-		'S_CAN_SPLIT'		=> ($auth->acl_get('m_split', $topic_info['forum_id'])) ? true : false,
-		'S_CAN_MERGE'		=> ($auth->acl_get('m_merge', $topic_info['forum_id'])) ? true : false,
+		'S_CAN_SPLIT'		=> ($auth->acl_get('m_split', $topic_info['forum_id']) && $action != 'merge') ? true : false,
+		'S_CAN_MERGE'		=> ($auth->acl_get('m_merge', $topic_info['forum_id']) && $action != 'split') ? true : false,
 		'S_CAN_DELETE'		=> ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_APPROVE'		=> ($has_unapproved_posts && $auth->acl_get('m_approve', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_LOCK'		=> ($auth->acl_get('m_lock', $topic_info['forum_id'])) ? true : false,
@@ -189,7 +205,273 @@ function mcp_topic_view($id, $mode, $action, $url)
 		'RETURN_FORUM'		=> sprintf($user->lang['RETURN_FORUM'], "<a href=\"viewforum.$phpEx$SID&amp;f={$topic_info['forum_id']}&amp;start=$start\">", '</a>'),

 		'PAGE_NUMBER'		=> on_page($total, $posts_per_page, $start),
-		'PAGINATION'		=> (!$posts_per_page) ? '' : generate_pagination("mcp.$phpEx$SID&amp;t=" . $topic_info['topic_id'] . "&amp;mode=$mode&amp;posts_per_page=$posts_per_page&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, $posts_per_page, $start),
+		'PAGINATION'		=> (!$posts_per_page) ? '' : generate_pagination("mcp.$phpEx$SID&amp;t=" . $topic_info['topic_id'] . "&amp;mode=$mode&amp;action=$action&amp;to_topic_id=$to_topic_id&amp;posts_per_page=$posts_per_page&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, $posts_per_page, $start),
 		'TOTAL'				=> $total)
 	);
-}
+}
+
+function split_topic($mode, $topic_id, $to_forum_id, $subject)
+{
+	global $db, $template, $user, $phpEx, $SID, $phpbb_root_path, $auth;
+
+	$post_id_list	= get_array('post_id_list', 0);
+	$start			= request_var('start', 0);
+		
+	if (!$post_id_list)
+	{
+		trigger_error('NO_POST_SELECTED');
+	}
+	
+	if (!($forum_id = check_ids($post_id_list, POSTS_TABLE, 'post_id', 'm_split')))
+	{
+		return;
+	}
+
+	$post_id = $post_id_list[0];
+	$post_info = get_post_data(array($post_id));
+
+	if (!sizeof($post_info))
+	{
+		$template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']);
+		return;
+	}
+
+	$post_info = $post_info[$post_id];
+	$subject = trim($subject);
+
+	// Make some tests
+	if (!$subject)
+	{
+		$template->assign_var('MESSAGE', $user->lang['EMPTY_SUBJECT']);
+		return;
+	}
+
+	if ($to_forum_id <= 0)
+	{
+		$template->assign_var('MESSAGE', $user->lang['NO_DESTINATION_FORUM']);
+		return;
+	}
+
+	$forum_info = get_forum_data(array($to_forum_id), 'm_split');
+
+	if (!sizeof($forum_info))
+	{
+		$template->assign_var('MESSAGE', $user->lang['NOT_MODERATOR']);
+		return;
+	}
+
+	$forum_info = $forum_info[$to_forum_id];
+
+	if ($forum_info['forum_type'] != FORUM_POST)
+	{
+		$template->assign_var('MESSAGE', $user->lang['FORUM_NOT_POSTABLE']);
+		return;
+	}
+
+	$redirect = request_var('redirect', $user->data['session_page']);
+
+	$s_hidden_fields = build_hidden_fields(array(
+		'post_id_list'	=> $post_id_list,
+		'f'				=> $forum_id,
+		'mode'			=> 'topic_view',
+		'start'			=> $start,
+		'action'		=> $mode,
+		't'				=> $topic_id,
+		'redirect'		=> $redirect,
+		'subject'		=> $subject,
+		'to_forum_id'	=> $to_forum_id,
+		'icon'			=> request_var('icon', 0))
+	);
+	$success_msg = $return_link = '';
+
+	if (confirm_box(true))
+	{
+		if ($mode == 'split_beyond')
+		{
+			mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
+			$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
+
+			if ($sort_order_sql{0} == 'u')
+			{
+				$sql = 'SELECT p.post_id, p.forum_id, p.post_approved
+					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
+					WHERE p.topic_id = $topic_id
+						AND p.poster_id = u.user_id
+						$limit_time_sql
+					ORDER BY $sort_order_sql";
+			}
+			else
+			{
+				$sql = 'SELECT p.post_id, p.forum_id, p.post_approved
+					FROM ' . POSTS_TABLE . " p
+					WHERE p.topic_id = $topic_id
+						$limit_time_sql
+					ORDER BY $sort_order_sql";
+			}
+			$result = $db->sql_query_limit($sql, 0, $start);
+
+			$store = false;
+			$post_id_list = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				// If splitted from selected post (split_beyond), we split the unapproved items too.
+				if (!$row['post_approved'] && !$auth->acl_get('m_approve', $row['forum_id']))
+				{
+//					continue;
+				}
+
+				// Start to store post_ids as soon as we see the first post that was selected
+				if ($row['post_id'] == $post_id)
+				{
+					$store = true;
+				}
+
+				if ($store)
+				{
+					$post_id_list[] = $row['post_id'];
+				}
+			}
+		}
+
+		if (!sizeof($post_id_list))
+		{
+			trigger_error($user->lang['NO_POST_SELECTED']);
+		}
+
+		$icon_id = request_var('icon', 0);
+
+		$sql_ary = array(
+			'forum_id'		=> $to_forum_id,
+			'topic_title'	=> $subject,
+			'icon_id'		=> $icon_id,
+			'topic_approved'=> 1
+		);
+	
+		$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+		$db->sql_query($sql);
+
+		$to_topic_id = $db->sql_nextid();
+		move_posts($post_id_list, $to_topic_id);
+
+		$success_msg = 'TOPIC_SPLIT_SUCCESS';
+
+		// Link back to both topics
+		$return_link = sprintf($user->lang['RETURN_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id'] . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $to_forum_id . '&amp;t=' . $to_topic_id . '">', '</a>');
+	}
+	else
+	{
+		confirm_box(false, ($mode == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields);
+	}
+
+	$redirect = request_var('redirect', "index.$phpEx$SID");
+
+	if (strpos($redirect, '?') === false)
+	{
+		$redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1);
+	}
+
+	if (!$success_msg)
+	{
+		return;
+	}
+	else
+	{
+		meta_refresh(3, "viewtopic.$phpEx$SID&amp;f=$to_forum_id&amp;t=$to_topic_id");
+		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+	}
+}
+
+// Merge selected posts into selected topic
+function merge_posts($topic_id, $to_topic_id)
+{
+	global $db, $template, $user, $phpEx, $SID, $phpbb_root_path, $auth;
+
+	if (!$to_topic_id)
+	{
+		$template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']);
+		return;
+	}
+
+	$topic_data = get_topic_data(array($to_topic_id), 'm_merge');
+
+	if (!sizeof($topic_data))
+	{
+		$template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']);
+		return;
+	}
+
+	$topic_data = $topic_data[$to_topic_id];
+
+	$post_id_list	= get_array('post_id_list', 0);
+	$start			= request_var('start', 0);
+		
+	if (!$post_id_list)
+	{
+		$template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']);
+		$this->main('merge');
+	}
+	
+	if (!($forum_id = check_ids($post_id_list, POSTS_TABLE, 'post_id', 'm_merge')))
+	{
+		return;
+	}
+
+	$redirect = request_var('redirect', $user->data['session_page']);
+
+	$s_hidden_fields = build_hidden_fields(array(
+		'post_id_list'	=> $post_id_list,
+		'to_topic_id'	=> $to_topic_id,
+		'mode'			=> 'topic_view',
+		'action'		=> 'merge_posts',
+		'start'			=> $start,
+		'redirect'		=> $redirect,
+		'f'				=> $forum_id,
+		't'				=> $topic_id)
+	);
+	$success_msg = $return_link = '';
+
+	if (confirm_box(true))
+	{
+		$to_forum_id = $topic_data['forum_id'];
+
+		move_posts($post_id_list, $to_topic_id);
+		add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']);
+				
+		// Message and return links
+		$success_msg = 'POSTS_MERGED_SUCCESS';
+
+		// Does the original topic still exist? If yes, link back to it
+		$topic_data = get_topic_data(array($topic_id));
+
+		if (sizeof($topic_data))
+		{
+			$return_link .= sprintf($user->lang['RETURN_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&amp;t=' . $topic_id . '">', '</a>');
+		}
+
+		// Link to the new topic
+		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $to_forum_id . '&amp;t=' . $to_topic_id . '">', '</a>');
+	}
+	else
+	{
+		confirm_box(false, 'MERGE_POSTS', $s_hidden_fields);
+	}
+
+	$redirect = request_var('redirect', "index.$phpEx$SID");
+
+	if (strpos($redirect, '?') === false)
+	{
+		$redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1);
+	}
+
+	if (!$success_msg)
+	{
+		return;
+	}
+	else
+	{
+		meta_refresh(3, "viewtopic.$phpEx$SID&amp;f=$to_forum_id&amp;t=$to_topic_id");
+		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+	}
+}
+
+?>