diff --git a/application/forms/RedisConfigForm.php b/application/forms/RedisConfigForm.php index 89aaf7b1a..bd3db9cc0 100644 --- a/application/forms/RedisConfigForm.php +++ b/application/forms/RedisConfigForm.php @@ -144,6 +144,7 @@ public function createElements(array $formData) 'description' => t('Redis Password'), 'label' => t('Redis Password'), 'renderPassword' => true, + 'autocomplete' => 'new-password' ]); $this->addDisplayGroup( @@ -182,6 +183,7 @@ public function createElements(array $formData) 'description' => t('Redis Password'), 'label' => t('Redis Password'), 'renderPassword' => true, + 'autocomplete' => 'new-password' ]); $this->addDisplayGroup( diff --git a/library/Icingadb/Setup/ApiTransportPage.php b/library/Icingadb/Setup/ApiTransportPage.php index 310933ae0..e727e9977 100644 --- a/library/Icingadb/Setup/ApiTransportPage.php +++ b/library/Icingadb/Setup/ApiTransportPage.php @@ -60,7 +60,8 @@ public function createElements(array $formData) $this->addElement('password', 'password', [ 'required' => true, 'renderPassword' => true, - 'label' => t('API Password') + 'label' => t('API Password'), + 'autocomplete' => 'new-password' ]); } diff --git a/library/Icingadb/Setup/IcingaDbWizard.php b/library/Icingadb/Setup/IcingaDbWizard.php index 2ad514a5b..f99f240a2 100644 --- a/library/Icingadb/Setup/IcingaDbWizard.php +++ b/library/Icingadb/Setup/IcingaDbWizard.php @@ -4,9 +4,9 @@ namespace Icinga\Module\Icingadb\Setup; +use Icinga\Application\Icinga; use Icinga\Module\Setup\Forms\SummaryPage; use Icinga\Module\Setup\Requirement\PhpModuleRequirement; -use Icinga\Module\Setup\Requirement\PhpVersionRequirement; use Icinga\Module\Setup\Requirement\WebLibraryRequirement; use Icinga\Module\Setup\RequirementSet; use Icinga\Module\Setup\Setup; @@ -50,19 +50,16 @@ public function getRequirements() { $set = new RequirementSet(); - $set->add(new PhpVersionRequirement([ - 'condition' => ['>=', '7.2'], - 'description' => sprintf(t('Icinga DB Web requires PHP version %s.'), '7.2') - ])); + $requiredVersions = Icinga::app()->getModuleManager()->getModule('icingadb')->getRequiredLibraries(); $set->add(new WebLibraryRequirement([ - 'condition' => ['icinga-php-library', '>=', '0.9.0'], + 'condition' => ['icinga-php-library', '', $requiredVersions['icinga-php-library']], 'alias' => 'Icinga PHP library', 'description' => t('The Icinga PHP library (IPL) is required for Icinga DB Web') ])); $set->add(new WebLibraryRequirement([ - 'condition' => ['icinga-php-thirdparty', '>=', '0.11.0'], + 'condition' => ['icinga-php-thirdparty', '', $requiredVersions['icinga-php-thirdparty']], 'alias' => 'Icinga PHP Thirdparty', 'description' => t('The Icinga PHP Thirdparty library is required for Icinga DB Web') ])); @@ -73,6 +70,12 @@ public function getRequirements() 'description' => t('For check plugins that output HTML the libxml extension is required') ])); + $set->add(new PhpModuleRequirement([ + 'condition' => 'dom', + 'alias' => 'dom', + 'description' => t('For check plugins that output HTML the dom extension is required') + ])); + $set->add(new PhpModuleRequirement([ 'condition' => 'curl', 'alias' => 'cURL',