holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"additionally using the port for the pdo connection and remove password from stacktrace of failed connection"

Browse Source
This commit is contained in:
Ralf Becker 2008-04-18 09:08:38 +00:00
parent b86449d359
commit 48734de102
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
View File

@ -1270,15 +1270,25 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
switch($egw_db->Type) switch($egw_db->Type)
{ {
case 'mysqlt': case 'mysqlt':
$dsn = 'mysql:host='.$egw_db->Host.';dbname='.$egw_db->Database; $type = 'mysql';
break; break;
default: default:
$dsn = $egw_db->Type.':host='.$egw_db->Host.';dbname='.$egw_db->Database; $type = $egw_db->Type;
break; break;
} }
self::$pdo = new PDO($dsn,$egw_db->User,$egw_db->Password); switch($type)
{
default:
$dsn = $egw_db->Type.':host='.$egw_db->Host.';port='.$egw_db->Port.';dbname='.$egw_db->Database;
break;
}
$egw_db->Password .= 'x';
try {
self::$pdo = new PDO($dsn,$egw_db->User,$egw_db->Password);
} catch(Exception $e) {
// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
self::$pdo = new PDO($dsn,$egw_db->User,'$egw_db->Password');
}
// set client charset of the connection // set client charset of the connection
$charset = $GLOBALS['egw']->translation->charset(); $charset = $GLOBALS['egw']->translation->charset();
switch($server['db_type']) switch($server['db_type'])