mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-09 04:48:53 +00:00
"Playing with MCP" part II - now that's the correct version. Good night ;)
git-svn-id: file:///svn/phpbb/trunk@3562 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
5a12bdc77d
commit
d128d5d800
1 changed files with 14 additions and 33 deletions
|
@ -157,6 +157,10 @@ switch ($mode)
|
||||||
|
|
||||||
$return_mode = '<br /><br />' . sprintf($user->lang['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;
|
||||||
|
|
||||||
|
case 'move':
|
||||||
|
$acl_list_src = array('m_move', 'a_');
|
||||||
|
$acl_list_trg = array('f_post', 'm_', 'a_');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check destination forum or topic if applicable
|
// Check destination forum or topic if applicable
|
||||||
|
@ -178,53 +182,29 @@ if ($to_topic_id > 0)
|
||||||
|
|
||||||
if ($to_forum_id > 0)
|
if ($to_forum_id > 0)
|
||||||
{
|
{
|
||||||
if (!$auth->acl_gets('f_list', 'm_', 'a_', $to_forum_id))
|
|
||||||
{
|
|
||||||
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['FORUM_NOT_EXIST'] . $return_mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isset($forum_data[$to_forum_id]))
|
if (!isset($forum_data[$to_forum_id]))
|
||||||
{
|
{
|
||||||
$result = $db->sql_query('SELECT * FROM ' . FORUMS_TABLE . ' WHERE forum_id = ' . $to_forum_id);
|
$result = $db->sql_query('SELECT * FROM ' . FORUMS_TABLE . ' WHERE forum_id = ' . $to_forum_id);
|
||||||
|
|
||||||
if (!$row = $db->sql_fetchrow($result))
|
if (!$row = $db->sql_fetchrow($result))
|
||||||
{
|
{
|
||||||
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['FORUM_NOT_EXIST'] . $return_mode);
|
trigger_error($user->lang['FORUM_NOT_EXIST'] . $return_mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
$forum_data[$to_forum_id] = $row;
|
$forum_data[$to_forum_id] = $row;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ($mode)
|
if (!$auth->acl_gets('f_list', 'm_', 'a_', $to_forum_id))
|
||||||
{
|
{
|
||||||
case 'move':
|
trigger_error($user->lang['FORUM_NOT_EXIST'] . $return_mode);
|
||||||
if ($confirm)
|
|
||||||
{
|
|
||||||
$is_auth = $auth->acl_gets('f_post', 'm_', 'a_', $to_forum_id);
|
|
||||||
}
|
}
|
||||||
break;
|
if (!$auth->acl_gets($acl_list_trg, $to_forum_id))
|
||||||
|
|
||||||
case 'merge':
|
|
||||||
case 'merge_posts':
|
|
||||||
$is_auth = $auth->acl_gets('f_post', 'f_reply', 'm_', 'a_', $to_forum_id);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'split_all':
|
|
||||||
case 'split_beyond':
|
|
||||||
$is_auth = $auth->acl_gets('f_post', 'm_', 'a_', $to_forum_id);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'select_topic':
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . 'Died here with mode ' . $mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: prevent moderators to move topics/posts to locked forums/topics?
|
|
||||||
if (!$is_auth || !$forum_data[$to_forum_id]['forum_postable'])
|
|
||||||
{
|
{
|
||||||
trigger_error('Line : ' . __LINE__ . '<br/><br/>' . $user->lang['User_cannot_post'] . $return_mode);
|
trigger_error('NOT_ALLOWED');
|
||||||
|
}
|
||||||
|
if (!$forum_data[$to_forum_id]['forum_postable'])
|
||||||
|
{
|
||||||
|
trigger_error($user->lang['FORUM_NOT_POSTABLE'] . $return_mode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1832,6 +1812,7 @@ function very_temporary_lang_strings()
|
||||||
|
|
||||||
'DELETE_POSTS' => 'Delete posts',
|
'DELETE_POSTS' => 'Delete posts',
|
||||||
|
|
||||||
|
'NOT_ALLOWED' => 'You are not allowed to perform this action.'
|
||||||
);
|
);
|
||||||
|
|
||||||
$user->lang = array_merge($user->lang, $lang);
|
$user->lang = array_merge($user->lang, $lang);
|
||||||
|
|
Loading…
Add table
Reference in a new issue