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 ae5be145d2390369664bff3d7ea88f380e145a12..7ec049843a3a752ce5f52d25d72aa1236cb09b10 100644 (file)
--- 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 66fbc8ecfe7f8ad3b8bd36c4a2e779b7944f8676..735f3197bb4d44ead8b4dbf75a2e2f856c1dd0f9 100644 (file)
--- 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');