makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11672] Clean up the logic in mcp_queue.php.

Browse source 
PHPBB3-11672
This commit is contained in:
Cesar G 2013-10-18 04:33:22 -07:00
parent 3eda261b8d
commit 10bfb212c4
1 changed files with 75 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
phpBB/includes/mcp/mcp_queue.php
View file

@ -678,6 +678,32 @@ class mcp_queue
} }
} }
} }
meta_refresh(3, $redirect);
$message = $user->lang[$success_msg];
if ($request->is_ajax())
{
$json_response = new \phpbb\json_response;
$json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message,
'REFRESH_DATA' => null,
'visible' => true,
));
}
else
{
$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
// If approving one post, also give links back to post...
if (sizeof($post_info) == 1 && $post_url)
{
$message .= '<br /><br />' . $user->lang('RETURN_POST', '<a href="' . $post_url . '">', '</a>');
}
}
trigger_error($message);
} }
else else
{ {
@ -709,42 +735,8 @@ class mcp_queue
$redirect = $request->variable('redirect', "index.$phpEx"); $redirect = $request->variable('redirect', "index.$phpEx");
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
if (!$success_msg)
{
redirect($redirect); redirect($redirect);
} }
else
{
meta_refresh(3, $redirect);
// If approving one post, also give links back to post...
$add_message = '';
if (sizeof($post_info) == 1 && $post_url)
{
$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
}
$message = $user->lang[$success_msg];
if ($request->is_ajax())
{
$json_response = new \phpbb\json_response;
$json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message,
'REFRESH_DATA' => null,
'visible' => true,
));
}
else
{
$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>') . $add_message;
}
trigger_error($message);
}
}
/** /**
* Approve/Restore topics * Approve/Restore topics
@ -830,6 +822,32 @@ class mcp_queue
} }
} }
} }
meta_refresh(3, $redirect);
$message = $user->lang[$success_msg];
if ($request->is_ajax())
{
$json_response = new \phpbb\json_response;
$json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message,
'REFRESH_DATA' => null,
'visible' => true,
));
}
else
{
$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
// If approving one topic, also give links back to topic...
if (sizeof($topic_info) == 1 && $topic_url)
{
$message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $topic_url . '">', '</a>');
}
}
trigger_error($message);
} }
else else
{ {
@ -861,42 +879,8 @@ class mcp_queue
$redirect = $request->variable('redirect', "index.$phpEx"); $redirect = $request->variable('redirect', "index.$phpEx");
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
if (!$success_msg)
{
redirect($redirect); redirect($redirect);
} }
else
{
meta_refresh(3, $redirect);
// If approving one topic, also give links back to topic...
$add_message = '';
if (sizeof($topic_info) == 1 && $topic_url)
{
$add_message = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $topic_url . '">', '</a>');
}
$message = $user->lang[$success_msg];
if ($request->is_ajax())
{
$json_response = new \phpbb\json_response;
$json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message,
'REFRESH_DATA' => null,
'visible' => true,
));
}
else
{
$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>') . $add_message;
}
trigger_error($message);
}
}
/** /**
* Disapprove Post * Disapprove Post
@ -1159,6 +1143,26 @@ class mcp_queue
{ {
$success_msg .= '_DELETED_SUCCESS'; $success_msg .= '_DELETED_SUCCESS';
} }
meta_refresh(3, $redirect);
$message = $user->lang[$success_msg];
if ($request->is_ajax())
{
$json_response = new \phpbb\json_response;
$json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message,
'REFRESH_DATA' => null,
'visible' => false,
));
}
else
{
$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
}
trigger_error($message);
} }
else else
{ {
@ -1209,32 +1213,6 @@ class mcp_queue
$redirect = $request->variable('redirect', "index.$phpEx"); $redirect = $request->variable('redirect', "index.$phpEx");
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
if (!$success_msg)
{
redirect($redirect); redirect($redirect);
} }
else
{
$message = $user->lang[$success_msg];
if ($request->is_ajax())
{
$json_response = new \phpbb\json_response;
$json_response->send(array(
'MESSAGE_TITLE' => $user->lang['INFORMATION'],
'MESSAGE_TEXT' => $message,
'REFRESH_DATA' => null,
'visible' => false,
));
}
else
{
$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
}
meta_refresh(3, $redirect);
trigger_error($message);
}
}
} }