summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-01-22 16:48:02 (GMT)
committerThomas Bruederli <thomas@roundcube.net>2014-01-22 16:48:02 (GMT)
commit7e88e7770d6ee6443d17fdf0210113dd78291bdc (patch)
treeb3349718a967bbb743f031a9576b7ce8837be8fa
parent6d53e8f0aebb479cbae2e3db7f7c7b471d5db93e (diff)
downloadkolab-freebusy-7e88e7770d6ee6443d17fdf0210113dd78291bdc.tar.gz
Fix typos and namespace issues with new Config class (#2772)
-rw-r--r--lib/Kolab/Config.php4
-rw-r--r--lib/Kolab/FreeBusy/Directory.php2
-rw-r--r--lib/Kolab/FreeBusy/DirectoryLDAP.php1
-rw-r--r--lib/Kolab/FreeBusy/Logger.php3
4 files changed, 7 insertions, 3 deletions
diff --git a/lib/Kolab/Config.php b/lib/Kolab/Config.php
index 30cebbf..c84426f 100644
--- a/lib/Kolab/Config.php
+++ b/lib/Kolab/Config.php
@@ -52,7 +52,7 @@ class Config
{
if (!isset(self::$instance)) {
self::$instance = new Config($env);
- if ($dir) self::$instance->basedir = $dif;
+ if ($dir) self::$instance->basedir = $dir;
}
if (!self::$instance->valid) {
@@ -244,7 +244,7 @@ class Config
}
// convert value to the requested type
- return $type ? self::convert($value, $type) : value;
+ return $type ? self::convert($value, $type) : $value;
}
/**
diff --git a/lib/Kolab/FreeBusy/Directory.php b/lib/Kolab/FreeBusy/Directory.php
index 6478e85..8ac2c24 100644
--- a/lib/Kolab/FreeBusy/Directory.php
+++ b/lib/Kolab/FreeBusy/Directory.php
@@ -23,6 +23,8 @@
namespace Kolab\FreeBusy;
+use Kolab\Config;
+
/**
* Abstract class representing an address directory for free/busy data lookups
*/
diff --git a/lib/Kolab/FreeBusy/DirectoryLDAP.php b/lib/Kolab/FreeBusy/DirectoryLDAP.php
index f462f79..42d72b1 100644
--- a/lib/Kolab/FreeBusy/DirectoryLDAP.php
+++ b/lib/Kolab/FreeBusy/DirectoryLDAP.php
@@ -25,6 +25,7 @@ namespace Kolab\FreeBusy;
// PEAR modules operate in global namespace
use \Net_LDAP3;
+use \Kolab\Config;
use \Monolog\Logger as Monolog;
/**
diff --git a/lib/Kolab/FreeBusy/Logger.php b/lib/Kolab/FreeBusy/Logger.php
index 618003b..b593330 100644
--- a/lib/Kolab/FreeBusy/Logger.php
+++ b/lib/Kolab/FreeBusy/Logger.php
@@ -23,6 +23,7 @@
namespace Kolab\FreeBusy;
+use Kolab\Config;
use Monolog\Logger as Monologger;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogHandler;
@@ -44,7 +45,7 @@ class Logger
$logger = new Monologger($name);
// read log config
- $config = Config::getInstance();
+ $config = Config::get_instance();
$identity = $config->get('log.name', 'freebusy');
$loglevel = $level ?: $config->get('log.level', Monologger::INFO);