X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fgroups%2Fclass_groupApplication.inc;h=b66f40e85ddb5c5ea2e86062735be8bc845e06d0;hb=2eadfd8a6b013002c7edc74d85d736ffa690b5ce;hp=80839ce16b81f0a2df4529fb66be18e9966f0a56;hpb=811d2d496bb582869e83487303ef7743c3e766e0;p=gosa.git diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 80839ce16..b66f40e85 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -37,24 +37,29 @@ class appgroup extends plugin var $CopyPasteVars = array("Categories"); var $gosaApplicationParameter ; + var $ui = NULL; + var $no_release_acls = false; - - function appgroup ($config, $dn= NULL) + function appgroup ($config, $dn= NULL, $parent= NULL) { - /* prepare group app for release management */ + /* 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"; + $this->objectclasses [] = "FAIreleaseTag"; + $this->attributes [] = "FAIrelease"; } - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); + + /* set userinfo object */ + $this->ui = get_userinfo(); - /* 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) */ + /* 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, @@ -65,7 +70,6 @@ class appgroup extends plugin } } - /* Load member applications */ if (isset ($this->attrs["gosaMemberApplication"][0])){ $this->gosaMemberApplication = array(); @@ -111,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]))){ @@ -132,8 +138,9 @@ class appgroup extends plugin } } } - } + } + /* Sort application by priority */ $tmp = array(); foreach($this->gosaMemberApplication as $key => $entries){ ksort ($entries); @@ -146,8 +153,12 @@ class appgroup extends plugin /* Get required release informations */ if($this->enableReleaseManagement){ - $this->InitialFAIrelease = $this->FAIrelease; - $this->Releases = $this->getReleases(); + $this->InitialFAIrelease = $this->FAIrelease; + $this->Releases = $this->getReleases(); + } + + if($this->is_account){ + @log::log("view","groups/".get_class($this),$this->dn); } } @@ -171,6 +182,7 @@ class appgroup extends plugin return($ret); } + /* Returns element position within given array */ function getpos($atr,$attrs) { $i = 0; @@ -183,10 +195,12 @@ class appgroup extends plugin return(-1); } + + /* Check current combination of application && release + Are all application available?, application parameter changed? ... */ function diffAppsInReleases() { - /* Only diff if it is required - */ + /* Only diff if it is required */ $ret =array(); /* If current release has changed */ @@ -217,8 +231,7 @@ class appgroup extends plugin if((!isset($old['gosaApplicationParameter'])) && (!isset($new['gosaApplicationParameter']))){ $ret[$entry['App']] = false; - /* Both got gosaApplicationParameter - */ + /* Both got gosaApplicationParameter */ }elseif((isset($old['gosaApplicationParameter'])) && (isset($new['gosaApplicationParameter']))){ if(array_differs($old['gosaApplicationParameter'],$new['gosaApplicationParameter'])){ $ret[$entry['App']] = true; @@ -226,13 +239,11 @@ class appgroup extends plugin $ret[$entry['App']] = false; } } - /* Initialy had gosaApplicationParameter bot in new release not - */ + /* 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 - */ + /* Old release had no gosaApplicationParameter but new got some */ }elseif((!isset($old['gosaApplicationParameter'])) && (isset($new['gosaApplicationParameter']))){ $ret[$entry['App']] = true; } @@ -275,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]); } @@ -291,13 +302,12 @@ class appgroup extends plugin } + /* Sort category on position down */ 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]); } @@ -307,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); @@ -327,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); @@ -347,7 +353,7 @@ class appgroup extends plugin } - + /* Add seperator to application list */ function AddSeperator($id) { $found = false; @@ -366,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(); + /* 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? */ @@ -398,176 +416,192 @@ 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 .= ""._("ACL")." + "._("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])){ - foreach($this->getParameters($val) as $para){ - if(isset($this->appoption[$para])){ - unset($this->appoption[$para]); + /* 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]); } - 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(); - - $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']; + + /* 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")); } - $ldap->cat($found, array("gosaApplicationParameter")); - }else{ - $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 { - 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]; + /* Get parameter */ + $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.=""; } - $table.=""; + $table.= "
".$this->option_name[$i]."". + "
".$this->option_name[$i]."". - "
"; + $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){ @@ -578,6 +612,12 @@ class appgroup extends plugin } } + /* Add application with post */ + if((isset($_GET['act']))&&($_GET['act']=="add")){ + $this->used_apps[$_GET['id']]= $_GET['id']; + asort($this->used_apps); + $this->addApp($_GET['id']); + } /* Cancel edit options? */ if (isset($_POST['edit_options_cancel'])){ @@ -606,16 +646,16 @@ class appgroup extends plugin } } - $div = new DivSelectBox("appgroup"); + /* Create application list */ + $div = new DivSelectBox("appgroup"); $div->SetHeight(300); - - /* get departments */ - $ui = get_userinfo(); $departments = array(); - $res = get_list("(objectClass=gosaDepartment)",$ui->subtreeACL,$this->curbase,array("description","cn","ou"),GL_SIZELIMIT); + $res = get_list("(objectClass=gosaDepartment)", "application", $this->curbase,array("description","cn","ou"),GL_SIZELIMIT); foreach($res as $value){ - $fdn= @LDAP::fix($value['dn']); + $fdn = $value['dn']; + $fdn = preg_replace("/".normalizePreg($this->curbase)."/","",$fdn); + $fdn= @LDAP::fix($fdn); if($value["description"][0]!=".."){ $departments[$value['dn']]= convert_department_dn($fdn)." - [".$value["description"][0]."]"; }else{ @@ -623,9 +663,15 @@ class appgroup extends plugin } } + /* Create 'open' and 'add' links */ + if($this->acl_is_writeable("gosaMemberApplication",$this->no_release_acls)){ + $linkadd = "%s"; + }else{ + $linkadd = "%s"; + } $linkopen = "%s"; - $linkadd = "%s"; + /* Create base back entry */ $base_back = preg_replace("/^[^,]+,/","",$this->curbase); if((strlen($base_back)>= strlen($this->config->current['BASE']))&&($this->curbase!=$this->config->current['BASE'])){ $div->AddEntry(array( @@ -633,6 +679,8 @@ class appgroup extends plugin "attach"=>"style='border:0px;'") )); } + + /* Append departments for current base */ foreach($departments as $key => $app){ $div->AddEntry(array( array("string"=>""._("department")." ".sprintf($linkopen,base64_encode($key),$app), @@ -640,6 +688,7 @@ class appgroup extends plugin )); } + /* Add applications found on this base */ foreach($apps as $key => $app){ $div->AddEntry(array( array("string"=>sprintf("",$key). @@ -648,39 +697,27 @@ class appgroup extends plugin )); } - 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); - } - } - } - + /* Create list of used/assigned applications */ $div2 = new DivSelectBox("appgroup"); $div2->SetHeight(300); - $linkopen = "\"\" %s"; - $catremove = " "; - $app = "\"\" %s"; - - $catupdown = " - \"\"  - \"\""; + /* Check acls to create "edit/remove" category links */ + if(!$this->acl_is_writeable("gosaMemberApplication",$this->no_release_acls)){ + $linkopen = "\"\" %s"; + $catremove = "  "; + $catupdown = ""; + }else{ + $linkopen = "\"\" %s"; + $catremove = " "; + $catupdown = "". + "\"\"". + " ". + "". + "\"\"". + ""; + } + /* Add back category for current category */ if(empty($this->curCatDir)){ $cnt =0; }else{ @@ -693,8 +730,8 @@ class appgroup extends plugin $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,base64_encode($bbk),"..")),array("string"=>" ","attach"=>"style='border-right:0px;'"))); } + /* Add sub categories */ $this->GetSubdirs($this->curCatDir); - foreach($this->GetSubdirs($this->curCatDir) as $path => $name){ $div2 ->AddEntry(array( array("string"=>sprintf($linkopen,base64_encode($path),$name)), @@ -702,28 +739,44 @@ class appgroup extends plugin "attach"=>"align='right' style='width:80px;border-right:0px;'"))); } - /* Append entries */ - + /* Create priority & seperator links */ $separator ="
"; + if($this->acl_is_writeable("gosaMemberApplication",$this->no_release_acls)){ + $sep = ""; + $upudown = "". + " {t}sort{/t}". + " ". + "". + " {t}sort{/t}". + " ". + ""; + }else{ + $sep = ""; + $upudown = ""; + } + + /* Create edit link */ + if($this->acl_is_writeable("gosaApplicationParameter",$this->no_release_acls)){ + $edit= " "; + }else{ + $edit= ""; + } - $sep = ""; - - $upudown =" {t}sort{/t}". - "  {t}sort{/t}". - " "; - $edit= " "; - + /* Get differences to mark those entries that have changed from last edit. */ $Differences = $this->diffAppsInReleases(); + /* Walk through entries an append them to list */ if(isset($this->gosaMemberApplication[$this->curCatDir])){ foreach($this->gosaMemberApplication[$this->curCatDir] as $cat => $entry){ - + /* Add seperator */ 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{ + /* Add application */ + $image = ""; /* Check if application was available within selected release * or application list if release management is not active @@ -733,11 +786,11 @@ class appgroup extends plugin /* release managent is active */ if(!$this->enableReleaseManagement){ - $image = " "; }else{ - $image = " "; + $image = "FFAIrelease)."\"> "; } }elseif(isset($Differences[$entry['App']]) && ($Differences[$entry['App']] == true)) { @@ -755,23 +808,30 @@ class appgroup extends plugin } } + /* Assign created div lists to template */ $smarty->assign("UsedApps", $div2->DrawList()); $smarty->assign("List", $div->DrawList()); $smarty->assign("apps", $apps); $smarty->assign("enableReleaseManagement",$this->enableReleaseManagement); + + $smarty->assign("ReleaseSelectAble", false); + $smarty->assign("Release", $this->FAIrelease); if($this->enableReleaseManagement){ $smarty->assign("FAIrelease", $this->FAIrelease); $smarty->assign("Releases", $this->Releases); - if(count($this->used_apps)){ - $smarty->assign("ReleaseSelectAble", false); - }else{ + if(!$this->no_release_acls && count($this->Releases)){ $smarty->assign("ReleaseSelectAble", true); } } - $smarty->assign("ReleaseSelectAble", true); + + /* Set acls to template */ + $tmp = $this->plInfo(); + foreach($tmp['plProvidedAcls'] as $acl => $translation){ + $smarty->assign($acl."ACL",$this->getacl($acl,$this->no_release_acls)); + } /* Show main page */ if ($this->dialog){ @@ -780,21 +840,23 @@ class appgroup extends plugin } else { $display.= $smarty->fetch (get_template_path('application.tpl', TRUE)); } + return ($display); } function getReleases() { - $dn = $this->config->current['BASE']; - $ldap = $this->config->get_ldap_link(); - $ldap->cd($dn); - $ldap->search("(&(objectClass=organizationalUnit)(objectClass=FAIbranch))",array("ou")); + /* Only display those releases that we are able to read */ + $dn = $this->config->current['BASE']; + $filter = "(&(objectClass=organizationalUnit)(objectClass=FAIbranch))"; + $res = get_list($filter,"application", $dn, array("ou"), GL_SUBSEARCH); + $ret =array(); - while($attrs = $ldap->fetch()){ + foreach($res as $attrs){ if(preg_match("/ou=apps,/",$attrs['dn'])){ - $bb = preg_replace("/ou=apps,.*/","",$attrs['dn']); - $parts = array_reverse(split("ou=",$bb)); + $bb = preg_replace("/ou=apps,.*/","",$attrs['dn']); + $parts = array_reverse(split("ou=",$bb)); $str =""; foreach($parts as $part){ @@ -815,6 +877,32 @@ class appgroup extends plugin function save_object() { + + /* Move category one position up or down */ + 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'])); + } + } + + /* Move application one position up or down */ + 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); + } + } + } + + plugin::save_object(); } @@ -828,8 +916,8 @@ class appgroup extends plugin $this->cleanup(); $ldap->modify ($this->attrs); - - show_ldap_error($ldap->get_error(), _("Removing application information failed")); + @log::log("remove","group/".get_class($this),$use_dn,array_keys($this->attrs),$ldap->get_error()); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of groups/applications with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ $this->handle_post_events("remove"); @@ -839,8 +927,16 @@ class appgroup extends plugin /* Save to LDAP */ function save() { + /* Skip saving application settings, if we do not have release acls */ + if($this->no_release_acls){ + gosa_log("Skip saving group application extension. Caused by insufficient acls"); + return; + } + plugin::save(); + + /* Copy members */ $this->Categories[""]=""; $this->attrs["gosaMemberApplication"]= array(); @@ -874,12 +970,18 @@ class appgroup extends plugin $this->cleanup(); $ldap->modify ($this->attrs); - show_ldap_error($ldap->get_error(), _("Saving application information failed")); + if($this->initially_was_account){ + @log::log("modify","group/".get_class($this),$use_dn,array_keys($this->attrs),$ldap->get_error()); + }else{ + @log::log("create","group/".get_class($this),$use_dn,array_keys($this->attrs),$ldap->get_error()); + } + + show_ldap_error($ldap->get_error(), sprintf(_("Saving of groups/applications with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ if ($this->initially_was_account == $this->is_account){ if ($this->is_modified){ - $this->handle_post_events("mofify"); + $this->handle_post_events("modify"); } } else { $this->handle_post_events("add"); @@ -901,36 +1003,51 @@ class appgroup extends plugin /* Generate applist */ $this->apps= array(); - /* Special handling for release managed apps - */ + /* 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; + /* Check if release is available */ $tmp = array_flip($this->Releases); if(isset($tmp[$this->FAIrelease])){ $base = $tmp[$this->FAIrelease]; }else{ + + /* Release is not available, check if there is an alternative */ + $old_r = $this->FAIrelease; $k = key($tmp); - $r = $tmp[$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->FAIrelease,$k)); + + if(isset($tmp[$k])){ + + /* We have found an alternative release name */ + $r = $tmp[$k]; + $this->FAIrelease = $k; + $base = $r; + + /* Display msg */ + if(!(!$this->initially_was_account && $old_r =="/")){ + print_red(sprintf(_("Can't resolve the release name '%s', setting release name to '%s'. Possibly the objects base has changed."),$old_r,$k)); + } + }else{ + + /* There are no releases available ... */ + print_red(_("There are no releases available. You will not be able to select another release.")); + return; + } } + /* Get applications for this release */ $base = preg_replace("/ou=apps,.*$/","ou=apps,".$this->curbase,$base); - - $ldap = $this->config->get_ldap_link(); - $ldap->cd ($base); - $ldap->ls ("(objectClass=gosaApplication)",$base); + $res = get_list("(objectClass=gosaApplication)","application",$base,array("*")); }else{ - $ldap = $this->config->get_ldap_link(); - $ldap->cd ("ou=apps,".$this->curbase); - $ldap->ls ("(objectClass=gosaApplication)","ou=apps,".$this->curbase); + + /* Get applications for this base */ + $res = get_list("(objectClass=gosaApplication)","application","ou=apps,".$this->curbase,array("*")); } - while ($attrs= $ldap->fetch()){ + /* Append applications */ + foreach($res as $attrs){ if (isset($attrs["description"][0])){ $this->apps[$attrs["cn"][0]]= $attrs["cn"][0]." (". @@ -941,15 +1058,13 @@ class appgroup extends plugin } } - $ldap->cd($this->config->current['BASE']); - $ldap->search("objectClass=gosaApplication",array("gosaApplicationParameter","cn")); + /* Get all apps ... */ + $res = get_list("objectClass=gosaApplication","application",$this->config->current['BASE'],array("gosaApplicationParameter","cn"),GL_SUBSEARCH); $tmp = search_config($this->config->data,"faiManagement","CLASS"); $this->AllAppsForRelease = array(); if(!empty($tmp)){ - $tmp = array_flip($this->Releases); - - while($attrs = $ldap->fetch()){ + foreach($res as $attrs){ $testdn = preg_replace("/ou=apps,.*$/","ou=apps",$attrs['dn']); $testdn = preg_replace("/^[^,]+/","",$testdn); @@ -961,7 +1076,7 @@ class appgroup extends plugin } } }else{ - while($attrs = $ldap->fetch()){ + foreach($res as $attrs){ $this->AllAppsForRelease[$attrs['dn']] = $attrs['cn'][0]; } } @@ -1049,9 +1164,35 @@ class appgroup extends plugin $ret[$path]=$cat; } } - return($ret); + return($ret); } -} + + function PrepareForCopyPaste($source) + { + $this->FAIrelease = $this->InitialFAIrelease = $source->FAIrelease; + $this->gosaMemberApplication = $source->gosaMemberApplication; + $this->appoption = $source->appoption; + } + + + /* Return plugin informations for acl handling */ + function plInfo() + { + return (array( + "plShortName" => _("Applications"), + "plDescription" => _("Group applications"), + "plSelfModify" => FALSE, + "plDepends" => array(), + "plPriority" => 0, + "plSection" => array("admin"), + "plCategory" => array("groups"), + "plProvidedAcls"=> array( + "gosaMemberApplication" => _("Application"), + "FAIrelease" => _("Release"), + "gosaApplicationParameter" => _("Application parameter")) + )); + } +} // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>