Merge remote-tracking branch 'origin/0.9.31'

2013-12-10 07:23:42 +01:00
parent 7bf4cc73b6 3e54fd765c
commit 7bf0299d33
11 changed files with 41 additions and 15 deletions
--- a/scripts/jobs/cron_tasks.inc.dns.10.bind.php
+++ b/scripts/jobs/cron_tasks.inc.dns.10.bind.php
@@ -257,6 +257,9 @@ class bind
 				/*&& $domain['spf'] == '1' */
 		) {
 			$zonefile.= $this->settings['spf']['spf_entry'] . "\n";
+			if (in_array('mail', $records)) {
+				$zonefile.= str_replace('@', 'mail', $this->settings['spf']['spf_entry']) . "\n";
+			}
 		}

 		/**