- {AVATAR}
+ {THIS_AVATAR}
{L_YOUR_RATIO} {USER_RATIO} {L_NONE} (DL < {MIN_DL_FOR_RATIO}){L_DOWNLOADED} {DOWN_TOTAL} {L_UPLOADED} {UP_TOTAL}
+
@@ -306,6 +311,7 @@ ajax.callback.view_post = function(data) {
onclick="ajax.view_post({tor.POST_ID}, this); return false;" href="{TOPIC_URL}{tor.TOPIC_ID}">{tor.TOPIC_TITLE}{tor.TOR_TYPE}{tor.TOPIC_TITLE}
+ {tor.TOPIC_TIME}
{tor.USERNAME}
{L_MODERATE_FORUM}
- |
- {L_TOPICS_PER_PAGE}:
-
-
-
+ |
+ {L_TOPICS_PER_PAGE}:
+ {SELECT_TPP}
+
+ {L_STATUS}:
+ {SELECT_TST}
+
+
+
diff --git a/upload/tracker.php b/upload/tracker.php
index 37ba89757..8c447d6d4 100644
--- a/upload/tracker.php
+++ b/upload/tracker.php
@@ -644,7 +644,7 @@ if ($allowed_forums)
$select = "
SELECT
tor.topic_id, tor.post_id, tor.attach_id, tor.size, tor.reg_time, tor.complete_count, tor.seeder_last_seen, tor.tor_status, tor.tor_type,
- t.topic_title, t.topic_replies, t.topic_views, sn.seeders, sn.leechers, tor.info_hash
+ t.topic_title, t.topic_time, t.topic_replies, t.topic_views, sn.seeders, sn.leechers, tor.info_hash
";
$select .= (!$hide_speed) ? ", sn.speed_up, sn.speed_down" : '';
$select .= (!$hide_forum) ? ", tor.forum_id" : '';
@@ -738,6 +738,7 @@ if ($allowed_forums)
'FORUM_NAME' => ($forum_id) ? $forum_name_html[$forum_id] : '',
'TOPIC_ID' => $tor['topic_id'],
'TOPIC_TITLE' => wbr($tor['topic_title']),
+ 'TOPIC_TIME' => bb_date($tor['topic_time'], 'd-M-y') .' · '. delta_time($tor['topic_time']),
'POST_ID' => $tor['post_id'],
'POSTER_ID' => $poster_id,
'USERNAME' => isset($tor['username']) ? wbr($tor['username']) : '',
@@ -860,6 +861,7 @@ $template->assign_vars(array(
'TITLE_MATCH_VAL' => $title_match_val,
'AJAX_TOPICS' => $user->opt_js['tr_t_ax'],
+ 'SHOW_TIME_TOPICS' => $user->opt_js['tr_t_t'],
'U_SEARCH_USER' => "search.php?mode=searchuser&input_name=$poster_name_key",
));
diff --git a/upload/viewforum.php b/upload/viewforum.php
index 33f4f1a66..a2d6b0a78 100644
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@@ -1,23 +1,4 @@
-1), array_flip($lang['tor_status']));
+ $template->assign_vars(array(
+ 'SELECT_TST' => build_select('tst', $select_tst, $tor_status),
+ ));
$select_st = array_merge(array('Выберите статус' => -1), array_flip($lang['tor_status']));
$template->assign_vars(array(
'SELECT_ST' => build_select('st', $select_st, -1),
@@ -351,8 +345,14 @@ $limit_topics_time_sql = ($topic_days) ? "AND t.topic_last_post_time > ". (TIMEN
$select_tor_sql = $join_tor_sql = '';
$join_dl = ($bb_cfg['show_dl_status_in_forum'] && !IS_GUEST);
+$where_tor_sql = '';
if ($forum_data['allow_reg_tracker'])
{
+ if ($tor_status != -1)
+ {
+ $where_tor_sql = "AND tor.tor_status = $tor_status";
+ }
+
$select_tor_sql = ',
bt.auth_key, tor.info_hash, tor.size AS tor_size, tor.reg_time, tor.complete_count, tor.seeder_last_seen, tor.attach_id, tor.tor_status, tor.tor_type,
sn.seeders, sn.leechers
@@ -420,6 +420,7 @@ if ($topics_csv = join(',', $topic_ids))
LEFT JOIN ". BB_USERS ." u2 ON(p2.poster_id = u2.user_id)
$join_tor_sql
WHERE t.topic_id IN($topics_csv)
+ $where_tor_sql
GROUP BY t.topic_id
$order_sql
");
@@ -474,7 +475,7 @@ $template->assign_vars(array(
'ONLY_NEW_TOPICS_ON' => ($only_new == ONLY_NEW_TOPICS),
'TITLE_MATCH' => htmlCHR($title_match),
- 'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '',
+ 'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page) : '',
'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $lang['POST_NEW_TOPIC'],
'S_AUTH_LIST' => $u_auth,
'U_VIEW_FORUM' => FORUM_URL . $forum_id,
@@ -575,6 +576,10 @@ foreach ($topic_rowset as $topic)
}
unset($topic_rowset);
+$pg_url = FORUM_URL . $forum_id;
+$pg_url .= ($sort_value) ? "&sort=$sort_value" : '';
+$pg_url .= ($order_value) ? "&order=$order_value" : '';
+$template->assign_var('MOD_URL', $pg_url);
$pg_url = FORUM_URL . $forum_id;
$pg_url .= ($topic_days) ? "&topicdays=$topic_days" : '';
$pg_url .= ($sort_value) ? "&sort=$sort_value" : '';
@@ -606,7 +611,6 @@ else
$template->assign_vars(array(
'PAGE_URL' => $pg_url,
- 'PAGE_URL_TPP' => url_arg($pg_url, 'tpp', null),
'FOUND_TOPICS' => $found_topics,
'AUTH_MOD' => $is_auth['auth_mod'],