Udpated mime acls

[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 3872b38242e3a26077814f9b704a4a571581c661..c3f08d653b3d4d01f3f8a645c41e20e2043383e1 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -158,7 +158,7 @@ class termgeneric extends plugin
 
       $ldap->cd($this->dn);
       $ldap->modify($attrs);
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), sprintf(_("Saving of system terminal/generic (FAIstate) with dn '%s' failed."),$this->dn));
 
       switch($_POST['saction']){
         case 'wake':
@@ -204,7 +204,7 @@ class termgeneric extends plugin
     foreach($_POST as $name => $value){
       if(preg_match("/^chooseBase/",$name) && $once){
         $once = false;
-        $this->dialog = new baseSelectDialog($this->config);
+        $this->dialog = new baseSelectDialog($this->config,$this);
         $this->dialog->setCurrentBase($this->base);
       }
     }
@@ -275,29 +275,23 @@ class termgeneric extends plugin
     $tmp2 = array(); 
     foreach($this->config->data['SERVERS']['NFS'] as $server){
       if($server != "default"){
-        $tmp = split("\|",$server);
-        $tmp3= split(":",$tmp[0]);
-
-        $servername = $tmp3[0];
-        $nfsname    = $tmp3[1];  
-
-        $path ="";
-        if(isset($tmp[4])){
-          $path       = $tmp[4];  
-        }
-
-        $tmp2[$servername.":".$path]= $servername.":".$path; 
+        $tmp2[$server]= $server;
       }else{
         $tmp2[$server]="["._("inherited")."]";
       }
     }
   
     $smarty->assign("nfsservers",     $tmp2);
+    $smarty->assign("syslogservers",  $this->gotoSyslogServers);
 
+    $tmp = array();
+    foreach($this->gotoNtpServers as $server){
+      if(!in_array($server,$this->gotoNtpServer)){
+        $tmp[$server] = $server;
+      }
+    }
     
-
-    $smarty->assign("syslogservers",  $this->gotoSyslogServers);
-    $smarty->assign("ntpservers",     $this->gotoNtpServers);
+    $smarty->assign("ntpservers",     $tmp);
 
     /* Variables */
     foreach(array("base", "gotoMode", "gotoTerminalPath", "gotoSwapServer",
@@ -322,7 +316,7 @@ class termgeneric extends plugin
     if($ldap->count()){
       $this->netConfigDNS->remove_from_parent();
       $ldap->rmDir($this->dn);
-      show_ldap_error($ldap->get_error(), _("Removing terminal failed"));
+      show_ldap_error($ldap->get_error(), sprintf(_("Removing of object system terminal/generic with dn '%s' failed."),$this->dn));
 
       /* Optionally execute a command after we're done */
       $this->handle_post_events("remove", array("macAddress" => $this->netConfigDNS->macAddress));
@@ -443,11 +437,9 @@ class termgeneric extends plugin
       $this->attrs= $attrs;
     }
 
-    if($this->inheritTimeServer){
-      $this->attrs['gotoNtpServer'] = array();
-    }else{  
-      /* Set ntpServers */
-      $this->attrs['gotoNtpServer'] = array();
+    /* Set ntpServers */
+    $this->attrs['gotoNtpServer'] = array();
+    if(!$this->inheritTimeServer){
       foreach($this->gotoNtpServer as $server){
         $this->attrs['gotoNtpServer'][] = $server;
       }
@@ -464,6 +456,9 @@ class termgeneric extends plugin
       $ldap->cd($this->config->current['BASE']);
       $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
       $ldap->cd($this->dn);
+      if (!count($this->attrs['gotoNtpServer'])){
+        unset($this->attrs['gotoNtpServer']);
+      }
       $ldap->add($this->attrs);
       $this->handle_post_events("add");
     } else {
@@ -478,7 +473,7 @@ class termgeneric extends plugin
     }
     $this->netConfigDNS->cn = $this->cn;
     $this->netConfigDNS->save($this->dn);
-    show_ldap_error($ldap->get_error(), _("Saving terminal failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of object system terminal/generic with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     $this->postcreate();