diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index b095805fbf705cdd7a464ffbadfd8180f277bd5d..99f784c5a7703751a5dafbe97cba54b6ec4d1211 100644 (file)
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)));
+ $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);
}
$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>";
}
$this->departments= array();
+
+ /* 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) ] = ".";
+ }
+
foreach ($res as $key => $value){
/* Don't display base as entry on subsearch */
$this->config->make_idepartments();
$this->DivListDepartment->save_object();
}
-
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>