From bcdfcb92132948f53d1f4be2df056e8486710ffe Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 12 Oct 2007 09:44:54 +0000 Subject: [PATCH] Fixed category removement git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7533 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_groupApplication.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 1ebb49de5..ff7640e90 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -524,14 +524,14 @@ class appgroup extends plugin } unset($this->gosaMemberApplication[$cat]); unset($this->Categories[$cat]); - foreach($this->Categories as $key => $name){ - if(preg_match("/^".$cat."\/.*/",$key)){ - foreach($this->gosaMemberApplication[$key] as $app){ - $free_apps[] = $app['App']; - } - unset($this->gosaMemberApplication[$key]); - unset($this->Categories[$key]); + } + foreach($this->Categories as $key => $name){ + if(preg_match("/^".normalizePreg($cat)."\/.*/",$key)){ + foreach($this->gosaMemberApplication[$key] as $app){ + $free_apps[] = $app['App']; } + unset($this->gosaMemberApplication[$key]); + unset($this->Categories[$key]); } } foreach($free_apps as $app){ @@ -745,8 +745,9 @@ class appgroup extends plugin $tmp = split("/",$this->curCatDir); $bbk = ""; for($i = 0 ; $i < ($cnt -1 ) ; $i++){ - $bbk .= $tmp[$i]; + $bbk .= $tmp[$i]."/"; } + $bbk = preg_replace("/\/$/","",$bbk); $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,base64_encode($bbk),".. ["._("Back")."]")),array("string"=>" ","attach"=>"style='border-right:0px;'"))); } -- 2.30.2