aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-12-27 00:06:39 +0000
committerNils Adermann <naderman@naderman.de>2006-12-27 00:06:39 +0000
commitb41365fcd41fc185fe197667d2f0bec13f6c30c2 (patch)
treee7746c0e1e870e82a62bb52f08cdb10977059d56 /phpBB/install
parent677dc5d2e11c3209fcaf798e4b44588a9305328f (diff)
downloadforums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar.gz
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar.bz2
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar.xz
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.zip
- display search type as page title for premade searches [Bug #6508]
- flash enabled on user side by default, so that admins can actually change anything by activating it (still disabled by default) - properly implemented password complexity check [Bug #6584] - do not ldap_escape paramaters for the bind function [Bug #6208] - deleted words in edited post subjects weren't getting there search cache refreshed [Bug #6288] - made common word threshold configurable [Bug #6168] - recreated word match table entries after installation, side effect of bug #6060 - option to only allow ASCII usernames - adjusted search page pagination [Bug #6424] - correctly calculate unformatted search result extract length git-svn-id: file:///svn/phpbb/trunk@6814 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php27
-rw-r--r--phpBB/install/schemas/firebird_schema.sql2
-rw-r--r--phpBB/install/schemas/mssql_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql2
-rw-r--r--phpBB/install/schemas/oracle_schema.sql2
-rw-r--r--phpBB/install/schemas/postgres_schema.sql2
-rw-r--r--phpBB/install/schemas/schema_data.sql21
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql2
9 files changed, 52 insertions, 10 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index febd88665f..42c7e101f8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -320,6 +320,10 @@ $database_update_info = array(
'session_forwarded_for' => array('VCHAR:255', 0),
),
),
+ 'change_columns' => array(
+ USERS_TABLE => array(
+ 'user_options' => array('UINT:11', 895),
+ ),
// Remove the following keys
'drop_keys' => array(
ZEBRA_TABLE => array(
@@ -558,6 +562,7 @@ if (version_compare($current_version, '3.0.b4', '<='))
set_config('forwarded_for_check', '0');
set_config('ldap_password', '');
set_config('ldap_user', '');
+ set_config('fulltext_native_common_thres', '20');
$sql = 'SELECT user_colour
FROM ' . USERS_TABLE . '
@@ -580,6 +585,28 @@ if (version_compare($current_version, '3.0.b4', '<='))
break;
}
+ switch ($config['pass_complex'])
+ {
+ case '.*':
+ set_config('pass_complex', 'PASS_TYPE_ANY');
+ break;
+
+ case '[a-zA-Z]':
+ set_config('pass_complex', 'PASS_TYPE_CASE');
+ break;
+
+ case '[a-zA-Z0-9]':
+ set_config('pass_complex', 'PASS_TYPE_ALPHA');
+ break;
+
+ case '[a-zA-Z\W]':
+ set_config('pass_complex', 'PASS_TYPE_SYMBOL');
+ break;
+ }
+
+ $sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = 895 WHERE user_options = 893';
+ _sql($sql, $errored, $error_ary);
+
$no_updates = false;
}
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index fe38795ee8..dd3e4af9d2 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1411,7 +1411,7 @@ CREATE TABLE phpbb_users (
user_allow_viewonline INTEGER DEFAULT 1 NOT NULL,
user_allow_viewemail INTEGER DEFAULT 1 NOT NULL,
user_allow_massemail INTEGER DEFAULT 1 NOT NULL,
- user_options INTEGER DEFAULT 893 NOT NULL,
+ user_options INTEGER DEFAULT 895 NOT NULL,
user_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
user_avatar_type INTEGER DEFAULT 0 NOT NULL,
user_avatar_width INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 8c00685f68..7f33783072 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1653,7 +1653,7 @@ CREATE TABLE [phpbb_users] (
[user_allow_viewonline] [int] DEFAULT (1) NOT NULL ,
[user_allow_viewemail] [int] DEFAULT (1) NOT NULL ,
[user_allow_massemail] [int] DEFAULT (1) NOT NULL ,
- [user_options] [int] DEFAULT (893) NOT NULL ,
+ [user_options] [int] DEFAULT (895) NOT NULL ,
[user_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
[user_avatar_type] [int] DEFAULT (0) NOT NULL ,
[user_avatar_width] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index ee3d290c42..7ceacea8b9 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -1013,7 +1013,7 @@ CREATE TABLE phpbb_users (
user_allow_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
user_allow_viewemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
- user_options int(11) UNSIGNED DEFAULT '893' NOT NULL,
+ user_options int(11) UNSIGNED DEFAULT '895' NOT NULL,
user_avatar varchar(255) DEFAULT '' NOT NULL,
user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index c203a8a574..a34b478be1 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -1013,7 +1013,7 @@ CREATE TABLE phpbb_users (
user_allow_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
user_allow_viewemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
- user_options int(11) UNSIGNED DEFAULT '893' NOT NULL,
+ user_options int(11) UNSIGNED DEFAULT '895' NOT NULL,
user_avatar varchar(255) DEFAULT '' NOT NULL,
user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f65d367356..a1d1e129e7 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1822,7 +1822,7 @@ CREATE TABLE phpbb_users (
user_allow_viewonline number(1) DEFAULT '1' NOT NULL,
user_allow_viewemail number(1) DEFAULT '1' NOT NULL,
user_allow_massemail number(1) DEFAULT '1' NOT NULL,
- user_options number(11) DEFAULT '893' NOT NULL,
+ user_options number(11) DEFAULT '895' NOT NULL,
user_avatar varchar2(255) DEFAULT '' ,
user_avatar_type number(2) DEFAULT '0' NOT NULL,
user_avatar_width number(4) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index ccd33c4f56..a5a3a4b546 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1273,7 +1273,7 @@ CREATE TABLE phpbb_users (
user_allow_viewonline INT2 DEFAULT '1' NOT NULL CHECK (user_allow_viewonline >= 0),
user_allow_viewemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_viewemail >= 0),
user_allow_massemail INT2 DEFAULT '1' NOT NULL CHECK (user_allow_massemail >= 0),
- user_options INT4 DEFAULT '893' NOT NULL CHECK (user_options >= 0),
+ user_options INT4 DEFAULT '895' NOT NULL CHECK (user_options >= 0),
user_avatar varchar(255) DEFAULT '' NOT NULL,
user_avatar_type INT2 DEFAULT '0' NOT NULL,
user_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_width >= 0),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 916a9a12d7..d1bc1ee376 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -90,6 +90,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('forwarded_for_chec
INSERT INTO phpbb_config (config_name, config_value) VALUES ('full_folder_action', '2');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_mysql_max_word_len', '254');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_mysql_min_word_len', '4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_common_thres', '20');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_load_upd', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_max_chars', '14');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_min_chars', '3');
@@ -164,7 +165,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars', '
INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars', '6');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_author_chars', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', '.*');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ANY');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
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');
@@ -589,13 +590,20 @@ INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, disp
# -- wordlist
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('this', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('example', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('post', 0);
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('your', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('phpbb', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('installation', 0);
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('you', 0);
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('may', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('delete', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('topic', 0);
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('and', 0);
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('even', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('forum', 0);
+INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('like', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('since', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('everything', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('seems', 0);
@@ -614,8 +622,15 @@ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (8, 1,
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (9, 1, 0);
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (10, 1, 0);
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (11, 1, 0);
-INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (12, 1, 1);
-INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (3, 1, 1);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (12, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (13, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (14, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (15, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (16, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (17, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (18, 1, 0);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (5, 1, 1);
+INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (19, 1, 1);
# -- reasons
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 4d697f3b15..d33f38b35a 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -984,7 +984,7 @@ CREATE TABLE phpbb_users (
user_allow_viewonline INTEGER UNSIGNED NOT NULL DEFAULT '1',
user_allow_viewemail INTEGER UNSIGNED NOT NULL DEFAULT '1',
user_allow_massemail INTEGER UNSIGNED NOT NULL DEFAULT '1',
- user_options INTEGER UNSIGNED NOT NULL DEFAULT '893',
+ user_options INTEGER UNSIGNED NOT NULL DEFAULT '895',
user_avatar varchar(255) NOT NULL DEFAULT '',
user_avatar_type tinyint(2) NOT NULL DEFAULT '0',
user_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-22 04:45:53 +0000