From 1b5d3d940ad53b9dbe8596b210c873fe1e6b2778 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Fri, 13 Apr 2012 15:37:05 +0000 Subject: [PATCH] r398 UPDATE bb_users SET user_opt = 0 WHERE user_id = -1; git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@398 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- install/sql/mysql.sql | 2 +- upload/admin/admin_board.php | 4 +- upload/ajax/index_data.php | 6 +-- upload/config.php | 2 +- upload/includes/functions.php | 13 +++++ upload/includes/page_header.php | 1 + upload/includes/ucp/usercp_bonus.php | 43 +++++++++------ upload/includes/ucp/usercp_register.php | 20 +------ upload/language/lang_english/lang_admin.php | 1 + upload/language/lang_english/lang_main.php | 25 ++++++--- upload/language/lang_russian/lang_admin.php | 4 +- upload/language/lang_russian/lang_main.php | 27 ++++++---- upload/templates/admin/admin_board.tpl | 10 ++-- .../templates/admin/admin_bt_tracker_cfg.tpl | 2 +- upload/templates/default/page_header.tpl | 1 + upload/templates/default/usercp_bonus.tpl | 54 +++++++++++++++++++ upload/templates/default/viewforum.tpl | 10 ++-- upload/templates/default/viewtopic_attach.tpl | 2 +- 18 files changed, 154 insertions(+), 73 deletions(-) create mode 100644 upload/templates/default/usercp_bonus.tpl diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index dad8a1f81..f85ac1343 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -494,7 +494,7 @@ CREATE TABLE IF NOT EXISTS `bb_bt_users` ( `down_yesterday` bigint(20) unsigned NOT NULL DEFAULT '0', `up_release_yesterday` bigint(20) unsigned NOT NULL DEFAULT '0', `up_bonus_yesterday` bigint(20) unsigned NOT NULL DEFAULT '0', - `points_yesterday` float(16,2) unsigned NOT NULL DEFAULT '0', + `points_yesterday` float(16,2) unsigned NOT NULL DEFAULT '0.00', PRIMARY KEY (`user_id`), UNIQUE KEY `auth_key` (`auth_key`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index f9e5716ce..d7077edf8 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -131,8 +131,8 @@ switch($mode) if(!$row || !$price_row[$i]) continue; $template->assign_block_vars('bonus_upload', array( - 'UP' => $upload_row[$i], - 'PRICE' => $row, + 'UP' => $row, + 'PRICE' => $price_row[$i], )); } } diff --git a/upload/ajax/index_data.php b/upload/ajax/index_data.php index 940940da9..44eea4fd7 100644 --- a/upload/ajax/index_data.php +++ b/upload/ajax/index_data.php @@ -118,9 +118,9 @@ switch($mode) '. $lang['MAX_SPEED'] .' '. $lang['DL_DL_SPEED'] .': '. $speed_down .' - '. $lang['DL_DL_SPEED'] .': '. $speed_down .' - - '; + '. $lang['DL_UL_SPEED'] .': '. $speed_up .''; + $html .= ($bb_cfg['seed_bonus_enabled']) ? '' : ''; + $html .= ''; $this->response['user_ratio'] = ' '. $lang['USER_RATIO'] .': diff --git a/upload/config.php b/upload/config.php index 15085ad21..49ff873d5 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 (RC)'; -$bb_cfg['tp_release_state'] = 'R397'; +$bb_cfg['tp_release_state'] = 'R398'; $bb_cfg['tp_release_date'] = '13-04-2012'; // Database diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 8b6b978b9..044d57868 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -2768,6 +2768,19 @@ function set_die_append_msg ($forum_id = null, $topic_id = null) $template->assign_var('BB_DIE_APPEND_MSG', $msg); } +function set_pr_die_append_msg($pr_uid) +{ + global $lang, $template; + + $template->assign_var('BB_DIE_APPEND_MSG', ' + '. $lang['PROFILE_RETURN'] .' +

+ '. $lang['PROFILE_EDIT_RETURN'] .' +

