wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PostgreSQL port configuration on install

Browse source
This commit is contained in:
eduardo 2014-01-04 19:23:25 -02:00
parent aaa48576ee
commit d258ade35e
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/private/setup/postgresql.php
View file

@ -10,13 +10,21 @@ class PostgreSQL extends AbstractDatabase {
$e_user = addslashes($this->dbuser); $e_user = addslashes($this->dbuser);
$e_password = addslashes($this->dbpassword); $e_password = addslashes($this->dbpassword);
// Eduardo: 04/01/2013
// Fix database with port connection
if(strpos($e_host, ':')) {
list($e_host, $port)=explode(':', $e_host, 2);
} else {
$port=false;
}
//check if the database user has admin rights //check if the database user has admin rights
$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'"; $connection_string = "host='$e_host' dbname=postgres user='$e_user' port='$port' password='$e_password'";
$connection = @pg_connect($connection_string); $connection = @pg_connect($connection_string);
if(!$connection) { if(!$connection) {
// Try if we can connect to the DB with the specified name // Try if we can connect to the DB with the specified name
$e_dbname = addslashes($this->dbname); $e_dbname = addslashes($this->dbname);
$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'"; $connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' port='$port' password='$e_password'";
$connection = @pg_connect($connection_string); $connection = @pg_connect($connection_string);
if(!$connection) if(!$connection)
@ -63,7 +71,15 @@ class PostgreSQL extends AbstractDatabase {
$e_user = addslashes($this->dbuser); $e_user = addslashes($this->dbuser);
$e_password = addslashes($this->dbpassword); $e_password = addslashes($this->dbpassword);
$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'"; // Eduardo: 04/01/2013
// Fix database with port connection
if(strpos($e_host, ':')) {
list($e_host, $port)=explode(':', $e_host, 2);
} else {
$port=false;
}
$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' port='$port' password='$e_password'";
$connection = @pg_connect($connection_string); $connection = @pg_connect($connection_string);
if(!$connection) { if(!$connection) {
throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'), throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),