Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 c582da1780e3d11b0d12deb42de281b92d76bf6f

Merge branch 'master' into 'master'

Master

See merge request !167

 interface/web/dns/lib/lang/de_dns_dmarc.lng

@@ -3,9 +3,9 @@
$wb['domain_txt'] = 'Domain';
$wb['dmarc_policy_txt'] = 'Mail Empfänger Policy';
$wb['dmarc_policy_note_txt'] = 'Wie der empfangen Server Mails behandeln soll, bei denen SPF oder DKIM (DMARC) fehlschlägt.';
$wb['dmarc_policy_none_txt'] = 'none';
$wb['dmarc_policy_quarantine_txt'] = 'quarantine';
$wb['dmarc_policy_reject_txt'] = 'reject';
$wb['dmarc_policy_none_txt'] = 'nur Reports';
$wb['dmarc_policy_quarantine_txt'] = 'Quarantäne';
$wb['dmarc_policy_reject_txt'] = 'abweisen';
$wb['dmarc_rua_txt'] = "'Aggregate Data Reporting' Adresse";
$wb['dmarc_rua_note_txt'] = 'Email für Berichte ISPs für Mails mit fehlgeschlagenen DMARC-Checks (mehrere mit Leerzeichen trennen).';
$wb['dmarc_ruf_txt'] = "'Forensic Data Reporting' Adresse";
@@ -19,32 +19,32 @@
$wb['dmarc_adkim_note_txt'] = "'strict' erfordert exakte Übereinstimmung zwischen DKIM der Domain und dem From-Header der Email";
$wb['dmarc_adkim_r_txt'] = 'relaxed';
$wb['dmarc_adkim_s_txt'] = 'strict';
$wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
$wb['dmarc_aspf_txt'] = "Abgleichsmodus ('alignment mode') für SPF";
$wb['dmarc_aspf_note_txt'] = "'strict' erfordert exakte Übereinstimmung zwischen dem SPF der Domain und dem From-Header der Email";
$wb['dmarc_aspf_r_txt'] = 'relaxed';
$wb['dmarc_aspf_s_txt'] = 'strict';
$wb['dmarc_rf_txt'] = 'Report Format';
$wb['dmarc_rf_afrf_txt'] = 'Authentication Failure Reporting Format';
$wb['dmarc_rf_iodef_txt'] = 'Incident Object Description Exchange Format';
$wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage';
$wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.';
$wb['dmarc_ri_txt'] = 'Reporting Interval';
$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 repersents 1 day).';
$wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).';
$wb['dmarc_sp_same_txt'] = 'same as domain';
$wb['dmarc_pct_txt'] = '% der Nachrichten, die gefiltert werden';
$wb['dmarc_pct_note_txt'] = '% (100 Standard). Messages in Prozent die der Empfänger testen soll.';
$wb['dmarc_ri_txt'] = 'Report-Interval';
$wb['dmarc_ri_note_txt'] = "Sekunden (default=86400). Wie oft 'Aggregate Reports' erstellt werden sollen (86400 entsprechen 1 Tag).";
$wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults identisch zur Domain).';
$wb['dmarc_sp_same_txt'] = 'wie Domain';
$wb['dmarc_sp_none_txt'] = 'none';
$wb['dmarc_sp_quarantine_txt'] = 'quarantine';
$wb['dmarc_sp_reject_txt'] = 'reject';
$wb['ttl_txt'] = 'TTL';
$wb['active_txt'] = 'Active';
$wb['active_txt'] = 'Aktiv';
$wb['dmarc_policy_error_txt'] = "Nur die Policy 'none' ist ohne DKIM möglich.";
$wb['dmarc_no_dkim_txt'] = 'Kein aktiver DKIM Eintrag.';
$wb['dmarc_no_spf_txt'] = 'Kein aktiver SPF Eintrag.';
$wb['dmarc_more_spf_txt'] = 'Mehr als ein aktiver SPF-Eintrag.';
$wb['dmarc_invalid_email_txt'] = 'ungültige Email-Adresse';
$wb['dmarc_empty_txt'] = 'DMARC Record leer - mindestens eine Option auswählen';
$wb['record_exists_txt'] = 'DNS-Record already exists';
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
$wb['record_exists_txt'] = 'DNS-Eintrag existiert bereits';
$wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für Ihr Konto wurde erreicht.';
$wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
$wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
?>

 interface/web/dns/lib/lang/de_dns_spf.lng

