Marius Cramer
2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9
Merge remote-tracking branch 'florian030/master'

Conflicts:
install/sql/incremental/upd_0073.sql
install/sql/ispconfig3.sql
47 files modified
161 ■■■■ changed files
interface/web/dns/dns_dkim_edit.php 8 ●●●●● patch | view | raw | blame | history
interface/web/dns/dns_dkim_get.php 21 ●●●● patch | view | raw | blame | history
interface/web/dns/dns_wizard.php 8 ●●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/ar_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/bg_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/br_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/cz_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/fi_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/hu_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/id_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/ja_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/nl_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/ru_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/se_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/sk_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/lib/lang/tr_dns_dkim.lng 1 ●●●● patch | view | raw | blame | history
interface/web/dns/templates/dns_dkim_edit.htm 6 ●●●● patch | view | raw | blame | history
interface/web/js/dns_dkim.js 1 ●●●● patch | view | raw | blame | history
interface/web/mail/form/mail_domain.tform.php 12 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/ar_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/bg_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/br_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/cz_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_domain.lng 4 ●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/fi_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_domain.lng 4 ●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/hr_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/hu_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/id_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/nl_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/pl_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/pt_mail_domain.lng 8 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/ro_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/se_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/sk_mail_domain.lng 3 ●●●●● patch | view | raw | blame | history
interface/web/mail/lib/lang/tr_mail_domain.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 4 ●●●● patch | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 31 ●●●●● patch | view | raw | blame | history
interface/web/dns/dns_dkim_edit.php
@@ -97,9 +97,10 @@
        $this->dataRecord["server_id"] = $soa["server_id"];
        // add dkim-settings to the public-key in the txt-record
        if (!empty($this->dataRecord['data'])) $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
        $this->dataRecord['name']='default._domainkey.'.$this->dataRecord['name'];
        if (!empty($this->dataRecord['data'])) {
            $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
            $this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
        }
        // Update the serial number  and timestamp of the RR record
        $soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);
        $this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
@@ -109,6 +110,7 @@
        $check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data = ? AND name = ?", $this->dataRecord['zone'], $this->dataRecord['type'], $this->dataRecord['data'], $this->dataRecord['name']);
        if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
        if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];
        parent::onSubmit();
    }
interface/web/dns/dns_dkim_get.php
@@ -67,33 +67,20 @@
    return $vars;
}
/**
* This function formats the public-key
* @param array $pubkey
* @return string public-key
*/
function pub_key($pubkey) {
        $public_key='';
        foreach($pubkey as $values) $public_key=$public_key.$values;
        return $public_key;
}
$_POST=getRealPost();
if (ctype_digit($_POST['zone'])) {
    // Get the parent soa record of the domain
    $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ".$app->tform->getAuthSQL('r'), $_POST['zone']);
    $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? and ?'", $app->db->quote($_POST['zone']), $app->tform->getAuthSQL('r'));
    $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'Y' AND ".$app->tform->getAuthSQL('r'), substr_replace($soa['origin'],'',-1));
    $public_key=pub_key($public_key);
    $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$public_key);
    $sql=$app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'Y' AND ?", substr_replace($soa['origin'],'',-1), $app->tform->getAuthSQL('r'));
    $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$sql['dkim_public']);
    echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
    echo "<formatname>\n";
    echo "<data>".$public_key."</data>\n";
    echo "<name>".$soa['origin']."</name>\n";
    echo "<selector>".$sql['dkim_selector']."</selector>\n";
    echo "</formatname>\n";
}
?>
interface/web/dns/dns_wizard.php
@@ -245,10 +245,12 @@
    if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}', $_POST['ns2'], $tpl_content);
    if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}', $_POST['email'], $tpl_content);
    if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/', $_POST['domain'])) {
        $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
        $sql = $app->db->queryOneRecord("SELECT dkim_public, dkim_selecotr FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
        $public_key = $sql['dkim_public'];
        if ($public_key!='') {
            $dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key['dkim_public']);
            $tpl_content .= "\n".'TXT|default._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
            if (empty($sql['dkim_selector'])) $sql['dkim_selector'] = 'default';
            $dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key);
            $tpl_content .= "\n".'TXT|'.$sql['dkim_selector'].'._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
        }
    }
