From 45f11e2be23676e9efc084b7c447993e58f5b670 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Mar 2007 16:20:39 -0500
Subject: [PATCH] Update of the mail and dns module.
---
interface/web/mail/form/mail_domain_catchall.tform.php | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/interface/web/mail/form/mail_domain_catchall.tform.php b/interface/web/mail/form/mail_domain_catchall.tform.php
index 0f16d44..d3197e2 100644
--- a/interface/web/mail/form/mail_domain_catchall.tform.php
+++ b/interface/web/mail/form/mail_domain_catchall.tform.php
@@ -37,8 +37,8 @@
$form["description"] = "";
$form["name"] = "mail_domain_catchall";
$form["action"] = "mail_domain_catchall_edit.php";
-$form["db_table"] = "mail_domain_catchall";
-$form["db_table_idx"] = "domain_catchall_id";
+$form["db_table"] = "mail_forwarding";
+$form["db_table_idx"] = "forwarding_id";
$form["db_history"] = "yes";
$form["tab_default"] = "catchall";
$form["list_default"] = "mail_domain_catchall_list.php";
@@ -51,8 +51,8 @@
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
$form["tabs"]['catchall'] = array (
- 'title' => "Domain Catchall",
- 'width' => 150,
+ 'title' => "Email catchall",
+ 'width' => 100,
'template' => "templates/mail_domain_catchall_edit.htm",
'fields' => array (
##################################
@@ -60,24 +60,23 @@
##################################
'server_id' => array (
'datatype' => 'INTEGER',
- 'formtype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
'default' => '',
- 'value' => ''
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
),
- 'domain' => array (
+ 'source' => array (
'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'validators' => array ( 0 => array ( 'type' => 'UNIQUE',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'errmsg'=> 'domain_error_empty'),
+ 1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'domain_error_unique'),
- 1 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}$/',
+ 2 => array ( 'type' => 'REGEX',
+ 'regex' => '/^\@[\w\.\-]{2,64}\.[a-zA-Z]{2,10}$/',
'errmsg'=> 'domain_error_regex'),
),
- 'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "SELECT domain FROM mail_domain WHERE type = 'local' AND {AUTHSQL} ORDER BY domain",
- 'keyfield'=> 'domain',
- 'valuefield'=> 'domain'
- ),
'default' => '',
'value' => '',
'width' => '30',
@@ -85,17 +84,29 @@
),
'destination' => array (
'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
+ 'formtype' => 'SELECT',
'default' => '',
- 'value' => '',
- 'width' => '30',
- 'maxlength' => '255'
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
+ 'keyfield' => 'email',
+ 'valuefield' => 'email'
+ ),
+ 'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
+ 'errmsg'=> 'destination_error_isemail'),
+ ),
+ 'value' => ''
+ ),
+ 'type' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('alias' => 'Alias','forward'=>'Forward','catchall'=>'Catchall')
),
'active' => array (
- 'datatype' => 'INTEGER',
+ 'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => '1',
- 'value' => '1'
+ 'default' => 'y',
+ 'value' => array(0 => 'n',1 => 'y')
),
##################################
# ENDE Datatable fields
@@ -104,4 +115,5 @@
);
+
?>
\ No newline at end of file
--
Gitblit v1.9.1