From a70ea9d7bbf4c08fc0f97501c1b431a4b32389dd Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 6 Sep 2010 12:31:04 +0000 Subject: [PATCH] Updated dialog names git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19527 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../personal/groupware/class_filterEditor.inc | 6 +++--- .../personal/groupware/class_groupware.inc | 16 ++++++++-------- .../personal/groupware/filterEditor.tpl | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc index 1c4284e61..5ee686db8 100644 --- a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc +++ b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc @@ -1,6 +1,6 @@ assign('list', $this->filterListing->render()); - return($smarty->fetch(get_template_path('filterEditor.tpl',TRUE,dirname(__FILE__)))); + return($smarty->fetch(get_template_path('filterManager.tpl',TRUE,dirname(__FILE__)))); } function save_object() @@ -105,7 +105,7 @@ class filterEditor extends plugin{ $key = $this->filterListing->getKey($key); if(isset($this->filter[$key])){ - echo "edit"; + } } } diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc index 6e9b201b2..3a1d53808 100644 --- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc +++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc @@ -47,7 +47,7 @@ class groupware extends plugin "mailBoxHardSizelimitEnabled","mailBoxAutomaticRemovalEnabled","localDeliveryOnly","dropOwnMails"); var $mailAddressSelectDialog = NULL; - var $filterEditor = NULL; + var $filterManager = NULL; var $filterRules = array(); var $vacationTemplates = array(); @@ -114,17 +114,17 @@ class groupware extends plugin Filter editor ****************/ - if(isset($_POST['filterEditor_cancel'])) $this->filterEditor = NULL; + if(isset($_POST['filterManager_cancel'])) $this->filterManager = NULL; if(isset($_POST['configureFilter'])){ - $this->filterEditor = new filterEditor($this->config, $this,$this->filterRules); - $this->filterEditor->acl_base = $this->acl_base; - $this->filterEditor->acl_category = $this->acl_category; + $this->filterManager = new filterManager($this->config, $this,$this->filterRules); + $this->filterManager->acl_base = $this->acl_base; + $this->filterManager->acl_category = $this->acl_category; } $this->dialog = FALSE; - if($this->filterEditor instanceOf filterEditor){ - $this->filterEditor->save_object(); + if($this->filterManager instanceOf filterManager){ + $this->filterManager->save_object(); $this->dialog = TRUE; - return($this->filterEditor->execute()); + return($this->filterManager->execute()); } diff --git a/gosa-plugins/groupware/personal/groupware/filterEditor.tpl b/gosa-plugins/groupware/personal/groupware/filterEditor.tpl index 8c528f1fb..e4f13ae72 100644 --- a/gosa-plugins/groupware/personal/groupware/filterEditor.tpl +++ b/gosa-plugins/groupware/personal/groupware/filterEditor.tpl @@ -13,6 +13,6 @@
- - + +
-- 2.30.2