From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 31 Aug 2010 13:22:43 +0000 (+0000)
Subject: Fixed problems while removing the groupware extension
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d94c5fcff41810ff074d27480aad9267940a39d1;p=gosa.git

Fixed problems while removing the groupware extension


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

diff --git a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc
index e892e4544..3474ed024 100644
--- a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc
@@ -22,6 +22,8 @@ class filterEditor extends plugin{
     {
         $smarty = get_smarty();
 
+
+
         $smarty->assign('list', $this->filterListing->render());
 
         return($smarty->fetch(get_template_path('filterEditor.tpl',TRUE,dirname(__FILE__))));
diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index 6f6d7b52e..fa70d041e 100644
--- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
@@ -128,9 +128,9 @@ class groupware extends plugin
          ****************/
 
         if(isset($_POST['modify_state'])){
-            if($this->is_account && $this->acl_is_removeable() && $this->mailMethod->accountRemoveAble()){
+            if($this->is_account && $this->acl_is_removeable()){
                 $this->is_account= FALSE;
-            }elseif(!$this->is_account && $this->acl_is_createable() && $this->mailMethod->accountCreateable()){
+            }elseif(!$this->is_account && $this->acl_is_createable()){
                 $this->is_account= TRUE;
             }
         }
@@ -451,7 +451,7 @@ class groupware extends plugin
         if($obj){
 
             /* Replace vacation start and end time */
-            if($this->mailMethod->vacationRangeEnabled()){
+            if($this->enabledFeatures['vacationMessage']){
                 if(preg_match("/%start/",$contents)){
                     $contents = preg_replace("/%start/",$this->vacationStart,$contents);
                 }