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

[feature/passwords] Modify forum_password column type for new hash types

Browse source 
PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-10-13 11:33:59 +02:00
parent b795ce8b7d
commit 841dd6b19f
9 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/db/schema_data.php
View file

@ -318,7 +318,7 @@ $schema_data['phpbb_forums'] = array(
'forum_desc_options' => array('UINT:11', 7), 'forum_desc_options' => array('UINT:11', 7),
'forum_desc_uid' => array('VCHAR:8', ''), 'forum_desc_uid' => array('VCHAR:8', ''),
'forum_link' => array('VCHAR_UNI', ''), 'forum_link' => array('VCHAR_UNI', ''),
'forum_password' => array('VCHAR_UNI:40', ''), 'forum_password' => array('VCHAR_UNI', ''),
'forum_style' => array('UINT', 0), 'forum_style' => array('UINT', 0),
'forum_image' => array('VCHAR', ''), 'forum_image' => array('VCHAR', ''),
'forum_rules' => array('TEXT_UNI', ''), 'forum_rules' => array('TEXT_UNI', ''),

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

@ -382,7 +382,7 @@ CREATE TABLE phpbb_forums (
forum_desc_options INTEGER DEFAULT 7 NOT NULL, forum_desc_options INTEGER DEFAULT 7 NOT NULL,
forum_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
forum_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
forum_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_password VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
forum_style INTEGER DEFAULT 0 NOT NULL, forum_style INTEGER DEFAULT 0 NOT NULL,
forum_image VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_image VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
forum_rules BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, forum_rules BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,

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

@ -485,7 +485,7 @@ CREATE TABLE [phpbb_forums] (
[forum_desc_options] [int] DEFAULT (7) NOT NULL , [forum_desc_options] [int] DEFAULT (7) NOT NULL ,
[forum_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL , [forum_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
[forum_link] [varchar] (255) DEFAULT ('') NOT NULL , [forum_link] [varchar] (255) DEFAULT ('') NOT NULL ,
[forum_password] [varchar] (40) DEFAULT ('') NOT NULL , [forum_password] [varchar] (255) DEFAULT ('') NOT NULL ,
[forum_style] [int] DEFAULT (0) NOT NULL , [forum_style] [int] DEFAULT (0) NOT NULL ,
[forum_image] [varchar] (255) DEFAULT ('') NOT NULL , [forum_image] [varchar] (255) DEFAULT ('') NOT NULL ,
[forum_rules] [varchar] (4000) DEFAULT ('') NOT NULL , [forum_rules] [varchar] (4000) DEFAULT ('') NOT NULL ,

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

@ -266,7 +266,7 @@ CREATE TABLE phpbb_forums (
forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
forum_desc_uid varbinary(8) DEFAULT '' NOT NULL, forum_desc_uid varbinary(8) DEFAULT '' NOT NULL,
forum_link blob NOT NULL, forum_link blob NOT NULL,
forum_password varbinary(120) DEFAULT '' NOT NULL, forum_password blob DEFAULT '' NOT NULL,
forum_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_image varbinary(255) DEFAULT '' NOT NULL, forum_image varbinary(255) DEFAULT '' NOT NULL,
forum_rules blob NOT NULL, forum_rules blob NOT NULL,

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

@ -266,7 +266,7 @@ CREATE TABLE phpbb_forums (
forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
forum_desc_uid varchar(8) DEFAULT '' NOT NULL, forum_desc_uid varchar(8) DEFAULT '' NOT NULL,
forum_link varchar(255) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL,
forum_password varchar(40) DEFAULT '' NOT NULL, forum_password varchar(255) DEFAULT '' NOT NULL,
forum_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_style mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_image varchar(255) DEFAULT '' NOT NULL, forum_image varchar(255) DEFAULT '' NOT NULL,
forum_rules text NOT NULL, forum_rules text NOT NULL,

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

@ -537,7 +537,7 @@ CREATE TABLE phpbb_forums (
forum_desc_options number(11) DEFAULT '7' NOT NULL, forum_desc_options number(11) DEFAULT '7' NOT NULL,
forum_desc_uid varchar2(8) DEFAULT '' , forum_desc_uid varchar2(8) DEFAULT '' ,
forum_link varchar2(765) DEFAULT '' , forum_link varchar2(765) DEFAULT '' ,
forum_password varchar2(120) DEFAULT '' , forum_password varchar2(255) DEFAULT '' ,
forum_style number(8) DEFAULT '0' NOT NULL, forum_style number(8) DEFAULT '0' NOT NULL,
forum_image varchar2(255) DEFAULT '' , forum_image varchar2(255) DEFAULT '' ,
forum_rules clob DEFAULT '' , forum_rules clob DEFAULT '' ,

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

@ -408,7 +408,7 @@ CREATE TABLE phpbb_forums (
forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0), forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0),
forum_desc_uid varchar(8) DEFAULT '' NOT NULL, forum_desc_uid varchar(8) DEFAULT '' NOT NULL,
forum_link varchar(255) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL,
forum_password varchar(40) DEFAULT '' NOT NULL, forum_password varchar(255) DEFAULT '' NOT NULL,
forum_style INT4 DEFAULT '0' NOT NULL CHECK (forum_style >= 0), forum_style INT4 DEFAULT '0' NOT NULL CHECK (forum_style >= 0),
forum_image varchar(255) DEFAULT '' NOT NULL, forum_image varchar(255) DEFAULT '' NOT NULL,
forum_rules varchar(4000) DEFAULT '' NOT NULL, forum_rules varchar(4000) DEFAULT '' NOT NULL,

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

@ -259,7 +259,7 @@ CREATE TABLE phpbb_forums (
forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
forum_desc_uid varchar(8) NOT NULL DEFAULT '', forum_desc_uid varchar(8) NOT NULL DEFAULT '',
forum_link varchar(255) NOT NULL DEFAULT '', forum_link varchar(255) NOT NULL DEFAULT '',
forum_password varchar(40) NOT NULL DEFAULT '', forum_password varchar(255) NOT NULL DEFAULT '',
forum_style INTEGER UNSIGNED NOT NULL DEFAULT '0', forum_style INTEGER UNSIGNED NOT NULL DEFAULT '0',
forum_image varchar(255) NOT NULL DEFAULT '', forum_image varchar(255) NOT NULL DEFAULT '',
forum_rules text(65535) NOT NULL DEFAULT '', forum_rules text(65535) NOT NULL DEFAULT '',

14
phpBB/phpbb/db/migration/data/v310/passwords.php
View file

@ -20,8 +20,11 @@ class passwords extends \phpbb\db\migration\migration
{ {
return array( return array(
'change_columns' => array( 'change_columns' => array(
$this->table_prefix . 'users' => array( $this->table_prefix . 'users' => array(
'user_password' => array('VCHAR:255', ''), 'user_password' => array('VCHAR:255', ''),
),
$this->table_prefix . 'forums' => array(
'forum_password' => array('VCHAR:255', ''),
), ),
), ),
); );
@ -31,8 +34,11 @@ class passwords extends \phpbb\db\migration\migration
{ {
return array( return array(
'change_columns' => array( 'change_columns' => array(
$this->table_prefix . 'users' => array( $this->table_prefix . 'users' => array(
'user_password' => array('VCHAR:40', ''), 'user_password' => array('VCHAR:40', ''),
),
$this->table_prefix . 'forums' => array(
'forum_password' => array('VCHAR:40', ''),
), ),
), ),
); );