From 862fb87e51a61c1d856255dcd2700ed4185abb22 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 28 Jul 2002 23:56:26 +0000 Subject: [PATCH] Missed settings and some reorg ... git-svn-id: file:///svn/phpbb/trunk@2779 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_board.php | 57 +++++++++++++++++++--- phpBB/install/schemas/mysql_basic.sql | 9 ++-- phpBB/language/lang_english/lang_admin.php | 24 +++++++-- 3 files changed, 74 insertions(+), 16 deletions(-) diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 55e6e46e22..c8110a0cbb 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -229,6 +229,12 @@ switch ( $mode ) $override_user_style_yes = ( $new['override_user_style'] ) ? 'checked="checked"' : ''; $override_user_style_no = ( !$new['override_user_style'] ) ? 'checked="checked"' : ''; + $topic_notify_yes = ( $new['allow_topic_notify'] ) ? 'checked="checked"' : ''; + $topic_notify_no = ( !$new['allow_topic_notify'] ) ? 'checked="checked"' : ''; + + $forum_notify_yes = ( $new['allow_forum_notify'] ) ? 'checked="checked"' : ''; + $forum_notify_no = ( !$new['allow_forum_notify'] ) ? 'checked="checked"' : ''; + $html_yes = ( $new['allow_html'] ) ? 'checked="checked"' : ''; $html_no = ( !$new['allow_html'] ) ? 'checked="checked"' : ''; @@ -265,6 +271,26 @@ switch ( $mode ) + +
+ + + +
+ + + + + />    /> + + + + />    /> + + + + />    /> + />    /> @@ -281,10 +307,6 @@ switch ( $mode ) />    /> - -
- - />    /> @@ -293,10 +315,6 @@ switch ( $mode )
- - - />    /> -
/>    />
+ +
+ + + +
+ + />    /> @@ -373,6 +402,18 @@ switch ( $mode )
+ +
+ + + +
+ + + +
+ + diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql index 12018f8a70..307db861a1 100644 --- a/phpBB/install/schemas/mysql_basic.sql +++ b/phpBB/install/schemas/mysql_basic.sql @@ -34,9 +34,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','1 INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','30'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_smilies', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_box_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes','4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs','50'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','youraddress@yourdomain.com'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0'); @@ -46,7 +48,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','') INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_enable','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval','10'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','90'); @@ -56,7 +58,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_pat INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','images/icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_logs_enable','1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable','1'); @@ -72,7 +73,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('newest_username', INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_users', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_posts', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_topics', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '1.5'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '2.0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_last_gc', '0'); diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index 02646ba3ef..b80c449b3a 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -399,6 +399,11 @@ $lang['Site_name'] = 'Site name'; $lang['Site_desc'] = 'Site description'; $lang['Board_disable'] = 'Disable board'; $lang['Board_disable_explain'] = 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.'; +$lang['Limit_load'] = 'Limit system load'; +$lang['Limit_load_explain'] = 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.'; +$lang['Limit_sessions'] = 'Limit database connections'; +$lang['Limit_sessions_explain'] = 'If the number of database connections exceeds this value the board will go offline. Set to 0 for unlimited connections.'; + $lang['Acct_activation'] = 'Enable account activation'; $lang['Acct_activation_explain'] = 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.'; $lang['Acc_None'] = 'None'; // These three entries are the type of activation @@ -412,12 +417,14 @@ $lang['Enable_COPPA_explain'] = 'This requires users to declare whether they are $lang['COPPA_fax'] = 'COPPA Fax Number'; $lang['COPPA_mail'] = 'COPPA Mailing Address'; $lang['COPPA_mail_explain'] = 'This is the mailing address where parents will send COPPA registration forms'; -$lang['Boxes_max'] = 'Max number of boxes'; +$lang['Boxes_max'] = 'Max number of message boxes'; $lang['Boxes_max_explain'] = 'Users can create this many private messaging boxes.'; -$lang['Boxes_limit'] = 'Max messages in boxes'; -$lang['Boxes_limit_explain'] = 'Users are limited to no more than this many messages in each of their private message folders'; +$lang['Boxes_limit'] = 'Max messages per box'; +$lang['Boxes_limit_explain'] = 'Users are limited to no more than this many messages in each of their private message boxes.'; $lang['Flood_Interval'] = 'Flood Interval'; $lang['Flood_Interval_explain'] = 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.'; +$lang['Search_Interval'] = 'Search Flood Interval'; +$lang['Search_Interval_explain'] = 'Number of seconds users must wait between searches.'; // @@ -435,13 +442,22 @@ $lang['Override_style_explain'] = 'Replaces users style with the default'; $lang['Default_language'] = 'Default Language'; $lang['Date_format'] = 'Date Format'; $lang['System_timezone'] = 'System Timezone'; + +$lang['Char_limit'] = 'Max characters per post'; +$lang['Char_limit_explain'] = 'Set to 0 for unlimited characters.'; +$lang['Allow_topic_notify'] = 'Allow Topic Watching'; +$lang['Allow_forum_notify'] = 'Allow Forum Watching'; $lang['Allow_HTML'] = 'Allow HTML'; $lang['Allow_BBCode'] = 'Allow BBCode'; $lang['Allowed_tags'] = 'Allowed HTML tags'; $lang['Allowed_tags_explain'] = 'Separate tags with commas'; $lang['Allow_smilies'] = 'Allow Smilies'; -$lang['Smilies_path'] = 'Smilies Storage Path'; +$lang['Smilies_path'] = 'Smilies storage path'; $lang['Smilies_path_explain'] = 'Path under your phpBB root dir, e.g. images/smilies'; +$lang['Smilies_limit'] = 'Max smilies per post'; +$lang['Smilies_limit_explain'] = 'Set to 0 for unlimited smilies.'; +$lang['Icons_path'] = 'Post icons storage path'; +$lang['Icons_path_explain'] = 'Path under your phpBB root dir, e.g. images/icons'; $lang['Allow_sig'] = 'Allow Signatures'; $lang['Max_sig_length'] = 'Maximum signature length'; $lang['Max_sig_length_explain'] = 'Maximum number of characters in user signatures';