+ '. $lang['INDEX_RETURN'] .' + '); +} + function CAPTCHA () { static $captcha_obj = null; diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index f68e17ce0..0206417b7 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -206,6 +206,7 @@ $template->assign_vars(array( 'LOGGED_IN' => $logged_in, 'SESSION_USER_ID' => $userdata['user_id'], + 'POINTS' => $userdata['user_points'], 'THIS_USER' => profile_url($userdata), 'THIS_AVATAR' => get_avatar($userdata['user_avatar'], $userdata['user_avatar_type'], !bf($userdata['user_opt'], 'user_opt', 'allow_avatar')), 'SHOW_LOGIN_LINK' => !defined('IN_LOGIN'), diff --git a/upload/includes/ucp/usercp_bonus.php b/upload/includes/ucp/usercp_bonus.php index 17e58f206..917cf7f9d 100644 --- a/upload/includes/ucp/usercp_bonus.php +++ b/upload/includes/ucp/usercp_bonus.php @@ -5,7 +5,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); $user_id = $userdata['user_id']; $user_points = $userdata['user_points']; -if($bb_cfg['bonus_upload'] && $bb_cfg['bonus_upload_price']) +if($bb_cfg['seed_bonus_enabled'] && $bb_cfg['bonus_upload'] && $bb_cfg['bonus_upload_price']) { $upload_row = unserialize($bb_cfg['bonus_upload']); $price_row = unserialize($bb_cfg['bonus_upload_price']); @@ -24,16 +24,18 @@ if (isset($_POST['bonus_id'])) generate_passkey($user_id, true); $btu = get_bt_userdata($user_id); } - - if(empty($upload_row[$id]) || empty($price_row[$id])) - { - bb_die('false'); - } - + $upload = $upload_row[$id]*1024*1024*1024; $points = $price_row[$id]; - - if($userdata['user_points'] <= $points) bb_die('false2'); + + if($userdata['user_points'] <= $points) + { + meta_refresh('index.php', 5); + + $message = $lang['BONUS_NOT_SUCCES'] .'

'. $lang['BONUS_RETURN'] .'

'. $lang['RETURN_PROFILE'] .'

'. sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + + bb_die($message); + } DB()->query("UPDATE ". BB_BT_USERS ." bu, ". BB_USERS ." u SET @@ -44,15 +46,21 @@ if (isset($_POST['bonus_id'])) AND u.user_id = bu.user_id "); - cache_rm_user_sessions ($user_id); - - bb_die(sprintf($lang['BONUS_SUCCES'], $_POST['bonus_id'])); + cache_rm_user_sessions($user_id); + meta_refresh(BONUS_URL, 5); + + $message = sprintf($lang['BONUS_SUCCES'], humn_size($upload_row[$id]*1024*1024*1024)); + $message .= '

'. $lang['BONUS_RETURN'] .'

'. $lang['RETURN_PROFILE'] .'

'. sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + + bb_die($message); } else { $template->assign_vars(array( - 'U_USER_PROFILE' => PROFILE_URL . $user_id, - 'S_MODE_ACTION' => 'profile.php?mode=bonus', + 'U_USER_PROFILE' => PROFILE_URL . $user_id, + 'S_MODE_ACTION' => 'profile.php?mode=bonus', + 'PAGE_TITLE' => $lang['EXCHANGE_BONUS'], + 'MY_BONUS' => sprintf($lang['MY_BONUS'], $user_points), )); foreach($price_row as $i => $price) @@ -61,9 +69,10 @@ else $class = ($user_points >= $price) ? 'seed' : 'leech'; $template->assign_block_vars('bonus_upload', array( - 'ID' => $i, - 'DESC' => sprintf($lang['BONUS_UPLOAD_DESC'], humn_size($upload_row[$i]*1024*1024*1024)), - 'PRICE' => sprintf($lang['BONUS_UPLOAD_PRICE'], sprintf('%.2f', $price), $class, $user_points), + 'ROW_CLASS' => !($i % 2) ? 'row2' : 'row1', + 'ID' => $i, + 'DESC' => sprintf($lang['BONUS_UPLOAD_DESC'], humn_size($upload_row[$i]*1024*1024*1024)), + 'PRICE' => sprintf($lang['BONUS_UPLOAD_PRICE'], $class, sprintf('%.2f', $price)), )); } diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index 767478c89..5aaeede3a 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -15,7 +15,7 @@ if (IS_ADMIN) if($new_user) $gen_simple_header = true; $template->assign_vars(array( - 'NEW_USER' => $new_user, + 'NEW_USER' => $new_user, )); } @@ -954,20 +954,4 @@ $template->assign_vars(array( )); -print_page('usercp_register.tpl'); - -// ----------------------------------------------------------- // -// Functions -// -function set_pr_die_append_msg ($pr_uid) -{ - global $lang, $template; - - $template->assign_var('BB_DIE_APPEND_MSG', ' - Перейти к просмотру профиля -

- Вернуться к редактированию -

- Вернуться на главную страницу - '); -} \ No newline at end of file +print_page('usercp_register.tpl'); \ No newline at end of file diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index c57d1a0c9..170e62c8d 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -677,4 +677,5 @@ $lang['SEED_BONUS_POINTS'] = 'bonuses in an hour'; $lang['SEED_BONUS_TOR_SIZE'] = '

Minimum distribution for which will be awarded bonuses

If you want to calculate bonuses for all distribution, leave blank.
'; $lang['SEED_BONUS_USER_REGDATA'] = '

Minimum length of user tracker, after which will be awarded bonuses

If you want to accrue bonuses to all users, leave blank.
'; $lang['SEED_BONUS_WARNING'] = 'ATTENTION! Seed Bonuses should be in ascending order'; +$lang['SEED_BONUS_EXCHANGE'] = 'Configuring Exchange Sid Bonuses'; $lang['SEED_BONUS_ROPORTION'] = 'Proportion addition for an exchange of bonuses on GB'; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 092e6a7ef..eaaa45d48 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1254,7 +1254,7 @@ $lang['PIECE_LENGTH'] = 'Piece length'; $lang['COMPLETED'] = 'Completed'; $lang['ADDED'] = 'Added'; $lang['DELETE_TORRENT'] = 'Delete torrent'; -$lang['DEL_MOVE_TORRENT'] = 'Delete and move topic'; +$lang['DELETE_MOVE_TORRENT'] = 'Delete and move topic'; $lang['DL_TORRENT'] = 'Download .torrent'; $lang['BT_LAST_POST'] = 'Last post'; $lang['BT_CREATED'] = 'Topic posted'; @@ -1361,16 +1361,23 @@ $lang['DOWNLOADED'] = 'Downloaded'; $lang['UPLOADED'] = 'Uploaded'; $lang['RELEASED'] = 'Released'; $lang['BONUS'] = 'On the rare'; -$lang['SEED_BONUS'] = 'Seed Bonus'; -$lang['EXCHANGE'] = 'Exchange'; -$lang['BONUS_UPLOAD_DESC'] = '%s to distribution
To exchange bonus points on %1$s traffic which will be added on to the sum of your distribution.'; -$lang['BONUS_UPLOAD_PRICE'] = '%s (at You %s)'; -$lang['PRICE'] = 'price'; -$lang['EXCHANGE_NOT'] 'The exchange not available'; -$lang['BONUS_SUCCES'] = 'To you it is successfully enlisted %s GB'; $lang['IT_WILL_BE_DOWN'] = 'it will start to be considered after it will be downloaded'; $lang['SPMODE_FULL'] = 'Show peers in full details'; +// Seed Bonus +$lang['MY_BONUS'] = 'My bonus (%s bonuses in stock)'; +$lang['BONUS_SELECT'] = 'Select'; +$lang['SEED_BONUS'] = 'Seed Bonus'; +$lang['EXCHANGE'] = 'Exchange'; +$lang['EXCHANGE_BONUS'] = 'Exchange of seed bonuses'; +$lang['BONUS_UPLOAD_DESC'] = '%s to distribution
To exchange bonus points on %1$s traffic which will be added on to the sum of your distribution.'; +$lang['BONUS_UPLOAD_PRICE'] = '%s'; +$lang['PRICE'] = 'Price'; +$lang['EXCHANGE_NOT'] = 'The exchange not available'; +$lang['BONUS_SUCCES'] = 'To you it is successfully enlisted %s'; +$lang['BONUS_NOT_SUCCES'] = 'You do not have bonuses available. More Seeding!'; +$lang['BONUS_RETURN'] = 'Return to the Seed Exchange Bonus'; + $lang['TRACKER'] = 'Tracker'; $lang['GALLERY'] = 'Gallery'; $lang['OPEN_TOPICS'] = 'Open topics'; @@ -1746,3 +1753,5 @@ $lang['INDEX_RETURN'] = 'Back to home page'; $lang['FORUM_RETURN'] = 'Back to Forum'; $lang['TOPIC_RETURN'] = 'Back to the topic'; $lang['POST_RETURN'] = 'Go to post'; +$lang['PROFILE_EDIT_RETURN'] = 'Return to editing'; +$lang['PROFILE_RETURN'] = 'Go to the Profile'; diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index 7111163c6..3304d4038 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -668,12 +668,12 @@ $lang['PIC_SIZE'] = 'Максимальный размер изображени $lang['AUTO_DELETE_POSTED_PICS'] = 'Удалять изображения размещенные в удаленных постах'; $lang['SHOW_MOD_HOME_PAGE'] = 'Показывать модераторов на главной'; $lang['PREMOD_HELP'] = '

