Fixed msgs for applications / departments / fai

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3990 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index a469fb26e7a93267c36e875fbd07a31eefe7a99e..ff957bbfd97bbc32e4757f663e660277deccd060 100644 (file)
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -196,7 +196,7 @@ class application extends plugin
   {
     $ldap= $this->config->get_ldap_link();
     $ldap->rmDir($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing application failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of applciation with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove");
@@ -414,7 +414,7 @@ class application extends plugin
       $ldap->add($this->attrs);
       $this->handle_post_events("add");
     }
-    show_ldap_error($ldap->get_error(), _("Saving application failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of application with dn '%s' failed."),$this->dn));
   }
 
   function set_picture($filename)

diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc
index 310efad57a9543ca33a0f7db7bd2eb9a0453b703..c803aff4d3d823cf88993cd080a1a6cb0be0beff 100644 (file)
--- a/plugins/admin/applications/class_applicationParameters.inc
+++ b/plugins/admin/applications/class_applicationParameters.inc
@@ -125,7 +125,7 @@ class applicationParameters extends plugin
        $this->cleanup();
        $ldap->modify ($this->attrs); 
 
-       show_ldap_error($ldap->get_error(), _("Removing application parameters failed"));
+       show_ldap_error($ldap->get_error(), sprintf(_("Removing of application parameters with dn '%s' failed."),$this->dn));
 
        /* Optionally execute a command after we're done */
        $this->handle_post_events('remove');
@@ -187,7 +187,7 @@ class applicationParameters extends plugin
        $this->cleanup();
        $ldap->modify ($this->attrs); 
 
-       show_ldap_error($ldap->get_error(), _("Saving applications parameters failed"));
+       show_ldap_error($ldap->get_error(), sprintf(_("Saving of application parameters with dn '%s' failed."),$this->dn));
 
        /* Optionally execute a command after we're done */
        $this->handle_post_events('modify');

diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index d687ea1127b66e44c3b199a89befd428c1c25d03..c1ef6e11d3f79cbe72d45c8c033c54e1bf3be0cc 100644 (file)
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -167,7 +167,7 @@ class department extends plugin
                $ldap= $this->config->get_ldap_link();
                $ldap->cd ($this->dn);
                $ldap->recursive_remove();
-               show_ldap_error($ldap->get_error(), _("Removing department failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of department with dn '%s' failed."),$this->dn));
 
                /* Optionally execute a command after we're done */
                $this->handle_post_events('remove');
@@ -328,7 +328,7 @@ class department extends plugin
                        $ldap->add($this->attrs);
                        $this->handle_post_events('add');
                }
-               show_ldap_error($ldap->get_error(), _("Saving department failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of department with dn '%s' failed."),$this->dn));
 
     /* The parameter forces only to set must_be_tagged, and don't touch any objects 
         This will be done later */

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 42f7e5feaee73d2b42ac2e63cff8272663de6e9d..b42ae9417f246604dd40031a8d4ab1541dae080a 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -329,7 +329,7 @@ class faiHook extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->rmdir_recursive($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing FAI hook base failed")); 
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/hook with dn '%s' failed."),$this->dn));
     $this->handle_post_events("remove");    
   }
 
@@ -380,7 +380,7 @@ class faiHook extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error(), _("Saving FAI hook base failed")); 
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/hook with dn '%s' failed."),$this->dn));
 
     /* Do object tagging */
     $this->handle_object_tagging();
@@ -448,13 +448,13 @@ class faiHook extends plugin
         $ldap->cd($sub_dn);
         $ldap->rmdir_recursive($sub_dn);
         $this->handle_post_events("remove");
-        show_ldap_error($ldap->get_error(), _("Removing FAI hook failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/hook with dn '%s' failed."),$sub_dn));
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
         $this->cleanup();
         $ldap->modify ($tmp); 
         $this->handle_post_events("modify");
-        show_ldap_error($ldap->get_error(), _("Saving FAI hook failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/hook with dn '%s' failed."),$sub_dn)); 
       }elseif($obj['status']=="new"){
         if($tmp['description']==array()){
           unset($tmp['description']);
@@ -464,7 +464,7 @@ class faiHook extends plugin
         $ldap->cd($sub_dn);
         $ldap->add($tmp); 
         $this->handle_post_events("add");
-        show_ldap_error($ldap->get_error(), _("Saving FAI hook failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/hook with dn '%s' failed."),$sub_dn)); 
       }
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
     }

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index fb845ee416083f500297a89c8b306a45df252301..260957797c1585d60ff65c8ac092655dd7c3806f 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -337,7 +337,7 @@ class faiPackage extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->rmdir_recursive($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing FAI package base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/package list with dn '%s' failed."),$this->dn));
     $this->handle_post_events("remove");    
   }
 
