diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index 2fbee8aed..c88669bfc 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -191,7 +191,7 @@ if ($tor_reged && $tor_info) { $template->assign_vars(array( 'SHOW_RATIO_WARN' => true, - 'RATIO_WARN_MSG' => sprintf($lang['BT_RATIO_WARNING_MSG'], $min_ratio_warn, $bb_cfg['bt_ratio_warning_url_help']), + 'RATIO_WARN_MSG' => sprintf($lang['BT_RATIO_WARNING_MSG'], $min_ratio_warn, $bb_cfg['ratio_url_help']), )); } } diff --git a/upload/config.php b/upload/config.php index bbf1ad3bb..ebe9ecf8c 100644 --- a/upload/config.php +++ b/upload/config.php @@ -45,7 +45,7 @@ * Ads * Misc * Captcha -*/ + **/ if (!defined('BB_ROOT')) die(basename(__FILE__)); @@ -56,9 +56,9 @@ $bb_cfg['js_ver'] = 1; $bb_cfg['css_ver'] = 1; // Increase number of revision after update -$bb_cfg['tp_version'] = '2.0'; -$bb_cfg['tp_release_state'] = 'R198'; -$bb_cfg['tp_release_date'] = '7-08-2011'; +$bb_cfg['tp_version'] = '2.0 RC'; +$bb_cfg['tp_release_state'] = 'R199'; +$bb_cfg['tp_release_date'] = '8-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; @@ -138,7 +138,6 @@ $bb_cfg['ratio_url_help'] = 'viewtopic.php?t=3'; // URL help link for $bb_cfg['bt_min_ratio_allow_dl_tor'] = 0; // 0 - disable $bb_cfg['bt_min_ratio_warning'] = 0; // 0 - disable -$bb_cfg['bt_ratio_warning_url_help'] = $bb_cfg['ratio_url_help']; // URL help link, for limit end. $bb_cfg['bt_min_ratio_dl_button'] = 0; // 0 - disable $tr_cfg = array( @@ -241,8 +240,8 @@ $bb_cfg['theme_css'] = 'theme_default.css'; $bb_cfg['show_sidebar1_on_every_page'] = false; $bb_cfg['show_sidebar2_on_every_page'] = false; -$bb_cfg['sidebar1_static_content_path'] = BB_PATH .'/misc/html/sidebar1.html'; # -$bb_cfg['sidebar2_static_content_path'] = ''; +$bb_cfg['sidebar1_static_content_path'] = BB_PATH .'/misc/html/sidebar1.html'; +$bb_cfg['sidebar2_static_content_path'] = BB_PATH .'/misc/html/sidebar2.html'; $page_cfg['show_sidebar1'] = array( # BB_SCRIPT => true diff --git a/upload/donate.php b/upload/donate.php new file mode 100644 index 000000000..0e836d83d --- /dev/null +++ b/upload/donate.php @@ -0,0 +1,15 @@ +session_start(); + +$template->assign_vars(array( + 'PAGE_TITLE' => 'Помошь трекеру', +)); + +print_page('donate.tpl'); \ No newline at end of file diff --git a/upload/includes/report_hack/report_privmsg.php b/upload/includes/report_hack/report_privmsg.php index 9d0fd319f..b675a858a 100644 --- a/upload/includes/report_hack/report_privmsg.php +++ b/upload/includes/report_hack/report_privmsg.php @@ -193,7 +193,7 @@ class report_privmsg extends report_module // function subject_details_obtain($report_subject) { - $sql = 'SELECT p.privmsgs_subject, p.privmsgs_from_userid, p.privmsgs_enable_bbcode, p.privmsgs_enable_smilies, pt.privmsgs_text, u.username + $sql = 'SELECT p.privmsgs_subject, p.privmsgs_from_userid, pt.privmsgs_text, u.username FROM ' . BB_PRIVMSGS . ' p INNER JOIN ' . BB_PRIVMSGS_TEXT . ' pt ON pt.privmsgs_text_id = privmsgs_id @@ -214,12 +214,12 @@ class report_privmsg extends report_module } $subject_details = array( - 'Message_id' => '#' . $report_subject, - 'Message_from' => '' . $row['username'] . '', - 'Message_title' => $row['privmsgs_subject'], - 'Message_text' => $row['privmsgs_text']); + 'MESSAGE_ID' => '#' . $report_subject, + 'MESSAGE_FROM' => '' . $row['username'] . '', + 'MESSAGE_TITLE' => $row['privmsgs_subject'], + 'MESSAGE_TEXT' => $row['privmsgs_text']); - $this->_subject_details_prepare($subject_details['Message_text'], $subject_details['Message_title'], $row); + $this->_subject_details_prepare($subject_details['MESSAGE_TEXT'], $subject_details['MESSAGE_TITLE'], $row); return array( 'details' => $subject_details); diff --git a/upload/misc/html/sidebar2.html b/upload/misc/html/sidebar2.html index 31546c5e8..5be491e4b 100644 --- a/upload/misc/html/sidebar2.html +++ b/upload/misc/html/sidebar2.html @@ -1,2 +1,10 @@ + + -sidebar2 static content \ No newline at end of file + + + + \ No newline at end of file diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index f17513243..d0e914d35 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -131,7 +131,9 @@ img { border: 0px; } .dlDown, .leech, .leechmed, .leechsmall { color: #800000; } .dlComplete, .seed, .seedmed, .seedsmall { color: #006600; } .dlCancel { color: #666666; } -.itsme { color: #0000FF !important; font-size: 12px; font-weight: bold; text-decoration: none;} + +/* DL list color me */ +.itsme { color: #0000FF !important; font-size: 12px; font-weight: bold; text-decoration: none;} a.dlWill, a.dlWill:visited { color: #0066CC; text-decoration: none; } a.dlDown, a.dlDown:visited { color: #800000; text-decoration: none; } @@ -590,7 +592,9 @@ table.smilies td { padding: 3px; text-align: center; } /* ---------------------------------- * Forums on home page * ---------------------------------- */ -/*.forums thead { display: none;}*/ /* , , ., . OFF on index page */ +/*.forums thead { display: none;}*/ /* Hide Forum, Topics, Posts, Last Post in index */ +/*.f_topics, .f_posts { display: none; }*/ /* Hide posts/topics count in index */ + #forums_list_wrap { margin-top: 4px; padding-right: 2px; } #forums_top_links { clear: both; } #forums_wrap { clear: both; padding-top: 1px; } diff --git a/upload/templates/default/donate.tpl b/upload/templates/default/donate.tpl index 072b7a3a7..302c8968c 100644 --- a/upload/templates/default/donate.tpl +++ b/upload/templates/default/donate.tpl @@ -4,7 +4,7 @@ - + - + - + - + - +
{L_DONATE_TITLE}{PAGE_TITLE}
@@ -13,7 +13,6 @@
Если Вы желаете материально помочь в развитии проекту - ниже указаны возможные способы перевода денежных средств.

