Applied patches from 2.5 Revision: 6519

[gosa.git] / plugins / admin / ogroups / class_ogroupManagement.inc

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 4f4317233f6c95f2afdd5808c064480a3db835c6..14f9d9f97ef32540864659651ec9f2c68da3525b 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -131,11 +131,6 @@ class ogroupManagement extends plugin
     }
 
 
-
-
-
-
-
     /********************
       Delete MULTIPLE entries requested, display confirm dialog
      ********************/
@@ -156,7 +151,11 @@ class ogroupManagement extends plugin
         }
         $dns_names .="</pre>";
         /* Lock the current entry, so nobody will edit it during deletion */
-        $smarty->assign("info",     sprintf(_("You're about to delete the following object group(s) %s"), @LDAP::fix($dns_names)));
+        if (count($this->dns) == 1){
+          $smarty->assign("info",     sprintf(_("You're about to delete the following object entry %s"), @LDAP::fix($dns_names)));
+        } else {
+          $smarty->assign("info",     sprintf(_("You're about to delete the following object entries %s"), @LDAP::fix($dns_names)));
+        }
         $smarty->assign("multiple", true);
         return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
       }
@@ -179,7 +178,6 @@ class ogroupManagement extends plugin
           /* Delete request is permitted, perform LDAP action */
           $this->ogroup= new ogrouptabs($this->config,$this->config->data['TABS']['OGROUPTABS'], $dn);
           $this->ogroup->delete ();
-          gosa_log ("Object group'".$this->dn."' has been removed");
           unset ($this->ogroup);
           $this->ogroup= NULL;
         } else {
@@ -187,7 +185,7 @@ class ogroupManagement extends plugin
           /* Normally this shouldn't be reached, send some extra
              logs to notify the administrator */
           print_red (_("You are not allowed to delete this object group!"));
-          gosa_log ("Warning: '".$this->ui->uid."' tried to trick group deletion.");
+          new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
         }
         /* Remove lock file after successfull deletion */
         del_lock ($dn);
@@ -259,7 +257,6 @@ class ogroupManagement extends plugin
         $this->ogroup= new ogrouptabs($this->config,
             $this->config->data['TABS']['OGROUPTABS'], $this->dn);
         $this->ogroup->delete ();
-        gosa_log ("Object group'".$this->dn."' has been removed");
         unset ($this->ogroup);
         $this->ogroup= NULL;
       } else {
@@ -267,7 +264,7 @@ class ogroupManagement extends plugin
         /* Normally this shouldn't be reached, send some extra
            logs to notify the administrator */
         print_red (_("You are not allowed to delete this object group!"));
-        gosa_log ("Warning: '".$this->ui->uid."' tried to trick group deletion.");
+        new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion.");
       }
 
       /* Remove lock file after successfull deletion */
@@ -328,7 +325,6 @@ class ogroupManagement extends plugin
 
         /* Save user data to ldap */
         $this->ogroup->save();
-        gosa_log ("Object group'".$this->dn."' has been saved");
 
         if (!isset($_POST['edit_apply'])){
           /* Group has been saved successfully, remove lock from