diff --git a/contributors.txt b/contributors.txt
index cbcc91c00..5425119a7 100644
--- a/contributors.txt
+++ b/contributors.txt
@@ -2,9 +2,9 @@
За помощь, оказанную в развитии нашего движка, выражаем особую благодарность нижеперечисленным участникам форума:
-********************************
-** Сборы марта 2013 года **
-********************************
+***************************
+** Сборы 2013 года **
+***************************
emilio13
UralSOFT
@@ -20,9 +20,9 @@ Bullit
Triceratop (http://goldenshara.com/)
Ramzess
-********************************
-** Сборы июня 2014 года **
-********************************
+****************************
+** Сборы 2014 года **
+****************************
SamSeGo
alesel (http://sporttracker.kz/)
@@ -33,10 +33,11 @@ wint1000 (http://asmlocator.ru/)
Philstone (http://worldofminecraft.su/)
Nightwolf
nord51
+Вася
-********************************
-** Прочая информация **
-********************************
+*****************************
+** Прочая информация **
+*****************************
Большое вам всем спасибо за помощь.
diff --git a/install/php-fpm+nginx/fastcgi_params b/install/php-fpm+nginx/fastcgi_params
index 0758053db..425b73424 100644
--- a/install/php-fpm+nginx/fastcgi_params
+++ b/install/php-fpm+nginx/fastcgi_params
@@ -28,4 +28,4 @@ fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param REDIRECT_STATUS 200;
+fastcgi_param REDIRECT_STATUS 200;
\ No newline at end of file
diff --git a/install/php-fpm+nginx/nginx.conf b/install/php-fpm+nginx/nginx.conf
index 970e6703d..d108b89ce 100644
--- a/install/php-fpm+nginx/nginx.conf
+++ b/install/php-fpm+nginx/nginx.conf
@@ -29,7 +29,7 @@ http {
sendfile on;
- # http://en.wikipedia.org/wiki/Asynchronous_I/O
+ # http://en.wikipedia.org/wiki/Asynchronous_I/O
# aio sendfile;
output_buffers 1 64k;
@@ -84,10 +84,10 @@ http {
root /var/www;
fastcgi_index index.php;
fastcgi_pass unix:/tmp/php.sock; # 127.0.0.1:9000;
- fastcgi_intercept_errors on;
+ fastcgi_intercept_errors on;
# FreeBSD Optimization
- fastcgi_pass_request_body off;
+ fastcgi_pass_request_body off;
client_body_in_file_only clean;
fastcgi_param REQUEST_BODY_FILE $request_body_file;
@@ -97,25 +97,26 @@ http {
include fastcgi_params;
}
- location ^~ /bt/ {
- access_log off;
-# if ( $query_string ~ "^uk=([^&?]{10})[&?]+(.*)$" ) {
-# set $uk $1;
-# set $qs $2&ip=$remote_addr;
-# }
-# if ( $query_string ~ "^uk=([^&?]{10})[&?]+((.*&|)ip=.*)$" ) {
-# set $uk $1;
-# set $qs $2;
-# }
-# if ( $qs ) {
-# rewrite ^.*/([a-z]+)(\.php|)$ /$uk/$1?$qs break;
-# }
- rewrite ^/?(.*)$ /$1?ip=$remote_addr&$query_string break;
- proxy_pass http://127.0.0.1:2710/;
- }
+ # Old XBTT config
+# location ^~ /bt/ {
+# access_log off;
+# if ( $query_string ~ "^uk=([^&?]{10})[&?]+(.*)$" ) {
+# set $uk $1;
+# set $qs $2&ip=$remote_addr;
+# }
+# if ( $query_string ~ "^uk=([^&?]{10})[&?]+((.*&|)ip=.*)$" ) {
+# set $uk $1;
+# set $qs $2;
+# }
+# if ( $qs ) {
+# rewrite ^.*/([a-z]+)(\.php|)$ /$uk/$1?$qs break;
+# }
+# rewrite ^/?(.*)$ /$1?ip=$remote_addr&$query_string break;
+# proxy_pass http://127.0.0.1:2710/;
+# }
# Cached Images
- location ~* \.(jpg|jpeg|gif|png|css|js|ico)$ {
+ location ~* \.(jpg|jpeg|gif|png|css|js|ico)$ {
root /var/www;
access_log off;
expires 30d;
@@ -126,7 +127,7 @@ http {
deny all;
# allow YOUR_IP;
}
- # Deny folder (Sec. lvl1)
+ # Deny folder (Sec. lvl1)
location ~ \/(cache|log|attach_mod|cache|config|includes|language|triggers)\/ {
deny all;
}
diff --git a/install/sphinx/sphinx.conf b/install/sphinx/sphinx.conf
index abbaadb58..be2360d8d 100644
--- a/install/sphinx/sphinx.conf
+++ b/install/sphinx/sphinx.conf
@@ -33,8 +33,8 @@ source posts: torrentpier
LEFT JOIN bb_topics t on pt.post_id = t.topic_first_post_id \
WHERE pt.post_id BETWEEN $start AND $end
- sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM bb_posts_text
- sql_range_step = 100000
+ sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM bb_posts_text
+ sql_range_step = 100000
sql_attr_uint = topic_id
sql_attr_uint = forum_id
@@ -63,7 +63,7 @@ index topics
min_prefix_len = 0
min_infix_len = 0
min_word_len = 1
- min_stemming_len = 4
+ min_stemming_len = 4
enable_star = 1
phrase_boundary = :, - , . , $
phrase_boundary_step = 1
@@ -97,7 +97,7 @@ searchd
read_timeout = 5
max_children = 15
max_matches = 5000
- seamless_rotate = 1
+ seamless_rotate = 1
preopen_indexes = 0
unlink_old = 1
pid_file = ./sphinx/searchd.pid
diff --git a/readme.txt b/readme.txt
index 070633c1f..fd68905d4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -46,13 +46,13 @@ php5-tidy
Подробнее в теме http://torrentpier.me/threads/Отвязка-запуск-крона.52/
************************************
-** Часто задаваемые вопросы **
+** Часто задаваемые вопросы **
************************************
http://torrentpier.me/threads/faq-для-новичков.260/
************************************
-** Где задать вопрос **
+** Где задать вопрос **
************************************
http://torrentpier.me/forums/Основные-вопросы-по-torrentpier-ii.10/
\ No newline at end of file
diff --git a/upgrade/r600-stable.php b/upgrade/r600-stable.php
new file mode 100644
index 000000000..c707e8bbe
--- /dev/null
+++ b/upgrade/r600-stable.php
@@ -0,0 +1,17 @@
+session_start();
+
+set_die_append_msg();
+if (!IS_SUPER_ADMIN) bb_die($lang['ONLY_FOR_SUPER_ADMIN']);
+
+// DRAFT, TODO IN NEXT REVISIONS
\ No newline at end of file
diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php
index d125627cb..dfc417156 100644
--- a/upload/admin/admin_board.php
+++ b/upload/admin/admin_board.php
@@ -64,33 +64,33 @@ switch($mode)
{
case 'config_mods':
$template->assign_vars(array(
- 'S_CONFIG_ACTION' => 'admin_board.php?mode=config_mods',
- 'CONFIG_MODS' => true,
+ 'S_CONFIG_ACTION' => 'admin_board.php?mode=config_mods',
+ 'CONFIG_MODS' => true,
- 'REPORTS_ENABLED' => $new['reports_enabled'],
- 'MAGNET_LINKS_ENABLED' => $new['magnet_links_enabled'],
- 'GENDER' => $new['gender'],
- 'CALLSEED' => $new['callseed'],
- 'TOR_STATS' => $new['tor_stats'],
- 'SHOW_LATEST_NEWS' => $new['show_latest_news'],
- 'MAX_NEWS_TITLE' => $new['max_news_title'],
- 'LATEST_NEWS_COUNT' => $new['latest_news_count'],
- 'LATEST_NEWS_FORUM_ID' => $new['latest_news_forum_id'],
- 'SHOW_NETWORK_NEWS' => $new['show_network_news'],
- 'MAX_NET_TITLE' => $new['max_net_title'],
- 'NETWORK_NEWS_COUNT' => $new['network_news_count'],
- 'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'],
- 'WHOIS_INFO' => $new['whois_info'],
- 'SHOW_MOD_INDEX' => $new['show_mod_index'],
- 'BIRTHDAY_ENABLED' => $new['birthday_enabled'],
- 'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'],
- 'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
- 'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
- 'PREMOD' => $new['premod'],
- 'TOR_COMMENT' => $new['tor_comment'],
- 'NEW_TPLS' => $new['new_tpls'],
- 'SEED_BONUS_ENABLED' => $new['seed_bonus_enabled'],
- 'SEED_BONUS_TOR_SIZE' => $new['seed_bonus_tor_size'],
+ 'REPORTS_ENABLED' => $new['reports_enabled'],
+ 'MAGNET_LINKS_ENABLED' => $new['magnet_links_enabled'],
+ 'GENDER' => $new['gender'],
+ 'CALLSEED' => $new['callseed'],
+ 'TOR_STATS' => $new['tor_stats'],
+ 'SHOW_LATEST_NEWS' => $new['show_latest_news'],
+ 'MAX_NEWS_TITLE' => $new['max_news_title'],
+ 'LATEST_NEWS_COUNT' => $new['latest_news_count'],
+ 'LATEST_NEWS_FORUM_ID' => $new['latest_news_forum_id'],
+ 'SHOW_NETWORK_NEWS' => $new['show_network_news'],
+ 'MAX_NET_TITLE' => $new['max_net_title'],
+ 'NETWORK_NEWS_COUNT' => $new['network_news_count'],
+ 'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'],
+ 'WHOIS_INFO' => $new['whois_info'],
+ 'SHOW_MOD_INDEX' => $new['show_mod_index'],
+ 'BIRTHDAY_ENABLED' => $new['birthday_enabled'],
+ 'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'],
+ 'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
+ 'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
+ 'PREMOD' => $new['premod'],
+ 'TOR_COMMENT' => $new['tor_comment'],
+ 'NEW_TPLS' => $new['new_tpls'],
+ 'SEED_BONUS_ENABLED' => $new['seed_bonus_enabled'],
+ 'SEED_BONUS_TOR_SIZE' => $new['seed_bonus_tor_size'],
'SEED_BONUS_USER_REGDATE' => $new['seed_bonus_user_regdate'],
));
@@ -129,32 +129,31 @@ switch($mode)
default:
$template->assign_vars(array(
- 'S_CONFIG_ACTION' => 'admin_board.php?mode=config',
- 'CONFIG' => true,
+ 'S_CONFIG_ACTION' => 'admin_board.php?mode=config',
+ 'CONFIG' => true,
- 'SITENAME' => htmlCHR($new['sitename']),
+ 'SITENAME' => htmlCHR($new['sitename']),
'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']),
- 'DISABLE_BOARD' => ($new['board_disable']) ? true : false,
-
- 'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false,
- 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],
- 'MAX_POLL_OPTIONS' => $new['max_poll_options'],
- 'FLOOD_INTERVAL' => $new['flood_interval'],
- 'TOPICS_PER_PAGE' => $new['topics_per_page'],
- 'POSTS_PER_PAGE' => $new['posts_per_page'],
- 'HOT_TOPIC' => $new['hot_threshold'],
- 'LANG_SELECT' => language_select($new['default_lang'], 'language'),
- 'DEFAULT_DATEFORMAT' => $new['default_dateformat'],
- 'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'),
- 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'],
- 'LOGIN_RESET_TIME' => $new['login_reset_time'],
- 'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false,
- 'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false,
- 'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false,
- 'ALLOW_SIG' => ($new['allow_sig']) ? true : false,
- 'SIG_SIZE' => $new['max_sig_chars'],
- 'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false,
- 'SMILIES_PATH' => $new['smilies_path'],
+ 'DISABLE_BOARD' => ($new['board_disable']) ? true : false,
+ 'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false,
+ 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],
+ 'MAX_POLL_OPTIONS' => $new['max_poll_options'],
+ 'FLOOD_INTERVAL' => $new['flood_interval'],
+ 'TOPICS_PER_PAGE' => $new['topics_per_page'],
+ 'POSTS_PER_PAGE' => $new['posts_per_page'],
+ 'HOT_TOPIC' => $new['hot_threshold'],
+ 'DEFAULT_DATEFORMAT' => $new['default_dateformat'],
+ 'LANG_SELECT' => language_select($new['default_lang'], 'default_lang'),
+ 'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'),
+ 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'],
+ 'LOGIN_RESET_TIME' => $new['login_reset_time'],
+ 'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false,
+ 'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false,
+ 'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false,
+ 'ALLOW_SIG' => ($new['allow_sig']) ? true : false,
+ 'SIG_SIZE' => $new['max_sig_chars'],
+ 'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false,
+ 'SMILIES_PATH' => $new['smilies_path'],
));
break;
}
diff --git a/upload/ajax/html/jumpbox_guest.html b/upload/ajax/html/jumpbox_guest.html
index d9e4994a7..e25cf03e0 100644
--- a/upload/ajax/html/jumpbox_guest.html
+++ b/upload/ajax/html/jumpbox_guest.html
@@ -1,6 +1,5 @@
-
-
\ No newline at end of file
diff --git a/upload/ajax/html/jumpbox_user.html b/upload/ajax/html/jumpbox_user.html
index d9e4994a7..e25cf03e0 100644
--- a/upload/ajax/html/jumpbox_user.html
+++ b/upload/ajax/html/jumpbox_user.html
@@ -1,6 +1,5 @@
-
-