X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupManagement.inc;h=4e21b8bdff40fa088b9b921763681680ef0fbd2e;hb=58c69f231e1fc25f441ba5d11b313f1c5c47f74c;hp=a086bb9c1123bd931d4819a261c26c795a73f18d;hpb=649c92b7f9a81e3e2fa480194ffe2726294786ef;p=gosa.git diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index a086bb9c1..4e21b8bdf 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -56,6 +56,9 @@ class groupManagement extends plugin function execute() { + /* Call parent execute */ + plugin::execute(); + /* Save data */ $groupfilter= get_global("groupfilter"); $s_action = ""; @@ -373,7 +376,8 @@ class groupManagement extends plugin $mailimg = "M"; $sambaimg = "S"; $applimg = "A"; - $phoneimg = "Ph"; + $phoneimg = "Ph"; + $envimg = "E"; // Space $empty = ""; @@ -382,13 +386,13 @@ class groupManagement extends plugin $divlist->SetHeader(array( array("string" => " "), array("string" => _("Groupname")." / "._("Department")), - array("string" => _("Properties"), "attach" => "style='width:100px;'"), + array("string" => _("Properties"), "attach" => "style='width:116px;'"), array("string" => _("Actions") ,"attach" => "style='border:none'") )); $divlist->SetSummary(_("This table displays all groups, in the selected tree.")); - $divlist->SetEntriesPerPage(20); + $divlist->SetEntriesPerPage(0); foreach($this->departments as $key=> $val){ @@ -405,10 +409,10 @@ class groupManagement extends plugin } - $field1 = array("string" => "department"); + $field1 = array("string" => "department","attach"=>"style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); $field3 = array("string" => " "); - $field4 = array("string" => " ","attach"=>"style='text-align:right;border:none'"); + $field4 = array("string" => " ","attach"=>"style='text-align:right;border:none;width:48px;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -421,6 +425,7 @@ class groupManagement extends plugin if(in_array("sambaGroupMapping", $val['objectClass'])) $samba = $sambaimg; else $samba = $empty; if(in_array("gosaApplicationGroup", $val['objectClass'])) $appl = $applimg; else $appl = $empty; if(in_array("goFonPickupGroup", $val['objectClass'])) $phone = $phoneimg; else $phone = $empty; + if(in_array("gotoEnvironment", $val['objectClass'])) $enviro= $envimg; else $enviro = $empty; }else{ $posix=$mail=$samba=$appl=$phone=$empty; } @@ -432,10 +437,10 @@ class groupManagement extends plugin }else{ $desc = " - [ ".$val['description'][0]." ]"; } - $field1 = array("string" => sprintf($userimg,$val['dn']),"attach"=>"style='width:20px;align:middle;'"); + $field1 = array("string" => sprintf($userimg,$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)),"attach"=>$title); - $field3 = array("string" => $posix." ".$mail." ".$samba." ".$appl." ".$phone); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none;width:32px;'"); + $field3 = array("string" => $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone,"attach"=>"style='text-align:left;width:136px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none;width:48px;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -443,7 +448,7 @@ class groupManagement extends plugin /* Show main page */ $smarty->assign("grouplisthead", $listhead); $smarty->assign("grouplist", $divlist->DrawList()); - $smarty->assign("searchg_image", get_template_path('images/search_group.png')); + $smarty->assign("search_image", get_template_path('images/search.png')); $smarty->assign("searchu_image", get_template_path('images/search_user.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("infoimage", get_template_path('images/info.png')); @@ -461,9 +466,7 @@ class groupManagement extends plugin return($smarty->fetch(get_template_path('headpage.tpl', TRUE))); } - - - function reload2() + function reload($CreatePosixsList=false) { /* Get config */ $groupfilter= get_global('groupfilter'); @@ -479,155 +482,21 @@ class groupManagement extends plugin } /* User filter? */ - $filter= ""; + $filter= "(objectclass=posixGroup)"; $error= ""; $error2= ""; $this->grouplist= array(); /* What are primary groups? */ $primaries= array(); - $ldap= $this->config->get_ldap_link(TRUE); + $ldap= $this->config->get_ldap_link(); $ldap->cd($base); $ldap->search("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn")); - $error= $ldap->error; - while ($attrs= $ldap->fetch()){ - $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0]; - } - - if ($groupfilter['primarygroups'] == "checked"){ - $filter.= "(&(objectClass=posixGroup)(|"; - foreach ($primaries as $gidNumber => $cn){ - $filter.= "(gidNumber=$gidNumber)"; - } - $filter.= "))"; - } else { - $filter.= "(&(objectClass=posixGroup)(!(|"; - foreach ($primaries as $gidNumber => $cn){ - $filter.= "(gidNumber=$gidNumber)"; - } - $filter.= ")))"; - } - /* Set filter depending on selection */ - $sfilter= ""; - if ($groupfilter['appgroups'] == "checked"){ - $filter.= "(objectClass=gosaApplicationGroup)"; - } - if ($this->config->current['SAMBAVERSION'] == 3){ - if ($groupfilter['primarygroups'] != "checked"){ - $sfilter= "(objectClass=sambaGroupMapping)"; - } elseif ($groupfilter['sambagroups'] == "checked"){ - $filter.= "(objectClass=sambaGroupMapping)"; - } - } - - if ($groupfilter['mailgroups'] == "checked"){ - $filter.= "(objectClass=gosaMailAccount)"; - } - if ($groupfilter['functionalgroups'] == "checked"){ - $ldap->cd($base); - $ldap->set_size_limit($_SESSION['size_limit']); - $ldap->search("(&(cn=$regex)(objectClass=posixGroup)(!(|(objectClass=gosaMailAccount)(objectClass=gosaApplicationGroup)$sfilter)))", array("cn", "gidNumber", "description")); - $error2= $ldap->error; - while ($attrs= $ldap->fetch()){ - if (!isset($primaries[$attrs['gidNumber'][0]])){ - if (isset($attrs["description"][0])){ - $this->grouplist[$attrs["dn"]]= $attrs["cn"][0]." [". - $attrs["description"][0]."]"; - } else { - $this->grouplist[$attrs["dn"]]= $attrs["cn"][0]; - } - } - } - } - - /* Generate grouplist */ - if ($filter != ""){ - $filter= "(&(cn=$regex)(objectClass=posixGroup)(|$filter))"; - if ($groupfilter['guser'] != ""){ - $filter= "(&(|(memberUID=" . $groupfilter['guser'] . ")(cn=" . $groupfilter['guser'] . "))$filter)"; - } - } - if ($groupfilter['subsearch'] != "checked"){ - $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE); - } else { - $base= get_groups_ou().$base; - - $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE); - } - if (preg_match("/size limit/i", $error) || preg_match("/size limit/i", $error2)){ - $_SESSION['limit_exceeded']= TRUE; - } - - foreach ($res as $value){ - if (isset($value["description"][0])){ - $this->grouplist[$value["dn"]]= $value["cn"][0]." [". - $value["description"][0]."]"; - } else { - $this->grouplist[$value["dn"]]= $value["cn"][0]; - } - } - - natcasesort ($this->grouplist); - reset ($this->grouplist); - } - - - - - - - - - - - - - function reload() - { - /* Get config */ - $groupfilter= get_global('groupfilter'); - - /* Set base for all searches */ - $base= $groupfilter['depselect']; - - /* Regex filter? */ - if ($groupfilter['regex'] != ""){ - $regex= $groupfilter['regex']; - } else { - $regex= "*"; - } - - /* User filter? */ - $filter= ""; - $error= ""; - $error2= ""; - $this->grouplist= array(); - - /* What are primary groups? */ - $primaries= array(); - $ldap= $this->config->get_ldap_link(TRUE); - $ldap->cd($base); - $ldap->ls("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn")); - $error= $ldap->error; + show_ldap_error($ldap->get_error()); while ($attrs= $ldap->fetch()){ $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0]; } - if ($groupfilter['primarygroups'] == "checked"){ - $filter.= "(&(objectClass=posixGroup)(|"; - foreach ($primaries as $gidNumber => $cn){ - $filter.= "(gidNumber=$gidNumber)"; - } - $filter.= "))"; - } else { - $filter.= "(&(objectClass=posixGroup)(!(|"; - foreach ($primaries as $gidNumber => $cn){ - $filter.= "(gidNumber=$gidNumber)"; - } - $filter.= ")))"; - } - - /* Set filter depending on selection */ $sfilter= ""; if ($groupfilter['appgroups'] == "checked"){ @@ -644,15 +513,14 @@ class groupManagement extends plugin if ($groupfilter['mailgroups'] == "checked"){ $filter.= "(objectClass=gosaMailAccount)"; } - if ($groupfilter['functionalgroups'] == "checked"){ - $ldap->cd($base); - $ldap->set_size_limit($_SESSION['size_limit']); - $ldap->ls("(&(cn=$regex)(objectClass=posixGroup)(!(|(objectClass=gosaMailAccount)(objectClass=gosaApplicationGroup)$sfilter)))", array("cn", "gidNumber", "description")); - $error2= $ldap->error; - while ($attrs= $ldap->fetch()){ - if (!isset($primaries[$attrs['gidNumber'][0]])){ - $this->grouplist[$attrs['gidNumber'][0]]= $attrs; - } + $functional= array(); + $ldap->cd(get_groups_ou().$base); + $ldap->set_size_limit($_SESSION['size_limit']); + $ldap->search("(&(cn=$regex)(objectClass=posixGroup)(!(|(objectClass=gosaMailAccount)(objectClass=gosaApplicationGroup)$sfilter)))", array("cn", "gidNumber", "description")); + $error2= $ldap->error; + while ($attrs= $ldap->fetch()){ + if (!isset($primaries[$attrs['gidNumber'][0]])){ + $functional[$attrs['gidNumber'][0]]= $attrs['gidNumber'][0]; } } @@ -660,24 +528,27 @@ class groupManagement extends plugin * We also need to search for the departments * So we are able to navigate like in konquerer */ - $base2 = preg_replace("/ou=people,/i","",$base); - $res3 = get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))", - FALSE, $base2, array("ou", "description"), TRUE); - - $this->departments= array(); - $tmp = array(); - foreach ($res3 as $value){ - $tmp[strtolower($value['dn']).$value['dn']]=$value; - } - ksort($tmp); - foreach($tmp as $value){ - if($value["description"][0]!=".."){ - $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]"; - }else{ - $this->departments[$value['dn']]=$value["description"][0]; + /* Only needed if we are in GroupManagement */ + if(!$CreatePosixsList){ + $res3 = get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))", + FALSE, $base, array("ou", "description"), TRUE); + $this->departments= array(); + $tmp = array(); + foreach ($res3 as $value){ + $tmp[strtolower($value['dn']).$value['dn']]=$value; + } + ksort($tmp); + foreach($tmp as $value){ + if($value["description"][0]!=".."){ + $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]"; + }else{ + $this->departments[$value['dn']]=$value["description"][0]; + } } } + /* Ende department generation + */ /* Generate grouplist */ if ($filter != ""){ @@ -686,10 +557,13 @@ class groupManagement extends plugin $filter= "(&(|(memberUID=" . $groupfilter['guser'] . ")(cn=" . $groupfilter['guser'] . "))$filter)"; } } + + /* Depending on $CreatePosixsList we have to create different lists */ + if ($groupfilter['subsearch'] == "checked"){ $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE); } else { - $base= get_groups_ou().$base; + $base= get_groups_ou().$base; $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE); } if (preg_match("/size limit/i", $error) || preg_match("/size limit/i", $error2)){ @@ -697,21 +571,53 @@ class groupManagement extends plugin } foreach ($res as $value){ - $this->grouplist[$value['gidNumber'][0]]= $value; + if ($groupfilter['functionalgroups'] != "checked" && isset($functional[$value['gidNumber'][0]])){ + continue; + } + if ($groupfilter['primarygroups'] == "checked"){ + $this->grouplist[$value['gidNumber'][0]]= $value; + } else { + if (!isset($primaries[$value['gidNumber'][0]])){ + $this->grouplist[$value['gidNumber'][0]]= $value; + } + } } + $tmp=array(); + /* If true ; this result is used for posix tab, group membership selection. */ + if($CreatePosixsList){ - $tmp=array(); - foreach($this->grouplist as $tkey => $val ){ - $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val; - } - ksort($tmp); - $this->grouplist=array(); - foreach($tmp as $val){ - $this->grouplist[]=$val; + /* Addd to array */ + foreach($this->grouplist as $tkey => $val ){ + $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val; + } + + /* Sort index */ + ksort($tmp); + + /* Recreate index array[dn]=cn[description]*/ + $this->grouplist=array(); + foreach($tmp as $val){ + if(isset($val['description'])){ + $this->grouplist[$val['dn']]=$val['cn'][0]." [".$val['description'][0]."]"; + }else{ + $this->grouplist[$val['dn']]=$val['cn'][0]; + } + } + }else{ + + /* Create result for group management listbox*/ + foreach($this->grouplist as $tkey => $val ){ + $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val; + } + ksort($tmp); + $this->grouplist=array(); + foreach($tmp as $val){ + $this->grouplist[]=$val; + } + reset ($this->grouplist); } - reset ($this->grouplist); } function remove_from_parent()