Fixed groupmail acl stuff

[gosa.git] / plugins / admin / groups / class_groupManagement.inc

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 45238bdc33215e6dd7d53e06e6bd8bb56d34c2b1..6bf78f1545b001fa94d68605f8923a3467ff036a 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -98,27 +98,32 @@ class groupManagement extends plugin
     /* Test Posts */
     foreach($_POST as $key => $val){
       // Post for delete
-      if(preg_match("/group_del.*/",$key)){
+      if(preg_match("/^group_del.*/",$key)){
         $s_action = "del";
         $s_entry  = preg_replace("/group_".$s_action."_/i","",$key);
         // Post for edit
-      }elseif(preg_match("/group_edit_.*/",$key)){
+      }elseif(preg_match("/^group_edit_.*/",$key)){
         $s_action="edit";
         $s_entry  = preg_replace("/group_".$s_action."_/i","",$key);
         // Post for new
-      }elseif(preg_match("/dep_back.*/i",$key)){
+      }elseif(preg_match("/^dep_back.*/i",$key)){
         $s_action="back";
-      }elseif(preg_match("/group_new.*/",$key)){
+      }elseif(preg_match("/^group_new.*/",$key)){
         $s_action="new";
-      }elseif(preg_match("/dep_home.*/i",$key)){
+      }elseif(preg_match("/^dep_home.*/i",$key)){
         $s_action="home";
-      }elseif(preg_match("/group_tplnew.*/i",$key)){
+      }elseif(preg_match("/^group_tplnew.*/i",$key)){
         $s_action="new_tpl";
-      }elseif(preg_match("/group_chgpw.*/i",$key)){
+      }elseif(preg_match("/^group_chgpw.*/i",$key)){
         $s_action="change_pw";
         $s_entry  = preg_replace("/group_chgpw_/i","",$key);
-      }elseif(preg_match("/dep_root.*/i",$key)){
+      }elseif(preg_match("/^dep_root.*/i",$key)){
         $s_action="root";
+      }elseif(preg_match("/_group_edit_/",$key)){
+        $type = preg_replace("/_group_edit_.*$/","",$key);
+        $s_action="edit";
+        $s_entry  = preg_replace("/".$type."_group_edit_/i","",$key); 
+        $_POST['arg'] = $type;
       }
     }
     $s_entry  = preg_replace("/_.$/","",$s_entry); 
@@ -200,7 +205,7 @@ class groupManagement extends plugin
     /* Finish group edit is triggered by the tabulator dialog, so
        the user wants to save edited data. Check and save at this
        point. */
-    if (isset($_POST['edit_finish'])){
+    if ((isset($_POST['edit_finish'])) && (isset($this->grouptab->config)) ){
 
       /* Check tabs, will feed message array */
       $message= $this->grouptab->check();
@@ -233,7 +238,7 @@ class groupManagement extends plugin
     }
 
     /* User wants to edit data? */
-    if ($s_action=="edit"){
+    if (($s_action=="edit") && (!isset($this->grouptab-> config))){
 
       /* Get 'dn' from posted 'uid', must be unique */
       $this->dn= $this->grouplist[trim($s_entry)]['dn'];
@@ -329,7 +334,7 @@ class groupManagement extends plugin
     }
 
     /* Show tab dialog if object is present */
-    if ($this->grouptab){
+    if (isset($this->grouptab->config)){
       $display= $this->grouptab->execute();
 
       /* Don't show buttons if tab dialog requests this */
@@ -376,13 +381,35 @@ class groupManagement extends plugin
     $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
     $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
 
-    // Extension images 
-    $posiximg = "<img class='center' src='images/select_groups.png'        alt='P'  title='"._("Posix")  ."'>";
-    $mailimg  = "<img class='center' src='images/mailto.png'             alt='M'  title='"._("Mail")   ."'>";
-    $sambaimg = "<img class='center' src='images/select_winstation.png'  alt='S'  title='"._("Samba")  ."'>";
-    $applimg  = "<img class='center' src='images/select_application.png' alt='A'  title='"._("Application")."'>"; 
-    $phoneimg = "<img class='center' src='images/select_phone.png'      alt='Ph' title='"._("Phone")  ."'>"; 
-    $envimg   = "<img class='center' src='images/smallenv.png'      alt='E' title='"._("Environment")  ."'>"; 
+
+    /* Extension images 
+        group
+        environment
+        appgroup
+        mailgroup
+        acl
+        reference
+
+     */
+    $posiximg = "<input type='image' class='center' src='images/select_groups.png' 
+                 name='group_group_edit_%KEY%' 
+                 alt='P'  title='"._("Posix")  ."'>";
+    $mailimg  = "<input type='image' class='center' src='images/mailto.png'            
+                 name='mailgroup_group_edit_%KEY%' 
+                  alt='M'  title='"._("Mail")   ."'>";
+    $sambaimg = "<input type='image'  class='center' src='images/select_winstation.png'  
+                 name='group_group_edit_%KEY%' 
+                  alt='S'  title='"._("Samba")  ."'>";
+    $applimg  = "<input type='image'  class='center' src='images/select_application.png' 
+                 name='appgroup_group_edit_%KEY%' 
+                  alt='A'  title='"._("Application")."'>"; 
+    $phoneimg = "<input type='image'  class='center' src='images/select_phone.png'      
+                 name='group_group_edit_%KEY%' 
+                  alt='Ph' title='"._("Phone")  ."'>"; 
+    $envimg   = "<input type='image'  class='center' src='images/smallenv.png'      
+                 name='environment_group_edit_%KEY%' 
+                  alt='E' title='"._("Environment")  ."'>"; 
+
     // Space
     $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
@@ -443,7 +470,7 @@ class groupManagement extends plugin
       }      
       $field1 = array("string" => sprintf($userimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
-      $field3 = array("string" => $posix."&nbsp;".$enviro."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone, "attach" => "style='width:136px;'");  
+      $field3 = array("string" => preg_replace("/%KEY%/", $key, $posix."&nbsp;".$enviro."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone), "attach" => "style='width:136px;'");  
       $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));