Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
lolo888
ISPConfig 3
Commits
8aed1bf6
Commit
8aed1bf6
authored
May 27, 2009
by
tbrehm
Browse files
Added missing error messages to spamfilter white and blacklist.
Set version number to 3.0.1.3
parent
44d2a76d
Changes
6
Hide whitespace changes
Inline
Side-by-side
install/sql/ispconfig3.sql
View file @
8aed1bf6
...
...
@@ -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
'
);
-- --------------------------------------------------------
...
...
install/tpl/config.inc.php.master
View file @
8aed1bf6
...
...
@@ -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
...
...
interface/web/mail/lib/lang/en_spamfilter_blacklist.lng
View file @
8aed1bf6
...
...
@@ -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
interface/web/mail/lib/lang/en_spamfilter_whitelist.lng
View file @
8aed1bf6
...
...
@@ -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
interface/web/mail/spamfilter_blacklist_edit.php
View file @
8aed1bf6
...
...
@@ -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"
)
);
}
}
}
...
...
interface/web/mail/spamfilter_whitelist_edit.php
View file @
8aed1bf6
...
...
@@ -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"
)
);
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment