diff -r 0b7ff06aad13 -r f3a5a276208c includes/dbal.php --- a/includes/dbal.php Fri Mar 06 11:19:55 2009 -0500 +++ b/includes/dbal.php Sat Mar 14 14:06:02 2009 -0400 @@ -131,7 +131,7 @@ return $internal_text; } - function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false) + function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false, $dbport = false) { if ( !defined('ENANO_SQL_CONSTANTS') ) { @@ -153,9 +153,11 @@ { @include(ENANO_ROOT.'/config.php'); } - + if ( isset($crypto_key) ) unset($crypto_key); // Get this sucker out of memory fast + if ( empty($dbport) ) + $dbport = 3306; if ( !defined('ENANO_INSTALLED') && !defined('MIDGET_INSTALLED') && !defined('IN_ENANO_INSTALL') ) { @@ -188,7 +190,15 @@ } } - $this->_conn = @mysql_connect($dbhost, $dbuser, $dbpasswd); + if ( !$dbport ) + $dbport = 3306; + + if ( $dbhost && !empty($dbport) && $dbport != 3306 ) + $dbhost = '127.0.0.1'; + + $host_line = ( preg_match('/^:/', $dbhost) ) ? $dbhost : "{$dbhost}:{$dbport}"; + + $this->_conn = @mysql_connect($host_line, $dbuser, $dbpasswd); unset($dbuser); unset($dbpasswd); // Security @@ -839,7 +849,7 @@ return $internal_text; } - function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false) + function connect($manual_credentials = false, $dbhost = false, $dbuser = false, $dbpasswd = false, $dbname = false, $dbport = false) { if ( !defined('ENANO_SQL_CONSTANTS') ) { @@ -864,6 +874,8 @@ if ( isset($crypto_key) ) unset($crypto_key); // Get this sucker out of memory fast + if ( empty($dbport) ) + $dbport = 5432; if ( !defined('ENANO_INSTALLED') && !defined('MIDGET_INSTALLED') && !defined('IN_ENANO_INSTALL') ) { @@ -890,7 +902,11 @@ exit; } } - $this->_conn = @pg_connect("host=$dbhost port=5432 dbname=$dbname user=$dbuser password=$dbpasswd"); + + if ( empty($dbport) ) + $dbport = 5432; + + $this->_conn = @pg_connect("host=$dbhost port=$dbport dbname=$dbname user=$dbuser password=$dbpasswd"); unset($dbuser); unset($dbpasswd); // Security @@ -951,7 +967,7 @@ } $time_start = microtime_float(); - $r = pg_query($q); + $r = @pg_query($q); $this->query_times[$q] = microtime_float() - $time_start; $this->latest_result = $r; return $r;