![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index 01df57a8bc608be848ac807003cfde2a9cf3ebec..deb06944b44abce34030c30d699f4b046a9043ac 100644 (file)
class environment extends plugin
{
- /* CLI vars */
- var $cli_summary = "Manage server basic objects";
- var $cli_description = "Some longer text\nfor help";
- var $cli_parameters = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
/* attribute list for save action */
var $ignore_account = FALSE;
var $plHeadline = "Environment";
}
/* Group Dialog with enabled environment options */
if ($this->is_account){
- $display= $this->show_enable_header(_("Remove environment extension"),
- _("Environment extension enabled. You can disable it by clicking below."));
+ $display= $this->show_enable_header(msgPool::removeFeaturesButton(_("Environment")),
+ msgPool::featuresEnabled(_("Environment")));
} else {
/* Environment is disabled
environment extensions
*/
if((isset($this->parent->by_object['group']))||(isset($this->attrs['objectClass']))&&((in_array("posixAccount",$this->attrs['objectClass'])))){
- // 4. There is a PosixAccount
- $display= $this->show_enable_header(_("Add environment extension"),
- _("Environment extension disabled. You can enable it by clicking below."));
+ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+ msgPool::featuresDisabled(_("Environment")));
return $display;
}else{
- // 4. There is no PosixAccount
- $display= $this->show_enable_header(_("Add environment extension"),
- _("Environment extension disabled. You have to setup a posix account before you can enable this feature."));
+ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+ msgPool::featuresDisabled(_("Environment"), _("POSIX")), TRUE);
return $display;
}
}
// 3. Account enabled . Editing from adminmenu
if ($this->is_account){
- $display= $this->show_disable_header(_("Remove environment extension"),
- _("Environment extension enabled. You can disable it by clicking below."));
+ $display= $this->show_enable_header(msgPool::removeFeaturesButton(_("Environment")),
+ msgPool::featuresEnabled(_("Environment")));
} else {
if($this->parent->by_object['posixAccount']->is_account==true){
- // 4. There is a PosixAccount
- $display= $this->show_disable_header(_("Add environment extension"),
- _("Environment extension disabled. You can enable it by clicking below."));
+ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+ msgPool::featuresDisabled(_("Environment")));
return $display;
}else{
- // 4. There is a PosixAccount
- $display= $this->show_disable_header(_("Add environment extension"),
- _("Environment extension disabled. You have to setup a posix account before you can enable this feature."),TRUE,TRUE);
+ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+ msgPool::featuresDisabled(_("Environment"), _("POSIX")), TRUE);
return $display;
}
}
/* We assign a share to this user, if we don't know where to mount the share */
if(!isset($_POST['gotoShareSelection']) || get_post('gotoShareSelection') == ""){
- msg_dialog::display(_("Error"), _("Please select a valid share!"), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), msgPool::invalid(_("Share")), ERROR_DIALOG);
}elseif((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
- msg_dialog::display(_("Error"), _("Please specify a valid mount point!"), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point")), ERROR_DIALOG);
}elseif(preg_match('/ /', $_POST['gotoShareMountPoint'])){
- msg_dialog::display(_("Error"), _("You cannot use spaces in the mount path!"), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point"), "/[^\s]/"), ERROR_DIALOG);
}elseif(!(
preg_match("/^\//",$_POST['gotoShareMountPoint']) ||
preg_match("/^~/",$_POST['gotoShareMountPoint']) ||
preg_match("/^%/",$_POST['gotoShareMountPoint'])
)
){
- msg_dialog::display(_("Error"), _("Please specify a valid mount point!"), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point")), ERROR_DIALOG);
}else{
$a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
$s_mount = $_POST['gotoShareMountPoint'];
title='"._("Reset password hash")."'>";
$img.= " ";
}
- $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/edittrash.png' alt='"._("Delete")."'
+ $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/edittrash.png' alt='".msgPool::delButton()."'
title='"._("Delete share entry")."'>";
$field1 = array("string" => $value , "attach" => "style='".$color."'");
$field2 = array("string" => $img , "attach" => "style='border-right:0px;'");
new log("remove","users/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
}
- show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/environment account with dn '%s' failed."),$this->dn));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+ }
/* Optionally execute a command after we're done */
$this->handle_post_events("remove",array("uid" => $this->uid));
$this->detect_grouptype();
if(preg_match("/[^0-9]/",$this->gotoProfileQuota)) {
- $message[]=_("Please set a valid profile quota size.");
+ $message[] = msgPool::invalid(_("Profile quota"),$this->gotoProfileQuota,"/[0-9]/") ;
}
if(!isset($this->attrs['objectClass'])){
$this->attrs['objectClass']=array();
}
if(!$this->is_group){
if((!((in_array("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true)))&&(!$this->is_group)){
- $message[]=(_("You need to setup a valid posix extension in order to enable evironment features."));
+ $message[]=(_("You need to enable POSIX features in order to enable evironment features!"));
}
}
return ($message);
new log("create",$cat."/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
}
- show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/environment account with dn '%s' failed."),$this->dn));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+ }
$this->handle_post_events($mode,array("uid"=>$this->uid));
}
$this->detect_grouptype();
if(preg_match("/[^0-9]/",$this->gotoProfileQuota) && in_array("gotoProfileQuota",$this->multi_boxes)) {
- $message[]=_("Please set a valid profile quota size.");
+ $message[] = msgPool::invalid(_("Profile quota"),$this->gotoProfileQuota,"/[0-9]/") ;
}
return($message);
}