X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=b66f40e85ddb5c5ea2e86062735be8bc845e06d0;hb=2eadfd8a6b013002c7edc74d85d736ffa690b5ce;hp=fd3500a8602dd1a970fe3544ac4df108a91b6bee;hpb=33259d4135eb2640250c7339d6d6debacafa76a0;p=gosa.git
diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index fd3500a86..b66f40e85 100644
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -14,24 +14,62 @@ 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("gosaMemberApplication");
- var $objectclasses= array("gosaApplicationGroup");
+ var $attributes = array("gosaMemberApplication","gosaApplicationParameter");
+ var $objectclasses = array("gosaApplicationGroup");
+ var $FAIrelease = "/";
+ var $InitialFAIrelease = "/";
+ var $Releases = array();
+ var $enableReleaseManagement = false;
- function appgroup ($config, $dn= NULL)
+ var $AllAppsForRelease = array();
+ var $AllAppsForReleaseParameter = array();
+
+ var $CopyPasteVars = array("Categories");
+ var $gosaApplicationParameter ;
+ var $ui = NULL;
+ var $no_release_acls = false;
+
+ function appgroup ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+
+ /* Check if we have relase mangement enabled and prepare group application 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);
+
+ /* set userinfo object */
+ $this->ui = get_userinfo();
+
+ /* Compatibility check
+ 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();
@@ -53,10 +91,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)){
@@ -77,9 +115,11 @@ class appgroup extends plugin
}
}
+ /* Assign collected category and application settings */
$this->Categories = $cats;
-
$this->gosaMemberApplication = $tmp2;
+
+ /* Sort application by category */
$cats[""]="";
foreach($cats as $cat ){
if((isset($prios[$cat]))&&(count($prios[$cat]))){
@@ -98,8 +138,9 @@ class appgroup extends plugin
}
}
}
- }
+ }
+ /* Sort application by priority */
$tmp = array();
foreach($this->gosaMemberApplication as $key => $entries){
ksort ($entries);
@@ -109,6 +150,16 @@ 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();
+ }
+
+ if($this->is_account){
+ @log::log("view","groups/".get_class($this),$this->dn);
+ }
}
@@ -131,6 +182,7 @@ class appgroup extends plugin
return($ret);
}
+ /* Returns element position within given array */
function getpos($atr,$attrs)
{
$i = 0;
@@ -144,6 +196,63 @@ class appgroup extends plugin
}
+ /* Check current combination of application && release
+ Are all application available?, application parameter changed? ... */
+ function diffAppsInReleases()
+ {
+ /* Only diff if it is required */
+ $ret =array();
+
+ /* If current release has changed */
+ if($this->FAIrelease != $this->InitialFAIrelease){
+
+ /* Walk through all apps which are currently displayed */
+ if(isset($this->gosaMemberApplication[$this->curCatDir])){
+
+ 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;
+ }
+ }
+ /* Initially 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;
+ }
+ }
+ }
+ }
+ return($ret);
+ }
+
/* TRansports the geiven Arraykey one position up*/
function ArrayUp($atr,$attrs)
{
@@ -177,13 +286,13 @@ class appgroup extends plugin
return($ret);
}
-
+
+ /* Sort category on position up */
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]);
}
@@ -192,14 +301,13 @@ class appgroup extends plugin
}
}
-
+
+ /* Sort category on position down */
function catDown($id)
{
- /* Get all cats depinding on current dir */
+ /* 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]);
}
@@ -209,18 +317,16 @@ class appgroup extends plugin
}
+ /* Increase application priority */
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);
@@ -229,18 +335,16 @@ class appgroup extends plugin
}
+ /* Decrease application priority */
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);
@@ -248,8 +352,8 @@ class appgroup extends plugin
$this->gosaMemberApplication[$cat] = $ret;
}
-
-
+
+ /* Add seperator to application list */
function AddSeperator($id)
{
$found = false;
@@ -268,25 +372,37 @@ class appgroup extends plugin
}
}
+
+ /* Check if application acls are readable */
+ function check_acls()
+ {
+ return(count($this->ui->get_module_departments("application")));
+ }
+
+
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
+ /* Check if department was selected */
if((isset($_GET['act']))&&($_GET['act']=="depopen")){
- $dep = base64_decode($_GET['depid']);
- if(isset($this->config->idepartments[$dep])){
- $this->curbase =$dep;
- }
+ $dep = base64_decode($_GET['depid']);
+ $this->curbase =$dep;
}
- if((isset($_GET['act']))&&($_GET['act']=="open")){
+ /* Check if category was selected */
+ if((isset($_GET['act']))&&($_GET['act']=="open") && (empty($_GET['id']) || isset($this->Categories[base64_decode($_GET['id'])]))){
$this->curCatDir = base64_decode($_GET['id']);
}
/* Do we need to flip is_account state? */
- if (isset($_POST['modify_state'])){
- $this->is_account= !$this->is_account;
+ if(isset($_POST['modify_state'])){
+ if($this->is_account && $this->acl_is_removeable()){
+ $this->is_account= FALSE;
+ }elseif(!$this->is_account && $this->acl_is_createable()){
+ $this->is_account= TRUE;
+ }
}
/* Do we represent a valid group? */
@@ -300,144 +416,191 @@ class appgroup extends plugin
$display= "";
if ($this->parent != NULL){
if ($this->is_account){
- $display= $this->show_header(_("Remove applications"),
+ $display= $this->show_disable_header(_("Remove applications"),
_("This group has application features enabled. You can disable them by clicking below."));
} else {
- $display.= $this->show_header(_("Create applications"),
+ $display.= $this->show_enable_header(_("Create applications"),
_("This group has application features disabled. You can enable them by clicking below."));
return ($display);
}
}
+ /* Check acl, applications must be readable */
+ if(!$this->check_acls()){
+ $display .= "
+ "._("Insufficient permissions")."
+
". + _("You do not have permission to query application entries. All your changes will not be saved."). + "
"; + $this->no_release_acls = true; + } + /* 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']; + /* Only allow adding a category, if it is allowed */ + if($this->acl_is_writeable("gosaMemberApplication",$this->no_release_acls)){ + + 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{ - $this->Categories[$this->curCatDir."/".$_POST['CatName']]=$_POST['CatName']; + print_red(_("The specified category already exists.")); } - }else{ - print_red(_("The specified category already exists.")); } } $this->reload(); + $this->diffAppsInReleases(); + + /* Check POST variables for commands + to add/remove some applications */ $only_once = false; - foreach($_POST as $name => $value){ - - if((preg_match("/AddSep_/",$name))&&(!$only_once)){ - $only_once = true; - $n = preg_replace("/AddSep_/","",$name); - $val= preg_replace("/_.*$/","",$n); - $this->AddSeperator($val); - } + if($this->acl_is_writeable("gosaMemberApplication",$this->no_release_acls)){ - if((preg_match("/DelApp_/",$name))&&(!$only_once)){ - $only_once = true; - + /* Walk through posts */ + foreach($_POST as $name => $value){ - if(preg_match("/DelApp___SEPARATOR__/",$name)) { - $n= preg_replace("/DelApp___SEPARATOR__/","",$name); - $val= "__SEPARATOR__".preg_replace("/_.*$/","",$n); - }else{ - $n = preg_replace("/DelApp_/","",$name); + /* Add a seperator to current category */ + if((preg_match("/AddSep_/",$name))&&(!$only_once)){ + $only_once = true; + $n = preg_replace("/AddSep_/","",$name); $val= preg_replace("/_.*$/","",$n); + $this->AddSeperator($val); } - 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]); + /* Delete application | seperator entry */ + 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])){ + 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)){ - $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]); + + /* Remove category entry */ + 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]); } - unset($this->Categories[$key]); } } - } - - 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))",array("gosaApplicationParameter")); - 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]; + + /* Edit application parameter */ + 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(); + + /* Check if we have release management enabled */ + $tmp = search_config($this->config->data,"faiManagement","CLASS"); + if(!empty($tmp)){ + + /* Get application parameter from ldap */ + $tmp = array_flip($this->Releases); + $base = $tmp[$this->FAIrelease]; + $ldap->cd($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{ + + /* Get application parameter from ldap */ + $ldap->cd($this->config->current['BASE']); + $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter")); + } + + /* Check if this application is unique */ + if ($ldap->count() != 1){ + print_red (_("The selected application name is not uniq. Please check your LDAP.")); + } else { - /* Create edit field */ - $table= "
".$this->option_name[$i]." | ".
- " |
".$this->option_name[$i]." | ".
+ " |