X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=fd4da27d2ebbb7fcd3b851d50e51852269733f16;hb=ca98ca8c7d1adccfcf78ccc86faa5d9e2d69967e;hp=ad21edb52d877ea5b2e8fda65d35af68276831f9;hpb=4d8d9ca6c817c15492391b90a9d7775c42dd7936;p=gosa.git diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index ad21edb52..fd4da27d2 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -27,6 +27,7 @@ class appgroup extends plugin var $attributes= array(); var $objectclasses= array("gosaApplicationGroup"); + function appgroup ($config, $dn= NULL) { plugin::plugin ($config, $dn); @@ -65,7 +66,9 @@ class appgroup extends plugin $tmp2[$tmp[1]][$tmp[2]] = array("App"=>$tmp[0]); } if(!empty($tmp[1])){ - $cats [$tmp[1]] = $tmp[1]; + $n = split("/",$tmp[1]); + $c = count($n); + $cats [$tmp[1]] = $n[$c-1]; } $prios[$tmp[1]][$tmp[2]] = $tmp[2]; }else{ @@ -107,60 +110,161 @@ class appgroup extends plugin $this->curbase = $this->config->current['BASE']; } - function getOneUp($appl) + + /* Combine new array */ + function combineArrays($ar0,$ar1,$ar2) { - $cat = $this->curCatDir; - if(!isset($this->gosaMemberApplication[$cat][($appl-1)])) return; - $f = 1; - if($appl == 1 ){ - $f = 0; - } - $first = array_slice($this->gosaMemberApplication[$cat],0,($appl-1)); - $middle = array_slice($this->gosaMemberApplication[$cat],$appl-1,(($appl+1)-$f)); - $last = array_slice($this->gosaMemberApplication[$cat],($appl+1)); - $tmp = array(); - foreach($first as $entry){ - $tmp[] = $entry; + $ret = array(); + if(is_array($ar0)) + foreach($ar0 as $ar => $a){ + $ret[$ar]=$a; } - foreach(array_reverse($middle) as $entry){ - $tmp[] = $entry; + if(is_array($ar1)) + foreach($ar1 as $ar => $a){ + $ret[$ar]=$a; } - foreach($last as $entry){ - $tmp[] = $entry; + if(is_array($ar2)) + foreach($ar2 as $ar => $a){ + $ret[$ar]=$a; } - $this->gosaMemberApplication[$cat] =$tmp; + return($ret); } + + function getpos($atr,$attrs) + { + $i = 0; + foreach($attrs as $attr => $name) { + $i++; + if($attr == $atr){ + return($i); + } + } + return(-1); + } + + + /* TRansports the geiven Arraykey one position up*/ + function ArrayUp($atr,$attrs) + { + $ret = $attrs; + $pos = $this->getpos($atr,$attrs) ; + $cn = count($attrs); + if(!(($pos == -1)||($pos == 1))){ + $before = array_slice($attrs,0,($pos-2)); + $mitte = array_reverse(array_slice($attrs,($pos-2),2)); + $unten = array_slice($attrs,$pos); + $ret = array(); + $ret = $this->combineArrays($before,$mitte,$unten); + } + return($ret); + } + + + /* TRansports the geiven Arraykey one position up*/ + function ArrayDown($atr,$attrs) + { + $ret = $attrs; + $pos = $this->getpos($atr,$attrs) ; + $cn = count($attrs); + if(!(($pos == -1)||($pos == $cn))){ + $before = array_slice($attrs,0,($pos-1)); + $mitte = array_reverse(array_slice($attrs,($pos-1),2)); + $unten = array_slice($attrs,($pos+1)); + $ret = array(); + $ret = $this->combineArrays($before,$mitte,$unten); + } + return($ret); + } + + + function catUp($id) + { + /* Get all cats depinding on current dir */ + $cats = $this->GetSubdirs($this->curCatDir); + $newcats =$this->ArrayUp($id,$cats); + + foreach($newcats as $cat => $name){ + unset($this->Categories[$cat]); + } + foreach($newcats as $cat => $name){ + $this->Categories[$cat]=$name; + } + } + - function getOneDown($appl){ - $cat = $this->curCatDir; - if(!isset($this->gosaMemberApplication[$cat][($appl+1)])) return; - $f = 0; - if($appl == 0 ){ - $f = 1; - } - $first = array_slice($this->gosaMemberApplication[$cat],0,($appl)); - $middle = array_slice($this->gosaMemberApplication[$cat],$appl,(($appl+1+$f))); - $last = array_slice($this->gosaMemberApplication[$cat],($appl+2)); - - $tmp = array(); - foreach($first as $entry){ - $tmp[] = $entry; + function catDown($id) + { + /* Get all cats depinding on current dir */ + $cats = $this->GetSubdirs($this->curCatDir); + + $newcats =$this->ArrayDown($id,$cats); + + foreach($newcats as $cat => $name){ + unset($this->Categories[$cat]); + } + foreach($newcats as $cat => $name){ + $this->Categories[$cat]=$name; } - foreach(array_reverse($middle) as $entry){ - $tmp[] = $entry; + } + + + function getOneUp($appl) + { + $cat = $this->curCatDir; + $apps = $this->gosaMemberApplication[$cat]; + + $appsA = array(); + foreach ($apps as $appkey => $name){ + $appsA[$name['App']] =$name['App']; } - foreach($last as $entry){ - $tmp[] = $entry; + + $result = $this->ArrayUp($appl,$appsA); + + $ret = array(); + foreach($result as $app){ + $ret[]=array("App"=>$app); } - $this->gosaMemberApplication[$cat] =$tmp; + $this->gosaMemberApplication[$cat] = $ret; } + + + function getOneDown($appl) + { + $cat = $this->curCatDir; + $apps = $this->gosaMemberApplication[$cat]; + + $appsA = array(); + foreach ($apps as $appkey => $name){ + $appsA[$name['App']] =$name['App']; + } + + $result = $this->ArrayDown($appl,$appsA); + + $ret = array(); + foreach($result as $app){ + $ret[]=array("App"=>$app); + } + $this->gosaMemberApplication[$cat] = $ret; + } + + - function AddSeperator() + function AddSeperator($id) { - $cat = $this->curCatDir; - $cnt = count($this->gosaMemberApplication[$cat]); - $tmp = array("App" => "__SEPARATOR__".($cnt+1)); - $this->gosaMemberApplication[$cat][] = $tmp; + $found = false; + $cat = ""; + $tmp = array(); + foreach($this->gosaMemberApplication[$this->curCatDir] as $appID => $app){ + $tmp[] = $app; + if(($app['App'] == $id)&&(!$found)){ + $cnt = count($this->gosaMemberApplication[$this->curCatDir]); + $tmp[] = array("App" => "__SEPARATOR__".($cnt+1)); + $found = true; + } + } + if($found){ + $this->gosaMemberApplication[$this->curCatDir]=$tmp; + } } function execute() @@ -175,10 +279,6 @@ class appgroup extends plugin } } - if(isset($_POST['AddSeperator'])){ - $this->AddSeperator(); - } - if((isset($_GET['act']))&&($_GET['act']=="open")){ $this->curCatDir = $_GET['id']; } @@ -214,7 +314,7 @@ class appgroup extends plugin if((isset($_POST['AddCat']))&&(isset($_POST['CatName']))&&(!empty($_POST['CatName']))){ - if(preg_match("/[^0-9a-z,\.-;:_#\+\- ]/i",$_POST['CatName'])){ + if(preg_match("/[\\\\\/]/i",$_POST['CatName'])){ print_red(_("Invalid character in category name.")); }elseif(!in_array($_POST['CatName'],$this->Categories)){ if(empty($this->curCatDir)){ @@ -230,9 +330,13 @@ class appgroup extends plugin $this->reload(); foreach($_POST as $name => $value){ + if(preg_match("/AddSep_/",$name)){ + $this->AddSeperator($value); + } + + if(preg_match("/DelApp_/",$name)){ $app = $value; - foreach($this->gosaMemberApplication as $key => $cat){ foreach($cat as $key2 => $app){ if($app['App'] == $value){ @@ -244,6 +348,15 @@ class appgroup extends plugin } } } + if(preg_match("/DelCat_/",$name)){ + $n = preg_replace("/DelCat_/","",$name); + $app = base64_decode( preg_replace("/_.*$/","",$n)); + foreach($this->Categories as $key => $cat){ + if($cat == $app){ + unset($this->Categories[$key]); + } + } + } if(preg_match("/EdiApp_/",$name)){ $appname = $value; /* We've got the appname, get parameters from ldap */ @@ -341,7 +454,7 @@ class appgroup extends plugin $div = new DivSelectBox("appgroup"); - $div->SetHeight(300); + $div->SetHeight(400); /* NEW LIST MANAGMENT * We also need to search for the departments @@ -364,7 +477,7 @@ class appgroup extends plugin $departments[$value['dn']]=convert_department_dn($value['dn']); } } - + /* END NEW LIST MANAGMENT */ @@ -375,53 +488,56 @@ class appgroup extends plugin if((strlen($base_back)>= strlen($this->config->current['BASE']))&&($this->curbase!=$this->config->current['BASE'])){ $div->AddEntry(array( array("string"=>sprintf($linkopen,base64_encode($base_back),".. ["._("back")."]"), - "attach"=>"style='border:0px;'") + "attach"=>"style='border:0px;'") )); } foreach($departments as $key => $app){ $div->AddEntry(array( - array("string"=>""._("department")." ".sprintf($linkopen,base64_encode($key),$app), - "attach"=>"style='border:0px;'") - )); + array("string"=>""._("department")." ".sprintf($linkopen,base64_encode($key),$app), + "attach"=>"style='border:0px;'") + )); } - + foreach($apps as $key => $app){ $div->AddEntry(array( - array("string"=>sprintf("",$key). - ""._("application")." ".sprintf($linkadd,$key,$app), - "attach"=>"style='border:0px;'") - )); + array("string"=>sprintf("",$key). + ""._("application")." ".sprintf($linkadd,$key,$app), + "attach"=>"style='border:0px;'") + )); + } + + if((isset($_GET['act']))&&(($_GET['act'] == "cat_up")||($_GET['act']=="cat_down"))){ + if($_GET['act']=="cat_up"){ + $this->catUp(base64_decode($_GET['id'])); + } + if($_GET['act']=="cat_down"){ + $this->catDown(base64_decode($_GET['id'])); + } } if((isset($_GET['act']))&&(($_GET['act'] == "one_up")||($_GET['act']=="one_down"))){ if(isset($_GET['id'])){ $id = $_GET['id']; $act = $_GET['act']; - $found = -1; - if(isset($this->gosaMemberApplication[$this->curCatDir])){ - foreach($this->gosaMemberApplication[$this->curCatDir] as $key => $member){ - if($id == $member['App']){ - $found = $key; - } - } - } - if($found != -1){ - if($act == "one_up"){ - $this->getOneUp($found); - }elseif($act == "one_down") { - $this->getOneDown($found); - } + if($act == "one_up"){ + $this->getOneUp($id); + }elseif($act == "one_down") { + $this->getOneDown($id); } } } $div2 = new DivSelectBox("appgroup"); - $div2->SetHeight(300); + $div2->SetHeight(400); - $linkopen = " %s"; - $catremove = ""; - $app = " %s"; + $linkopen = "\"\" %s"; + $catremove = " "; + $app = "\"\" %s"; + + $catupdown = " + \"\"  + \"\""; if(empty($this->curCatDir)){ $cnt =0; @@ -434,40 +550,39 @@ class appgroup extends plugin } $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,$bbk,"..")),array("string"=>" ","attach"=>"style='border-right:0px;'"))); } - - foreach($this->Categories as $path => $name){ - $depth = count(split("/",$path)); - if(($depth == ($cnt)+1)){ - - $div2 ->AddEntry(array( - array("string"=>sprintf($linkopen,$path,$name)), - array("string"=>sprintf($catremove,$path). - "", - "attach"=>"align='right' style='width:80px;border-right:0px;'"))); - } + + $this->GetSubdirs($this->curCatDir); + + foreach($this->GetSubdirs($this->curCatDir) as $path => $name){ + $div2 ->AddEntry(array( + 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;'"))); } - /* Append entries */ + /* Append entries */ $separator ="
"; - - $upudown = " ". - "  ". - " "; - $edit= " "; + + $sep = ""; + + $upudown =" {t}sort{/t}". + "  {t}sort{/t}". + " "; + $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'],$upudown.$edit),"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;'"))); } } } - + $smarty->assign("UsedApps", $div2->DrawList()); $smarty->assign("List", $div->DrawList()); $smarty->assign("apps", $apps); @@ -577,12 +692,12 @@ class appgroup extends plugin reset ($this->apps); if(is_array($this->gosaMemberApplication)) - foreach ($this->gosaMemberApplication as $cat){ - if(is_array($cat)) - foreach($cat as $entry){ - $this->used_apps[$entry['App']]= $entry['App']; + foreach ($this->gosaMemberApplication as $cat){ + if(is_array($cat)) + foreach($cat as $entry){ + $this->used_apps[$entry['App']]= $entry['App']; + } } - } } @@ -611,6 +726,33 @@ class appgroup extends plugin $this->is_modified= TRUE; } + function GetSubdirs($dir) + { + $ret = array(); + $tmp1 = split("/",$this->curCatDir); + + foreach($this->Categories as $path=>$cat){ + $tmp2 = split("/",$path); + + if((empty($this->curCatDir))&&(!preg_match("/\//",$path))){ + $abort = false; + }elseif(((count($tmp1))+1) == (count($tmp2))){ + $abort = false; + for($i = 0 ; $i < count($tmp1) ; $i++){ + if($tmp1[$i] != $tmp2[$i]){ + $abort = true; + } + } + }else{ + $abort= true; + } + if(!$abort){ + $ret[$path]=$cat; + } + } + return($ret); + } + } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: