diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 621fe653e3fb41fcb249274b26749ad473db240a..e6f9dc8970e2cac4d528d8d544baaf3eb72d17f9 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 a0f978c7c3a820941526ebec163db3acd29474d7..9ba97990e8f8ac3d2ff3798b328b83257355c9f7 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 877e38aefa1f9599c0f3cb77b42951989b88524b..6478b1f2fce33f0b06ed467983d5eae977913b1a 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 877e38aefa1f9599c0f3cb77b42951989b88524b..6478b1f2fce33f0b06ed467983d5eae977913b1a 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 141e6a77e70b9adba88b6191bc7d587f46c66be5..a75af7539577b3a8ecc168f7439209faf6006867 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 bf1db41f9955167d40b695cc1ad4b76cab9a2748..b6762af77a7d8ec18036bf838b5fd3c469b123c8 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")); } } }