steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include sieveutils.class.php, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	sieveutils.class.php 
Log Message:
Fix for Issue597 (vacation broken)

Index: sieveutils.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/sieveutils.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sieveutils.class.php	16 Dec 2004 21:03:29 -0000	1.3
+++ sieveutils.class.php	7 Jan 2005 12:53:36 -0000	1.4
@@ -28,47 +28,38 @@
     return str_replace( "\n..", "\n.", $str );
   }
   
-  /*static*/ function getDeliverFolder( &$sieve ) {
-    $scriptname = 'kolab-deliver.siv';
-    $inbox = false;
-    $scripts = $sieve->listScripts();
-    if( in_array( $scriptname, $scripts ) ) {
-      $deliverscript = $sieve->getScript( $scriptname );
-      
-      if( ereg('fileinto "INBOX/(.*)";', $deliverscript, $regs ) ) {
-	$inbox = $regs[1];
-      }
-    }
+  /*static*/ function getDeliverFolder( $script ) {
+    $inbox = false;      
+	if( preg_match("/fileinto \"INBOX/(.*)\";/", $script, $regs ) ) {
+	  $inbox = $regs[1];
+	}
     return $inbox;
   }
 
-  /*static*/ function getVacationAddresses( &$sieve ) {
-    $script = $sieve->getScript( 'kolab-vacation.siv' );
+  /*static*/ function getVacationAddresses( $script ) {
     $addresses = false;
-    if( ereg(':addresses \[([^\]]*)\]', $script, $regs ) ) {
+    if( preg_match("/:addresses \\[([^\\]]*)\\]/s", $script, $regs ) ) {
       $tmp = split(',', $regs[1] );
       $addresses = array();
       foreach( $tmp as $a ) {
-	if( ereg('^ *"(.*)" *$', $a, $regs ) ) $addresses[] = $regs[1];
-	else $addresses[] = $a;
+		if( ereg('^ *"(.*)" *$', $a, $regs ) ) $addresses[] = $regs[1];
+		else $addresses[] = $a;
       }
     }
     return $addresses;
   }
 
-  /*static*/ function getVacationDays( &$sieve ) {
-    $script = $sieve->getScript( 'kolab-vacation.siv' );
+  /*static*/ function getVacationDays( $script ) {
     $days = false;
-    if( ereg(':days ([0-9]+)', $script, $regs ) ) {
+    if( preg_match("/:days ([0-9]+)/s", $script, $regs ) ) {
       $days = $regs[1];
     }
     return $days;
   }
 
-  /*static*/ function getVacationText( &$sieve ) {
+  /*static*/ function getVacationText( $script ) {
     $text = false;
-    $script = $sieve->getScript( 'kolab-vacation.siv' );
-    if( ereg("text:\r\n(.*)\r\n\\.\r\n", $script, $regs ) ) {
+    if( preg_match("/text:(.*\r\n)\\.\r\n/s", $script, $regs ) ) {
       $text = $regs[1];
       $text = str_replace( '\n', "\r\n", $text );
       $text = SieveUtils::undotstuff($text);
@@ -76,17 +67,15 @@
     return $text;
   }
 
-  /*static*/ function getForwardAddress( &$sieve ) {
+  /*static*/ function getForwardAddress( $script ) {
     $address = false;
-    $script = $sieve->getScript( 'kolab-forward.siv' );
-    if( ereg('redirect "(.*)";', $script, $regs ) ) {
+    if( preg_match("/redirect \"([^\"]*)\"/s", $script, $regs ) ) {
       $address = $regs[1];
     }
     return $address;
   }
 
-  /*static*/ function getKeepOnServer( &$sieve ) {
-    $script = $sieve->getScript( 'kolab-forward.siv' );
+  /*static*/ function getKeepOnServer( $script ) {
     return ereg('"; keep;', $script, $regs );    
   }