From 0b8f2e56fb9f608811f4c8ec301663e2eacbce69 Mon Sep 17 00:00:00 2001 From: "glix08@gmail.com" Date: Thu, 30 Jan 2014 23:10:42 +0000 Subject: [PATCH] r577 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фиксы части косяков новых голосований; забытые папки для файлкеша (cmod 0777); удаление проверки на имя домена в имени торрента (неактуально, файлу при скачивании присваивается имя домена автоматически). git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@577 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- ReadMe.txt | 4 ++++ upload/config.php | 9 ++++----- upload/includes/functions.php | 19 ++++++++++++------- upload/includes/topic_templates.php | 2 -- upload/language/lang_english/lang_main.php | 1 - upload/language/lang_russian/lang_main.php | 1 - upload/poll.php | 14 +++++++++----- .../default/topic_templates/audiobooks.tpl | 7 ------- .../default/topic_templates/books.tpl | 7 ------- .../default/topic_templates/games.tpl | 7 ------- .../default/topic_templates/games_ps.tpl | 7 ------- .../default/topic_templates/games_psp.tpl | 7 ------- .../default/topic_templates/games_xbox.tpl | 7 ------- .../default/topic_templates/music.tpl | 7 ------- .../default/topic_templates/progs.tpl | 7 ------- .../default/topic_templates/progs_mac.tpl | 7 ------- .../default/topic_templates/sport.tpl | 7 ------- .../default/topic_templates/video.tpl | 7 ------- .../default/topic_templates/video_home.tpl | 7 ------- .../default/topic_templates/video_lesson.tpl | 7 ------- .../default/topic_templates/video_simple.tpl | 7 ------- upload/viewtopic.php | 2 +- 22 files changed, 30 insertions(+), 120 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index 267e86441..4021015ac 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -18,8 +18,12 @@ - cache - cache/filecache - cache/filecache/bb_cache +- cache/filecache/bb_cap_sid +- cache/filecache/bb_login_err +- cache/filecache/bb_poll_data - cache/filecache/datastore - cache/filecache/session_cache +- cache/filecache/tr_cache - files - files/thumbs - images diff --git a/upload/config.php b/upload/config.php index c5cb3134a..a10f186ee 100644 --- a/upload/config.php +++ b/upload/config.php @@ -55,8 +55,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 (unstable)'; -$bb_cfg['tp_release_date'] = '30-01-2014'; -$bb_cfg['tp_release_state'] = 'R576'; +$bb_cfg['tp_release_date'] = '31-01-2014'; +$bb_cfg['tp_release_state'] = 'R577'; // Database $charset = 'utf8'; @@ -181,9 +181,8 @@ $bb_cfg['show_tor_info_in_dl_list'] = true; $bb_cfg['allow_dl_list_names_mode'] = true; // Torrents -$bb_cfg['torrent_sign'] = "[{$domain_name}]"; // e.g. [yoursite.com] -$bb_cfg['torrent_name_style'] = true; // use torrent name style [yoursite.com].txxx.torrent -$bb_cfg['tor_help_links'] = ''; +$bb_cfg['torrent_name_style'] = true; // use torrent name style [yoursite.com].txxx.torrent +$bb_cfg['tor_help_links'] = ''; // Сколько дней сохранять торрент зарегистрированным / Days to keep torrent registered, if: $bb_cfg['seeder_last_seen_days_keep'] = 0; // сколько дней назад был сид последний раз diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 246a554cc..bef0f7b38 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -2409,13 +2409,18 @@ function get_poll_data_items_js ($topic_id) } $items = array(); - $sql = " - SELECT topic_id, vote_id, vote_text, vote_result - FROM ". BB_POLL_VOTES ." - WHERE topic_id IN($topic_id_csv) - ORDER BY topic_id, vote_id - "; - foreach (DB()->fetch_rowset($sql) as $row) + if (!$poll_data = CACHE('bb_poll_data')->get("poll_$topic_id")) + { + $poll_data = DB()->fetch_rowset(" + SELECT topic_id, vote_id, vote_text, vote_result + FROM ". BB_POLL_VOTES ." + WHERE topic_id IN($topic_id_csv) + ORDER BY topic_id, vote_id + "); + CACHE('bb_poll_data')->set("poll_$topic_id", $poll_data); + } + + foreach ($poll_data as $row) { $opt_text_for_js = htmlCHR($row['vote_text']); $opt_result_for_js = (int) $row['vote_result']; diff --git a/upload/includes/topic_templates.php b/upload/includes/topic_templates.php index 1f028a10e..152b18ee5 100644 --- a/upload/includes/topic_templates.php +++ b/upload/includes/topic_templates.php @@ -94,8 +94,6 @@ if ($topic_tpl = DB()->fetch_row($sql)) 'L_ORIGINAL_TITLE' => $lang['TPL']['ORIGINAL_NAME'], 'L_ORIGINAL_TITLE_DESC' => $lang['TPL']['ORIGINAL_NAME_DESC'], 'L_TITLE_EXP' => $lang['TPL']['NAME_EXP'], - - 'TORRENT_SIGN' => $bb_cfg['torrent_sign'], )); foreach ($lang['TPL'] as $name => $val) diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 4943d3318..965fd6405 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -3027,7 +3027,6 @@ $lang['TPL']['SYSREQ'] = 'System requirements'; $lang['TPL']['TOR_SIZE_EXP'] = 'Filesize is too big'; $lang['TPL']['TORRENT'] = 'Torrent'; $lang['TPL']['TORRENT_EXP'] = 'Select torrent file that you want to release'; -$lang['TPL']['TORRENT_SIGN_EXP'] = 'You should include '. $bb_cfg['torrent_sign'] .' in the name'; $lang['TPL']['TRACKLIST'] = 'Tracklist'; $lang['TPL']['TRANSLATION_TYPE'] = 'Translation type'; $lang['TPL']['UNCOMPRESSED'] = '(uncompressed)'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index d080f1b14..fc7feef96 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -3039,7 +3039,6 @@ $lang['TPL']['SYSREQ'] = 'Системные требования'; $lang['TPL']['TOR_SIZE_EXP'] = 'Слишком большой размер торрент-файла. Вам необходимо увеличить размер частей и создать торрент заново'; $lang['TPL']['TORRENT'] = 'Торрент'; $lang['TPL']['TORRENT_EXP'] = 'Выберите торрент-файл, который будете использовать для релиза'; -$lang['TPL']['TORRENT_SIGN_EXP'] = 'В название файла необходимо добавить '. $bb_cfg['torrent_sign']; $lang['TPL']['TRACKLIST'] = 'Трэклист'; $lang['TPL']['TRANSLATION_TYPE'] = 'Тип перевода'; $lang['TPL']['UNCOMPRESSED'] = '(несжатый)'; diff --git a/upload/poll.php b/upload/poll.php index ba0e12d29..a5c8ec7af 100644 --- a/upload/poll.php +++ b/upload/poll.php @@ -43,14 +43,16 @@ if ($mode != 'poll_vote') } // проверка на возможность вносить изменения -if ($mode != 'poll_delete') +if ($mode == 'poll_delete') { if ($t_data['topic_time'] < TIMENOW - $bb_cfg['poll_max_days']*86400) { bb_die("Время для этого опроса ({$bb_cfg['poll_max_days']} дней с момента создания темы) уже закончилось"); } if (!IS_ADMIN && ($t_data['topic_vote'] != POLL_FINISHED)) - { bb_die($lang['CANNOT_DELETE_POLL']); } + { + bb_die($lang['CANNOT_DELETE_POLL']); + } } switch ($mode) @@ -75,7 +77,7 @@ switch ($mode) } if (DB()->fetch_row("SELECT 1 FROM ". BB_POLL_USERS ." WHERE topic_id = $topic_id AND user_id = {$userdata['user_id']} LIMIT 1")) { - bb_die($lang['TOPIC_LOCKED_SHORT']); + bb_die('Вы уже голосовали'); } DB()->query(" @@ -89,10 +91,11 @@ switch ($mode) { bb_die('Вы не выбрали, за что голосуете'); } - CACHE('bb_poll_data')->rm($topic_id, 'poll_'); DB()->query("INSERT IGNORE INTO ". BB_POLL_USERS ." (topic_id, user_id, vote_dt) VALUES ($topic_id, {$userdata['user_id']}, ". TIMENOW .")"); + CACHE('bb_poll_data')->rm("poll_$topic_id"); + bb_die('Спасибо! Ваш голос учтён'); break; @@ -153,6 +156,7 @@ switch ($mode) bb_die($poll->err_msg); } $poll->insert_votes_into_db($topic_id); + CACHE('bb_poll_data')->rm("poll_$topic_id"); bb_die('Опрос изменён и старые результаты удалены'); break; @@ -236,6 +240,6 @@ class bb_poll { DB()->query("DELETE FROM ". BB_POLL_VOTES ." WHERE topic_id = $topic_id"); DB()->query("DELETE FROM ". BB_POLL_USERS ." WHERE topic_id = $topic_id"); - CACHE('bb_poll_data')->rm($topic_id, 'poll_'); + CACHE('bb_poll_data')->rm("poll_$topic_id"); } } \ No newline at end of file diff --git a/upload/templates/default/topic_templates/audiobooks.tpl b/upload/templates/default/topic_templates/audiobooks.tpl index f0dadcb70..29222f6b3 100644 --- a/upload/templates/default/topic_templates/audiobooks.tpl +++ b/upload/templates/default/topic_templates/audiobooks.tpl @@ -1,7 +1,6 @@