updated templates

[gosa.git] / gosa-plugins / goto / admin / systems / goto / class_terminalGeneric.inc

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index 4737b7fde59704be187386746f8f7f112b5a9645..8374b3ac9879d60a8a5697bc0c9931cf306ba082 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -128,6 +128,8 @@ class termgeneric 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);
+    } 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("terminalRDN"), '/')."/i", "", $this->dn);
     }
@@ -233,7 +235,6 @@ class termgeneric extends plugin
 
     $smarty->assign("cn", $this->cn);
     $smarty->assign("description", $this->description);
-    $smarty->assign("staticAddress", "");
 
     /* tell smarty the inherit checkbox state */
     $smarty->assign("inheritTimeServer",$this->inheritTimeServer);
@@ -428,6 +429,11 @@ class termgeneric extends plugin
       $message[]= msgPool::required(_("Name"));
     }
 
+    // Check if a wrong base was supplied
+    if(!$this->baseSelector->checkLastBaseUpdate()){
+      $message[]= msgPool::check_base();
+    }
+
     /* Check if given name is a valid host/dns name */
     if(!tests::is_dns_name($this->cn) ){
       $message[] = msgPool::invalid(_("Name"));