From 72fb2e186b2f815f0fecdf71a6bc66ea676be72f Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 10 Mar 2010 09:32:26 +0000
Subject: [PATCH] Updated filterClass names

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16367 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../modern/{filterEditor.tpl => userFilter.tpl}      |  0
 .../{filterEditorEntry.tpl => userFilterEditor.tpl}  |  2 +-
 gosa-core/include/class_filterEditor.inc             | 12 ++++++------
 gosa-core/include/class_filterEditorEntry.inc        |  8 ++++----
 gosa-core/include/class_management.inc               |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename gosa-core/ihtml/themes/modern/{filterEditor.tpl => userFilter.tpl} (100%)
 rename gosa-core/ihtml/themes/modern/{filterEditorEntry.tpl => userFilterEditor.tpl} (97%)

diff --git a/gosa-core/ihtml/themes/modern/filterEditor.tpl b/gosa-core/ihtml/themes/modern/userFilter.tpl
similarity index 100%
rename from gosa-core/ihtml/themes/modern/filterEditor.tpl
rename to gosa-core/ihtml/themes/modern/userFilter.tpl
diff --git a/gosa-core/ihtml/themes/modern/filterEditorEntry.tpl b/gosa-core/ihtml/themes/modern/userFilterEditor.tpl
similarity index 97%
rename from gosa-core/ihtml/themes/modern/filterEditorEntry.tpl
rename to gosa-core/ihtml/themes/modern/userFilterEditor.tpl
index 71f5e0fcc..2d94578cd 100644
--- a/gosa-core/ihtml/themes/modern/filterEditorEntry.tpl
+++ b/gosa-core/ihtml/themes/modern/userFilterEditor.tpl
@@ -59,7 +59,7 @@
 
 <hr>
 
-<input type='hidden' value='1' name='filterEditorEntry'>
+<input type='hidden' value='1' name='userFilterEditor'>
 
 <div class="plugin-actions">
   <button type='submit' name='saveFilterSettings'>{msgPool type='saveButton'}</button>
diff --git a/gosa-core/include/class_filterEditor.inc b/gosa-core/include/class_filterEditor.inc
index 9c779ef24..91ae157eb 100644
--- a/gosa-core/include/class_filterEditor.inc
+++ b/gosa-core/include/class_filterEditor.inc
@@ -1,6 +1,6 @@
 <?php
 
-class filterEditor extends plugin 
+class userFilter extends plugin 
 {
   protected $fitlers = array();
   protected $availableCategories = array();
@@ -101,7 +101,7 @@ class filterEditor extends plugin
     }
 
     // Save modified filter entries (edit dialog)
-    if(isset($_POST['saveFilterSettings']) && $this->dialog instanceOf filterEditEntry){
+    if(isset($_POST['saveFilterSettings']) && $this->dialog instanceOf userFilterEditor){
       $this->dialog->save_object();
       $msgs = $this->dialog->check();
       if(count($msgs)){
@@ -136,13 +136,13 @@ class filterEditor extends plugin
     if($action['action'] == 'edit' && count($action['targets']) == 1){
       $key= $this->filterWidget->getKey($action['targets'][0]);
       if(isset($this->filters[$key])){
-        $this->dialog=new filterEditEntry($this->filters[$key], $this->availableCategories);
+        $this->dialog=new userFilterEditor($this->filters[$key], $this->availableCategories);
       }
     }
 
     // Act on new requests
     if(isset($_POST['addFilter'])){
-      $this->dialog=new filterEditEntry(array(), $this->availableCategories);
+      $this->dialog=new userFilterEditor(array(), $this->availableCategories);
     }
 
     // Act on remove requests 
@@ -156,14 +156,14 @@ class filterEditor extends plugin
     }
 
     // Display edit dialog
-    if($this->dialog instanceOf filterEditEntry){
+    if($this->dialog instanceOf userFilterEditor){
       $this->dialog->save_object();
       return($this->dialog->execute());
     }
 
     $smarty = get_smarty();
     $smarty->assign("list", $this->filterWidget->render());
-    return($smarty->fetch(get_template_path('filterEditor.tpl', FALSE)));
+    return($smarty->fetch(get_template_path('userFilter.tpl', FALSE)));
   }
 
 
diff --git a/gosa-core/include/class_filterEditorEntry.inc b/gosa-core/include/class_filterEditorEntry.inc
index 7d347558b..5719106bb 100644
--- a/gosa-core/include/class_filterEditorEntry.inc
+++ b/gosa-core/include/class_filterEditorEntry.inc
@@ -1,6 +1,6 @@
 <?php
 
-class filterEditEntry extends plugin 
+class userFilterEditor extends plugin 
 {
   // The original entry else array(), allows us to perform existence checks.
   public $entry = array();
@@ -71,7 +71,7 @@ class filterEditEntry extends plugin
     $smarty->assign('description', $this->description);
     $smarty->assign('selectedCategories', $this->selectedCategories);
     $smarty->assign('availableCategories', $this->availableCategories);
-    return($smarty->fetch(get_template_path('filterEditorEntry.tpl', FALSE)));
+    return($smarty->fetch(get_template_path('userFilterEditor.tpl', FALSE)));
   }
 
 
@@ -79,7 +79,7 @@ class filterEditEntry extends plugin
    */
   function save_object()
   {
-    if(isset($_POST['filterEditorEntry'])){
+    if(isset($_POST['userFilterEditor'])){
 
       // Get posted strings
       foreach(array('name','description','filter') as $attr){
@@ -132,7 +132,7 @@ class filterEditEntry extends plugin
 
 
   /*! \brief    Transforms the entered values into a filter object (array) which is useable
-   *             for the filterEditor overview dialog.
+   *             for the userFilter overview dialog.
    *  @return   Returns transformed filter data.
    */
   function save()
diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index aec1431f5..4604eecbe 100644
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -189,7 +189,7 @@ class management
   function editFilter()
   {
     $headpage = $this->getHeadpage();
-    $this->dialogObject = new filterEditor($this->config,$headpage->categories);
+    $this->dialogObject = new userFilter($this->config,$headpage->categories);
   }
  
   function renderList()
-- 
2.30.2