From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 10 Nov 2010 15:44:29 +0000 (+0000)
Subject: Updated registration process
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=491a9e6a49c9b653919290b2498e0eb20c2d1f21;p=gosa.git

Updated registration process

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

diff --git a/gosa-core/include/class_GOsaRegistration.inc b/gosa-core/include/class_GOsaRegistration.inc
index 2090e9deb..2c788b102 100644
--- a/gosa-core/include/class_GOsaRegistration.inc
+++ b/gosa-core/include/class_GOsaRegistration.inc
@@ -88,8 +88,9 @@ class GOsaRegistration
             return($this->isInstanceRegisteredWithServer());
         }else{
 
-            // Server is down, now check if we've an instancePassword set in our gosa.conf.             
-            return(!empty($this->config->instancePassword));
+            // Server is down, now check if we've an instancePassword set in our gosa.conf.
+            $instancePassword = $this->config->configRegistry->getPropertyValue('GOsaRegistration','instancePassword'); 
+            return(!empty($instancePassword));
         }
     }
 
@@ -110,6 +111,15 @@ class GOsaRegistration
     {
         return (array(
                     "plProperties"  => array(
+                        array(
+                            "name"          => "instancePassword",
+                            "type"          => "string",
+                            "default"       => "",
+                            "description"   => "",
+                            "check"         => "gosaProperty::isString",
+                            "migrate"       => "",
+                            "group"         => "registration",
+                            "mandatory"     => FALSE),
                         array(
                             "name"          => "askForRegistration",
                             "type"          => "integer",
@@ -119,7 +129,9 @@ class GOsaRegistration
                             "migrate"       => "",
                             "group"         => "registration",
                             "mandatory"     => FALSE),
-                        ))); 
+                        )
+                    )
+                    );
     }
 }