diff --git a/upload/ajax/index_data.php b/upload/ajax/index_data.php index 154a4bd3a..2f38b2b18 100644 --- a/upload/ajax/index_data.php +++ b/upload/ajax/index_data.php @@ -92,10 +92,9 @@ switch($mode) case 'get_traf_stats': $user_id = (int) $this->request['user_id']; $btu = get_bt_userdata($user_id); - $bts = get_bt_speed($user_id); - $speed_up = ($bts['speed_up']) ? humn_size($bts['speed_up']).'/s' : '0 KB/s'; - $speed_down = ($bts['speed_down']) ? humn_size($bts['speed_down']).'/s' : '0 KB/s'; + $speed_up = ($btu['speed_up']) ? humn_size($btu['speed_up']).'/s' : '0 KB/s'; + $speed_down = ($btu['speed_down']) ? humn_size($btu['speed_down']).'/s' : '0 KB/s'; $user_ratio = ($btu['u_down_total'] > MIN_DL_FOR_RATIO) ? ''. get_bt_ratio($btu) .'' : $lang['IT_WILL_BE_DOWN'] .' '. humn_size(MIN_DL_FOR_RATIO) .''; $html = ' diff --git a/upload/config.php b/upload/config.php index d2231401b..328e9de8d 100644 --- a/upload/config.php +++ b/upload/config.php @@ -52,7 +52,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'] = 'R378'; +$bb_cfg['tp_release_state'] = 'R379'; $bb_cfg['tp_release_date'] = '03-03-2012'; // Database diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 62a98ab86..b117e0807 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -1206,13 +1206,7 @@ function wbr ($text, $max_word_length = HTML_WBR_LENGTH) function get_bt_userdata ($user_id) { - return DB()->fetch_row("SELECT * FROM ". BB_BT_USERS ." WHERE user_id = ". (int) $user_id); -} - -function get_bt_speed ($user_id) -{ - return DB()->fetch_row("SELECT SUM(speed_up) as speed_up, SUM(speed_down) as speed_down - FROM ". BB_BT_TRACKER ." WHERE user_id = ". (int) $user_id); + return DB()->fetch_row("SELECT bt.*, SUM(tr.speed_up) as speed_up, SUM(tr.speed_down) as speed_down FROM ". BB_BT_USERS ." bt, ". BB_BT_TRACKER ." tr WHERE bt.user_id = ". (int) $user_id ." AND tr.user_id = ". (int) $user_id); } function get_bt_ratio ($btu) @@ -1226,8 +1220,9 @@ function get_bt_ratio ($btu) function show_bt_userdata ($user_id) { + global $lang; + $btu = get_bt_userdata($user_id); - $bts = get_bt_speed($user_id); $GLOBALS['template']->assign_vars(array( 'SHOW_BT_USERDATA' => true, @@ -1239,9 +1234,9 @@ function show_bt_userdata ($user_id) 'USER_RATIO' => get_bt_ratio($btu), 'MIN_DL_FOR_RATIO' => humn_size(MIN_DL_FOR_RATIO), 'MIN_DL_BYTES' => MIN_DL_FOR_RATIO, - 'AUTH_KEY' => $btu['auth_key'], - 'SPEED_UP' => ($bts['speed_up']) ? humn_size($bts['speed_up']).'/s' : '0 KB/s', - 'SPEED_DOWN' => ($bts['speed_down']) ? humn_size($bts['speed_down']).'/s' : '0 KB/s', + 'AUTH_KEY' => ($btu['auth_key']) ? $btu['auth_key'] : $lang['NONE'], + 'SPEED_UP' => ($btu['speed_up']) ? humn_size($btu['speed_up']).'/s' : '0 KB/s', + 'SPEED_DOWN' => ($btu['speed_down']) ? humn_size($btu['speed_down']).'/s' : '0 KB/s', )); } @@ -2726,7 +2721,7 @@ function pad_with_space ($str) function create_magnet($infohash, $auth_key, $logged_in) { global $bb_cfg, $userdata, $_GET; - $passkey_url = (!$logged_in || isset($_GET['no_passkey'])) ? '' : "?{$bb_cfg['passkey_key']}=$auth_key&"; + $passkey_url = (!$logged_in || isset($_GET['no_passkey'])) ? '' : "?{$bb_cfg['passkey_key']}=$auth_key"; return ''; } @@ -2855,6 +2850,4 @@ function profile_url($data) } return $profile; -} - - +} \ No newline at end of file diff --git a/upload/includes/ucp/torrent_userprofile.php b/upload/includes/ucp/torrent_userprofile.php index 70b73a1e4..368d34453 100644 --- a/upload/includes/ucp/torrent_userprofile.php +++ b/upload/includes/ucp/torrent_userprofile.php @@ -30,32 +30,12 @@ else $template->assign_vars(array('EDIT_PROF' => false)); } -// Set tpl vars for bt_userdata -if (IS_ADMIN || $profile_user_id == $userdata['user_id']) -{ - show_bt_userdata($profile_user_id); -} - -if (IS_ADMIN) -{ - $template->assign_vars(array( - 'SHOW_PASSKEY' => true, - 'CAN_EDIT_RATIO' => IS_ADMIN, - )); -} -else -{ - $template->assign_vars(array( - 'CAN_EDIT_RATIO' => false, - )); -} - // Auth $not_auth_forums_sql = ($f = $user->get_not_auth_forums(AUTH_READ)) ? "AND f.forum_id NOT IN($f)" : ''; $datastore->rm('cat_forums'); // Get users active torrents -$sql = 'SELECT f.forum_id, f.forum_name, t.topic_title, tor.size, tr.* +$sql = 'SELECT f.forum_id, f.forum_name, t.topic_title, tor.tor_type, tor.size, tr.* FROM '. BB_FORUMS .' f, '. BB_TOPICS .' t, '. BB_BT_TRACKER .' tr, '. BB_BT_TORRENTS ." tor WHERE tr.user_id = $profile_user_id AND tr.topic_id = tor.topic_id @@ -99,11 +79,25 @@ if ($releasing_count = count($releasing)) for ($i=0; $i<$releasing_count; $i++) { + $is_gold = ''; + if ($tr_cfg['gold_silver_enabled']) + { + if ($releasing[$i]['tor_type'] == TOR_TYPE_GOLD) + { + $is_gold = ' '; + } + elseif ($releasing[$i]['tor_type'] == TOR_TYPE_SILVER) + { + $is_gold = ' '; + } + } + $template->assign_block_vars('released.releasedrow', array( 'FORUM_NAME' => htmlCHR($releasing[$i]['forum_name']), - 'TOPIC_TITLE' => wbr($releasing[$i]['topic_title']), + 'TOPIC_TITLE' => ($releasing[$i]['update_time']) ? wbr($releasing[$i]['topic_title']) : ''. wbr($releasing[$i]['topic_title']) .'', 'U_VIEW_FORUM' => "viewforum.php?". POST_FORUM_URL .'='. $releasing[$i]['forum_id'], 'U_VIEW_TOPIC' => "viewtopic.php?". POST_TOPIC_URL .'='. $releasing[$i]['topic_id'] .'&spmode=full#seeders', + 'TOR_TYPE' => $is_gold, )); } } @@ -118,11 +112,25 @@ if ($seeding_count = count($seeding)) for ($i=0; $i<$seeding_count; $i++) { + $is_gold = ''; + if ($tr_cfg['gold_silver_enabled']) + { + if ($seeding[$i]['tor_type'] == TOR_TYPE_GOLD) + { + $is_gold = ' '; + } + elseif ($seeding[$i]['tor_type'] == TOR_TYPE_SILVER) + { + $is_gold = ' '; + } + } + $template->assign_block_vars('seed.seedrow', array( 'FORUM_NAME' => htmlCHR($seeding[$i]['forum_name']), - 'TOPIC_TITLE' => wbr($seeding[$i]['topic_title']), + 'TOPIC_TITLE' => ($seeding[$i]['update_time']) ? wbr($seeding[$i]['topic_title']) : ''. wbr($seeding[$i]['topic_title']) .'', 'U_VIEW_FORUM' => "viewforum.php?". POST_FORUM_URL .'='. $seeding[$i]['forum_id'], 'U_VIEW_TOPIC' => "viewtopic.php?". POST_TOPIC_URL .'='. $seeding[$i]['topic_id'] .'&spmode=full#seeders', + 'TOR_TYPE' => $is_gold, )); } } @@ -137,15 +145,29 @@ if ($leeching_count = count($leeching)) for ($i=0; $i<$leeching_count; $i++) { + $is_gold = ''; + if ($tr_cfg['gold_silver_enabled']) + { + if ($leeching[$i]['tor_type'] == TOR_TYPE_GOLD) + { + $is_gold = ' '; + } + elseif ($leeching[$i]['tor_type'] == TOR_TYPE_SILVER) + { + $is_gold = ' '; + } + } + $compl_size = ($leeching[$i]['remain'] && $leeching[$i]['size'] && $leeching[$i]['size'] > $leeching[$i]['remain']) ? ($leeching[$i]['size'] - $leeching[$i]['remain']) : 0; $compl_perc = ($compl_size) ? floor($compl_size * 100 / $leeching[$i]['size']) : 0; $template->assign_block_vars('leech.leechrow', array( 'FORUM_NAME' => htmlCHR($leeching[$i]['forum_name']), - 'TOPIC_TITLE' => wbr($leeching[$i]['topic_title']), + 'TOPIC_TITLE' => ($leeching[$i]['update_time']) ? wbr($leeching[$i]['topic_title']) : ''. wbr($leeching[$i]['topic_title']) .'', 'U_VIEW_FORUM' => "viewforum.php?". POST_FORUM_URL .'='. $leeching[$i]['forum_id'], 'U_VIEW_TOPIC' => "viewtopic.php?". POST_TOPIC_URL .'='. $leeching[$i]['topic_id'] .'&spmode=full#leechers', 'COMPL_PERC' => $compl_perc, + 'TOR_TYPE' => $is_gold, )); } } diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index eccd55f39..e606731b8 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -955,21 +955,6 @@ $template->assign_vars(array( )); -//bt -if ($mode == 'editprofile' && $userdata['session_logged_in']) -{ - $template->assign_block_vars('switch_bittorrent', array()); - - $row = DB()->fetch_row("SELECT auth_key FROM ". BB_BT_USERS ." WHERE user_id = $pr_user_id"); - $curr_passkey = ($row['auth_key']) ? $row['auth_key'] : ''; - - $template->assign_vars(array( - 'S_GEN_PASSKEY' => '' . $lang['BT_GEN_PASSKEY_URL'] . '', - 'CURR_PASSKEY' => $curr_passkey, - )); -} -//bt end - require(PAGE_HEADER); $template->pparse('body'); diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php index 50ac9111c..875dc368f 100644 --- a/upload/includes/ucp/usercp_viewprofile.php +++ b/upload/includes/ucp/usercp_viewprofile.php @@ -133,10 +133,10 @@ $template->assign_vars(array( 'S_PROFILE_ACTION' => 'profile.php', 'SIGNATURE' => $signature, - + 'SHOW_PASSKEY' => (IS_ADMIN || $profile_user_id), 'SHOW_ROLE' => (IS_AM || $profile_user_id || $profiledata['user_active']), 'GROUP_MEMBERSHIP' => false, - 'TRAF_STATS' => !(IS_ADMIN || $profile_user_id), + 'TRAF_STATS' => !(IS_AM || $profile_user_id), )); if (IS_ADMIN) @@ -192,6 +192,19 @@ if (!bf($profiledata['user_opt'], 'user_opt', 'allow_dls') || (IS_AM || $profile include(INC_DIR .'ucp/torrent_userprofile.php'); } +// Ajax bt_userdata +if (IS_AM || $profile_user_id) +{ + show_bt_userdata($profiledata['user_id']); +} +else +{ + $template->assign_vars(array( + 'DOWN_TOTAL_BYTES' => false, + 'MIN_DL_BYTES' => false, + )); +} + $template->assign_vars(array( 'SHOW_ACCESS_PRIVILEGE' => IS_ADMIN, 'IGNORE_SRV_LOAD' => ($profiledata['user_level'] != USER || $profiledata['ignore_srv_load']) ? $lang['NO'] : $lang['YES'], diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index e69b68ec9..8b2640282 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1189,11 +1189,7 @@ $lang['INVALID_ANN_URL'] = 'Invalid Announce URL [%s]

