| is no longer allowed in goShareServer Tab

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

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 7ae9d8b5db093d862b099f334f880b73ced44ea6..52df6e02369d44cc8bd4e8795c04e192b975ed0f 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -128,6 +128,20 @@ class group extends plugin
     }
     $gufilter= get_global('gufilter');
 
+      /* Bases / Departments */
+      
+    if(isset($_SESSION['groupfilter']['depselect'])){
+      $this->base = $_SESSION['groupfilter']['depselect'];
+    }else{
+      if ($this->dn == "new"){
+        $ui= get_userinfo();
+        $this->base= dn2base($ui->dn);
+      } else {
+        $this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn);
+      }
+    }
+
+
     /* This is always an account */
     $this->is_account= TRUE;
     $this->reload();
@@ -137,7 +151,7 @@ class group extends plugin
   {
     /* Do we represent a valid group? */
     if (!$this->is_account && $this->parent == NULL){
-      $display= "<img src=\"images/stop.png\" align=center>&nbsp;<b>".
+      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
         _("This 'dn' is no group.")."</b>";
       return ($display);
     }
@@ -222,6 +236,7 @@ class group extends plugin
         }
       }
       $smarty->assign("users", $users);
+      $smarty->assign("apply", apply_filter());
       $display= $smarty->fetch (get_template_path('group_objects.tpl', TRUE, dirname(__FILE__)));
       return ($display);
     }
@@ -229,13 +244,6 @@ class group extends plugin
     /* Bases / Departments */
     if (isset($_POST['base'])){
       $this->base= $_POST['base'];
-    } else {
-      if ($this->dn == "new"){
-        $ui= get_userinfo();
-        $this->base= dn2base($ui->dn);
-      } else {
-        $this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn);
-      }
     }
 
     $smarty->assign("bases", $this->config->idepartments);
@@ -280,6 +288,8 @@ class group extends plugin
     $smarty->assign("sambaDomainNameACL", chkacl($this->acl, "sambaDomainName"));
     if ($this->fon_group){
       $smarty->assign("fon_group", "checked");
+    } else {
+      $smarty->assign("fon_group", "");
     }
     $smarty->assign("fon_groupACL", chkacl($this->acl, "fon_group"));
 
@@ -289,6 +299,11 @@ class group extends plugin
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
     }
 
+    /* Missing ACL's */
+    foreach (array("base", "smbgroup", "members") as $val){
+      $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
+    }
+
     /* Show main page */
     $smarty->assign("alphabet", generate_alphabet(10));
     $smarty->assign("search_image", get_template_path('images/search.png'));
@@ -329,7 +344,7 @@ class group extends plugin
     natcasesort ($this->users);
     reset ($this->users);
 
-    $ldap->cd ($this->config->current['BASE']);
+    $ldap->cd ($gufilter['dselect']);
     $ldap->search ("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))");
     $this->allusers= array();
     while ($attrs= $ldap->fetch()){