"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/setup/library/Setup/WebWizard.php" between
icingaweb2-2.11.3.tar.gz and icingaweb2-2.11.4.tar.gz

About: Icinga Web 2 is an Web interface for Icinga 2, a network and computer system monitoring system.

WebWizard.php  (icingaweb2-2.11.3)	:	WebWizard.php  (icingaweb2-2.11.4)
skipping to change at line 448		skipping to change at line 448
'tables' => $this->databaseTables,		'tables' => $this->databaseTables,
'privileges' => $this->databaseUsagePrivileges,		'privileges' => $this->databaseUsagePrivileges,
'resourceConfig' => $pageData['setup_auth_db_resource'],		'resourceConfig' => $pageData['setup_auth_db_resource'],
'adminName' => isset($pageData['setup_auth_db_creati on']['username'])		'adminName' => isset($pageData['setup_auth_db_creati on']['username'])
? $pageData['setup_auth_db_creation']['username']		? $pageData['setup_auth_db_creation']['username']
: null,		: null,
'adminPassword' => isset($pageData['setup_auth_db_creati on']['password'])		'adminPassword' => isset($pageData['setup_auth_db_creati on']['password'])
? $pageData['setup_auth_db_creation']['password']		? $pageData['setup_auth_db_creation']['password']
: null,		: null,
'schemaPath' => Config::module('setup')		'schemaPath' => Config::module('setup')
->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))		->get('schema', 'path', Icinga::app()->getBaseDir('schem a'))
))		))
);		);
} elseif (isset($pageData['setup_config_db_resource'])		} elseif (isset($pageData['setup_config_db_resource'])
&& !$pageData['setup_config_db_resource']['skip_validation']		&& !$pageData['setup_config_db_resource']['skip_validation']
&& (! isset($pageData['setup_config_db_creation'])		&& (! isset($pageData['setup_config_db_creation'])
|| !$pageData['setup_config_db_creation']['skip_validation']		|| !$pageData['setup_config_db_creation']['skip_validation']
)		)
) {		) {
$setup->addStep(		$setup->addStep(
new DatabaseStep(array(		new DatabaseStep(array(
'tables' => $this->databaseTables,		'tables' => $this->databaseTables,
'privileges' => $this->databaseUsagePrivileges,		'privileges' => $this->databaseUsagePrivileges,
'resourceConfig' => $pageData['setup_config_db_resource'] ,		'resourceConfig' => $pageData['setup_config_db_resource'] ,
'adminName' => isset($pageData['setup_config_db_crea tion']['username'])		'adminName' => isset($pageData['setup_config_db_crea tion']['username'])
? $pageData['setup_config_db_creation']['username']		? $pageData['setup_config_db_creation']['username']
: null,		: null,
'adminPassword' => isset($pageData['setup_config_db_crea tion']['password'])		'adminPassword' => isset($pageData['setup_config_db_crea tion']['password'])
? $pageData['setup_config_db_creation']['password']		? $pageData['setup_config_db_creation']['password']
: null,		: null,
'schemaPath' => Config::module('setup')		'schemaPath' => Config::module('setup')
->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))		->get('schema', 'path', Icinga::app()->getBaseDir('schem a'))
))		))
);		);
}		}
$setup->addStep(		$setup->addStep(
new GeneralConfigStep(array(		new GeneralConfigStep(array(
'generalConfig' => $pageData['setup_general_config'],		'generalConfig' => $pageData['setup_general_config'],
'resourceName' => isset($pageData['setup_auth_db_resource']['na me'])		'resourceName' => isset($pageData['setup_auth_db_resource']['na me'])
? $pageData['setup_auth_db_resource']['name']		? $pageData['setup_auth_db_resource']['name']
: (isset($pageData['setup_config_db_resource']['name'])		: (isset($pageData['setup_config_db_resource']['name'])
End of changes. 2 change blocks.
2 lines changed or deleted		2 lines changed or added

---