From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6

---
 interface/web/mail/form/mail_alias.tform.php |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface/web/mail/form/mail_alias.tform.php b/interface/web/mail/form/mail_alias.tform.php
index 1223b95..6676998 100644
--- a/interface/web/mail/form/mail_alias.tform.php
+++ b/interface/web/mail/form/mail_alias.tform.php
@@ -37,8 +37,8 @@
 $form["description"] 	= "";
 $form["name"] 			= "mail_alias";
 $form["action"]			= "mail_alias_edit.php";
-$form["db_table"]		= "mail_redirect";
-$form["db_table_idx"]	= "redirect_id";
+$form["db_table"]		= "mail_forwarding";
+$form["db_table_idx"]	= "forwarding_id";
 $form["db_history"]		= "yes";
 $form["tab_default"]	= "alias";
 $form["list_default"]	= "mail_alias_list.php";
@@ -51,7 +51,7 @@
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
 $form["tabs"]['alias'] = array (
-	'title' 	=> "Email alias",
+	'title' 	=> "Email Alias",
 	'width' 	=> 100,
 	'template' 	=> "templates/mail_alias_edit.htm",
 	'fields' 	=> array (
@@ -66,7 +66,7 @@
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
-		'email' => array (
+		'source' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISEMAIL',
@@ -82,7 +82,7 @@
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
 			'datasource'	=> array ( 	'type'			=> 'SQL',
-										'querystring' 	=> 'SELECT email FROM mail_box WHERE {AUTHSQL} ORDER BY email',
+										'querystring' 	=> 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
 										'keyfield'		=> 'email',
 										'valuefield'	=> 'email'
 									 ),
@@ -98,10 +98,10 @@
 			'value'		=> array('alias' => 'Alias','forward'=>'Forward')
 		),
 		'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