Fixed group tabs to allow cleanup handling

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

diff --git a/plugins/admin/groups/class_groupAcl.inc b/plugins/admin/groups/class_groupAcl.inc
index 79c28d043e02932ef844d1e0807a79ee34434a8b..f6bee91b6265ad94711393c93d58cc038bd30c16 100644 (file)
--- a/plugins/admin/groups/class_groupAcl.inc
+++ b/plugins/admin/groups/class_groupAcl.inc
@@ -22,7 +22,7 @@ class acl extends plugin
 
 
   /* attribute list for save action */
-  var $attributes= array();
+  var $attributes= array("gosaSubtreeACL");
   var $objectclasses= array("gosaObject");
 
   function acl ($config, $dn= NULL)

diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 8cee62bab47e4e76fcaf1bc6e550886cd91a9673..51b37e3ab67dc301bc29ad924dc1d571a7222078 100644 (file)
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -24,7 +24,7 @@ class appgroup extends plugin
   var $curCatDepth    =0;         //
 
   /* attribute list for save action */
-  var $attributes= array();
+  var $attributes= array("gosaMemberApplication");
   var $objectclasses= array("gosaApplicationGroup");
 
 
@@ -34,6 +34,7 @@ class appgroup extends plugin
 
     /* Load member applications */
     if (isset ($this->attrs["gosaMemberApplication"][0])){
+      $this->gosaMemberApplication = array();
       for ($i= 0; $i<$this->attrs["gosaMemberApplication"]["count"]; $i++){
         $this->gosaMemberApplication[]=
           $this->attrs["gosaMemberApplication"][$i];

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 188b6b6061909ff26a74ebd30f4cc383982d07f8..ef433d85b032b4a996a186086eea37d556d734e5 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -35,7 +35,7 @@ class group extends plugin
   var $nagios_group =FALSE;
 
   /* attribute list for save action */
-  var $attributes= array("cn", "description", "gidNumber");
+  var $attributes= array("cn", "description", "gidNumber","memberUid","sambaGroupType","sambaSID");
   var $objectclasses= array("top", "posixGroup");
 
   function group ($config, $dn= NULL)

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index 383b513614b490e132ea0bc9c26bcc91a8338830..874391ba46e3a63685c5273964036bf4bdc9bf94 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -21,7 +21,7 @@ class mailgroup extends plugin
   var $gosaVacationMessage= "";
   var $gosaSpamSortLevel= "";
   var $gosaSpamMailbox= "";
-
+  var $gosaSharedFolderTarget;
   var $quotaUsage= 0;
   var $forward_dialog= FALSE;
   var $members= array();
@@ -35,8 +35,8 @@ class mailgroup extends plugin
   var $indexed_user= array();
 
   /* attribute list for save action */
-  var $attributes= array("mail", "gosaMailServer", "gosaMailQuota", "gosaMailMaxSize",
-      "gosaMailDeliveryMode", "gosaSpamSortLevel", "gosaSpamMailbox",
+  var $attributes= array("mail", "gosaMailServer", "gosaMailQuota", "gosaMailMaxSize","gosaMailAlternateAddress","gosaMailForwardingAddress",
+      "gosaMailDeliveryMode", "gosaSpamSortLevel", "gosaSpamMailbox","acl","gosaSharedFolderTarget",
       "gosaVacationMessage");
   var $objectclasses= array("gosaMailAccount");
 
@@ -78,6 +78,7 @@ class mailgroup extends plugin
 
       /* Load attributes containing arrays */
       foreach (array("gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){
+        $this->$val = array();
         if (isset($this->attrs["$val"]["count"])){
           for ($i= 0; $i<$this->attrs["$val"]["count"]; $i++){
             array_push($this->$val, $this->attrs["$val"][$i]);
@@ -507,7 +508,7 @@ class mailgroup extends plugin
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
     }
     if (is_numeric($this->gosaMailQuota) && $this->gosaMailQuota != 0){
-      $smarty->assign("quotausage", progressbar(round(($this->quotaUsage * 100)/ $this->gosaMailQuota,100,15,true)));
+      $smarty->assign("quotausage", progressbar(round(($this->quotaUsage * 100)/ $this->gosaMailQuota),100,15,true));
       $smarty->assign("quotadefined", "true");
     } else {
       $smarty->assign("quotadefined", "false");
@@ -524,7 +525,7 @@ class mailgroup extends plugin
     /* Added these ObjectClass and Attributes, because they were not 
        removed correctly, only in case of kolab ... 
      */
-    if(preg_match("/kolab/i",$this->config->current['MAILMETHOD'])){
+    if(isset($this->config->current['MAILMETHOD'])&&preg_match("/kolab/i",$this->config->current['MAILMETHOD'])){
       $this->attributes[]="acl";
       $this->attributes[]="kolabHomeServer";
       $this->objectclasses[] = "kolabSharedFolder";