From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 4 May 2010 13:25:37 +0000 (+0000)
Subject: Updated config viewer
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=491d472ccb334401bde14e080a21f1c9b312d896;p=gosa.git

Updated config viewer


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

diff --git a/gosa-core/plugins/addons/configViewer/class_configViewer.inc b/gosa-core/plugins/addons/configViewer/class_configViewer.inc
index a655a26c4..74e2ddc78 100644
--- a/gosa-core/plugins/addons/configViewer/class_configViewer.inc
+++ b/gosa-core/plugins/addons/configViewer/class_configViewer.inc
@@ -1,9 +1,35 @@
 <?php
 
-class configViewer extends plugin
+
+class configViewer extends management
 {
     var $plHeadline= "Preferences";
     var $plDescription= "Configure global and special GOsa settings like hooks and plugin parameters";
+    var $plIcon  = "plugins/configViewer/images/plugin.png";
+
+    function __construct($config,$ui)
+    {
+        $this->config = $config;
+        $this->ui = $ui;
+
+        // Build filter
+        if (0&&session::global_is_set(get_class($this)."_filter")){
+            $filter= session::global_get(get_class($this)."_filter");
+        } else {
+            $filter = new filter(get_template_path("property-filter.xml", true));
+            $filter->setObjectStorage($this->storagePoints);
+        }
+        $this->setFilter($filter);
+
+        // Build headpage
+        $headpage = new listing(get_template_path("property-list.xml", true));
+        $headpage->setFilter($filter);
+        parent::__construct($config, $ui, "property", $headpage);
+    }
+}
+
+class configViewer_old extends plugin
+{
 
     var $configRegistry = NULL;    
     var $viewType = 'byClass';
diff --git a/gosa-core/plugins/addons/configViewer/class_filterProperties.inc b/gosa-core/plugins/addons/configViewer/class_filterProperties.inc
new file mode 100644
index 000000000..85975aeea
--- /dev/null
+++ b/gosa-core/plugins/addons/configViewer/class_filterProperties.inc
@@ -0,0 +1,23 @@
+<?php
+
+class filterProperties {
+
+  static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
+  {
+    print_a(array($base, $scope, $filter, $attributes, $category, $objectStorage));
+    return(array());
+  }
+
+  static function unifyResult($result)
+  {
+    $res=array();
+    foreach($result as $entry){
+      if(!isset($res[$entry['dn']])){
+        $res[$entry['dn']]=$entry;
+      }
+    }
+    return(array_values($res)); 
+  }
+}
+
+?>
diff --git a/gosa-core/plugins/addons/configViewer/main.inc b/gosa-core/plugins/addons/configViewer/main.inc
index 27444ad41..1737aa979 100644
--- a/gosa-core/plugins/addons/configViewer/main.inc
+++ b/gosa-core/plugins/addons/configViewer/main.inc
@@ -47,7 +47,6 @@ if ( $cleanup ){
     $configViewer = session::get('configViewer');
 
     /* Execute formular */
-    $display= $configViewer->save_object();
     $display= $configViewer->execute ();
     $display.= "<input type=\"hidden\" name=\"ignore\">\n";