X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=4a4fde162c069a21fe595b08f4b95b940961ac92;hb=4f507bf6c24fd9a5c50928b3a0c334ba5529c42d;hp=845b19969bcd7320c325d1e86208cf05c23bf714;hpb=4857dcc32dd1ae5beb60fe8ebdd6c25b5738c3b3;p=gosa.git
diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 845b19969..4a4fde162 100644
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -14,25 +14,61 @@ class appgroup extends plugin
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 $option_name = array();
+ var $option_value = array();
+ var $appoption = array();
- var $table = "";
- var $curbase = "";
- var $curCatDir ;
- var $curCatDepth =0; //
+ var $table = "";
+ var $curbase = "";
+ var $curCatDir ;
+ var $curCatDepth =0; //
/* attribute list for save action */
- var $attributes= array();
- var $objectclasses= array("gosaApplicationGroup");
+ var $attributes = array("gosaMemberApplication","gosaApplicationParameter");
+ var $objectclasses = array("gosaApplicationGroup");
- function appgroup ($config, $dn= NULL)
+ var $FAIrelease = "/";
+ var $InitialFAIrelease = "/";
+ var $Releases = array();
+ var $enableReleaseManagement = false;
+
+ var $AllAppsForRelease = array();
+ var $AllAppsForReleaseParameter = array();
+
+ var $CopyPasteVars = array("Categories");
+ var $gosaApplicationParameter ;
+
+
+ function appgroup ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+
+ /* prepare group app for release management */
+ $tmp = search_config($config->data,"faiManagement","CLASS");
+ if(!empty($tmp)){
+ $this->enableReleaseManagement = true;
+ $this->objectclasses [] = "FAIreleaseTag";
+ $this->attributes[] = "FAIrelease";
+ }
+
+ plugin::plugin ($config, $dn, $parent);
+
+ /* In some case of old applikations with old release tag saving, we
+ must reassign is_account state.
+ (Or if release management wasn't activated before creating this app) */
+ if($this->enableReleaseManagement){
+
+ /* Release management is activated && this is a valid group app account,
+ but no release class was found, so activate is_account flag */
+ if($dn != "new" && ( in_array("gosaApplicationGroup",$this->attrs['objectClass'])) &&
+ (!in_array("FAIreleaseTag",$this->attrs['objectClass']))){
+ $this->is_account =true;
+ }
+ }
+
/* Load member applications */
if (isset ($this->attrs["gosaMemberApplication"][0])){
+ $this->gosaMemberApplication = array();
for ($i= 0; $i<$this->attrs["gosaMemberApplication"]["count"]; $i++){
$this->gosaMemberApplication[]=
$this->attrs["gosaMemberApplication"][$i];
@@ -51,10 +87,10 @@ class appgroup extends plugin
}
/* Parse MemberApplication*/
- $tmp = array();
- $tmp2 = array();
- $prios = array();
- $cats = array();
+ $tmp = array();
+ $tmp2 = array();
+ $prios = array();
+ $cats = array();
foreach($this->gosaMemberApplication as $memberApp){
if(preg_match("/\|/i",$memberApp)){
@@ -107,153 +143,211 @@ class appgroup extends plugin
}
$this->gosaMemberApplication = $tmp;
$this->curbase = $this->config->current['BASE'];
+
+ /* Get required release informations */
+ if($this->enableReleaseManagement){
+ $this->InitialFAIrelease = $this->FAIrelease;
+ $this->Releases = $this->getReleases();
+ }
}
- function catDown($id){
- /* Get all cats depinding on current dir */
- $cats = $this->GetSubdirs($this->curCatDir);
+
+ /* Combine new array */
+ function combineArrays($ar0,$ar1,$ar2)
+ {
$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;
+ 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);
}
- function catUp($id)
+ function diffAppsInReleases()
{
- /* Get all cats depinding on current dir */
- $cats = $this->GetSubdirs($this->curCatDir);
+ /* Only diff if it is required
+ */
+ $ret =array();
- $ret = array();
+ /* If current release has changed */
+ if($this->FAIrelease != $this->InitialFAIrelease){
- 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;
- }
- }
+ /* Walk through all apps which are currently displayed */
+ if(isset($this->gosaMemberApplication[$this->curCatDir])){
- 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($this->gosaMemberApplication[$this->curCatDir] as $entry){
+
+ /* If application is also available in new release, check if parameter differs */
+ if(in_array($entry['App'],$this->AllAppsForRelease)){
+
+ $old = array(); // Old application parameter
+ $new = array(); // New parameters
+
+ /* There are possibly no parameters specified */
+ if(isset($this->AllAppsForReleaseParameter[$this->InitialFAIrelease][$entry['App']])){
+ $old = $this->AllAppsForReleaseParameter[$this->InitialFAIrelease][$entry['App']];
+ }
+
+ if(isset($this->AllAppsForReleaseParameter[$this->FAIrelease][$entry['App']])){
+ $new = $this->AllAppsForReleaseParameter[$this->FAIrelease][$entry['App']];
+ }
+
+ /* Both (old & new) have no gosaApplicationParameter
+ */
+ if((!isset($old['gosaApplicationParameter'])) && (!isset($new['gosaApplicationParameter']))){
+ $ret[$entry['App']] = false;
+
+ /* Both got gosaApplicationParameter
+ */
+ }elseif((isset($old['gosaApplicationParameter'])) && (isset($new['gosaApplicationParameter']))){
+ if(array_differs($old['gosaApplicationParameter'],$new['gosaApplicationParameter'])){
+ $ret[$entry['App']] = true;
+ }else{
+ $ret[$entry['App']] = false;
+ }
+ }
+ /* Initialy had gosaApplicationParameter bot in new release not
+ */
+ }elseif((isset($old['gosaApplicationParameter'])) && (!isset($new['gosaApplicationParameter']))){
+ $ret[$entry['App']] = true;
+
+ /* Old release had no gosaApplicationParameter but new got some
+ */
+ }elseif((!isset($old['gosaApplicationParameter'])) && (isset($new['gosaApplicationParameter']))){
+ $ret[$entry['App']] = true;
}
}
}
-
- foreach($cats as $cat => $name){
- unset($this->Categories[$cat]);
- }
- foreach($ret as $cat => $name){
- $this->Categories[$cat]=$name;
- }
}
-
+ return($ret);
+ }
+ /* 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);
}
- function getOneUp($appl)
+
+ /* TRansports the geiven Arraykey one position up*/
+ function ArrayDown($atr,$attrs)
{
- $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 = $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);
}
- foreach(array_reverse($middle) as $entry){
- $tmp[] = $entry;
+ 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($last as $entry){
- $tmp[] = $entry;
+ foreach($newcats as $cat => $name){
+ $this->Categories[$cat]=$name;
}
- $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;
+
+
+ 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(array_reverse($middle) as $entry){
- $tmp[] = $entry;
+ foreach($newcats as $cat => $name){
+ $this->Categories[$cat]=$name;
}
- foreach($last 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'];
}
- $this->gosaMemberApplication[$cat] =$tmp;
+
+ $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;
@@ -274,18 +368,18 @@ class appgroup extends plugin
function execute()
{
- /* Call parent execute */
- plugin::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;
+ $this->curbase =$dep;
}
}
if((isset($_GET['act']))&&($_GET['act']=="open")){
- $this->curCatDir = $_GET['id'];
+ $this->curCatDir = base64_decode($_GET['id']);
}
/* Do we need to flip is_account state? */
@@ -315,11 +409,11 @@ 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'])){
+
+ if(preg_match("/[\\\\\/]/i",$_POST['CatName'])){
print_red(_("Invalid character in category name."));
}elseif(!in_array($_POST['CatName'],$this->Categories)){
if(empty($this->curCatDir)){
@@ -334,40 +428,94 @@ class appgroup extends plugin
$this->reload();
+
+ $this->diffAppsInReleases();
+ $only_once = false;
foreach($_POST as $name => $value){
- if(preg_match("/AddSep_/",$name)){
- $this->AddSeperator($value);
+
+ 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)){
- $app = $value;
+ 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'] == $value){
+
+ if($app['App'] == $val){
unset($this->gosaMemberApplication[$key][$key2]);
- if(isset($this->used_apps[$value])){
- unset($this->used_apps[$value]);
+ if(isset($this->used_apps[$val])){
+ foreach($this->getParameters($val) as $para){
+ if(isset($this->appoption[$para])){
+ unset($this->appoption[$para]);
+ }
+ }
+ unset($this->used_apps[$val]);
}
}
}
}
}
+
if(preg_match("/DelCat_/",$name)){
- $app = $value;
+ $n = preg_replace("/DelCat_/","",$name);
+ $app = base64_decode( preg_replace("/_.*$/","",$n));
foreach($this->Categories as $key => $cat){
- if($cat == $value){
+ 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;
- /* We've got the appname, get parameters from ldap */
+ $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))");
+
+ $tmp = search_config($this->config->data,"faiManagement","CLASS");
+ if(!empty($tmp)){
+ $tmp = array_flip($this->Releases);
+ $base = $tmp[$this->FAIrelease];
+
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter"));
+ $found = "";
+ while($attrs = $ldap->fetch()) {
+ if(preg_match("/cn=".$appname.",".$base."/",$attrs['dn'])){
+ $found = $attrs['dn'];
+ }
+ }
+ $ldap->cat($found, array("gosaApplicationParameter"));
+ }else{
+ $ldap->cd($this->config->current['BASE']);
+ $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 {
@@ -410,6 +558,7 @@ class appgroup extends plugin
}
}
}
+
$this->reload();
/* Add group with post */
@@ -459,33 +608,21 @@ class appgroup extends plugin
$div = new DivSelectBox("appgroup");
- $div->SetHeight(400);
+ $div->SetHeight(300);
- /* 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){
+ /* get departments */
+ $ui = get_userinfo();
+ $departments = array();
+ $res = get_list("(objectClass=gosaDepartment)",$ui->subtreeACL,$this->curbase,array("description","cn","ou"),GL_SIZELIMIT);
+ foreach($res as $value){
+ $fdn= @LDAP::fix($value['dn']);
if($value["description"][0]!=".."){
- $departments[$value['dn']]=convert_department_dn($value['dn'])." - [".$value["description"][0]."]";
+ $departments[$value['dn']]= convert_department_dn($fdn)." - [".$value["description"][0]."]";
}else{
- $departments[$value['dn']]=convert_department_dn($value['dn']);
+ $departments[$value['dn']]=convert_department_dn($fdn);
}
}
- /* END NEW LIST MANAGMENT
- */
-
$linkopen = "%s";
$linkadd = "%s";
@@ -498,25 +635,25 @@ class appgroup extends plugin
}
foreach($departments as $key => $app){
$div->AddEntry(array(
- array("string"=>" ".sprintf($linkopen,base64_encode($key),$app),
+ 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),
+ 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']);
+ $this->catUp(base64_decode($_GET['id']));
}
if($_GET['act']=="cat_down"){
- $this->catDown($_GET['id']);
+ $this->catDown(base64_decode($_GET['id']));
}
}
@@ -524,35 +661,25 @@ class appgroup extends plugin
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(400);
+ $div2->SetHeight(300);
- $linkopen = "
%s";
+ $linkopen = "
%s";
$catremove = " ";
- $app = "
%s";
+ $app = "
%s";
- $catupdown = "
-
-
";
+ $catupdown = "
+
+
";
if(empty($this->curCatDir)){
$cnt =0;
@@ -563,37 +690,67 @@ class appgroup extends plugin
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;'")));
+ $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,base64_encode($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),
+ 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 ="