diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index a4f7125e8288e97e11a4ca9314a6608d1f00c73d..a37cdb4c8607e1da87a8e286631f04d2e8934b33 100644 (file)
}else{
$this->base = $base_tmp;
msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
- $this->set_acl_base('dummy,'.$this->base);
}
}
}
}
}
-
- $this->set_acl_base('dummy,'.$this->base);
}
}
/* Fallback if there's no image magick inside PHP */
if (!function_exists("imagick_blob2image")){
/* Get temporary file name for conversation */
- $fname = tempnam ("/tmp", "GOsa");
+ $fname = tempnam (TEMP_DIR, "GOsa");
/* Open file and write out photoData */
$fp = fopen ($fname, "w");
foreach($temp['name'] as $id => $name){
if($name == $this->pw_storage){
if($temp['is_configurable'][$id] && !$this->pwObject instanceof $temp[$name] ){
- $message[] = _("The selected password method a requires initial configuration.");
+ $message[] = _("The selected password method requires initial configuration!");
}
break;
}
$this->set_acl_base($this->base);
}
+ /* Check if we are allowed to create/move this user
+ */
+
+ if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
+ $message[]= msgPool::permCreate();
+ }elseif($this->orig_dn != "new" && $this->new_dn != $this->orig_dn && !$this->acl_is_moveable($this->base)){
+ $message[]= msgPool::permMove();
+ }
+
/* UID already used? */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
"plProvidedAcls" => array(
"base" => _("Base"),
"userPassword" => _("User password"),
- "sn" => _("Surename"),
+ "sn" => _("Surname"),
"givenName" => _("Given name"),
"uid" => _("User identification"),
"personalTitle" => _("Personal title"),