From 8cb0e267cd0876349bbe601b2a9b5b13698084aa Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 9 Mar 2006 10:50:45 +0000 Subject: [PATCH] Added checkbox which allows subsearch git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2830 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_groupGeneric.inc | 42 ++++++++++++++++++--- plugins/admin/groups/group_objects.tpl | 8 ++++ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index d3e408871..0fcc62b1d 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -35,6 +35,7 @@ class group extends plugin var $nagios_group =FALSE; var $sambaGroupType; var $dialog; + var $OnlyShowFirstEntries =200; /* attribute list for save action */ var $attributes= array("cn", "description", "gidNumber","memberUid","sambaGroupType","sambaSID"); @@ -136,6 +137,10 @@ class group extends plugin } $gufilter= get_global('gufilter'); + $gufilter['SubSearchGroup'] = false; + + register_global('gufilter',$gufilter); + /* Bases / Departments */ if(isset($_SESSION['groupfilter']['depselect'])){ @@ -148,7 +153,7 @@ class group extends plugin $this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn); } } - + /* This is always an account */ $this->is_account= TRUE; @@ -256,6 +261,14 @@ class group extends plugin $gufilter[$type]= $_POST[$type]; } } + if(isset($_POST['regex'])){ + if(isset($_POST['SubSearchGroup'])){ + $gufilter['SubSearchGroup'] = true; + }else{ + $gufilter['SubSearchGroup'] = false; + } + } + if (isset($_GET['search'])){ $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*"; if ($s == "**"){ @@ -273,7 +286,7 @@ class group extends plugin $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->config->idepartments); $smarty->assign("alphabet", generate_alphabet()); - foreach( array("dselect", "regex") as $type){ + foreach( array("dselect", "regex","SubSearchGroup") as $type){ $smarty->assign("$type", $gufilter[$type]); } $smarty->assign("hint", print_sizelimit_warning()); @@ -398,13 +411,23 @@ class group extends plugin $this->last_sorting= "invalid"; $this->users= array(); $ldap= $this->config->get_ldap_link(); - $gufilter= get_global("gufilter"); + $MaxUser = $this->OnlyShowFirstEntries; + + $gufilter= get_global("gufilter"); $ldap->cd ($this->config->current['BASE']); - $ldap->cd (get_people_ou().$gufilter['dselect']); - $ldap->ls ("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))",get_people_ou().$gufilter['dselect'],array("uid", "sn", "givenName")); + if($gufilter['SubSearchGroup']){ + $ldap->cd ($gufilter['dselect']); + $ldap->search("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))",array("uid", "sn","givenName")); + }else{ + $ldap->cd (get_people_ou().$gufilter['dselect']); + $ldap->ls ("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))",get_people_ou().$gufilter['dselect'],array("uid", "sn", "givenName")); + } $this->allusers= array(); - while ($attrs= $ldap->fetch()){ + + $i = 0 ; + while (($attrs= $ldap->fetch()) && ($i < $MaxUser)){ + $i ++; if (isset($attrs["givenName"][0]) && isset($attrs["sn"][0])){ $this->allusers[$attrs["uid"][0]]= $attrs["sn"][0].", ". $attrs["givenName"][0]." [".$attrs["uid"][0]."]"; @@ -412,6 +435,11 @@ class group extends plugin $this->allusers[$attrs["uid"][0]]= $attrs['uid'][0]; } } + + if(($i == $MaxUser)){ + print_red(sprintf(_("Your search method returned more than '%s' users, only '%s' users are shown.") , $MaxUser,$MaxUser)); + } + natcasesort ($this->allusers); reset ($this->allusers); @@ -471,6 +499,8 @@ class group extends plugin { /* Save additional values for possible next step */ if (isset($_POST['groupedit'])){ + + plugin::save_object(); $this->force_gid= 0; diff --git a/plugins/admin/groups/group_objects.tpl b/plugins/admin/groups/group_objects.tpl index bb58eceaa..5fcdc73a2 100644 --- a/plugins/admin/groups/group_objects.tpl +++ b/plugins/admin/groups/group_objects.tpl @@ -23,6 +23,14 @@ {$alphabet}
+ + + + +
+ {t}Search within subtree{/t}
+
-- 2.30.2