Fixed User dialog, to detect changed attributes correctly

[gosa.git] / plugins / admin / departments / class_departmentManagement.inc

diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 0575c45fedaa69335f0f783cf6b2f065f46a08ea..2a1e2e523a85bdc5efbe9d061dff3a96d6cc2b7f 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -142,12 +142,9 @@ class departmentManagement extends plugin
                /* New Entry if Posted action (s_action) == new
                 */
                if ($s_action=="new"){
-                       $this->acl= array(":all");
                        $this->dn= "new";
-
                        $this->deptabs= new deptabs($this->config,
                                        $this->config->data['TABS']['DEPTABS'], $this->dn);
-                       $this->deptabs->set_acl($this->acl);
                }
 
                /* Edit Entry if Posted action (s_action) == edit 
@@ -185,7 +182,7 @@ class departmentManagement extends plugin
                                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'."), $this->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);
                        }
@@ -197,7 +194,7 @@ class departmentManagement extends plugin
                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, "all") == ""){
+                       if (chkacl($acl, "delete") == ""){
                                $this->remove_from_parent();
                                gosa_log ("Department object'".$this->dn."' has been removed");
                                $this->reload ();
@@ -283,7 +280,7 @@ class departmentManagement extends plugin
                                                " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
                                                " <input class='center' type='image' src='images/list_new_department.png' align='middle' alt='"._("Create new department")."' name='dep_new'>&nbsp;".
                                                " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-                                               _("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()'>$options</select>".
+                                               _("Base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
                                                " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
                                                "</div>";
 
@@ -291,8 +288,8 @@ class departmentManagement extends plugin
                        $divlist = new divlist("departmenttabs");
                        $divlist->SetSummary(_("This table displays all departments, in the selected tree."));
                        $divlist->SetEntriesPerPage(0);
-                       $actions= "<input type='image' src='images/edit.png'             alt='"._("edit")."'    name='dep_edit_%KEY%' title='"._("Edit this entry")."'>";
-                       $actions.= "<input type='image' src='images/edittrash.png' alt='"._("delete")."'        name='dep_del_%KEY%' title='"._("Delete this entry")."'>";
+                       $actions= "<input class='center' type='image' src='images/edit.png'              alt='"._("edit")."'    name='dep_edit_%KEY%' title='"._("Edit this entry")."'>";
+                       $actions.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'         name='dep_del_%KEY%' title='"._("Delete this entry")."'>";
 
                        $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
@@ -417,6 +414,9 @@ class departmentManagement extends plugin
                }
                natcasesort ($this->departments);
                reset ($this->departments);
+
+               /* Unset global department list */
+               unset($_SESSION['cached_departments']);
        }
 
        function remove_from_parent()