diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index 2526b9c42..1ad29973b 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -96,7 +96,6 @@ switch($mode) 'WHOIS_INFO' => $new['whois_info'], 'SHOW_MOD_INDEX' => $new['show_mod_index'], 'BIRTHDAY_ENABLED' => $new['birthday_enabled'], - 'L_BIRTHDAY_YEARS' => $lang['DELTA_TIME']['INTERVALS']['year'][2], 'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'], 'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'], 'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'], diff --git a/upload/includes/cron/jobs/clean_dlstat.php b/upload/includes/cron/jobs/clean_dlstat.php index 8f7d7419d..fbcbb6a25 100644 --- a/upload/includes/cron/jobs/clean_dlstat.php +++ b/upload/includes/cron/jobs/clean_dlstat.php @@ -97,4 +97,26 @@ DB()->query(" FROM ". BB_BT_TORSTAT ." tst LEFT JOIN ". BB_BT_TORRENTS ." tor USING(topic_id) WHERE tor.topic_id IS NULL -"); \ No newline at end of file +"); + +DB()->query(" + UPDATE + ". BB_BT_USERS ." + SET + up_yesterday = up_today, + down_yesterday = down_today, + up_release_yesterday = up_release_today, + up_bonus_yesterday = up_bonus_today, + points_yesterday = points_today +"); + +DB()->query(" + UPDATE + ". BB_BT_USERS ." + SET + up_today = 0, + down_today = 0, + up_release_today = 0, + up_bonus_today = 0, + points_today = 0 +"); diff --git a/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php b/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php index e94f49bf1..1fc160788 100644 --- a/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php +++ b/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php @@ -128,10 +128,14 @@ if($bb_cfg['announce_type'] != 'xbt') ". BB_BT_USERS ." u, ". NEW_BB_BT_LAST_USERSTAT ." ub SET - u.u_up_total = u.u_up_total + ub.up_add, - u.u_down_total = u.u_down_total + ub.down_add, - u.u_up_release = u.u_up_release + ub.release_add, - u.u_up_bonus = u.u_up_bonus + ub.bonus_add + u.u_up_total = u.u_up_total + ub.up_add, + u.u_down_total = u.u_down_total + ub.down_add, + u.u_up_release = u.u_up_release + ub.release_add, + u.u_up_bonus = u.u_up_bonus + ub.bonus_add, + u.up_today = u.up_today + ub.up_add, + u.down_today = u.down_today + ub.down_add, + u.up_release_today = u.up_release_today + ub.release_add, + u.up_bonus_today = u.up_bonus_today + ub.bonus_add WHERE u.user_id = ub.user_id "); @@ -216,8 +220,9 @@ if($bb_cfg['seed_bonus_enabled'] && $bb_cfg['seed_bonus_points'] && $bb_cfg['see $user_regdate = (TIMENOW - $bb_cfg['seed_bonus_user_regdate'] * 86400); DB()->query(" - UPDATE ". BB_USERS ." u, tmp_bonus b + 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, b.user_id = 0 WHERE u.user_id = b.user_id AND b.release_count <= $release diff --git a/upload/includes/posting_tpl.php b/upload/includes/posting_tpl.php index 91e328d0e..acdc881ac 100644 --- a/upload/includes/posting_tpl.php +++ b/upload/includes/posting_tpl.php @@ -3,7 +3,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); $can_edit_tpl = IS_SUPER_ADMIN; -$edit_tpl_mode = ($can_edit_tpl && empty($_REQUEST['edit_tpl'])); +$edit_tpl_mode = ($can_edit_tpl && !empty($_REQUEST['edit_tpl'])); // forum_data $sql = "SELECT forum_name, allow_reg_tracker, forum_tpl_id FROM ". BB_FORUMS ." WHERE forum_id = $forum_id LIMIT 1"; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index de52a30d5..e164f72b1 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -598,6 +598,7 @@ $lang['BIRTHDAY_ENABLE'] = 'Enable birthday'; $lang['BIRTHDAY_MAX_AGE'] = 'Max age'; $lang['BIRTHDAY_MIN_AGE'] = 'Min age'; $lang['BIRTHDAY_CHECK_DAY'] = 'Days to check for come shortly birthdays'; +$lang['YEARS'] = 'Years'; $lang['NO_THEMES'] = 'No Themes In database'; $lang['TIMEZONE'] = 'Timezone'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index c2f782979..9f5f6ec34 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -604,6 +604,7 @@ $lang['BIRTHDAY_ENABLE'] = 'Показывать дни рождения'; $lang['BIRTHDAY_MAX_AGE'] = 'Максимальный возраст'; $lang['BIRTHDAY_MIN_AGE'] = 'Минимальный возраст'; $lang['BIRTHDAY_CHECK_DAY'] = 'Показывать ближайшие дни рождения за'; +$lang['YEARS'] = 'Лет'; $lang['NO_THEMES'] = 'В базе нет цветовых схем'; $lang['TIMEZONE'] = 'Часовой пояс'; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index 00c561bad..751de6333 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -414,11 +414,11 @@

{L_BIRTHDAY_MAX_AGE}

-  {L_BIRTHDAY_YEARS} +  {L_YEARS}

{L_BIRTHDAY_MIN_AGE}

-  {L_BIRTHDAY_YEARS} +  {L_YEARS}

{L_BIRTHDAY_CHECK_DAY}