From b0191fc04e7ea04d08a42e67c184c9be704ec12a Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 21 Sep 2012 07:08:47 -0400
Subject: [PATCH] Bugfix: Attachments were not cleaned up on finish() call of mail class (next recipient gets all attachments, too) Update: some import tests for plesk
---
interface/web/mail/form/mail_user.tform.php | 62 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 5214b62..0dd7c8f 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -29,9 +29,15 @@
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
*/
+global $app;
$form["title"] = "Mailbox";
$form["description"] = "";
@@ -77,8 +83,24 @@
'default' => '',
'value' => '',
'width' => '30',
- 'maxlength' => '255'
+ 'maxlength' => '255',
+ 'searchable' => 1
),
+ 'login' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'validators' => array (
+ 0 => array ( 'type' => 'UNIQUE',
+ 'errmsg'=> 'login_error_unique'),
+ 1 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[a-z0-9][\w\.\-_\+@]{1,63}$/',
+ 'errmsg'=> 'login_error_regex'),
+ ),
+ 'default' => '',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
'password' => array (
'datatype' => 'VARCHAR',
'formtype' => 'PASSWORD',
@@ -94,7 +116,8 @@
'default' => '',
'value' => '',
'width' => '30',
- 'maxlength' => '255'
+ 'maxlength' => '255',
+ 'searchable' => 2
),
'quota' => array (
'datatype' => 'INTEGER',
@@ -106,6 +129,18 @@
'errmsg'=> 'quota_error_value'),
),
'default' => '-1',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
+ 'cc' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
+ 'errmsg'=> 'cc_error_isemail'),
+ ),
+ 'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
@@ -169,7 +204,7 @@
'value' => array(1 => 'y',0 => 'n')
),
##################################
- # ENDE Datatable fields
+ # END Datatable fields
##################################
)
);
@@ -182,6 +217,14 @@
##################################
# Begin Datatable fields
##################################
+ 'autoresponder_subject' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => 'Out of office reply',
+ 'value' => '',
+ 'width' => '30',
+ 'maxlength' => '255'
+ ),
'autoresponder_text' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXTAREA',
@@ -199,11 +242,6 @@
'autoresponder_start_date' => array (
'datatype' => 'DATETIME',
'formtype' => 'DATETIME',
- 'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
- 'class' => 'validate_autoresponder',
- 'function' => 'start_date',
- 'errmsg'=> 'autoresponder_start_date_isfuture'),
- ),
),
'autoresponder_end_date' => array (
'datatype' => 'DATETIME',
@@ -215,7 +253,7 @@
),
),
##################################
- # ENDE Datatable fields
+ # END Datatable fields
##################################
)
);
@@ -235,7 +273,7 @@
'value' => array(0 => 'n',1 => 'y')
),
##################################
- # ENDE Datatable fields
+ # END Datatable fields
##################################
),
'plugins' => array (
@@ -243,7 +281,7 @@
'class' => 'plugin_listview',
'options' => array(
'listdef' => 'list/mail_user_filter.list.php',
- 'sqlextwhere' => "mailuser_id = ".@intval(@$_REQUEST['id']),
+ 'sqlextwhere' => "mailuser_id = ".@$app->functions->intval(@$_REQUEST['id']),
'sql_order_by' => "ORDER BY rulename"
)
)
@@ -269,7 +307,7 @@
'rows' => '15'
),
##################################
- # ENDE Datatable fields
+ # END Datatable fields
##################################
)
);
--
Gitblit v1.9.1