X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=845b19969bcd7320c325d1e86208cf05c23bf714;hb=0b0ba2643acbe53011db1b3307397cb38adb0c36;hp=481c514961036bd6a8354b65484105627d91b35b;hpb=4d5fd5f96acfd166d7519826b7b6b3b63f898954;p=gosa.git diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 481c51496..845b19969 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -10,16 +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 $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(); @@ -47,13 +49,234 @@ class appgroup extends plugin $this->appoption[$name]= $option; } } + + /* Parse MemberApplication*/ + $tmp = array(); + $tmp2 = array(); + $prios = array(); + $cats = array(); + + foreach($this->gosaMemberApplication as $memberApp){ + if(preg_match("/\|/i",$memberApp)){ + + $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[]['App'] = $memberApp; + } + } + + $this->Categories = $cats; + + $this->gosaMemberApplication = $tmp2; + $cats[""]=""; + foreach($cats as $cat ){ + 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; + } + } + } + } + + $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 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($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 catUp($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){ + $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; + } + } + + + } + + 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 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; + } + foreach($last as $entry){ + $tmp[] = $entry; + } + $this->gosaMemberApplication[$cat] =$tmp; + } + + 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; + } + } + 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])){ @@ -61,6 +284,10 @@ class appgroup extends plugin } } + if((isset($_GET['act']))&&($_GET['act']=="open")){ + $this->curCatDir = $_GET['id']; + } + /* Do we need to flip is_account state? */ if (isset($_POST['modify_state'])){ $this->is_account= !$this->is_account; @@ -86,25 +313,104 @@ class appgroup extends plugin } } - /* Check sorting variable */ - $this->reload(); - /* Delete app from group */ - if (isset($_POST['del_app']) && isset ($_POST['used_apps'])){ - foreach ($_POST['used_apps'] as $value){ - unset ($this->used_apps["$value"]); - $this->removeApp($value); + /* 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.")); } } - /* Add app to group */ - if (isset($_POST['add_app']) && isset($_POST['apps'])){ - foreach ($_POST['apps'] as $value){ - $this->used_apps["$value"]= $this->apps[$value]; - asort($this->used_apps); - $this->addApp($value); + + $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){ + 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; + /* 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))"); + if ($ldap->count() != 1){ + print_red (_("The selected application name is not uniq. Please check your LDAP.")); + } else { + $attrs= $ldap->fetch(); + if(isset($attrs['gosaApplicationParameter'])){ + $this->dialog= TRUE; + + /* Fill name and value arrays */ + for ($i= 0; $i<$attrs['gosaApplicationParameter']['count']; $i++){ + $option= preg_replace('/^[^:]+:/', '', + $attrs['gosaApplicationParameter'][$i]); + $name= preg_replace('/:.*$/', '', + $attrs['gosaApplicationParameter'][$i]); + $this->option_name[$i]= $name; + + /* Fill with values from application, default should be + loaded by the external scripts */ + if (isset($this->appoption[$name])){ + $this->option_value[$i]= $this->appoption[$name]; + } + } + + /* Create edit field */ + $table= ""; + for ($i= 0; $i < count($this->option_name); $i++){ + if (isset($this->option_value[$i])){ + $value= $this->option_value[$i]; + } else { + $value= ""; + } + $table.=""; + } + $table.= "
".$this->option_name[$i]."". + "
"; + $this->table= $table; + } else { + print_red (_("The selected application has no options.")); + } + } } } + $this->reload(); /* Add group with post */ if((isset($_GET['act']))&&($_GET['act']=="add")){ @@ -113,56 +419,17 @@ class appgroup extends plugin $this->addApp($_GET['id']); } - /* Edit application options? */ - if (isset($_POST['edit_options']) && isset($_POST['used_apps'])){ - $appname= $_POST['used_apps'][0]; - - /* 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))"); - if ($ldap->count() != 1){ - print_red (_("The selected application name is not uniq. Please check your LDAP.")); - } else { - $attrs= $ldap->fetch(); - if(isset($attrs['gosaApplicationParameter'])){ - $this->dialog= TRUE; - - /* Fill name and value arrays */ - for ($i= 0; $i<$attrs['gosaApplicationParameter']['count']; $i++){ - $option= preg_replace('/^[^:]+:/', '', - $attrs['gosaApplicationParameter'][$i]); - $name= preg_replace('/:.*$/', '', - $attrs['gosaApplicationParameter'][$i]); - $this->option_name[$i]= $name; - - /* Fill with values from application, default should be - loaded by the external scripts */ - if (isset($this->appoption[$name])){ - $this->option_value[$i]= $this->appoption[$name]; - } - } - - /* Create edit field */ - $table= ""; - for ($i= 0; $i < count($this->option_name); $i++){ - if (isset($this->option_value[$i])){ - $value= $this->option_value[$i]; - } else { - $value= ""; - } - $table.=""; - } - $table.= "
".$this->option_name[$i]."". - "
"; - $this->table= $table; - } else { - print_red (_("The selected application has no options.")); + /* Add multiple */ + if(isset($_POST['AddApps'])){ + foreach($_POST as $name => $value){ + if(preg_match("/AddApp_/",$name)){ + $app = preg_replace("/AddApp_/","",$name); + $this->addApp($app); } } } + /* Cancel edit options? */ if (isset($_POST['edit_options_cancel'])){ $this->dialog= FALSE; @@ -192,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 @@ -215,7 +482,7 @@ class appgroup extends plugin $departments[$value['dn']]=convert_department_dn($value['dn']); } } - + /* END NEW LIST MANAGMENT */ @@ -226,23 +493,112 @@ 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"=>""._("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($_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 = -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); + } + } + } + } + + $div2 = new DivSelectBox("appgroup"); + $div2->SetHeight(400); + + $linkopen = " %s"; + $catremove = " "; + $app = " %s"; + + $catupdown = " +   + "; + + 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;'"))); + } + + $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 */ + + $separator ="
"; + + $sep = ""; + + $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;'"))); + }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;'"))); + } + } + } + + $smarty->assign("UsedApps", $div2->DrawList()); $smarty->assign("List", $div->DrawList()); $smarty->assign("apps", $apps); @@ -253,7 +609,6 @@ class appgroup extends plugin } else { $display.= $smarty->fetch (get_template_path('application.tpl', TRUE)); } - return ($display); } @@ -274,22 +629,28 @@ class appgroup extends plugin } - /* Save data to object */ -# function save_object() -# { -# plugin::save_object(); -# } - - /* Save to LDAP */ function save() { plugin::save(); /* Copy members */ + $this->Categories[""]=""; $this->attrs["gosaMemberApplication"]= array(); - foreach ($this->gosaMemberApplication as $val){ - $this->attrs["gosaMemberApplication"][]= stripslashes($val); + $cats = array(); + foreach($this->Categories as $name => $cats){ + $cats[$name] =0; + if(isset($this->gosaMemberApplication[$name])){ + foreach($this->gosaMemberApplication[$name] as $entry){ + if(!preg_match("/__SEPARATOR__/",$entry['App'])){ + $this->attrs["gosaMemberApplication"][]= $entry['App']."|".$name."|".$cats[$name]; + } + $cats[$name] = $cats[$name] + 1; + } + } + if(($cats[$name]==0)&&(!empty($name))){ + $this->attrs["gosaMemberApplication"][]= "|".$name."|".$cats[$name]; + } } /* Are there application parameters to be saved */ @@ -345,15 +706,25 @@ class appgroup extends plugin natcasesort ($this->apps); reset ($this->apps); - foreach ($this->gosaMemberApplication as $value){ - $this->used_apps[$value]= $value; - } + 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']; + } + } } + function addApp($cn) { - $this->gosaMemberApplication[]= $cn; - $this->gosaMemberApplication= array_unique($this->gosaMemberApplication); + if((isset($this->gosaMemberApplication[$this->curCatDir]))&&(is_array($this->gosaMemberApplication[$this->curCatDir]))){ + foreach($this->gosaMemberApplication[$this->curCatDir] as $entry){ + if($entry['App'] == $cn) return; + } + } + $this->gosaMemberApplication[$this->curCatDir][]= array("App"=>$cn); + $this->used_apps[$cn]=$cn; $this->is_modified= TRUE; } @@ -370,6 +741,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: