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 e892e454461ea859fbd234e3a116832b979574e6..3474ed0244c7a003b6faef900063718e93ca83c7 100644 (file)
--- 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 6f6d7b52eff6cdce1084a719c3a44c2d7dd5f34e..fa70d041e9ea030a0717f71c2235ba30c2ce04ca 100644 (file)
--- 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);
                 }