1.1 --- a/debian/patches/config-lcattributes.diff Sat Aug 16 17:55:09 2014 +0200
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,10 +0,0 @@
1.4 ---- a/config/config.ini.sample
1.5 -+++ b/config/config.ini.sample
1.6 -@@ -48,6 +48,7 @@
1.7 - base_dn = "dc=yourdomain,dc=com"
1.8 - filter = "(&(objectClass=kolabInetOrgPerson)(|(uid=%s)(mail=%s)(alias=%s)))"
1.9 - attributes[] = mail
1.10 -+lc_attributes[] = mail
1.11 - fbsource = file:/www/kolab-freebusy/data/%mail.ifb
1.12 - loglevel = 100 ; Debug
1.13 -
2.1 --- a/debian/patches/config-ldap-loglevel.diff Sat Aug 16 17:55:09 2014 +0200
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,11 +0,0 @@
2.4 ---- a/config/config.ini.sample
2.5 -+++ b/config/config.ini.sample
2.6 -@@ -50,7 +50,7 @@
2.7 - attributes[] = mail
2.8 - lc_attributes[] = mail
2.9 - fbsource = file:/www/kolab-freebusy/data/%mail.ifb
2.10 --loglevel = 100 ; Debug
2.11 -+loglevel = 300 ; Warn
2.12 -
2.13 - ;; external MS Exchange 2010 server
2.14 - [directory "exchange"]
3.1 --- a/debian/patches/directory-lcattributes.diff Sat Aug 16 17:55:09 2014 +0200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,32 +0,0 @@
3.4 ---- a/lib/Kolab/FreeBusy/Directory.php
3.5 -+++ b/lib/Kolab/FreeBusy/Directory.php
3.6 -@@ -53,7 +53,7 @@
3.7 - $fbsource = $this->config['fbsource'];
3.8 - if ($source = Source::Factory($fbsource)) {
3.9 - // forward request to Source instance
3.10 -- if ($data = $source->getFreeBusyData($user, $extended)) {
3.11 -+ if ($data = $source->getFreeBusyData($this->postprocessAttrib($user), $extended)) {
3.12 - // send data through the according format converter
3.13 - $converter = Format::factory($this->config['format']);
3.14 - $data = $converter->toVCalendar($data);
3.15 -@@ -66,4 +66,19 @@
3.16 - return false;
3.17 - }
3.18 -
3.19 -+ /**
3.20 -+ * Modify attribute values according to config
3.21 -+ */
3.22 -+ protected function postprocessAttrib($attrib)
3.23 -+ {
3.24 -+ if (!empty($this->config['lc_attributes'])) {
3.25 -+ foreach ((array)$this->config['lc_attributes'] as $key) {
3.26 -+ if (!empty($attrib[$key]))
3.27 -+ $attrib[$key] = strtolower($attrib[$key]);
3.28 -+ }
3.29 -+ }
3.30 -+
3.31 -+ return $attrib;
3.32 -+ }
3.33 -+
3.34 - }
3.35 -\ No newline at end of file
4.1 --- a/debian/patches/index-config-path.diff Sat Aug 16 17:55:09 2014 +0200
4.2 +++ b/debian/patches/index-config-path.diff Sat Aug 16 18:06:13 2014 +0200
4.3 @@ -1,5 +1,5 @@
4.4 ---- a/web/index.php
4.5 -+++ b/web/index.php
4.6 +--- a/public_html/index.php
4.7 ++++ b/public_html/index.php
4.8 @@ -26,6 +26,7 @@
4.9
4.10
4.11 @@ -8,12 +8,12 @@
4.12
4.13 // suppress error notices
4.14 ini_set('error_reporting', E_ALL &~ E_NOTICE);
4.15 -@@ -41,7 +42,7 @@
4.16 +@@ -42,7 +43,7 @@
4.17
4.18
4.19 // load config
4.20 --$config = Config::getInstance(KOLAB_FREEBUSY_ROOT . '/config');
4.21 -+$config = Config::getInstance(KOLAB_FREEBUSY_CONFIG_ROOT);
4.22 - if ($config->isValid()) {
4.23 +-$config = Config::get_instance(KOLAB_FREEBUSY_ROOT . '/config');
4.24 ++$config = Config::get_instance(KOLAB_FREEBUSY_CONFIG_ROOT);
4.25 + if ($config->valid()) {
4.26 // check for trusted IP first
4.27 $remote_ip = Utils::remoteIP();
5.1 --- a/debian/patches/series Sat Aug 16 17:55:09 2014 +0200
5.2 +++ b/debian/patches/series Sat Aug 16 18:06:13 2014 +0200
5.3 @@ -1,5 +1,2 @@
5.4 -config-lcattributes.diff
5.5 -config-ldap-loglevel.diff
5.6 -directory-lcattributes.diff
5.7 index-config-path.diff
5.8 config-log-path.diff