tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

ResourceConfig: Chance createResouce to create

Browse Source 
Not useful everywhere. Changed on the best suitable places.

refs #5514
This commit is contained in:
Marius Hein 2014-08-28 11:42:22 +02:00
parent 9d0037a53a
commit 436a4d2965
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/ListController.php
View File

@ -45,8 +45,7 @@ class ListController extends Controller
file_exists($config_ini['logging']['target']) file_exists($config_ini['logging']['target'])
) )
) { ) {
$config = ResourceFactory::getResourceConfig('logfile'); $resource = ResourceFactory::create('logfile');
$resource = ResourceFactory::createResource($config);
$this->view->logData = $resource->select()->order('DESC')->paginate(); $this->view->logData = $resource->select()->order('DESC')->paginate();
} else { } else {
$this->view->logData = null; $this->view->logData = null;

3
application/forms/Config/Authentication/DbBackendForm.php
View File

@ -111,10 +111,9 @@ class DbBackendForm extends BaseBackendForm
public function isValidAuthenticationBackend() public function isValidAuthenticationBackend()
{ {
try { try {
$testConnection = ResourceFactory::createResource(ResourceFactory::getResourceConfig( $dbUserBackend = new DbUserBackend(ResourceFactory::create(
$this->getValue('backend_' . $this->filterName($this->getBackendName()) . '_resource') $this->getValue('backend_' . $this->filterName($this->getBackendName()) . '_resource')
)); ));
$dbUserBackend = new DbUserBackend($testConnection);
if ($dbUserBackend->count() < 1) { if ($dbUserBackend->count() < 1) {
$this->addErrorMessage(t("No users found under the specified database backend")); $this->addErrorMessage(t("No users found under the specified database backend"));
return false; return false;

2
application/forms/Config/Authentication/LdapBackendForm.php
View File

@ -149,7 +149,7 @@ class LdapBackendForm extends BaseBackendForm
$cfg = $this->getConfig(); $cfg = $this->getConfig();
$backendName = 'backend_' . $this->filterName($this->getBackendName()) . '_name'; $backendName = 'backend_' . $this->filterName($this->getBackendName()) . '_name';
$backendConfig = new Zend_Config($cfg[$this->getValue($backendName)]); $backendConfig = new Zend_Config($cfg[$this->getValue($backendName)]);
$backend = ResourceFactory::createResource(ResourceFactory::getResourceConfig($backendConfig->resource)); $backend = ResourceFactory::create($backendConfig->resource);
$testConn = new LdapUserBackend( $testConn = new LdapUserBackend(
$backend, $backend,
$backendConfig->user_class, $backendConfig->user_class,

2
modules/monitoring/library/Monitoring/Backend.php
View File

@ -97,7 +97,7 @@ class Backend implements Selectable, Queryable, ConnectionInterface
); );
} }
} }
$resource = ResourceFactory::createResource(ResourceFactory::getResourceConfig($backendConfig->resource)); $resource = ResourceFactory::create($backendConfig->resource);
if ($backendConfig->type === 'ido' && $resource->getDbType() !== 'oracle') { if ($backendConfig->type === 'ido' && $resource->getDbType() !== 'oracle') {
// TODO(el): The resource should set the table prefix // TODO(el): The resource should set the table prefix
$resource->setTablePrefix('icinga_'); $resource->setTablePrefix('icinga_');