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

allow to read db-config from environment, by using "@name" to reference to name from environment

Browse Source
This commit is contained in:
Ralf Becker 2015-10-06 12:45:26 +00:00
parent 91d68acc6f
commit 223918a192
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.egw_db.inc.php
View File

@ -347,6 +347,11 @@ class egw_db
{ {
$this->Type = $GLOBALS['egw_info']['server']['db_type']; $this->Type = $GLOBALS['egw_info']['server']['db_type'];
} }
foreach(array('Database', 'Host', 'Port', 'User', 'Password', 'Type') as $var)
{
$val = (string)$this->$var;
if ($val[0] === '@') $this->$var = getenv(substr($val, 1));
}
// on connection failure re-try with an other host // on connection failure re-try with an other host
// remembering in session which host we used last time // remembering in session which host we used last time
$use_host_from_session = true; $use_host_from_session = true;
@ -371,6 +376,10 @@ class egw_db
$use_host_from_session = false; // re-try with next host from list $use_host_from_session = false; // re-try with next host from list
} }
} }
if (!isset($e))
{
die('No DB Host set!');
}
throw $e; throw $e;
} }
@ -451,7 +460,7 @@ class egw_db
case 'pgsql': case 'pgsql':
$type = 'postgres'; // name in ADOdb $type = 'postgres'; // name in ADOdb
// 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
$Host = "dbname=$this->Database".($this->Host ? " host=$this->Host".($this->Port ? " port=$this->Port" : '') : ''). $Host = "dbname=$this->Database".($Host ? " host=$Host".($this->Port ? " port=$this->Port" : '') : '').
" user=$this->User".($this->Password ? " password='".addslashes($this->Password)."'" : ''); " user=$this->User".($this->Password ? " password='".addslashes($this->Password)."'" : '');
$User = $Password = $Database = ''; // to indicate $Host is a connection-string $User = $Password = $Database = ''; // to indicate $Host is a connection-string
break; break;
@ -1670,6 +1679,7 @@ class egw_db
$column_type = is_array($column_definitions) ? @$column_definitions[$col]['type'] : False; $column_type = is_array($column_definitions) ? @$column_definitions[$col]['type'] : False;
$not_null = is_array($column_definitions) && isset($column_definitions[$col]['nullable']) ? !$column_definitions[$col]['nullable'] : false; $not_null = is_array($column_definitions) && isset($column_definitions[$col]['nullable']) ? !$column_definitions[$col]['nullable'] : false;
$maxlength = null;
if ($truncate_varchar) if ($truncate_varchar)
{ {
$maxlength = in_array($column_definitions[$col]['type'], array('varchar','ascii')) ? $column_definitions[$col]['precision'] : null; $maxlength = in_array($column_definitions[$col]['type'], array('varchar','ascii')) ? $column_definitions[$col]['precision'] : null;