diff options
Diffstat (limited to 'zabbix-config.patch')
| -rw-r--r-- | zabbix-config.patch | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/zabbix-config.patch b/zabbix-config.patch index 5d61074..9d58fc6 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,8 +1,7 @@ -diff --git a/ui/include/classes/core/CConfigFile.php b/ui/include/classes/core/CConfigFile.php -index d7ad93a..88b7d5f 100644 ---- a/ui/include/classes/core/CConfigFile.php -+++ b/ui/include/classes/core/CConfigFile.php -@@ -20,7 +20,7 @@ class CConfigFile { +diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0.2/ui/include/classes/core/CConfigFile.php +--- zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config 2022-03-23 08:38:25.049013803 -0600 ++++ zabbix-6.0.2/ui/include/classes/core/CConfigFile.php 2022-03-23 08:39:25.001657019 -0600 +@@ -25,7 +25,7 @@ class CConfigFile { const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; @@ -11,11 +10,10 @@ index d7ad93a..88b7d5f 100644 private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php -index 51b2165..e57e5a8 100644 ---- a/ui/include/classes/core/ZBase.php -+++ b/ui/include/classes/core/ZBase.php -@@ -392,7 +392,7 @@ class ZBase { +diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/include/classes/core/ZBase.php +--- zabbix-6.0.2/ui/include/classes/core/ZBase.php.config 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/ui/include/classes/core/ZBase.php 2022-03-23 08:38:25.052013836 -0600 +@@ -368,7 +368,7 @@ class ZBase { * @throws Exception */ protected function setMaintenanceMode() { @@ -24,24 +22,23 @@ index 51b2165..e57e5a8 100644 if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -405,7 +405,7 @@ class ZBase { +@@ -381,7 +381,7 @@ class ZBase { * Load zabbix config file. */ - protected function loadConfigFile(): void { -- $configFile = $this->root_dir.CConfigFile::CONFIG_FILE_PATH; + protected function loadConfigFile() { +- $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; - $config = new CConfigFile($configFile); - -diff --git a/ui/include/classes/setup/CSetupWizard.php b/ui/include/classes/setup/CSetupWizard.php -index 8574868..79d0c72 100644 ---- a/ui/include/classes/setup/CSetupWizard.php -+++ b/ui/include/classes/setup/CSetupWizard.php -@@ -328,7 +328,7 @@ class CSetupWizard extends CForm { + $this->config = $config->load(); + } +diff -up zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php +--- zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php 2022-03-23 08:38:25.054013857 -0600 +@@ -271,7 +271,7 @@ class CSetupWizard extends CForm { // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); -- $config = new CConfigFile(APP::getRootDir().CConfigFile::CONFIG_FILE_PATH); +- $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH); + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH); $config->config = [ 'DB' => [ |