X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=88936bd503a44fca137274790f3a877074bdd5c7;hb=c3a786a7af7dcec35d946e2e7f551ab29f05ad1c;hp=1b81ca4dbbbb92b9e90c39e3b69ec6fdb4532420;hpb=865b39fed406e9666f83089f8cbf45632fb408f5;p=gosa.git
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 1b81ca4db..88936bd50 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -350,7 +350,7 @@ class userManagement extends plugin
/* Lock the current entry, so nobody will edit it during deletion */
add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("info", sprintf(_("You're about to delete the user %s."), $this->dn));
+ $smarty->assign("info", sprintf(_("You're about to delete the user %s."), LDAP::fix($this->dn)));
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
} else {
@@ -521,7 +521,8 @@ class userManagement extends plugin
}
/* Use template if there are any of them */
- if ((count($this->templates) && !isset($_POST['new_template']))||($s_action=="create_user_from_tpl")){
+
+ if ((count($this->templates) && ($s_action!='new_tpl'))||($s_action=="create_user_from_tpl")){
foreach(array("sn", "givenName", "uid", "got_uid", "templates") as $attr){
$smarty->assign("$attr", $this->$attr);
}
@@ -666,29 +667,29 @@ class userManagement extends plugin
/* NEW LIST MANAGMENT */
$listhead = "