mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 21:54:00 +02:00
Code Issues Releases Wiki Activity

- first try to break things...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5108 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2005-03-21 22:43:07 +00:00
parent 68b7397da8
commit a4e51c9699
32 changed files with 260 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/install/install.php
View File

@@ -621,7 +621,7 @@ if ($stage == 1)
// Generate list of available DB's
$dbms_options = '';
foreach($available_dbms as $dbms_name => $details)
foreach ($available_dbms as $dbms_name => $details)
{
$selected = ($dbms_name == $dbms) ? ' selected="selected"' : '';
$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $details['LABEL'] . '</option>';

22
phpBB/install/schemas/firebird_schema.sql
View File

@@ -528,13 +528,13 @@ CREATE TABLE phpbb_sitelist (
# phpbb_smilies
CREATE TABLE phpbb_smilies (
smile_id INTEGER NOT NULL,
smiley_id INTEGER NOT NULL,
code VARCHAR(10),
emoticon VARCHAR(50),
smile_url VARCHAR(50),
smile_width INTEGER DEFAULT 0 NOT NULL,
smile_height INTEGER DEFAULT 0 NOT NULL,
smile_order INTEGER DEFAULT 0 NOT NULL,
smiley VARCHAR(50),
smiley_url VARCHAR(50),
smiley_width INTEGER DEFAULT 0 NOT NULL,
smiley_height INTEGER DEFAULT 0 NOT NULL,
smiley_order INTEGER DEFAULT 0 NOT NULL,
display_on_posting INTEGER DEFAULT 1 NOT NULL
);;
@@ -1275,7 +1275,7 @@ ADD PRIMARY KEY (
ALTER TABLE phpbb_smilies
ADD PRIMARY KEY (
smile_id
smiley_id
);;
ALTER TABLE phpbb_styles
@@ -1530,9 +1530,9 @@ CREATE GENERATOR G_phpbb_sitelistsite_idGen24;;
SET GENERATOR G_phpbb_sitelistsite_idGen24 TO 0;;
CREATE GENERATOR G_phpbb_smiliessmile_idGen25;;
CREATE GENERATOR G_phpbb_smiliessmiley_idGen25;;
SET GENERATOR G_phpbb_smiliessmile_idGen25 TO 0;;
SET GENERATOR G_phpbb_smiliessmiley_idGen25 TO 0;;
CREATE GENERATOR G_phpbb_stylesstyle_idGen26;;
@@ -1737,11 +1737,11 @@ BEGIN
NEW.site_id = GEN_ID(G_phpbb_sitelistsite_idGen24, 1);
END;;
CREATE TRIGGER NextG_phpbb_smiliessmile_idGen2 FOR phpbb_smilies
CREATE TRIGGER NextG_phpbb_smiliessmiley_idGen2 FOR phpbb_smilies
BEFORE INSERT
AS
BEGIN
NEW.smile_id = GEN_ID(G_phpbb_smiliessmile_idGen25, 1);
NEW.smiley_id = GEN_ID(G_phpbb_smiliessmiley_idGen25, 1);
END;;
CREATE TRIGGER tNextG_phpbb_stylesstyle_idGen2 FOR phpbb_styles

20
phpBB/install/schemas/mssql_schema.sql
View File

@@ -533,13 +533,13 @@ CREATE TABLE [phpbb_sitelist] (
GO
CREATE TABLE [phpbb_smilies] (
[smile_id] [int] IDENTITY (1, 1) NOT NULL ,
[smiley_id] [int] IDENTITY (1, 1) NOT NULL ,
[code] [varchar] (10) NULL ,
[emoticon] [varchar] (50) NULL ,
[smile_url] [varchar] (50) NULL ,
[smile_width] [int] NOT NULL ,
[smile_height] [int] NOT NULL ,
[smile_order] [int] NOT NULL ,
[smiley] [varchar] (50) NULL ,
[smiley_url] [varchar] (50) NULL ,
[smiley_width] [int] NOT NULL ,
[smiley_height] [int] NOT NULL ,
[smiley_order] [int] NOT NULL ,
[display_on_posting] [int] NOT NULL
) ON [PRIMARY]
GO
@@ -1073,7 +1073,7 @@ GO
ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY CLUSTERED
(
[smile_id]
[smiley_id]
) ON [PRIMARY]
GO
@@ -1463,9 +1463,9 @@ ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD
GO
ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD
CONSTRAINT [DF_smilie_smile_width] DEFAULT (0) FOR [smile_width],
CONSTRAINT [DF_smilie_smile_height] DEFAULT (0) FOR [smile_height],
CONSTRAINT [DF_smilie_smile_order] DEFAULT (0) FOR [smile_order],
CONSTRAINT [DF_smilie_smiley_width] DEFAULT (0) FOR [smiley_width],
CONSTRAINT [DF_smilie_smiley_height] DEFAULT (0) FOR [smiley_height],
CONSTRAINT [DF_smilie_smiley_order] DEFAULT (0) FOR [smiley_order],
CONSTRAINT [DF_smilie_display_on_posting] DEFAULT (1) FOR [display_on_posting]
GO

14
phpBB/install/schemas/mysql_schema.sql
View File

@@ -622,15 +622,15 @@ CREATE TABLE phpbb_sitelist (
# Table: 'phpbb_smilies'
CREATE TABLE phpbb_smilies (
smile_id tinyint(4) UNSIGNED NOT NULL auto_increment,
smiley_id tinyint(4) UNSIGNED NOT NULL auto_increment,
code char(10),
emoticon char(50),
smile_url char(50),
smile_width tinyint(4) UNSIGNED NOT NULL,
smile_height tinyint(4) UNSIGNED NOT NULL,
smile_order tinyint(4) UNSIGNED NOT NULL,
smiley char(50),
smiley_url char(50),
smiley_width tinyint(4) UNSIGNED NOT NULL,
smiley_height tinyint(4) UNSIGNED NOT NULL,
smiley_order tinyint(4) UNSIGNED NOT NULL,
display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
PRIMARY KEY (smile_id)
PRIMARY KEY (smiley_id)
);
# Table: 'phpbb_styles'

24
phpBB/install/schemas/postgres_schema.sql
View File

@@ -847,25 +847,25 @@ CREATE TABLE phpbb_sitelist (
SELECT SETVAL('phpbb_sitelist_site_id_seq',(select case when max(site_id)>0 then max(site_id)+1 else 1 end from phpbb_sitelist));
/* Table: phpbb_smilies */
CREATE SEQUENCE phpbb_smilies_smile_id_seq;
CREATE SEQUENCE phpbb_smilies_smiley_id_seq;
CREATE TABLE phpbb_smilies (
smile_id INT2 DEFAULT nextval('phpbb_smilies_smile_id_seq'),
smiley_id INT2 DEFAULT nextval('phpbb_smilies_smiley_id_seq'),
code char(10),
emoticon char(50),
smile_url char(50),
smile_width INT2 NOT NULL,
smile_height INT2 NOT NULL,
smile_order INT2 NOT NULL,
smiley char(50),
smiley_url char(50),
smiley_width INT2 NOT NULL,
smiley_height INT2 NOT NULL,
smiley_order INT2 NOT NULL,
display_on_posting INT2 DEFAULT '1' NOT NULL,
PRIMARY KEY (smile_id),
CHECK (smile_width>=0),
CHECK (smile_height>=0),
CHECK (smile_order>=0),
PRIMARY KEY (smiley_id),
CHECK (smiley_width>=0),
CHECK (smiley_height>=0),
CHECK (smiley_order>=0),
CHECK (display_on_posting>=0)
);
SELECT SETVAL('phpbb_smilies_smile_id_seq',(select case when max(smile_id)>0 then max(smile_id)+1 else 1 end from phpbb_smilies));
SELECT SETVAL('phpbb_smilies_smiley_id_seq',(select case when max(smiley_id)>0 then max(smiley_id)+1 else 1 end from phpbb_smilies));
/* Table: phpbb_styles */
CREATE SEQUENCE phpbb_styles_style_id_seq;

62
phpBB/install/schemas/schema_data.sql
View File

@@ -55,10 +55,11 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','
INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars/upload');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smilies');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','images/icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path','images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path','images/ranks');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
@@ -146,7 +147,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_dir', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
@@ -496,42 +496,42 @@ INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post
# -- Smilies
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':(', 'icon_sad.gif', 'Sad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':o', 'icon_surprised.gif', 'Surprised', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':eek:', 'icon_surprised.gif', 'Surprised', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES ('8O', 'icon_eek.gif', 'Shocked', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':?', 'icon_confused.gif', 'Confused', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES ('8)', 'icon_cool.gif', 'Cool', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':lol:', 'icon_lol.gif', 'Laughing', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':x', 'icon_mad.gif', 'Mad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':roll:', 'icon_rolleyes.gif', 'Rolling Eyes', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (';)', 'icon_wink.gif', 'Wink', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':!:', 'icon_exclaim.gif', 'Exclamation', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':?:', 'icon_question.gif', 'Question', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':idea:', 'icon_idea.gif', 'Idea', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':arrow:', 'icon_arrow.gif', 'Arrow', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':|', 'icon_neutral.gif', 'Neutral', 15, 15);
INSERT INTO phpbb_smilies (code, smile_url, emoticon, smile_width, smile_height) VALUES (':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':(', 'icon_sad.gif', 'Sad', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':o', 'icon_surprised.gif', 'Surprised', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':eek:', 'icon_surprised.gif', 'Surprised', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES ('8O', 'icon_eek.gif', 'Shocked', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':?', 'icon_confused.gif', 'Confused', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES ('8)', 'icon_cool.gif', 'Cool', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':lol:', 'icon_lol.gif', 'Laughing', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':x', 'icon_mad.gif', 'Mad', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':roll:', 'icon_rolleyes.gif', 'Rolling Eyes', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (';)', 'icon_wink.gif', 'Wink', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':!:', 'icon_exclaim.gif', 'Exclamation', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':?:', 'icon_question.gif', 'Question', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':idea:', 'icon_idea.gif', 'Idea', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':arrow:', 'icon_arrow.gif', 'Arrow', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':|', 'icon_neutral.gif', 'Neutral', 15, 15);
INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green', 15, 15);
# -- icons ... these are just some of those in CVS
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/arrow_bold_rgt.gif', 19, 19, 1, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface_anim.gif', 19, 19, 9, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mr_green.gif', 19, 19, 10, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/redface_anim.gif', 19, 19, 9, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/mr_green.gif', 19, 19, 10, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/musical.gif', 19, 19, 4, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/asterix.gif', 19, 19, 2, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/square.gif', 19, 19, 3, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alien_grn.gif', 19, 19, 5, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/idea.gif', 19, 19, 8, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.gif', 19, 19, 6, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/exclaim.gif', 19, 19, 7, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/alien_grn.gif', 19, 19, 5, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/idea.gif', 19, 19, 8, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/question.gif', 19, 19, 6, 1);
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smilies/exclaim.gif', 19, 19, 7, 1);
# MSSQL IDENTITY phpbb_search_wordlist ON #