From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/mail/form/mail_alias.tform.php | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/interface/web/mail/form/mail_alias.tform.php b/interface/web/mail/form/mail_alias.tform.php
index 1223b95..072f622 100644
--- a/interface/web/mail/form/mail_alias.tform.php
+++ b/interface/web/mail/form/mail_alias.tform.php
@@ -29,6 +29,11 @@
Hint:
The ID field of the database table is not part of the datafield definition.
The ID field must be always auto incement (int or bigint).
+
+ Search:
+ - searchable = 1 or searchable = 2 include the field in the search
+ - searchable = 1: this field will be the title of the search result
+ - searchable = 2: this field will be included in the description of the search result
*/
@@ -37,8 +42,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 +56,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 +71,7 @@
'width' => '30',
'maxlength' => '255'
),
- 'email' => array (
+ 'source' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
@@ -75,21 +80,23 @@
'default' => '',
'value' => '',
'width' => '30',
- 'maxlength' => '255'
+ 'maxlength' => '255',
+ 'searchable' => 1
),
'destination' => array (
'datatype' => 'VARCHAR',
'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'
),
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
'errmsg'=> 'destination_error_isemail'),
),
- 'value' => ''
+ 'value' => '',
+ 'searchable' => 2
),
'type' => array (
'datatype' => 'VARCHAR',
@@ -98,10 +105,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