gunnar: server/horde/fbview-horde conf.php, 1.6, 1.7 fbview-horde.spec, 1.13, 1.14

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv32740/horde/fbview-horde

Modified Files:
	conf.php fbview-horde.spec 
Log Message:
kolab/issue2134 ([Horde] Unable to send message with attachments)

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/conf.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- conf.php	4 Sep 2007 09:35:40 -0000	1.6
+++ conf.php	7 Nov 2007 10:37:53 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: horde/config/conf.xml,v 1.183 2007/05/21 15:17:40 slusarz Exp $
+// $Horde: horde/config/conf.xml,v 1.194 2007/07/30 15:47:32 chuck Exp $
 $conf['vhosts'] = false;
 $conf['debug_level'] = E_ALL;
 $conf['max_exec_time'] = 0;
@@ -9,6 +9,7 @@
 $conf['use_ssl'] = 2;
 $conf['server']['name'] = $_SERVER['SERVER_NAME'];
 $conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['safe_ips'] = array();
 $conf['session']['name'] = 'Horde';
 $conf['session']['use_only_cookies'] = true;
 $conf['session']['cache_limiter'] = 'nocache';
@@ -39,7 +40,8 @@
 $conf['datatree']['driver'] = 'null';
 $conf['group']['driver'] = 'datatree';
 $conf['group']['cache'] = false;
-$conf['share']['cache'] = false;
+$conf['share']['no_sharing'] = false;
+$conf['share']['cache'] = true;
 $conf['share']['driver'] = 'kolab';
 $conf['cache']['default_lifetime'] = 1800;
 $conf['cache']['params']['dir'] = Horde::getTempDir();
@@ -49,7 +51,9 @@
 $conf['token']['driver'] = 'none';
 $conf['mailer']['params']['auth'] = '0';
 $conf['mailer']['type'] = 'smtp';
-$conf['vfs']['params']['vfsroot'] = '/tmp';
+$conf['mailformat']['brokenrfc2231'] = false;
+$conf['tmpdir'] = dirname(__FILE__) . '/../../../tmp/fbview';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../../../tmp/fbview';
 $conf['vfs']['type'] = 'file';
 $conf['sessionhandler']['type'] = 'none';
 $conf['image']['convert'] = '/usr/bin/convert';
@@ -79,7 +83,7 @@
 $conf['kolab']['ldap']['port'] = 389;
 $conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
 $conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
-$conf['kolab']['ldap']['phppw'] = '';
+$conf['kolab']['ldap']['phppw'] = 'dummy';
 $conf['kolab']['imap']['server'] = 'localhost';
 $conf['kolab']['imap']['port'] = 143;
 $conf['kolab']['imap']['sieveport'] = 2000;
@@ -89,6 +93,7 @@
 $conf['kolab']['smtp']['port'] = 25;
 $conf['kolab']['misc']['multidomain'] = false;
 $conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
 /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
 if (file_exists(dirname(__FILE__) . '/kolab.php')) {
   require_once(dirname(__FILE__) . '/kolab.php');

Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fbview-horde.spec	14 Oct 2007 12:31:58 -0000	1.13
+++ fbview-horde.spec	7 Nov 2007 10:37:53 -0000	1.14
@@ -2,8 +2,8 @@
 %define         V_horde_name horde
 %define         V_package fbview-%{V_horde_name}
 %define         V_year  2007
-%define         V_month 10
-%define         V_day   13
+%define         V_month 11
+%define         V_day   01
 %define         V_version 3.2_alpha
 %define         V_uver    3.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -70,6 +70,7 @@
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/fbview
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp/fbview
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	cd %{V_horde_name}-%{V_uver}
@@ -90,6 +91,7 @@
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
  	    %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/fbview \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/fbview \
 	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-horde-conf.template'\
 	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php'    \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/conf.php'    \