msb/vpanel-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suppress errors for all dns_get_record calls

Browse Source
This commit is contained in:
Matthew Saunders Brown 2024-04-09 10:22:58 -07:00
parent 31c87e65af
commit 5c29b0b1e4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panel/classes/Panel/Cert/CertsAdd.php
View File

@ -22,7 +22,7 @@ class CertsAdd extends \Panel\Cert {
if ($f3->exists('PARAMS.cert')) { if ($f3->exists('PARAMS.cert')) {
$domain = $f3->get('PARAMS.cert'); $domain = $f3->get('PARAMS.cert');
if ($f3->call('\Panel::validateDomain', $domain)) { if ($f3->call('\Panel::validateDomain', $domain)) {
if ($certdomain_dns = dns_get_record("$domain", DNS_A)) { if ($certdomain_dns = @dns_get_record("$domain", DNS_A)) {
if ($certdomain_dns[0]['ip'] == $_SERVER['SERVER_ADDR']) { if ($certdomain_dns[0]['ip'] == $_SERVER['SERVER_ADDR']) {
if (is_dir('/var/tmp/letsencrypt/')) { if (is_dir('/var/tmp/letsencrypt/')) {
if (is_writable('/var/tmp/letsencrypt/')) { if (is_writable('/var/tmp/letsencrypt/')) {

2
panel/classes/Panel/Vhost/Vhosts.php
View File

@ -43,7 +43,7 @@ class Vhosts extends \Panel\Vhost {
$dnsinfo['server_addr'] = $_SERVER['SERVER_ADDR']; $dnsinfo['server_addr'] = $_SERVER['SERVER_ADDR'];
# A record # A record
$dnsinfo['a']['color'] = "red"; $dnsinfo['a']['color'] = "red";
if ($certdomain_dns = dns_get_record("$vhost", DNS_A)) { if ($certdomain_dns = @dns_get_record("$vhost", DNS_A)) {
if ($certdomain_dns[0]['ip'] == $dnsinfo['server_addr']) { if ($certdomain_dns[0]['ip'] == $dnsinfo['server_addr']) {
$dnsinfo['a']['status'] = "Verified"; $dnsinfo['a']['status'] = "Verified";
$dnsinfo['a']['color'] = "black"; $dnsinfo['a']['color'] = "black";

2
panel/classes/Panel/Vmail/Dkim.php
View File

@ -23,7 +23,7 @@ class Dkim extends \Panel\Vmail {
if ($dkim_array = $f3->call('\Panel::vGet', array("vmail-dkim-get.sh -d $domain -c", FALSE))) { if ($dkim_array = $f3->call('\Panel::vGet', array("vmail-dkim-get.sh -d $domain -c", FALSE))) {
$dkim_array = $dkim_array[0]; $dkim_array = $dkim_array[0];
$dkim_array['dns']['host'] = $dkim_array['selector'] . "._domainkey.$domain"; $dkim_array['dns']['host'] = $dkim_array['selector'] . "._domainkey.$domain";
if ($dns_txt_records = dns_get_record($dkim_array['dns']['host'], DNS_TXT)) { if ($dns_txt_records = @dns_get_record($dkim_array['dns']['host'], DNS_TXT)) {
$dkim_array['dns']['status'] = "Verified"; $dkim_array['dns']['status'] = "Verified";
} else { } else {
$dkim_array['dns']['status'] = "Update"; $dkim_array['dns']['status'] = "Update";

10
panel/classes/Panel/Vmail/Domains.php
View File

@ -44,7 +44,7 @@ class Domains extends \Panel\Vmail {
$dnsinfo['server_addr'] = $_SERVER['SERVER_ADDR']; $dnsinfo['server_addr'] = $_SERVER['SERVER_ADDR'];
# A record # A record
$dnsinfo['a']['color'] = "red"; $dnsinfo['a']['color'] = "red";
if ($certdomain_dns = dns_get_record("$mxdomain", DNS_A)) { if ($certdomain_dns = @dns_get_record("$mxdomain", DNS_A)) {
if ($certdomain_dns[0]['ip'] == $dnsinfo['server_addr']) { if ($certdomain_dns[0]['ip'] == $dnsinfo['server_addr']) {
$dnsinfo['a']['status'] = "Verified"; $dnsinfo['a']['status'] = "Verified";
$dnsinfo['a']['color'] = "black"; $dnsinfo['a']['color'] = "black";
@ -71,7 +71,7 @@ class Domains extends \Panel\Vmail {
# SPF (TXT) record # SPF (TXT) record
$dnsinfo['spf']['status'] = "Create"; $dnsinfo['spf']['status'] = "Create";
$dnsinfo['spf']['color'] = "red"; $dnsinfo['spf']['color'] = "red";
if ($dns_txt_records = dns_get_record("$domain", DNS_TXT)) { if ($dns_txt_records = @dns_get_record("$domain", DNS_TXT)) {
foreach ($dns_txt_records as $k=>$dns_txt_record) { foreach ($dns_txt_records as $k=>$dns_txt_record) {
if (str_starts_with($dns_txt_record['txt'], 'v=spf1')) { if (str_starts_with($dns_txt_record['txt'], 'v=spf1')) {
$dnsinfo['spf']['status'] = "Update"; $dnsinfo['spf']['status'] = "Update";
@ -88,7 +88,7 @@ class Domains extends \Panel\Vmail {
if ($f3->call('\Panel::verifyDkimExists', $domain)) { if ($f3->call('\Panel::verifyDkimExists', $domain)) {
if ($dkim_array = $f3->call('\Panel::vGet', array("vmail-dkim-get.sh -d $domain -c", FALSE))) { if ($dkim_array = $f3->call('\Panel::vGet', array("vmail-dkim-get.sh -d $domain -c", FALSE))) {
$dkim_hostname = $dkim_array[0]['selector'] . "._domainkey.$domain"; $dkim_hostname = $dkim_array[0]['selector'] . "._domainkey.$domain";
if ($dns_txt_records = dns_get_record($dkim_hostname, DNS_TXT)) { if ($dns_txt_records = @dns_get_record($dkim_hostname, DNS_TXT)) {
$dnsinfo['dkim']['status'] = "Verified"; $dnsinfo['dkim']['status'] = "Verified";
$dnsinfo['dkim']['color'] = "black"; $dnsinfo['dkim']['color'] = "black";
$dnsinfo['verified_count']++; $dnsinfo['verified_count']++;
@ -107,7 +107,7 @@ class Domains extends \Panel\Vmail {
# DMARC (TXT) record # DMARC (TXT) record
$dnsinfo['dmarc']['status'] = "Create"; $dnsinfo['dmarc']['status'] = "Create";
$dnsinfo['dmarc']['color'] = "red"; $dnsinfo['dmarc']['color'] = "red";
if ($dns_txt_records = dns_get_record("_dmarc.$domain", DNS_TXT)) { if ($dns_txt_records = @dns_get_record("_dmarc.$domain", DNS_TXT)) {
foreach ($dns_txt_records as $k=>$dns_txt_record) { foreach ($dns_txt_records as $k=>$dns_txt_record) {
if (str_starts_with($dns_txt_record['txt'], 'v=DMARC1')) { if (str_starts_with($dns_txt_record['txt'], 'v=DMARC1')) {
$dnsinfo['dmarc']['status'] = "Verified"; $dnsinfo['dmarc']['status'] = "Verified";
@ -148,7 +148,7 @@ class Domains extends \Panel\Vmail {
// dns_dkim // dns_dkim
// # domain does not have cert yet, check DNS // # domain does not have cert yet, check DNS
// $dns_a_record = $_SERVER['SERVER_ADDR']; // $dns_a_record = $_SERVER['SERVER_ADDR'];
// if ($certdomain_dns = dns_get_record("$certdomain", DNS_A)) { // if ($certdomain_dns = @dns_get_record("$certdomain", DNS_A)) {
// if ($certdomain_dns[0]['ip'] == $dns_a_record) { // if ($certdomain_dns[0]['ip'] == $dns_a_record) {
// $dns_status = "ready"; // $dns_status = "ready";
// } else { // } else {