Updated workstation - Startup

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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 294f8e537f1bea00d1bb16243e1732e0943ea818..eb389834517f25e228f58c0b8f29d779a7d329c6 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -66,9 +66,9 @@ class workgeneric extends plugin
 
   var $member_of_ogroup = FALSE;
 
-  function workgeneric ($config, $dn= NULL, $parent= NULL)
+  function workgeneric (&$config, $dn= NULL, $parent= NULL)
   {
-    $tmp = search_config($config->data,"faiManagement","CLASS");
+    $tmp= $config->search("faiManagement", "CLASS",array('menu','tabs'));
     if(!empty($tmp)){
       $this->fai_activated = TRUE;
     }
@@ -82,7 +82,7 @@ class workgeneric 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){
@@ -110,6 +110,11 @@ class workgeneric extends plugin
       $this->gotoNtpServer=array();
     }
 
+    /* You can't inherit the NTP service, if we are not member in an object group */
+    if(!$this->member_of_ogroup){
+      $this->inheritTimeServer = FALSE;
+    }
+
     /* Create available ntp options */
     $tmp = $this->config->data['SERVERS']['NTP'];
     $this->gotoNtpServers = array();
@@ -133,7 +138,7 @@ class workgeneric extends plugin
     $tmp = $this->config->data['SERVERS']['SYSLOG'];
     foreach($tmp as $server){
       $visible = $server;
-      if($server == "default") {
+      if($server == "default" && $this->member_of_ogroup) {
         $visible = "["._("inherited")."]";
       }
       $this->gotoSyslogServers[$server] = $visible;
@@ -176,7 +181,7 @@ class workgeneric extends plugin
     }
 
     if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate"))){
-      $cmd= search_config($this->config->data['TABS'], "workgeneric", "ACTIONCMD");
+      $cmd= $this->config->search("workgeneric", "ACTIONCMD",array('tabs'));
       if ($cmd == ""){
         print_red(_("No ACTIONCMD definition found in your gosa.conf"));
       } else {
@@ -222,7 +227,7 @@ class workgeneric 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 workstation features.")."</b>";
       return($display);
@@ -338,8 +343,13 @@ class workgeneric extends plugin
     $smarty->assign("inheritTimeServer",$this->inheritTimeServer);
     $smarty->assign("member_of_ogroup",$this->member_of_ogroup);
 
+    $str = $this->netConfigDNS->execute();
+    if(is_object($this->netConfigDNS->dialog)){
+      return($str);
+    }
+    $smarty->assign("netconfig", $str);
+
     /* Show main page */
-    $smarty->assign("netconfig", $this->netConfigDNS->execute());
     return($smarty->fetch (get_template_path('workstation.tpl', TRUE)));
   }
 
@@ -395,13 +405,16 @@ class workgeneric extends plugin
 
     /* Set inherit mode */
     if((isset($_POST['workgeneric_posted'])) && ($this->acl_is_writeable("gotoNtpServer"))){
-      if(isset($_POST["inheritTimeServer"])){
+      if(isset($_POST["inheritTimeServer"]) && $this->member_of_ogroup){
         $this->inheritTimeServer = true;
       }else{
         $this->inheritTimeServer = false;
       }
     }
-
+    
+    if(isset($_POST["inheritAll"])){
+      $this->set_everything_to_inherited();
+    }
   }
 
 
@@ -422,6 +435,11 @@ class workgeneric extends plugin
       $message[]= _("The required field 'Workstation 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 != $this->dn){
       $ldap= $this->config->get_ldap_link();
       $ldap->cd ($this->base);
@@ -433,7 +451,7 @@ class workgeneric 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){
@@ -539,7 +557,7 @@ class workgeneric extends plugin
     }
 
     $this->netConfigDNS->cn = $this->cn;
-    $this->netConfigDNS->save($this->dn);
+    $this->netConfigDNS->save();
     show_ldap_error($ldap->get_error(), sprintf(_("Saving of system workstation/generic with dn '%s' failed."),$this->dn));
   }
 
@@ -628,7 +646,7 @@ class workgeneric extends plugin
     /* Set workstation service attributes to inherited */
     if($this->member_of_ogroup && isset($this->parent->by_object['workservice'])){
       foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
-            "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseType") as $name){
+            "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
         $this->parent->by_object['workservice']->$name = "default"; 
       }
     }