From 125f2397b4f8704d2d21f64185fe97f19d5c231d Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 2 Aug 2010 13:23:37 +0000
Subject: - Fixed vacation parameters parsing (#1486883)

git-svn-id: https://svn.roundcube.net/trunk@3855 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/managesieve/lib/rcube_sieve.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'plugins/managesieve/lib')

diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php
index 7333d1dcd..7c397254a 100644
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ b/plugins/managesieve/lib/rcube_sieve.php
@@ -751,32 +751,32 @@ class rcube_sieve_script
                 else if(preg_match('/^vacation\s+(.*);$/sm', $content, $matches)) {
                     $vacation = array('type' => 'vacation');
 
-                    if (preg_match('/:(days)\s+([0-9]+)/', $content, $vm)) {
-                        $vacation['days'] = $vm[2];
-                        $content = preg_replace('/:(days)\s+([0-9]+)/', '', $content);
+                    if (preg_match('/:days\s+([0-9]+)/', $content, $vm)) {
+                        $vacation['days'] = $vm[1];
+                        $content = preg_replace('/:days\s+([0-9]+)/', '', $content);
                     }
-                    if (preg_match('/:(subject)\s+(".*?[^\\\]")/', $content, $vm)) {
-                        $vacation['subject'] = $vm[2];
-                        $content = preg_replace('/:(subject)\s+(".*?[^\\\]")/', '', $content);
+                    if (preg_match('/:subject\s+"(.*?[^\\\])"/', $content, $vm)) {
+                        $vacation['subject'] = $vm[1];
+                        $content = preg_replace('/:subject\s+"(.*?[^\\\])"/', '', $content);
                     }
-                    if (preg_match('/:(addresses)\s+\[(.*?[^\\\])\]/', $content, $vm)) {
-                        $vacation['addresses'] = $this->_parse_list($vm[2]);
-                        $content = preg_replace('/:(addresses)\s+\[(.*?[^\\\])\]/', '', $content);
+                    if (preg_match('/:addresses\s+\[(.*?[^\\\])\]/', $content, $vm)) {
+                        $vacation['addresses'] = $this->_parse_list($vm[1]);
+                        $content = preg_replace('/:addresses\s+\[(.*?[^\\\])\]/', '', $content);
                     }
-                    if (preg_match('/:(handle)\s+(".*?[^\\\]")/', $content, $vm)) {
-                        $vacation['handle'] = $vm[2];
-                    $content = preg_replace('/:(handle)\s+(".*?[^\\\]")/', '', $content);
+                    if (preg_match('/:handle\s+"(.*?[^\\\])"/', $content, $vm)) {
+                        $vacation['handle'] = $vm[1];
+                        $content = preg_replace('/:handle\s+"(.*?[^\\\])"/', '', $content);
                     }
-                    if (preg_match('/:(from)\s+(".*?[^\\\]")/', $content, $vm)) {
-                        $vacation['from'] = $vm[2];
-                        $content = preg_replace('/:(from)\s+(".*?[^\\\]")/', '', $content);
+                    if (preg_match('/:from\s+"(.*?[^\\\])"/', $content, $vm)) {
+                        $vacation['from'] = $vm[1];
+                        $content = preg_replace('/:from\s+"(.*?[^\\\])"/', '', $content);
                     }
 
                     $content = preg_replace('/^vacation/', '', $content);
                     $content = preg_replace('/;$/', '', $content);
                     $content = trim($content);
 
-                    if (preg_match('/^:(mime)/', $content, $vm)) {
+                    if (preg_match('/^:mime/', $content, $vm)) {
                         $vacation['mime'] = true;
                         $content = preg_replace('/^:mime/', '', $content);
                     }
-- 
cgit v1.2.3