gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify DBI code as $server no longer can be null

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-07-29 12:21:06 +02:00
parent 061c620723
commit f2e179b750
3 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/dbi/DBIExtension.php
View File

@ -25,7 +25,7 @@ interface DBIExtension
* @return mixed false on error or a connection object on success
*/
public function connect(
$user, $password, $server = null
$user, $password, $server
);
/**

17
libraries/dbi/DBIMysql.php
View File

@ -99,7 +99,7 @@ class DBIMysql implements DBIExtension
* @return mixed false on error or a mysqli object on success
*/
public function connect(
$user, $password, $server = null
$user, $password, $server
) {
if ($server['port'] === 0) {
$server_port = '';
@ -130,20 +130,13 @@ class DBIMysql implements DBIExtension
$client_flags |= MYSQL_CLIENT_SSL;
}
if (! $server) {
if (!isset($server['host'])) {
$link = $this->_realConnect($server_socket, $user, $password, null);
} else {
$link = $this->_realConnect(
$server['host'] . $server_port . $server_socket,
$user, $password, empty($client_flags) ? null : $client_flags
$user, $password, null
);
} else {
if (!isset($server['host'])) {
$link = $this->_realConnect($server_socket, $user, $password, null);
} else {
$link = $this->_realConnect(
$server['host'] . $server_port . $server_socket,
$user, $password, null
);
}
}
return $link;
}

33
libraries/dbi/DBIMysqli.php
View File

@ -117,7 +117,7 @@ class DBIMysqli implements DBIExtension
* @return mixed false on error or a mysqli object on success
*/
public function connect(
$user, $password, $server = null
$user, $password, $server
) {
if ($server) {
$server['host'] = (empty($server['host']))
@ -166,28 +166,15 @@ class DBIMysqli implements DBIExtension
}
}
if (! $server) {
$return_value = $this->_realConnect(
$link,
$server['host'],
$user,
$password,
false,
$server['port'],
$server['socket'],
$client_flags
);
} else {
$return_value = $this->_realConnect(
$link,
$server['host'],
$user,
$password,
false,
$server['port'],
$server['socket']
);
}
$return_value = $this->_realConnect(
$link,
$server['host'],
$user,
$password,
false,
$server['port'],
$server['socket']
);
if ($return_value === false || is_null($return_value)) {
return false;