X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=845b19969bcd7320c325d1e86208cf05c23bf714;hb=0b0ba2643acbe53011db1b3307397cb38adb0c36;hp=5b42adcde0524569323894690f099e03c798d4dc;hpb=f03d1b6d42d91754f40acc07c040e53fef224b14;p=gosa.git diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 5b42adcde..845b19969 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -10,19 +10,18 @@ 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(); @@ -51,136 +50,233 @@ 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]); - $last = false; - for($i = $min ; $i < $max ; $i++){ - if(!isset($prios[$cat][$i])){ - if($last == false){ - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['Pri'] = $i; - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['Cat'] = $this->curCatDir; - $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['App'] = "__SEPARATOR__".$i; - - $last = true; + 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; } - }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) - { - $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; + function catDown($id){ + /* Get all cats depinding on current dir */ + $cats = $this->GetSubdirs($this->curCatDir); + $ret = array(); + if((in_array($id,array_flip($cats)))&&(count($cats)>1)){ + if(count($cats) == 2){ + $ret = array_reverse($cats); + }else{ + $cnt = 0; + $hit = 0; + foreach($cats as $cat=>$name){ + if($cat == $id){ + $hit = $cnt; + } + $cnt ++; } - } - } - - if($next != 0){ - $this->gosaMemberApplication[$appl]['Pri']= $next; - $this->gosaMemberApplication[$key_use]['Pri']= $prio; + if($hit == 0){ + $first = array_slice($cats,0,0); + $middle = array_slice($cats,0,2); + $last = array_slice($cats,$hit+2,$cnt); + }else{ + $first = array_slice($cats,0,$hit); + $middle = array_slice($cats,$hit,2); + $last = array_slice($cats,$hit+2,$cnt); + } + foreach($first as $cat => $name){ + $ret[$cat]=$name; + } + foreach(array_reverse($middle) as $cat => $name){ + $ret[$cat]=$name; + } + foreach($last as $cat => $name){ + $ret[$cat]=$name; + } + } + foreach($cats as $cat => $name){ + unset($this->Categories[$cat]); + } + foreach($ret as $cat => $name){ + $this->Categories[$cat]=$name; + } } } - - function getOneDown($appl){ - $prio = $this->gosaMemberApplication[$appl]['Pri']; - $prios = array(); - $next = 10000; - $key_use = false; - foreach($this->gosaMemberApplication as $key => $app){ - if($app['Cat'] != $this->gosaMemberApplication[$appl]['Cat']) continue; - + function catUp($id) + { + /* Get all cats depinding on current dir */ + $cats = $this->GetSubdirs($this->curCatDir); + + $ret = array(); - if($app['Pri']> $prio){ - if($app['Pri'] < $next){ - $next = $app['Pri']; - $key_use = $key; + if((in_array($id,array_flip($cats)))&&(count($cats)>1)){ + if(count($cats) == 2){ + $ret = array_reverse($cats); + }else{ + $cnt = 0; + $hit = 0; + foreach($cats as $cat => $name){ + $cnt ++; + if($cat == $id){ + $hit = $cnt; + } } + + if($hit>1){ + if($hit == 2){ + $first = array_slice($cats,0,$hit-2); + $middle = array_slice($cats,$hit-2,$hit); + $last = array_slice($cats,$hit,$cnt); + }else{ + $first = array_slice($cats,0,$hit-2); + $middle = array_slice($cats,$hit-2,2); + $last = array_slice($cats,$hit,$cnt); + } + foreach($first as $cat => $name){ + $ret[$cat]=$name; + } + foreach(array_reverse($middle) as $cat => $name){ + $ret[$cat]=$name; + } + foreach($last as $cat => $name){ + $ret[$cat]=$name; + } + } + } + + foreach($cats as $cat => $name){ + unset($this->Categories[$cat]); + } + foreach($ret as $cat => $name){ + $this->Categories[$cat]=$name; } } + - if($next != 0){ - $this->gosaMemberApplication[$appl]['Pri']= $next; - $this->gosaMemberApplication[$key_use]['Pri']= $prio; + } + + function getOneUp($appl) + { + $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; + } + foreach(array_reverse($middle) as $entry){ + $tmp[] = $entry; + } + foreach($last as $entry){ + $tmp[] = $entry; } + $this->gosaMemberApplication[$cat] =$tmp; } - function getNextFree($prio,$cat) - { - $ret = $prio; - $prios =array(); - foreach($this->gosaMemberApplication as $app){ - if($cat == $app['Cat']){ - $prios[$app['Pri']]=$app['Pri']; - } + 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; + } + foreach(array_reverse($middle) as $entry){ + $tmp[] = $entry; } - while(isset($prios[$ret])){ - $ret ++; + foreach($last as $entry){ + $tmp[] = $entry; } - return($ret); + $this->gosaMemberApplication[$cat] =$tmp; } - - function AddSeperator() + + function AddSeperator($id) { - $i = 1; - while(isset($this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir])){ - $i ++; + $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])){ @@ -188,26 +284,8 @@ class appgroup extends plugin } } - 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; - } } /* Do we need to flip is_account state? */ @@ -235,12 +313,54 @@ class appgroup extends plugin } } + + /* Add Categorie */ + + + if((isset($_POST['AddCat']))&&(isset($_POST['CatName']))&&(!empty($_POST['CatName']))){ + + if(preg_match("/[^0-9a-z,\.-;:_#\+\- ]/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(); foreach($_POST as $name => $value){ + if(preg_match("/AddSep_/",$name)){ + $this->AddSeperator($value); + } + + if(preg_match("/DelApp_/",$name)){ $app = $value; - unset($this->used_apps[$app]); - unset($this->gosaMemberApplication[$app."|".$this->curCatDir]); + + foreach($this->gosaMemberApplication as $key => $cat){ + foreach($cat as $key2 => $app){ + if($app['App'] == $value){ + unset($this->gosaMemberApplication[$key][$key2]); + if(isset($this->used_apps[$value])){ + unset($this->used_apps[$value]); + } + } + } + } + } + if(preg_match("/DelCat_/",$name)){ + $app = $value; + foreach($this->Categories as $key => $cat){ + if($cat == $value){ + unset($this->Categories[$key]); + } + } } if(preg_match("/EdiApp_/",$name)){ $appname = $value; @@ -339,7 +459,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 @@ -362,7 +482,7 @@ class appgroup extends plugin $departments[$value['dn']]=convert_department_dn($value['dn']); } } - + /* END NEW LIST MANAGMENT */ @@ -373,36 +493,47 @@ 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($_GET['id']); + } + if($_GET['act']=="cat_down"){ + $this->catDown($_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; + $found = -1; + if(isset($this->gosaMemberApplication[$this->curCatDir])){ + foreach($this->gosaMemberApplication[$this->curCatDir] as $key => $member){ + if($id == $member['App']){ + $found = $key; + } } } - if($found != false){ + if($found != -1){ if($act == "one_up"){ $this->getOneUp($found); }elseif($act == "one_down") { @@ -413,43 +544,57 @@ class appgroup extends plugin } $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,$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,$path,$name)), + array("string"=>preg_replace("/%s/",$path,$catupdown.$catremove), + "attach"=>"align='right' style='width:80px;border-right:0px;'"))); } - /* Append entries */ + /* Append entries */ $separator ="