gunnar: server/patches/horde/imp-3.2-rc2 HK-GW-Config_imp-3.2-rc2.patch, NONE, 1.1

cvs at kolab.org cvs at kolab.org
Wed Feb 20 18:35:17 CET 2008


Author: gunnar

Update of /kolabrepository/server/patches/horde/imp-3.2-rc2
In directory doto:/tmp/cvs-serv32120/imp-3.2-rc2

Added Files:
	HK-GW-Config_imp-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_imp-3.2-rc2.patch ---
diff -r 18399a1e2037 imp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imp/config/conf.php	Tue Feb 19 13:28:57 2008 +0100
@@ -0,0 +1,65 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: imp/config/conf.xml,v 1.53.2.21 2008/01/03 07:07:57 slusarz Exp $
+$conf['spell']['driver'] = 'aspell';
+$conf['utils']['gnupg'] = '/usr/bin/gpg';
+$conf['utils']['gnupg_keyserver'] = array();
+$conf['utils']['gnupg_timeout'] = 10;
+$conf['utils']['openssl_cafile'] = '/etc/ssl/certs';
+$conf['utils']['openssl_binary'] = '/usr/bin/openssl';
+$conf['menu']['apps'] = array();
+$conf['user']['select_sentmail_folder'] = true;
+$conf['user']['allow_resume_all_in_drafts'] = false;
+$conf['user']['allow_folders'] = true;
+$conf['user']['allow_resume_all'] = false;
+$conf['user']['allow_view_source'] = true;
+$conf['user']['alternate_login'] = false;
+$conf['user']['redirect_on_logout'] = false;
+$conf['user']['select_view'] = true;
+$conf['server']['change_server'] = false;
+$conf['server']['change_port'] = false;
+$conf['server']['change_protocol'] = false;
+$conf['server']['change_smtphost'] = false;
+$conf['server']['change_smtpport'] = false;
+$conf['server']['server_list'] = 'none';
+$conf['server']['fixed_folders'] = array();
+$conf['server']['sort_limit'] = 0;
+$conf['server']['cache_folders'] = false;
+$conf['server']['cachejs'] = false;
+$conf['server']['cachecss'] = false;
+$conf['mailbox']['show_preview'] = true;
+$conf['fetchmail']['show_account_colors'] = false;
+$conf['fetchmail']['size_limit'] = 4000000;
+$conf['mboxcache']['use_mboxcache'] = false;
+$conf['mlistcache']['use_mlistcache'] = false;
+$conf['msgsettings']['filtering']['words'] = './config/filter.txt';
+$conf['msgsettings']['filtering']['replacement'] = '****';
+$conf['spam']['reporting'] = false;
+$conf['notspam']['reporting'] = false;
+$conf['print']['add_printedby'] = false;
+$conf['msg']['prepend_header'] = true;
+$conf['msg']['append_trailer'] = false;
+$conf['compose']['allow_receipts'] = true;
+$conf['compose']['special_characters'] = true;
+$conf['compose']['use_vfs'] = true;
+$conf['compose']['link_all_attachments'] = false;
+$conf['compose']['link_attachments_notify'] = true;
+$conf['compose']['link_attachments'] = true;
+$conf['compose']['attach_size_limit'] = 0;
+$conf['compose']['attach_count_limit'] = 0;
+$conf['compose']['reply_limit'] = 200000;
+$conf['hooks']['vinfo'] = false;
+$conf['hooks']['postlogin'] = false;
+$conf['hooks']['postsent'] = false;
+$conf['hooks']['signature'] = false;
+$conf['hooks']['trailer'] = false;
+$conf['hooks']['fetchmail_filter'] = false;
+$conf['hooks']['mbox_redirect'] = true;
+$conf['hooks']['mbox_icon'] = true;
+$conf['hooks']['spam_bounce'] = false;
+$conf['hooks']['msglist_format'] = false;
+$conf['maillog']['use_maillog'] = true;
+$conf['sentmail']['driver'] = 'none';
+$conf['tasklist']['use_tasklist'] = true;
+$conf['notepad']['use_notepad'] = true;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 18399a1e2037 imp/config/servers.php.dist
--- a/imp/config/servers.php.dist	Tue Feb 19 13:16:57 2008 +0100
+++ b/imp/config/servers.php.dist	Tue Feb 19 13:28:57 2008 +0100
@@ -203,6 +203,8 @@
  *              time, you may want to set this to a lower value.  The minimum
  *              value for this setting is 1.
  */
+
+if (!$GLOBALS['conf']['kolab']['enabled']) {
 
 /* Any entries whose key value ('foo' in $servers['foo']) begin with '_'
  * (an underscore character) will be treated as prompts, and you won't be
@@ -287,6 +289,7 @@
     'realm' => '',
     'preferred' => '',
 );
+}
 
 if ($GLOBALS['conf']['kolab']['enabled']) {
     require_once 'Horde/Kolab.php';





More information about the commits mailing list