diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot
index 53487f46f..11c0f81f6 100644
--- a/perl-install/install/share/po/DrakX.pot
+++ b/perl-install/install/share/po/DrakX.pot

diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po
index 84337fa1d..2cd22a59b 100644
--- a/perl-install/install/share/po/af.po
+++ b/perl-install/install/share/po/af.po

diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po
index 039f458bc..e8063369c 100644
--- a/perl-install/install/share/po/am.po
+++ b/perl-install/install/share/po/am.po

diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po
index 184f13462..01047bcf1 100644
--- a/perl-install/install/share/po/ar.po
+++ b/perl-install/install/share/po/ar.po

diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po
index 40e452361..d51f77935 100644
--- a/perl-install/install/share/po/az.po
+++ b/perl-install/install/share/po/az.po

diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po
index 621443c68..0e74897a5 100644
--- a/perl-install/install/share/po/be.po
+++ b/perl-install/install/share/po/be.po

diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po
index 1a229f7d8..976960827 100644
--- a/perl-install/install/share/po/bg.po
+++ b/perl-install/install/share/po/bg.po

diff --git a/perl-install/install/share/po/bn.po b/perl-install/install/share/po/bn.po
index ed78d86ed..1fa2b518e 100644
--- a/perl-install/install/share/po/bn.po
+++ b/perl-install/install/share/po/bn.po

diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po
index 3ebb6472e..063b8a85e 100644
--- a/perl-install/install/share/po/br.po
+++ b/perl-install/install/share/po/br.po

