From f18be0f13550500408412ced93426b9159fb8225 Mon Sep 17 00:00:00 2001 From: dougk_ff7 Date: Thu, 3 Jan 2002 02:27:31 +0000 Subject: [PATCH] Fixes bug 498620, among others. A problem with a rank_max value still hanging around in SQL statements. It was still created by all the schema files, so I changed it there, too. If I end up creating more problems, I'll revert them to the old values... Actually, I think I'd better. Anyway, don't even ask why I updated Oracle. I felt like it, plus we may use it someday... That's it for now! One bug fix... yeah! git-svn-id: file:///svn/phpbb/trunk@1779 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_ranks.php | 8 ++++---- phpBB/db/schemas/mssql_basic.sql | 2 +- phpBB/db/schemas/mssql_schema.sql | 1 - phpBB/db/schemas/mysql_basic.sql | 2 +- phpBB/db/schemas/mysql_schema.sql | 1 - phpBB/db/schemas/oracle_basic.sql | 10 +++++----- phpBB/db/schemas/oracle_schema.sql | 1 - phpBB/db/schemas/postgres_basic.sql | 2 +- phpBB/db/schemas/postgres_schema.sql | 1 - 9 files changed, 12 insertions(+), 16 deletions(-) diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php index 55d3ef6487..de76e85ae4 100644 --- a/phpBB/admin/admin_ranks.php +++ b/phpBB/admin/admin_ranks.php @@ -164,15 +164,15 @@ if( $mode != "" ) if( $rank_id ) { $sql = "UPDATE " . RANKS_TABLE . " - SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_max = 0, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "' + SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "' WHERE rank_id = $rank_id"; $message = $lang['Rank_updated']; } else { - $sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_max, rank_min, rank_image) - VALUES ('" . str_replace("\'", "''", $rank_title) . "', $special_rank, 0, $min_posts, '" . str_replace("\'", "''", $rank_image) . "')"; + $sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_min, rank_image) + VALUES ('" . str_replace("\'", "''", $rank_title) . "', $special_rank, $min_posts, '" . str_replace("\'", "''", $rank_image) . "')"; $message = $lang['Rank_added']; } @@ -352,4 +352,4 @@ $template->pparse("body"); include('page_footer_admin.'.$phpEx); -?> \ No newline at end of file +?> diff --git a/phpBB/db/schemas/mssql_basic.sql b/phpBB/db/schemas/mssql_basic.sql index e30d330130..f87d46d4fa 100644 --- a/phpBB/db/schemas/mssql_basic.sql +++ b/phpBB/db/schemas/mssql_basic.sql @@ -96,7 +96,7 @@ INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_passw */ SET IDENTITY_INSERT phpbb_ranks ON; -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES (1, 'Site Admin', -1, -1, 1, ''); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES (1, 'Site Admin', -1, 1, ''); SET IDENTITY_INSERT phpbb_ranks OFF; diff --git a/phpBB/db/schemas/mssql_schema.sql b/phpBB/db/schemas/mssql_schema.sql index 1e278f6cb3..998e05a76a 100644 --- a/phpBB/db/schemas/mssql_schema.sql +++ b/phpBB/db/schemas/mssql_schema.sql @@ -149,7 +149,6 @@ CREATE TABLE [phpbb_ranks] ( [rank_id] [int] IDENTITY (1, 1) NOT NULL , [rank_title] [varchar] (50) NOT NULL , [rank_min] [int] NULL , - [rank_max] [int] NULL , [rank_special] [smallint] NULL , [rank_image] [varchar] (50) NULL ) ON [PRIMARY] diff --git a/phpBB/db/schemas/mysql_basic.sql b/phpBB/db/schemas/mysql_basic.sql index 4e9da5af7e..77550ca3aa 100644 --- a/phpBB/db/schemas/mysql_basic.sql +++ b/phpBB/db/schemas/mysql_basic.sql @@ -71,7 +71,7 @@ INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_passw # -- Ranks -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, -1, 1, NULL); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, 1, NULL); # -- Groups diff --git a/phpBB/db/schemas/mysql_schema.sql b/phpBB/db/schemas/mysql_schema.sql index 719f6ce083..5e49ee5426 100644 --- a/phpBB/db/schemas/mysql_schema.sql +++ b/phpBB/db/schemas/mysql_schema.sql @@ -231,7 +231,6 @@ CREATE TABLE phpbb_ranks ( rank_id smallint(5) UNSIGNED NOT NULL auto_increment, rank_title varchar(50) NOT NULL, rank_min mediumint(8) DEFAULT '0' NOT NULL, - rank_max mediumint(8) DEFAULT '0' NOT NULL, rank_special tinyint(1) DEFAULT '0', rank_image varchar(255), PRIMARY KEY (rank_id) diff --git a/phpBB/db/schemas/oracle_basic.sql b/phpBB/db/schemas/oracle_basic.sql index bc951a6297..384f60b78f 100644 --- a/phpBB/db/schemas/oracle_basic.sql +++ b/phpBB/db/schemas/oracle_basic.sql @@ -70,11 +70,11 @@ INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_passw -- Ranks -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '-1', '1', ''); -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '2', 'Newbie', '0', '9', '0', ''); -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '5', 'Here Often', '10', '49', '0', ''); -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '6', 'Should Get Out More', '50', '199', '0', ''); -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( '7', 'Has No Life', '200', '9999', '0', ''); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '1', ''); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '2', 'Newbie', '0', '0', ''); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '5', 'Here Often', '10', '0', ''); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '6', 'Should Get Out More', '50', '0', ''); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '7', 'Has No Life', '200', '0', ''); -- Groups diff --git a/phpBB/db/schemas/oracle_schema.sql b/phpBB/db/schemas/oracle_schema.sql index 8f68aab9ca..9894cbaef7 100644 --- a/phpBB/db/schemas/oracle_schema.sql +++ b/phpBB/db/schemas/oracle_schema.sql @@ -259,7 +259,6 @@ CREATE TABLE phpbb_ranks ( rank_id number(4) NOT NULL, rank_title varchar(50) DEFAULT '' NOT NULL, rank_min number(4) DEFAULT '0' NOT NULL, - rank_max number(4) DEFAULT '0' NOT NULL, rank_special number(4) DEFAULT '0', rank_image varchar(255), CONSTRAINT phpbb_ranks_pkey PRIMARY KEY (rank_id) diff --git a/phpBB/db/schemas/postgres_basic.sql b/phpBB/db/schemas/postgres_basic.sql index bcc49cc03b..11d171bc6e 100644 --- a/phpBB/db/schemas/postgres_basic.sql +++ b/phpBB/db/schemas/postgres_basic.sql @@ -71,7 +71,7 @@ INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_passw -- Ranks -INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_max, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, -1, 1, NULL); +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, 1, NULL); -- Groups diff --git a/phpBB/db/schemas/postgres_schema.sql b/phpBB/db/schemas/postgres_schema.sql index cea66b3204..6f0b6a61ac 100644 --- a/phpBB/db/schemas/postgres_schema.sql +++ b/phpBB/db/schemas/postgres_schema.sql @@ -226,7 +226,6 @@ CREATE TABLE phpbb_ranks ( rank_id int4 DEFAULT nextval('phpbb_ranks_id_seq'::text) NOT NULL, rank_title varchar(50) DEFAULT '' NOT NULL, rank_min int4 DEFAULT '0' NOT NULL, - rank_max int4 DEFAULT '0' NOT NULL, rank_special int2 DEFAULT '0', rank_image varchar(255), CONSTRAINT phpbb_ranks_pkey PRIMARY KEY (rank_id)