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/firstrun

Browse Source 
* also added check for port on this option
 * hide control chars from error input request for win
This commit is contained in:
Sarjuuk
2015-10-06 22:00:51 +02:00
parent ef5d7cce3b
commit dabf307c13
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup/tools/CLISetup.class.php
View File

@@ -188,27 +188,27 @@ class CLISetup
public static function red($str) public static function red($str)
{ {
return "\e[31m".$str."\e[0m"; return self::$win ? $str : "\e[31m".$str."\e[0m";
} }
public static function green($str) public static function green($str)
{ {
return "\e[32m".$str."\e[0m"; return self::$win ? $str : "\e[32m".$str."\e[0m";
} }
public static function yellow($str) public static function yellow($str)
{ {
return "\e[33m".$str."\e[0m"; return self::$win ? $str : "\e[33m".$str."\e[0m";
} }
public static function blue($str) public static function blue($str)
{ {
return "\e[36m".$str."\e[0m"; return self::$win ? $str : "\e[36m".$str."\e[0m";
} }
public static function bold($str) public static function bold($str)
{ {
return "\e[1m".$str."\e[0m"; return self::$win ? $str : "\e[1m".$str."\e[0m";
} }
public static function log($txt = '', $lvl = -1) public static function log($txt = '', $lvl = -1)
@@ -255,13 +255,10 @@ class CLISetup
$msg .= $txt."\n"; $msg .= $txt."\n";
} }
// remove highlights for logging & win echo $msg;
$raw = preg_replace(["/\e\[\d+m/", "/\e\[0m/"], '', $msg);
echo self::$win ? $raw : $msg; if (self::$logHandle) // remove highlights for logging
fwrite(self::$logHandle, preg_replace(["/\e\[\d+m/", "/\e\[0m/"], '', $msg));
if (self::$logHandle)
fwrite(self::$logHandle, $raw);
flush(); flush();
} }

8
setup/tools/clisetup/firstrun.func.php
View File

@@ -117,12 +117,18 @@ function firstrun($resume)
require 'config/config.php'; require 'config/config.php';
$error = []; $error = [];
$defPort = ini_get('mysqli.default_port');
foreach (['world', 'aowow', 'auth'] as $what) foreach (['world', 'aowow', 'auth'] as $what)
{ {
if ($what == 'auth' && (empty($AoWoWconf['auth']) || empty($AoWoWconf['auth']['host']))) if ($what == 'auth' && (empty($AoWoWconf['auth']) || empty($AoWoWconf['auth']['host'])))
continue; continue;
if ($link = @mysqli_connect($AoWoWconf[$what]['host'], $AoWoWconf[$what]['user'], $AoWoWconf[$what]['pass'], $AoWoWconf[$what]['db'])) $port = 0;
if (strstr($AoWoWconf[$what]['host'], ':'))
list($AoWoWconf[$what]['host'], $port) = explode(':', $AoWoWconf[$what]['host']);
if ($link = @mysqli_connect($AoWoWconf[$what]['host'], $AoWoWconf[$what]['user'], $AoWoWconf[$what]['pass'], $AoWoWconf[$what]['db'], $port ?: $defPort))
mysqli_close($link); mysqli_close($link);
else else
$error[] = ' * '.$what.': '.'['.mysqli_connect_errno().'] '.mysqli_connect_error(); $error[] = ' * '.$what.': '.'['.mysqli_connect_errno().'] '.mysqli_connect_error();