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

CS: Fix for DbAdapter, Auth/Manager and Preferences/DbStore

Browse Source 
refs #4596
This commit is contained in:
Marius Hein 2013-08-26 10:08:32 +02:00
parent 49cf62a9dc
commit 0c69dbf482
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Application/DbAdapterFactory.php
View File

@ -246,7 +246,7 @@ class DbAdapterFactory implements ConfigAwareFactory
private static function callFactory($adapter, $options)
{
$factory = self::$factoryClass;
$optionModifierCallback = __CLASS__. '::get' . ucfirst(str_replace('_', '', $adapter)) . 'Options';
$optionModifierCallback = __CLASS__ . '::get' . ucfirst(str_replace('_', '', $adapter)) . 'Options';
if (is_callable($optionModifierCallback)) {
$options = call_user_func($optionModifierCallback, $options);
}

5
library/Icinga/Authentication/Manager.php
View File

@ -188,7 +188,7 @@ class Manager
{
$type = ucwords(strtolower($backendConfig->backend));
if (!$type) {
Logger::warn('No type given...');
Logger::warn('Backend has no type configured. (e.g. backend=ldap)');
return null;
}
try {
@ -214,7 +214,8 @@ class Manager
* in the current session
*
* @return Boolean true on success, otherwise false
**/
* @throws ConfigError
*/
public function authenticate(Credentials $credentials, $persist = true)
{
if (!$this->userBackend) {

1
library/Icinga/User/Preferences/DbStore.php
View File

@ -93,7 +93,6 @@ class DbStore implements LoadInterface, FlushObserverInterface
public function setDbAdapter(Zend_Db_Adapter_Abstract $db)
{
$this->db = $db;
$this->db->getProfiler()->setEnabled(true);
}