gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve Script.php, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve
In directory doto:/tmp/cvs-serv17066/kolab-webadmin/lib/KolabAdmin/Sieve

Modified Files:
	Script.php 
Log Message:
Allow successful writing/reparsing of the generated script. This simplyfies the modified regexes and they should be made more secure later again.

Index: Script.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Script.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Script.php	31 Mar 2010 20:21:37 -0000	1.2
+++ Script.php	31 Mar 2010 21:05:43 -0000	1.3
@@ -51,7 +51,7 @@
 
   /*static*/ function getMailDomain( $script ) {
 	$maildomain = false;
-	if( preg_match( '/if not address :domain :contains "From" "(.*)" { keep; stop; }/i', $script, $regs ) ) {
+	if( preg_match( '/address :domain :contains "From" "(.*)"/i', $script, $regs ) ) {
 	  $maildomain = $regs[1];
 	}
 	return $maildomain;
@@ -59,7 +59,7 @@
   
   /*static*/ function getReactToSpam( $script ) {
 	$spam = false;
-	if( preg_match('/if header :contains "X-Spam-Flag" "YES" { keep; stop; }/i', $script ) ) {
+	if( preg_match('/header :contains "X-Spam-Flag" "YES"/i', $script ) ) {
 	  $spam = true;
 	}
 	return $spam;