From 952df8e1fa28767fa7df1438e015c920725deafd Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 20 Apr 2016 11:30:23 -0400
Subject: [PATCH] Fixed Issue #3833 Cant create mail filter. Added missing strings to language file.
---
interface/web/mail/lib/lang/en_mail_user_filter.lng | 1 +
interface/web/mail/lib/lang/de_mail_user_filter.lng | 1 +
interface/web/mail/mail_user_filter_edit.php | 2 +-
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng
index 76179ab..c9fb78f 100644
--- a/interface/web/mail/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng
@@ -25,4 +25,5 @@
$wb['keep_txt'] = 'Behalten';
$wb['reject_txt'] = 'Abweisen';
$wb['stop_txt'] = 'Stop';
+$wb['move_to_txt'] = 'Verschiebe nach';
?>
diff --git a/interface/web/mail/lib/lang/en_mail_user_filter.lng b/interface/web/mail/lib/lang/en_mail_user_filter.lng
index cf143e1..e78f808 100644
--- a/interface/web/mail/lib/lang/en_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/en_mail_user_filter.lng
@@ -25,4 +25,5 @@
$wb['keep_txt'] = 'Keep';
$wb['reject_txt'] = 'Reject';
$wb['stop_txt'] = 'Stop';
+$wb['move_to_txt'] = 'Move to';
?>
diff --git a/interface/web/mail/mail_user_filter_edit.php b/interface/web/mail/mail_user_filter_edit.php
index 52cab08..653ea52 100644
--- a/interface/web/mail/mail_user_filter_edit.php
+++ b/interface/web/mail/mail_user_filter_edit.php
@@ -70,7 +70,7 @@
global $app, $conf;
// Get the parent mail_user record
- $mailuser = $app->db->queryOneRecord("SELECT * FROM mail_user WHERE mailuser_id = ? AND ".$app->tform->getAuthSQL('r'). $_REQUEST["mailuser_id"]);
+ $mailuser = $app->db->queryOneRecord("SELECT * FROM mail_user WHERE mailuser_id = ? AND ".$app->tform->getAuthSQL('r'), $_REQUEST["mailuser_id"]);
// Check if Domain belongs to user
if($mailuser["mailuser_id"] != $_POST["mailuser_id"]) $app->tform->errorMessage .= $app->tform->wordbook["no_mailuser_perm"];
--
Gitblit v1.9.1