Updated css und div framework.

[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 cdb83d0ffd6da177a0c8586dcc31c4cfab8b71c4..df051b4733936b8b2bb21eee776e581dc8eb9ed5 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -78,11 +78,6 @@ class ogroupManagement extends plugin
         // Post for new
       }elseif(preg_match("/^group_new.*/",$key)){
         $s_action="new";
-      }elseif(preg_match("/^group_tplnew.*/i",$key)){
-        $s_action="new_tpl";
-      }elseif(preg_match("/^group_chgpw.*/i",$key)){
-        $s_action="change_pw";
-        $s_entry  = preg_replace("/group_chgpw_/i","",$key);
       }elseif(preg_match("/^editPaste.*/i",$key)){
         $s_action="editPaste";
       }elseif(preg_match("/^copy_.*/",$key)){
@@ -182,7 +177,6 @@ class ogroupManagement extends plugin
         /* Delete request is permitted, perform LDAP action */
         $this->ogroup= new ogrouptabs($this->config,
             $this->config->data['TABS']['OGROUPTABS'], $this->dn);
-        $this->ogroup->set_acl(array($this->acl));
         $this->ogroup->delete ();
         gosa_log ("Object group'".$this->dn."' has been removed");
         unset ($this->ogroup);
@@ -279,7 +273,7 @@ class ogroupManagement extends plugin
      ****************/
 
     /* Cancel dialogs */
-    if (isset($_POST['edit_cancel'])){
+    if ((isset($_POST['edit_cancel']))  && (isset($this->ogroup->dn))){
       del_lock ($this->ogroup->dn);
       unset ($this->ogroup);
       $this->ogroup= NULL;
@@ -389,8 +383,6 @@ class ogroupManagement extends plugin
       $html_object_2 = "<img ";
     }
     
-    $html_object_1 = "<input type='image' ";
-      
     $temp = $html_object_1." class='center' id='iconA".preg_replace("/_/","",$p1['lnk']."_group_edit_%KEY")."' 
       src='images/".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
     $temp.= $html_object_2." class='center' id='iconB".preg_replace("/_/","",$p2['lnk']."_group_edit_%KEY")."'