∏ Премодерация

Если у пользователя нет раздач со статусом √, # или T в текущем разделе, включая подразделы, то раздача автоматически получает данный статус
'; -$lang['SEED_BONUS'] = 'Сид Бонус'; + $lang['SEED_BONUS_ADD'] = '

Добавление сид бонуса

Кол-во раздаваемых раздач пользователем и размер начисления бонусов за них (начисления раз в час)
'; $lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов'; $lang['SEED_BONUS_POINTS'] = 'бонусов в час'; $lang['SEED_BONUS_TOR_SIZE'] = '

Минимальный размер раздачи, за который будут начисляться бонусы

Если хотите начислять бонусы за все раздачи, оставьте поле пустым.
'; $lang['SEED_BONUS_USER_REGDATA'] = '

Минимальный стаж пользователя на трекере, после которого будут начисляться бонусы

Если хотите начислять бонусы всем пользователям, оставьте поле пустым.
'; $lang['SEED_BONUS_WARNING'] = 'ВНИМАНИЕ! Сид Бонусы должны быть в порядке возрастания'; +$lang['SEED_BONUS_EXCHANGE'] = 'Настройка обмена Сид Бонусов'; $lang['SEED_BONUS_ROPORTION'] = 'Добавление пропорции для обмена бонусов на GB'; - diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 1c1e104f2..cac5cd533 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1261,7 +1261,7 @@ $lang['PIECE_LENGTH'] = 'Размер блока'; $lang['COMPLETED'] = 'Скачан'; $lang['ADDED'] = 'Добавлен'; $lang['DELETE_TORRENT'] = 'Удалить торрент'; -$lang['DEL_MOVE_TORRENT'] = 'Удалить и перенести топик'; +$lang['DELETE_MOVE_TORRENT'] = 'Удалить и перенести топик'; $lang['DL_TORRENT'] = 'Скачать .torrent'; $lang['BT_LAST_POST'] = 'Посл. сообщение'; $lang['BT_CREATED'] = 'Время создания топика'; @@ -1367,16 +1367,23 @@ $lang['DOWNLOADED'] = 'Скачано'; $lang['UPLOADED'] = 'Отдано'; $lang['RELEASED'] = 'На своих'; $lang['BONUS'] = 'На редких'; -$lang['SEED_BONUS'] = 'СидБонус'; -$lang['EXCHANGE'] = 'Обменять'; -$lang['BONUS_UPLOAD_DESC'] = '%s к раздаче
Обменять бонусные очки на %1$s трафика, который будет приплюсован к сумме Вашей раздачи.'; -$lang['BONUS_UPLOAD_PRICE'] = '%s (у Вас %s)'; -$lang['PRICE'] = 'Цена'; -$lang['EXCHANGE_NOT'] = 'Обмен не доступен'; -$lang['BONUS_SUCCES'] = 'Вам успешно зачислено %s GB'; $lang['IT_WILL_BE_DOWN'] = 'начнет учитываться после того как будет скачано'; $lang['SPMODE_FULL'] = 'Подробная статистика пиров'; +// Seed Bonus +$lang['MY_BONUS'] = 'Мой бонус (%s бонусов в наличии)'; +$lang['BONUS_SELECT'] = 'Выбор'; +$lang['SEED_BONUS'] = 'СидБонус'; +$lang['EXCHANGE'] = 'Обменять'; +$lang['EXCHANGE_BONUS'] = 'Обмен сид бонусов'; +$lang['BONUS_UPLOAD_DESC'] = '%s к раздаче
Обменять бонусные очки на %1$s трафика, который будет приплюсован к сумме Вашей раздачи.'; +$lang['BONUS_UPLOAD_PRICE'] = '%s'; +$lang['PRICE'] = 'Цена'; +$lang['EXCHANGE_NOT'] = 'Обмен не доступен'; +$lang['BONUS_SUCCES'] = 'Обмен произведён удачно! Вам прибавлено %s'; +$lang['BONUS_NOT_SUCCES'] = 'У Вас недостаточно Бонусов в наличии. Больше сидируйте!'; +$lang['BONUS_RETURN'] = 'Вернуться к обмену Сид бонусов'; + $lang['TRACKER'] = 'Трекер'; $lang['GALLERY'] = 'Галерея'; $lang['OPEN_TOPICS'] = 'Открывать топики'; @@ -1753,4 +1760,6 @@ $lang['DEL_LIST_INFO'] = 'Для удаления тем из списка на $lang['INDEX_RETURN'] = 'Вернуться на главную'; $lang['FORUM_RETURN'] = 'Вернуться в форум'; $lang['TOPIC_RETURN'] = 'Вернуться в тему'; -$lang['POST_RETURN'] = 'Перейти к сообщению'; \ No newline at end of file +$lang['POST_RETURN'] = 'Перейти к сообщению'; +$lang['PROFILE_EDIT_RETURN'] = 'Вернуться к редактированию'; +$lang['PROFILE_RETURN'] = 'Перейти к просмотру профиля'; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index d0b42f9a8..800a18fc5 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -476,14 +476,14 @@  {L_DAYS} - Настройка обмена бонусов + {L_SEED_BONUS_EXCHANGE}

