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
Zvonimir
ISPConfig 3
Commits
ed1d29a4
Commit
ed1d29a4
authored
Mar 10, 2014
by
Marius Cramer
Browse files
Implemented: FS#3362 - Sort spamfilter policy's by name in mailbox and domain settings
parent
4dfacaa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/mail/mail_domain_edit.php
View file @
ed1d29a4
...
...
@@ -148,7 +148,7 @@ class page_action extends tform_actions {
// Get the spamfilter policys for the user
$tmp_user
=
$app
->
db
->
queryOneRecord
(
"SELECT policy_id FROM spamfilter_users WHERE email = '@"
.
$app
->
db
->
quote
(
$this
->
dataRecord
[
"domain"
])
.
"'"
);
$sql
=
"SELECT id, policy_name FROM spamfilter_policy WHERE "
.
$app
->
tform
->
getAuthSQL
(
'r'
);
$sql
=
"SELECT id, policy_name FROM spamfilter_policy WHERE "
.
$app
->
tform
->
getAuthSQL
(
'r'
)
.
" ORDER BY policy_name"
;
$policys
=
$app
->
db
->
queryAllRecords
(
$sql
);
$policy_select
=
"<option value='0'>"
.
$app
->
tform
->
wordbook
[
"no_policy"
]
.
"</option>"
;
if
(
is_array
(
$policys
))
{
...
...
interface/web/mail/mail_user_edit.php
View file @
ed1d29a4
...
...
@@ -93,7 +93,7 @@ class page_action extends tform_actions {
// Get the spamfilter policys for the user
$tmp_user
=
$app
->
db
->
queryOneRecord
(
"SELECT policy_id FROM spamfilter_users WHERE email = '"
.
$app
->
db
->
quote
(
$this
->
dataRecord
[
"email"
])
.
"'"
);
$sql
=
"SELECT id, policy_name FROM spamfilter_policy WHERE "
.
$app
->
tform
->
getAuthSQL
(
'r'
);
$sql
=
"SELECT id, policy_name FROM spamfilter_policy WHERE "
.
$app
->
tform
->
getAuthSQL
(
'r'
)
.
" ORDER BY policy_name"
;
$policys
=
$app
->
db
->
queryAllRecords
(
$sql
);
$policy_select
=
"<option value='0'>"
.
$app
->
tform
->
lng
(
"no_policy"
)
.
"</option>"
;
if
(
is_array
(
$policys
))
{
...
...
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