Skip to content

Commit ed1d29a

Browse files
author
Marius Cramer
committed
Implemented: FS#3362 - Sort spamfilter policy's by name in mailbox and domain settings
1 parent 4dfacaa commit ed1d29a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

interface/web/mail/mail_domain_edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function onShowEnd() {
148148

149149
// Get the spamfilter policys for the user
150150
$tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = '@".$app->db->quote($this->dataRecord["domain"])."'");
151-
$sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r');
151+
$sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r')." ORDER BY policy_name";
152152
$policys = $app->db->queryAllRecords($sql);
153153
$policy_select = "<option value='0'>".$app->tform->wordbook["no_policy"]."</option>";
154154
if(is_array($policys)) {

interface/web/mail/mail_user_edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function onShowEnd() {
9393

9494
// Get the spamfilter policys for the user
9595
$tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
96-
$sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r');
96+
$sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r') . " ORDER BY policy_name";
9797
$policys = $app->db->queryAllRecords($sql);
9898
$policy_select = "<option value='0'>".$app->tform->lng("no_policy")."</option>";
9999
if(is_array($policys)) {

0 commit comments

Comments
 (0)