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

Florian Schaal · Florian Schaal · commit a52ec4b67dcd · 2014-09-18T12:23:29.000+02:00
diff --git 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
@@ -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;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@`
`48`	`48`
`49`	`49`	`function validate_domain($domain) {`
`50`	`50`	`$regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';`
`51`		`- return preg_match($regex, $domain);`
	`51`	`+ if ( preg_match($regex, $domain) === 1 ) return true; else return false;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`function validate_selector($selector) {`
`55`	`55`	`$regex = '/^[a-z0-9]{0,63}$/';`
`56`		`- return preg_match($regex, $selector);`
	`56`	`+ if ( preg_match($regex, $selector) === 1 ) return true; else return false;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`