2 commits - doc/sample-kolab.conf lib/Conf.php
Aleksander Machniak
machniak at kolabsys.com
Tue Sep 10 13:04:07 CEST 2013
doc/sample-kolab.conf | 24 ++++++++++++------------
lib/Conf.php | 7 ++++---
2 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit c3844db0cb15b058828738f359f25debcf995d23
Author: Aleksander Machniak <alec at alec.pl>
Date: Tue Sep 10 13:03:45 2013 +0200
Move primary_mail and secondary_mail to [kolab] section
diff --git a/doc/sample-kolab.conf b/doc/sample-kolab.conf
index 61ddf11..7b3702a 100644
--- a/doc/sample-kolab.conf
+++ b/doc/sample-kolab.conf
@@ -17,6 +17,18 @@ mta = postfix
archving = openbenno
default_quota = 2097152
virtual_domains = userid
+primary_mail = %(givenname)s.%(surname)s@%(domain)s
+secondary_mail = {
+ 0: {
+ "{0}.{1}@{2}": "format('%(givenname)s'[0:1].capitalize(), '%(surname)s', '%(domain)s')"
+ },
+ 1: {
+ "{0}@{1}": "format('%(uid)s', '%(domain)s')"
+ },
+ 2: {
+ "{0}@{1}": "format('%(givenname)s.%(surname)s', '%(domain)s')"
+ }
+ }
[ldap]
uri = ldap://ldap.klab.cc
@@ -76,15 +88,3 @@ result_attribute = mail
[klab.cc]
default_quota = 131072
-primary_mail = %(givenname)s.%(surname)s@%(domain)s
-secondary_mail = {
- 0: {
- "{0}.{1}@{2}": "format('%(givenname)s'[0:1].capitalize(), '%(surname)s', '%(domain)s')"
- },
- 1: {
- "{0}@{1}": "format('%(uid)s', '%(domain)s')"
- },
- 2: {
- "{0}@{1}": "format('%(givenname)s.%(surname)s', '%(domain)s')"
- }
- }
commit 55f414ca1144995d55768d4c679f2b70308882b0
Author: Aleksander Machniak <alec at alec.pl>
Date: Tue Sep 10 13:01:57 2013 +0200
Removed fallback to primary domain section in Conf::get_raw()
diff --git a/lib/Conf.php b/lib/Conf.php
index 01ea946..6131850 100644
--- a/lib/Conf.php
+++ b/lib/Conf.php
@@ -112,19 +112,20 @@ class Conf {
}
// If section is specified, but requested setting doesn't exist there
- // we'll fall back to (global) 'kolab' and primary domain section (in this order).
+ // we fall back to (global) 'kolab' section
if ($key2) {
if (isset($this->_conf['kolab'][$key2])) {
return $this->_conf['kolab'][$key2];
}
-
+/*
+ // fall back to primary domain section
$primary_domain = $this->_conf['kolab']['primary_domain'];
if ($primary_domain && isset($this->_conf[$primary_domain])) {
if (isset($this->_conf[$primary_domain][$key2])) {
return $this->_conf[$primary_domain][$key2];
}
}
-
+*/
return null;
}
More information about the commits
mailing list