From a41468bf1c2ff19d9f9a9d87913e87103a1cbe9c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 26 Dec 2022 14:21:36 +0100
Subject: [PATCH] Avoid Automatic conversion of false to array is deprecated in
cron.d/200-logfiles.inc.php
---
server/lib/classes/cron.d/200-ftplogfiles.inc.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/lib/classes/cron.d/200-ftplogfiles.inc.php b/server/lib/classes/cron.d/200-ftplogfiles.inc.php
index a88a360ae2..430d8ce412 100644
--- a/server/lib/classes/cron.d/200-ftplogfiles.inc.php
+++ b/server/lib/classes/cron.d/200-ftplogfiles.inc.php
@@ -70,7 +70,7 @@ class cronjob_ftplogfiles extends cronjob {
function add_ftp_traffic(&$traffic_array, $parsed_line)
{
- if(is_array($traffic_array[$parsed_line['date']]) && array_key_exists($parsed_line['domain'], $traffic_array[$parsed_line['date']]))
+ if(isset($traffic_array[$parsed_line['date']]) && is_array($traffic_array[$parsed_line['date']]) && array_key_exists($parsed_line['domain'], $traffic_array[$parsed_line['date']]))
{
$traffic_array[$parsed_line['date']][$parsed_line['domain']][$parsed_line['direction']] += $parsed_line['size'];
}
@@ -89,13 +89,13 @@ class cronjob_ftplogfiles extends cronjob {
while($line = fgets($fp))
{
$parsed_line = parse_ftp_log($line);
+ if (!empty($parsed_line)) {
+ $sql = "SELECT wd.domain FROM ftp_user AS fu INNER JOIN web_domain AS wd ON fu.parent_domain_id = wd.domain_id WHERE fu.username = ? ";
+ $temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
+ $parsed_line['domain'] = $temp['domain'];
+ add_ftp_traffic($ftp_traffic, $parsed_line);
+ }
- $sql = "SELECT wd.domain FROM ftp_user AS fu INNER JOIN web_domain AS wd ON fu.parent_domain_id = wd.domain_id WHERE fu.username = ? ";
- $temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
-
- $parsed_line['domain'] = $temp['domain'];
-
- add_ftp_traffic($ftp_traffic, $parsed_line);
}
fclose($fp);
--
GitLab