Moved folder image

[gosa.git] / gosa-plugins / dns / admin / systems / services / dns / class_servDNS.inc

diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
index dfddd446a55efec3b2212ebeb5673bdc38b6da58..d2779828baf2f93336700ad7d20bd8e13a9e1d8b 100644 (file)
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
@@ -2,11 +2,6 @@
 
 class servdns extends goService
 {
-  /* CLI vars */
-  var $cli_summary= "Manage server basic objects";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* attribute list for save action */
   var $ignore_account   = FALSE;
   var $attributes       = array(); 
@@ -154,7 +149,7 @@ class servdns extends goService
       $smarty->assign("dns_take_over",TRUE);
       $smarty->assign("info",$info);
       $warning = sprintf(_("You are going to migrate the DNS setup from server '%s'."),$this->dns_server_list['ENTRIES'][$id]['cn'][0]);
-      $warning2 = _("The migration will be startet when you save this system. To cancel this action, use the cancel button below.");
+      $warning2 = _("The migration will be started when you save this system. To cancel this action, use the cancel button below.");
       $smarty->assign("warning",$warning);
       $smarty->assign("warning2",$warning2);
       return($smarty->fetch(get_template_path('servdns.tpl', TRUE, dirname(__FILE__))));
@@ -186,7 +181,7 @@ class servdns extends goService
        */
       if(count($this->dialog->check())){
         foreach($this->dialog->check() as $msgs){
-          print_red($msgs); 
+          msg_dialog::display(_("Error"), $msgs, ERROR_DIALOG);
         }
       }else{
         /* add new/edited zone 
@@ -269,9 +264,9 @@ class servdns extends goService
 
     /* Add entries to divlist
      */
-    $editImg = "<input type='image' src='images/edit.png' name='editZone_%s'>";
+    $editImg = "<input type='image' src='images/lists/edit.png' name='editZone_%s'>";
     if($this->acl_is_removeable()){
-      $editImg.= "<input type='image' src='images/edittrash.png' name='delZone_%s'>";
+      $editImg.= "<input type='image' src='images/lists/trash.png' name='delZone_%s'>";
     }
 
     $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=%s'>%s</a>";
@@ -344,7 +339,7 @@ class servdns extends goService
       if(count($used)> 2) {
         $str .=" ... ";
       }
-      print_red(sprintf(_("Can't delete the selected zone, because it is still in use by these entry/entries '%s'"),trim($str)));
+      msg_dialog::display(_("Error"), sprintf(_("Cannot delete the selected zone. It is still in use by '%s'"), trim($str)), ERROR_DIALOG);
       return(false);
     }else{
       unset($this->Zones[$id]);
@@ -454,7 +449,9 @@ class servdns extends goService
         $ldap->cd($dn);
         $ldap->modify($attrs);
         new log("modify","unknown/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-        show_ldap_error($ldap->get_error(), sprintf(_("Updating of system server/dns with dn '%s' failed."),$this->dn));
+        if (!$ldap->success()){
+          msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+        }
       }
     }
 
@@ -468,7 +465,9 @@ class servdns extends goService
       $ldap->cd($dn);
       $ldap->rmdir_recursive($dn);
       new log("remove","unknown/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-      show_ldap_error($ldap->get_error(), sprintf(_("Removing of system server/dns with dn '%s' failed."),$this->dn));
+      if (!$ldap->success()){
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class()));
+      }
 
       /* Handle Post events */
       if(preg_match("/^zoneName=/",$dn)){
@@ -491,7 +490,9 @@ class servdns extends goService
       if($ldap->fetch()){
         $ldap->cd($dn);
         $ldap->modify ($attrs);
-        show_ldap_error($ldap->get_error(), sprintf(_("Saving of system server/dns with dn '%s' failed."),$this->dn));
+        if (!$ldap->success()){
+          msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+        }
 
         /* Handle Post events */
         if(preg_match("/^zoneName=/",$dn)){
@@ -500,7 +501,9 @@ class servdns extends goService
       }else{
         $ldap->cd($dn);
         $ldap->add($attrs);
-        show_ldap_error($ldap->get_error(), sprintf(_("Saving of system server/dns with dn '%s' failed."),$this->dn));
+        if (!$ldap->success()){
+          msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_ADD, get_class()));
+        }
 
         /* Handle Post events */
         if(preg_match("/^zoneName=/",$dn)){
@@ -531,7 +534,9 @@ class servdns extends goService
       $attrs[$flag] = $value;
       $this->$flag = $value;
       $ldap->modify($attrs);
-      show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for system server/dns with dn '%s' failed."),$this->dn));
+      if (!$ldap->success()){
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+      }
       $this->action_hook();
     }
   }