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

add missing namespaces, fix typo

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-10 11:15:06 +02:00
parent 16a9b18dad
commit e82d7b5d8b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install/updates/froxlor/update_0.10.inc.php
View File

@@ -24,10 +24,12 @@
*/ */
use Froxlor\Froxlor; use Froxlor\Froxlor;
use Froxlor\FileDir;
use Froxlor\Database\Database; use Froxlor\Database\Database;
use Froxlor\Settings; use Froxlor\Settings;
use Froxlor\Install\Update; use Froxlor\Install\Update;
use Froxlor\System\Cronjob; use Froxlor\System\Cronjob;
use Froxlor\System\IPTools;
if (!defined('_CRON_UPDATE')) { if (!defined('_CRON_UPDATE')) {
if (!defined('AREA') || (defined('AREA') && AREA != 'admin') || !isset($userinfo['loginname']) || (isset($userinfo['loginname']) && $userinfo['loginname'] == '')) { 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; $complete_filedir = Froxlor::getInstallDir() . $filedir;
if (file_exists($complete_filedir)) { if (file_exists($complete_filedir)) {
if ($exec_allowed) { if ($exec_allowed) {
Froxlor\FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir)); FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir));
} else { } else {
$del_list .= "rm -rf " . escapeshellarg($complete_filedir) . PHP_EOL; $del_list .= "rm -rf " . escapeshellarg($complete_filedir) . PHP_EOL;
} }
@@ -889,7 +891,7 @@ if (Froxlor::isDatabaseVersion('202107210')) {
Database::pexecute($result_stmt); Database::pexecute($result_stmt);
$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "` SET `ip` = :ip WHERE `id` = :id"); $upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "` SET `ip` = :ip WHERE `id` = :id");
while ($iprow = $result_stmt->fetch(\PDO::FETCH_ASSOC)) { 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'])); $ip = inet_ntop(inet_pton($iprow['ip']));
Database::pexecute($upd_stmt, [ Database::pexecute($upd_stmt, [
'ip' => $ip, 'ip' => $ip,

2
install/updates/froxlor/update_0.11.inc.php
View File

@@ -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"); $upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `allowed_mysqlserver` = :allowed_mysqlserver WHERE `customerid` = :customerid");
while ($dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC)) { 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'])); $allowed_mysqlserver = json_encode(explode(",", $dbserver['allowed_mysqlserver']));
Database::pexecute($upd_stmt, ['allowed_mysql_server' => $allowed_mysqlserver, 'customerid' => $dbserver['customerid']]); Database::pexecute($upd_stmt, ['allowed_mysql_server' => $allowed_mysqlserver, 'customerid' => $dbserver['customerid']]);
} }

2
lib/Froxlor/FileDir.php
View File

@@ -554,7 +554,7 @@ class FileDir
*/ */
public static function setImmutable(string $filename) public static function setImmutable(string $filename)
{ {
FileDir::safe_exec(self::getImmutableFunction(false) . escapeshellarg($filename)); self::safe_exec(self::getImmutableFunction(false) . escapeshellarg($filename));
} }
/** /**