tbrehm
2012-06-07 3560ade37614f43b6549d72e8619405acc4a3267
Implemented: FS#1875 - Change select field for recipient in email catchall to input field
4 files modified
14 ■■■■■ changed files
interface/web/mail/form/mail_domain_catchall.tform.php 4 ●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_domain_catchall.lng 3 ●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_domain_catchall.lng 3 ●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_domain_catchall_edit.htm 4 ●●● patch | view | raw | blame | history
interface/web/mail/form/mail_domain_catchall.tform.php
@@ -90,13 +90,15 @@
        ),
        'destination' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'SELECT',
            'formtype'    => 'TEXT',
            'default'    => '',
            /*
            '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'),
                                    ),
interface/web/mail/lib/lang/de_mail_domain_catchall.lng
@@ -1,10 +1,11 @@
<?php
$wb['domain_txt'] = 'Domain';
$wb['destination_txt'] = 'Ziel';
$wb['destination_txt'] = 'Ziel Email';
$wb['active_txt'] = 'Aktiv';
$wb['domain_error_unique'] = 'Es besteht bereits ein Catchall-Eintrag für diese Domain.';
$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
$wb['domain_error_regex'] = 'Ungültiger Domainname oder ungültige Zeichen im Domainnamen.';
$wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall-Einträgen für ihr Konto wurde erreicht.';
$wb["source_txt"] = 'Quelle';
$wb['destination_error_isemail'] = 'Das Ziel ist keine gültige Emailadresse.';
?>
interface/web/mail/lib/lang/en_mail_domain_catchall.lng
@@ -1,6 +1,6 @@
<?php
$wb["domain_txt"] = 'Domain';
$wb["destination_txt"] = 'Destination';
$wb["destination_txt"] = 'Destination Email';
$wb["active_txt"] = 'Active';
$wb["domain_error_unique"] = "There is already a Catchall record for this domain.";
$wb["no_domain_perm"] = "You have no permission for this domain.";
@@ -8,4 +8,5 @@
$wb["limit_mailcatchall_txt"] = 'The max. number of email catchall accounts for your account is reached.';
$wb['domain_txt'] = 'Domain';
$wb["source_txt"] = 'Source';
$wb['destination_error_isemail'] = 'Destination is no valid email address.';
?>
interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -14,9 +14,7 @@
      </div>
      <div class="ctrlHolder">
          <label for="destination">{tmpl_var name='destination_txt'}</label>
        <select name="destination" id="destination" class="selectInput">
                    {tmpl_var name='destination'}
                </select>
        <input name="destination" id="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
      </div>
      <div class="ctrlHolder">
                <p class="label">{tmpl_var name='active_txt'}</p>