diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index a51a5c21fbdecd1264d9dc1635f9f42ef1d4f863..67f6021bca54dadf832fb7c1d0b6b85b90a954c1 100644 (file)
- // Change cassword
+ // Change password
if(isset($this->force_hash_type[$this->dn])){
if(!change_password ($this->dn, $new_password,0,$this->force_hash_type[$this->dn],'', $message)){
msg_dialog::displayChecks(array($message));
$smarty->assign("template", array_pop($target));
$smarty->assign("templates", $templates);
$smarty->assign("edit_uid", "");
+ $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
return($smarty->fetch(get_template_path('template.tpl', TRUE)));
// -> See 'templateContinue' for further handling!
$smarty->assign("template", "none");
$smarty->assign("templates", $templates);
$smarty->assign("edit_uid", "");
+ $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
return($smarty->fetch(get_template_path('template.tpl', TRUE)));
// -> See 'templateContinue' for further handling!
$smarty->assign("templates",$templates);
$smarty->assign("got_uid", $this->got_uid);
$smarty->assign("edit_uid",false);
+ $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
return($smarty->fetch(get_template_path('template.tpl', TRUE)));
}
if ($ldap->count () != 0){
msg_dialog::displayChecks(array(msgPool::duplicated(_("Name"))));
+ $smarty->assign("edit_uid", "");
}else{
// Preset uid field by using the idGenerator
$attributes= array('sn' => $this->sn, 'givenName' => $this->givenName);
if ($this->config->get_cfg_value("core","idGenerator") != ""){
- $uids= gen_uids ($this->config->get_cfg_value("core","idGenerator"), $attributes);
- if (count($uids)){
- $smarty->assign("edit_uid", "false");
- $smarty->assign("uids", $uids);
- $this->uid= current($uids);
+ $genStr = $this->config->get_cfg_value("core","idGenerator");
+ $smarty->assign("edit_uid", "");
+ if(!empty($genStr)){
+ $uids= gen_uids($genStr, $attributes);
+ if (count($uids)){
+ $smarty->assign("edit_uid", "false");
+ $smarty->assign("uids", $uids);
+ $this->uid= current($uids);
+ }else{
+ msg_dialog::displayChecks(array(_("Cannot generate a unique id, please specify it manually!")));
+ }
}
} else {
$smarty->assign("edit_uid", "");
$smarty->assign("template", get_post('template'));
}
$smarty->assign("templates",$templates);
+ $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
return($smarty->fetch(get_template_path('template.tpl', TRUE)));
}