diff --git a/upload/ajax/index_data.php b/upload/ajax/index_data.php index 2f38b2b18..c450d6682 100644 --- a/upload/ajax/index_data.php +++ b/upload/ajax/index_data.php @@ -98,7 +98,7 @@ switch($mode) $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 = ' - + '. $lang['DOWNLOADED'] .' '. $lang['UPLOADED'] .' '. $lang['RELEASED'] .' diff --git a/upload/config.php b/upload/config.php index 328e9de8d..4fab4b8bb 100644 --- a/upload/config.php +++ b/upload/config.php @@ -52,8 +52,8 @@ $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'] = 'R379'; -$bb_cfg['tp_release_date'] = '03-03-2012'; +$bb_cfg['tp_release_state'] = 'R380'; +$bb_cfg['tp_release_date'] = '04-03-2012'; // Database $charset = 'utf8'; diff --git a/upload/includes/functions.php b/upload/includes/functions.php index b117e0807..c0fc26622 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -1206,7 +1206,10 @@ function wbr ($text, $max_word_length = HTML_WBR_LENGTH) function get_bt_userdata ($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); + 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 + LEFT JOIN ". BB_BT_TRACKER ." tr ON (bt.user_id = tr.user_id) + WHERE bt.user_id = ". (int) $user_id); } function get_bt_ratio ($btu) diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 8b2640282..179d104ec 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1188,7 +1188,9 @@ $lang['BT_REGISTERED'] = 'Torrent registered on tracker

Now you need $lang['INVALID_ANN_URL'] = 'Invalid Announce URL [%s]

must be %s'; $lang['PASSKEY_ERR_TOR_NOT_REG'] = 'Could not add passkey

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_PASSKEY'] = 'Passkey'; +$lang['BT_GEN_PASSKEY'] = 'create a new'; +$lang['BT_PASSKEY_VIEW'] = 'show'; $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'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 66d8dbd78..af43dcf99 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1195,7 +1195,9 @@ $lang['BT_REGISTERED'] = 'Торрент зарегистрирован на т $lang['INVALID_ANN_URL'] = 'Неправильный Аnnounce URL [%s]

должен быть %s'; $lang['PASSKEY_ERR_TOR_NOT_REG'] = 'Невозможно добавить passkey

Торрент не зарегистрирован на трекере'; $lang['PASSKEY_ERR_EMPTY'] = 'Невозможно добавить passkey

Вам необходимо зайти в ваш форумный профиль и сгенерировать passkey'; -$lang['BT_GEN_PASSKEY'] = 'Passkey'; +$lang['BT_PASSKEY'] = 'Passkey'; +$lang['BT_GEN_PASSKEY'] = 'Создать новый'; +$lang['BT_PASSKEY_VIEW'] = 'Показать'; $lang['BT_GEN_PASSKEY_NEW'] = "Внимание! После изменения нового passkey, Вам необходимо будет заново скачать все активные торренты! \n Вы уверены, что хотите создать новый passkey?"; $lang['BT_NO_SEARCHABLE_FORUMS'] = 'Доступных для поиска форумов не найдено'; diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index 83bf66e2f..50bca13a4 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -332,8 +332,14 @@ ajax.callback.gen_passkey = function(data){ {L_NONE} (DL < {MIN_DL_FOR_RATIO}) + - [ {L_BT_GEN_PASSKEY}: {AUTH_KEY} ] + [ {L_BT_PASSKEY}: {L_BT_PASSKEY_VIEW} + ] + @@ -392,26 +398,26 @@ ajax.callback.gen_passkey = function(data){ - style="display: none;" class="ratio bCenter borderless" cellspacing="1" width="200"> - - - - - - - - - - - - - - - - -
{L_DOWNLOADED}{L_UPLOADED}{L_RELEASED}{L_BONUS}
{DOWN_TOTAL}{UP_TOTAL}{RELEASED}{UP_BONUS}
{L_DL_DL_SPEED}: {SPEED_DOWN}{L_DL_UL_SPEED}: {SPEED_UP}
- - + style="display: none;" class="ratio bCenter borderless" cellspacing="1" width="200"> + + + + + + + + + + + + + + + + +
{L_DOWNLOADED}{L_UPLOADED}{L_RELEASED}{L_BONUS}
{DOWN_TOTAL}{UP_TOTAL}{RELEASED}{UP_BONUS}
{L_DL_DL_SPEED}: {SPEED_DOWN}{L_DL_UL_SPEED}: {SPEED_UP}
+ +