diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index ed6aa6f62..0a67e2afc 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -75,7 +75,6 @@ switch($mode) 'CONFIG_MODS' => true, 'REPORTS_ENABLED' => $new['reports_enabled'], - 'GOLD_SILVER_ENABLED' => $new['gold_silver_enabled'], 'GALLERY_ENABLED' => $new['gallery_enabled'], 'PIC_DIR' => $new['pic_dir'], 'PIC_MAX_SIZE' => $new['pic_max_size'], diff --git a/upload/admin/admin_bt_tracker_cfg.php b/upload/admin/admin_bt_tracker_cfg.php index ee84b8b68..618f121d3 100644 --- a/upload/admin/admin_bt_tracker_cfg.php +++ b/upload/admin/admin_bt_tracker_cfg.php @@ -57,6 +57,7 @@ $template->assign_vars(array( 'IGNORE_REPORTED_IP' => $bb_cfg['ignore_reported_ip'], 'ANNOUNCE_INTERVAL' => $bb_cfg['announce_interval'], 'PASSKEY_KEY' => $bb_cfg['passkey_key'], + 'GOLD_SILVER_ENABLED' => $tr_cfg['gold_silver_enabled'], 'DISABLE_SUBMIT' => true, 'S_HIDDEN_FIELDS' => '', diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index de46b6fc3..23de2bc63 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -189,7 +189,7 @@ if ($tor_reged && $tor_info) { $template->assign_vars(array( 'SHOW_RATIO_WARN' => true, - 'RATIO_WARN_MSG' => sprintf($lang['BT_RATIO_WARNING_MSG'], $min_ratio_warn, $bb_cfg['ratio_url_help']), + 'RATIO_WARN_MSG' => sprintf($lang['BT_RATIO_WARNING_MSG'], $min_ratio_dl, $bb_cfg['ratio_url_help']), )); } } diff --git a/upload/bt/announce.php b/upload/bt/announce.php index 2d49235e8..b82081cbf 100644 --- a/upload/bt/announce.php +++ b/upload/bt/announce.php @@ -357,7 +357,7 @@ $up_add = ($lp_info && $uploaded > $lp_info['uploaded']) ? $uploaded - $lp_info[ $down_add = ($lp_info && $downloaded > $lp_info['downloaded']) ? $downloaded - $lp_info['downloaded'] : 0; // Gold/Silver releases -if ($bb_cfg['gold_silver_enabled'] && $down_add) +if ($tr_cfg['gold_silver_enabled'] && $down_add) { if ($tor_type == TOR_TYPE_GOLD) { diff --git a/upload/config.php b/upload/config.php index a47ced36e..abeeada28 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R360'; +$bb_cfg['tp_release_state'] = 'R361'; $bb_cfg['tp_release_date'] = '08-02-2012'; // Database @@ -163,6 +163,7 @@ $tr_cfg = array( 'limit_seed_ips' => 0, 'limit_leech_ips' => 0, 'tor_topic_up' => true, + 'gold_silver_enabled' => true, ); $bb_cfg['show_dl_status_in_search'] = true; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index fb31d43f8..f84bb9e8f 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -290,13 +290,6 @@ - -

{L_GOLD} / {L_SILVER}

- -    - - -

{L_MAGNET}

diff --git a/upload/templates/admin/admin_bt_tracker_cfg.tpl b/upload/templates/admin/admin_bt_tracker_cfg.tpl index ba51a333d..db84fb5b1 100644 --- a/upload/templates/admin/admin_bt_tracker_cfg.tpl +++ b/upload/templates/admin/admin_bt_tracker_cfg.tpl @@ -106,6 +106,13 @@

{L_UPDATE_DLSTAT}

Used in cron Tracker cleanup and dlstat
+ +

{L_GOLD} / {L_SILVER}

+ +    + + +

{L_IGNORE_GIVEN_IP}

$bb_cfg['ignore_reported_ip']
{L_IGNOR_GIVEN_IP_EXPL}
  {L_YES}{L_NO} diff --git a/upload/templates/default/tracker.tpl b/upload/templates/default/tracker.tpl index 7dcb93ebc..4de31395e 100644 --- a/upload/templates/default/tracker.tpl +++ b/upload/templates/default/tracker.tpl @@ -149,7 +149,7 @@ ajax.callback.view_post = function(data) {

{ONLY_ACTIVE_CHBOX}

{SEED_EXIST_CHBOX}

{ONLY_NEW_CHBOX}[{MINIPOST_IMG_NEW}] 

-

{TOR_TYPE_CHBOX}

+

{TOR_TYPE_CHBOX}

diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl index d43eaa12d..684a72833 100644 --- a/upload/templates/default/viewtopic_attach.tpl +++ b/upload/templates/default/viewtopic_attach.tpl @@ -232,11 +232,11 @@ {postrow.attach.tor_reged.DOWNLOAD_NAME} {postrow.attach.tor_reged.MAGNET} - +  {L_SILVER_STATUS}  - +  {L_GOLD_STATUS}  @@ -321,7 +321,7 @@ - + diff --git a/upload/tracker.php b/upload/tracker.php index d7a1460ae..bac150490 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -734,7 +734,7 @@ if ($allowed_forums) // Gold/Silver releases mod $is_gold = ''; - if ($bb_cfg['gold_silver_enabled']) + if ($tr_cfg['gold_silver_enabled']) { if ($tor['tor_type'] == TOR_TYPE_GOLD) { @@ -882,7 +882,7 @@ $template->assign_vars(array( 'AJAX_TOPICS' => $user->opt_js['tr_t_ax'], 'SHOW_TIME_TOPICS' => $user->opt_js['tr_t_t'], 'SHOW_CURSOR' => $user->opt_js['hl_tr'], - + 'U_SEARCH_USER' => "search.php?mode=searchuser&input_name=$poster_name_key", )); diff --git a/upload/viewforum.php b/upload/viewforum.php index 09047481d..76c990d69 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -480,7 +480,7 @@ foreach ($topic_rowset as $topic) // Gold/Silver releases mod $is_gold = ''; - if ($bb_cfg['gold_silver_enabled'] && isset($topic['tor_type'])) + if ($tr_cfg['gold_silver_enabled'] && isset($topic['tor_type'])) { if ($topic['tor_type'] == TOR_TYPE_GOLD) {