X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=05c1160e498545005e44e40f08e595ad7c17ed84;hb=875a3f2fab1278394aa011b5998a1943d346d885;hp=f75d80d630417a30c931e869ddc2632ceedaff77;hpb=535f37f8026c627a66b0c3ef2f7b8d538a9bcbfb;p=gosa.git diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index f75d80d63..05c1160e4 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -10,24 +10,24 @@ class appgroup extends plugin var $gosaMemberApplication= array(); /* Helpers */ - var $department= ""; - var $apps= array(); - var $used_apps= array(); - var $opt_edit= FALSE; - var $option_name= array(); - var $option_value= array(); - var $appoption= array(); - var $table= ""; - var $curbase = ""; - var $curCatDir; - var $curCatDepth=0; - var $Categories=array(); + var $departments = ""; // All departments within $this->curbase; + var $apps = array(); // All available applications + var $used_apps = array(); // Specifies which applications are currently assigned + var $option_name = array(); + var $option_value = array(); + var $appoption = array(); + + var $table = ""; + var $curbase = ""; + var $curCatDir ; + var $curCatDepth =0; // /* attribute list for save action */ var $attributes= array(); var $objectclasses= array("gosaApplicationGroup"); + function appgroup ($config, $dn= NULL) { plugin::plugin ($config, $dn); @@ -51,134 +51,236 @@ class appgroup extends plugin } } + /* Parse MemberApplication*/ $tmp = array(); $tmp2 = array(); - $prios = array(); + $cats = array(); foreach($this->gosaMemberApplication as $memberApp){ if(preg_match("/\|/i",$memberApp)){ - $tmp = split("\|",$memberApp); - $tmp2[$tmp[0]."|".$tmp[1]]['App'] = $tmp[0]; - $tmp2[$tmp[0]."|".$tmp[1]]['Cat'] = $tmp[1]; - $tmp2[$tmp[0]."|".$tmp[1]]['Pri'] = $tmp[2]; - $cats [$tmp[1]] = $tmp[1]; + $tmp = split("\|",$memberApp); + + if(!empty($tmp[0])){ + $tmp2[$tmp[1]][$tmp[2]] = array("App"=>$tmp[0]); + } + if(!empty($tmp[1])){ + $n = split("/",$tmp[1]); + $c = count($n); + $cats [$tmp[1]] = $n[$c-1]; + } $prios[$tmp[1]][$tmp[2]] = $tmp[2]; }else{ - $tmp2[$memberApp."|"]['App'] = $memberApp; - $tmp2[$memberApp."|"]['Cat'] = ""; - $tmp2[$memberApp."|"]['Pri'] = 1000; + $tmp2[]['App'] = $memberApp; } } + $this->Categories = $cats; + $this->gosaMemberApplication = $tmp2; + $cats[""]=""; foreach($cats as $cat ){ - $max = max($prios[$cat]); - $min = 1;//min($prios[$cat]); - for($i = $min ; $i < $max ; $i++){ - if(!isset($prios[$cat][$i])){ - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['Pri'] = $i; - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['Cat'] = $this->curCatDir; - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['App'] = "__SEPARATOR__".$i; + if((isset($prios[$cat]))&&(count($prios[$cat]))){ + $max = max($prios[$cat]); + $min = 1;//min($prios[$cat]); + $last = false; + for($i = $min ; $i < $max ; $i++){ + if(!isset($prios[$cat][$i])){ + if($last == false){ + $this->gosaMemberApplication[$cat][$i]['App'] = "__SEPARATOR__".$i; + + $last = true; + } + }else{ + $last = false; + } } } } - /* Append at last*/ - foreach($this->gosaMemberApplication as $key => $app){ - if($app['Pri'] == 1000){ - $this->gosaMemberApplication[$key]['Pri'] = $this->getNextFree(1,$app['Cat']); + $tmp = array(); + foreach($this->gosaMemberApplication as $key => $entries){ + ksort ($entries); + foreach($entries as $entry){ + $tmp[$key][]= $entry; } } - - + $this->gosaMemberApplication = $tmp; $this->curbase = $this->config->current['BASE']; } - function getOneUp($appl) + + /* Combine new array */ + function combineArrays($ar0,$ar1,$ar2) { - $prio = $this->gosaMemberApplication[$appl]['Pri']; - $prios = array(); - $next = 0; - $key_use = false; - foreach($this->gosaMemberApplication as $key => $app){ - if($app['Cat'] != $this->gosaMemberApplication[$appl]['Cat']) continue; - if($app['Pri']< $prio){ - if($app['Pri'] > $next){ - $next = $app['Pri']; - $key_use = $key; - } - } + $ret = array(); + if(is_array($ar0)) + foreach($ar0 as $ar => $a){ + $ret[$ar]=$a; + } + if(is_array($ar1)) + foreach($ar1 as $ar => $a){ + $ret[$ar]=$a; } + if(is_array($ar2)) + foreach($ar2 as $ar => $a){ + $ret[$ar]=$a; + } + return($ret); + } - if($next != 0){ - $this->gosaMemberApplication[$appl]['Pri']= $next; - $this->gosaMemberApplication[$key_use]['Pri']= $prio; + function getpos($atr,$attrs) + { + $i = 0; + foreach($attrs as $attr => $name) { + $i++; + if($attr == $atr){ + return($i); + } } + return(-1); } - - function getOneDown($prio){ - return($prio); + + + /* 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 getNextFree($prio,$cat) + function catDown($id) { - $ret = $prio; - $prios =array(); - foreach($this->gosaMemberApplication as $app){ - if($cat == $app['Cat']){ - $prios[$app['Pri']]=$app['Pri']; - } + /* 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]); } - while(isset($prios[$ret])){ - $ret ++; + foreach($newcats as $cat => $name){ + $this->Categories[$cat]=$name; } - return($ret); } - function AddSeperator() + + function getOneUp($appl) + { + $cat = $this->curCatDir; + $apps = $this->gosaMemberApplication[$cat]; + + $appsA = array(); + foreach ($apps as $appkey => $name){ + $appsA[$name['App']] =$name['App']; + } + + $result = $this->ArrayUp($appl,$appsA); + + $ret = array(); + foreach($result as $app){ + $ret[]=array("App"=>$app); + } + $this->gosaMemberApplication[$cat] = $ret; + } + + + function getOneDown($appl) { - $i = 1; - while(isset($this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir])){ - $i ++; + $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($id) + { + $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; } - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir]['Pri'] = $this->getNextFree(1,$this->curCatDir); - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir]['Cat'] = $this->curCatDir; - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir]['App'] = "__SEPARATOR__".$i; } function execute() { /* Call parent execute */ - //plugin::execute(); + plugin::execute(); + if((isset($_GET['act']))&&($_GET['act']=="depopen")){ $dep = base64_decode($_GET['depid']); if(isset($this->config->idepartments[$dep])){ - $this->curbase = $dep; + $this->curbase =$dep; } } - if(isset($_POST['AddSeperator'])){ - $this->AddSeperator(); - } - if((isset($_GET['act']))&&($_GET['act']=="open")){ - $this->curCatDir = $_GET['id']; - - $found = false; - foreach($this->Categories as $key => $name ){ - if($this->curCatDir==$name){ - $tmp = array_flip(split("\/",$key)); - - $this->curCatDepth = ($tmp[$this->curCatDir]); - $found= true; - } - } - if(!$found){ - $this->curCatDir = ""; - $this->curCatDepth = 0; - } + $this->curCatDir = base64_decode($_GET['id']); } /* Do we need to flip is_account state? */ @@ -206,19 +308,86 @@ class appgroup extends plugin } } + + /* Add Categorie */ + + + if((isset($_POST['AddCat']))&&(isset($_POST['CatName']))&&(!empty($_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)){ + $this->Categories[$_POST['CatName']]=$_POST['CatName']; + }else{ + $this->Categories[$this->curCatDir."/".$_POST['CatName']]=$_POST['CatName']; + } + }else{ + print_red(_("The specified category already exists.")); + } + } + + $this->reload(); + $only_once = false; foreach($_POST as $name => $value){ - if(preg_match("/DelApp_/",$name)){ - $app = preg_replace("/DelApp_/","",$name); - unset($this->used_apps[$app]); - unset($this->gosaMemberApplication[$app."|".$this->curCatDir]); + + if((preg_match("/AddSep_/",$name))&&(!$only_once)){ + $only_once = true; + $n = preg_replace("/AddSep_/","",$name); + $val= preg_replace("/_.*$/","",$n); + $this->AddSeperator($val); + } + + if((preg_match("/DelApp_/",$name))&&(!$only_once)){ + $only_once = true; + + + if(preg_match("/DelApp___SEPARATOR__/",$name)) { + $n= preg_replace("/DelApp___SEPARATOR__/","",$name); + $val= "__SEPARATOR__".preg_replace("/_.*$/","",$n); + }else{ + $n = preg_replace("/DelApp_/","",$name); + $val= preg_replace("/_.*$/","",$n); + } + + foreach($this->gosaMemberApplication as $key => $cat){ + foreach($cat as $key2 => $app){ + if($app['App'] == $val){ + unset($this->gosaMemberApplication[$key][$key2]); + if(isset($this->used_apps[$val])){ + unset($this->used_apps[$val]); + } + } + } + } + } + + 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){ + foreach($this->Categories as $p => $n){ + if(preg_match("/^".$key."\/.*/",$p)){ + unset($this->Categories[$p]); + } + } + unset($this->Categories[$key]); + } + } } - if(preg_match("/EdiApp_/",$name)){ + + if((preg_match("/EdiApp_/",$name))&&(!$only_once)){ + + $only_once = true; $appname = $value; + $appname = preg_replace("/EdiApp_/","",$name); + $appname = preg_replace("/_.*$/","",$appname); /* We've got the appname, get parameters from ldap */ $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); - $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))"); + $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter")); if ($ldap->count() != 1){ print_red (_("The selected application name is not uniq. Please check your LDAP.")); } else { @@ -262,7 +431,6 @@ class appgroup extends plugin } } $this->reload(); - /* Add group with post */ if((isset($_GET['act']))&&($_GET['act']=="add")){ $this->used_apps[$_GET['id']]= $_GET['id']; @@ -310,7 +478,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 @@ -333,7 +501,7 @@ class appgroup extends plugin $departments[$value['dn']]=convert_department_dn($value['dn']); } } - + /* END NEW LIST MANAGMENT */ @@ -344,83 +512,98 @@ 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"=>" ".sprintf($linkopen,base64_encode($key),$app), - "attach"=>"style='border:0px;'") - )); + array("string"=>" ".sprintf($linkopen,base64_encode($key),$app), + "attach"=>"style='border:0px;'") + )); } - + foreach($apps as $key => $app){ $div->AddEntry(array( - array("string"=>sprintf("",$key). - " ".sprintf($linkadd,$key,$app), - "attach"=>"style='border:0px;'") - )); + array("string"=>sprintf("",$key). + " ".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 = false; - foreach($this->gosaMemberApplication as $key => $member){ - if($id == $member['App']){ - $found = $key; - } - } - if($found != false){ - 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); - $menu = $this->CreateCatMenu(); - $str_noprio = " %s "; - $linkopen = " %s"; - $app = " %s".$str_noprio; + $linkopen = " %s"; + $catremove = " "; + $app = " %s"; + + $catupdown = " + + "; - /* append back entry */ - if($menu["__BACK__"] != false){ - $div2 ->AddEntry(array( - array("string"=>sprintf($linkopen,$menu["__BACK__"],".. [ "._("back")." ]")), - array("string"=>" ","attach"=>"style='border-right:0px;'") - )); + if(empty($this->curCatDir)){ + $cnt =0; + }else{ + $cnt = count(split("/",$this->curCatDir)); + $tmp = split("/",$this->curCatDir); + $bbk = ""; + for($i = 0 ; $i < ($cnt -1 ) ; $i++){ + $bbk .= $tmp[$i]; + } + $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,base64_encode($bbk),"..")),array("string"=>" ","attach"=>"style='border-right:0px;'"))); } - foreach($menu['__CATEGORY__'] as $path => $name){ - $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,$path,$name)),array("string"=>" ","attach"=>"style='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 ="