# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1408205173 -7200
# Node ID 4bbc66ecef8df903cbd6490110f3be917ecf308f
# Parent  8c6660bb507862ec24cbbd6aa1cc05e1c193ee07
Removed apparently obsolete patches.

diff -r 8c6660bb5078 -r 4bbc66ecef8d debian/patches/config-lcattributes.diff
--- a/debian/patches/config-lcattributes.diff	Sat Aug 16 17:55:09 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- a/config/config.ini.sample
-+++ b/config/config.ini.sample
-@@ -48,6 +48,7 @@
- base_dn = "dc=yourdomain,dc=com"
- filter = "(&(objectClass=kolabInetOrgPerson)(|(uid=%s)(mail=%s)(alias=%s)))"
- attributes[] = mail
-+lc_attributes[] = mail
- fbsource = file:/www/kolab-freebusy/data/%mail.ifb
- loglevel = 100  ; Debug
- 
diff -r 8c6660bb5078 -r 4bbc66ecef8d debian/patches/config-ldap-loglevel.diff
--- a/debian/patches/config-ldap-loglevel.diff	Sat Aug 16 17:55:09 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- a/config/config.ini.sample
-+++ b/config/config.ini.sample
-@@ -50,7 +50,7 @@
- attributes[] = mail
- lc_attributes[] = mail
- fbsource = file:/www/kolab-freebusy/data/%mail.ifb
--loglevel = 100  ; Debug
-+loglevel = 300  ; Warn
- 
- ;; external MS Exchange 2010 server
- [directory "exchange"]
diff -r 8c6660bb5078 -r 4bbc66ecef8d debian/patches/directory-lcattributes.diff
--- a/debian/patches/directory-lcattributes.diff	Sat Aug 16 17:55:09 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- a/lib/Kolab/FreeBusy/Directory.php
-+++ b/lib/Kolab/FreeBusy/Directory.php
-@@ -53,7 +53,7 @@
- 			$fbsource = $this->config['fbsource'];
- 			if ($source = Source::Factory($fbsource)) {
- 				// forward request to Source instance
--				if ($data = $source->getFreeBusyData($user, $extended)) {
-+				if ($data = $source->getFreeBusyData($this->postprocessAttrib($user), $extended)) {
- 					// send data through the according format converter
- 					$converter = Format::factory($this->config['format']);
- 					$data = $converter->toVCalendar($data);
-@@ -66,4 +66,19 @@
- 		return false;
- 	}
- 
-+	/**
-+	 * Modify attribute values according to config
-+	 */
-+	protected function postprocessAttrib($attrib)
-+	{
-+		if (!empty($this->config['lc_attributes'])) {
-+			foreach ((array)$this->config['lc_attributes'] as $key) {
-+				if (!empty($attrib[$key]))
-+					$attrib[$key] = strtolower($attrib[$key]);
-+			}
-+		}
-+
-+		return $attrib;
-+	}
-+
- }
-\ No newline at end of file
diff -r 8c6660bb5078 -r 4bbc66ecef8d debian/patches/index-config-path.diff
--- a/debian/patches/index-config-path.diff	Sat Aug 16 17:55:09 2014 +0200
+++ b/debian/patches/index-config-path.diff	Sat Aug 16 18:06:13 2014 +0200
@@ -1,5 +1,5 @@
---- a/web/index.php
-+++ b/web/index.php
+--- a/public_html/index.php
++++ b/public_html/index.php
 @@ -26,6 +26,7 @@
  
  
@@ -8,12 +8,12 @@
  
  // suppress error notices
  ini_set('error_reporting', E_ALL &~ E_NOTICE);
-@@ -41,7 +42,7 @@
+@@ -42,7 +43,7 @@
  
  
  // load config
--$config = Config::getInstance(KOLAB_FREEBUSY_ROOT . '/config');
-+$config = Config::getInstance(KOLAB_FREEBUSY_CONFIG_ROOT);
- if ($config->isValid()) {
+-$config = Config::get_instance(KOLAB_FREEBUSY_ROOT . '/config');
++$config = Config::get_instance(KOLAB_FREEBUSY_CONFIG_ROOT);
+ if ($config->valid()) {
  	// check for trusted IP first
  	$remote_ip = Utils::remoteIP();
diff -r 8c6660bb5078 -r 4bbc66ecef8d debian/patches/series
--- a/debian/patches/series	Sat Aug 16 17:55:09 2014 +0200
+++ b/debian/patches/series	Sat Aug 16 18:06:13 2014 +0200
@@ -1,5 +1,2 @@
-config-lcattributes.diff
-config-ldap-loglevel.diff
-directory-lcattributes.diff
 index-config-path.diff
 config-log-path.diff