mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Adapted for merged posts tables
git-svn-id: file:///svn/phpbb/trunk@3556 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
9961eb789d
commit
b9e52c5f0f
1 changed files with 25 additions and 25 deletions
|
@ -129,7 +129,7 @@ if (!empty($_GET['post_id_list']))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$url_extra = (!empty($selected_post_ids)) ? '&post_id_list=' . short_id_list($selected_post_ids) : '';
|
$url_extra = (!empty($selected_post_ids)) ? '&post_id_list=' . short_id_list($selected_post_ids) : '';
|
||||||
$return_mcp = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '">', '</a>');
|
$return_mcp = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '">', '</a>');
|
||||||
|
|
||||||
// Build up return links and acl list
|
// Build up return links and acl list
|
||||||
// $acl_list_src contains the acl list for source forum(s)
|
// $acl_list_src contains the acl list for source forum(s)
|
||||||
|
@ -137,7 +137,7 @@ $return_mcp = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href
|
||||||
|
|
||||||
$acl_list_src = array('m_', 'a_');
|
$acl_list_src = array('m_', 'a_');
|
||||||
$acl_list_trg = array('m_', 'a_');
|
$acl_list_trg = array('m_', 'a_');
|
||||||
$return_mode = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '">', '</a>');
|
$return_mode = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '">', '</a>');
|
||||||
|
|
||||||
switch ($mode)
|
switch ($mode)
|
||||||
{
|
{
|
||||||
|
@ -147,7 +147,7 @@ switch ($mode)
|
||||||
$acl_list_src = array('m_split', 'a_');
|
$acl_list_src = array('m_split', 'a_');
|
||||||
$acl_list_trg = array('f_post', 'm_', 'a_');
|
$acl_list_trg = array('f_post', 'm_', 'a_');
|
||||||
|
|
||||||
$return_mode = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '&mode=split&t=' . $topic_id . $url_extra . '&subject=' . htmlspecialchars($subject) . '">', '</a>');
|
$return_mode = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&mode=split&t=' . $topic_id . $url_extra . '&subject=' . htmlspecialchars($subject) . '">', '</a>');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'merge':
|
case 'merge':
|
||||||
|
@ -155,7 +155,7 @@ switch ($mode)
|
||||||
$acl_list_src = array('m_merge', 'a_');
|
$acl_list_src = array('m_merge', 'a_');
|
||||||
$acl_list_trg = array('m_merge', 'a_');
|
$acl_list_trg = array('m_merge', 'a_');
|
||||||
|
|
||||||
$return_mode = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '&mode=merge&t=' . $topic_id . $url_extra . '">', '</a>');
|
$return_mode = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&mode=merge&t=' . $topic_id . $url_extra . '">', '</a>');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -393,7 +393,7 @@ $mcp_url .= ($forum_id) ? '&f=' . $forum_id : '';
|
||||||
$mcp_url .= ($topic_id) ? '&t=' . $topic_id : '';
|
$mcp_url .= ($topic_id) ? '&t=' . $topic_id : '';
|
||||||
$mcp_url .= ($post_id) ? '&p=' . $post_id : '';
|
$mcp_url .= ($post_id) ? '&p=' . $post_id : '';
|
||||||
//$mcp_url .= ($start) ? '&start=' . $start : '';
|
//$mcp_url .= ($start) ? '&start=' . $start : '';
|
||||||
$return_mcp = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="' . $mcp_url . '">', '</a>');
|
$return_mcp = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="' . $mcp_url . '">', '</a>');
|
||||||
|
|
||||||
if ($forum_id)
|
if ($forum_id)
|
||||||
{
|
{
|
||||||
|
@ -506,7 +506,7 @@ switch ($mode)
|
||||||
resync('topic', 'topic_id', $topic_id_list);
|
resync('topic', 'topic_id', $topic_id_list);
|
||||||
|
|
||||||
$redirect_page = "mcp.$phpEx$SID&f=$forum_id";
|
$redirect_page = "mcp.$phpEx$SID&f=$forum_id";
|
||||||
$l_redirect = sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
$l_redirect = sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
|
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
|
||||||
|
@ -530,7 +530,7 @@ switch ($mode)
|
||||||
delete_posts('post_id', $post_id_list);
|
delete_posts('post_id', $post_id_list);
|
||||||
|
|
||||||
$redirect_page = "mcp.$phpEx$SID&f=$forum_id";
|
$redirect_page = "mcp.$phpEx$SID&f=$forum_id";
|
||||||
$l_redirect = sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
$l_redirect = sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
|
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
|
||||||
|
@ -575,12 +575,12 @@ switch ($mode)
|
||||||
if ($quickmod)
|
if ($quickmod)
|
||||||
{
|
{
|
||||||
$redirect_page = "";
|
$redirect_page = "";
|
||||||
$l_redirect = sprintf($user->lang['Click_return_forum'], '<a href="viewforum.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
$l_redirect = sprintf($user->lang['RETURN_FORUM'], '<a href="viewforum.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$redirect_page = "mcp.$phpEx$SID&f=$forum_id";
|
$redirect_page = "mcp.$phpEx$SID&f=$forum_id";
|
||||||
$l_redirect = sprintf($user->lang['Click_return_mcp'], '<a href="mcp.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
$l_redirect = sprintf($user->lang['RETURN_MCP'], '<a href="mcp.' . $phpEx . $SID . '&f=' . $forum_id . '">', '</a>');
|
||||||
}
|
}
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
|
@ -628,7 +628,7 @@ switch ($mode)
|
||||||
// Post ordering options
|
// Post ordering options
|
||||||
$previous_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']);
|
$previous_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']);
|
||||||
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
|
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
|
||||||
$sort_by = array('a' => 'u.username', 't' => 'p.post_id', 's' => 'pt.post_subject');
|
$sort_by = array('a' => 'u.username', 't' => 'p.post_id', 's' => 'p.post_subject');
|
||||||
|
|
||||||
$sort_days = (!empty($_REQUEST['sort_days'])) ? max(intval($_REQUEST['sort_days']), 0) : 0;
|
$sort_days = (!empty($_REQUEST['sort_days'])) ? max(intval($_REQUEST['sort_days']), 0) : 0;
|
||||||
$sort_key = (!empty($_REQUEST['sort_key']) && preg_match('/^(a|t|s)$/', $_REQUEST['sort_key'])) ? $_REQUEST['sort_key'] : 't';
|
$sort_key = (!empty($_REQUEST['sort_key']) && preg_match('/^(a|t|s)$/', $_REQUEST['sort_key'])) ? $_REQUEST['sort_key'] : 't';
|
||||||
|
@ -687,11 +687,10 @@ switch ($mode)
|
||||||
}
|
}
|
||||||
$select_post_days .= '</select>';
|
$select_post_days .= '</select>';
|
||||||
|
|
||||||
$sql = "SELECT u.username, p.*, pt.*
|
$sql = 'SELECT u.username, p.*
|
||||||
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
|
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
|
||||||
WHERE p.topic_id = $topic_id
|
WHERE p.topic_id = $topic_id
|
||||||
AND p.poster_id = u.user_id
|
AND p.poster_id = u.user_id
|
||||||
AND p.post_id = pt.post_id
|
|
||||||
$limit_posts_time
|
$limit_posts_time
|
||||||
ORDER BY $sort_order";
|
ORDER BY $sort_order";
|
||||||
$result = $db->sql_query_limit($sql, $posts_per_page, $start);
|
$result = $db->sql_query_limit($sql, $posts_per_page, $start);
|
||||||
|
@ -796,11 +795,10 @@ switch ($mode)
|
||||||
'S_FORM_ACTION' => $mcp_url
|
'S_FORM_ACTION' => $mcp_url
|
||||||
));
|
));
|
||||||
|
|
||||||
$sql = "SELECT u.username, p.*, pt.*
|
$sql = 'SELECT u.username, p.*
|
||||||
FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
|
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
|
||||||
WHERE p.post_id = $post_id
|
WHERE p.post_id = $post_id
|
||||||
AND p.poster_id = u.user_id
|
AND p.poster_id = u.user_id";
|
||||||
AND p.post_id = pt.post_id";
|
|
||||||
$result = $db->sql_query($sql);
|
$result = $db->sql_query($sql);
|
||||||
|
|
||||||
if (!$row = $db->sql_fetchrow($result))
|
if (!$row = $db->sql_fetchrow($result))
|
||||||
|
@ -843,7 +841,7 @@ switch ($mode)
|
||||||
case 'move':
|
case 'move':
|
||||||
if ($confirm)
|
if ($confirm)
|
||||||
{
|
{
|
||||||
$return_move = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="' . $mcp_url . '&mode=move">', '</a>');
|
$return_move = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="' . $mcp_url . '&mode=move">', '</a>');
|
||||||
|
|
||||||
if (!$to_forum_id)
|
if (!$to_forum_id)
|
||||||
{
|
{
|
||||||
|
@ -910,15 +908,15 @@ switch ($mode)
|
||||||
if (isset($_GET['quickmod']))
|
if (isset($_GET['quickmod']))
|
||||||
{
|
{
|
||||||
$redirect_page = "viewtopic.$phpEx$SID&t=$topic_id&start=$start";
|
$redirect_page = "viewtopic.$phpEx$SID&t=$topic_id&start=$start";
|
||||||
$message .= sprintf($user->lang['Click_return_topic'], '<a href="' . $redirect_page . '">', '</a>');
|
$message .= sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_page . '">', '</a>');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$redirect_page = $mcp_url . '&mode=forum_view';
|
$redirect_page = $mcp_url . '&mode=forum_view';
|
||||||
$message .= sprintf($user->lang['Click_return_mcp'], '<a href="' . $redirect_page . '">', '</a>');
|
$message .= sprintf($user->lang['RETURN_MCP'], '<a href="' . $redirect_page . '">', '</a>');
|
||||||
}
|
}
|
||||||
|
|
||||||
$message .= '<br \><br \>' . sprintf($user->lang['Click_return_forum'], "<a href=\"viewforum.$phpEx$SID&f=$forum_id\">", '</a>');
|
$message .= '<br \><br \>' . sprintf($user->lang['RETURN_FORUM'], "<a href=\"viewforum.$phpEx$SID&f=$forum_id\">", '</a>');
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">'
|
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">'
|
||||||
|
@ -928,7 +926,7 @@ switch ($mode)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'merge_posts':
|
case 'merge_posts':
|
||||||
$return_url = '<br /><br />' . sprintf($user->lang['Click_return_topic'], '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $to_topic_id . '">', '</a>');
|
$return_url = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $to_topic_id . '">', '</a>');
|
||||||
move_posts($post_id_list, $to_topic_id);
|
move_posts($post_id_list, $to_topic_id);
|
||||||
|
|
||||||
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['Posts_merged'] . $return_url . $return_mcp);
|
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['Posts_merged'] . $return_url . $return_mcp);
|
||||||
|
@ -936,7 +934,7 @@ switch ($mode)
|
||||||
|
|
||||||
case 'split_all':
|
case 'split_all':
|
||||||
case 'split_beyond':
|
case 'split_beyond':
|
||||||
$return_split = '<br /><br />' . sprintf($user->lang['Click_return_mcp'], '<a href="' . $mcp_url . '&mode=split' . $url_extra . '">', '</a>');
|
$return_split = '<br /><br />' . sprintf($user->lang['RETURN_MCP'], '<a href="' . $mcp_url . '&mode=split' . $url_extra . '">', '</a>');
|
||||||
|
|
||||||
if (!$subject)
|
if (!$subject)
|
||||||
{
|
{
|
||||||
|
@ -977,7 +975,7 @@ switch ($mode)
|
||||||
$to_topic_id = $db->sql_nextid();
|
$to_topic_id = $db->sql_nextid();
|
||||||
move_posts($post_id_list, $to_topic_id);
|
move_posts($post_id_list, $to_topic_id);
|
||||||
|
|
||||||
$return_url = '<br /><br />' . sprintf($user->lang['Click_return_topic'], '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $topic_id . '">', '</a>');
|
$return_url = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $topic_id . '">', '</a>');
|
||||||
$return_url .= '<br /><br />' . sprintf($user->lang['CLICK_GO_NEW_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $to_topic_id . '">', '</a>');
|
$return_url .= '<br /><br />' . sprintf($user->lang['CLICK_GO_NEW_TOPIC'], '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $to_topic_id . '">', '</a>');
|
||||||
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['TOPIC_SPLIT'] . $return_url . $return_mcp);
|
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['TOPIC_SPLIT'] . $return_url . $return_mcp);
|
||||||
break;
|
break;
|
||||||
|
@ -1385,10 +1383,12 @@ function delete_posts($where_type, $where_ids, $auto_sync = TRUE)
|
||||||
|
|
||||||
$where_sql = ' WHERE post_id IN (' . implode(', ', $post_ids) . ')';
|
$where_sql = ' WHERE post_id IN (' . implode(', ', $post_ids) . ')';
|
||||||
|
|
||||||
|
$db->sql_return_on_error(FALSE);
|
||||||
$db->sql_query('DELETE FROM ' . POSTS_TABLE . $where_sql);
|
$db->sql_query('DELETE FROM ' . POSTS_TABLE . $where_sql);
|
||||||
$db->sql_query('DELETE FROM ' . POSTS_TEXT_TABLE . $where_sql);
|
// $db->sql_query('DELETE FROM ' . POSTS_TEXT_TABLE . $where_sql);
|
||||||
$db->sql_query('DELETE FROM ' . RATINGS_TABLE . $where_sql);
|
$db->sql_query('DELETE FROM ' . RATINGS_TABLE . $where_sql);
|
||||||
$db->sql_query('DELETE FROM ' . SEARCH_MATCH_TABLE . $where_sql);
|
$db->sql_query('DELETE FROM ' . SEARCH_MATCH_TABLE . $where_sql);
|
||||||
|
$db->sql_return_on_error(TRUE);
|
||||||
|
|
||||||
if ($auto_sync)
|
if ($auto_sync)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue