steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user forward.php, 1.7, 1.8 vacation.php, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv29439/kolab-webadmin/www/admin/user

Modified Files:
	forward.php vacation.php 
Log Message:
inform user that only one script can be active at any time

Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- forward.php	18 Nov 2004 02:16:40 -0000	1.7
+++ forward.php	22 Nov 2004 00:06:41 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¤lvdalens Datakonsult AB
+ *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¤lvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -53,9 +53,6 @@
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   $scripts = $sieve->listScripts();
-
-  // Fetch script data from server
-  $inbox = SieveUtils::getDeliverFolder( $sieve );
   
   // Update sieve script on server in case we have submit data
   if( $_REQUEST['submit'] ) {
@@ -68,9 +65,6 @@
 	} else {
 	  $script = 
 		"require \"fileinto\";\r\nredirect \"".addslashes($address)."\";".($keep?" keep;":"");
-	  if( $inbox ) {
-		$script .= "\r\nif header :contains [\"X-Kolab-Scheduling-Message\"] [\"FALSE\"] {\r\nfileinto \"INBOX/$inbox\";\r\n}\r\n";
-	  }
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vacation.php	18 Nov 2004 02:16:40 -0000	1.7
+++ vacation.php	22 Nov 2004 00:06:41 -0000	1.8
@@ -32,9 +32,6 @@
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   $scripts = $sieve->listScripts();
 
-  // Fetch script data from server
-  $inbox = SieveUtils::getDeliverFolder($sieve);
-
   // Update sieve script on server in case we have submit data
   if( $_REQUEST['submit'] ) {
 	$addresses = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_POST['addresses'] ) ), 'strlen') );
@@ -44,9 +41,6 @@
 	  "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".
 	  $_REQUEST['days']." text:\r\n".
 	  SieveUtils::dotstuff($_REQUEST['text'])."\r\n.\r\n;\r\n\r\n";
-	if( $inbox ) {
-	  $script .= "if header :contains [\"X-Kolab-Scheduling-Message\"] [\"FALSE\"] {\r\nfileinto \"INBOX/$inbox\";\r\n}\r\n";
-	}
 	$active = isset($_REQUEST['active']);
 
 	if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {