From e82d7b5d8bc657e89f29d9d149ac9a03ae9d8fff Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Wed, 10 Aug 2022 11:15:06 +0200
Subject: [PATCH] add missing namespaces, fix typo

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 install/updates/froxlor/update_0.10.inc.php | 6 ++++--
 install/updates/froxlor/update_0.11.inc.php | 2 +-
 lib/Froxlor/FileDir.php                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/install/updates/froxlor/update_0.10.inc.php b/install/updates/froxlor/update_0.10.inc.php
index f9374aff..d7ef1450 100644
--- a/install/updates/froxlor/update_0.10.inc.php
+++ b/install/updates/froxlor/update_0.10.inc.php
@@ -24,10 +24,12 @@
  */
 
 use Froxlor\Froxlor;
+use Froxlor\FileDir;
 use Froxlor\Database\Database;
 use Froxlor\Settings;
 use Froxlor\Install\Update;
 use Froxlor\System\Cronjob;
+use Froxlor\System\IPTools;
 
 if (!defined('_CRON_UPDATE')) {
 	if (!defined('AREA') || (defined('AREA') && AREA != 'admin') || !isset($userinfo['loginname']) || (isset($userinfo['loginname']) && $userinfo['loginname'] == '')) {
@@ -323,7 +325,7 @@ if (Froxlor::isDatabaseVersion('201907270')) {
 		$complete_filedir = Froxlor::getInstallDir() . $filedir;
 		if (file_exists($complete_filedir)) {
 			if ($exec_allowed) {
-				Froxlor\FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir));
+				FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir));
 			} else {
 				$del_list .= "rm -rf " . escapeshellarg($complete_filedir) . PHP_EOL;
 			}
@@ -889,7 +891,7 @@ if (Froxlor::isDatabaseVersion('202107210')) {
 	Database::pexecute($result_stmt);
 	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "` SET `ip` = :ip WHERE `id` = :id");
 	while ($iprow = $result_stmt->fetch(\PDO::FETCH_ASSOC)) {
-		if (Validate::is_ipv6($iprow['ip'])) {
+		if (IPTools::is_ipv6($iprow['ip'])) {
 			$ip = inet_ntop(inet_pton($iprow['ip']));
 			Database::pexecute($upd_stmt, [
 				'ip' => $ip,
diff --git a/install/updates/froxlor/update_0.11.inc.php b/install/updates/froxlor/update_0.11.inc.php
index d4454423..8da662a0 100644
--- a/install/updates/froxlor/update_0.11.inc.php
+++ b/install/updates/froxlor/update_0.11.inc.php
@@ -79,7 +79,7 @@ if (Froxlor::isFroxlorVersion('0.10.99')) {
 	");
 	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `allowed_mysqlserver` = :allowed_mysqlserver WHERE `customerid` = :customerid");
 	while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) {
-		if (isset($dbserver['allowed_mysqlserver']) && !empt($dbserver['allowed_mysqlserver'])) {
+		if (isset($dbserver['allowed_mysqlserver']) && !empty($dbserver['allowed_mysqlserver'])) {
 			$allowed_mysqlserver = json_encode(explode(",", $dbserver['allowed_mysqlserver']));
 			Database::pexecute($upd_stmt, ['allowed_mysql_server' => $allowed_mysqlserver, 'customerid' => $dbserver['customerid']]);
 		}
diff --git a/lib/Froxlor/FileDir.php b/lib/Froxlor/FileDir.php
index ed61b2ac..f1f68c6f 100644
--- a/lib/Froxlor/FileDir.php
+++ b/lib/Froxlor/FileDir.php
@@ -554,7 +554,7 @@ class FileDir
 	 */
 	public static function setImmutable(string $filename)
 	{
-		FileDir::safe_exec(self::getImmutableFunction(false) . escapeshellarg($filename));
+		self::safe_exec(self::getImmutableFunction(false) . escapeshellarg($filename));
 	}
 
 	/**