X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=fd4da27d2ebbb7fcd3b851d50e51852269733f16;hb=ca98ca8c7d1adccfcf78ccc86faa5d9e2d69967e;hp=a6ef61f10ba4ab7f3205615e27534350c34b1af5;hpb=22d35ef3995e44b2816491478db83e3b407268a6;p=gosa.git diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index a6ef61f10..fd4da27d2 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -10,19 +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 $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); @@ -46,10 +51,238 @@ 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); + + 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']; + } + + + /* Combine new array */ + function combineArrays($ar0,$ar1,$ar2) + { + $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); + } + + 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 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; + } + } + + + 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) + { + $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; + } } function execute() { + /* Call parent execute */ + plugin::execute(); + + if((isset($_GET['act']))&&($_GET['act']=="depopen")){ + $dep = base64_decode($_GET['depid']); + if(isset($this->config->idepartments[$dep])){ + $this->curbase = $dep; + } + } + + 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; @@ -57,7 +290,7 @@ class appgroup extends plugin /* Do we represent a valid group? */ if (!$this->is_account && $this->parent == NULL){ - $display= " ". + $display= " ". _("This 'dn' is no appgroup.").""; return ($display); } @@ -75,75 +308,122 @@ 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 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); + /* 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.")); } } - /* 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]; + $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)){ + $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 */ + $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= ""; + /* 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.="".$this->option_name[$i]."". + ""; } - $table.="".$this->option_name[$i]."". - ""; + $table.= ""; + $this->table= $table; + } else { + print_red (_("The selected application has no options.")); } - $table.= ""; - $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")){ + $this->used_apps[$_GET['id']]= $_GET['id']; + asort($this->used_apps); + $this->addApp($_GET['id']); + } + + /* 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'])){ @@ -171,6 +451,140 @@ class appgroup extends plugin $apps["$key"]= "$value"; } } + + $div = new DivSelectBox("appgroup"); + + $div->SetHeight(400); + + /* NEW LIST MANAGMENT + * We also need to search for the departments + * So we are able to navigate like in konquerer + */ + + $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->curbase) ; + $ldap->ls("(objectClass=gosaDepartment)"); + $departments= array(); + $tmp = array(); + while ($value = $ldap->fetch()){ + $tmp[strtolower($value['dn']).$value['dn']]=$value; + } + ksort($tmp); + foreach($tmp as $value){ + if($value["description"][0]!=".."){ + $departments[$value['dn']]=convert_department_dn($value['dn'])." - [".$value["description"][0]."]"; + }else{ + $departments[$value['dn']]=convert_department_dn($value['dn']); + } + } + + /* END NEW LIST MANAGMENT + */ + + $linkopen = "%s"; + $linkadd = "%s"; + + $base_back = preg_replace("/^[^,]+,/","",$this->curbase); + 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;'") + )); + } + foreach($departments as $key => $app){ + $div->AddEntry(array( + 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;'") + )); + } + + 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']; + + if($act == "one_up"){ + $this->getOneUp($id); + }elseif($act == "one_down") { + $this->getOneDown($id); + } + } + } + + $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,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 */ + + $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/",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/",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); /* Show main page */ @@ -180,7 +594,6 @@ class appgroup extends plugin } else { $display.= $smarty->fetch (get_template_path('application.tpl', TRUE)); } - return ($display); } @@ -201,22 +614,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 */ @@ -256,10 +675,11 @@ class appgroup extends plugin /* Generate applist */ $this->apps= array(); $ldap= $this->config->get_ldap_link(); - $ldap->cd ($this->config->current['BASE']); - $ldap->search ("(objectClass=gosaApplication)"); + $ldap->cd ("ou=apps,".$this->curbase); + + $ldap->ls ("(objectClass=gosaApplication)","ou=apps,".$this->curbase); while ($attrs= $ldap->fetch()){ - if (isset($attrs["description"][0])){ + if (isset($attrs["description"][0])){ $this->apps[$attrs["cn"][0]]= $attrs["cn"][0]." (". $attrs["description"][0].")"; @@ -271,16 +691,25 @@ class appgroup extends plugin natcasesort ($this->apps); reset ($this->apps); - $this->used_apps= array(); - foreach ($this->gosaMemberApplication as $value){ - $this->used_apps[$value]= $this->apps[$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; } @@ -297,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: