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

beautified code

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-04-27 08:14:50 +00:00
parent 56f0cdc7cd
commit 4f1c341d17
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/common.lib.php3
View File

@@ -376,9 +376,9 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
// Ensures compatibility with old config files // Ensures compatibility with old config files
if (!isset($cfg['Server']['auth_type'])) { if (!isset($cfg['Server']['auth_type'])) {
$cfg['Server']['auth_type'] = (isset($cfg['Server']['adv_auth']) && $cfg['Server']['adv_auth']) $cfg['Server']['auth_type'] = (isset($cfg['Server']['adv_auth']) && $cfg['Server']['adv_auth'])
? 'http' ? 'http'
: 'config'; : 'config';
} }
if (isset($cfg['Server']['stduser'])) { if (isset($cfg['Server']['stduser'])) {
@@ -413,11 +413,11 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
// must be open after this one so it would be default one for all the // must be open after this one so it would be default one for all the
// scripts) // scripts)
if ($cfg['Server']['controluser'] != '') { if ($cfg['Server']['controluser'] != '') {
$dbh = @$connect_func( $dbh = @$connect_func(
$cfg['Server']['host'] . $server_port . $server_socket, $cfg['Server']['host'] . $server_port . $server_socket,
$cfg['Server']['controluser'], $cfg['Server']['controluser'],
$cfg['Server']['controlpass'] $cfg['Server']['controlpass']
); );
if ($dbh == FALSE) { if ($dbh == FALSE) {
if (mysql_error()) { if (mysql_error()) {
$conn_error = mysql_error(); $conn_error = mysql_error();
@@ -435,11 +435,11 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
} // end if } // end if
// Connects to the server (validates user's login) // Connects to the server (validates user's login)
$userlink = @$connect_func( $userlink = @$connect_func(
$cfg['Server']['host'] . $server_port . $server_socket, $cfg['Server']['host'] . $server_port . $server_socket,
$cfg['Server']['user'], $cfg['Server']['user'],
$cfg['Server']['password'] $cfg['Server']['password']
); );
if ($userlink == FALSE) { if ($userlink == FALSE) {
PMA_auth_fails(); PMA_auth_fails();
} // end if } // end if