@@ -7,10 +7,10 @@
$wb['spf_mechanism_neutral_txt'] = 'Neutral - nichts unternehmen';
$wb['spf_mx_txt'] = 'Von allen MX-Servern dürfen Mails für diese Domain verschicken';
$wb['spf_a_txt'] = 'Von allen eingetragenen IP-Adressen dürfen Mails für diese Domain verschickt werden';
$wb['spf_ip_txt'] = 'Zusätzliche IP-Adressen im CIDR Format, die Mails für diese Domain verschicken dürfen';
$wb['spf_ip_txt'] = '(Zusätzliche) IP-Adressen im CIDR Format, die Mails für diese Domain verschicken dürfen';
$wb['spf_ip_note_txt'] = '(mehrere IPs mit Leerzeichen trennen)';
$wb['spf_invalid_ip_txt'] = 'Ungültige IP-Adresse';
$wb['spf_hostname_txt'] = 'Zusätzliche Hostnamen, die für diese Domain Mails verschicken dürfen oder als Relay arbeiten.';
$wb['spf_hostname_txt'] = '(Zusätzliche) Hostnamen, die für diese Domain Mails verschicken dürfen oder als Relay arbeiten.';
$wb['spf_hostname_note_txt'] = '(mehrere Hostnamen mit Leerzeichen trennen)';
$wb['spf_invalid_hostname_txt'] = 'Ungültiger Hostname';
$wb['spf_domain_txt'] = 'Zusätzliche Domains, die Mails verschicken dürfen oder als Relay arbeiten';

 interface/web/dns/templates/dns_dmarc_edit.htm