must be %s
Torrent not registered on tracker'; $lang['PASSKEY_ERR_EMPTY'] = 'Could not add passkey (passkey is empty)

Go to your forum profile and generate it'; $lang['BT_GEN_PASSKEY'] = 'Passkey'; -$lang['BT_GEN_PASSKEY_URL'] = 'Generate or change Passkey'; -$lang['BT_GEN_PASSKEY_EXPLAIN'] = 'Generate your personal id for torrent tracker'; -$lang['BT_GEN_PASSKEY_EXPLAIN_2'] = "Warning! After generating new id you'll need to redownload all active torrent's!"; -$lang['BT_GEN_PASSKEY_NEW'] = 'Are you sure you want to create a new passkey?'; -$lang['BT_GEN_PASSKEY_OK'] = 'New personal identifier generated'; +$lang['BT_GEN_PASSKEY_NEW'] = "Attention! After changing the new passkey, you will need to re-download all the active torrents! \ n Are you sure you want to create a new passkey?"; $lang['BT_NO_SEARCHABLE_FORUMS'] = 'No searchable forums found'; $lang['SEEDS'] = 'Seed'; @@ -1356,8 +1352,6 @@ $lang['UPLOADED'] = 'Uploaded'; $lang['RELEASED'] = 'Released'; $lang['BONUS'] = 'Bonus'; $lang['IT_WILL_BE_DOWN'] = 'it will start to be considered after it will be downloaded'; - -$lang['CURR_PASSKEY'] = 'Current passkey:'; $lang['SPMODE_FULL'] = 'Show peers in full details'; $lang['TRACKER'] = 'Tracker'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index aeda6f839..66d8dbd78 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1196,11 +1196,7 @@ $lang['INVALID_ANN_URL'] = 'Неправильный Аnnounce URL [%s]

