gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include sieveutils.class.php, 1.9, 1.10

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	sieveutils.class.php 
Log Message:
Ensure the regex does not grab too much content. When we combine the different sieve scripts the regular expression matching should be as precise as possible.

Index: sieveutils.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/sieveutils.class.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sieveutils.class.php	12 Apr 2005 10:50:17 -0000	1.9
+++ sieveutils.class.php	31 Mar 2010 19:28:26 -0000	1.10
@@ -30,7 +30,7 @@
   
   /*static*/ function getDeliverFolder( $script ) {
     $inbox = false;      
-	if( preg_match("/fileinto \"INBOX\/(.*)\";/", $script, $regs ) ) {
+	if( preg_match("/fileinto \"INBOX\/([^\"]*)\";/", $script, $regs ) ) {
 	  $inbox = $regs[1];
 	}
     return $inbox;
@@ -99,14 +99,3 @@
     // TODO
   }
 };
-
-/*
-  Local variables:
-  mode: php
-  indent-tabs-mode: t
-  tab-width: 4
-  buffer-file-coding-system: utf-8
-  End:
-  vim:encoding=utf-8:
- */
-?>
\ No newline at end of file