steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user forward.php, 1.4, 1.5 vacation.php, 1.4, 1.5
cvs at intevation.de
cvs at intevation.de
Thu Sep 2 00:18:07 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv15631/www/admin/user
Modified Files:
forward.php vacation.php
Log Message:
contact homeserver instead of localhost for sieve
Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- forward.php 9 Aug 2004 10:42:35 -0000 1.4
+++ forward.php 1 Sep 2004 22:18:05 -0000 1.5
@@ -49,7 +49,8 @@
// this is the name KDE client stores - so we can also change the setting from KDE client
$scriptname = "kmail-forward.siv";
if( !$errors ) {
- $sieve =& new Net_Sieve( $auth->uid(), $auth->password() );
+ $obj = $ldap->read( $auth->dn() );
+ $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
// Update sieve script on server in case we have submit data
@@ -118,5 +119,6 @@
tab-width: 4
buffer-file-coding-system: utf-8
End:
+ vim:encoding=utf-8:
*/
?>
Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vacation.php 3 Aug 2004 22:58:00 -0000 1.4
+++ vacation.php 1 Sep 2004 22:18:05 -0000 1.5
@@ -1,6 +1,6 @@
<?php
/*
- (c) 2004 Klarälvdalens Datakonsult AB
+ (c) 2004 Klarälvdalens Datakonsult AB
This program is Free Software under the GNU General Public License (>=v2).
Read the file COPYING that comes with this packages for details.
@@ -36,7 +36,8 @@
/**** Sieve handling ***/
$scriptname = 'kmail-vacation.siv';
if( !$errors ) {
- $sieve =& new Net_Sieve( $auth->uid(), $auth->password() );
+ $obj = $ldap->read( $auth->dn() );
+ $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
// Update sieve script on server in case we have submit data
if( $_REQUEST['submit'] ) {
@@ -130,5 +131,6 @@
tab-width: 4
buffer-file-coding-system: utf-8
End:
+ vim:encoding=utf-8:
*/
?>
More information about the commits
mailing list