makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

oops?

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6106 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-06-20 00:21:16 +00:00
parent 9b0d2143bb
commit c125ae1276
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/includes/acp/acp_database.php
View file

@ -23,7 +23,7 @@ class acp_database
$user->add_lang('acp/database'); $user->add_lang('acp/database');
$this->tpl_name = 'acp_database'; $this->tpl_name = 'acp_database';
$this->page_title = 'ACP_DATABasE'; $this->page_title = 'ACP_DATABASE';
$action = request_var('action', ''); $action = request_var('action', '');
$submit = (isset($_POST['submit'])) ? true : false; $submit = (isset($_POST['submit'])) ? true : false;
@ -42,16 +42,16 @@ class acp_database
$type = request_var('type', ''); $type = request_var('type', '');
$table = request_var('table', array('')); $table = request_var('table', array(''));
$format = request_var('method', ''); $format = request_var('method', '');
$WHERE = request_var('WHERE', ''); $where = request_var('WHERE', '');
$store = $download = $structure = $schema_data = false; $store = $download = $structure = $schema_data = false;
if ($WHERE == 'store_and_download' || $WHERE == 'store') if ($where == 'store_and_download' || $where == 'store')
{ {
$store = true; $store = true;
} }
if ($WHERE == 'store_and_download' || $WHERE == 'download') if ($where == 'store_and_download' || $where == 'download')
{ {
$download = true; $download = true;
} }
@ -418,7 +418,7 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
// Grab all of the data FROM current table. // Grab all of the data from current table.
$sql = "SELECT * $sql = "SELECT *
FROM {$table_name}"; FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -539,7 +539,7 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
$ident_set = false; $ident_set = false;
// Grab all of the data FROM current table. // Grab all of the data from current table.
$sql = "SELECT * $sql = "SELECT *
FROM {$table_name}"; FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -650,7 +650,7 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
$ident_set = false; $ident_set = false;
// Grab all of the data FROM current table. // Grab all of the data from current table.
$sql = "SELECT * $sql = "SELECT *
FROM {$table_name}"; FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -761,7 +761,7 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
// Grab all of the data FROM current table. // Grab all of the data from current table.
$sql = "SELECT * $sql = "SELECT *
FROM {$table_name}"; FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -846,7 +846,7 @@ class acp_database
case 'oracle': case 'oracle':
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
// Grab all of the data FROM current table. // Grab all of the data from current table.
$sql = "SELECT * $sql = "SELECT *
FROM {$table_name}"; FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -1020,7 +1020,7 @@ class acp_database
case 'mssql_odbc': case 'mssql_odbc':
$sql = "SELECT TABLE_NAME $sql = "SELECT TABLE_NAME
FROM INFORMATION_SCHEMA.TABLES FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BasE TABLE' WHERE TABLE_TYPE = 'BASE TABLE'
ORDER BY TABLE_NAME"; ORDER BY TABLE_NAME";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -1438,7 +1438,7 @@ class acp_database
$lines = array(); $lines = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
// Get the data FROM the table // Get the data from the table
$sql_get_default = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault $sql_get_default = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault
FROM pg_attrdef d, pg_class c FROM pg_attrdef d, pg_class c
WHERE (c.relname = '" . $db->sql_escape($table_name) . "') WHERE (c.relname = '" . $db->sql_escape($table_name) . "')
@ -1807,7 +1807,7 @@ class acp_database
$sql_data .= "\nCREATE GENERATOR " . $gen_name . ";;"; $sql_data .= "\nCREATE GENERATOR " . $gen_name . ";;";
$sql_data .= "\nSET GENERATOR " . $gen_name . " TO 0;;\n"; $sql_data .= "\nSET GENERATOR " . $gen_name . " TO 0;;\n";
$sql_data .= "\nCREATE TRIGGER {$row['dname']} FOR $table_name"; $sql_data .= "\nCREATE TRIGGER {$row['dname']} FOR $table_name";
$sql_data .= "\nBEFORE INSERT\nas\nBEGIN"; $sql_data .= "\nBEFORE INSERT\nAS\nBEGIN";
$sql_data .= "\n NEW.{$row['fname']} = GEN_ID(" . $gen_name . ", 1);"; $sql_data .= "\n NEW.{$row['fname']} = GEN_ID(" . $gen_name . ", 1);";
$sql_data .= "\nEND;;\n"; $sql_data .= "\nEND;;\n";
} }

2
phpBB/includes/message_parser.php
View file

@ -97,7 +97,7 @@ class bbcode_firstpass extends bbcode
'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")), 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](https?://)([a-z0-9\-\.,\?!%\*_:;~\\&$@/=\+]+)\[/img\]#ie' => "\$this->bbcode_img('\$1\$2')")), 'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](https?://)([a-z0-9\-\.,\?!%\*_:;~\\&$@/=\+]+)\[/img\]#ie' => "\$this->bbcode_img('\$1\$2')")),
'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?[1-2]?[0-9])\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")), 'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?[1-2]?[0-9])\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")), 'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9A-Fa-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
'u' => array('bbcode_id' => 7, 'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")), 'u' => array('bbcode_id' => 7, 'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")),
'list' => array('bbcode_id' => 9, 'regexp' => array('#\[list(=[a-z|0-9|(?:disc|circle|square))]+)?\].*\[/list\]#ise' => "\$this->bbcode_parse_list('\$0')")), 'list' => array('bbcode_id' => 9, 'regexp' => array('#\[list(=[a-z|0-9|(?:disc|circle|square))]+)?\].*\[/list\]#ise' => "\$this->bbcode_parse_list('\$0')")),
'email' => array('bbcode_id' => 10, 'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")), 'email' => array('bbcode_id' => 10, 'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")),