From c8744ac3a1ecff55eb2b85d84fb8b2f2f65c5f46 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 30 Mar 2007 10:38:57 +0000 Subject: [PATCH] Updated some comments git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5938 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/sieve/class_My_Parser.inc | 19 ++----------------- include/sieve/class_My_Tree.inc | 4 ++-- include/sieve/class_sieveManagement.inc | 13 ++++--------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/include/sieve/class_My_Parser.inc b/include/sieve/class_My_Parser.inc index 691faf43e..ac99301a6 100644 --- a/include/sieve/class_My_Parser.inc +++ b/include/sieve/class_My_Parser.inc @@ -1,14 +1,15 @@ "; - 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 32bf58a03..99a076f3a 100644 --- a/include/sieve/class_My_Tree.inc +++ b/include/sieve/class_My_Tree.inc @@ -1,7 +1,5 @@ _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 fb6778ba6..1b6fe5885 100644 --- 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'."), -- 2.30.2