@@ -481,7 +481,7 @@ class faiPackage extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error(), _("Saving FAI package base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/package list with dn '%s' failed."),$this->dn));
 
     /* Do object tagging */
     $this->handle_object_tagging();
@@ -526,16 +526,12 @@ class faiPackage extends plugin
           $ldap->cd($pkgdn);
           $ldap->add($pkgattrs);
         }
-        show_ldap_error($ldap->get_error(), _("Saving FAI package entry failed"));
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/package list with dn '%s' failed."),$this->dn));
 
         /* Handle tagging */
         $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);
       }
     }
-
-
-
-
   }
 }
 

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index efc90856b669f60b3235cec13dc789bc13935d77..4cfe78150647b9a96304363b32314a3424e1c7ad 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -345,7 +345,7 @@ class faiPartitionTable extends plugin
       $this->cleanup();
       $ldap->modify ($this->attrs); 
     }
-    show_ldap_error($ldap->get_error(), _("Saving FAI partition table base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/partition table with dn '%s' failed."),$this->dn));
   
     /* Do object tagging */
     $this->handle_object_tagging();
@@ -387,7 +387,7 @@ class faiPartitionTable extends plugin
       if($disk['status'] == "delete"){
         $ldap->cd($disk_dn);
         $ldap->rmdir_recursive($disk_dn);
-        show_ldap_error($ldap->get_error(), _("Removing FAI partition table failed"));
+        show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/partition table with dn '%s' failed."),$disk_dn));
       }elseif($disk['status']== "edited"){
         if(empty($disk_attrs['description'])){
           $disk_attrs['description']=array();
@@ -395,7 +395,7 @@ class faiPartitionTable extends plugin
         $ldap->cd($disk_dn);
         $this->cleanup();
         $ldap->modify ($disk_attrs); 
-        show_ldap_error($ldap->get_error(), _("Saving FAI partition table failed"));
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/partition table with dn '%s' failed."),$disk_dn));
       }elseif($disk['status']== "new"){
         if(empty($disk_attrs['description'])){
           unset($disk_attrs['description']);
@@ -404,7 +404,7 @@ class faiPartitionTable extends plugin
         $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $disk_dn));
         $ldap->cd($disk_dn);
         $ldap->add($disk_attrs);
-        show_ldap_error($ldap->get_error(), _("Saving FAI partition table failed"));
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/partition table with dn '%s' failed."),$disk_dn));
       }else{
         print_red("unknown status while saving disks");
       }
@@ -452,7 +452,7 @@ class faiPartitionTable extends plugin
         if(($partition['status'] == "delete")&&($disk['status']!="new")){
           $ldap->cd($partition_dn);
           $ldap->rmdir_recursive($partition_dn);
-          show_ldap_error($ldap->get_error(), _("Removing FAI partition table entry failed"));
+          show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/partition table entry with dn '%s' failed."),$partition_dn));
         }elseif($partition['status'] == "new"){
           if(empty($partition_attrs['description'])){
             unset($partition_attrs['description']);
@@ -461,7 +461,7 @@ class faiPartitionTable extends plugin
           $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $partition_dn));
           $ldap->cd($partition_dn);
           $ldap->add($partition_attrs);
