]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Fix support for PHP 5
authorMarcin Haba <marcin.haba@bacula.pl>
Fri, 10 Feb 2023 14:48:09 +0000 (15:48 +0100)
committerMarcin Haba <marcin.haba@bacula.pl>
Sun, 5 Mar 2023 06:06:30 +0000 (07:06 +0100)
gui/baculum/protected/API/Modules/JobManager.php

index 271527a0df5787a779b883f4d5eea9d6fd513fd0..ec6803dede73de509e24d31294bcceaba4db999a 100644 (file)
@@ -540,15 +540,23 @@ WHERE Client.ClientId='$clientid' $wh";
                $duration = $this->getJobHistoryDuration($job, $level);
                $success = $this->getJobHistorySuccessPercent($job);
                $objects = $this->getJobHistoryAverageObjects($job, $level);
+               $bytes_est = (int) $result['jobbytes'];
+               $files_est = (int) $result['jobfiles'];
+               $corr_jobbytes = (float) $result['corr_jobbytes'];
+               $nb_jobs = (int) $result['nb_jobs'];
+               $corr_jobfiles = (float) $result['corr_jobfiles'];
+               $avg_duration = (int) $duration['duration'];
+               $avg_objects = (int) $objects['objects'];
+               $success_perc = (int) $success['success'];
                return [
-                       'bytes_est' => (int) ($result['jobbytes'] ?? '0'),
-                       'bytes_corr' => (float) $result['corr_jobbytes'],
-                       'files_est' => (int) ($result['jobfiles'] ?? '0'),
-                       'files_corr' => (float) $result['corr_jobfiles'],
-                       'job_count' => (int) $result['nb_jobs'],
-                       'avg_duration' => (int) ($duration['duration'] ?? '0'),
-                       'avg_objects' => (int) ($objects['objects'] ?? '0'),
-                       'success_perc' => (int) ($success['success'] ?? '0')
+                       'bytes_est' => max($bytes_est, 0),
+                       'bytes_corr' => $corr_jobbytes,
+                       'files_est' => max($files_est, 0),
+                       'files_corr' => $corr_jobfiles,
+                       'job_count' => $nb_jobs,
+                       'avg_duration' => $avg_duration,
+                       'avg_objects' => $avg_objects,
+                       'success_perc' => $success_perc
                ];
        }