From 30e6a00c8e50083ae88c7567c21c850f7526b069 Mon Sep 17 00:00:00 2001 From: "glix08@gmail.com" Date: Sun, 13 Jul 2014 10:30:03 +0000 Subject: [PATCH] r591 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Новая система локализации шаблонов боковых панелей, пользовательских соглашений и т.д. Добавлены локализации оных на английский и украинский языки. Исправления ошибок и прочие изменения: - вторая боковая панель включена по-умолчанию; - включена панель отладки в администраторской панели; - исправление ошибки с сохранением кеша для разных языков; - исправление ошибки с выбором стандартного языка для форума; - исправление ошибки с генерацией списка текущих дней рождения; - исправление ошибки с иногда некорректной генерацией списка файлов в раздаче; - исправление ошибки с возможностью парсинга базы данных пользовательских email-адресов; - исправление ошибки с редиректом страниц на некоторых конфигурациях серверов (IIS); - исправление ошибки с выводом информации о текущем выбранном шаблоне/языке, если на форуме он всего один; - исправление кодировки кастомного поиска для браузера; - множественные правки в css, js, языковых переменных. Также были переименованы все файлы в папке /includes/ucp, для предотвращения дублирования текста в названии оных. Изменения в сами файлы не вносились. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@591 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- contributors.txt | 19 +- install/php-fpm+nginx/fastcgi_params | 2 +- install/php-fpm+nginx/nginx.conf | 43 +- install/sphinx/sphinx.conf | 8 +- readme.txt | 4 +- upgrade/r600-stable.php | 17 + upload/admin/admin_board.php | 99 +- upload/ajax/html/jumpbox_guest.html | 5 +- upload/ajax/html/jumpbox_user.html | 5 +- upload/ajax/index_data.php | 2 +- upload/ajax/post_mod_comment.php | 10 +- upload/ajax/view_torrent.php | 2 +- upload/config.php | 42 +- upload/develop/error_report.php | 14 +- upload/groupcp.php | 38 +- upload/includes/datastore/build_stats.php | 2 +- upload/includes/db/mysql.php | 2 +- upload/includes/functions.php | 10 +- upload/includes/functions_selects.php | 4 +- upload/includes/init_bb.php | 4 +- upload/includes/online_userlist.php | 4 +- upload/includes/page_footer.php | 4 +- upload/includes/page_footer_dev.php | 2 +- upload/includes/page_header.php | 10 +- .../ucp/{usercp_activate.php => activate.php} | 0 .../ucp/{usercp_bonus.php => bonus.php} | 0 .../ucp/{usercp_email.php => email.php} | 0 .../ucp/{usercp_register.php => register.php} | 0 .../{usercp_sendpasswd.php => sendpasswd.php} | 0 ...usercp_topic_watch.php => topic_watch.php} | 0 ...usercp_viewprofile.php => viewprofile.php} | 2 +- ...usercp_viewtorrent.php => viewtorrent.php} | 0 upload/{misc => language/en}/html/.htaccess | 0 upload/language/en/html/advert.html | 17 + .../language/en/html/copyright_holders.html | 52 + upload/language/en/html/not_found.html | 14 + upload/language/en/html/sidebar1.html | 23 + upload/language/en/html/sidebar2.html | 18 + upload/language/en/html/user_agreement.html | 105 + upload/language/en/main.php | 6074 ++++++++--------- upload/language/ru/html/.htaccess | 2 + upload/language/ru/html/advert.html | 17 + .../ru}/html/copyright_holders.html | 0 .../{misc => language/ru}/html/not_found.html | 23 +- .../{misc => language/ru}/html/sidebar1.html | 12 +- upload/language/ru/html/sidebar2.html | 18 + .../ru}/html/user_agreement.html | 8 +- upload/language/ru/main.php | 46 +- upload/language/ua/html/.htaccess | 2 + upload/language/ua/html/advert.html | 17 + .../language/ua/html/copyright_holders.html | 52 + upload/language/ua/html/not_found.html | 14 + upload/language/ua/html/sidebar1.html | 23 + upload/language/ua/html/sidebar2.html | 18 + upload/language/ua/html/user_agreement.html | 105 + upload/language/ua/main.php | 55 +- upload/language/ua/translit_table.php | 2 +- upload/memberlist.php | 2 +- upload/misc.php | 4 +- upload/misc/html/advert.html | 21 - upload/misc/html/agreement.html | 3 - upload/misc/html/sidebar2.html | 10 - upload/misc/js/bbcode.js | 6 +- upload/opensearch_desc.xml | 2 +- upload/opensearch_desc_bt.xml | 2 +- upload/profile.php | 14 +- upload/templates/admin/admin_attachments.tpl | 2 +- upload/templates/admin/admin_board.tpl | 69 +- upload/templates/admin/admin_cron.tpl | 2 +- upload/templates/admin/admin_forums.tpl | 2 +- upload/templates/admin/admin_log.tpl | 4 +- .../templates/admin/admin_rebuild_search.tpl | 2 +- upload/templates/admin/admin_ug_auth.tpl | 4 +- upload/templates/admin/index.tpl | 4 +- upload/templates/default/agreement.tpl | 27 - upload/templates/default/css/main.css | 168 +- upload/templates/default/modcp_split.tpl | 4 +- upload/templates/default/page_footer.tpl | 15 +- upload/templates/default/page_header.tpl | 12 +- upload/templates/default/posting_editor.tpl | 2 +- upload/templates/default/posting_tpl.tpl | 10 +- upload/templates/default/usercp_register.tpl | 12 +- .../templates/default/usercp_viewprofile.tpl | 28 +- upload/templates/default/viewforum.tpl | 10 +- upload/templates/default/viewtopic.tpl | 18 +- upload/templates/default/viewtopic_poll.tpl | 2 +- .../templates/default/viewtopic_torrent.tpl | 5 +- .../templates/topic_tpl_overall_header.html | 6 +- 88 files changed, 3972 insertions(+), 3571 deletions(-) create mode 100644 upgrade/r600-stable.php rename upload/includes/ucp/{usercp_activate.php => activate.php} (100%) rename upload/includes/ucp/{usercp_bonus.php => bonus.php} (100%) rename upload/includes/ucp/{usercp_email.php => email.php} (100%) rename upload/includes/ucp/{usercp_register.php => register.php} (100%) rename upload/includes/ucp/{usercp_sendpasswd.php => sendpasswd.php} (100%) rename upload/includes/ucp/{usercp_topic_watch.php => topic_watch.php} (100%) rename upload/includes/ucp/{usercp_viewprofile.php => viewprofile.php} (96%) rename upload/includes/ucp/{usercp_viewtorrent.php => viewtorrent.php} (100%) rename upload/{misc => language/en}/html/.htaccess (100%) create mode 100644 upload/language/en/html/advert.html create mode 100644 upload/language/en/html/copyright_holders.html create mode 100644 upload/language/en/html/not_found.html create mode 100644 upload/language/en/html/sidebar1.html create mode 100644 upload/language/en/html/sidebar2.html create mode 100644 upload/language/en/html/user_agreement.html create mode 100644 upload/language/ru/html/.htaccess create mode 100644 upload/language/ru/html/advert.html rename upload/{misc => language/ru}/html/copyright_holders.html (100%) rename upload/{misc => language/ru}/html/not_found.html (60%) rename upload/{misc => language/ru}/html/sidebar1.html (56%) create mode 100644 upload/language/ru/html/sidebar2.html rename upload/{misc => language/ru}/html/user_agreement.html (98%) create mode 100644 upload/language/ua/html/.htaccess create mode 100644 upload/language/ua/html/advert.html create mode 100644 upload/language/ua/html/copyright_holders.html create mode 100644 upload/language/ua/html/not_found.html create mode 100644 upload/language/ua/html/sidebar1.html create mode 100644 upload/language/ua/html/sidebar2.html create mode 100644 upload/language/ua/html/user_agreement.html delete mode 100644 upload/misc/html/advert.html delete mode 100644 upload/misc/html/agreement.html delete mode 100644 upload/misc/html/sidebar2.html delete mode 100644 upload/templates/default/agreement.tpl 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 @@ - - - + \ No newline at end of file diff --git a/upload/ajax/index_data.php b/upload/ajax/index_data.php index efe5bdd28..5b355026e 100644 --- a/upload/ajax/index_data.php +++ b/upload/ajax/index_data.php @@ -8,7 +8,7 @@ $mode = (string) $this->request['mode']; $html = ''; switch($mode) -{ +{ case 'birthday_week': $stats = $datastore->get('stats'); $datastore->enqueue(array( diff --git a/upload/ajax/post_mod_comment.php b/upload/ajax/post_mod_comment.php index cf37e4bfd..d4e9c8fee 100644 --- a/upload/ajax/post_mod_comment.php +++ b/upload/ajax/post_mod_comment.php @@ -11,13 +11,11 @@ if (!$mc_text = prepare_message($mc_text)) $this->ajax_die($lang['EMPTY_MESSAGE' $post = DB()->fetch_row(" SELECT - p.post_id, p.poster_id, - u.username, u.user_id, u.user_rank + p.post_id, p.poster_id FROM ". BB_POSTS ." p - LEFT JOIN ". BB_USERS ." u ON(u.user_id = p.mc_user_id) WHERE p.post_id = $post_id "); -if(!$post) $this->ajax_die('not post'); +if (!$post) $this->ajax_die('not post'); $data = array( 'mc_comment' => ($mc_type) ? $mc_text : '', @@ -31,7 +29,7 @@ if ($mc_type && $post['poster_id'] != $userdata['user_id']) { $subject = sprintf($lang['MC_COMMENT_PM_SUBJECT'], $lang['MC_COMMENT'][$mc_type]['type']); $message = sprintf($lang['MC_COMMENT_PM_MSG'], get_username($post['poster_id']), make_url(POST_URL ."$post_id#$post_id"), $lang['MC_COMMENT'][$mc_type]['type'], $mc_text); - + send_pm($post['poster_id'], $subject, $message); cache_rm_user_sessions($post['poster_id']); } @@ -59,4 +57,4 @@ $this->response['mc_type'] = $mc_type; $this->response['post_id'] = $post_id; $this->response['mc_title'] = sprintf($lang['MC_COMMENT'][$mc_type]['title'], profile_url($userdata)); $this->response['mc_text'] = bbcode2html($mc_text); -$this->response['mc_class'] = $mc_class; +$this->response['mc_class'] = $mc_class; \ No newline at end of file diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php index 0b192847b..1b1b58954 100644 --- a/upload/ajax/view_torrent.php +++ b/upload/ajax/view_torrent.php @@ -104,7 +104,7 @@ class torrent } array_deep($f['path'], 'clean_tor_dirname'); - $length = isset($f['length']) ? (int) $f['length'] : 0; + $length = isset($f['length']) ? (float) $f['length'] : 0; $subdir_count = count($f['path']) - 1; if ($subdir_count > 0) diff --git a/upload/config.php b/upload/config.php index a4b056031..45f3a7cba 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.6 (RC)'; -$bb_cfg['tp_release_date'] = '21-06-2014'; -$bb_cfg['tp_release_state'] = 'R590'; +$bb_cfg['tp_release_date'] = '13-07-2014'; +$bb_cfg['tp_release_state'] = 'R591'; // Database $charset = 'utf8'; @@ -212,7 +212,7 @@ $bb_cfg['dl_cancel_days_keep'] = 30; $bb_cfg['torstat_days_keep'] = 60; // days to keep user's per-torrent stats // Tor-Help -$bb_cfg['torhelp_enabled'] = false; // find dead torrents (without seeder) that user might help seeding +$bb_cfg['torhelp_enabled'] = false; // find dead torrents (without seeder) that user might help seeding $page_cfg['show_torhelp'] = array( # BB_SCRIPT => true @@ -242,11 +242,8 @@ $bb_cfg['posting_url'] = 'posting.php'; # "http://{$domain_name}/posting.php" $bb_cfg['pm_url'] = 'privmsg.php'; # "http://{$domain_name}/privmsg.php" // Language -setlocale(LC_ALL, 'ru_RU.UTF-8'); -setlocale(LC_NUMERIC, 'C'); - -$bb_cfg['charset'] = 'utf8'; -$bb_cfg['auto_language'] = true; +$bb_cfg['charset'] = 'utf8'; // page charset +$bb_cfg['auto_language'] = true; // select user-preferred language automatically if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language']) { @@ -285,7 +282,7 @@ define('ADMIN_TPL_DIR', TEMPLATES_DIR .'/admin/'); $bb_cfg['templates'] = array( // 'folder' => 'Name', - 'default' => 'Стандартный' + 'default' => 'Стандартный', ); $bb_cfg['tpl_name'] = 'default'; @@ -300,15 +297,9 @@ $page_cfg['show_sidebar1'] = array( ); $page_cfg['show_sidebar2'] = array( # BB_SCRIPT => true - 'index' => false, + 'index' => true, ); -$bb_cfg['sidebar1_static_content_path'] = BB_PATH .'/misc/html/sidebar1.html'; -$bb_cfg['sidebar2_static_content_path'] = BB_PATH .'/misc/html/sidebar2.html'; - -$bb_cfg['topic_tpl']['overall_header'] = TEMPLATES_DIR .'topic_tpl_overall_header.html'; -$bb_cfg['topic_tpl']['rules_video'] = TEMPLATES_DIR .'topic_tpl_rules_video.html'; - // Cookie $bb_cfg['cookie_domain'] = in_array($domain_name, array(getenv('SERVER_ADDR'), 'localhost')) ? '' : ".$domain_name"; $bb_cfg['cookie_secure'] = (!empty($_SERVER['HTTPS']) ? 1 : 0); # 0 @@ -439,10 +430,10 @@ define('CRON_ALLOWED', TRIGGERS_DIR .'cron_allowed'); define('CRON_RUNNING', TRIGGERS_DIR .'cron_running'); //Формат даты -$bb_cfg['date_format'] = 'Y-m-d'; +$bb_cfg['date_format'] = 'Y-m-d'; // Subforums -$bb_cfg['sf_on_first_page_only'] = true; +$bb_cfg['sf_on_first_page_only'] = true; // Forums $bb_cfg['allowed_topics_per_page'] = array(50, 100, 150, 200, 250, 300); @@ -455,7 +446,7 @@ $bb_cfg['show_poster_joined'] = true; $bb_cfg['show_poster_posts'] = true; $bb_cfg['show_poster_from'] = true; $bb_cfg['show_bot_nick'] = false; -$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links +$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links $bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable $bb_cfg['post_date_format'] = 'd-M-Y H:i'; $bb_cfg['ext_link_new_win'] = true; // open external links in new window @@ -568,12 +559,12 @@ define('MEM_USAGE', function_exists('memory_get_usage')); $bb_cfg['mem_on_start'] = (MEM_USAGE) ? memory_get_usage() : 0; -$bb_cfg['translate_dates'] = true; // in displaying time +$bb_cfg['translate_dates'] = true; // in displaying time $bb_cfg['use_word_censor'] = true; $bb_cfg['last_visit_date_format'] = 'd-M H:i'; $bb_cfg['last_post_date_format'] = 'd-M-y H:i'; -$bb_cfg['poll_max_days'] = 180; // сколько дней с момента создания темы опрос будет активным +$bb_cfg['poll_max_days'] = 180; // сколько дней с момента создания темы опрос будет активным $bb_cfg['allow_change'] = array( 'language' => true, @@ -590,8 +581,8 @@ $banned_user_agents = array( # 'wget', ); -$bb_cfg['porno_forums_screenshots_topic_id'] = 52267; -$bb_cfg['trash_forum_id'] = 0; // (int) 27 +$bb_cfg['porno_forums_screenshots_topic_id'] = 0; // (int) 7 +$bb_cfg['trash_forum_id'] = 0; // (int) 7 $bb_cfg['first_logon_redirect_url'] = 'index.php'; $bb_cfg['terms_and_conditions_url'] = 'index.php'; @@ -600,11 +591,6 @@ $bb_cfg['user_agreement_url'] = 'misc.php?do=info&show=user_agreement'; $bb_cfg['copyright_holders_url'] = 'misc.php?do=info&show=copyright_holders'; $bb_cfg['advert_url'] = 'misc.php?do=info&show=advert'; -$bb_cfg['html_path'] = BB_PATH .'/misc/html/'; # -$bb_cfg['user_agreement_html_path'] = $bb_cfg['html_path'] .'user_agreement.html'; # -$bb_cfg['copyright_holders_html_path'] = $bb_cfg['html_path'] .'copyright_holders.html'; # -$bb_cfg['advert_html_path'] = $bb_cfg['html_path'] .'advert.html'; # - // Captcha $bb_cfg['captcha'] = array( 'disabled' => false, diff --git a/upload/develop/error_report.php b/upload/develop/error_report.php index c4a329a63..5120c62a6 100644 --- a/upload/develop/error_report.php +++ b/upload/develop/error_report.php @@ -24,16 +24,16 @@ $showSourceNext = 15; @@ -154,14 +154,14 @@ ajax.index_data = function(mode) { mode : mode, user_id : {PROFILE_USER_ID} }); -} +}; ajax.callback.index_data = function(data) { $('#traf-stats-tbl').html(data.html); $('#bt_user_ratio').html(data.user_ratio); $('#traf-stats-span').hide(); $('#traf-stats-tbl').show(); $('#bt_user_ratio').show(); -} +}; diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index 019466a47..547a92bd2 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -107,7 +107,7 @@ ajax.edit_topic_title = function(topic_id, topic_title) { topic_id : topic_id, topic_title : topic_title }); -} +}; function mod_action (mode) { @@ -137,7 +137,7 @@ ajax.mod_action = function(topic_ids, mode, status) { topic_ids : topic_ids, status : status }); -} +}; ajax.callback.mod_action = function(data) { if(data.topics) { @@ -150,7 +150,7 @@ ajax.callback.mod_action = function(data) { $tt_td.html(ajax.tte_orig_html); $('.tt-text', $tt_td).html(data.topic_title); } -} +};