Code

Updated listing of FAI classes
[gosa.git] / gosa-plugins / goto / admin / systems / goto / class_workstationGeneric.inc
index 9ade8d06dc8522a27001915d7db2d46b99ebd05e..dbda55d9198bef61bbbfb8ac7dfcb99d744d9222 100644 (file)
@@ -144,7 +144,9 @@ class workgeneric extends plugin
     if ($this->dn == "new"){
       $ui= get_userinfo();
       $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
-    } else {
+    } elseif(preg_match("/".preg_quote(get_ou("systemIncomingRDN"), '/')."/i", $this->dn)){
+      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("systemIncomingRDN"), '/')."/i", "", $this->dn);
+    }else{
       $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("workstationRDN"), '/')."/i", "", $this->dn);
     }
 
@@ -260,7 +262,6 @@ class workgeneric extends plugin
     $smarty->assign("cn", $this->cn);
     $smarty->assign("description", $this->description);
     $smarty->assign("l", $this->l);
-    $smarty->assign("staticAddress", "");
 
     $tmp = array();
     foreach($this->gotoNtpServers as $server){