From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 20 Apr 2022 19:11:43 +0000 (+0200)
Subject: baculum: Fix #2661 required parameter PHP error on PHP 8.0
X-Git-Tag: Release-13.0.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=641b4d312e769d477416165042585eb25753850e;p=thirdparty%2Fbacula.git

baculum: Fix #2661 required parameter PHP error on PHP 8.0
---

diff --git a/gui/baculum/protected/API/Class/JobManager.php b/gui/baculum/protected/API/Class/JobManager.php
index b210525b7..14162576c 100644
--- a/gui/baculum/protected/API/Class/JobManager.php
+++ b/gui/baculum/protected/API/Class/JobManager.php
@@ -33,7 +33,7 @@ Prado::using('Application.API.Class.Database');
  */
 class JobManager extends APIModule {
 
-	public function getJobs($criteria = array(), $limit_val) {
+	public function getJobs($criteria = array(), $limit_val = null) {
 		$sort_col = 'JobId';
 		$db_params = $this->getModule('api_config')->getConfig('db');
 		if ($db_params['type'] === Database::PGSQL_TYPE) {
diff --git a/gui/baculum/protected/Common/Class/ConfigFileModule.php b/gui/baculum/protected/Common/Class/ConfigFileModule.php
index 95388d50f..44cf4d23e 100644
--- a/gui/baculum/protected/Common/Class/ConfigFileModule.php
+++ b/gui/baculum/protected/Common/Class/ConfigFileModule.php
@@ -123,7 +123,7 @@ class ConfigFileModule extends CommonModule {
 	 * @param string $path config file path
 	 * @return boolean true if config valid, otherwise false
 	 */
-	protected function isConfigValid($required_options, array $config = array(), $format, $path = '') {
+	protected function isConfigValid($required_options, array $config = array(), $format = '', $path = '') {
 		$config_format = $this->getConfigFormatModule($format);
 		$is_valid = $config_format->isConfigValid($required_options, $config, $path);
 		return $is_valid;
diff --git a/gui/baculum/protected/Common/Class/ConfigIni.php b/gui/baculum/protected/Common/Class/ConfigIni.php
index d73947e52..82b6456bc 100644
--- a/gui/baculum/protected/Common/Class/ConfigIni.php
+++ b/gui/baculum/protected/Common/Class/ConfigIni.php
@@ -119,7 +119,7 @@ class ConfigIni extends CommonModule implements ConfigFormat {
 	 * @param string $source config file path
 	 * @return boolean true if config valid, otherwise false
 	 */
-	public function isConfigValid(array $required_options, array $config = array(), $source) {
+	public function isConfigValid(array $required_options, array $config = array(), $source = '') {
 		$valid = true;
 		$invalid = array('required' => null);