steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include debug.php, 1.7, 1.8 sieveutils.class.php, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv3037/kolab-webadmin/php/admin/include

Modified Files:
	debug.php sieveutils.class.php 
Log Message:
Issue700 and Issue701 (vacation issues)

Index: debug.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/debug.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- debug.php	10 Feb 2005 14:41:47 -0000	1.7
+++ debug.php	7 Apr 2005 08:36:08 -0000	1.8
@@ -23,7 +23,7 @@
     return ((float)$usec + (float)$sec); 
 }
 function debug($str) {
-    #print $str.'<br/>';
+    print $str.'<br/>';
 }
 function debug_var_dump($var) {
     #print '<pre>';

Index: sieveutils.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/sieveutils.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sieveutils.class.php	9 Mar 2005 13:34:02 -0000	1.7
+++ sieveutils.class.php	7 Apr 2005 08:36:08 -0000	1.8
@@ -59,7 +59,7 @@
   
   /*static*/ function getReactToSpam( $script ) {
 	$spam = false;
-	if( preg_match('/if header :contains "X-Spam-Flag" "YES" {/', $script ) ) {
+	if( preg_match('/if header :contains "X-Spam-Flag" "YES" { keep; stop; }/', $script ) ) {
 	  $spam = true;
 	}
 	return $spam;