mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-04 22:58:10 +02:00
some changes before i forget...
git-svn-id: file:///svn/phpbb/trunk@5916 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
501aa7bde7
commit
d52e31a489
@ -9,8 +9,9 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* todo:
|
||||
* templates->cache (show template files in cache)
|
||||
* @todo see /includes/acp/acp_styles.php
|
||||
* templates/themes->cache (show template files in cache, ability to remove all)
|
||||
* templates/themes->refresh (give explanation of what this is doing [confirm_box?] and printing out success message
|
||||
*/
|
||||
|
||||
/**
|
||||
|
@ -492,7 +492,7 @@ class template_compile
|
||||
$match[4] = strtoupper($match[4]);
|
||||
break;
|
||||
|
||||
case '.';
|
||||
case '.':
|
||||
$match[4] = doubleval($match[4]);
|
||||
break;
|
||||
|
||||
|
@ -179,8 +179,8 @@ class ucp_groups
|
||||
'USERNAME' => $row['username'],
|
||||
'GROUP_NAME' => $group_row[$group_id]['group_name'],
|
||||
|
||||
'U_PENDING' => generate_board_url() . "/ucp.$phpEx?i=usergroups&mode=manage",
|
||||
'U_GROUP' => generate_board_url() . "/memberlist.$phpEx?mode=group&g=$group_id")
|
||||
'U_PENDING' => generate_board_url() . "/ucp.$phpEx?i=usergroups&mode=manage",
|
||||
'U_GROUP' => generate_board_url() . "/memberlist.$phpEx?mode=group&g=$group_id")
|
||||
);
|
||||
|
||||
$messenger->send($row['user_notify_type']);
|
||||
|
@ -24,7 +24,7 @@ class ucp_register
|
||||
{
|
||||
trigger_error($user->lang['UCP_REGISTER_DISABLE']);
|
||||
}
|
||||
$config['max_reg_attempts'] = 0;
|
||||
|
||||
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
|
||||
|
||||
$confirm_id = request_var('confirm_id', '');
|
||||
|
@ -656,25 +656,25 @@ CREATE TABLE phpbb_privmsgs (
|
||||
msg_id INTEGER NOT NULL,
|
||||
root_level INTEGER DEFAULT 0 NOT NULL,
|
||||
author_id INTEGER DEFAULT 0 NOT NULL,
|
||||
icon_id INTEGER DEFAULT 1 NOT NULL,
|
||||
icon_id INTEGER DEFAULT 0 NOT NULL,
|
||||
author_ip VARCHAR(40) NOT NULL,
|
||||
message_time INTEGER DEFAULT 0 NOT NULL,
|
||||
enable_bbcode INTEGER DEFAULT 1 NOT NULL,
|
||||
enable_smilies INTEGER DEFAULT 1 NOT NULL,
|
||||
enable_magic_url INTEGER DEFAULT 1 NOT NULL,
|
||||
enable_sig INTEGER DEFAULT 1 NOT NULL,
|
||||
message_subject BLOB SUB_TYPE TEXT,
|
||||
message_text BLOB SUB_TYPE TEXT,
|
||||
message_edit_reason BLOB SUB_TYPE TEXT,
|
||||
message_edit_user INTEGER DEFAULT 0 NOT NULL,
|
||||
message_subject BLOB SUB_TYPE TEXT NOT NULL,
|
||||
message_text BLOB SUB_TYPE TEXT NOT NULL,
|
||||
message_edit_reason BLOB SUB_TYPE TEXT NULL,
|
||||
message_edit_user INTEGER DEFAULT 0 NULL,
|
||||
message_encoding VARCHAR(20) DEFAULT 'iso-8859-1' NOT NULL,
|
||||
message_attachment INTEGER DEFAULT 0 NOT NULL,
|
||||
bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
|
||||
bbcode_uid VARCHAR(5) NOT NULL,
|
||||
message_edit_time INTEGER DEFAULT 0 NOT NULL,
|
||||
message_edit_count INTEGER DEFAULT 0 NOT NULL,
|
||||
to_address BLOB SUB_TYPE TEXT,
|
||||
bcc_address BLOB SUB_TYPE TEXT
|
||||
message_edit_time INTEGER DEFAULT 0 NULL,
|
||||
message_edit_count INTEGER DEFAULT 0 NULL,
|
||||
to_address BLOB SUB_TYPE TEXT NOT NULL,
|
||||
bcc_address BLOB SUB_TYPE TEXT NOT NULL
|
||||
);;
|
||||
|
||||
ALTER TABLE phpbb_privmsgs ADD PRIMARY KEY (msg_id);;
|
||||
|
@ -1010,18 +1010,18 @@ CREATE TABLE [phpbb_privmsgs] (
|
||||
[enable_smilies] [int] NOT NULL ,
|
||||
[enable_magic_url] [int] NOT NULL ,
|
||||
[enable_sig] [int] NOT NULL ,
|
||||
[message_subject] [text] ,
|
||||
[message_text] [text] ,
|
||||
[message_edit_reason] [text] ,
|
||||
[message_edit_user] [int] NOT NULL ,
|
||||
[message_subject] [text] NOT NULL ,
|
||||
[message_text] [text] NOT NULL ,
|
||||
[message_edit_reason] [text] NULL ,
|
||||
[message_edit_user] [int] NULL ,
|
||||
[message_encoding] [varchar] (20) NOT NULL ,
|
||||
[message_attachment] [int] NOT NULL ,
|
||||
[bbcode_bitfield] [int] NOT NULL ,
|
||||
[bbcode_uid] [varchar] (5) NOT NULL ,
|
||||
[message_edit_time] [int] NOT NULL ,
|
||||
[message_edit_count] [int] NOT NULL ,
|
||||
[to_address] [text] NULL ,
|
||||
[bcc_address] [text] NULL
|
||||
[message_edit_time] [int] NULL ,
|
||||
[message_edit_count] [int] NULL ,
|
||||
[to_address] [text] NOT NULL ,
|
||||
[bcc_address] [text] NOT NULL
|
||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||
GO
|
||||
|
||||
@ -1035,7 +1035,7 @@ GO
|
||||
ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD
|
||||
CONSTRAINT [DF_phpbb_privms_root_level] DEFAULT (0) FOR [root_level],
|
||||
CONSTRAINT [DF_phpbb_privms_author_id] DEFAULT (0) FOR [author_id],
|
||||
CONSTRAINT [DF_phpbb_privms_icon_id] DEFAULT (1) FOR [icon_id],
|
||||
CONSTRAINT [DF_phpbb_privms_icon_id] DEFAULT (0) FOR [icon_id],
|
||||
CONSTRAINT [DF_phpbb_privms_message_time] DEFAULT (0) FOR [message_time],
|
||||
CONSTRAINT [DF_phpbb_privms_enable_bbcode] DEFAULT (1) FOR [enable_bbcode],
|
||||
CONSTRAINT [DF_phpbb_privms_enable_smilies] DEFAULT (1) FOR [enable_smilies],
|
||||
|
@ -428,25 +428,25 @@ CREATE TABLE phpbb_privmsgs (
|
||||
msg_id mediumint(8) UNSIGNED NOT NULL auto_increment,
|
||||
root_level mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
author_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
icon_id tinyint(4) UNSIGNED DEFAULT '1' NOT NULL,
|
||||
icon_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
author_ip varchar(40) DEFAULT '' NOT NULL,
|
||||
message_time int(11) DEFAULT '0' NOT NULL,
|
||||
enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
|
||||
enable_smilies tinyint(1) DEFAULT '1' NOT NULL,
|
||||
enable_magic_url tinyint(1) DEFAULT '1' NOT NULL,
|
||||
enable_sig tinyint(1) DEFAULT '1' NOT NULL,
|
||||
message_subject text,
|
||||
message_text mediumtext,
|
||||
message_edit_reason text,
|
||||
message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
message_subject text NOT NULL,
|
||||
message_text mediumtext NOT NULL,
|
||||
message_edit_reason text NULL,
|
||||
message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NULL,
|
||||
message_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
|
||||
message_attachment tinyint(1) DEFAULT '0' NOT NULL,
|
||||
bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
bbcode_uid varchar(5) DEFAULT '' NOT NULL,
|
||||
message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
message_edit_count smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
|
||||
to_address text,
|
||||
bcc_address text,
|
||||
message_edit_time int(11) UNSIGNED DEFAULT '0' NULL,
|
||||
message_edit_count smallint(5) UNSIGNED DEFAULT '0' NULL,
|
||||
to_address text NOT NULL,
|
||||
bcc_address text NOT NULL,
|
||||
PRIMARY KEY (msg_id),
|
||||
KEY author_ip (author_ip),
|
||||
KEY message_time (message_time),
|
||||
|
@ -889,25 +889,25 @@ CREATE TABLE phpbb_privmsgs (
|
||||
msg_id number(8) NOT NULL,
|
||||
root_level number(8) DEFAULT '0' NOT NULL,
|
||||
author_id number(8) DEFAULT '0' NOT NULL,
|
||||
icon_id number(4) DEFAULT '1' NOT NULL,
|
||||
author_ip varchar2(40) DEFAULT '',
|
||||
icon_id number(4) DEFAULT '0' NOT NULL,
|
||||
author_ip varchar2(40) DEFAULT '' NOT NULL,
|
||||
message_time number(11) DEFAULT '0' NOT NULL,
|
||||
enable_bbcode number(1) DEFAULT '1' NOT NULL,
|
||||
enable_smilies number(1) DEFAULT '1' NOT NULL,
|
||||
enable_magic_url number(1) DEFAULT '1' NOT NULL,
|
||||
enable_sig number(1) DEFAULT '1' NOT NULL,
|
||||
message_subject varchar2(1000),
|
||||
message_text clob,
|
||||
message_edit_reason varchar2(1000),
|
||||
message_edit_user number(8) DEFAULT '0' NOT NULL,
|
||||
message_encoding varchar2(20) DEFAULT 'iso-8859-1',
|
||||
message_subject varchar2(1000) NOT NULL,
|
||||
message_text clob NOT NULL,
|
||||
message_edit_reason varchar2(1000) NULL,
|
||||
message_edit_user number(8) DEFAULT '0' NULL,
|
||||
message_encoding varchar2(20) DEFAULT 'iso-8859-1' NOT NULL,
|
||||
message_attachment number(1) DEFAULT '0' NOT NULL,
|
||||
bbcode_bitfield number(11) DEFAULT '0' NOT NULL,
|
||||
bbcode_uid varchar2(5) DEFAULT '',
|
||||
message_edit_time number(11) DEFAULT '0' NOT NULL,
|
||||
message_edit_count number(5) DEFAULT '0' NOT NULL,
|
||||
to_address clob,
|
||||
bcc_address clob,
|
||||
bbcode_uid varchar2(5) DEFAULT '' NOT NULL,
|
||||
message_edit_time number(11) DEFAULT '0' NULL,
|
||||
message_edit_count number(5) DEFAULT '0' NULL,
|
||||
to_address clob NOT NULL,
|
||||
bcc_address clob NOT NULL,
|
||||
CONSTRAINT pk_phpbb_privmsgs PRIMARY KEY (msg_id)
|
||||
)
|
||||
/
|
||||
|
@ -605,25 +605,25 @@ CREATE TABLE phpbb_privmsgs (
|
||||
msg_id INT4 DEFAULT nextval('phpbb_privmsgs_seq'),
|
||||
root_level INT4 DEFAULT '0' NOT NULL,
|
||||
author_id INT4 DEFAULT '0' NOT NULL,
|
||||
icon_id INT2 DEFAULT '1' NOT NULL,
|
||||
icon_id INT2 DEFAULT '0' NOT NULL,
|
||||
author_ip varchar(40) DEFAULT '' NOT NULL,
|
||||
message_time INT4 DEFAULT '0' NOT NULL,
|
||||
enable_bbcode INT2 DEFAULT '1' NOT NULL,
|
||||
enable_smilies INT2 DEFAULT '1' NOT NULL,
|
||||
enable_magic_url INT2 DEFAULT '1' NOT NULL,
|
||||
enable_sig INT2 DEFAULT '1' NOT NULL,
|
||||
message_subject TEXT,
|
||||
message_text TEXT,
|
||||
message_edit_reason TEXT,
|
||||
message_edit_user INT4 DEFAULT '0' NOT NULL,
|
||||
message_subject TEXT NOT NULL,
|
||||
message_text TEXT NOT NULL,
|
||||
message_edit_reason TEXT NULL,
|
||||
message_edit_user INT4 DEFAULT '0' NULL,
|
||||
message_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
|
||||
message_attachment INT2 DEFAULT '0' NOT NULL,
|
||||
bbcode_bitfield INT4 DEFAULT '0' NOT NULL,
|
||||
bbcode_uid varchar(5) DEFAULT '' NOT NULL,
|
||||
message_edit_time INT4 DEFAULT '0' NOT NULL,
|
||||
message_edit_count INT2 DEFAULT '0' NOT NULL,
|
||||
to_address TEXT,
|
||||
bcc_address TEXT,
|
||||
message_edit_time INT4 DEFAULT '0' NULL,
|
||||
message_edit_count INT2 DEFAULT '0' NULL,
|
||||
to_address TEXT NOT NULL,
|
||||
bcc_address TEXT NOT NULL,
|
||||
PRIMARY KEY (msg_id),
|
||||
CHECK (root_level>=0),
|
||||
CHECK (author_id>=0),
|
||||
|
@ -462,25 +462,25 @@ CREATE TABLE phpbb_privmsgs (
|
||||
msg_id INTEGER PRIMARY KEY NOT NULL,
|
||||
root_level mediumint(8) NOT NULL DEFAULT '0',
|
||||
author_id mediumint(8) NOT NULL DEFAULT '0',
|
||||
icon_id tinyint(4) NOT NULL DEFAULT '1',
|
||||
icon_id tinyint(4) NOT NULL DEFAULT '0',
|
||||
author_ip varchar(40) NOT NULL DEFAULT '',
|
||||
message_time int(11) NOT NULL DEFAULT '0',
|
||||
enable_bbcode tinyint(1) NOT NULL DEFAULT '1',
|
||||
enable_smilies tinyint(1) NOT NULL DEFAULT '1',
|
||||
enable_magic_url tinyint(1) NOT NULL DEFAULT '1',
|
||||
enable_sig tinyint(1) NOT NULL DEFAULT '1',
|
||||
message_subject text(65535),
|
||||
message_text mediumtext(16777215),
|
||||
message_edit_reason text(65535),
|
||||
message_edit_user mediumint(8) NOT NULL DEFAULT '0',
|
||||
message_subject text(65535) NOT NULL,
|
||||
message_text mediumtext(16777215) NOT NULL,
|
||||
message_edit_reason text(65535) NULL,
|
||||
message_edit_user mediumint(8) NULL DEFAULT '0',
|
||||
message_encoding varchar(20) NOT NULL DEFAULT 'iso-8859-1',
|
||||
message_attachment tinyint(1) NOT NULL DEFAULT '0',
|
||||
bbcode_bitfield int(11) NOT NULL DEFAULT '0',
|
||||
bbcode_uid varchar(5) NOT NULL DEFAULT '',
|
||||
message_edit_time int(11) NOT NULL DEFAULT '0',
|
||||
message_edit_count smallint(5) NOT NULL DEFAULT '0',
|
||||
to_address text(65535),
|
||||
bcc_address text(65535)
|
||||
message_edit_time int(11) NULL DEFAULT '0',
|
||||
message_edit_count smallint(5) NULL DEFAULT '0',
|
||||
to_address text(65535) NOT NULL,
|
||||
bcc_address text(65535) NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX phpbb_privmsgs_author_ip on phpbb_privmsgs (author_ip);
|
||||
|
Loading…
x
Reference in New Issue
Block a user