mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

some fixes today

Browse Source 
- most important change is the consolidation of the display attachment functions; merging them together to have one function we need to call.


git-svn-id: file:///svn/phpbb/trunk@6803 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-12-24 13:11:54 +00:00
parent 9cc0b364bc
commit ae1cb0316e
20 changed files with 506 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/mcp/mcp_queue.php
View File

@@ -50,11 +50,11 @@ class mcp_queue
if ($action == 'approve')
{
approve_post($post_id_list, $mode);
approve_post($post_id_list, 'queue', $mode);
}
else
{
disapprove_post($post_id_list, $mode);
disapprove_post($post_id_list, 'queue', $mode);
}
break;
@@ -372,7 +372,7 @@ class mcp_queue
/**
* Approve Post/Topic
*/
function approve_post($post_id_list, $mode)
function approve_post($post_id_list, $id, $mode)
{
global $db, $template, $user, $config;
global $phpEx, $phpbb_root_path;
@@ -386,7 +386,7 @@ function approve_post($post_id_list, $mode)
$success_msg = '';
$s_hidden_fields = build_hidden_fields(array(
'i' => 'queue',
'i' => $id,
'mode' => $mode,
'post_id_list' => $post_id_list,
'action' => 'approve',
@@ -617,7 +617,7 @@ function approve_post($post_id_list, $mode)
/**
* Disapprove Post/Topic
*/
function disapprove_post($post_id_list, $mode)
function disapprove_post($post_id_list, $id, $mode)
{
global $db, $template, $user, $config;
global $phpEx, $phpbb_root_path;
@@ -633,7 +633,7 @@ function disapprove_post($post_id_list, $mode)
$success_msg = $additional_msg = '';
$s_hidden_fields = build_hidden_fields(array(
'i' => 'queue',
'i' => $id,
'mode' => $mode,
'post_id_list' => $post_id_list,
'action' => 'disapprove',

15
phpBB/includes/mcp/mcp_topic.php
View File

@@ -57,6 +57,21 @@ function mcp_topic_view($id, $mode, $action)
$subject = $topic_info['topic_title'];
}
// Approve posts?
if ($action == 'approve' && $auth->acl_get('m_approve', $topic_info['forum_id']))
{
include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
if (!sizeof($post_id_list))
{
trigger_error('NO_POST_SELECTED');
}
approve_post($post_id_list, $id, $mode);
}
// Jumpbox, sort selects and that kind of things
make_jumpbox($url . "&i=$id&mode=forum_view", $topic_info['forum_id'], false, 'm_');
$where_sql = ($action == 'reports') ? 'WHERE post_reported = 1 AND ' : 'WHERE';