X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_management.inc;h=2e42c572eca2fd1fd97b342d2064e1a900a9775a;hb=226580d683c1bebd09e732b0ce8af02935fd7e31;hp=e2fce7894a4d8c07f0fe6f06880826e78db76f43;hpb=bd53422da0d9d7b38f325012be6d42deee5dccde;p=gosa.git diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc index e2fce7894..2e42c572e 100644 --- a/gosa-core/include/class_management.inc +++ b/gosa-core/include/class_management.inc @@ -118,10 +118,12 @@ class management $this->registerAction("restore", "restoreSnapshotDialog"); $this->registerAction("saveSnapshot","saveSnapshot"); $this->registerAction("restoreSnapshot","restoreSnapshot"); + $this->registerAction("removeSnapshotConfirmed","removeSnapshotConfirmed"); $this->registerAction("cancelSnapshot","closeDialogs"); $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"); @@ -255,7 +257,7 @@ class management // Display ok, (apply) and cancel buttons $str.= "
\n"; - $str.= "\n"; + $str.= "\n"; $str.= " \n"; if($this->displayApplyBtn){ $str.= "\n"; @@ -286,8 +288,12 @@ class management @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{ @@ -309,7 +315,6 @@ class management // Add locks $dns_names = array(); $types = array(); - $h = $this->getHeadpage(); // Build list of object -labels foreach($h->objectTypes as $type){ @@ -319,7 +324,7 @@ class management foreach($this->dns as $dn){ $tmp = $h->getType($dn); if(isset($map[$tmp])){ - $dns_names[] = '('._($map[$tmp]).') - '.LDAP::fix($dn); + $dns_names[LDAP::fix($dn)] = _($map[$tmp]); }else{ $dns_names[] =LDAP::fix($dn); } @@ -342,26 +347,34 @@ class management * @param Array 'all' A combination of both 'action' and 'target'. */ function removeEntryConfirmed($action="",$target=array(),$all=array(), - $altTabClass="",$altTabType="",$altAclCategory="") + $altTabClass="",$altTabType="", $altAclCategory="",$altAclPlugin="") { $tabType = $this->tabType; $tabClass = $this->tabClass; $aclCategory = $this->aclCategory; + $aclPlugin = $this->aclPlugin; if(!empty($altTabClass)) $tabClass = $altTabClass; if(!empty($altTabType)) $tabType = $altTabType; if(!empty($altAclCategory)) $aclCategory = $altAclCategory; + if(!empty($altAclPlugin)) $aclPlugin = $altAclPlugin; @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, $this->aclCategory."/".$this->aclPlugin); if(preg_match("/d/",$acl)){ // Delete the object $this->dn = $dn; - $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory, true, true); + $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, + $aclCategory, true, true); $this->tabObject->set_acl_base($this->dn); $this->tabObject->parent = &$this; $this->tabObject->delete (); @@ -394,9 +407,10 @@ class management if(isset($_POST['edit_finish'])) $action['action'] = "save"; if(isset($_POST['edit_cancel'])) $action['action'] = "cancel"; if(isset($_POST['delete_confirmed'])) $action['action'] = "removeConfirmed"; + if(isset($_POST['delete_snapshot_confirm'])) $action['action'] = "removeSnapshotConfirmed"; 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"; @@ -405,7 +419,7 @@ class management $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); } @@ -445,7 +459,7 @@ class management $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!"), bold($entry)), ERROR_DIALOG); } } @@ -492,7 +506,22 @@ class management @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!"), bold($entry)), + ERROR_DIALOG); + } + } + + + /*! \brief Removes a snapshot object. + */ + function removeSnapshotConfirmed($action="",$target=array(),$all=array()) + { + $entry = $this->dialogObject->del_dn; + if(!empty($entry) && $this->ui->allow_snapshot_create($entry,$this->aclCategory)){ + $this->snapHandler->remove_snapshot($entry); + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$entry,"Snaptshot removed!"); + }else{ + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to remove a snapshot for %s!"), bold($entry)), ERROR_DIALOG); } } @@ -529,7 +558,7 @@ class management $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!"), bold($entry)), ERROR_DIALOG); } }else{ @@ -543,7 +572,7 @@ class management $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!"), bold($entry)), ERROR_DIALOG); } } @@ -602,7 +631,7 @@ class management $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!"), bold($tabType)), ERROR_DIALOG); } } } @@ -661,7 +690,7 @@ class management 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); @@ -708,6 +737,17 @@ class management } + /*! \brief Close filter dialog + */ + protected function cancelFilter() + { + if($this->dialogObject instanceOf userFilter){ + $this->remove_lock(); + $this->closeDialogs(); + } + } + + /*! \brief Save filter modifcations. */ protected function saveFilter() @@ -973,7 +1013,7 @@ class management function handle_post_events($mode, $addAttrs= array()) { if(!in_array($mode, array('add','remove','modify'))){ - trigger_error(sprintf("Invalid post event type given '%s'! Valid types are [add,modify,remove].", $mode)); + trigger_error(sprintf("Invalid post event type given %s! Valid types are [add,modify,remove].", bold($mode))); return; } switch ($mode){