From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 5 Jul 2011 13:47:58 +0000 (+0000)
Subject: Updated device RDN to GOsaDeviceRDN
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b7a592f396cf536645c81b544be1657ab7d0813;p=gosa.git

Updated device RDN to GOsaDeviceRDN


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

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc b/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc
index b80756eec..0378c5617 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc
@@ -10,7 +10,7 @@ class DeviceTab extends tabs
         $orig_uuid = $baseobject->orig_deviceUUID;
 
 
-        $rdn = get_ou('Device','DeviceRDN');
+        $rdn = get_ou('Device','GOsaDeviceRDN');
         $cn      = preg_replace('/,/', '\,', $baseobject->cn);
         $cn      = preg_replace('/"/', '\"', $cn);
 
diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc
index 2d3dca35e..c2b102cd5 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc
@@ -49,7 +49,7 @@ class Device extends plugin
             $ui= get_userinfo();
             $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
         } else {
-            $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("Device", "DeviceRDN"), '/')."/i", "", $this->dn);
+            $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("Device", "GOsaDeviceRDN"), '/')."/i", "", $this->dn);
         }
 
         // Prepare the base selector
@@ -307,12 +307,12 @@ class Device extends plugin
             "plProperties" =>
                 array(
                         array(
-                            "name"          => "DeviceRDN",
+                            "name"          => "GOsaDeviceRDN",
                             "type"          => "rdn",
                             "default"       => "ou=devices,ou=systems,",
                             "description"   => _("RDN for device storage."),
                             "check"         => "gosaProperty::isRdn",
-                            "migrate"       => "migrate_deviceRDN",
+                            "migrate"       => "migrate_GOsaDeviceRDN",
                             "group"         => "plugin",
                             "mandatory"     => FALSE
                             ),
diff --git a/gosa-plugins/goto/admin/systems/goto/migration/class_migrate_GOsaDeviceRDN.inc b/gosa-plugins/goto/admin/systems/goto/migration/class_migrate_GOsaDeviceRDN.inc
new file mode 100644
index 000000000..b82e0e0a5
--- /dev/null
+++ b/gosa-plugins/goto/admin/systems/goto/migration/class_migrate_GOsaDeviceRDN.inc
@@ -0,0 +1,6 @@
+<?php 
+class migrate_GOsaDeviceRDN extends migrateRDN implements propertyMigration
+{
+	protected $filter = "(&(objectClass=device)%s)";
+}
+?>