![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index e71dee31665b7293549b0385b4e8b93ad14a886a..6029010c1348eda4260bbe879847596e0f3b38cb 100644 (file)
var $CopyPasteHandler = NULL;
var $DivListApplication = NULL;
var $applications = array();
- var $acl = "";
var $enableReleaseManagement = false;
function IsReleaseManagementActivated()
$ldap = $this->config->get_ldap_link();
$dn = "ou=apps,".$base;
$ret = array();
- $ret [$base] = "/";
+ $ret ["ou=apps,".$base] = "/";
$ldap->cd($dn);
$ldap->search("objectClass=organizationalUnit",array("ou"));
$this->dn= "new";
/* Create new usertab object */
- $this->apptabs= new apptabs($this->config,
- $this->config->data['TABS']['APPSTABS'], $this->dn);
- $this->apptabs->set_acl(array(':all'));
+ $this->apptabs= new apptabs($this->config,$this->config->data['TABS']['APPSTABS'], $this->dn,"application");
+ $this->apptabs->set_acl_base($this->dn);
}
/* Finish apps edit is triggered by the tabulator dialog, so
the user wants to save edited data. Check and save at this
point. */
- if ((isset($_POST['edit_finish'])) && (isset($this->apptabs->config))){
+ if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply']) ) && (isset($this->apptabs->config))){
/* Check tabs, will feed message array */
$this->apptabs->last= $this->apptabs->current;
$this->apptabs->save();
gosa_log ("Application object'".$this->dn."' has been saved");
- /* Application has been saved successfully, remove lock from
- LDAP. */
- if ($this->dn != "new"){
- del_lock ($this->dn);
+ if (!isset($_POST['edit_apply'])){
+ /* Application has been saved successfully, remove lock from
+ LDAP. */
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
+ unset ($this->apptabs);
+ $this->apptabs= NULL;
+ unset ($_SESSION['objectinfo']);
}
- unset ($this->apptabs);
- $this->apptabs= NULL;
- unset ($_SESSION['objectinfo']);
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
above dialog */
add_lock ($this->dn, $this->ui->dn);
- /* Set up the users ACL's for this 'dn' */
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-
/* Register apptabs to trigger edit dialog */
- $this->apptabs= new apptabs($this->config,
- $this->config->data['TABS']['APPSTABS'], $this->dn);
- $this->apptabs->set_acl($acl);
+ $this->apptabs= new apptabs($this->config,$this->config->data['TABS']['APPSTABS'], $this->dn,"application");
+ $this->apptabs->set_acl_base($this->dn);
$_SESSION['objectinfo']= $this->dn;
}
/* Load permissions for selected 'dn' and check if
we're allowed to remove this 'dn' */
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
- $this->acl= get_module_permission($acl, "application", $this->dn);
- if (chkacl($this->acl, "delete") == ""){
+ $ui = get_userinfo();
+ $acl = $ui->get_permissions($this->dn ,"application/application");
+ if(preg_match("/d/",$acl)){
/* Check locking, save current plugin in 'back_plugin', so
the dialog knows where to return. */
if (($user= get_lock($this->dn)) != ""){
/* Some nice guy may send this as POST, so we've to check
for the permissions again. */
- if (chkacl($this->acl, "delete") == ""){
+ $ui = get_userinfo();
+ $acl = $ui->get_permissions($this->dn ,"application/application");
+
+ if(preg_match("/d/",$acl)){
/* Delete request is permitted, perform LDAP action */
- $this->apptabs= new apptabs($this->config,
- $this->config->data['TABS']['APPSTABS'], $this->dn);
- $this->apptabs->set_acl(array($this->acl));
+ $this->apptabs= new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $this->dn,"application");
+ $this->apptabs->set_acl_base($this->dn);
$this->apptabs->delete ();
gosa_log ("Application object'".$this->dn."' has been removed");
unset ($this->apptabs);
/* Don't show buttons if tab dialog requests this */
if (!$this->apptabs->by_object[$this->apptabs->current]->dialog){
$display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Save")."\">\n";
+ $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
$display.= " \n";
+ if ($this->dn != "new"){
+ $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+ $display.= " \n";
+ }
$display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
$display.= "</p>";
}
Dialog display
****************/
+ /* Check if there is a snapshot dialog open */
+ $base = $this->DivListApplication->selectedBase;
+ if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases($base))){
+ return($str);
+ }
+
/* Display dialog with system list */
$this->DivListApplication->parent = $this;
$this->DivListApplication->execute();
}
+ /* Return departments, that will be included within snapshot detection */
+ function get_used_snapshot_bases(){
+ if($this->DivListApplication->selectedRelease == "main"){
+ return(array($this->DivListApplication->selectedBase));
+ }else{
+ return(array($this->DivListApplication->selectedRelease));
+ }
+ }
+
+
function reload()
{
$this->applications= array();
$Flags |= GL_SUBSEARCH;
}
- $res= get_list($Filter, $this->ui->subtreeACL,$use_base, array("cn","description","dn","objectClass"), $Flags);
+ $res= get_list($Filter, "application", $use_base, array("cn","description","dn","objectClass"), $Flags);
foreach ($res as $val){
$tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
}
function check() {}
function adapt_from_template($dn) {}
function password_change_needed() {}
- function show_header($button_text, $text, $disabled= FALSE) {}
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>