Skip to content

Commit 3560ade

Browse files
committed
Implemented: FS#1875 - Change select field for recipient in email catchall to input field
1 parent 03e1700 commit 3560ade

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

interface/web/mail/form/mail_domain_catchall.tform.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,15 @@
9090
),
9191
'destination' => array (
9292
'datatype' => 'VARCHAR',
93-
'formtype' => 'SELECT',
93+
'formtype' => 'TEXT',
9494
'default' => '',
95+
/*
9596
'datasource' => array ( 'type' => 'SQL',
9697
'querystring' => 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
9798
'keyfield' => 'email',
9899
'valuefield' => 'email'
99100
),
101+
*/
100102
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
101103
'errmsg'=> 'destination_error_isemail'),
102104
),
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22
$wb['domain_txt'] = 'Domain';
3-
$wb['destination_txt'] = 'Ziel';
3+
$wb['destination_txt'] = 'Ziel Email';
44
$wb['active_txt'] = 'Aktiv';
55
$wb['domain_error_unique'] = 'Es besteht bereits ein Catchall-Eintrag für diese Domain.';
66
$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
77
$wb['domain_error_regex'] = 'Ungültiger Domainname oder ungültige Zeichen im Domainnamen.';
88
$wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall-Einträgen für ihr Konto wurde erreicht.';
99
$wb["source_txt"] = 'Quelle';
10+
$wb['destination_error_isemail'] = 'Das Ziel ist keine gültige Emailadresse.';
1011
?>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?php
22
$wb["domain_txt"] = 'Domain';
3-
$wb["destination_txt"] = 'Destination';
3+
$wb["destination_txt"] = 'Destination Email';
44
$wb["active_txt"] = 'Active';
55
$wb["domain_error_unique"] = "There is already a Catchall record for this domain.";
66
$wb["no_domain_perm"] = "You have no permission for this domain.";
77
$wb["domain_error_regex"] = 'Invalid domain name od domain contains invalid characters.';
88
$wb["limit_mailcatchall_txt"] = 'The max. number of email catchall accounts for your account is reached.';
99
$wb['domain_txt'] = 'Domain';
1010
$wb["source_txt"] = 'Source';
11+
$wb['destination_error_isemail'] = 'Destination is no valid email address.';
1112
?>

interface/web/mail/templates/mail_domain_catchall_edit.htm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1414
</div>
1515
<div class="ctrlHolder">
1616
<label for="destination">{tmpl_var name='destination_txt'}</label>
17-
<select name="destination" id="destination" class="selectInput">
18-
{tmpl_var name='destination'}
19-
</select>
17+
<input name="destination" id="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
2018
</div>
2119
<div class="ctrlHolder">
2220
<p class="label">{tmpl_var name='active_txt'}</p>

0 commit comments

Comments
 (0)