{L_SEED_BONUS_ROPORTION}

-  размер в GB
-  их цена   +  {L_GB}
+  {L_PRICE} @@ -492,8 +492,8 @@

{L_SEED_BONUS_ROPORTION}

-  размер в GB
-  их цена +  {L_GB}
+  {L_PRICE} diff --git a/upload/templates/admin/admin_bt_tracker_cfg.tpl b/upload/templates/admin/admin_bt_tracker_cfg.tpl index d28358279..73f92bc0e 100644 --- a/upload/templates/admin/admin_bt_tracker_cfg.tpl +++ b/upload/templates/admin/admin_bt_tracker_cfg.tpl @@ -13,7 +13,7 @@

Changes disabled (see $tr_cfg in config.php)
- Изменение данных из файла config.php при необходимости. Строка ~143 + Изменение данных из файла config.php при необходимости. Строка ~146

diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index 53e16b668..8a636cb3b 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -550,6 +550,7 @@ important_info {L_UPLOADED}{UP_TOTAL} {L_RELEASED}{RELEASED} {L_BONUS}{UP_BONUS} + {L_SEED_BONUS}{POINTS} diff --git a/upload/templates/default/usercp_bonus.tpl b/upload/templates/default/usercp_bonus.tpl new file mode 100644 index 000000000..9fcaa6417 --- /dev/null +++ b/upload/templates/default/usercp_bonus.tpl @@ -0,0 +1,54 @@ + +{PAGE_TITLE} + + + + + +
+ {T_INDEX} + » {L_RETURN_PROFILE} +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
{MY_BONUS}
{L_DESCRIPTION}{L_PRICE}{L_BONUS_SELECT}
{bonus_upload.DESC}{bonus_upload.PRICE}
+ +
+ +
+ + +
+ +
+ +
+

{LAST_VISIT_DATE}

+

{CURRENT_TIME}

+

{S_TIMEZONE}

+
+
+ +
diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index 8c8ac1e9f..2be3c018c 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -643,12 +643,12 @@ td.topic_id { cursor: pointer; }
{L_ADMIN}:  -{L_DESIGNER}  ·  +{L_DESIGNER}  ·  -{L_FORUM_LOGS}  ·  -{L_EDIT}  ·  -{L_PERMISSIONS}  ·  -{L_DELETE} +{L_FORUM_LOGS}  ·  +{L_EDIT}  ·  +{L_PERMISSIONS}  ·  +{L_DELETE}
diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl index 684a72833..d851beae9 100644 --- a/upload/templates/default/viewtopic_attach.tpl +++ b/upload/templates/default/viewtopic_attach.tpl @@ -319,7 +319,7 @@