From 7d52e00a51450bc4a080d4e21b7dda02c0a65191 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 05:42:06 -0500
Subject: [PATCH] Fixed list sorting
---
interface/web/mail/form/mail_blacklist.tform.php | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/interface/web/mail/form/mail_blacklist.tform.php b/interface/web/mail/form/mail_blacklist.tform.php
index 6b91c3a..df63f7f 100644
--- a/interface/web/mail/form/mail_blacklist.tform.php
+++ b/interface/web/mail/form/mail_blacklist.tform.php
@@ -37,8 +37,8 @@
$form["description"] = "";
$form["name"] = "mail_blacklist";
$form["action"] = "mail_blacklist_edit.php";
-$form["db_table"] = "mail_blacklist";
-$form["db_table_idx"] = "blacklist_id";
+$form["db_table"] = "mail_access";
+$form["db_table_idx"] = "access_id";
$form["db_history"] = "yes";
$form["tab_default"] = "blacklist";
$form["list_default"] = "mail_blacklist_list.php";
@@ -63,36 +63,42 @@
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
+ 'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
'keyfield'=> 'server_id',
'valuefield'=> 'server_name'
),
'value' => ''
),
- 'address' => array (
+ 'source' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'address_error_notempty'),
- ),
'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'source_error_notempty'),
+ ),
'value' => '',
'width' => '30',
'maxlength' => '255'
),
- 'recipient' => array (
+ 'access' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
+ 'default' => 'REJECT',
+ 'value' => 'REJECT',
'width' => '30',
'maxlength' => '255'
+ ),
+ 'type' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'y',
+ 'value' => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
),
'active' => array (
- 'datatype' => 'INTEGER',
+ 'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => '1',
- 'value' => '1'
+ 'default' => 'y',
+ 'value' => array(0 => 'n',1 => 'y')
),
##################################
# ENDE Datatable fields
--
Gitblit v1.9.1