X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_management.inc;h=ba745812558848fc7f379e8718f26fd02479c249;hb=76226dfbd4fe37f09a9cb125cd2818b070e59159;hp=98f02cee2fa00e1f020fc4958dc88d4833b15697;hpb=bec0b267059af47bad39e9327da8a6d58df14453;p=gosa.git
diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index 98f02cee2..ba7458125 100644
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -33,7 +33,7 @@ class management
public $plHeadline = "unconfigured";
// The currently used object(s) (e.g. in edit, removal)
- protected $dn = "";
+ public $dn = ""; // this is public due to some compatibility problems with class plugin..
protected $dns = array();
// The last used object(s).
@@ -46,6 +46,7 @@ class management
// The tab definitions to use for the current object.
protected $tabClass = ""; // e.g. usertabs
protected $tabType = ""; // e.g. USERTABS
+ protected $aclPlugin = ""; // e.g. generic
protected $aclCategory = ""; // e.g. users
protected $objectName = ""; // e.g. users
@@ -83,7 +84,7 @@ class management
protected $actions = array();
// Attributes managed by this plugin, can be used in post events;
- protected $attributes = array();
+ public $attributes = array();
function __construct(&$config,$ui,$plugname, $headpage)
{
@@ -118,6 +119,13 @@ class management
$this->registerAction("saveSnapshot","saveSnapshot");
$this->registerAction("restoreSnapshot","restoreSnapshot");
$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");
}
/*! \brief Execute this plugin
@@ -129,6 +137,8 @@ class management
$vars = array('/^act$/','/^listing/','/^PID$/','/^FILTER_PID$/');
session::set('LOCK_VARS_TO_USE',$vars);
+ pathNavigator::registerPlugin($this);
+
/* Display the copy & paste dialog, if it is currently open */
$ret = $this->copyPasteHandler("",array());
if($ret){
@@ -140,9 +150,6 @@ class management
$this->filter->update();
session::global_set(get_class($this)."_filter", $this->filter);
session::set('autocomplete', $this->filter);
- if (!$this->filter->isValid()){
- msg_dialog::display(_("Filter error"), _("The filter is incomplete!"), ERROR_DIALOG);
- }
}
// Handle actions (POSTs and GETs)
@@ -161,7 +168,7 @@ class management
// Display tab object.
if($this->tabObject instanceOf tabs || $this->tabObject instanceOf multi_plug){
- $this->tabObject->save_object();
+# $this->tabObject->save_object();
$display = $this->tabObject->execute();
$display.= $this->_getTabFooter();
return($this->getHeader().$display);
@@ -179,11 +186,16 @@ class management
$this->snapHandler->setSnapshotBases($bases);
}
-
+
// Display list
return($this->renderList());
}
-
+
+ function editFilter()
+ {
+ $this->dialogObject = new userFilter($this->config,$this->getHeadpage());
+ }
+
function renderList()
{
$this->headpage->update();
@@ -206,16 +218,8 @@ class management
*/
protected function getHeader()
{
- if($this->skipHeader) return("");
-
- if (get_object_info() != ""){
- $display= print_header(get_template_path($this->plIcon),_($this->plDescription),
- "".
- LDAP::fix(get_object_info()));
- } else {
- $display= print_header(get_template_path($this->plIcon),_($this->plDescription));
- }
- return($display);
+ // We do not display any headers right now.
+ if(1 || $this->skipHeader) return("");
}
@@ -243,21 +247,22 @@ class management
// In case an of locked entry, we may have opened a read-only tab.
$str = "";
if(isset($this->tabObject->read_only) && $this->tabObject->read_only == TRUE){
- $str.= "
- + $str.= " +
+
"; return($str); }else{ // Display ok, (apply) and cancel buttons $str.= "\n"; - $str.= "\n"; + $str.= "\n"; $str.= " \n"; if($this->displayApplyBtn){ - $str.= "\n"; + $str.= "\n"; $str.= " \n"; } - $str.= "\n"; + $str.= "\n"; $str.= "
"; } return($str); @@ -273,14 +278,21 @@ class management */ protected function removeEntryRequested($action="",$target=array(),$all=array()) { + // Close dialogs and remove locks for currently handled dns + $this->cancelEdit(); + $disallowed = array(); $this->dns = array(); @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$target,"Entry removel requested!"); // Check permissons for each target + $h = $this->getHeadpage(); + $oTypes = $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{ @@ -301,16 +313,28 @@ class management // Add locks $dns_names = array(); + $types = array(); + + // Build list of object -labels + foreach($h->objectTypes as $type){ + $map[$type['objectClass']]= $type['label']; + } + foreach($this->dns as $dn){ - $dns_names[] =LDAP::fix($dn); + $tmp = $h->getType($dn); + if(isset($map[$tmp])){ + $dns_names[LDAP::fix($dn)] = _($map[$tmp]); + }else{ + $dns_names[] =LDAP::fix($dn); + } } add_lock ($this->dns, $this->ui->dn); // Display confirmation dialog. $smarty = get_smarty(); - $smarty->assign("info", msgPool::deleteInfo($dns_names,_($this->objectName))); + $smarty->assign("info", msgPool::deleteInfo($dns_names)); $smarty->assign("multiple", true); - return($smarty->fetch(get_template_path('remove.tpl', TRUE))); + return($smarty->fetch(get_template_path('removeEntries.tpl'))); } } @@ -322,26 +346,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 = $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 (); @@ -375,6 +407,8 @@ class management if(isset($_POST['edit_cancel'])) $action['action'] = "cancel"; 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'] = "cancelFilter"; // Detect Snapshot actions if(isset($_POST['CreateSnapshot'])) $action['action'] = "saveSnapshot"; @@ -383,7 +417,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); } @@ -438,7 +472,8 @@ class management * @param Array 'all' A combination of both 'action' and 'target'. */ function saveSnapshot($action="",$target=array(),$all=array()) - { + { + if(!is_object($this->dialogObject)) return; $this->dialogObject->save_object(); $msgs = $this->dialogObject->check(); if(count($msgs)){ @@ -573,10 +608,14 @@ class management if(empty($tabClass) || empty($tabType)){ // No tab type defined }else{ - $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory); - $this->tabObject->set_acl_base($this->headpage->getBase()); - $this->tabObject->parent = &$this; - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Create new entry initiated!"); + if (isset($this->config->data['TABS'][$tabType])) { + $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory); + $this->tabObject->set_acl_base($this->headpage->getBase()); + $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); + } } } @@ -634,7 +673,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); @@ -681,6 +720,39 @@ 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() + { + if($this->dialogObject instanceOf userFilter){ + $msgs = $this->dialogObject->check(); + if(count($msgs)){ + msg_dialog::displayChecks($msgs); + return(""); + }else{ + $this->dialogObject->save(); + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dns,"Entry saved!"); + $this->remove_lock(); + $this->closeDialogs(); + + // Ask filter to reload information + $this->filter->reloadFilters(); + } + } + } + + /*! \brief Save object modifications and closes dialogs (returns to object listing). * - Calls '::check' to validate the given input. * - Calls '::save' to save back object modifications (e.g. to ldap). @@ -910,7 +982,36 @@ class management msg_dialog::display(_("Error"), $message, ERROR_DIALOG); } } + } + + function is_modal_dialog() + { + return(is_object($this->tabObject) || is_object($this->dialogObject)); + } + + /*! \brief Forward command execution request + * to the correct method. + */ + 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)); + return; + } + switch ($mode){ + case "add": + plugin::callHook($this,"POSTCREATE", $addAttrs); + break; + + case "modify": + plugin::callHook($this,"POSTMODIFY", $addAttrs); + break; + + case "remove": + plugin::callHook($this,"POSTREMOVE", $addAttrs); + break; + } } }