mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 08:47:45 +02:00
Ok, here comes a big one. Poor updater. Also requires testing.
#i91 #i92 #i93 #i94 #i95 #i96 git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -424,6 +424,15 @@ $database_update_info = array(
|
||||
),
|
||||
),
|
||||
),
|
||||
// Changes from 3.0.RC5 to the next version
|
||||
'3.0.RC5' => array(
|
||||
// Add the following columns
|
||||
'add_columns' => array(
|
||||
USER_TABLE => array(
|
||||
'user_form_salt' => array('VCHAR_UNI:32', ''),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
// Determine mapping database type
|
||||
@@ -1510,6 +1519,9 @@ if (version_compare($current_version, '3.0.RC5', '<='))
|
||||
WHERE bot_agent = '" . $db->sql_escape('Mediapartners-Google/') . "'";
|
||||
_sql($sql, $errored, $error_ary);
|
||||
|
||||
set_config('form_token_lifetime', '7200');
|
||||
set_config('form_token_mintime', '0');
|
||||
|
||||
$no_updates = false;
|
||||
}
|
||||
|
||||
|
@@ -1354,7 +1354,8 @@ CREATE TABLE phpbb_users (
|
||||
user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
||||
user_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
||||
user_actkey VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
||||
user_newpasswd VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE
|
||||
user_newpasswd VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
|
||||
user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE
|
||||
);;
|
||||
|
||||
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;
|
||||
|
@@ -1621,7 +1621,8 @@ CREATE TABLE [phpbb_users] (
|
||||
[user_occ] [varchar] (4000) DEFAULT ('') NOT NULL ,
|
||||
[user_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,
|
||||
[user_actkey] [varchar] (32) DEFAULT ('') NOT NULL ,
|
||||
[user_newpasswd] [varchar] (32) DEFAULT ('') NOT NULL
|
||||
[user_newpasswd] [varchar] (32) DEFAULT ('') NOT NULL ,
|
||||
[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
@@ -955,6 +955,7 @@ CREATE TABLE phpbb_users (
|
||||
user_interests blob NOT NULL,
|
||||
user_actkey varbinary(32) DEFAULT '' NOT NULL,
|
||||
user_newpasswd varbinary(96) DEFAULT '' NOT NULL,
|
||||
user_form_salt varbinary(96) DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (user_id),
|
||||
KEY user_birthday (user_birthday),
|
||||
KEY user_email_hash (user_email_hash),
|
||||
|
@@ -955,6 +955,7 @@ CREATE TABLE phpbb_users (
|
||||
user_interests text NOT NULL,
|
||||
user_actkey varchar(32) DEFAULT '' NOT NULL,
|
||||
user_newpasswd varchar(32) DEFAULT '' NOT NULL,
|
||||
user_form_salt varchar(32) DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (user_id),
|
||||
KEY user_birthday (user_birthday),
|
||||
KEY user_email_hash (user_email_hash),
|
||||
|
@@ -1772,6 +1772,7 @@ CREATE TABLE phpbb_users (
|
||||
user_interests clob DEFAULT '' ,
|
||||
user_actkey varchar2(32) DEFAULT '' ,
|
||||
user_newpasswd varchar2(96) DEFAULT '' ,
|
||||
user_form_salt varchar2(96) DEFAULT '' ,
|
||||
CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id),
|
||||
CONSTRAINT u_phpbb_username_clean UNIQUE (username_clean)
|
||||
)
|
||||
|
@@ -1218,6 +1218,7 @@ CREATE TABLE phpbb_users (
|
||||
user_interests varchar(4000) DEFAULT '' NOT NULL,
|
||||
user_actkey varchar(32) DEFAULT '' NOT NULL,
|
||||
user_newpasswd varchar(32) DEFAULT '' NOT NULL,
|
||||
user_form_salt varchar(32) DEFAULT '' NOT NULL,
|
||||
PRIMARY KEY (user_id)
|
||||
);
|
||||
|
||||
|
@@ -88,6 +88,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons',
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_post_confirm', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval', '15');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('force_server_vars', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_lifetime', '7200');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_mintime', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('forward_pm', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('forwarded_for_check', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('full_folder_action', '2');
|
||||
|
@@ -924,7 +924,8 @@ CREATE TABLE phpbb_users (
|
||||
user_occ text(65535) NOT NULL DEFAULT '',
|
||||
user_interests text(65535) NOT NULL DEFAULT '',
|
||||
user_actkey varchar(32) NOT NULL DEFAULT '',
|
||||
user_newpasswd varchar(32) NOT NULL DEFAULT ''
|
||||
user_newpasswd varchar(32) NOT NULL DEFAULT '',
|
||||
user_form_salt varchar(32) NOT NULL DEFAULT ''
|
||||
);
|
||||
|
||||
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
|
||||
|
Reference in New Issue
Block a user