extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 13:51:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to create the postgres conection string in an extra variable

Browse Source
This commit is contained in:
Ralf Becker 2004-04-03 12:58:43 +00:00
parent c09e4eb4c8
commit b69585b36f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpgwapi/inc/class.db.inc.php
View File

@ -189,13 +189,16 @@
case 'pgsql': case 'pgsql':
$type = 'postgres'; $type = 'postgres';
// create our own pgsql connection-string, to allow unix domain soccets if !$Host // create our own pgsql connection-string, to allow unix domain soccets if !$Host
$this->Host = "dbname=$this->Database".($this->Host ? " host=$this->Host".($this->Port ? " port=$this->Port" : '') : ''). $Host = "dbname=$this->Database".($this->Host ? " host=$this->Host".($this->Port ? " port=$this->Port" : '') : '').
" user=$this->User".($this->Password ? " password='".addslashes($this->Password)."'" : ''); " user=$this->User".($this->Password ? " password='".addslashes($this->Password)."'" : '');
$this->User = $this->Password = $this->Database = $this->Port = ''; // to indicate $Host is a connection-string $User = $Password = $Database = ''; // to indicate $Host is a connection-string
break; break;
default: default:
$this->Host .= ($this->Port ? ':'.$this->Port : ''); $Host = $this->Host . ($this->Port ? ':'.$this->Port : '');
$this->Port = ''; foreach(array('Database','User','Password') as $name)
{
$$name = $this->$name;
}
$type = $this->Type; $type = $this->Type;
} }
@ -222,9 +225,9 @@
return 0; // in case error-reporting = 'no' return 0; // in case error-reporting = 'no'
} }
$connect = $GLOBALS['phpgw_info']['server']['db_persistent'] ? 'PConnect' : 'Connect'; $connect = $GLOBALS['phpgw_info']['server']['db_persistent'] ? 'PConnect' : 'Connect';
if (!$this->Link_ID->$connect($this->Host, $this->User, $this->Password, $this->Database)) if (!$this->Link_ID->$connect($Host, $User, $Password, $Database))
{ {
$this->halt("ADOdb::$connect($this->Host, $this->User, \$Password, $this->Database) failed."); $this->halt("ADOdb::$connect($Host, $User, \$Password, $Database) failed.");
return 0; // in case error-reporting = 'no' return 0; // in case error-reporting = 'no'
} }
//echo "new ADOdb connection<pre>".print_r($GLOBALS['phpgw']->ADOdb,True)."</pre>\n"; //echo "new ADOdb connection<pre>".print_r($GLOBALS['phpgw']->ADOdb,True)."</pre>\n";