diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index f9cb42dc1..26666c4dd 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -561,14 +561,10 @@ INSERT INTO `bb_config` VALUES ('flood_interval', '15'); INSERT INTO `bb_config` VALUES ('hot_threshold', '300'); INSERT INTO `bb_config` VALUES ('login_reset_time', '30'); INSERT INTO `bb_config` VALUES ('max_autologin_time', '10'); -INSERT INTO `bb_config` VALUES ('max_inbox_privmsgs', '200'); INSERT INTO `bb_config` VALUES ('max_login_attempts', '5'); INSERT INTO `bb_config` VALUES ('max_poll_options', '6'); -INSERT INTO `bb_config` VALUES ('max_savebox_privmsgs', '50'); -INSERT INTO `bb_config` VALUES ('max_sentbox_privmsgs', '25'); INSERT INTO `bb_config` VALUES ('max_sig_chars', '255'); INSERT INTO `bb_config` VALUES ('posts_per_page', '15'); -INSERT INTO `bb_config` VALUES ('privmsg_disable', '0'); INSERT INTO `bb_config` VALUES ('prune_enable', '1'); INSERT INTO `bb_config` VALUES ('record_online_date', '1211477508'); INSERT INTO `bb_config` VALUES ('record_online_users', '2'); @@ -1498,4 +1494,4 @@ CREATE TABLE IF NOT EXISTS `buf_topic_view` ( `topic_id` mediumint(8) unsigned NOT NULL DEFAULT '0', `topic_views` mediumint(8) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`topic_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index 1f0623ce4..90b5e0800 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -163,10 +163,6 @@ switch($mode) 'LANG_SELECT' => language_select($new['default_lang'], 'default_lang', 'language'), 'DEFAULT_DATEFORMAT' => $new['default_dateformat'], 'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'), - 'PRIVMSG_DISABLE' => ($new['privmsg_disable']) ? false : true, - 'INBOX_LIMIT' => $new['max_inbox_privmsgs'], - 'SENTBOX_LIMIT' => $new['max_sentbox_privmsgs'], - 'SAVEBOX_LIMIT' => $new['max_savebox_privmsgs'], 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'], 'LOGIN_RESET_TIME' => $new['login_reset_time'], 'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false, diff --git a/upload/config.php b/upload/config.php index 256ee2b83..e5cadecbb 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'] = '29-01-2014'; -$bb_cfg['tp_release_state'] = 'R572'; +$bb_cfg['tp_release_date'] = '30-01-2014'; +$bb_cfg['tp_release_state'] = 'R573'; // Database $charset = 'utf8'; @@ -69,8 +69,20 @@ $bb_cfg['db']['db1'] = array('localhost', 'dbase', 'user', 'pass', $charset, $pc //$bb_cfg['db']['db3'] = array('localhost3', 'dbase3', 'user2', 'pass3', $charset, $pconnect); $bb_cfg['db_alias'] = array( -// 'alias' => 'srv_name' - 'cap' => 'db1', // BB_CAPTCHA +// 'alias' => 'srv_name' +# db1 + 'log' => 'db1', // BB_LOG + 'search' => 'db1', // BB_TOPIC_SEARCH + 'sres' => 'db1', // BB_BT_USER_SETTINGS, BB_SEARCH_RESULTS + 'u_ses' => 'db1', // BB_USER_SES, BB_USER_LASTVISIT +# db2 + 'dls' => 'db1', // BB_BT_DLS_* + 'ip' => 'db1', // BB_POSTS_IP + 'ut' => 'db1', // BB_TOPICS_USER_POSTED +# db3 + 'cap' => 'db1', // BB_CAPTCHA + 'pm' => 'db1', // BB_PRIVMSGS, BB_PRIVMSGS_TEXT + 'pt' => 'db1', // BB_POSTS_TEXT ); // Cache @@ -104,9 +116,9 @@ $bb_cfg['cache']['engines'] = array( $bb_cfg['datastore_type'] = 'filecache'; // Server -$bb_cfg['server_name'] = $domain_name; // The domain name from which this board runs -$bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80; // The port your server is running on -$bb_cfg['script_path'] = '/'; // The path where FORUM is located relative to the domain name +$bb_cfg['server_name'] = $domain_name; // The domain name from which this board runs +$bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80; // The port your server is running on +$bb_cfg['script_path'] = '/'; // The path where FORUM is located relative to the domain name // Increase number after changing js or css $bb_cfg['js_ver'] = 1; @@ -223,10 +235,10 @@ define('TEMPLATES_DIR', BB_PATH .'/templates/'); define('TRIGGERS_DIR', BB_PATH .'/triggers/' ); // URLs -$bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" +$bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" $bb_cfg['login_url'] = 'login.php'; # "http://{$domain_name}/login.php" -$bb_cfg['pm_url'] = 'privmsg.php'; # "http://{$domain_name}/privmsg.php" $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'); @@ -281,7 +293,7 @@ $bb_cfg['topic_tpl']['overall_header'] = TEMPLATES_DIR .'topic_tpl_overall_heade $bb_cfg['topic_tpl']['rules_video'] = TEMPLATES_DIR .'topic_tpl_rules_video.html'; // Cookie -$bb_cfg['cookie_domain'] = ($domain_name != $_SERVER['SERVER_ADDR']) ? ".$domain_name" : ''; # '.yourdomain.com' +$bb_cfg['cookie_domain'] = ($domain_name != $_SERVER['SERVER_ADDR']) ? ".$domain_name" : ''; # '.yourdomain.com' $bb_cfg['cookie_secure'] = (!empty($_SERVER['HTTPS']) ? 1 : 0); # 0 $bb_cfg['cookie_prefix'] = 'bb_'; # 'bb_' @@ -460,6 +472,14 @@ $bb_cfg['spam_filter_file_path'] = ''; //BB_PATH .'/misc/spam_filter_words. $bb_cfg['prevent_multiposting'] = true; // replace "reply" with "edit last msg" if user (not admin or mod) is last topic poster $bb_cfg['max_smilies'] = 10; // Максимальное число смайлов в посте (0 - без ограничения) +// PM +$bb_cfg['privmsg_disable'] = false; // отключить систему личных сообщений на форуме +$bb_cfg['max_outgoing_pm_cnt'] = 10; // ограничение на кол. одновременных исходящих лс (для замедления рассылки спама) +$bb_cfg['max_inbox_privmsgs'] = 200; +$bb_cfg['max_savebox_privmsgs'] = 20; +$bb_cfg['max_sentbox_privmsgs'] = 50; +$bb_cfg['pm_days_keep'] = 180; // время хранения ЛС + // Actions log $bb_cfg['log_days_keep'] = 90; diff --git a/upload/includes/functions.php b/upload/includes/functions.php index ecdc424c1..a5f8c163c 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -1124,9 +1124,24 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false) function get_username ($user_id) { - if (empty($user_id)) return false; - $row = DB()->fetch_row("SELECT username FROM ". BB_USERS ." WHERE user_id = $user_id LIMIT 1"); - return $row['username']; + if (empty($user_id)) + { + return is_array($user_id) ? array() : false; + } + if (is_array($user_id)) + { + $usernames = array(); + foreach (DB()->fetch_rowset("SELECT user_id, username FROM ". BB_USERS ." WHERE user_id IN(". get_id_csv($user_id) .")") as $row) + { + $usernames[$row['user_id']] = $row['username']; + } + return $usernames; + } + else + { + $row = DB()->fetch_row("SELECT username FROM ". BB_USERS ." WHERE user_id = $user_id LIMIT 1"); + return $row['username']; + } } function get_user_id ($username) diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index 1513ebee2..1a92c6994 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -198,6 +198,8 @@ define('PRIVMSGS_SENT_MAIL', 2); define('PRIVMSGS_SAVED_IN_MAIL', 3); define('PRIVMSGS_SAVED_OUT_MAIL', 4); define('PRIVMSGS_UNREAD_MAIL', 5); +define('HAVE_UNREAD_PM', 1); +define('HAVE_NEW_PM', 2); define('USERNAME_MIN_LENGTH', 3); diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php index e46a44f61..f5ed8777d 100644 --- a/upload/includes/page_footer.php +++ b/upload/includes/page_footer.php @@ -64,7 +64,7 @@ if ($show_dbg_info) $stat .= '  ]'; $stat .= ' - + '; $stat .= !empty($_COOKIE['sql_log']) ? '[ wrap · max ]' : ''; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 534a1d545..30e0e30f5 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1682,8 +1682,8 @@ $lang['LIST'] = 'List'; $lang['LIST_TITLE'] = 'List: [list]text[/list] (Ctrl+l)'; $lang['LIST_ITEM'] = 'Ordered list: [list=]text[/list] (Ctrl+O)'; $lang['QUOTE_SEL'] = 'Quote selected'; -$lang['TRANSLIT'] = ''; -$lang['TRANSLIT_TITLE'] = ' '; +$lang['TRANSLIT'] = 'Translit'; +$lang['TRANSLIT_TITLE'] = 'Translit selected to russian'; $lang['JAVASCRIPT_ON'] = 'Heads necessary to send messages to enable JavaScript'; $lang['NEW'] = 'New'; @@ -1764,8 +1764,8 @@ $lang['WORD_CENSOR'] = 'Word Censors'; $lang['EXPORT'] = 'Export'; $lang['CREATE_NEW'] = 'Create'; $lang['ADD_NEW'] = 'Add'; -$lang['CRON'] = 'Task Scheduler (Cron)'; -$lang['REBUILD_SEARCH_INDEX'] = ' '; +$lang['CRON'] = 'Task Scheduler (cron)'; +$lang['REBUILD_SEARCH_INDEX'] = 'Rebuild search index'; $lang['FORUM_CONFIG'] = 'Forum settings'; $lang['TRACKER_CONFIG'] = 'Tracker settings'; $lang['RELEASE_TEMPLATES'] = 'Release Templates'; @@ -1796,7 +1796,7 @@ $lang['FORUM_STATS'] = 'Forum Statistics'; $lang['ADMIN_INDEX'] = 'Admin Index'; $lang['CREATE_PROFILE'] = 'Create profile'; -$lang['TP_VERSION'] = 'TorrenPier version'; +$lang['TP_VERSION'] = 'TorrentPier version'; $lang['TP_RELEASE_DATE'] = 'Release date'; $lang['CLICK_RETURN_ADMIN_INDEX'] = 'Click %sHere%s to return to the Admin Index'; @@ -1995,11 +1995,6 @@ $lang['AVATAR_GALLERY_PATH_EXPLAIN'] = 'Path under your phpBB root dir for pre-l $lang['EMAIL_SETTINGS'] = 'Email Settings'; -$lang['DISABLE_PRIVMSG'] = 'Private Messaging'; -$lang['INBOX_LIMITS'] = 'Max posts in Inbox'; -$lang['SENTBOX_LIMITS'] = 'Max posts in Sentbox'; -$lang['SAVEBOX_LIMITS'] = 'Max posts in Savebox'; - // Visual Confirmation $lang['VISUAL_CONFIRM'] = 'Enable Visual Confirmation'; $lang['VISUAL_CONFIRM_EXPLAIN'] = 'Requires users enter a code defined by an image when registering.'; @@ -3090,8 +3085,8 @@ $lang['TPL']['SOURCE_TYPE_OPTIONS'] = array( $lang['TPL']['MULTIPLAYER_OPTIONS'] = array( 'no', - '2', - '4', + '2x', + '4x', 'more', ); diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index f749f5cd3..804d030ec 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1770,7 +1770,7 @@ $lang['WORD_CENSOR'] = 'Автоцензор'; $lang['EXPORT'] = 'Экспорт'; $lang['CREATE_NEW'] = 'Создать'; $lang['ADD_NEW'] = 'Добавить'; -$lang['CRON'] = 'Планировщик задач (Cron)'; +$lang['CRON'] = 'Планировщик задач (cron)'; $lang['REBUILD_SEARCH_INDEX'] = 'Перечесть индексы поиска'; $lang['FORUM_CONFIG'] = 'Настройки форумов'; $lang['TRACKER_CONFIG'] = 'Настройки трекера'; @@ -1802,7 +1802,7 @@ $lang['FORUM_STATS'] = 'Статистика Форумов'; $lang['ADMIN_INDEX'] = 'Главная страница'; $lang['CREATE_PROFILE'] = 'Создать аккаунт'; -$lang['TP_VERSION'] = 'Версия TorrenPier II'; +$lang['TP_VERSION'] = 'Версия TorrentPier II'; $lang['TP_RELEASE_DATE'] = 'Дата выпуска'; $lang['CLICK_RETURN_ADMIN_INDEX'] = '%sВернуться на главную страницу администраторского раздела%s'; @@ -2003,11 +2003,6 @@ $lang['AVATAR_GALLERY_PATH_EXPLAIN'] = 'Каталог ниже корня phpBB $lang['EMAIL_SETTINGS'] = 'Настройки e-mail'; -$lang['DISABLE_PRIVMSG'] = 'Личные сообщения'; -$lang['INBOX_LIMITS'] = 'Макс. число сообщений в папке «Входящие»'; -$lang['SENTBOX_LIMITS'] = 'Макс. число сообщений в папке «Отправленные»'; -$lang['SAVEBOX_LIMITS'] = 'Макс. число сообщений в папке «Сохранённые»'; - // Visual Confirmation $lang['VISUAL_CONFIRM'] = 'Включить визуальное подтверждение'; $lang['VISUAL_CONFIRM_EXPLAIN'] = 'Потребовать от пользователей ввести при регистрации изображённый на картинке код.'; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index 83a8b8031..72366ea52 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -108,28 +108,6 @@ - - {L_PRIVATE_MESSAGING} - - -

{L_DISABLE_PRIVMSG}

- -    - - - - -

{L_INBOX_LIMITS}

- - - -

{L_SENTBOX_LIMITS}

- - - -

{L_SAVEBOX_LIMITS}

- - {L_ABILITIES_SETTINGS}