set default dkim-path during update / install and corrected mail_domain_dki...

Florian Schaal

2014-09-18 a52ec4b67dcd4b245bbdaf831988f3b714152525

set default dkim-path during update / install and corrected mail_domain_dkim_create

 install/tpl/system.ini.master

@@ -10,6 +10,7 @@
enable_custom_login=n
mailboxlist_webmail_link=y
webmail_url=/webmail
dkim_path=/var/lib/amavis/dkim

[monitor]


 interface/web/mail/mail_domain_dkim_create.php

@@ -48,12 +48,12 @@

function validate_domain($domain) {
    $regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
    return preg_match($regex, $domain);
    if ( preg_match($regex, $domain) === 1 ) return true; else return false;
}

function validate_selector($selector) {
    $regex = '/^[a-z0-9]{0,63}$/';
    return preg_match($regex, $selector);
    if ( preg_match($regex, $selector) === 1 ) return true; else return false;
}

/**