mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 19:54:12 +02:00
- Display coloured usernames in ACP groups management screens
- Changed behaviour of group_create() function to support specifying additional group columns - New groups option to excempt group leaders from group permissions git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -13,6 +13,9 @@ $updates_to_version = '3.0.6-dev';
|
||||
// Enter any version to update from to test updates. The version within the db will not be updated.
|
||||
$debug_from_version = false;
|
||||
|
||||
// Which oldest version does this updater supports?
|
||||
$oldest_from_version = '3.0.0';
|
||||
|
||||
// Return if we "just include it" to find out for which version the database update is responsible for
|
||||
if (defined('IN_PHPBB') && defined('IN_INSTALL'))
|
||||
{
|
||||
@@ -685,6 +688,11 @@ function database_update_info()
|
||||
'log_time' => array('log_time'),
|
||||
),
|
||||
),
|
||||
'add_columns' => array(
|
||||
GROUPS_TABLE => array(
|
||||
'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -1991,23 +1999,28 @@ class updater_db_tools
|
||||
switch ($this->sql_layer)
|
||||
{
|
||||
case 'firebird':
|
||||
// Does not support AFTER statement, only POSITION (and there you need the column position)
|
||||
$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
|
||||
break;
|
||||
|
||||
case 'mssql':
|
||||
// Does not support AFTER, only through temporary table
|
||||
$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
|
||||
break;
|
||||
|
||||
case 'mysql_40':
|
||||
case 'mysql_41':
|
||||
$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'];
|
||||
$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
|
||||
$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
|
||||
break;
|
||||
|
||||
case 'oracle':
|
||||
// Does not support AFTER, only through temporary table
|
||||
$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
|
||||
break;
|
||||
|
||||
case 'postgres':
|
||||
// Does not support AFTER, only through temporary table
|
||||
$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
|
||||
break;
|
||||
|
||||
|
@@ -425,6 +425,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_id INTEGER NOT NULL,
|
||||
group_type INTEGER DEFAULT 1 NOT NULL,
|
||||
group_founder_manage INTEGER DEFAULT 0 NOT NULL,
|
||||
group_skip_auth INTEGER DEFAULT 0 NOT NULL,
|
||||
group_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
|
||||
group_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
|
||||
group_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -297,6 +297,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
|
||||
group_type tinyint(4) DEFAULT '1' NOT NULL,
|
||||
group_founder_manage tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_skip_auth tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_name blob NOT NULL,
|
||||
group_desc blob NOT NULL,
|
||||
group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
|
||||
|
@@ -297,6 +297,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
|
||||
group_type tinyint(4) DEFAULT '1' NOT NULL,
|
||||
group_founder_manage tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_skip_auth tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
group_name varchar(255) DEFAULT '' NOT NULL,
|
||||
group_desc text NOT NULL,
|
||||
group_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
|
||||
|
@@ -586,6 +586,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_id number(8) NOT NULL,
|
||||
group_type number(4) DEFAULT '1' NOT NULL,
|
||||
group_founder_manage number(1) DEFAULT '0' NOT NULL,
|
||||
group_skip_auth number(1) DEFAULT '0' NOT NULL,
|
||||
group_name varchar2(255) DEFAULT '' ,
|
||||
group_desc clob DEFAULT '' ,
|
||||
group_desc_bitfield varchar2(255) DEFAULT '' ,
|
||||
@@ -822,7 +823,7 @@ CREATE TABLE phpbb_poll_votes (
|
||||
topic_id number(8) DEFAULT '0' NOT NULL,
|
||||
poll_option_id number(4) DEFAULT '0' NOT NULL,
|
||||
vote_user_id number(8) DEFAULT '0' NOT NULL,
|
||||
vote_user_ip varchar2(40) DEFAULT ''
|
||||
vote_user_ip varchar2(40) DEFAULT ''
|
||||
)
|
||||
/
|
||||
|
||||
@@ -1466,7 +1467,7 @@ CREATE TABLE phpbb_styles_template_data (
|
||||
template_filename varchar2(100) DEFAULT '' ,
|
||||
template_included clob DEFAULT '' ,
|
||||
template_mtime number(11) DEFAULT '0' NOT NULL,
|
||||
template_data clob DEFAULT ''
|
||||
template_data clob DEFAULT ''
|
||||
)
|
||||
/
|
||||
|
||||
|
@@ -440,6 +440,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_id INT4 DEFAULT nextval('phpbb_groups_seq'),
|
||||
group_type INT2 DEFAULT '1' NOT NULL,
|
||||
group_founder_manage INT2 DEFAULT '0' NOT NULL CHECK (group_founder_manage >= 0),
|
||||
group_skip_auth INT2 DEFAULT '0' NOT NULL CHECK (group_skip_auth >= 0),
|
||||
group_name varchar_ci DEFAULT '' NOT NULL,
|
||||
group_desc varchar(4000) DEFAULT '' NOT NULL,
|
||||
group_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
|
||||
|
@@ -289,6 +289,7 @@ CREATE TABLE phpbb_groups (
|
||||
group_id INTEGER PRIMARY KEY NOT NULL ,
|
||||
group_type tinyint(4) NOT NULL DEFAULT '1',
|
||||
group_founder_manage INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
group_skip_auth INTEGER UNSIGNED NOT NULL DEFAULT '0',
|
||||
group_name varchar(255) NOT NULL DEFAULT '',
|
||||
group_desc text(65535) NOT NULL DEFAULT '',
|
||||
group_desc_bitfield varchar(255) NOT NULL DEFAULT '',
|
||||
|
Reference in New Issue
Block a user