@@ -1,100 +1,163 @@
<h2><tmpl_var name="list_head_txt"></h2>
<div class='page-header'>
    <h1><tmpl_var name="list_head_txt"></h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_dns_txt">
    <div class="pnl_formsarea">
        <fieldset class="inlineLabels">
            <div class="ctrlHolder">
                <label for="domain">{tmpl_var name='domain_txt'}</label>
                <input name="domain" id="domain" value="{tmpl_var name='domain'}" readonly size="30" maxlength="255" type="text" class="textInput" />
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_policy">{tmpl_var name='dmarc_policy_txt'}</label>
                <select name="dmarc_policy" id="dmarc_policy" class="selectInput">
                    {tmpl_var name='dmarc_policy'}
                </select>
                {tmpl_var name='dmarc_policy_note_txt'}
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_rua">{tmpl_var name='dmarc_rua_txt'}</label>
                <input name="dmarc_rua" id="dmarc_rua" value="{tmpl_var name='dmarc_rua'}" size="20" maxlength="63" type="text" class="textInput" />
                {tmpl_var name='dmarc_rua_note_txt'}

        
            <div class="form-group">
                <label for="domain" class="col-sm-2 control-label">{tmpl_var name='domain_txt'}</label>
                <div class="col-sm-3">
                    <input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" readonly class="form-control" />
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_ruf">{tmpl_var name='dmarc_ruf_txt'}</label>
                <input name="dmarc_ruf" id="dmarc_ruf" value="{tmpl_var name='dmarc_ruf'}" size="20" maxlength="63" type="text" class="textInput" />
                {tmpl_var name='dmarc_ruf_note_txt'}
            <div class="form-group">
                <label for="dmarc_policy" class="col-sm-2 control-label">{tmpl_var name='dmarc_policy_txt'}</label>
                <div class="col-sm-3">
                    <select name="dmarc_policy" id="dmarc_policy" class="form-control">{tmpl_var name='dmarc_policy'}</select>
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_policy_note_txt'}
                </div>
            </div>
            <div class="form-group">
                <label for="dmarc_rua" class="col-sm-2 control-label">{tmpl_var name='dmarc_rua_txt'}</label>
                <div class="col-sm-3">
                    <input type="text" name="dmarc_rua" id="dmarc_rua" value="{tmpl_var name='dmarc_rua'}" class="form-control" />
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_rua_note_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='dmarc_fo_txt'}</p>
                <div class="multiField">
                    <input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>{tmpl_var name='dmarc_fo0_txt'}<br>
                    <input type="checkbox" value="1" id="dmarc_fo1" name="dmarc_fo1" {tmpl_var name='dmarc_fo1'}/>{tmpl_var name='dmarc_fo1_txt'}<br>
                    <input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>{tmpl_var name='dmarc_fod_txt'}<br>
                    <input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>{tmpl_var name='dmarc_fos_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_adkim">{tmpl_var name='dmarc_adkim_txt'}</label>
                <select name="dmarc_adkim" id="dmarc_adkim" class="selectInput">
                    {tmpl_var name='dmarc_adkim'}
                </select>
                {tmpl_var name='dmarc_adkim_note_txt'}
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_aspf">{tmpl_var name='dmarc_aspf_txt'}</label>
                <select name="dmarc_aspf" id="dmarc_aspf" class="selectInput">
                    {tmpl_var name='dmarc_aspf'}
                </select>
                {tmpl_var name='dmarc_aspf_note_txt'}
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='dmarc_rf_txt'}</p>
                <div class="multiField">
                     <input type="checkbox" value="1" id=dmarc_rf_afrf" name="dmarc_rf_afrf" {tmpl_var name='dmarc_rf_afrf'}/>{tmpl_var name='dmarc_rf_afrf_txt'}<br>
                    <input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>{tmpl_var name='dmarc_rf_iodef_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_pct">{tmpl_var name='dmarc_pct_txt'}</label>
                <input name="dmarc_pct" id="dmarc_pct" value="{tmpl_var name='dmarc_pct'}" size="20" maxlength="63" type="text" class="textInput" />
                {tmpl_var name='dmarc_pct_note_txt'}
            <div class="form-group">
                <label for="dmarc_ruf" class="col-sm-2 control-label">{tmpl_var name='dmarc_ruf_txt'}</label>
                <div class="col-sm-3">
                    <input type="text" name="dmarc_ruf" id="dmarc_ruf" value="{tmpl_var name='dmarc_ruf'}" class="form-control" />
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_ruf_note_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_ri">{tmpl_var name='dmarc_ri_txt'}</label>
                <input name="dmarc_ri" id="dmarc_ri" value="{tmpl_var name='dmarc_ri'}" size="20" maxlength="63" type="text" class="textInput" />
                {tmpl_var name='dmarc_ri_note_txt'}

            <div class="form-group">
                <label class="col-sm-2 control-label">{tmpl_var name='dmarc_fo_txt'}</label>
                 <div class="col-sm-3">
                    <input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>
                </div>
                <div class="col-sm-3 input-sm">
                    {tmpl_var name='dmarc_fo0_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="dmarc_sp">{tmpl_var name='dmarc_sp_txt'}</label>
                <select name="dmarc_sp" id="dmarc_sp" class="selectInput">
                    {tmpl_var name='dmarc_sp'}
                </select>
            <div class="form-group">
                <label class="col-sm-2 control-label"></label>
                <div class="col-sm-3">
                    <input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
                </div>
                <div class="col-sm-3 input-sm">
                    {tmpl_var name='dmarc_fo1_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
            <div class="form-group">
                <label class="col-sm-2 control-label"></label>
                <div class="col-sm-3">
                    <input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>
                </div>
                <div class="col-sm-3 input-sm">
                    {tmpl_var name='dmarc_fod_txt'}
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label"></label>
                <div class="col-sm-3">
                    <input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>
                </div>
                <div class="col-sm-3 input-sm">
                    {tmpl_var name='dmarc_fos_txt'}
                </div>
            </div>

            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='active_txt'}</p>
                <div class="multiField">
                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} / >
            <div class="form-group">
                <label for="dmarc_adkim" class="col-sm-2 control-label">{tmpl_var name='dmarc_adkim_txt'}</label>
                <div class="col-sm-3">
                    <select name="dmarc_adkim" id="dmarc_adkim" class="form-control">{tmpl_var name='dmarc_adkim'}</select>
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_adkim_note_txt'}
                </div>
            </div>
            <div class="form-group">
                <label for="dmarc_aspf" class="col-sm-2 control-label">{tmpl_var name='dmarc_aspf_txt'}</label>
                <div class="col-sm-3">
                    <select name="dmarc_aspf" id="dmarc_aspf" class="form-control">{tmpl_var name='dmarc_aspf'}</select>
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_aspf_note_txt'}
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_txt'}</label>
                 <div class="col-sm-3">
                    <input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_fo0" {tmpl_var name='dmarc_rf_afrf'}/>
                </div>
                <div class="col-sm-3 input-sm">
                    {tmpl_var name='dmarc_rf_afrf_txt'}
                </div>
            </div>
        </fieldset>
            
            <div class="form-group">
                <label class="col-sm-2 control-label"></label>
                <div class="col-sm-3">
                    <input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>
                </div>
                <div class="col-sm-3 input-sm">
                    {tmpl_var name='dmarc_rf_iodef_txt'}
                </div>
            </div>
            <div class="form-group">
                <label for="dmarc_pct" class="col-sm-2 control-label">{tmpl_var name='dmarc_pct_txt'}</label>
                <div class="col-sm-3">
                    <input type="text" name="dmarc_pct" id="dmarc_pct" value="{tmpl_var name='dmarc_pct'}" class="form-control" />
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_pct_note_txt'}
                </div>
            </div>
            <div class="form-group">
                <label for="dmarc_ri" class="col-sm-2 control-label">{tmpl_var name='dmarc_ri_txt'}</label>
                <div class="col-sm-3">
                    <input type="text" name="dmarc_ri" id="dmarc_ri" value="{tmpl_var name='dmarc_ri'}" class="form-control" />
                </div>
                <div class="col-sm-7 input-sm">
                    {tmpl_var name='dmarc_ri_note_txt'}
                </div>
            </div>
            <div class="form-group">
                <label for="dmarc_sp" class="col-sm-2 control-label">{tmpl_var name='dmarc_sp_txt'}</label>
                <div class="col-sm-3">
                    <select name="dmarc_sp" id="dmarc_sp" class="form-control">{tmpl_var name='dmarc_sp'}</select>
                </div>
            </div>
            <div class="form-group">
                <label for="ttl" class="col-sm-2 control-label">{tmpl_var name='ttl_txt'}</label>
                <div class="col-sm-3">
                    <input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
                </div>
            </div>

            <div class="form-group">
                <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-3">
                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/>
                </div>
            </div>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <input type="hidden" name="zone" value="{tmpl_var name='zone'}" id="zone">
        <input type="hidden" name="type" value="{tmpl_var name='type'}">
        <input type="hidden" name="name" value="{tmpl_var name='name'}">
            </div>
            
        <div class="buttonHolder buttons">
            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php"><span>{tmpl_var name='btn_save_txt'}</span></button>
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div>
    </div>
  
</div>
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>


 interface/web/dns/templates/dns_spf_edit.htm

@@ -16,11 +16,11 @@
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='spf_mx_txt'}</label>
                <div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="spf_mx" name="spf_mx" {tmpl_var name = 'spf_mx_active'} /></div>
                <div class="col-sm-9"><input type="checkbox" value="1" id="spf_mx" name="spf_mx" {tmpl_var name = 'spf_mx_active'} /></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='spf_a_txt'}</label>
                <div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="spf_a" name="spf_a" {tmpl_var name = 'spf_a_active'} /></div>
                <div class="col-sm-9"><input type="checkbox" value="1" id="spf_a" name="spf_a" {tmpl_var name = 'spf_a_active'} /></div>
            </div>
            <div class="form-group">
                <label for="spf_ip" class="col-sm-3 control-label">{tmpl_var name='spf_ip_txt'}</label>
@@ -40,11 +40,13 @@
            <div class="form-group">
                <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
                <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" /></div></div>

            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} /></div>
                 <div class="col-sm-9">
                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/>
                </div>
            </div>

        
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">

 interface/web/mail/templates/mail_domain_edit.htm

@@ -100,8 +100,8 @@
              <div class="form-group">
                <label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
                <div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
<a href="javascript:setRequest('create')">{tmpl_var name='dkim_generate_txt'}</a>
              </div>
                <a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
        <div class="form-group">
                <div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
              </div>