Skip to content

Commit a41468b

Browse files
committed
Avoid Automatic conversion of false to array is deprecated in cron.d/200-logfiles.inc.php
1 parent 5bb6e37 commit a41468b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

server/lib/classes/cron.d/200-ftplogfiles.inc.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function parse_ftp_log($line){
7070

7171
function add_ftp_traffic(&$traffic_array, $parsed_line)
7272
{
73-
if(is_array($traffic_array[$parsed_line['date']]) && array_key_exists($parsed_line['domain'], $traffic_array[$parsed_line['date']]))
73+
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']]))
7474
{
7575
$traffic_array[$parsed_line['date']][$parsed_line['domain']][$parsed_line['direction']] += $parsed_line['size'];
7676
}
@@ -89,13 +89,13 @@ function add_ftp_traffic(&$traffic_array, $parsed_line)
8989
while($line = fgets($fp))
9090
{
9191
$parsed_line = parse_ftp_log($line);
92+
if (!empty($parsed_line)) {
93+
$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 = ? ";
94+
$temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
95+
$parsed_line['domain'] = $temp['domain'];
96+
add_ftp_traffic($ftp_traffic, $parsed_line);
97+
}
9298

93-
$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 = ? ";
94-
$temp = $app->db->queryOneRecord($sql, $parsed_line['username'] );
95-
96-
$parsed_line['domain'] = $temp['domain'];
97-
98-
add_ftp_traffic($ftp_traffic, $parsed_line);
9999
}
100100

101101
fclose($fp);

0 commit comments

Comments
 (0)