From: Marcin Haba Date: Fri, 10 Feb 2023 14:48:09 +0000 (+0100) Subject: baculum: Fix support for PHP 5 X-Git-Tag: Release-13.0.3~133 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=603987d5e7f61697c81bc586b71d5475829cfce9;p=thirdparty%2Fbacula.git baculum: Fix support for PHP 5 --- diff --git a/gui/baculum/protected/API/Modules/JobManager.php b/gui/baculum/protected/API/Modules/JobManager.php index 271527a0d..ec6803ded 100644 --- a/gui/baculum/protected/API/Modules/JobManager.php +++ b/gui/baculum/protected/API/Modules/JobManager.php @@ -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 ]; }