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

cvs at kolab.org cvs at kolab.org
Thu Apr 1 17:10:36 CEST 2010


Author: gunnar

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

Modified Files:
	Sieve.php 
Log Message:
Add the handler for the forward sieve segment.

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Sieve.php	1 Apr 2010 13:38:19 -0000	1.3
+++ Sieve.php	1 Apr 2010 15:10:33 -0000	1.4
@@ -33,6 +33,8 @@
 
     const OLD_SCRIPT_DELIVERY = 'kolab-deliver.siv';
 
+    const OLD_SCRIPT_FORWARD = 'kolab-forward.siv';
+
 
     /**
      * The sieve connection.
@@ -73,11 +75,22 @@
                             $this->_segments['delivery']->setActive();
                         }
                     }
+                    if (in_array(self::OLD_SCRIPT_FORWARD, $scripts)) {
+                        $this->_segments['forward'] = new KolabAdmin_Sieve_Segment_Forward(
+                            $this->_sieve->getScript(self::OLD_SCRIPT_FORWARD)
+                        );
+                        if ($this->_sieve->getActive() == self::OLD_SCRIPT_FORWARD) {
+                            $this->_segments['forward']->setActive();
+                        }
+                    }
                 }
             }
             if (!isset($this->_segments['delivery'])) {
                 $this->_segments['delivery'] = new KolabAdmin_Sieve_Segment_Delivery();
             }
+            if (!isset($this->_segments['forward'])) {
+                $this->_segments['forward'] = new KolabAdmin_Sieve_Segment_Forward();
+            }
         }
     }
 
@@ -105,5 +118,11 @@
     {
         $this->_init();
         return $this->_segments['delivery'];
+    }
+
+    public function fetchForwardSegment()
+    {
+        $this->_init();
+        return $this->_segments['forward'];
     }
 }





More information about the commits mailing list