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

fix font assets path, logo path, database installation and checks

Browse Source
This commit is contained in:
envoyr
2022-04-20 17:01:25 +02:00
parent d1dda00a1c
commit 8c942178d2
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
install/lib/class.FroxlorInstall.php
View File

@@ -333,7 +333,7 @@ class FroxlorInstall
}
// check if we have unrecoverable errors
if ($fatal_fail || $another_fail || $this->_abort) {
if ($fatal_fail || isset($another_fail) && $another_fail || $this->_abort) {
// D'oh
$_die = true;
$message = $this->_lng['install']['testing_mysql_fail'];
@@ -775,7 +775,10 @@ class FroxlorInstall
$mysql_access_host_array[] = '127.0.0.1';
}
$mysql_access_host_array[] = $this->_data['serverip'];
if (!in_array($this->_data['serverip'], $mysql_access_host_array)) {
$mysql_access_host_array[] = $this->_data['serverip'];
}
foreach ($mysql_access_host_array as $mysql_access_host) {
$frox_db = str_replace('`', '', $this->_data['mysql_database']);
$this->_grantDbPrivilegesTo($db_root, $frox_db, $this->_data['mysql_unpriv_user'], $this->_data['mysql_unpriv_pass'], $mysql_access_host);