maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

prepare database-class to have a separate socket-option, not as replacement for 'host'

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-10 16:13:14 +01:00
parent c356639ce9
commit c482db8c89
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/classes/database/class.Database.php
View File

@@ -224,7 +224,7 @@ class Database {
&& isset($sql['root_password']) && isset($sql['root_password'])
&& (!isset($sql_root) || !is_array($sql_root)) && (!isset($sql_root) || !is_array($sql_root))
) { ) {
$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password'])); $sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'socket' => (isset($sql['socket']) ? $sql['socket'] : null), 'user' => $sql['root_user'], 'password' => $sql['root_password']));
unset($sql['root_user']); unset($sql['root_user']);
unset($sql['root_password']); unset($sql['root_password']);
} }
@@ -235,11 +235,13 @@ class Database {
$user = $sql_root[self::$_dbserver]['user']; $user = $sql_root[self::$_dbserver]['user'];
$password = $sql_root[self::$_dbserver]['password']; $password = $sql_root[self::$_dbserver]['password'];
$host = $sql_root[self::$_dbserver]['host']; $host = $sql_root[self::$_dbserver]['host'];
$socket = isset($sql_root[self::$_dbserver]['socket']) ? $sql_root[self::$_dbserver]['socket'] : null;
} else { } else {
$caption = 'localhost'; $caption = 'localhost';
$user = $sql["user"]; $user = $sql["user"];
$password = $sql["password"]; $password = $sql["password"];
$host = $sql["host"]; $host = $sql["host"];
$socket = isset($sql['socket']) ? $sql['socket'] : null;
} }
// save sql-access-data if needed // save sql-access-data if needed
@@ -248,6 +250,7 @@ class Database {
'user' => $user, 'user' => $user,
'passwd' => $password, 'passwd' => $password,
'host' => $host, 'host' => $host,
'socket' => $socket,
'db' => $sql["db"], 'db' => $sql["db"],
'caption' => $caption 'caption' => $caption
); );
@@ -264,8 +267,8 @@ class Database {
'charset' => 'utf8' 'charset' => 'utf8'
); );
if (!validateLocalHostname($host) && !validate_ip2($host, true, 'invalidip', true, true)) { if ($socket != null) {
$dbconf["dsn"]['unix_socket'] = makeCorrectFile($host); $dbconf["dsn"]['unix_socket'] = makeCorrectFile($socket);
} else { } else {
$dbconf["dsn"]['host'] = $host; $dbconf["dsn"]['host'] = $host;
} }
@@ -345,7 +348,7 @@ class Database {
&& isset($sql['root_password']) && isset($sql['root_password'])
&& (!isset($sql_root) || !is_array($sql_root)) && (!isset($sql_root) || !is_array($sql_root))
) { ) {
$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password'])); $sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'socket' => (isset($sql['socket']) ? $sql['socket'] : null), 'user' => $sql['root_user'], 'password' => $sql['root_password']));
} }
// hide username/password in messages // hide username/password in messages