Updated statistics plugin

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

diff --git a/gosa-core/plugins/generic/statistics/class_statistics.inc b/gosa-core/plugins/generic/statistics/class_statistics.inc
index c0937f8f375cf71b9a4f3426d96ad69ea42f50a8..d3b41a28bdae795218db714ecfad14da6643db94 100644 (file)
--- a/gosa-core/plugins/generic/statistics/class_statistics.inc
+++ b/gosa-core/plugins/generic/statistics/class_statistics.inc
@@ -61,15 +61,13 @@ class statistics extends plugin
             $this->graph1DatePicker2 = date('d.m.Y', time());
 
             // First try to retrieve values via RPC
-            $this->rpcConfigured = FALSE;
-            if ($this->config->get_cfg_value("core","gosaRpcServer") != ""){
-                $this->rpcConfigured = TRUE;
-                $this->rpcHandle = $this->config->getRpcHandle(
-                        "http://10.3.64.59:4000",
-                        "65717fe6-9e3e-11df-b010-5452005f1250",
-                        "WyukwauWoid2",
-                        TRUE);
-            }
+            $this->rpcConfigured = TRUE;
+            $this->rpcHandle = $this->config->getRpcHandle(
+                    $this->config->registration->getRegistrationServer(),
+                    $this->config->getInstanceUUID(),
+                    $this->config->getInstancePassword(),
+                    TRUE);
+
             $this->initialized = TRUE;
         }
     }
@@ -161,7 +159,7 @@ class statistics extends plugin
 
         // If we have an unregistered instance of GOsa, display a message which
         //  allows to registrate GOsa
-        if(!$this->instanceRegistered){
+        if(!$this->instanceRegistered || !$this->serverAccessible){
             return($smarty->fetch(get_template_path('statistics.tpl', TRUE)));
         }