From a52ec4b67dcd4b245bbdaf831988f3b714152525 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 18 Sep 2014 06:23:29 -0400
Subject: [PATCH] set default dkim-path during update / install and corrected mail_domain_dkim_create
---
install/tpl/system.ini.master | 1 +
interface/web/mail/mail_domain_dkim_create.php | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index c563122..f1a1bc9 100644
--- a/install/tpl/system.ini.master
+++ b/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]
diff --git a/interface/web/mail/mail_domain_dkim_create.php b/interface/web/mail/mail_domain_dkim_create.php
index 084f2a5..d0ac3e8 100644
--- a/interface/web/mail/mail_domain_dkim_create.php
+++ b/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;
}
/**
--
Gitblit v1.9.1