forgot a few things

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8708 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-07-29 12:36:07 +00:00
parent 7997796789
commit 86dddd43b6
8 changed files with 28 additions and 15 deletions

View file

@ -75,20 +75,19 @@ if (isset($_GET['avatar']))
} }
if ($exit) if (!$exit)
{ {
file_gc(); if (!$filename)
} {
// no way such an avatar could exist. They are not following the rules, stop the show.
if (!$filename) header("HTTP/1.0 403 Forbidden");
{ }
// no way such an avatar could exist. They are not following the rules, stop the show. else
header("HTTP/1.0 403 Forbidden"); {
} send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
else }
{
send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
} }
file_gc();
} }
// implicit else: we are not in avatar mode // implicit else: we are not in avatar mode

View file

@ -1076,7 +1076,9 @@ CREATE TABLE phpbb_styles_template (
template_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, template_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
template_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, template_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL, bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL,
template_storedb INTEGER DEFAULT 0 NOT NULL template_storedb INTEGER DEFAULT 0 NOT NULL,
template_inherits_id INTEGER DEFAULT 0 NOT NULL,
template_inherit_path VARCHAR(255) CHARACTER SET NONE NOT NULL
);; );;
ALTER TABLE phpbb_styles_template ADD PRIMARY KEY (template_id);; ALTER TABLE phpbb_styles_template ADD PRIMARY KEY (template_id);;

View file

@ -1295,7 +1295,9 @@ CREATE TABLE [phpbb_styles_template] (
[template_copyright] [varchar] (255) DEFAULT ('') NOT NULL , [template_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
[template_path] [varchar] (100) DEFAULT ('') NOT NULL , [template_path] [varchar] (100) DEFAULT ('') NOT NULL ,
[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL , [bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
[template_storedb] [int] DEFAULT (0) NOT NULL [template_storedb] [int] DEFAULT (0) NOT NULL ,
[template_inherits_id] [int] DEFAULT (0) NOT NULL ,
[template_inherit_path] [varchar] (255) NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO

View file

@ -739,6 +739,8 @@ CREATE TABLE phpbb_styles_template (
template_path varbinary(100) DEFAULT '' NOT NULL, template_path varbinary(100) DEFAULT '' NOT NULL,
bbcode_bitfield varbinary(255) DEFAULT 'kNg=' NOT NULL, bbcode_bitfield varbinary(255) DEFAULT 'kNg=' NOT NULL,
template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
template_inherit_path varbinary(255) NOT NULL,
PRIMARY KEY (template_id), PRIMARY KEY (template_id),
UNIQUE tmplte_nm (template_name(255)) UNIQUE tmplte_nm (template_name(255))
); );

View file

@ -739,6 +739,8 @@ CREATE TABLE phpbb_styles_template (
template_path varchar(100) DEFAULT '' NOT NULL, template_path varchar(100) DEFAULT '' NOT NULL,
bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL, bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
template_inherit_path varchar(255) NOT NULL,
PRIMARY KEY (template_id), PRIMARY KEY (template_id),
UNIQUE tmplte_nm (template_name) UNIQUE tmplte_nm (template_name)
) CHARACTER SET `utf8` COLLATE `utf8_bin`; ) CHARACTER SET `utf8` COLLATE `utf8_bin`;

View file

@ -1431,6 +1431,8 @@ CREATE TABLE phpbb_styles_template (
template_path varchar2(100) DEFAULT '' , template_path varchar2(100) DEFAULT '' ,
bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL, bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL,
template_storedb number(1) DEFAULT '0' NOT NULL, template_storedb number(1) DEFAULT '0' NOT NULL,
template_inherits_id number(4) DEFAULT '0' NOT NULL,
template_inherit_path varchar2(255) NOT NULL,
CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id), CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id),
CONSTRAINT u_phpbb_tmplte_nm UNIQUE (template_name) CONSTRAINT u_phpbb_tmplte_nm UNIQUE (template_name)
) )

View file

@ -972,6 +972,8 @@ CREATE TABLE phpbb_styles_template (
template_path varchar(100) DEFAULT '' NOT NULL, template_path varchar(100) DEFAULT '' NOT NULL,
bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL, bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
template_storedb INT2 DEFAULT '0' NOT NULL CHECK (template_storedb >= 0), template_storedb INT2 DEFAULT '0' NOT NULL CHECK (template_storedb >= 0),
template_inherits_id INT4 DEFAULT '0' NOT NULL CHECK (template_inherits_id >= 0),
template_inherit_path varchar(255) NOT NULL,
PRIMARY KEY (template_id) PRIMARY KEY (template_id)
); );

View file

@ -713,7 +713,9 @@ CREATE TABLE phpbb_styles_template (
template_copyright varchar(255) NOT NULL DEFAULT '', template_copyright varchar(255) NOT NULL DEFAULT '',
template_path varchar(100) NOT NULL DEFAULT '', template_path varchar(100) NOT NULL DEFAULT '',
bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=', bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=',
template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0' template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0',
template_inherits_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
template_inherit_path varchar(255) NOT NULL
); );
CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name); CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);