-          show_ldap_error($ldap->get_error(), _("Saving FAI partition table entry failed"));
+          show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/partition table entry with dn '%s' failed."),$partition_dn));
         }elseif($partition['status'] == "edited"){
           if(empty($partition_attrs['description'])){
             $partition_attrs['description']=array();
@@ -469,7 +469,7 @@ class faiPartitionTable extends plugin
           $ldap->cd($partition_dn);
           $this->cleanup();
           $ldap->modify ($partition_attrs); 
-          show_ldap_error($ldap->get_error(), _("Saving FAI partition table entry failed"));
+          show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/partition table entry with dn '%s' failed."),$partition_dn));
         } 
 
         $this->handle_object_tagging($partition_dn, $this->gosaUnitTag);

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index 40c61eb329fbc33aa2238fc939b48fbd6d67d415..78f8f915fc416862dc4896a8817ff1029fb45ebd 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -356,7 +356,7 @@ class faiProfile extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->rmdir_recursive($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing FAI profile failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/profile with dn '%s' failed."),$this->dn));
     $this->handle_post_events("remove");    
   }
 
@@ -426,7 +426,7 @@ class faiProfile extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error(), _("Saving FAI profile failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/profile with dn '%s' failed."),$this->dn));
 
     /* Do object tagging */
     $this->handle_object_tagging();

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index 371a57c56c69de091b97bbba99442c35ade46404..c0cec6b9438bf349beec50a2198ae41c0a3578b6 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -300,7 +300,7 @@ class faiScript extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->rmdir_recursive($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing FAI script base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/script with dn '%s' failed."),$this->dn));
     $this->handle_post_events("remove");    
   }
 
@@ -351,7 +351,7 @@ class faiScript extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error(), _("Creating FAI script base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Creating of FAI/script with dn '%s' failed."),$this->dn));
 
     /* Do object tagging */
     $this->handle_object_tagging();
@@ -421,7 +421,7 @@ class faiScript extends plugin
         $ldap->cd($sub_dn);
         $ldap->rmdir_recursive($sub_dn);
         $this->handle_post_events("remove");
-        show_ldap_error($ldap->get_error(), _("Removing FAI script failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/script entry with dn '%s' failed."),$this->dn));
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
         $this->cleanup();
@@ -440,7 +440,7 @@ class faiScript extends plugin
         $ldap->cd($sub_dn);
         $ldap->add($tmp); 
         $this->handle_post_events("add");
-        show_ldap_error($ldap->get_error(), _("Saving FAI script failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/script entry with dn '%s' failed."),$this->dn));
       }
 
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 56e7f613d02bc6e22742f3a701988cdbedd87d77..4285a18355f14ed94c4310f2357f35f1564f74e4 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -322,7 +322,7 @@ class faiTemplate extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error(), _("Saving FAI template base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/template with dn '%s' failed."),$this->dn));
 
     /* Do object tagging */
     $this->handle_object_tagging();
@@ -383,12 +383,12 @@ class faiTemplate extends plugin
         $ldap->cd($sub_dn);
         $ldap->rmdir_recursive($sub_dn);
         $this->handle_post_events("remove");
-        show_ldap_error($ldap->get_error(), _("Removing FAI template base failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/template with dn '%s' failed."),$sub_dn));
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
         $this->cleanup();
         $ldap->modify ($tmp); 
-        show_ldap_error($ldap->get_error(), _("Saving FAI template failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/template with dn '%s' failed."),$sub_dn));
 
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
@@ -401,7 +401,7 @@ class faiTemplate extends plugin
         $ldap->cd($sub_dn);
         $ldap->add($tmp); 
         $this->handle_post_events("add");
-        show_ldap_error($ldap->get_error(), _("Saving FAI template failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/template with dn '%s' failed."),$sub_dn));
       }
 
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 1c596cb50dd73d913a81b31be0722c74106bacb5..49aa77226df402ff31922b0a83f03d3ac42d7d97 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -291,7 +291,7 @@ class faiVariable extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error(), _("Saving FAI variable base failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/variable with dn '%s' failed."),$this->dn));
  
     /* Do object tagging */
     $this->handle_object_tagging();
@@ -353,14 +353,14 @@ class faiVariable extends plugin
         $ldap->cd($sub_dn);
         $ldap->rmdir_recursive($sub_dn);
         $this->handle_post_events("remove");
-        show_ldap_error($ldap->get_error(), _("Removing FAI variable failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Removing of FAI/variable with dn '%s' failed."),$sub_dn));
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
         $this->cleanup();
         $ldap->modify ($tmp); 
 
         $this->handle_post_events("modify");
-        show_ldap_error($ldap->get_error(), _("Saving FAI variable failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/variable with dn '%s' failed."),$sub_dn));
       }elseif($obj['status']=="new"){
 
         if($tmp['description'] == array()){
@@ -372,7 +372,7 @@ class faiVariable extends plugin
         $ldap->cd($sub_dn);
         $ldap->add($tmp); 
         $this->handle_post_events("add");
-        show_ldap_error($ldap->get_error(), _("Saving FAI variable failed")); 
+        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/variable with dn '%s' failed."),$sub_dn));
       }
 
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);