Updated some comments

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5938 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/sieve/class_My_Parser.inc b/include/sieve/class_My_Parser.inc
index 691faf43e0ed342224067e82bcc9f69676258247..ac99301a6f0406dac55cad68e4cf97fb160530c5 100644 (file)
--- a/include/sieve/class_My_Parser.inc
+++ b/include/sieve/class_My_Parser.inc
@@ -1,14 +1,15 @@
 <?php
 
+/* String used to indent the different code blocks */
 define("SIEVE_INDENT_TAB","  ");
 
+
 /* This class is inherited from the original 'Parser'
  *  class written by Heiko Hund
  */
 class My_Parser extends Parser 
 {
        var $parent = NULL;
-
        var $registeredExtensions_ =array();
 
        function My_Parser($parent)
@@ -69,22 +70,6 @@ class My_Parser extends Parser
        }
 
 
-       /* Should be obsolete in the end. */
-       function dumpToken_(&$token)
-       {
-               if (is_array($token))
-               {
-                       $str = "<" . $token['text'] . "> ";
-                       foreach ($token as $k => $v)
-                       {
-                               $str .= " $k:$v";
-                       }
-                       return $str;
-               }
-               return strval($token);
-       }
-
-
        function dumpParseTree()
        {
                return $this->tree_->execute();

diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index 32bf58a038a7057fc63566053ea443dbea0f1337..99a076f3a7f0d263035c1a58c57a6aa821670714 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /* This class is inherited from the original 'Tree'
  *  class written by Heiko Hund.
  * It is partly rewritten to create a useable html interface 
@@ -23,11 +21,13 @@ class My_Tree extends Tree
     $this->_construct($root);
   }
 
+
   function execute()
   {
     return($this->dump());
   }
 
+
   /* Create a html interface for the current sieve filter 
    */
   function dump()

diff --git a/include/sieve/class_sieveManagement.inc b/include/sieve/class_sieveManagement.inc
index fb6778ba6467107bc48fcb76cf2fa3138d7fe788..1b6fe5885ecdaa427ae5a466367ff6f4e9d89ad5 100644 (file)
--- a/include/sieve/class_sieveManagement.inc
+++ b/include/sieve/class_sieveManagement.inc
@@ -69,12 +69,8 @@ class sieveManagement extends plugin
     $this->parent = $parent;
     plugin::plugin($config,$dn);
 
-    /* Get sieve */
+    /* Get sieve, if this fail abort class initialization */
     if(!$this->sieve_handle = $this->get_sieve()){
-#      print_red(
- #       sprintf(
-  #        _("Can't log into SIEVE server. Server says '%s'."),
-   #       to_string($this->Sieve_Error)));
       return;
     }
 
@@ -128,7 +124,7 @@ class sieveManagement extends plugin
   }
 
 
-  /* Return a sieve class hanlde,
+  /* Return a sieve class handle,
    *  false if login fails
    */
   function get_sieve()
@@ -667,13 +663,12 @@ class sieveManagement extends plugin
       $List ->AddEntry(array($field1,$field2,$field3,$field4,$field6)); 
     }
  
-    /* If the uattrib is empty   (Attribute to use for atuthentification with sieve)
-     *  Display a message that a connection can't be established right now.
+    /* If the uattrib is empty   (Attribute to use for authentification with sieve)
+     *  Display a message that the connection can't be established.
      */
     $uattrib = $this->uattrib;
     $smarty = get_smarty();
 
-
     if(!$this->get_sieve()){
       $smarty->assign("Sieve_Error",sprintf(
         _("Can't log into SIEVE server. Server says '%s'."),