From a0984175145b99e3c10140c500ecbf7a66713be9 Mon Sep 17 00:00:00 2001 From: David M Date: Fri, 10 Nov 2006 14:56:18 +0000 Subject: - cleaned up firebirdsql - cleaned up install git-svn-id: file:///svn/phpbb/trunk@6563 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/firebird.php | 2 +- phpBB/install/install_install.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 82ff453a4c..7fd034c7dc 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -207,7 +207,7 @@ class dbal_firebird extends dbal foreach (get_object_vars($cur_row) as $key => $value) { - $row[strtolower($key)] = trim(str_replace("\\0", "\0", str_replace("\\n", "\n", $value))); + $row[strtolower($key)] = trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)); } return (sizeof($row)) ? $row : false; diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index ec1e4d776e..bae24122cd 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1074,7 +1074,7 @@ class install_install extends module // Set default config and post data, this applies to all DB's $sql_ary = array( 'INSERT INTO ' . $table_prefix . "config (config_name, config_value) - VALUES ('board_startdate', $current_time)", + VALUES ('board_startdate', '$current_time')", 'INSERT INTO ' . $table_prefix . "config (config_name, config_value) VALUES ('default_lang', '" . $db->sql_escape($default_lang) . "')", @@ -1156,7 +1156,7 @@ class install_install extends module WHERE config_name = 'newest_username'", 'UPDATE ' . $table_prefix . "users - SET username = '" . $db->sql_escape($admin_name) . "', user_password='" . $db->sql_escape(md5($admin_pass1)) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($default_lang) . "', user_email='" . $db->sql_escape($board_email1) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = '" . (int) (crc32(strtolower($board_email1)) . strlen($board_email1)) . "', username_clean = '" . $db->sql_escape(utf8_clean_string($admin_name)) . "' + SET username = '" . $db->sql_escape($admin_name) . "', user_password='" . $db->sql_escape(md5($admin_pass1)) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($default_lang) . "', user_email='" . $db->sql_escape($board_email1) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (int) (crc32(strtolower($board_email1)) . strlen($board_email1)) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($admin_name)) . "' WHERE username = 'Admin'", 'UPDATE ' . $table_prefix . "moderator_cache @@ -1768,7 +1768,8 @@ class install_install extends module break; case 'oracle': - $sql = 'SELECT table_name FROM USER_TABLES'; + $sql = 'SELECT table_name + FROM USER_TABLES'; $field = 'table_name'; break; } @@ -2017,7 +2018,7 @@ class install_install extends module 'MODULE' => 'oci8', 'DELIM' => '/', 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'oci8' + 'DRIVER' => 'oracle' ), 'postgres' => array( 'LABEL' => 'PostgreSQL 7.x/8.x', -- cgit v1.2.1