Merge origin/master

allebb · Dec 2, 2013 · c777cf4 · c777cf4
2 parents 755a3d8 + f7396ea
commit c777cf4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/dns_manager/code/controller.ext.php b/modules/dns_manager/code/controller.ext.php
@@ -1517,7 +1517,7 @@ static function CheckZoneRecord($domainID)
                         $checkline .= $rowdns['dn_host_vc'] . "     " . $rowdns['dn_ttl_in'] . "        IN      SRV     " . $rowdns['dn_priority_in'] . "   " . $rowdns['dn_weight_in'] . " " . $rowdns['dn_port_in'] . "   " . $rowdns['dn_target_vc'] . "." . fs_filehandler::NewLine();
                     }
                     if ($rowdns['dn_type_vc'] == "SPF") {
-                        $checkline .= $rowdns['dn_host_vc'] . "     " . $rowdns['dn_ttl_in'] . "        IN      SPF     \"" . stripslashes($rowdns['dn_target_vc']) . "\"" . fs_filehandler::NewLine();
+                        $checkline .= $rowdns['dn_host_vc'] . "     " . $rowdns['dn_ttl_in'] . "        IN      TXT     \"" . stripslashes($rowdns['dn_target_vc']) . "\"" . fs_filehandler::NewLine();
                     }
                     if ($rowdns['dn_type_vc'] == "NS") {
                         $checkline .= $rowdns['dn_host_vc'] . "     " . $rowdns['dn_ttl_in'] . "        IN      NS      " . $rowdns['dn_target_vc'] . "." . fs_filehandler::NewLine();
@@ -1557,4 +1557,4 @@ static function CheckZoneRecord($domainID)
 
 }
 
-?>
+?>
diff --git a/modules/dns_manager/hooks/OnDaemonRun.hook.php b/modules/dns_manager/hooks/OnDaemonRun.hook.php
@@ -95,7 +95,7 @@ function WriteDNSZoneRecordsHook()
                     $line .= $rowdns['dn_host_vc'] . "    " . $rowdns['dn_ttl_in'] . "    IN    SRV    " . $rowdns['dn_priority_in'] . "  " . $rowdns['dn_weight_in'] . "  " . $rowdns['dn_port_in'] . "  " . $rowdns['dn_target_vc'] . "." . fs_filehandler::NewLine();
                     break;
                 case "SPF" :
-                    $line .= $rowdns['dn_host_vc'] . "    " . $rowdns['dn_ttl_in'] . "    IN    SPF    \"" . stripslashes($rowdns['dn_target_vc']) . "\"" . fs_filehandler::NewLine();
+                    $line .= $rowdns['dn_host_vc'] . "    " . $rowdns['dn_ttl_in'] . "    IN    TXT    \"" . stripslashes($rowdns['dn_target_vc']) . "\"" . fs_filehandler::NewLine();
                     break;
                 case "NS" :
                     $line .= $rowdns['dn_host_vc'] . "    " . $rowdns['dn_ttl_in'] . "    IN    NS    " . $rowdns['dn_target_vc'] . "." . fs_filehandler::NewLine();
@@ -198,4 +198,4 @@ function ReloadBindHook()
     echo "Reloading BIND now..." . fs_filehandler::NewLine();
     pclose(popen($reload_bind, 'r'));
 }
-?>
+?>