diff --git a/perl-install/install/share/po/bs.po b/perl-install/install/share/po/bs.po
index af9e4fa5c..d453b59ff 100644
--- a/perl-install/install/share/po/bs.po
+++ b/perl-install/i $type = ($pm) ? 'pm_reports' : 'reports'; $default_key = 't'; $default_dir = 'd'; $limit_time_sql = ($min_time) ? "AND r.report_time >= $min_time" : ''; if ($topic_id) { $where_sql .= ' p.topic_id = ' . $topic_id . ' AND '; } else if ($forum_id) { $where_sql .= ' p.forum_id = ' . $forum_id . ' AND '; } 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' || $mode == 'pm_reports') { $where_sql .= ' r.report_closed = 0 AND '; } else { $where_sql .= ' r.report_closed = 1 AND '; } if ($pm) { $sql = 'SELECT COUNT(r.report_id) AS total FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . " p $where_sql r.post_id = 0 AND p.msg_id = r.pm_id $limit_time_sql"; } else { $sql = 'SELECT COUNT(r.report_id) AS total FROM ' . REPORTS_
index c61870d88..323e10695 100644
--- a/perl-install/install/share/po/ca.po
+++ b/perl-install/install/share/po/ca.po

diff --git a/perl-install/install/share/po/cs.po b/perl-install/install/share/po/cs.po
index 34b4684fe..13801b032 100644
--- a/perl-install/install/share/po/cs.po
+++ b/perl-install/install/share/po/cs.po

diff --git a/perl-install/install/share/po/cy.po b/perl-ins $sort_by_sql_ary = array('a' => 'u.username_clean', 't' => array('p.post_time', 'p.post_id'), 's' => 'p.post_subject'); $limit_time_sql = ($min_time) ? "AND p.post_time >= $min_time" : ''; break; case '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_ary = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => array('p.post_time', 'p.post_id'), '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_ary = 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']); $sort_by_sql_ary = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation'); $limit_time_sql = ($min_time) ? "AND l.log_time >= $min_time" : ''; break; } // Default total to -1 to allow editing by the event $total_val = -1; $sort_by_sql = $sort_by_sql_ary; $sort_days = $sort_days_val; $sort_dir = $sort_dir_val; $sort_key = $sort_key_val; $total = $total_val; /** * This event allows you to control the SQL query used to get the total number * of reports the user can access. * * This total is used for the pagination and for displaying the total number * of reports to the user * * * @event core.mcp_sorting_query_before * @var string sql The current SQL search string * @var string mode An id related to the module(s) the user is viewing * @var string type Which kind of information is this being used for displaying. Posts, topics, etc... * @var int forum_id The forum id of the posts the user is trying to access, if not 0 * @var int topic_id The topic id of the posts the user is trying to access, if not 0 * @var int sort_days The max age of the oldest report to be shown, in days * @var string sort_key The way the user has decided to sort the data. * The valid values must be in the keys of the sort_by_* variables * @var string sort_dir Either 'd' for "DESC" or 'a' for 'ASC' in the SQL query * @var int limit_days The possible max ages of the oldest report for the user to choose, in days. * @var array sort_by_sql SQL text (values) for the possible names of the ways of sorting data (keys). * @var array sort_by_text Language text (values) for the possible names of the ways of sorting data (keys). * @var int min_time Integer with the minimum post time that the user is searching for * @var int limit_time_sql Time limiting options used in the SQL query. * @var int total The total number of reports that exist. Only set if you want to override the result * @var string where_sql Extra information included in the WHERE clause. It must end with "WHERE" or "AND" or "OR". * Set to "WHERE" and set total above -1 to override the total value * @since 3.1.4-RC1 */ $vars = array( 'sql', 'mode', 'type', 'forum_id', 'topic_id', 'sort_days', 'sort_key', 'sort_dir', 'limit_days', 'sort_by_sql', 'sort_by_text', 'min_time', 'limit_time_sql', 'total', 'where_sql', ); extract($phpbb_dispatcher->trigger_event('core.mcp_sorting_query_before', compact($vars))); $sort_by_sql_ary = $sort_by_sql; $sort_days_val = $sort_days; $sort_key_val = $sort_key; $sort_dir_val = $sort_dir; $total_val = $total; unset($sort_by_sql); unset($sort_days); unset($sort_key); unset($sort_dir); unset($total); if (!isset($sort_by_sql_ary[$sort_key_val])) { $sort_key_val = $default_key; } $direction = ($sort_dir_val == 'd') ? 'DESC' : 'ASC'; if (is_array($sort_by_sql_ary[$sort_key_val])) { $sort_order_sql = implode(' ' . $direction . ', ', $sort_by_sql_ary[$sort_key_val]) . ' ' . $direction; } else { $sort_order_sql = $sort_by_sql_ary[$sort_key_val] . ' ' . $direction; } $s_limit_days = $s_sort_key = $s_sort_dir = $sort_url = ''; gen_sort_selects($limit_days, $sort_by_text, $sort_days_val, $sort_key_val, $sort_dir_val, $s_limit_days, $s_sort_key, $s_sort_dir, $sort_url); $template->assign_vars(array( 'S_SELECT_SORT_DIR' => $s_sort_dir, 'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_DAYS' => $s_limit_days) ); if (($sort_days_val && $mode != 'viewlogs') || in_array($mode, array('reports', 'unapproved_topics', 'unapproved_posts', 'deleted_topics', 'deleted_posts')) || $where_sql != 'WHERE') { $result = $db->sql_query($sql); $total_val = (int) $db->sql_fetchfield('total'); $db->sql_freeresult($result); } else if ($total_val < -1) { $total_val = -1; } } /** * Validate ids * * @param array &$ids The relevant ids to check * @param string $table The table to find the ids in * @param string $sql_id The ids relevant column name * @param array $acl_list A list of permissions the user need to have * @param mixed $singe_forum Limit to one forum id (int) or the first forum found (true) * * @return mixed False if no ids were able to be retrieved, true if at least one id left. * Additionally, this value can be the forum_id assigned if $single_forum was set. * Therefore checking the result for with !== false is the best method. */ function phpbb_check_ids(&$ids, $table, $sql_id, $acl_list = false, $single_forum = false) { global $db, $auth; if (!is_array($ids) || empty($ids)) { return false; } $sql = "SELECT $sql_id, forum_id FROM $table WHERE " . $db->sql_in_set($sql_id, $ids); $result = $db->sql_query($sql); $ids = array(); $forum_id = false; while ($row = $db->sql_fetchrow($result)) { if ($acl_list && $row['forum_id'] && !$auth->acl_gets($acl_list, $row['forum_id'])) { continue; } if ($acl_list && !$row['forum_id'] && !$auth->acl_getf_global($acl_list)) { continue; } // Limit forum? If not, just assign the id. if ($single_forum === false) { $ids[] = $row[$sql_id]; continue; } // Limit forum to a specific forum id? // This can get really tricky, because we do not want to create a failure on global topics. :) if ($row['forum_id']) { if ($single_forum !== true && $row['forum_id'] == (int) $single_forum) { $forum_id = (int) $single_forum; } else if ($forum_id === false) { $forum_id = $row['forum_id']; } if ($row['forum_id'] == $forum_id) { $ids[] = $row[$sql_id]; } } else { // Always add a global topic $ids[] = $row[$sql_id]; } } $db->sql_freeresult($result); if (!count($ids)) { return false; } // If forum id is false and ids populated we may have only global announcements selected (returning 0 because of (int) $forum_id) return ($single_forum === false) ? true : (int) $forum_id; }