X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=064b94e6bf79bb58c4735456090e50df220699b6;hb=335428f1501ac307511e688ea19958e274b4bcc6;hp=113894274e74ade2e1150f00eab33960b22180b3;hpb=c7265e3d999c1299597fdddf1a7054b82d396ae1;p=gosa.git
diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 113894274..064b94e6b 100644
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -37,11 +37,13 @@ class appgroup extends plugin
var $CopyPasteVars = array("Categories");
var $gosaApplicationParameter ;
+ var $ui ;
function appgroup ($config, $dn= NULL, $parent= NULL)
{
-
+ $this->ui = get_userinfo();
+
/* prepare group app for release management */
$tmp = search_config($config->data,"faiManagement","CLASS");
if(!empty($tmp)){
@@ -615,11 +617,14 @@ class appgroup extends plugin
$departments = array();
$res = get_list("(objectClass=gosaDepartment)",$ui->subtreeACL,$this->curbase,array("description","cn","ou"),GL_SIZELIMIT);
foreach($res as $value){
- $fdn= @LDAP::fix($value['dn']);
+
+ $fdn = $value['dn'];
+ $fdn = preg_replace("/".normalizePreg($this->curbase)."/","",$fdn);
+ $fdn= @LDAP::fix($fdn);
if($value["description"][0]!=".."){
$departments[$value['dn']]= convert_department_dn($fdn)." - [".$value["description"][0]."]";
}else{
- $departments[$value['dn']]=convert_department_dn($fdn);
+ $departments[$value['dn']]= convert_department_dn($fdn);
}
}
@@ -733,11 +738,11 @@ class appgroup extends plugin
/* release managent is active
*/
if(!$this->enableReleaseManagement){
- $image = "
";
}else{
- $image = "
";
+ $image = "
FAIrelease)."\"> ";
}
}elseif(isset($Differences[$entry['App']]) && ($Differences[$entry['App']] == true)) {
@@ -927,17 +932,12 @@ class appgroup extends plugin
}
$base = preg_replace("/ou=apps,.*$/","ou=apps,".$this->curbase,$base);
-
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ($base);
- $ldap->ls ("(objectClass=gosaApplication)",$base);
+ $app_res = get_list("(objectClass=gosaApplication)", $this->ui->subtreeACL, $base,array("cn","description"));
}else{
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ("ou=apps,".$this->curbase);
- $ldap->ls ("(objectClass=gosaApplication)","ou=apps,".$this->curbase);
+ $app_res = get_list("(objectClass=gosaApplication)", $this->ui->subtreeACL, "ou=apps,".$this->curbase,array("cn","description"));
}
- while ($attrs= $ldap->fetch()){
+ foreach($app_res as $attrs){
if (isset($attrs["description"][0])){
$this->apps[$attrs["cn"][0]]=
$attrs["cn"][0]." (".
@@ -948,6 +948,7 @@ class appgroup extends plugin
}
}
+ $ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$ldap->search("objectClass=gosaApplication",array("gosaApplicationParameter","cn"));
$tmp = search_config($this->config->data,"faiManagement","CLASS");