summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e11a34b)
raw | patch | inline | side by side (parent: e11a34b)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 10 Mar 2008 15:25:25 +0000 (15:25 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Mon, 10 Mar 2008 15:25:25 +0000 (15:25 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9612 594d385d-05f5-0310-b6e9-bd551577e9d8
gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc | patch | blob | history |
diff --git a/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc b/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc
index db235189968cd072aec52bf900b8c6818882fb85..5311ed5009933034d239d8700654fc3b4f4eeb20 100644 (file)
$error =false;
if(empty($this->mailQueueScript)){
- msg_dialog::display(_("Configuration error"), sprintf(_("Missing '%s' directive in configuration!"), "mailqueuescriptpath"), ERROR_DIALOG);
+ #FIXME This will be provided by the gosa-si server later, then this message becomes obsolete.
+ msg_dialog::display(_("Configuration error"),
+ sprintf(_("Missing '%s' directive in configuration!"), "mailqueuescriptpath"), ERROR_DIALOG);
$error = true;
}else{
if((preg_match("/".$attr."/",$name))&&($only_once)){
if(!$this->acl_is_readable($attr)){
$only_once = false;
- msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to submit a '%s' command!"), $attr), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"),
+ sprintf(_("You have no permission to submit a '%s' command!"), $attr), ERROR_DIALOG);
}else{
$only_once = false;
$act = preg_replace("/_.*$/i","",$attr);
$r_cmd = preg_replace("/%server/" , $se_str ,$r_cmd);
$r_cmd = preg_replace("/%id/" , "ALL" ,$r_cmd);
if($this->pass_cmd($r_cmd)==false){
- msg_dialog::display(_("Configuration error"), sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $r_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"),
+ msgPool::cmdnotfound("mailqueuescriptpath",_("Mail queue addon")), ERROR_DIALOG);
}
}
}
$only_once = false;
if(!$this->acl_is_readable($opt)){
- msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to submit a '%s' command!"), $opt), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"), i
+ sprintf(_("You have no permission to submit a '%s' command!"), $opt), ERROR_DIALOG);
}else{
/* Create cmd */
$r_cmd = preg_replace("/%action/" , $opt ,$this->mailQueueScript);
/* Execute cmd */
if(!$str = $this->pass_cmd($r_cmd)){
- msg_dialog::display(_("Configuration error"), sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $r_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
+ #FIXME This will be provided by the gosa-si server later, then this message becomes obsolete.
+ msg_dialog::display(_("Configuration error"),
+ sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $r_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
}else{
/* Special handling for option='header' */
$q_cmd = preg_replace("/%id/" ,"all" ,$q_cmd);
if(!$this->acl_is_readable("query")){
- msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to submit a '%s' command!"), "query"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"),
+ sprintf(_("You have no permission to submit a '%s' command!"), "query"), ERROR_DIALOG);
$mailQueueParser = new parseMailQueue("",$this->Server);
}else{
$mailQueueParser = new parseMailQueue($str,$this->Server);
}else{
/* On error/ no return value / false return value */
- msg_dialog::display(_("Configuration error"), sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $q_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"),
+ sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $q_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
$error = true;
}
}
if(!$this->acl_is_readable("query")){
- msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to submit a '%s' command!"), "query"), ERROR_DIALOG);
+ msg_dialog::display(_("Permission error"),
+ sprintf(_("You have no permission to submit a '%s' command!"), "query"), ERROR_DIALOG);
$mailQueueParser = new parseMailQueue("",$this->Server);
}else{
}
/* On error/ no return value / false return value */
}else{
- msg_dialog::display(_("Configuration error"), sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $q_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"),
+ sprintf(_("'%s' defined for the '%s' directive cannot be executed!"), $q_cmd, "mailqueuescriptpath"), ERROR_DIALOG);
$error = true;
}
}
Else display error */
$server = $this->getServer();
if((count($server) == 1 ) && (isset($server['all']))){
- msg_dialog::display(_("Configuration error"), _("No mail servers sepcified!"), ERROR_DIALOG);
+ msg_dialog::display(_("Configuration error"), _("No mail servers sepcified!"), ERROR_DIALOG);
$error = true;
}