makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add support for min/max of numerical search backend settings

Browse source 
- change word_text maximum length
- don't update search settings if nothing was changed


git-svn-id: file:///svn/phpbb/trunk@5993 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-05-30 21:46:12 +00:00
parent 64e7df76a6
commit 91a35359ed
8 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/acp/acp_search.php
View file

@ -99,10 +99,24 @@ class acp_search
continue;
}
$config_value = $cfg_array[$config_name];
settype($config_value, $var_type);
// e.g. integer:4:12 (min 4, max 12)
$var_type = explode(':', $var_type);
if ($submit)
$config_value = $cfg_array[$config_name];
settype($config_value, $var_type[0]);
if (isset($var_type[1]))
{
$config_value = max($var_type[1], $config_value);
}
if (isset($var_type[2]))
{
$config_value = min($var_type[2], $config_value);
}
// only change config if anything was actually changed
if ($submit && ($config[$config_name] != $config_value))
{
set_config($config_name, $config_value);
$updated = true;

2
phpBB/includes/search/fulltext_native.php
View file

@ -1098,7 +1098,7 @@ class fulltext_native extends search_backend
// These are fields required in the config table
return array(
'tpl' => $tpl,
'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer', 'fulltext_native_max_chars' => 'integer')
'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:252', 'fulltext_native_max_chars' => 'integer:0:252')
);
}
}

2
phpBB/install/schemas/firebird_schema.sql
View file

@ -911,7 +911,7 @@ ALTER TABLE phpbb_search_results ADD PRIMARY KEY (search_key);;
# phpbb_search_wordlist
CREATE TABLE phpbb_search_wordlist (
word_text VARCHAR(50) DEFAULT '' NOT NULL,
word_text VARCHAR(252) DEFAULT '' NOT NULL,
word_id INTEGER NOT NULL,
word_common INTEGER DEFAULT 0 NOT NULL
);;

2
phpBB/install/schemas/mssql_schema.sql
View file

@ -1436,7 +1436,7 @@ GO
Table: phpbb_search_wordlist
*/
CREATE TABLE [phpbb_search_wordlist] (
[word_text] [nvarchar] (50) NOT NULL ,
[word_text] [nvarchar] (252) NOT NULL ,
[word_id] [int] IDENTITY (1, 1) NOT NULL ,
[word_common] [int] NOT NULL
) ON [PRIMARY]

2
phpBB/install/schemas/mysql_schema.sql
View file

@ -586,7 +586,7 @@ CREATE TABLE phpbb_search_results (
# Table: 'phpbb_search_wordlist'
CREATE TABLE phpbb_search_wordlist (
word_text varchar(50) BINARY DEFAULT '' NOT NULL,
word_text varchar(252) BINARY DEFAULT '' NOT NULL,
word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
word_common tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (word_text),

2
phpBB/install/schemas/oracle_schema.sql
View file

@ -1213,7 +1213,7 @@ CREATE TABLE phpbb_search_results (
Table: phpbb_search_wordlist
*/
CREATE TABLE phpbb_search_wordlist (
word_text varchar2(50) DEFAULT '' NOT NULL,
word_text varchar2(252) DEFAULT '' NOT NULL,
word_id number(8) NOT NULL,
word_common number(1) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_search_wordlist PRIMARY KEY (word_text)

2
phpBB/install/schemas/postgres_schema.sql
View file

@ -915,7 +915,7 @@ CREATE SEQUENCE phpbb_search_wordlist_seq;
CREATE TABLE phpbb_search_wordlist (
word_id INT4 DEFAULT nextval('phpbb_search_wordlist_seq'),
word_text varchar(50) DEFAULT '' NOT NULL,
word_text varchar(252) DEFAULT '' NOT NULL,
word_common INT2 DEFAULT '0' NOT NULL,
PRIMARY KEY (word_text),
CHECK (word_common>=0)

2
phpBB/install/schemas/sqlite_schema.sql
View file

@ -628,7 +628,7 @@ CREATE TABLE phpbb_search_results (
# Table: phpbb_search_wordlist
CREATE TABLE phpbb_search_wordlist (
word_text varchar(50) NOT NULL DEFAULT '',
word_text varchar(252) NOT NULL DEFAULT '',
word_id mediumint(8) NOT NULL,
word_common tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (word_text)