![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 128639d12540887409452ccb6a489149994e03ae..2bdcf1b879adea05cf4e60150f35271476b5b97e 100644 (file)
*/
if ($s_action=="new"){
$this->dn= "new";
- $this->deptabs= new deptabs($this->config,
- $this->config->data['TABS']['DEPTABS'], $this->dn);
+ $this->deptabs= new deptabs($this->config,$this->config->data['TABS']['DEPTABS'], $this->dn,"department");
+ $this->deptabs->set_acl_base($this->DivListDepartment->selectedBase);
}
* The entry which will be edited is defined in $s_entry
*/
if (( $s_action=="edit") && (!isset($this->deptabs->config))){
- $s_entry = convert_department_dn(base64_decode($s_entry));
$this->dn= $this->config->departments[trim($s_entry)];
if (($user= get_lock($this->dn)) != ""){
/* Lock the current entry, so everyone will get the above dialog */
add_lock ($this->dn, $this->ui->dn);
- /* Set up the users ACL's for this 'dn' */
- $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-
/* Register deptabs to trigger edit dialog */
- $this->deptabs= new deptabs($this->config,$this->config->data['TABS']['DEPTABS'], $this->dn);
- $this->deptabs->set_acl($this->acl);
+ $this->deptabs= new deptabs($this->config,$this->config->data['TABS']['DEPTABS'], $this->dn,"department");
+ $this->deptabs->set_acl_base($this->dn);
+
$_SESSION['objectinfo']= $this->dn;
}
* The entry which will be deleted is defined in $s_entry
*/
if ($s_action =="del"){
- $s_entry = convert_department_dn(base64_decode($s_entry));
$this->dn= $this->config->departments[trim($s_entry)];
- /* Check locking */
- if (($user= get_lock($this->dn)) != ""){
- $_SESSION['dn']= $this->dn;
- return(gen_locked_message($user, $this->dn));
- } else {
- add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("info", sprintf(_("You're about to delete the whole LDAP subtree placed under '%s'."), @LDAP::fix($this->dn)));
- $display.= $smarty->fetch (get_template_path('remove.tpl', TRUE));
- return ($display);
+ /* check acls */
+ $acl = $this->ui->get_permissions($this->dn,"department/department");
+ if(preg_match("/d/",$acl)){
+
+ /* Check locking */
+ if (($user= get_lock($this->dn)) != ""){
+ $_SESSION['dn']= $this->dn;
+ return(gen_locked_message($user, $this->dn));
+ } else {
+ add_lock ($this->dn, $this->ui->dn);
+ $smarty->assign("info", sprintf(_("You're about to delete the whole LDAP subtree placed under '%s'."), @LDAP::fix($this->dn)));
+ $display.= $smarty->fetch (get_template_path('remove.tpl', TRUE));
+ return ($display);
+ }
+ }else{
+ print_red (_("You have no permission to remove this department."));
}
}
* Finally delete department
*/
if (isset($_POST['delete_department_confirm'])){
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
- $acl= get_module_permission($acl, "department", $this->dn);
- if (chkacl($acl, "delete") == ""){
+
+ /* check acls */
+ $acl = $this->ui->get_permissions($this->dn,"department/department");
+ if(preg_match("/d/",$acl)){
$this->remove_from_parent();
gosa_log ("Department object'".$this->dn."' has been removed");
} else {
Edit department finished
***************/
- if ((isset($_POST['edit_finish'])) && (isset($this->deptabs->config))){
+ if ((isset($_POST['edit_finish'])) && (isset($this->deptabs->config)) && !isset($_POST['dep_move_confirm'])){
+ $this->deptabs->save_object();
+ $obj = $this->deptabs->by_object['department'];
+ if($obj->orig_dn != "new"){
+ if($obj->orig_ou != $obj->ou || $obj->base != $obj->orig_base){
+ return($smarty->fetch(get_template_path("dep_move_confirm.tpl",TRUE)));
+ }
+ }
+ }
+
+ /* Save changes */
+ if ((isset($_POST['edit_finish'])|| isset($_POST['dep_move_confirm'])) && (isset($this->deptabs->config))){
/* Check tabs, will feed message array */
$message= $this->deptabs->check();
if (count($message) == 0){
$this->deptabs->save(true);
-
- if(!$this->deptabs->by_object['department']->am_i_moved()){
- $this->deptabs->save(true);
- }
+ $this->config->get_departments();
/* This object must be tagged, so set ObjectTaggingRequested to true */
if($this->deptabs->by_object['department']->must_be_tagged()){
if($this->deptabs->by_object['department']->am_i_moved()){
$this->RecursiveRemoveRequested = true;
}
-
+
/* This var indicated that there is an object which isn't saved right now. */
$this->ObjectInSaveMode = true;
/* initiate recursive remove (Is called from iframe, generates output)*/
if(isset($_GET['PerformRecMove'])){
$this->deptabs->by_object['department']->recursive_move("","",true);
+ $this->DivListDepartment->selectedBase = $this->deptabs->by_object['department']->dn;
exit();
}
remove locks & save object tab & unset current object */
if($this->ObjectInSaveMode && (!$this->RecursiveRemoveRequested) && (!$this->ObjectTaggingRequested)){
$this->deptabs->save();
+ $this->config->get_departments();
$this->ObjectInSaveMode = false;
if ($this->dn != "new"){
del_lock ($this->dn);
$display= $this->deptabs->execute();
if (!$this->deptabs->by_object[$this->deptabs->current]->dialog){
$display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
+ $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
$display.= " \n";
$display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
$display.= "</p>";
}
return ($display);
}else{
-
- /* Check if there is a snapshot dialog open */
- if($str = $this->showSnapshotDialog($this->DivListDepartment->selectedBase,$this->DivListDepartment->selectedBase)){
- return($str);
- }
-
/* Display dialog with group list */
$this->DivListDepartment->parent = $this;
$this->DivListDepartment->execute();
if($this->DivListDepartment->SubSearch){
$res= get_list("(&(|(ou=$Regex)(description=$Regex))(objectClass=gosaDepartment))",
- $this->ui->subtreeACL, $base, array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH);
+ "department", $base, array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH);
}else{
$res= get_list("(&(|(ou=$Regex)(description=$Regex))(objectClass=gosaDepartment))",
- $this->ui->subtreeACL, $base, array("ou", "description"), GL_SIZELIMIT );
+ "department", $base, array("ou", "description"), GL_SIZELIMIT );
}
$this->departments= array();
- $tmp = array();
- foreach ($res as $key => $value){
- #$tmp[get_sub_department(convert_department_dn($value['dn']))] = $key;
- $tmp[$key] = get_sub_department(convert_department_dn($value['dn']));
+
+ /* Add current base to the list of available departments, but only if its naming attribute is 'ou' */
+ if(preg_match("/^ou=/",$base)){
+ $this->departments [ convert_department_dn($base) ] = ".";
}
- natcasesort($tmp);
- foreach($tmp as $key => $q){
- $value = $res [$key];
+
+ foreach ($res as $key => $value){
+
/* Don't display base as entry on subsearch */
if(($value['dn'] == $base) && ($this->DivListDepartment->SubSearch)){
continue;
}
- $this->departments[base64_encode($value['dn'])]= $value;
+ $cdn= convert_department_dn($value['dn']);
+
+ /* Append to dep list */
+ if(isset($value["description"][0])){
+ $this->departments[$cdn]= get_sub_department($cdn)." - [".$value["description"][0]."]";
+ }else{
+ $this->departments[$cdn]= get_sub_department($cdn);//$value["description"][0];
+ }
}
+ natcasesort ($this->departments);
+ reset ($this->departments);
}
function remove_from_parent()
{
/* reload department */
$this->config->get_departments();
- $config = $this->config;
$this->config->make_idepartments();
+ $this->DivListDepartment->config= $this->config;
$this->DivListDepartment->save_object();
}
-
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>