From 698abcb8fcd31dc6c8e681a48270108b6ad6f939 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 14 May 2010 06:32:31 +0000
Subject: [PATCH] Updated configViewer and its migration handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18405 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../class_migrateRDN.inc}                         | 15 +++++++++------
 .../migration/class_migrate_groupRDN.inc          |  6 ++++++
 .../migration/class_migrate_userRDN.inc           |  6 ++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
 rename gosa-core/plugins/addons/configViewer/{class_migrate_userRDN.inc => migration/class_migrateRDN.inc} (95%)
 create mode 100644 gosa-core/plugins/addons/configViewer/migration/class_migrate_groupRDN.inc
 create mode 100644 gosa-core/plugins/addons/configViewer/migration/class_migrate_userRDN.inc

diff --git a/gosa-core/plugins/addons/configViewer/class_migrate_userRDN.inc b/gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc
similarity index 95%
rename from gosa-core/plugins/addons/configViewer/class_migrate_userRDN.inc
rename to gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc
index bdfb02b54..ce3d1a859 100644
--- a/gosa-core/plugins/addons/configViewer/class_migrate_userRDN.inc
+++ b/gosa-core/plugins/addons/configViewer/migration/class_migrateRDN.inc
@@ -1,12 +1,13 @@
 <?php
 
 
-class migrate_userRDN implements propertyMigration
-{
-    private $property = NULL;
-    private $config = NULL;
 
-    private $found = array();
+class migrateRDN implements propertyMigration
+{
+    protected $property = NULL;
+    protected $config = NULL;
+    protected $found = array();
+    protected $filter ="";
 
     function __construct($config,$property)
     {
@@ -36,7 +37,8 @@ class migrate_userRDN implements propertyMigration
         }
 
         // Search for users
-        $ldap->search("(&(objectClass=gosaAccount)(!(objectClass=sambaSamAccount)){$dnMatch})",array('dn'));
+        $filter = sprintf($this->filter,$dnMatch);
+        $ldap->search($filter,array('dn'));
         $found = FALSE;
         while($attrs = $ldap->fetch()){
             $dn = $attrs['dn'];
@@ -144,4 +146,5 @@ class migrate_userRDN implements propertyMigration
     }
 } 
 
+
 ?>
diff --git a/gosa-core/plugins/addons/configViewer/migration/class_migrate_groupRDN.inc b/gosa-core/plugins/addons/configViewer/migration/class_migrate_groupRDN.inc
new file mode 100644
index 000000000..0a75c2b98
--- /dev/null
+++ b/gosa-core/plugins/addons/configViewer/migration/class_migrate_groupRDN.inc
@@ -0,0 +1,6 @@
+<?php
+class migrate_groupRDN extends migrateRDN implements propertyMigration 
+{
+    protected $filter = "(&(objectClass=posixGroup)%s)";
+}
+?>
diff --git a/gosa-core/plugins/addons/configViewer/migration/class_migrate_userRDN.inc b/gosa-core/plugins/addons/configViewer/migration/class_migrate_userRDN.inc
new file mode 100644
index 000000000..90782a777
--- /dev/null
+++ b/gosa-core/plugins/addons/configViewer/migration/class_migrate_userRDN.inc
@@ -0,0 +1,6 @@
+<?php
+class migrate_userRDN extends migrateRDN implements propertyMigration 
+{
+    protected $filter = "(&(objectClass=gosaAccount)(!(objectClass=sambaSamAccount))%s)";
+}
+?>
-- 
2.30.2