index c03e860e55c7dd92337ca4897299733ab65ffc06..6915a6e0dfcc50872faaa94affc4a018556f0ea2 100644 (file)
$this->registerAction("config-filter","editFilter");
$this->registerAction("saveFilter","saveFilter");
+ $this->registerAction("cancelFilter","cancelFilter");
// To temporay disable the filter caching UNcomment this line.
#session::global_un_set(get_class($this)."_filter");
// Display ok, (apply) and cancel buttons
$str.= "<p style=\"text-align:right\">\n";
- $str.= "<button type=\"submit\" name=\"edit_finish\" style=\"width:80px\">".msgPool::okButton()."</button>\n";
+ $str.= "<button type=\"submit\" name=\"edit_finish\">".msgPool::okButton()."</button>\n";
$str.= " \n";
if($this->displayApplyBtn){
$str.= "<button type=\"submit\" name=\"edit_apply\">".msgPool::applyButton()."</button>\n";
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$target,"Entry removel requested!");
// Check permissons for each target
+ $h = $this->getHeadpage();
+ $oTypes = array_reverse($h->objectTypes);
foreach($target as $dn){
- $acl = $this->ui->get_permissions($dn, $this->aclCategory."/".$this->aclPlugin);
+ $entry = $h->getEntry($dn);
+ $obj = $h->getObjectType($oTypes, $entry['objectClass']);
+ $acl = $this->ui->get_permissions($dn, $obj['category']."/".$obj['class']);
if(preg_match("/d/",$acl)){
$this->dns[] = $dn;
}else{
// Add locks
$dns_names = array();
$types = array();
- $h = $this->getHeadpage();
// Build list of object -labels
foreach($h->objectTypes as $type){
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$target,"Entry removel confirmed!");
+ // Check permissons for each target
+ $h = $this->getHeadpage();
+ $oTypes = array_reverse($h->objectTypes);
foreach($this->dns as $key => $dn){
+ $entry = $h->getEntry($dn);
+ $obj = $h->getObjectType($oTypes, $entry['objectClass']);
+ $acl = $this->ui->get_permissions($dn, $obj['category']."/".$obj['class']);
// Check permissions, are we allowed to remove this object?
- $acl = $this->ui->get_permissions($dn, $aclCategory."/".$aclPlugin);
if(preg_match("/d/",$acl)){
// Delete the object
if(isset($_POST['delete_confirmed'])) $action['action'] = "removeConfirmed";
if(isset($_POST['delete_cancel'])) $action['action'] = "cancelDelete";
if(isset($_POST['saveFilter'])) $action['action'] = "saveFilter";
- if(isset($_POST['cancelFilter'])) $action['action'] = "cancel";
+ if(isset($_POST['cancelFilter'])) $action['action'] = "cancelFilter";
// Detect Snapshot actions
if(isset($_POST['CreateSnapshot'])) $action['action'] = "saveSnapshot";
$once =TRUE;
if(preg_match("/^RestoreSnapShot_/",$name) && $once){
$once = FALSE;
- $entry = base64_decode(preg_replace("/^RestoreSnapShot_([^_]*)_[xy]$/i","\\1",$name));
+ $entry = base64_decode(preg_replace("/^RestoreSnapShot_(.*)$/i","\\1",$name));
$action['action'] = "restoreSnapshot";
$action['targets'] = array($entry);
}
$this->dialogObject->parent = &$this;
}else{
- msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s."),$entry),
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"),$entry),
ERROR_DIALOG);
}
}
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Snaptshot restored!");
$this->closeDialogs();
}else{
- msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),
ERROR_DIALOG);
}
}
$this->dialogObject->display_restore_dialog = true;
$this->dialogObject->parent = &$this;
}else{
- msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),
ERROR_DIALOG);
}
}else{
$this->dialogObject->display_restore_dialog = true;
$this->dialogObject->parent = &$this;
}else{
- msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),
+ msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),
ERROR_DIALOG);
}
}
$this->tabObject->parent = &$this;
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Create new entry initiated!");
} else {
- msg_dialog::display(_("Error"), sprintf(_("No tab declaration for '%s' found in your configuration file. Cannot create plugin instance!"), $tabType), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("No tab definition for '%s' found in configuration file: cannot create plugin instance!"), $tabType), ERROR_DIALOG);
}
}
}
set_object_info($this->dn);
$user = get_lock($this->dn);
if ($user != ""){
- return(gen_locked_message ($user, $this->dn,TRUE));
+ return(gen_locked_message ($user, array($this->dn),TRUE));
}
add_lock ($this->dn, $this->ui->dn);
}
+ /*! \brief Close filter dialog
+ */
+ protected function cancelFilter()
+ {
+ if($this->dialogObject instanceOf userFilter){
+ $this->remove_lock();
+ $this->closeDialogs();
+ }
+ }
+
+
/*! \brief Save filter modifcations.
*/
protected function saveFilter()