interface/web/dns/lib/lang/ar_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/bg_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/br_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/cz_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/de_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb["limit_dns_record_txt"] = 'Die max. Anzahl von DNS Eintraegen fuer den Account ist erreicht.';
$wb["no_zone_perm"] = 'Fehlende Berechtigung zum Hinzufuegen eines Eintrags zur DNS-Zone.';
$wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
$wb['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/en_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/es_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/fi_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/fr_dns_dkim.lng
@@ -6,4 +6,5 @@
$wb["limit_dns_record_txt"] = 'Le nombre max. d\'enregistrement DNS pour votre compte à été atteint.';
$wb["no_zone_perm"] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement à cette Zone DNS.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
$wb['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/hr_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/hu_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/id_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/it_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/ja_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/nl_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/ru_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/se_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/sk_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/lib/lang/tr_dns_dkim.lng
@@ -7,4 +7,5 @@
$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['selector_txt'] = 'DKIM-Selector';
?>
interface/web/dns/templates/dns_dkim_edit.htm
@@ -6,8 +6,12 @@
        <fieldset class="inlineLabels">
              <div class="ctrlHolder">
                <label for="data">{tmpl_var name='public_key_txt'}</label>
                <textarea name="data" id="data" readonly>{tmpl_var name='public_key'}</textarea>
                <textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
              </div>
              <div class="ctrlHolder">
                <label for="selector">{tmpl_var name='selector_txt'}</label>
                <input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" class="textInput" />
              </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" />
interface/web/js/dns_dkim.js
@@ -60,6 +60,7 @@
                                else {
                                        document.getElementsByName('data')[0].value = request.responseXML.getElementsByTagName('data')[0].firstChild.nodeValue;
                                        document.getElementsByName('name')[0].value = request.responseXML.getElementsByTagName('name')[0].firstChild.nodeValue;
                                        document.getElementsByName('selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
                                }
                                break;
                        default:
interface/web/mail/form/mail_domain.tform.php
@@ -125,6 +125,18 @@
            'cols'          => '30',
            'rows'          => '10'
        ),
        'dkim_selector' => array (
            'datatype'      => 'VARCHAR',
            'formtype'      => 'TEXT',
            'default'       => 'default',
            'value'         => 'default',
            'width'  => '20',
            'maxlength' => '63',
            'validators' => array (  0 => array (   'type' => 'REGEX',
                    'regex' => '/^[a-z0-9]{0,63}$/',
                    'errmsg'=> 'dkim_selector_error'),
            ),
        ),
        'active' => array (
            'datatype' => 'VARCHAR',
            'formtype' => 'CHECKBOX',
interface/web/mail/lib/lang/ar_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/bg_mail_domain.lng
@@ -13,6 +13,8 @@
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['policy_txt'] = 'Спамфилтър';
$wb['no_policy'] = '- не е разрешен -';
interface/web/mail/lib/lang/br_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -14,6 +14,8 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';
?>
interface/web/mail/lib/lang/de_mail_domain.lng
@@ -16,4 +16,6 @@
$wb['limit_maildomain_txt'] = 'Die maximale Anzahl an E-Mail Domains für Ihr Konto wurde erreicht.';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nicht aktiviert -';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector.  Verwenden Sie nur alphanumerische Zeichen (a-z oder 0-9)';
?>
interface/web/mail/lib/lang/en_mail_domain.lng
@@ -18,4 +18,6 @@
$wb["policy_txt"] = 'Spamfilter';
$wb["no_policy"] = '- not enabled -';
$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
?>
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/es_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/fr_mail_domain.lng
@@ -18,4 +18,6 @@
$wb['policy_txt'] = 'Filtre antispam';
$wb['no_policy'] = '- inactif -';
$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
?>
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/id_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/it_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/pt_mail_domain.lng
@@ -10,4 +10,12 @@
$wb['limit_maildomain_txt'] = 'O número máximo de contas de correio eletrônico para este domínio foi atingido.';
$wb['policy_txt'] = 'Filtro Anti-Spam';
$wb['no_policy'] = '- desactivado -';
$wb["dkim_txt"] = 'enable DKIM';
$wb["dkim_private_txt"] = 'DKIM Private-key';
$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/ro_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/se_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/lib/lang/sk_mail_domain.lng
@@ -14,6 +14,9 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- Nie je aktivovaný -';
?>
interface/web/mail/lib/lang/tr_mail_domain.lng
@@ -16,4 +16,6 @@
$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
$wb["dkim_dns_txt"] = 'DNS-Record (TYPE TXT)<br><br>add this record to your DNS';
$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
$wb['dkim_selector_txt'] = 'DKIM-Selector';
$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9)';
?>
interface/web/mail/templates/mail_domain_edit.htm
@@ -87,6 +87,10 @@
                </div>
              </div>
              <div class="ctrlHolder">
                <label for="dkim_selector">{tmpl_var name='dkim_selector_txt'}</label>
                <input name="dkim_selector" id="dkim_selector" value="{tmpl_var name='dkim_selector'}" size="20" maxlength="63" type="text" class="textInput" />
              </div>
              <div class="ctrlHolder">
                <label for="dkim_private">{tmpl_var name='dkim_private_txt'}</label>
                <textarea name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea>
<a href="javascript:setRequest('create','{tmpl_var name='domain'}')">{tmpl_var name='dkim_generate_txt'}</a>
server/plugins-available/mail_plugin_dkim.inc.php
@@ -205,19 +205,21 @@
     * This function adds the entry to the amavisd-config
     * @param string $key_domain mail-domain
     */
    function add_to_amavis($key_domain) {
    function add_to_amavis($key_domain, $selector, $old_selector) {
        global $app, $mail_config;
        if (empty($selector)) $selector = 'default';
        $restart = false;
        $selector = 'default';
        $amavis_configfile = $this->get_amavis_config();
        $search_regex = "/(\n|\r)?dkim_key\(\'".$key_domain."\',\ \'(".$selector."|".$old_selector."){1}?\'.*/";
        //* If we are using seperate config-files with amavis remove existing keys from 50-user to avoid duplicate keys
        if (substr_compare($amavis_configfile, '60-dkim', -7) === 0) {
            $temp_configfile = str_replace('60-dkim', '50-user', $amavis_configfile);
            $temp_config = file_get_contents($temp_configfile);
            if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $temp_config)) {
                $temp_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/", '', $temp_config)."\n";
            if (preg_match($search_regex, $temp_config)) {
                $temp_config = preg_replace($search_regex, '', $temp_config)."\n";
                file_put_contents($temp_configfile, $temp_config);
            }
            unset($temp_configfile);
@@ -226,7 +228,7 @@
        $key_value="dkim_key('".$key_domain."', '".$selector."', '".$mail_config['dkim_path']."/".$key_domain.".private');\n";
        $amavis_config = file_get_contents($amavis_configfile);
        $amavis_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*/", '', $amavis_config).$key_value;
        $amavis_config = preg_replace($search_regex, '', $amavis_config).$key_value;
        if (file_put_contents($amavis_configfile, $amavis_config)) {
            $app->log('Adding DKIM Private-key to amavis-config.', LOGLEVEL_DEBUG);
@@ -249,8 +251,10 @@
        $amavis_configfile = $this->get_amavis_config();
        $amavis_config = file_get_contents($amavis_configfile);
        if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $amavis_config)) {
            $amavis_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/", '', $amavis_config);
        $search_regex = "/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/";
        if (preg_match($search_regex, $amavis_config)) {
            $amavis_config = preg_replace($search_regex, '', $amavis_config);
            file_put_contents($amavis_configfile, $amavis_config);
            $app->log('Deleted the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_DEBUG);
            $restart = true;
@@ -260,8 +264,8 @@
        if (substr_compare($amavis_configfile, '60-dkim', -7) === 0) {
            $temp_configfile = str_replace('60-dkim', '50-user', $amavis_configfile);
            $temp_config = file_get_contents($temp_configfile);
            if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $temp_config)) {
                $temp_config = preg_replace("/dkim_key.*".$key_domain.".*/", '', $temp_config);
            if (preg_match($search_regex, $temp_config)) {
                $temp_config = preg_replace($search_regex, '', $temp_config);
                file_put_contents($temp_configfile, $temp_config);
                $restart = true;
            }
@@ -283,7 +287,7 @@
            if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' )
                $mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
            if ($this->write_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['dkim_private'], $data['new']['domain'])) {
                if ($this->add_to_amavis($data['new']['domain'])) {
                if ($this->add_to_amavis($data['new']['domain'], $data['new']['dkim_selector'], $data['old']['dkim_selector'] )) {
                    $this->restart_amavis();
                } else {
                    $this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
@@ -291,9 +295,6 @@
            } else {
                $app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_ERROR);
            }
        }
        else {
            $app->log('DKIM for '.$data['new']['domain'].' not written to disk - domain is inactive', LOGLEVEL_DEBUG);
        }
    }
@@ -360,6 +361,10 @@
                if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
                    $this->add_dkim($data);
                }
                /* new selector */
                if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
                    $this->add_dkim($data);
                }
                /* new domain-name */
                if ($data['new']['domain'] != $data['old']['domain']) {
                    $this->remove_dkim($data['old']);