-
WMID: *************

@@ -25,19 +24,19 @@
Евро E************* E*************
Доллар Z************* Z*************
Гривны U************* U*************
Рубли R************* R*************
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index bf3eccac8..26d7b63b1 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -106,7 +106,7 @@

{c.f.last.LAST_POST_TIME} - by + · {c.f.last.LAST_POST_USER_NAME} diff --git a/upload/templates/default/page_footer.tpl b/upload/templates/default/page_footer.tpl index a19881c4d..5a9c893e7 100644 --- a/upload/templates/default/page_footer.tpl +++ b/upload/templates/default/page_footer.tpl @@ -7,8 +7,11 @@

+ + +
diff --git a/upload/templates/default/rss_body.tpl b/upload/templates/default/rss_body.tpl deleted file mode 100644 index c0b0521cd..000000000 --- a/upload/templates/default/rss_body.tpl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - -{BOARD_TITLE} -{BOARD_URL} -{BOARD_DESCRIPTION} -{BOARD_MANAGING_EDITOR} -http://blogs.law.harvard.edu/tech/rss -{PROGRAM}{LANGUAGE} -{BUILD_DATE} - - {BOARD_URL}images/logo/logo.gif - {BOARD_TITLE} - {BOARD_URL} - 122 - 56 - - - -{post_item.FORUM_NAME} :: {post_item.TOPIC_TITLE} -{post_item.POST_URL} -{post_item.UTF_TIME} -{post_item.POST_URL} -{L_AUTHOR}: {post_item.AUTHOR}<br /> -{post_item.POST_SUBJECT} -{L_POSTED}: {post_item.POST_TIME}<br /> -<br /><span class="postbody"> -{post_item.POST_TEXT}{post_item.USER_SIG}</span><br /> - -{post_item.AUTHOR0} -{post_item.FORUM_NAME} - -{post_item.REPLY_URL} - - - - \ No newline at end of file