From a22762f86bef6a909fd686088198b0c3d6e47b49 Mon Sep 17 00:00:00 2001
From: dmorley <support@diasp.org>
Date: Mon, 30 Jan 2017 08:23:29 -0800
Subject: [PATCH] back to old ip lookup, use delv for both.

---
 db/pull.php  | 25 +++++++++++++++++--------
 showfull.php |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/db/pull.php b/db/pull.php
index 2269ebe..5298b33 100644
--- a/db/pull.php
+++ b/db/pull.php
@@ -112,14 +112,23 @@ while ($row = pg_fetch_assoc($result)) {
 
   _debug('Signup Open', $signup);
 
-  $ip   = dns_get_record($_domain, DNS_A)[0]['ip'] ?? null;
-  $ipv6 = dns_get_record($_domain, DNS_AAAA)[0]['ipv6'] ?? null;
-
-  $iplookup = [];
-  exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain), $iplookup);
-  if ($iplookup) {
-    _debug('Iplookup', $iplookup, true);
-    $dnssec = in_array('; fully validated', $iplookup, true) ?? false;
+  $iplookupv4 = [];
+  exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain), $iplookupv4);
+  if ($iplookupv4) {
+    _debug('Iplookupv4', $iplookupv4, true);
+    $dnssec = in_array('; fully validated', $iplookupv4, true) ?? false;
+    $getaonly = array_values(preg_grep('/\s+IN\s+A\s+.*/', $iplookupv4));
+    preg_match('/A\s(.*)/', $getaonly[0], $aversion);
+    $ip   = trim($aversion[1]);
+  }
+  $iplookupv6 = [];
+  exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain . ' AAAA '), $iplookupv6);
+  if ($iplookupv6) {
+    _debug('Iplookupv6', $iplookupv6, true);
+    $dnssec = in_array('; fully validated', $iplookupv6, true) ?? false;
+    $getaaaaonly = array_values(preg_grep('/\s+IN\s+AAAA\s+.*/', $iplookupv6));
+    preg_match('/A\s(.*)/', $getaaaaonly[0], $aaaaversion);
+    $ipv6   = trim($aaaaversion[1]);
   }
   $ip || $score -= 2;
 
diff --git a/showfull.php b/showfull.php
index ef18a48..b633d63 100644
--- a/showfull.php
+++ b/showfull.php
@@ -97,7 +97,7 @@ $numrows = pg_num_rows($result);
     $row['service_wordpress'] === 't' && print '<div class="smlogo smlogo-wordpress" title="Publish to WordPress"></div>';
     $row['service_xmpp'] === 't' && print '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" title="XMPP chat server" alt="XMPP chat server"></div>';
     echo '</td>';
-    $row['terms'] === 't' ? print '<td><a href="https://' . $row['domain'] . $row['terms'] . '">&#128279;</a></td></tr>' : print '<td></td></tr>';
+    echo '<td>' . ($row['terms'] ? '<a href="https://' . $row['domain'] . $row['terms'] . '">&#128279;</a>' : '&nbsp;') . '</td>';
   }
   ?>
   </tbody>
-- 
GitLab