From 6bc45ad3cefc2ae59e596064af9ee564556363c0 Mon Sep 17 00:00:00 2001 From: Exile Date: Sat, 6 Dec 2014 20:34:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Дополнение схемы обновления базы данных; еще один фикс задачи начисления сидбонусов. --- install/sql/mysql.sql | 2 +- install/upgrade/changes.txt | 31 +++++++++++++++++++- library/includes/cron/jobs/tr_seed_bonus.php | 6 ++-- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 13191c574..9763848dc 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -574,7 +574,7 @@ INSERT INTO `bb_cron` VALUES ('', '1', 'DS update stats', 'ds_update_stats.php', INSERT INTO `bb_cron` VALUES ('', '1', 'Flash topic view', 'flash_topic_view.php', 'interval', '', '', '255', '', '', '00:10:00', '0', '', '0', '0', '0'); INSERT INTO `bb_cron` VALUES ('', '1', 'Clean search results', 'clean_search_results.php', 'interval', '', '', '255', '', '', '00:10:00', '0', '', '0', '0', '0'); INSERT INTO `bb_cron` VALUES ('', '1', 'Tracker cleanup and dlstat', 'tr_cleanup_and_dlstat.php', 'interval', '', '', '20', '', '', '00:15:00', '0', '', '0', '0', '0'); -INSERT INTO `bb_cron` VALUES ('', '1', 'Accrual seedbonus', 'tr_seed_bonus.php', 'interval', '', '', '25', '', '', '00:10:00', '0', '', '0', '0', '0'); +INSERT INTO `bb_cron` VALUES ('', '1', 'Accrual seedbonus', 'tr_seed_bonus.php', 'interval', '', '', '25', '', '', '00:15:00', '0', '', '0', '0', '0'); INSERT INTO `bb_cron` VALUES ('', '1', 'Make tracker snapshot', 'tr_make_snapshot.php', 'interval', '', '', '10', '', '', '00:10:00', '0', '', '0', '0', '0'); INSERT INTO `bb_cron` VALUES ('', '1', 'Seeder last seen', 'tr_update_seeder_last_seen.php', 'interval', '', '', '255', '', '', '01:00:00', '0', '', '0', '0', '0'); INSERT INTO `bb_cron` VALUES ('', '1', 'Tracker dl-complete count', 'tr_complete_count.php', 'interval', '', '', '255', '', '', '06:00:00', '0', '', '0', '0', '0'); diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt index 2174b0a2a..acbed64ed 100644 --- a/install/upgrade/changes.txt +++ b/install/upgrade/changes.txt @@ -2,6 +2,7 @@ Изменения в базе: +// 2.1.1 DROP TABLE IF EXISTS `bb_reports`; DROP TABLE IF EXISTS `bb_reports_changes`; DROP TABLE IF EXISTS `bb_reports_modules`; @@ -19,8 +20,36 @@ ALTER TABLE `bb_topics` DROP COLUMN `topic_reported`; DELETE FROM `bb_cron` WHERE `cron_script` = 'site_backup.php'; DELETE FROM `bb_cron` WHERE `cron_script` = 'db_backup.php'; UPDATE `bb_cron` SET `cron_script` = 'board_maintenance.php' WHERE `cron_script` = 'bb_maintenance.php'; +UPDATE `bb_attachments_config` SET `config_value` = 'data/old_files' WHERE `config_name` = 'upload_dir'; +UPDATE `bb_attachments_config` SET `config_value` = 'styles/images/icon_clip.gif' WHERE `config_name` = 'upload_img'; +UPDATE `bb_attachments_config` SET `config_value` = 'styles/images/icon_clip.gif' WHERE `config_name` = 'topic_icon'; +UPDATE `bb_config` SET `config_value` = 'styles/images/smiles' WHERE `config_name` = 'smilies_path'; + +// 2.1.4 +ALTER TABLE `bb_bt_tracker` DROP COLUMN `ul_gdc`; +ALTER TABLE `bb_bt_tracker` DROP COLUMN `ul_gdc_c`; +ALTER TABLE `bb_bt_tracker` DROP COLUMN `ul_16k_c`; +ALTER TABLE `bb_bt_tracker` DROP COLUMN `ul_eq_dl`; +ALTER TABLE `bb_bt_torrents` CHANGE `info_hash` `info_hash` VARBINARY(20) NOT NULL DEFAULT ''; +ALTER TABLE `bb_bt_torrents` CHANGE `speed_up` `speed_up` INT(11) NOT NULL DEFAULT '0'; +ALTER TABLE `bb_bt_torrents` CHANGE `speed_down` `speed_down` INT(11) NOT NULL DEFAULT '0'; +ALTER TABLE `bb_bt_tracker` CHANGE `peer_id` `peer_id` VARCHAR(20) NOT NULL DEFAULT '0'; +UPDATE `bb_config` SET `config_value` = '180' WHERE `config_name` = 'cron_check_interval'; +ALTER TABLE `bb_cron` CHANGE `run_order` `run_order` TINYINT(4) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `bb_cron` CHANGE `run_interval` `run_interval` TIME DEFAULT NULL DEFAULT '0'; +ALTER TABLE `bb_groups` CHANGE `group_description` `group_description` TEXT NOT NULL; +ALTER TABLE `bb_groups` CHANGE `group_signature` `group_signature` TEXT NOT NULL; +ALTER TABLE `bb_posts` CHANGE `mc_comment` `mc_comment` TEXT NOT NULL; +ALTER TABLE `bb_posts` CHANGE `mc_user_id` `mc_user_id` MEDIUMINT(8) NOT NULL DEFAULT '0'; +ALTER TABLE `bb_posts_html` CHANGE `post_html` `post_html` MEDIUMTEXT NOT NULL DEFAULT ''; +ALTER TABLE `bb_users` CHANGE `user_regdate` `user_regdate` INT(11) NOT NULL DEFAULT '0'; +ALTER TABLE `bb_users` CHANGE `user_lang` `user_lang` VARCHAR(255) NOT NULL DEFAULT 'ru'; +ALTER TABLE `bb_users` CHANGE `avatar_ext_id` `avatar_ext_id` TINYINT(4) NOT NULL DEFAULT '0'; +ALTER TABLE `bb_user_group` CHANGE `user_time` `user_time` INT(11) NOT NULL DEFAULT '0'; +ALTER TABLE `bb_bt_tracker` ADD `client` VARCHAR(51) NOT NULL DEFAULT 'Unknown' AFTER `port`; +ALTER TABLE `bb_bt_tracker` ADD `complete` INT(11) NOT NULL DEFAULT '0' AFTER `complete_percent`; // 2.1.5 DROP TABLE IF EXISTS `bb_captcha`; DELETE FROM `bb_cron` WHERE `cron_script` = 'captcha_gen_gc.php'; -INSERT INTO `bb_cron` VALUES ('', '1', 'Accrual seedbonus', 'tr_seed_bonus.php', 'interval', '', '', '25', '', '', '00:10:00', '0', '', '0', '0', '0'); \ No newline at end of file +INSERT INTO `bb_cron` VALUES ('', '1', 'Accrual seedbonus', 'tr_seed_bonus.php', 'interval', '', '', '25', '', '', '00:15:00', '0', '', '0', '0', '0'); \ No newline at end of file diff --git a/library/includes/cron/jobs/tr_seed_bonus.php b/library/includes/cron/jobs/tr_seed_bonus.php index 0d5b15932..3cc379c26 100644 --- a/library/includes/cron/jobs/tr_seed_bonus.php +++ b/library/includes/cron/jobs/tr_seed_bonus.php @@ -38,11 +38,11 @@ if ($bb_cfg['seed_bonus_enabled'] && $bb_cfg['seed_bonus_points'] && $bb_cfg['se DB()->query(" UPDATE ". BB_USERS ." u, ". BB_BT_USERS ." bu, tmp_bonus b SET - u.user_points = u.user_points + $user_points, - bu.points_today = bu.points_today + $user_points, + u.user_points = u.user_points + '$user_points', + bu.points_today = bu.points_today + '$user_points', b.user_id = 0 WHERE - b.user_id = u.user_id + b.user_id = u.user_id AND bu.user_id = u.user_id AND b.release_count <= $release AND u.user_regdate < $user_regdate