diff options
| author | Nils Adermann <naderman@naderman.de> | 2009-07-22 13:33:54 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2009-07-22 13:33:54 +0000 |
| commit | 00e81e704d78c7f4f45d1536ad170ed8dd985e84 (patch) | |
| tree | 30c3a68f8226804b6bb3796425aa84bf2517f5d1 /phpBB/mcp.php | |
| parent | 54f78a50bc6162fd49e506892a455f7bb43e31fb (diff) | |
| download | forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar.gz forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar.bz2 forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar.xz forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.zip | |
fix mcp sorting for pm_reports, and some minor language changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9830 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index e04bd7cab2..48cd68500f 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -698,13 +698,13 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, case 'pm_reports_closed': case 'reports': case 'reports_closed': - $type = 'reports'; + $pm = (strpos($mode, 'pm_') === 0) ? true : false; + + $type = ($pm) ? 'pm_reports' : 'reports'; $default_key = 't'; $default_dir = 'd'; $limit_time_sql = ($min_time) ? "AND r.report_time >= $min_time" : ''; - $pm = (strpos($mode, 'pm_') === 0) ? true : false; - if ($topic_id) { $where_sql .= ' p.topic_id = ' . $topic_id . ' AND '; @@ -713,12 +713,12 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, { $where_sql .= ' p.forum_id = ' . $forum_id . ' AND '; } - else if ($pm) + else if (!$pm) { $where_sql .= ' ' . $db->sql_in_set('p.forum_id', get_forum_list(array('!f_read', '!m_report')), true, true) . ' AND '; } - if ($mode == 'reports') + if ($mode == 'reports' || $mode == 'pm_reports') { $where_sql .= ' r.report_closed = 0 AND '; } @@ -785,6 +785,12 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, $sort_by_sql = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => 'p.post_time', 't' => 'r.report_time', 's' => 'p.post_subject'); break; + case 'pm_reports': + $limit_days = array(0 => $user->lang['ALL_REPORTS'], 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'], 365 => $user->lang['1_YEAR']); + $sort_by_text = array('a' => $user->lang['AUTHOR'], 'r' => $user->lang['REPORTER'], 'p' => $user->lang['POST_TIME'], 't' => $user->lang['REPORT_TIME'], 's' => $user->lang['SUBJECT']); + $sort_by_sql = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => 'p.message_time', 't' => 'r.report_time', 's' => 'p.message_subject'); + break; + case 'logs': $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 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'], 365 => $user->lang['1_YEAR']); $sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']); |