tbrehm
2009-05-27 8aed1bf629daf813b62d57610b45d2ed580ef21b
Added missing error messages to spamfilter white and blacklist.
Set version number to 3.0.1.3
6 files modified
10 ■■■■■ changed files
install/sql/ispconfig3.sql 2 ●●● patch | view | raw | blame | history
install/tpl/config.inc.php.master 2 ●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/en_spamfilter_blacklist.lng 1 ●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/en_spamfilter_whitelist.lng 1 ●●●● patch | view | raw | blame | history
interface/web/mail/spamfilter_blacklist_edit.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/spamfilter_whitelist_edit.php 2 ●●● patch | view | raw | blame | history
install/sql/ispconfig3.sql
@@ -1148,7 +1148,7 @@
-- 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');
-- --------------------------------------------------------
install/tpl/config.inc.php.master
@@ -57,7 +57,7 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.1');
define('ISPC_APP_VERSION', '3.0.1.3');
//** Database
interface/web/mail/lib/lang/en_spamfilter_blacklist.lng
@@ -5,4 +5,5 @@
$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.';
?>
interface/web/mail/lib/lang/en_spamfilter_whitelist.lng
@@ -5,4 +5,5 @@
$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.';
?>
interface/web/mail/spamfilter_blacklist_edit.php
@@ -63,7 +63,7 @@
            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"));
                }
            }
        }
interface/web/mail/spamfilter_whitelist_edit.php
@@ -63,7 +63,7 @@
            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"));
                }
            }
        }