{PAGE_TITLE}
- @@ -15,6 +14,7 @@
{L_SORT_BY}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}  {L_SORT_PER_LETTER}: {S_LETTER_SELECT}{S_LETTER_HIDDEN}
+
diff --git a/upload/templates/default/privmsgs_read.tpl b/upload/templates/default/privmsgs_read.tpl index 1dcbf7eb3..d2adca48d 100644 --- a/upload/templates/default/privmsgs_read.tpl +++ b/upload/templates/default/privmsgs_read.tpl @@ -65,7 +65,15 @@
- + {S_HIDDEN_FIELDS} @@ -83,6 +91,9 @@ - - - - - - - - - - - - - - diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index 478599c42..83bf66e2f 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -86,12 +86,11 @@ $(document).ready(function(){ {action: "edit_user_profile", id: "ignore_srv_load", editableType: "yesno-radio"} -{action: "edit_user_profile", id: "u_up_total"}{action: "edit_user_profile", id: "u_down_total"}{action: "edit_user_profile", id: "u_up_release"}{action: "edit_user_profile", id: "u_up_bonus"} - + @@ -325,23 +323,23 @@ ajax.callback.gen_passkey = function(data){ - style="display: none;"> + style="display: none;"> @@ -391,7 +389,7 @@ ajax.callback.gen_passkey = function(data){ - +
+
diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index a3799d7ae..eaa699ae3 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -74,24 +74,6 @@ document.write(''); 		{L_RESET_AUTOLOGIN}
{L_RESET_AUTOLOGIN_EXPL}
TorrentPier
{L_BT_GEN_PASSKEY}
{L_BT_GEN_PASSKEY_EXPLAIN}
{L_BT_GEN_PASSKEY_EXPLAIN_2}
{S_GEN_PASSKEY}
{L_CURR_PASSKEY}{CURR_PASSKEY}
{L_PROFILE_INFO}
{L_USER_RATIO}: {USER_RATIO} [?] - {L_NONE} (DL < {MIN_DL_FOR_RATIO}) + {L_NONE} (DL < {MIN_DL_FOR_RATIO}) - - [ Passkey: {AUTH_KEY} ] + + [ {L_BT_GEN_PASSKEY}: {AUTH_KEY} ]
{L_ACCESS_SRV_LOAD}: {IGNORE_SRV_LOAD}
style="display: none;" class="ratio bCenter borderless" cellspacing="1" width="200"> @@ -459,7 +457,7 @@ ajax.callback.gen_passkey = function(data){ - + @@ -481,7 +479,7 @@ ajax.callback.gen_passkey = function(data){ - + @@ -504,7 +502,7 @@ ajax.callback.gen_passkey = function(data){ - +
{seed.releasedrow.FORUM_NAME}{seed.releasedrow.TOPIC_TITLE}{seed.releasedrow.TOR_TYPE}{seed.releasedrow.TOPIC_TITLE}
{seed.seedrow.FORUM_NAME}{seed.seedrow.TOPIC_TITLE}{seed.seedrow.TOR_TYPE}{seed.seedrow.TOPIC_TITLE}
{leech.leechrow.FORUM_NAME}{leech.leechrow.TOPIC_TITLE}{leech.leechrow.TOR_TYPE}{leech.leechrow.TOPIC_TITLE} {leech.leechrow.COMPL_PERC}