Updated workstation - Startup

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

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index ec31c831f4db43b114485a9adcceed55111d48ea..f129061de5e9610d6aa45e04810c3a156d14c82c 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -60,10 +60,10 @@ class termgeneric extends plugin
 
   var $member_of_ogroup = FALSE;
 
-  function termgeneric ($config, $dn= NULL, $parent= NULL)
+  function termgeneric (&$config, $dn= NULL, $parent= NULL)
   {
     /* Check if FAI is activated */
-    $tmp = search_config($config->data,"faiManagement","CLASS");
+    $tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
     if(!empty($tmp)){
       $this->fai_activated = TRUE;
     }
@@ -77,7 +77,7 @@ class termgeneric extends plugin
       $this->member_of_ogroup = $ldap->count() >= 1;
     }
 
-    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+    $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
     /* Read arrays */
     foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
       if (!isset($this->attrs[$val])){
@@ -204,7 +204,8 @@ class termgeneric extends plugin
 
       switch($_POST['saction']){
         case 'wake':
-          $cmd= search_config($this->config->data['TABS'], "termgeneric", "WAKECMD");
+          $cmd= $this->config->search("termgeneric", "WAKECMD",array('tabs'));
+
           if ($cmd == ""){
             print_red(_("No WAKECMD definition found in your gosa.conf"));
           } else {
@@ -216,7 +217,7 @@ class termgeneric extends plugin
           break;
 
         case 'reboot':
-          $cmd= search_config($this->config->data['TABS'], "termgeneric", "REBOOTCMD");
+          $cmd= $this->config->search("termgeneric", "REBOOTCMD",array('tabs'));
           if ($cmd == ""){
             print_red(_("No REBOOTCMD definition found in your gosa.conf"));
           } else {
@@ -228,7 +229,7 @@ class termgeneric extends plugin
           break;
 
         case 'halt':
-          $cmd= search_config($this->config->data['TABS'], "termgeneric", "HALTCMD");
+          $cmd= $this->config->search("termgeneric", "HALTCMD",array('tabs'));
           if ($cmd == ""){
             print_red(_("No HALTCMD definition found in your gosa.conf"));
           } else {
@@ -272,7 +273,7 @@ class termgeneric extends plugin
     }
 
     /* Do we represent a valid terminal? */
-    if (!$this->is_account && $this->parent == NULL){
+    if (!$this->is_account && $this->parent === NULL){
       $display= "<img alt=\"\" src=\"images/stop.png\" align=middle>&nbsp;<b>".
         _("This 'dn' has no terminal features.")."</b>";
       return($display);
@@ -357,7 +358,11 @@ class termgeneric extends plugin
     $smarty->assign("member_of_ogroup",$this->member_of_ogroup);
 
     /* Show main page */
-    $smarty->assign("netconfig", $this->netConfigDNS->execute());
+    $str = $this->netConfigDNS->execute();
+    if(is_object($this->netConfigDNS->dialog)){
+      return($str);
+    }
+    $smarty->assign("netconfig", $str);
     return($smarty->fetch (get_template_path('terminal.tpl', TRUE)));
   }
 
@@ -449,6 +454,11 @@ class termgeneric extends plugin
       $message[]= _("The required field 'Terminal name' is not set.");
     }
 
+    /* Check if given name is a valid host/dns name */
+    if(!is_dns_name($this->cn) ){
+      $message[] = _("Please specify a valid name for this object.");
+    }
+
     if ($this->orig_dn == 'new'){
       $ldap= $this->config->get_ldap_link();
       $ldap->cd ($this->base);
@@ -461,7 +471,7 @@ class termgeneric extends plugin
       }
       if ($ldap->count() != 0){
         while ($attrs= $ldap->fetch()){
-          if (preg_match ("/,ou=incoming,/", $ldap->getDN())){
+          if (preg_match("/cn=dhcp,/",$attrs['dn']) || preg_match ("/,ou=incoming,/", $ldap->getDN())){
             continue;
           } else {
             if ($attrs['dn'] != $this->orig_dn){
@@ -560,7 +570,7 @@ class termgeneric extends plugin
     }
 
     $this->netConfigDNS->cn = $this->cn;
-    $this->netConfigDNS->save($this->dn);
+    $this->netConfigDNS->save();
     show_ldap_error($ldap->get_error(), sprintf(_("Saving of object system terminal/generic with dn '%s' failed."),$this->dn));
   }