From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 27 Aug 2010 15:52:28 +0000 (+0000)
Subject: Applied patch from 'bcooksley' see #1023
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=48a683a0a2de36223befe46caa0010e839eb6285;p=gosa.git

Applied patch from 'bcooksley' see #1023


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

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 7c9fe51fc..1ebe81b73 100644
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -697,12 +697,15 @@ class config  {
 
         /* If no samba servers are found, look for configured sid/ridbase */
         if (count($this->data['SERVERS']['SAMBA']) == 0){
-            if (!isset($this->current["SAMBASID"]) || !isset($this->current["SAMBARIDBASE"])){
-                msg_dialog::display(_("Configuration error"), _("sambaSID and/or sambaRidBase missing in the configuration!"), ERROR_DIALOG);
+            $sambaSID = $this->get_cfg_value("core","sambaSID"); 
+            $sambaRIDBase = $this->get_cfg_value("core","sambaRidBase"); 
+            if (!isset($sambaSID) || !isset($sambaRIDBase)){ 
+                msg_dialog::display(_("Configuration error"), 
+                        _("sambaSID and/or sambaRidBase missing in the configuration!"), ERROR_DIALOG);
             } else {
                 $this->data['SERVERS']['SAMBA']['DEFAULT']= array(
-                        "SID" => $this->current["SAMBASID"],
-                        "RIDBASE" => $this->current["SAMBARIDBASE"]);
+                        "SID" => $sambaSID ,
+                        "RIDBASE" => $sambaRIDBase);
             }
         }