yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Setup/DBConfig

Browse Source 
* fixed parsing port on host ip (already worked, but setup threw an error)
This commit is contained in:
Sarjuuk
2015-10-03 12:18:24 +02:00
parent d7c6092d5f
commit ef5d7cce3b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/tools/clisetup/dbconfig.func.php
View File

@@ -24,19 +24,24 @@ function dbconfig()
); );
$testDB = function($idx, $name, $dbInfo) $testDB = function($idx, $name, $dbInfo)
{ {
$buff = '['.CLISetup::bold($idx).'] '.str_pad($name, 17); $buff = '['.CLISetup::bold($idx).'] '.str_pad($name, 17);
$errStr = ''; $errStr = '';
$defPort = ini_get('mysqli.default_port');
$port = 0;
if (strstr($dbInfo['host'], ':'))
list($dbInfo['host'], $port) = explode(':', $dbInfo['host']);
if ($dbInfo['host']) if ($dbInfo['host'])
{ {
// test DB // test DB
if ($link = @mysqli_connect($dbInfo['host'], $dbInfo['user'], $dbInfo['pass'], $dbInfo['db'])) if ($link = @mysqli_connect($dbInfo['host'], $dbInfo['user'], $dbInfo['pass'], $dbInfo['db'], $port ?: $defPort))
mysqli_close($link); mysqli_close($link);
else else
$errStr = '['.mysqli_connect_errno().'] '.mysqli_connect_error(); $errStr = '['.mysqli_connect_errno().'] '.mysqli_connect_error();
$buff .= $errStr ? CLISetup::red('ERR ') : CLISetup::green('OK '); $buff .= $errStr ? CLISetup::red('ERR ') : CLISetup::green('OK ');
$buff .= 'mysqli://'.$dbInfo['user'].':'.str_pad('', mb_strlen($dbInfo['pass']), '*').'@'.$dbInfo['host'].'/'.$dbInfo['db']; $buff .= 'mysqli://'.$dbInfo['user'].':'.str_pad('', mb_strlen($dbInfo['pass']), '*').'@'.$dbInfo['host'].($port ? ':'.$port : null).'/'.$dbInfo['db'];
$buff .= ($dbInfo['prefix'] ? ' table prefix: '.$dbInfo['prefix'] : null).' '.$errStr; $buff .= ($dbInfo['prefix'] ? ' table prefix: '.$dbInfo['prefix'] : null).' '.$errStr;
} }
else else