diff --git a/db/pull.php b/db/pull.php index 709d353d39eb6eb1a82991cf34d5c8e0aaa6b006..2a91a396c6c988cfa88ad014671935b3d3b0f588 100644 --- a/db/pull.php +++ b/db/pull.php @@ -79,7 +79,7 @@ while ($row = pg_fetch_assoc($result)) { $shortversion = $dverr[0]; $signup = ($jsonssl->openRegistrations ?? false) === true; $softwarename = $jsonssl->software->name ?? 'unknown'; - $name = $jsonssl->metadata->nodeName ?? 'null'; + $name = $jsonssl->metadata->nodeName ?? $softwarename; $total_users = $jsonssl->usage->users->total ?? 0; $active_users_halfyear = $jsonssl->usage->users->activeHalfyear ?? 0; $active_users_monthly = $jsonssl->usage->users->activeMonth ?? 0; @@ -120,7 +120,7 @@ while ($row = pg_fetch_assoc($result)) { $iplookupv4 = []; $ip = ''; - exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain), $iplookupv4); + exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain . ' 2>&1'), $iplookupv4); $dnssec = in_array('; fully validated', $iplookupv4, true) ?? false; $getaonly = array_values(preg_grep('/\s+IN\s+A\s+.*/', $iplookupv4)); if ($getaonly) { @@ -129,7 +129,7 @@ while ($row = pg_fetch_assoc($result)) { } $iplookupv6 = []; $ipv6 = null; - exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain . ' AAAA '), $iplookupv6); + exec(escapeshellcmd('delv @' . $dnsserver . ' ' . $domain . ' AAAA 2>&1'), $iplookupv6); $getaaaaonly = array_values(preg_grep('/\s+IN\s+AAAA\s+.*/', $iplookupv6)); if ($getaaaaonly) { preg_match('/AAAA\s(.*)/', $getaaaaonly[0], $aaaaversion); diff --git a/go.php b/go.php index 5669157c75e0912ce51a20526348c5b9c28d6446..cedac23bf73b8190458eeb5cd95bf91925b708f7 100644 --- a/go.php +++ b/go.php @@ -32,5 +32,5 @@ if ($_domain) { $result = pg_query_params($dbh, $sql, [$row[0]['domain'], '1']); $result || die('Error in SQL query: ' . pg_last_error()); - header('Location: https://' . $row[0]['domain'] . '/users/sign_up'); + header('Location: https://' . $row[0]['domain']); } diff --git a/index.php b/index.php index 6972991f682913115580584a18cdd67f7c34ac8d..493982bda7305b58991d7a8e942548a767064246 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,7 @@ $podminedit = isset($_GET['podminedit']); $simpleview = !($detailedview || $mapview || $cleanup || $podmin || $podminedit || $statsview); ?> - + Open Source Social Network Pod Uptime Status @@ -60,12 +60,7 @@ $simpleview = !($detailedview || $mapview || $cleanup || $podmin || $podminedi
  • Wiki
  • API
    • -

    Data refreshed:
    EST


    - - - +

    Data refreshed:
    EST

    Confused? Auto pick a pod for you. diff --git a/show.php b/show.php index 9a4d149f4618fb022bee559d9f6f29cd3a48f1d9..63f6762bd44bcafe75319152239fd3d79b4e1cb0 100644 --- a/show.php +++ b/show.php @@ -36,9 +36,7 @@ $numrows = pg_num_rows($result); $verdiff = str_replace('.', '', $row['masterversion']) - str_replace('.', '', $row['shortversion']); $pod_name = htmlentities($row['name'], ENT_QUOTES); $tip = sprintf( - 'This %1$s pod %2$s has been watched for %3$s months and with an uptime of %4$s%% this month. On a scale of 100 this pod is a %5$s right now', - $row['softwarename'], - $pod_name, + 'Uptime %2$s%% over %1$s months, score is %3$s out of 100.', $row['monthsmonitored'], $row['uptime_alltime'], $row['score'] diff --git a/showfull.php b/showfull.php index 6ccf7845851208402046a57162acba1a9d3cd4b1..e147fc8bbe45cdd5d60c18c84415ce8db37b1e29 100644 --- a/showfull.php +++ b/showfull.php @@ -33,7 +33,7 @@ $numrows = pg_num_rows($result); Active 1m Posts Comments - Months + Months Rating Score DNSSEC @@ -46,8 +46,7 @@ $numrows = pg_num_rows($result); ' . $row['domain'] . ' 🔒'; @@ -70,7 +69,7 @@ $numrows = pg_num_rows($result); } echo '
    ' . $version . '
    '; echo '' . $row['softwarename'] . ''; - echo '' . ($row['uptime_alltime'] > 0 ? $row['uptime_alltime'].'%' : '') . ''; + echo '' . ($row['uptime_alltime'] > 0 ? $row['uptime_alltime'].'%' : '-') . ''; echo '' . ($row['ipv6'] === 't' ? '✓' : '') . ''; echo '' . ($row['latency'] > 0 ? $row['latency'] : '') . ''; echo '' . ($row['signup'] === 't' ? '✓' : '') . '';