![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index f726bcddb4a61f113b926a30087120d8829174a0..064b94e6bf79bb58c4735456090e50df220699b6 100644 (file)
var $curCatDepth =0; //
/* attribute list for save action */
- var $attributes = array("gosaMemberApplication");
+ var $attributes = array("gosaMemberApplication","gosaApplicationParameter");
var $objectclasses = array("gosaApplicationGroup");
- var $Release = "/";
+ var $FAIrelease = "/";
+ var $InitialFAIrelease = "/";
var $Releases = array();
var $enableReleaseManagement = false;
var $AllAppsForRelease = array();
+ var $AllAppsForReleaseParameter = array();
- function appgroup ($config, $dn= NULL)
+ var $CopyPasteVars = array("Categories");
+ var $gosaApplicationParameter ;
+ var $ui ;
+
+
+ function appgroup ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ $this->ui = get_userinfo();
+
+ /* 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])){
}
/* 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)){
$this->gosaMemberApplication = $tmp;
$this->curbase = $this->config->current['BASE'];
- /* Check if we should enable the release selection
- */
- $tmp = search_config($config->data,"faiManagement","CLASS");
- if(!empty($tmp)){
- $this->enableReleaseManagement = true;
- $this->Release = $this->getReleaseName();
- $this->Releases= $this->getReleases();
+ /* Get required release informations */
+ if($this->enableReleaseManagement){
+ $this->InitialFAIrelease = $this->FAIrelease;
+ $this->Releases = $this->getReleases();
}
}
return(-1);
}
+ 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;
+ }
+ }
+ /* 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;
+ }
+ }
+ }
+ }
+ return($ret);
+ }
/* TRansports the geiven Arraykey one position up*/
function ArrayUp($atr,$attrs)
}
}
-
+
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){
foreach ($apps as $appkey => $name){
$appsA[$name['App']] =$name['App'];
}
-
+
$result = $this->ArrayUp($appl,$appsA);
$ret = array();
$this->gosaMemberApplication[$cat] = $ret;
}
-
-
+
+
function AddSeperator($id)
{
$found = false;
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
if((isset($_GET['act']))&&($_GET['act']=="depopen")){
$dep = base64_decode($_GET['depid']);
/* Add Categorie */
-
-
+
+
if((isset($_POST['AddCat']))&&(isset($_POST['CatName']))&&(!empty($_POST['CatName']))){
if(preg_match("/[\\\\\/]/i",$_POST['CatName'])){
$this->reload();
+
+ $this->diffAppsInReleases();
$only_once = false;
foreach($_POST as $name => $value){
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]);
}
}
$tmp = search_config($this->config->data,"faiManagement","CLASS");
if(!empty($tmp)){
- $base = $this->Releases[$this->Release];
+ $tmp = array_flip($this->Releases);
+ $base = $tmp[$this->FAIrelease];
$ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter"));
$found = $attrs['dn'];
}
}
- $ldap->cat($found);
+ $ldap->cat($found, array("gosaApplicationParameter"));
}else{
$ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter"));
-
}
}
}
}
+
$this->reload();
+
/* Add group with post */
if((isset($_GET['act']))&&($_GET['act']=="add")){
$this->used_apps[$_GET['id']]= $_GET['id'];
$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
- */
+ /* 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){
- $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){
+ $fdn = $value['dn'];
+ $fdn = preg_replace("/".normalizePreg($this->curbase)."/","",$fdn);
+ $fdn= @LDAP::fix($fdn);
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 = "<a href='?plug=".$_GET['plug']."&act=depopen&depid=%s'>%s</a>";
$linkadd = "<a href='?plug=".$_GET['plug']."&act=add&id=%s'>%s</a>";
}
$div2 = new DivSelectBox("appgroup");
- $div2->SetHeight(400);
+ $div2->SetHeight(300);
$linkopen = "<img class='center' src='images/folder.png' alt=\"\"> <a href='?plug=".$_GET['plug']."&act=open&id=%s'>%s</a>";
$catremove = " <input type='image' src='images/edittrash.png' title='"._("Delete entry")."' name='DelCat_%s' value='%s'>";
" <input type='image' src='images/edittrash.png' title='"._("Delete entry")."' name='DelApp_%s' value='%s' alt='{t}delete{/t}' >";
$edit= " <input type='image' src='images/edit.png' title='"._("Edit entry")."' name='EdiApp_%s' value='%s' alt='{t}edit{/t}' >";
+ $Differences = $this->diffAppsInReleases();
+
if(isset($this->gosaMemberApplication[$this->curCatDir])){
foreach($this->gosaMemberApplication[$this->curCatDir] as $cat => $entry){
/* release managent is active
*/
if(!$this->enableReleaseManagement){
- $image = "<img class='center' src='images/select_invalid_application.png'
+ $image = "<img class='center' alt='R' src='images/select_invalid_application.png'
title='"._("This application is no longer available.")."'> ";
}else{
- $image = "<img class='center' src='images/select_invalid_application.png'
- title='".sprintf(_("This application is not available in any release named %s."),$this->Release)."'> ";
+ $image = "<img class='center' alt='F' src='images/select_invalid_application.png'
+ title=\"".sprintf(_("This application is not available in any release named %s."),$this->FAIrelease)."\"> ";
}
+ }elseif(isset($Differences[$entry['App']]) && ($Differences[$entry['App']] == true)) {
+ $entry['App'].=" <i>["._("Check parameter")."]</i>";
+ $image = "<img class='center' src='images/select_invalid_application.png'
+ title='"._("This application has changed parameters.")."'> ";
}else{
$image = "<img class='center' src='images/select_application.png' alt=\"\"> ";
}
- $div2 ->AddEntry(array(array("string"=>sprintf($image."%s",$entry['App'])),
+ $div2->AddEntry(array(array("string"=>sprintf($image."%s",$entry['App'])),
array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$sep.$edit.$upudown),
"attach"=>"align='right' style='width:100px;border-right:0px;'")));
}
$smarty->assign("enableReleaseManagement",$this->enableReleaseManagement);
if($this->enableReleaseManagement){
- $smarty->assign("Release", $this->Release);
+ $smarty->assign("FAIrelease", $this->FAIrelease);
$smarty->assign("Releases", $this->Releases);
if(count($this->used_apps)){
function getReleases()
{
- $dn = "ou=apps,".$this->config->current['BASE'];
+ $dn = $this->config->current['BASE'];
$ldap = $this->config->get_ldap_link();
$ldap->cd($dn);
- $ldap->search("objectClass=organizationalUnit",array("ou"));
+ $ldap->search("(&(objectClass=organizationalUnit)(objectClass=FAIbranch))",array("ou"));
$ret =array();
while($attrs = $ldap->fetch()){
if(preg_match("/ou=apps,/",$attrs['dn'])){
$ret[$attrs['dn']] = $name;
}
}
+
+ /* Set releases to / id nor presenet */
+ if (!count($ret)){
+ $ret['/']= '/';
+ }
+
return($ret);
}
function save_object()
{
- if(isset($_POST ['Release'])){
- $this->Release = $_POST['Release'];
- }
+ plugin::save_object();
}
{
plugin::remove_from_parent();
- $this->attrs["gosaMemberApplication"]= array();
-
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
+
+ $ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing application information failed"));
/* Optionally execute a command after we're done */
$this->handle_post_events("remove");
/* Copy members */
$this->Categories[""]="";
$this->attrs["gosaMemberApplication"]= array();
+ $this->attrs["gosaApplicationParameter"]= array();
foreach($this->Categories as $name => $cats){
$i =0;
if(isset($this->gosaMemberApplication[$name])){
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
$this->cleanup();
-$ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving application information failed"));
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
/* Special handling for release managed apps
*/
$tmp = search_config($this->config->data,"faiManagement","CLASS");
- if(!empty($tmp)){
+ if(!empty($tmp) && count($this->Releases)){
$this->enableReleaseManagement = true;
$tmp = array_flip($this->Releases);
- if(isset($tmp[$this->Release])){
- $base = $tmp[$this->Release];
+ if(isset($tmp[$this->FAIrelease])){
+ $base = $tmp[$this->FAIrelease];
}else{
+ $old_r = $this->FAIrelease;
$k = key($tmp);
$r = $tmp[$k];
- $this->Release = $k;
+ $this->FAIrelease = $k;
$base = $r;
- print_red(sprintf(_("Can't resolve the release name '%s', setting release name to '%s'. Possibly the objects base has changed."),$this->Release,$k));
+ print_red(sprintf(_("Can't resolve the release name '%s', setting release name to '%s'. Possibly the objects base has changed."),$old_r,$k));
}
$base = preg_replace("/ou=apps,.*$/","ou=apps,".$this->curbase,$base);
-
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ($base);
- $ldap->ls ("(objectClass=gosaApplication)",$base);
+ $app_res = get_list("(objectClass=gosaApplication)", $this->ui->subtreeACL, $base,array("cn","description"));
}else{
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ("ou=apps,".$this->curbase);
- $ldap->ls ("(objectClass=gosaApplication)","ou=apps,".$this->curbase);
+ $app_res = get_list("(objectClass=gosaApplication)", $this->ui->subtreeACL, "ou=apps,".$this->curbase,array("cn","description"));
}
- while ($attrs= $ldap->fetch()){
+ foreach($app_res as $attrs){
if (isset($attrs["description"][0])){
$this->apps[$attrs["cn"][0]]=
$attrs["cn"][0]." (".
}
}
+ $ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search("objectClass=gosaApplication",array("cn"));
+ $ldap->search("objectClass=gosaApplication",array("gosaApplicationParameter","cn"));
$tmp = search_config($this->config->data,"faiManagement","CLASS");
$this->AllAppsForRelease = array();
if(!empty($tmp)){
$tmp = array_flip($this->Releases);
while($attrs = $ldap->fetch()){
+
$testdn = preg_replace("/ou=apps,.*$/","ou=apps",$attrs['dn']);
$testdn = preg_replace("/^[^,]+/","",$testdn);
$testdn = preg_replace("/^,/","",$testdn);
- if($testdn == preg_replace("/ou=apps,.*$/","ou=apps",$tmp[$this->Release])){
+ if($testdn == preg_replace("/ou=apps,.*$/","ou=apps",$tmp[$this->FAIrelease])){
$this->AllAppsForRelease[$attrs['dn']] = $attrs['cn'][0];
+ $this->AllAppsForReleaseParameter[$this->FAIrelease][$attrs['cn'][0]] = $attrs;
}
}
}else{
$this->is_modified= TRUE;
}
+ function getParameters($app)
+ {
+ $tmp = $this->getReleases();
+ $ret = array();
+ if(in_array($this->FAIrelease,$tmp)){
+ $tmp2 = array_flip($tmp);
+ $base = $tmp2[$this->FAIrelease];
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->search("(&(objectClass=gosaApplication)(cn=".$app.")(gosaApplicationParameter=*))",array("gosaApplicationParameter"));
+ if($ldap->count()){
+ $attrs = $ldap->fetch();
+ for($i = 0 ; $i < $attrs['gosaApplicationParameter']['count'] ; $i ++ ){
+ $name = preg_replace("/:.*$/","",$attrs['gosaApplicationParameter'][$i]);
+ $ret[$name] = $name;
+ }
+ }
+ }
+ return($ret);
+ }
+
function GetSubdirs($dir)
{
$ret = array();
}
return($ret);
}
-
-
- /* Get selected release name.
- * it is written in the description tag
- * within ... (.*)$
- */
- function getReleaseName()
- {
-
- if(isset($this->parent)){
- $base = $this->parent->by_object['group'];
- }else{
- $base = $this;
- }
-
- if(isset($base->attrs['description'][0])){
- $desc = $base->attrs['description'][0];
- }else{
- $desc = "";
- }
-
- if(preg_match("/\(.*\)$/",$desc)){
- $str = preg_replace("/^.*\((.*)\)$/","\\1",$desc);
- }else{
- $str = "/";
- }
- return($str);
- }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: