From 8aed1bf629daf813b62d57610b45d2ed580ef21b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 27 May 2009 13:11:25 +0000
Subject: [PATCH] Added missing error messages to spamfilter white and
blacklist. Set version number to 3.0.1.3
---
install/sql/ispconfig3.sql | 2 +-
install/tpl/config.inc.php.master | 2 +-
interface/web/mail/lib/lang/en_spamfilter_blacklist.lng | 1 +
interface/web/mail/lib/lang/en_spamfilter_whitelist.lng | 1 +
interface/web/mail/spamfilter_blacklist_edit.php | 2 +-
interface/web/mail/spamfilter_whitelist_edit.php | 2 +-
6 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 621fe653e3..e6f9dc8970 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1148,7 +1148,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.3');
-- --------------------------------------------------------
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index a0f978c7c3..9ba97990e8 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -57,7 +57,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.1');
+define('ISPC_APP_VERSION', '3.0.1.3');
//** Database
diff --git a/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng
index 877e38aefa..6478b1f2fc 100644
--- a/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/en_spamfilter_blacklist.lng
@@ -5,4 +5,5 @@ $wb["rid_txt"] = 'User';
$wb["email_txt"] = 'Email';
$wb["priority_txt"] = 'Priority';
$wb["active_txt"] = 'Active';
+$wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.';
?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng
index 877e38aefa..6478b1f2fc 100644
--- a/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/en_spamfilter_whitelist.lng
@@ -5,4 +5,5 @@ $wb["rid_txt"] = 'User';
$wb["email_txt"] = 'Email';
$wb["priority_txt"] = 'Priority';
$wb["active_txt"] = 'Active';
+$wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.';
?>
\ No newline at end of file
diff --git a/interface/web/mail/spamfilter_blacklist_edit.php b/interface/web/mail/spamfilter_blacklist_edit.php
index 141e6a77e7..a75af75395 100644
--- a/interface/web/mail/spamfilter_blacklist_edit.php
+++ b/interface/web/mail/spamfilter_blacklist_edit.php
@@ -63,7 +63,7 @@ class page_action extends tform_actions {
if($client["limit_spamfilter_wblist"] >= 0) {
$tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id");
if($tmp["number"] >= $client["limit_spamfilter_wblist"]) {
- $app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]);
+ $app->error($app->tform->lng("limit_spamfilter_wblist_txt"));
}
}
}
diff --git a/interface/web/mail/spamfilter_whitelist_edit.php b/interface/web/mail/spamfilter_whitelist_edit.php
index bf1db41f99..b6762af77a 100644
--- a/interface/web/mail/spamfilter_whitelist_edit.php
+++ b/interface/web/mail/spamfilter_whitelist_edit.php
@@ -63,7 +63,7 @@ class page_action extends tform_actions {
if($client["limit_spamfilter_wblist"] >= 0) {
$tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id");
if($tmp["number"] >= $client["limit_spamfilter_wblist"]) {
- $app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]);
+ $app->error($app->tform->lng("limit_spamfilter_wblist_txt"));
}
}
}
--
GitLab