From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 5 Nov 2010 15:50:55 +0000 (+0000)
Subject: Updated instance uuid handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b1c445282dce7676d6f0bb9aaaac826dc77c88d8;p=gosa.git

Updated instance uuid handling


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

diff --git a/gosa-core/include/class_stats.inc b/gosa-core/include/class_stats.inc
index ae5be145d..7ec049843 100644
--- a/gosa-core/include/class_stats.inc
+++ b/gosa-core/include/class_stats.inc
@@ -228,7 +228,7 @@ class stats
         }
 
         // Prepare values to be useable within a database
-        $uuid = $config->getGOsaUUID();
+        $uuid = $config->getInstanceUUID();
         $type           = sqlite_escape_string($type);
         $plugin         = sqlite_escape_string($plugin);
         $action         = sqlite_escape_string($action);
@@ -395,7 +395,7 @@ class stats
 
         // Do we have to return the result as SQL INSERT statement?
         if($statisticConformResult){ 
-            $uuid           = $config->getGOsaUUID();
+            $uuid           = $config->getInstanceUUID();
             $type           = 'objectCount';
             $plugin         = '';
             $action         = '';
diff --git a/gosa-core/plugins/generic/dashBoard/Register/class_RegisterGOsa.inc b/gosa-core/plugins/generic/dashBoard/Register/class_RegisterGOsa.inc
index 66fbc8ecf..735f3197b 100644
--- a/gosa-core/plugins/generic/dashBoard/Register/class_RegisterGOsa.inc
+++ b/gosa-core/plugins/generic/dashBoard/Register/class_RegisterGOsa.inc
@@ -97,6 +97,10 @@ class GOsaRegistration extends plugin
 
     static function isRegistered($config, $uuid = NULL)
     {
+        // Get the GOsa-instance-uuid and ask the backend if a registration of this uuid is known.
+        $instanceUUID = $config->getInstanceUUID();
+        echo $instanceUUID;
+    
         $status = $config->configRegistry->getPropertyValue('GOsaRegistration','registerStatus');
         if(!$uuid){
             $uuid = $config->configRegistry->getPropertyValue('GOsaRegistration','registeredUUID');