X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=fd4da27d2ebbb7fcd3b851d50e51852269733f16;hb=ca98ca8c7d1adccfcf78ccc86faa5d9e2d69967e;hp=5b746ea9765cdc61c885514f23dbe0bdaf53a6fb;hpb=dc3f75f95a277a7c5855e1d2582baa82a22ca23b;p=gosa.git
diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 5b746ea97..fd4da27d2 100644
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -337,7 +337,6 @@ class appgroup extends plugin
if(preg_match("/DelApp_/",$name)){
$app = $value;
-
foreach($this->gosaMemberApplication as $key => $cat){
foreach($cat as $key2 => $app){
if($app['App'] == $value){
@@ -350,9 +349,10 @@ class appgroup extends plugin
}
}
if(preg_match("/DelCat_/",$name)){
- $app = $value;
+ $n = preg_replace("/DelCat_/","",$name);
+ $app = base64_decode( preg_replace("/_.*$/","",$n));
foreach($this->Categories as $key => $cat){
- if($cat == $value){
+ if($cat == $app){
unset($this->Categories[$key]);
}
}
@@ -508,10 +508,10 @@ class appgroup extends plugin
if((isset($_GET['act']))&&(($_GET['act'] == "cat_up")||($_GET['act']=="cat_down"))){
if($_GET['act']=="cat_up"){
- $this->catUp($_GET['id']);
+ $this->catUp(base64_decode($_GET['id']));
}
if($_GET['act']=="cat_down"){
- $this->catDown($_GET['id']);
+ $this->catDown(base64_decode($_GET['id']));
}
}
@@ -531,13 +531,13 @@ class appgroup extends plugin
$div2 = new DivSelectBox("appgroup");
$div2->SetHeight(400);
- $linkopen = "
%s";
+ $linkopen = "
%s";
$catremove = " ";
- $app = "
%s";
+ $app = "
%s";
- $catupdown = "
-
-
";
+ $catupdown = "
+
+
";
if(empty($this->curCatDir)){
$cnt =0;
@@ -555,8 +555,8 @@ class appgroup extends plugin
foreach($this->GetSubdirs($this->curCatDir) as $path => $name){
$div2 ->AddEntry(array(
- array("string"=>sprintf($linkopen,$path,$name)),
- array("string"=>preg_replace("/%s/",$path,$catupdown.$catremove),
+ array("string"=>sprintf($linkopen,base64_encode($path),$name)),
+ array("string"=>preg_replace("/%s/",base64_encode($path),$catupdown.$catremove),
"attach"=>"align='right' style='width:80px;border-right:0px;'")));
}
@@ -566,19 +566,19 @@ class appgroup extends plugin
$sep = "";
- $upudown ="
".
- "
".
- " ";
- $edit= " ";
+ $upudown ="
".
+ "
".
+ " ";
+ $edit= " ";
if(isset($this->gosaMemberApplication[$this->curCatDir])){
foreach($this->gosaMemberApplication[$this->curCatDir] as $cat => $entry){
if(preg_match("/__SEPARATOR__/",$entry['App'])){
$div2 ->AddEntry(array(array("string"=>$separator),
- array("string"=>preg_replace("/\%s/",$entry['App'],$upudown),"attach"=>"align='right' style='border-right:0px;'")));
+ array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$upudown),"attach"=>"align='right' style='border-right:0px;'")));
}else{
$div2 ->AddEntry(array(array("string"=>sprintf($app,$entry['App'])),
- array("string"=>preg_replace("/\%s/",$entry['App'],$sep.$edit.$upudown),"attach"=>"align='right' style='border-right:0px;'")));
+ array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$sep.$edit.$upudown),"attach"=>"align='right' style='border-right:0px;'")));
}
}
}