gunnar: server/patches/horde-webmail/1.2.0/tg series, 1.2, 1.3 t_GLOBAL_HK_GW_Config.diff, 1.2, 1.3 t_GLOBAL_HK_GW_ConfigOpenPKG.diff, 1.2, 1.3
cvs at kolab.org
cvs at kolab.org
Mon Feb 9 11:01:59 CET 2009
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0/tg
In directory doto:/tmp/cvs-serv25040
Modified Files:
series t_GLOBAL_HK_GW_Config.diff
t_GLOBAL_HK_GW_ConfigOpenPKG.diff
Log Message:
Fix for kolab/issue3309.
Index: series
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/series,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- series 7 Feb 2009 16:40:53 -0000 1.2
+++ series 9 Feb 2009 10:01:57 -0000 1.3
@@ -60,3 +60,5 @@
t_imp_HideGroupwareFolders.diff -p1
t_imp_SC_CH_SecIssues20090128.diff -p1
t_horde_SC_CH_SecIssues20090128.diff -p1
+t_dimp_H_MS_FixBrokenFolderImages.diff -p1
+t_dimp_HK_GW_ItipHandling.diff -p1
Index: t_GLOBAL_HK_GW_Config.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_Config.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_GLOBAL_HK_GW_Config.diff 7 Feb 2009 16:40:53 -0000 1.2
+++ t_GLOBAL_HK_GW_Config.diff 9 Feb 2009 10:01:57 -0000 1.3
@@ -6,19 +6,20 @@
Signed-off-by: Gunnar Wrobel <p at rdus.de>
---
- horde-webmail/config/conf.php | 118 ++++++++++++++
+ horde-webmail/.gitignore | 2 +
+ horde-webmail/config/conf.php | 116 ++++++++++++++
horde-webmail/config/hooks.php | 52 +++----
- horde-webmail/config/kolab.php | 37 +++++
+ horde-webmail/config/kolab.php | 40 +++++
horde-webmail/config/prefs.php | 4 +-
horde-webmail/config/registry.php | 2 +-
horde-webmail/dimp/config/servers.php | 255 ++++++++++++++++++++++++++++++
horde-webmail/imp/config/conf.php | 14 +-
horde-webmail/imp/config/hooks.php | 7 +
- horde-webmail/imp/config/servers.php | 34 +++-
+ horde-webmail/imp/config/servers.php | 67 +++++++-
horde-webmail/ingo/config/backends.php | 4 +
horde-webmail/ingo/config/conf.php | 3 +-
horde-webmail/kronolith/config/conf.php | 15 +-
- horde-webmail/kronolith/config/kolab.php | 10 ++
+ horde-webmail/kronolith/config/kolab.php | 13 ++
horde-webmail/lib/core.php | 6 +
horde-webmail/log/.htaccess | 1 +
horde-webmail/mnemo/config/conf.php | 5 +-
@@ -27,14 +28,24 @@
horde-webmail/tmp/.htaccess | 1 +
horde-webmail/turba/config/conf.php | 4 +-
horde-webmail/turba/config/sources.php | 248 +++++++++++++++++++++++++++++
- 21 files changed, 763 insertions(+), 62 deletions(-)
+ 22 files changed, 802 insertions(+), 62 deletions(-)
+diff --git a/horde-webmail/.gitignore b/horde-webmail/.gitignore
+index ce4c292..f986bb5 100644
+--- a/horde-webmail/.gitignore
++++ b/horde-webmail/.gitignore
+@@ -1,3 +1,5 @@
+ tmp/*
+ log/*
+ storage/*
++config/kolab.local.php
++kronolith/config/kolab.local.php
diff --git a/horde-webmail/config/conf.php b/horde-webmail/config/conf.php
new file mode 100644
-index 0000000..54a82b5
+index 0000000..f5c85a6
--- /dev/null
+++ b/horde-webmail/config/conf.php
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,116 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
@@ -67,10 +78,8 @@
+$conf['auth']['checkbrowser'] = true;
+$conf['auth']['alternate_login'] = false;
+$conf['auth']['redirect_on_logout'] = false;
-+$conf['auth']['params']['login_block'] = true;
-+$conf['auth']['params']['login_block_count'] = 3;
-+$conf['auth']['params']['login_block_time'] = 5;
-+$conf['auth']['driver'] = 'kolab';
++$conf['auth']['params']['app'] = 'imp';
++$conf['auth']['driver'] = 'application';
+$conf['signup']['allow'] = false;
+$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['ident'] = 'HORDE';
@@ -218,10 +227,10 @@
diff --git a/horde-webmail/config/kolab.php b/horde-webmail/config/kolab.php
new file mode 100644
-index 0000000..1adecaf
+index 0000000..57a5a43
--- /dev/null
+++ b/horde-webmail/config/kolab.php
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,40 @@
+<?php
+/* Add additional admins here */
+$conf['auth']['admins'] = array('manager');
@@ -258,7 +267,10 @@
+
+/* Primary mail domain of your Kolab server */
+$conf['kolab']['imap']['maildomain'] = 'example.com';
-+?>
++
++if (file_exists(dirname(__FILE__) . '/kolab.local.php')) {
++ require_once(dirname(__FILE__) . '/kolab.local.php');
++}
diff --git a/horde-webmail/config/prefs.php b/horde-webmail/config/prefs.php
index d8e4c75..52c7730 100644
--- a/horde-webmail/config/prefs.php
@@ -616,10 +628,10 @@
// Sample function for returning the quota. Uses the PECL ssh2
diff --git a/horde-webmail/imp/config/servers.php b/horde-webmail/imp/config/servers.php
-index 0e2acc5..30962f3 100644
+index 0e2acc5..1c6e537 100644
--- a/horde-webmail/imp/config/servers.php
+++ b/horde-webmail/imp/config/servers.php
-@@ -226,10 +226,30 @@ $servers['_prompt'] = array(
+@@ -226,10 +226,63 @@ $servers['_prompt'] = array(
/* Example configurations: */
@@ -631,28 +643,61 @@
- 'port' => 143,
-);
+if ($GLOBALS['conf']['kolab']['enabled']) {
-+ require_once 'Horde/Kolab.php';
+
-+ if (!is_callable('Kolab', 'getServer')) {
-+ $server = $GLOBALS['conf']['kolab']['imap']['server'];
++ if (isset($_SESSION['imp']['user']) && isset($_SESSION['imp']['pass'])) {
++ require_once 'Horde/Kolab/Session.php';
++ $session = Horde_Kolab_Session::singleton($_SESSION['imp']['user'],
++ array('password' => Secret::read(Secret::getKey('imp'), $_SESSION['imp']['pass'])));
++ $imapParams = $session->getImapParams();
++ if (is_a($imapParams, 'PEAR_Error')) {
++ $useDefaults = true;
++ } else {
++ $useDefaults = false;
++ }
++ $_SESSION['imp']['uniquser'] = $session->user_mail;
+ } else {
-+ $server = Kolab::getServer('imap');
++ $useDefaults = true;
++ }
++
++ if ($useDefaults) {
++ require_once 'Horde/Kolab.php';
++
++ if (is_callable('Kolab', 'getServer')) {
++ $server = Kolab::getServer('imap');
++ if (is_a($server, 'PEAR_Error')) {
++ $useDefaults = true;
++ } else {
++ $useDefaults = false;
++ }
++ } else {
++ $useDefaults = true;
++ }
++
++ if ($useDefaults) {
++ $server = $GLOBALS['conf']['kolab']['imap']['server'];
++ }
++
++ $imapParams = array(
++ 'hostspec' => $server,
++ 'port' => $GLOBALS['conf']['kolab']['imap']['port'],
++ 'protocol' => $GLOBALS['conf']['auth']['params']['protocol']
++ );
+ }
+
+ $servers['kolab'] = array(
-+ 'name' => 'Kolab Cyrus IMAP Server',
-+ 'server' => $server,
-+ 'hordeauth' => 'full',
-+ 'protocol' => 'imap/notls/novalidate-cert',
-+ 'port' => $GLOBALS['conf']['kolab']['imap']['port'],
++ 'name' => 'Kolab Cyrus IMAP Server',
++ 'hordeauth' => 'full',
++ 'server' => $imapParams['hostspec'],
++ 'port' => $imapParams['port'],
++ 'protocol' => $imapParams['protocol'],
+ 'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'],
-+ 'realm' => '',
-+ 'preferred' => '',
-+ 'quota' => array(
++ 'realm' => '',
++ 'preferred' => '',
++ 'quota' => array(
+ 'driver' => 'imap',
+ 'params' => array('hide_quota_when_unlimited' => true),
+ ),
-+ 'acl' => array(
++ 'acl' => array(
+ 'driver' => 'rfc2086',
+ ),
+ );
@@ -725,10 +770,10 @@
+}
diff --git a/horde-webmail/kronolith/config/kolab.php b/horde-webmail/kronolith/config/kolab.php
new file mode 100644
-index 0000000..184f42c
+index 0000000..f6b6d2a
--- /dev/null
+++ b/horde-webmail/kronolith/config/kolab.php
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,13 @@
+<?php
+/* Primary mail domain of your Kolab server */
+$conf['storage']['default_domain'] = 'example.com';
@@ -738,7 +783,10 @@
+
+/* The email address of your sys admin */
+$conf['reminder']['from_addr'] = 'hostmaster at example.com';
-+?>
++
++if (file_exists(dirname(__FILE__) . '/kolab.local.php')) {
++ require_once(dirname(__FILE__) . '/kolab.local.php');
++}
diff --git a/horde-webmail/lib/core.php b/horde-webmail/lib/core.php
index 3ecd9e5..656dae3 100644
--- a/horde-webmail/lib/core.php
Index: t_GLOBAL_HK_GW_ConfigOpenPKG.diff
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/tg/t_GLOBAL_HK_GW_ConfigOpenPKG.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_GLOBAL_HK_GW_ConfigOpenPKG.diff 7 Feb 2009 16:40:53 -0000 1.2
+++ t_GLOBAL_HK_GW_ConfigOpenPKG.diff 9 Feb 2009 10:01:57 -0000 1.3
@@ -10,10 +10,10 @@
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/horde-webmail/config/conf.php b/horde-webmail/config/conf.php
-index 54a82b5..cf5ce86 100644
+index f5c85a6..ae2acef 100644
--- a/horde-webmail/config/conf.php
+++ b/horde-webmail/config/conf.php
-@@ -43,7 +43,8 @@ $conf['log']['params']['append'] = true;
+@@ -41,7 +41,8 @@ $conf['log']['params']['append'] = true;
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
$conf['log_accesskeys'] = false;
@@ -24,4 +24,4 @@
$conf['alarms']['params']['ttl'] = 300;
$conf['alarms']['driver'] = 'sql';
--
-tg: (7baa33d..) t/GLOBAL/HK/GW/ConfigOpenPKG (depends on: t/GLOBAL/HK/GW/Config)
+tg: (f56e948..) t/GLOBAL/HK/GW/ConfigOpenPKG (depends on: t/GLOBAL/HK/GW/Config)
More information about the commits
mailing list