diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 3142979c018c07979473ff3530dcfea6820d0668..f3a3ad2593eb9f6bb10cf2e6821a0b876f9d1251 100644 (file)
Copy & Paste handling
****************/
Copy & Paste handling
****************/
- /* Only perform copy / paste if it is enabled
- */
- if($this->CopyPasteHandler){
-
- /* Paste copied/cutted object in here
- */
- if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
- $this->CopyPasteHandler->save_object();
- $this->CopyPasteHandler->SetVar("base", $this->DivListOGroup->selectedBase);
- return($this->CopyPasteHandler->execute());
- }
-
- /* Copy current object to CopyHandler
- */
- if($s_action == "copy"){
- $this->CopyPasteHandler->Clear();
- $dn = $this->ogrouplist[$s_entry]['dn'];
- $obj = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $dn);
- $objNew = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], "new");
- $this->CopyPasteHandler->Copy($obj,$objNew);
- }
-
- /* Copy current object to CopyHandler
- */
- if($s_action == "cut"){
- $this->CopyPasteHandler->Clear();
- $dn = $this->ogrouplist[$s_entry]['dn'];
- $obj = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $dn);
- $this->CopyPasteHandler->Cut($obj);
- }
+ /* Display the copy & paste dialog, if it is currently open */
+ $ret = $this->copyPasteHandling($s_action,$s_entry);
+ if($ret){
+ return($ret);
}
}
-
/****************
Create a new object group
****************/
/****************
Create a new object group
****************/
$this->dn= "new";
/* Create new usertab object */
$this->dn= "new";
/* Create new usertab object */
- $this->ogroup= new ogrouptabs($this->config,
- $this->config->data['TABS']['OGROUPTABS'], $this->dn);
+ $this->ogroup= new ogrouptabs($this->config,$this->config->data['TABS']['OGROUPTABS'], $this->dn,"ogroups");
+ $this->ogroup->set_acl_base($this->DivListOGroup->selectedBase);
}
}
/* Load permissions for selected 'dn' and check if
we're allowed to remove 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, "ogroup", $this->dn);
- if (chkacl($this->acl, "delete") == ""){
+ $acl = $this->ui->get_permissions($this->dn,"ogroup");
+ if(preg_match("/d/",$acl)){
/* Check locking, save current plugin in 'back_plugin', so
the dialog knows where to return. */
/* Check locking, save current plugin in 'back_plugin', so
the dialog knows where to return. */
/* Some nice guy may send this as POST, so we've to check
for the permissions again. */
/* Some nice guy may send this as POST, so we've to check
for the permissions again. */
- if (chkacl($this->acl, "delete") == ""){
+ $acl = $this->ui->get_permissions($this->dn,"groups");
+ if(preg_match("/d/",$acl)){
/* Delete request is permitted, perform LDAP action */
$this->ogroup= new ogrouptabs($this->config,
/* Delete request is permitted, perform LDAP action */
$this->ogroup= new ogrouptabs($this->config,
above dialog */
add_lock ($this->dn, $this->ui->dn);
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 grouptab to trigger edit dialog */
/* Register grouptab to trigger edit dialog */
- $this->ogroup= new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'],
- $this->dn);
- $this->ogroup->set_acl($acl);
+ $this->ogroup= new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $this->dn, "ogroups");
+ $this->ogroup->set_acl_base($this->dn);
$_SESSION['objectinfo']= $this->dn;
}
$_SESSION['objectinfo']= $this->dn;
}
Display list
****************/
Display list
****************/
- /* Check if there is a snapshot dialog open */
- if($str = $this->showSnapshotDialog($this->DivListOGroup->selectedBase,get_groups_ou())){
+ /* Check if there is a snapshot dialog open */
+ $base = $this->DivListOGroup->selectedBase;
+ if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
return($str);
}
return($str);
}
}
}
+ /* Return departments, that will be included within snapshot detection */
+ function get_used_snapshot_bases()
+ {
+ return(array(get_groups_ou().$this->DivListOGroup->selectedBase));
+ }
+
+
+
function convert_list($input)
{
$temp= "";
function convert_list($input)
{
$temp= "";
function reload()
{
/* Set base for all searches && initialise some vars */
function reload()
{
/* Set base for all searches && initialise some vars */
- $this->oogrouplist= array();
+ $this->ogrouplist= array();
$base = $this->DivListOGroup->selectedBase;
$filter = "(gosaGroupObjects=[])";
$Regex = $this->DivListOGroup->Regex;
$base = $this->DivListOGroup->selectedBase;
$filter = "(gosaGroupObjects=[])";
$Regex = $this->DivListOGroup->Regex;
$filter= "(&(cn=$Regex)(objectClass=gosaGroupOfNames)(|$filter))";
if($this->DivListOGroup->SubSearch){
$filter= "(&(cn=$Regex)(objectClass=gosaGroupOfNames)(|$filter))";
if($this->DivListOGroup->SubSearch){
- $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT | GL_SUBSEARCH);
+ $res= get_list($filter, "ogroups", $base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT | GL_SUBSEARCH);
}else{
}else{
- $res= get_list($filter, $this->ui->subtreeACL, get_groups_ou().$base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT );
+ $res= get_list($filter, "ogroups", get_groups_ou().$base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT );
}
$this->ogrouplist= $res;
}
$this->ogrouplist= $res;
reset ($this->ogrouplist);
}
reset ($this->ogrouplist);
}
+
+ function copyPasteHandling($s_action,$s_entry)
+ {
+ if($this->CopyPasteHandler){
+
+ /* Paste copied/cutted object in here
+ */
+ if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
+ $this->CopyPasteHandler->save_object();
+ $this->CopyPasteHandler->SetVar("base", $this->DivListOGroup->selectedBase);
+ return($this->CopyPasteHandler->execute());
+ }
+
+ /* Copy current object to CopyHandler
+ */
+ if($s_action == "copy"){
+ $this->CopyPasteHandler->Clear();
+ $dn = $this->ogrouplist[$s_entry]['dn'];
+ $obj = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $dn);
+ $objNew = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], "new");
+
+ $types_of_tabs = $obj->by_object['ogroup']->gosaGroupObjects;
+ $objNew->by_object['ogroup']->gosaGroupObjects = $types_of_tabs;
+ $objNew->reload($types_of_tabs);
+
+ $this->CopyPasteHandler->Copy($obj,$objNew);
+ }
+
+ /* Copy current object to CopyHandler
+ */
+ if($s_action == "cut"){
+ $this->CopyPasteHandler->Clear();
+ $dn = $this->ogrouplist[$s_entry]['dn'];
+ $obj = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $dn);
+ $this->CopyPasteHandler->Cut($obj);
+ }
+ }
+ }
+
+
function save_object()
{
$this->DivListOGroup->save_object();
function save_object()
{
$this->DivListOGroup->save_object();