From 7c83163325cd52a1e9b827727bed3a26ad9e8e55 Mon Sep 17 00:00:00 2001 From: Mark Unwin Date: Fri, 6 Sep 2019 11:50:41 +1000 Subject: [PATCH] Fix - remove config->item() from tests and replace with config->config[] because old PHP. --- code_igniter/application/controllers/include_dictionary.php | 2 +- .../application/controllers/include_input_discoveries.php | 2 +- code_igniter/application/controllers/rules.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code_igniter/application/controllers/include_dictionary.php b/code_igniter/application/controllers/include_dictionary.php index 9b28f4482..0b6d3fe96 100644 --- a/code_igniter/application/controllers/include_dictionary.php +++ b/code_igniter/application/controllers/include_dictionary.php @@ -211,7 +211,7 @@ if ($table == 'collectors') { $dictionary->sentence = 'Open-AudIT Enterprise includes Collectors. Have a single Open-AudIT server control many other servers that perform discovery and collect device information.'; - if ($this->config->item('oae_product') !== 'Open-AudIT Cloud') { + if ($this->config->config['oae_product'] !== 'Open-AudIT Cloud') { $dictionary->about = '

The Collectors feature enables you to easily manage many "collector" computers that perform network discovery. All Collectors are centrally controlled from the Server. The only required network ports between the Collector and the Server are 80 and/or 443.

It makes managing disparate networks quick, easy and simple. Open-AudIT Enterprise licensees get a single collector license included and have the option to buy more as required..

' . $link . '

'; diff --git a/code_igniter/application/controllers/include_input_discoveries.php b/code_igniter/application/controllers/include_input_discoveries.php index 8f01c9a0b..d481cb9be 100644 --- a/code_igniter/application/controllers/include_input_discoveries.php +++ b/code_igniter/application/controllers/include_input_discoveries.php @@ -1617,7 +1617,7 @@ } } } else { - if (php_uname('s') == 'Windows NT' and exec('whoami') == 'nt authority\system' and !empty($this->config->item('discovery_use_vintage_service')) and $this->config->item('discovery_use_vintage_service') == 'y') { + if (php_uname('s') == 'Windows NT' and exec('whoami') == 'nt authority\system' and !empty($this->config->config['discovery_use_vintage_service']) and $this->config->config['discovery_use_vintage_service'] == 'y') { $log->message = 'Audit result incoming from target.'; $log->severity = 6; discovery_log($log); diff --git a/code_igniter/application/controllers/rules.php b/code_igniter/application/controllers/rules.php index ed710c1db..8f7ec4fdd 100644 --- a/code_igniter/application/controllers/rules.php +++ b/code_igniter/application/controllers/rules.php @@ -56,7 +56,7 @@ public function __construct() parent::__construct(); $this->load->model('m_rules'); inputRead(); - $this->output->url = $this->config->item('oa_web_index'); + $this->output->url = $this->config->config['oa_web_index']; } /**