From 8c942178d26c8da3c232d5420247edf3032ee304 Mon Sep 17 00:00:00 2001
From: envoyr <hello@envoyr.com>
Date: Wed, 20 Apr 2022 17:01:25 +0200
Subject: [PATCH] fix font assets path, logo path, database installation and
 checks

---
 install/lib/class.FroxlorInstall.php           |  7 +++++--
 templates/Froxlor/misc/configurehint.html.twig |  2 +-
 webpack.mix.js                                 | 12 +++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php
index 570b30b1..057dcf5c 100644
--- a/install/lib/class.FroxlorInstall.php
+++ b/install/lib/class.FroxlorInstall.php
@@ -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);
diff --git a/templates/Froxlor/misc/configurehint.html.twig b/templates/Froxlor/misc/configurehint.html.twig
index b07f41f3..26e695b2 100644
--- a/templates/Froxlor/misc/configurehint.html.twig
+++ b/templates/Froxlor/misc/configurehint.html.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
 	<div class="container max-w-lg flex align-content-center mt-5">
-		<img src="templates/Sparkle/assets/img/logo.png" alt="Froxlor Server Management Panel" />
+		<img src="templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
 
 		<div class="row gx-0 rounded shadow bg-primary text-white mt-5">
 			<div class="col p-5 rounded-start">
diff --git a/webpack.mix.js b/webpack.mix.js
index 95cbe5dc..a4cfc116 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -3,6 +3,12 @@
 let mix = require('laravel-mix');
 
 mix
-    .js('templates/Froxlor/src/js/main.js', 'templates/Froxlor/assets/js')
-    .sass('templates/Froxlor/src/scss/main.scss', 'templates/Froxlor/assets/css')
-    .sass('templates/Froxlor/src/scss/dark.scss', 'templates/Froxlor/assets/css');
\ No newline at end of file
+	.setPublicPath('')
+	.options({
+		fileLoaderDirs:  {
+			fonts: 'templates/Froxlor/assets/fonts'
+		}
+	})
+	.js('templates/Froxlor/src/js/main.js', 'templates/Froxlor/assets/js')
+	.sass('templates/Froxlor/src/scss/main.scss', 'templates/Froxlor/assets/css')
+	.sass('templates/Froxlor/src/scss/dark.scss', 'templates/Froxlor/assets/css');