diff options
| -rw-r--r-- | phpBB/adm/style/acp_ban.html | 5 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 6 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 12 | ||||
| -rw-r--r-- | phpBB/mcp.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/mcp_ban.html | 5 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/mcp_reports.html | 10 |
6 files changed, 29 insertions, 11 deletions
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 6eed1500e7..735afc9417 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -12,16 +12,19 @@ <!-- var ban_length = new Array(); + ban_length[-1] = ""; <!-- BEGIN ban_length --> ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}"; <!-- END ban_length --> var ban_reason = new Array(); + ban_reason[-1] = ""; <!-- BEGIN ban_reason --> ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}"; <!-- END ban_reason --> var ban_give_reason = new Array(); + ban_give_reason[-1] = ""; <!-- BEGIN ban_give_reason --> ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.REASON}"; <!-- END ban_give_reason --> @@ -81,7 +84,7 @@ <!-- IF S_BANNED_OPTIONS --> <dl> <dt><label for="unban">{L_BAN_CELL}:</label></dt> - <dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="display_details(this.options[this.selectedIndex].value)">{BANNED_OPTIONS}</select></dd> + <dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd> </dl> <dl> <dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt> diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 11378d1f9f..e63ffbbdc2 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -288,7 +288,11 @@ class mcp_queue // Now display the page $template->assign_vars(array( 'L_DISPLAY_ITEMS' => ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'], - 'S_FORUM_OPTIONS' => $forum_options) + 'S_FORUM_OPTIONS' => $forum_options, + + 'PAGINATION' => generate_pagination("{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=$mode&f=$forum_id", $total, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), + 'TOTAL' => $total) ); $this->tpl_name = 'mcp_queue'; diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 8b30694e1a..30d4466157 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -291,7 +291,6 @@ class mcp_reports 'U_VIEW_REPORTER_PROFILE' => ($row['reporter_id'] != ANONYMOUS) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u={$row['reporter_id']}" : '', 'S_CHECKBOX' => $s_checkbox, - 'S_CLOSED' => ($mode == 'reports_closed') ? true : false, 'FORUM_NAME' => $row['forum_name'], 'POSTER' => $poster, @@ -307,9 +306,12 @@ class mcp_reports // Now display the page $template->assign_vars(array( - 'L_DISPLAY_ITEMS' => $user->lang['DISPLAY_POSTS'], - 'S_MCP_ACTION' => "{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=$mode&t=0", - 'S_FORUM_OPTIONS' => $forum_options) + 'PAGINATION' => generate_pagination("{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=$mode&f=$forum_id&t=$topic_id", $total, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), + 'TOTAL' => $total, + 'S_MCP_ACTION' => "{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=$mode&t=0", + 'S_FORUM_OPTIONS' => $forum_options, + 'S_CLOSED' => ($mode == 'reports_closed') ? true : false) ); $this->tpl_name = 'mcp_reports'; @@ -488,7 +490,7 @@ function close_report($post_id_list, $mode, $action) else { meta_refresh(3, "viewforum.$phpEx$SID&f=$forum_id"); - trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], "<a href=\"{$phpbb_root_path}viewforum.$phpEx$SID&f=" . $forum_id . '">', '</a>')); + trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>')); } } diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 46a263518e..0ef50378c9 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -477,7 +477,7 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, 'S_SELECT_SORT_DAYS'=> $s_limit_days) ); - if (($sort_days && $mode != 'viewlogs') || $mode == 'reports' || $where_sql != 'WHERE') + if (($sort_days && $mode != 'viewlogs') || in_array($mode, array('reports', 'unapproved_topics', 'unapproved_posts')) || $where_sql != 'WHERE') { $result = $db->sql_query($sql); $total = ($row = $db->sql_fetchrow($result)) ? $row['total'] : 0; diff --git a/phpBB/styles/subSilver/template/mcp_ban.html b/phpBB/styles/subSilver/template/mcp_ban.html index 0ceaf9fb0e..d8dea4e1e4 100644 --- a/phpBB/styles/subSilver/template/mcp_ban.html +++ b/phpBB/styles/subSilver/template/mcp_ban.html @@ -6,16 +6,19 @@ <!-- var ban_length = new Array(); + ban_length[-1] = ""; <!-- BEGIN ban_length --> ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}"; <!-- END ban_length --> var ban_reason = new Array(); + ban_reason[-1] = ""; <!-- BEGIN ban_reason --> ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}"; <!-- END ban_reason --> var ban_give_reason = new Array(); + ban_give_reason[-1] = ""; <!-- BEGIN ban_give_reason --> ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.REASON}"; <!-- END ban_give_reason --> @@ -79,7 +82,7 @@ <!-- IF S_BANNED_OPTIONS --> <tr> <td class="row1" valign="top" width="45%"><b>{L_BAN_CELL}:</b></td> - <td class="row2"><select name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="display_details(this.options[this.selectedIndex].value)">{BANNED_OPTIONS}</select></td> + <td class="row2"><select name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></td> </tr> <tr> <td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> diff --git a/phpBB/styles/subSilver/template/mcp_reports.html b/phpBB/styles/subSilver/template/mcp_reports.html index 9fa329ba2d..00a10ac8f6 100644 --- a/phpBB/styles/subSilver/template/mcp_reports.html +++ b/phpBB/styles/subSilver/template/mcp_reports.html @@ -5,7 +5,7 @@ <th colspan="5" height="28" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th> </tr> <tr> - <td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_ITEMS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> + <td colspan="5" class="cat" height="28" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <span class="gensmall">{L_FORUM}</span> <select name="f">{S_FORUM_OPTIONS}</select> <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td> </tr> <tr> <th height="28"> {L_POST} </th> @@ -32,7 +32,13 @@ </tr> <!-- END postrow --> <tr> - <td class="cat" colspan="5" height="28" align="center"><!-- IF not S_CLOSED --><input class="btnmain" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /> <!-- ENDIF --><input class="btnlite" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /></td> + <td class="cat" colspan="5" height="28" align="center"> + <!-- IF S_CLOSED --> + <input class="btnmain" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> + <!-- ELSE --> + <input class="btnmain" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /> <input class="btnlite" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> + <!-- ENDIF --> + </td> </tr> </form></table> |