index 549d7d170abc3d0075782f41f4818a339eed2e8c..c03e860e55c7dd92337ca4897299733ab65ffc06 100644 (file)
foreach($this->dns as $dn){
$tmp = $h->getType($dn);
if(isset($map[$tmp])){
- $dns_names[] = '<i>('.$map[$tmp].')</i> '.LDAP::fix($dn);
+ $dns_names[LDAP::fix($dn)] = _($map[$tmp]);
}else{
$dns_names[] =LDAP::fix($dn);
}
* @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!");
foreach($this->dns as $key => $dn){
// Check permissions, are we allowed to remove this object?
- $acl = $this->ui->get_permissions($dn, $this->aclCategory."/".$this->aclPlugin);
+ $acl = $this->ui->get_permissions($dn, $aclCategory."/".$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 ();