steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php, 1.10, 1.11

cvs at intevation.de cvs at intevation.de
Wed Mar 9 14:34:04 CET 2005


Author: steffen

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

Modified Files:
	vacation.php 
Log Message:
I think this is how it should work

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vacation.php	9 Mar 2005 02:47:05 -0000	1.10
+++ vacation.php	9 Mar 2005 13:34:02 -0000	1.11
@@ -36,16 +36,15 @@
   if( $_REQUEST['submit'] ) {
 	$addresses = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_REQUEST['addresses'] ) ), 'strlen') );
 	$maildomain = trim( $_REQUEST['maildomain'] );
-	$onlyspam = isset( $_REQUEST['onlyspam'] );
+	$reacttospam = isset( $_REQUEST['reacttospam'] );
 	$script = 
 	  "require \"vacation\";\r\n\r\n".
 	  "require \"fileinto\";\r\n\r\n".
 	  (!empty($maildomain)?"if not address :contains :domain \"From\" \"".$maildomain."\" { keep; stop; }\r\n":"").
-	  ($onlyspam?"if header :contains \"X-Spam-Flag\" \"YES\" {\r\n":"").
+	  ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
 	  "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".
 	  $_REQUEST['days']." text:\r\n".
-	  SieveUtils::dotstuff($_REQUEST['text'])."\r\n.\r\n;\r\n\r\n".
-	  ($onlyspam?"}\r\n":"\r\n");
+	  SieveUtils::dotstuff($_REQUEST['text'])."\r\n.\r\n;\r\n\r\n";
 	$active = isset($_REQUEST['active']);
 
 	if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
@@ -68,7 +67,7 @@
   if( in_array( $scriptname, $scripts ) ) {
 	$script = $sieve->getScript($scriptname);
 	$maildomain = SieveUtils::getMailDomain( $script );
-	$onlyspam = SieveUtils::getOnlySpam( $script );
+	$recttospam = SieveUtils::getReactToSpam( $script );
 	$addresses = SieveUtils::getVacationAddresses( $script );
 	$days = SieveUtils::getVacationDays( $script );
 	$text = SieveUtils::getVacationText( $script );
@@ -107,7 +106,7 @@
 $smarty->assign( 'text', $text );
 $smarty->assign( 'addresses', $addresses );
 $smarty->assign( 'maildomain', $maildomain );
-$smarty->assign( 'onlyspam', $onlyspam );
+$smarty->assign( 'reacttospam', $reacttospam );
 $smarty->assign( 'days', $days );
 $smarty->assign( 'inbox', $inbox );
 $smarty->assign( 'maincontent', 'vacation.tpl' );





More information about the commits mailing list