' . $version . '
'; - echo 'Uptime This Month ' . $row['uptimelast7'] . '
'; - echo 'Months Monitored: ' . $row['monthsmonitored'] . '
'; - echo 'Response Time: ' . $row['responsetimelast7'] . '
'; - echo 'User Rating: ' . $row['userrating'] . '
'; - echo 'Server Country: ' . $row['country'] . '
'; - echo 'Server State: ' . $row['state'] . '
'; - echo 'Server City: ' . $row['city'] . '
'; - echo 'Latitude: ' . $row['lat'] . '
'; - echo 'Longitude: ' . $row['long'] . '
'; - } -} -pg_free_result($result); -pg_close($dbh); diff --git a/db/edit.php b/db/edit.php index 3943526ae8550c3a54a2a7589def8d8b5d85eb79..5cbefd33f33d1fe513c4bf15b65f095644124344 100644 --- a/db/edit.php +++ b/db/edit.php @@ -10,14 +10,14 @@ $_delete = $_GET['delete'] ?? ''; $_weight = $_GET['weight'] ?? ''; $_email = $_GET['email'] ?? ''; $_oldemail = $_GET['oldemail'] ?? ''; -$_pingdomurl = $_GET['pingdomurl'] ?? ''; +$_statsurl = $_GET['statsurl'] ?? ''; require_once __DIR__ . '/../config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); $dbh || die('Error in connection: ' . pg_last_error()); -$sql = 'SELECT domain,email,token,tokenexpire,pingdomurl,weight FROM pods WHERE domain = $1'; +$sql = 'SELECT domain,email,token,tokenexpire,statsurl,weight FROM pods WHERE domain = $1'; $result = pg_query_params($dbh, $sql, [$_domain]); $result || die('Error in SQL query: ' . pg_last_error()); @@ -38,8 +38,8 @@ while ($row = pg_fetch_array($result)) { if ($_save === $row['token']) { $_weight <= 10 || die('10 is max weight'); - $sql = 'UPDATE pods SET email = $1, pingdomurl = $2, weight = $3 WHERE domain = $4'; - $result = pg_query_params($dbh, $sql, [$_email, $_pingdomurl, $_weight, $_domain]); + $sql = 'UPDATE pods SET email = $1, statsurl = $2, weight = $3 WHERE domain = $4'; + $result = pg_query_params($dbh, $sql, [$_email, $_statsurl, $_weight, $_domain]); if (!$result) { die('Error in SQL query: ' . pg_last_error()); } @@ -60,7 +60,7 @@ while ($row = pg_fetch_array($result)) { echo ''; echo ''; echo ''; - echo 'Stats Key Uptimerobot API key for this monitor
'; + echo 'Stats Key Uptimerobot API key for this monitor
'; echo 'Email
'; echo 'Weight This lets you weight your pod lower on the list if you have too much trafic coming in, 10 is the norm use lower to move down the list.
'; echo ''; diff --git a/db/pull.php b/db/pull.php index 9c1a55821d55d2512945b206fb4057b4455dda1c..938b1b9140b4adcd824558660227b2489affaed4 100644 --- a/db/pull.php +++ b/db/pull.php @@ -46,11 +46,11 @@ $dbh || die('Error in connection: ' . pg_last_error()); //foreach pod check it and update db if ($_domain) { - $sql = 'SELECT domain,pingdomurl,score,datecreated,weight FROM pods WHERE domain = $1'; + $sql = 'SELECT domain,statsurl,score,datecreated,weight FROM pods WHERE domain = $1'; $sleep = '0'; $result = pg_query_params($dbh, $sql, [$_domain]); } elseif (PHP_SAPI === 'cli') { - $sql = 'SELECT domain,pingdomurl,score,datecreated,adminrating,weight FROM pods'; + $sql = 'SELECT domain,statsurl,score,datecreated,adminrating,weight FROM pods'; $sleep = '1'; $result = pg_query($dbh, $sql); } else { @@ -254,15 +254,14 @@ while ($row = pg_fetch_all($result)) { } } echo '
'; - $connection = ''; $pingdomdate = date('Y-m-d H:i:s'); - if (strpos($row[$i]['pingdomurl'], 'pingdom.com')) { + if (strpos($row[$i]['statsurl'], 'pingdom.com')) { //curl the pingdom page $ping = curl_init(); $thismonth = '/' . date('Y') . '/' . date('m'); - curl_setopt($ping, CURLOPT_URL, $row[$i]['pingdomurl'] . $thismonth); + curl_setopt($ping, CURLOPT_URL, $row[$i]['statsurl'] . $thismonth); if ($debug) { - echo $row[$i]['pingdomurl'] . $thismonth; + echo $row[$i]['statsurl'] . $thismonth; } curl_setopt($ping, CURLOPT_POST, 0); curl_setopt($ping, CURLOPT_HEADER, 1); @@ -308,7 +307,7 @@ while ($row = pg_fetch_all($result)) { } else { //do uptimerobot API instead $ping = curl_init(); - curl_setopt($ping, CURLOPT_URL, 'https://api.uptimerobot.com/getMonitors?format=json&customUptimeRatio=7-30-60-90&responseTimes=1&responseTimesAverage=86400&apiKey=' . $row[$i]['pingdomurl']); + curl_setopt($ping, CURLOPT_URL, 'https://api.uptimerobot.com/getMonitors?format=json&customUptimeRatio=7-30-60-90&responseTimes=1&responseTimesAverage=86400&apiKey=' . $row[$i]['statsurl']); curl_setopt($ping, CURLOPT_POST, 0); curl_setopt($ping, CURLOPT_HEADER, 0); curl_setopt($ping, CURLOPT_RETURNTRANSFER, 1); @@ -377,10 +376,10 @@ while ($row = pg_fetch_all($result)) { $timenow = date('Y-m-d H:i:s'); $sql = 'UPDATE pods SET Hgitdate = $1, Hencoding = $2, secure = $3, hidden = $4, Hruntime = $5, Hgitref = $6, ip = $7, ipv6 = $8, monthsmonitored = $9, - uptimelast7 = $10, status = $11, dateLaststats = $12, dateUpdated = $13, responsetimelast7 = $14, score = $15, adminrating = $16, country = $17, city = $18, - state = $19, lat = $20, long = $21, postalcode=\'\', connection = $22, whois = $23, userrating = $24, longversion = $25, shortversion = $26, + uptime_alltime = $10, status = $11, dateLaststats = $12, dateUpdated = $13, responsetimems = $14, score = $15, adminrating = $16, country = $17, city = $18, + state = $19, lat = $20, long = $21, connection = $22, whois = $23, userrating = $24, longversion = $25, shortversion = $26, masterversion = $27, signup = $28, total_users = $29, active_users_halfyear = $30, active_users_monthly = $31, local_posts = $32, name = $33, - comment_counts = $35, service_facebook = $36, service_tumblr = $37, service_twitter = $38, service_wordpress = $39, weightedscore = $40, xmpp = $41, softwarename = $42, sslvalid = $43 + comment_counts = $35, service_facebook = $36, service_tumblr = $37, service_twitter = $38, service_wordpress = $39, weightedscore = $40, service_xmpp = $41, softwarename = $42, sslvalid = $43 WHERE domain = $34'; $result = pg_query_params($dbh, $sql, [$gitdate, $encoding, $secure, $hidden, $runtime, $gitrev, $ipnum, $ipv6, $months, $uptime, $live, $pingdomdate, $timenow, $responsetime, $score, $adminrating, $country, $city, $state, $lat, $long, $dver, $whois, $userrating, $xdver, $dver, $masterversion, $signup, $total_users, $active_users_halfyear, $active_users_monthly, $local_posts, $name, $domain, $comment_counts, $service_facebook, $service_tumblr, $service_twitter, $service_wordpress, $weightedscore, $service_xmpp, $softwarename, $outputsslerror]); $result || die('Error in SQL query3: ' . pg_last_error()); diff --git a/db/tables.sql b/db/tables.sql index 474c9f618940017591567ea73966cce9275cbf13..c61ff4527054af37170646052469d881e627add2 100644 --- a/db/tables.sql +++ b/db/tables.sql @@ -3,49 +3,51 @@ CREATE TABLE pods ( domain text UNIQUE NOT NULL, name text, softwarename text, + masterversion text, + shortversion text, score int DEFAULT 10, weightedscore numeric(5,2) DEFAULT 10, adminrating decimal DEFAULT 10, userrating decimal DEFAULT 10, whois text, - hidden text DEFAULT 'yes', + hidden boolean DEFAULT 'yes', ip text, - ptr text, country text, city text, state text, lat text, long text, - connection text, - postalcode text, email text, - ipv6 text, - secure text, + ipv6 boolean, + secure boolean, sslvalid text, Hgitdate text, Hgitref text, Hruntime text, Hencoding text, - pingdomurl text, - pingdomlast text, + statsurl text, monthsmonitored int, - signup int, + signup boolean, total_users int, active_users_halfyear int, active_users_monthly int, local_posts int, - uptimelast7 numeric(5,2), + uptime_alltime numeric(5,2), + uptime_custom text, status text, - responsetimelast7 text, + responsetimems text, service_facebook boolean, service_twitter boolean, service_tumblr boolean, service_wordpress boolean, + service_xmpp boolean, token text, tokenexpire timestamp, + terms text, + sslexpire timestamp, + dnssec boolean, comment_counts int, - weight int DEFAULT 10, - xmpp boolean, + weight int DEFAULT 50, dateUpdated timestamp DEFAULT current_timestamp, dateLaststats timestamp DEFAULT current_timestamp, dateCreated timestamp DEFAULT current_timestamp @@ -61,12 +63,4 @@ CREATE TABLE rating_comments ( userurl text, date timestamp DEFAULT current_timestamp ); -CREATE TABLE users ( - id serial8 UNIQUE PRIMARY KEY, - admin int NOT NULL, - username text UNIQUE NOT NULL, - password text NOT NULL, - userurl text, - userpod text, - dateCreated timestamp DEFAULT current_timestamp -); + diff --git a/go.php b/go.php index 4e93b641394d44ca9495f34a92bc4f12e2564f9c..e67231bbd5b59af85ca46a2973ca355d8d076880 100644 --- a/go.php +++ b/go.php @@ -20,11 +20,11 @@ if ($_url) { //Add click counter +1 for $row[0]['domain'] clicks in future, separate click table header('Location:' . $_url); } else { - $sql = 'SELECT secure,domain FROM pods WHERE score > 90 AND masterversion = shortversion AND signup = 1 ORDER BY RANDOM() LIMIT 1'; + $sql = 'SELECT secure,domain FROM pods WHERE score > 90 AND masterversion = shortversion AND signup ORDER BY RANDOM() LIMIT 1'; $result = pg_query($dbh, $sql); $result || die('Error in SQL query: ' . pg_last_error()); $row = pg_fetch_all($result); - $scheme = $row[0]['secure'] === 'true' ? 'https://' : 'http://'; + $scheme = $row[0]['secure'] ? 'https://' : 'http://'; header('Location:' . $scheme . $row[0]['domain'] . '/users/sign_up'); } diff --git a/js/podup.js b/js/podup.js index b170b59f7a4cac61d4e22be67e89330d6c73fdde..b98b3cb8ec80fbbecbf49059e4637a517d2555cf 100644 --- a/js/podup.js +++ b/js/podup.js @@ -2,10 +2,7 @@ $(document).ready(function(){ $.facebox.settings.closeImage = 'bower_components/facebox/src/closelabel.png' $.facebox.settings.loadingImage = 'bower_components/facebox/src/loading.gif' $('a[rel*=facebox]').facebox() - $('#myTable').tablesorter(); -}); - -$(function () { + $('#myTable').tablesorter() $('[data-toggle="tooltip"]').tooltip() -}) +}); diff --git a/show.php b/show.php index e69e3016919239aca3de687eae2809b51eb16497..ec4150940850498fee15292e3ec279638724bbef 100644 --- a/show.php +++ b/show.php @@ -8,7 +8,7 @@ $country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? ''; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); $dbh || die('Error in connection: ' . pg_last_error()); -$sql = "SELECT * FROM pods WHERE adminrating <> -1 AND hidden <> 'yes' AND signup = 1 ORDER BY uptimelast7 DESC"; +$sql = "SELECT * FROM pods WHERE adminrating <> -1 AND NOT hidden AND signup ORDER BY uptime_alltime DESC"; $result = pg_query($dbh, $sql); $result || die('Error in SQL query: ' . pg_last_error()); @@ -32,14 +32,12 @@ $numrows = pg_num_rows($result);
' . $version . '
Open Signup: {$signup}
Users: {$row['active_users_halfyear']}
Uptime: {$row['uptimelast7']}%
Services:{$feat}' + 'html': '{$pod_name}
Visit
Open Signup: {$signup}
Users: {$row['active_users_halfyear']}
Uptime: {$row['uptime_alltime']}%
Services:{$feat}' }, 'geometry': { 'type': 'Point', diff --git a/showstats.php b/showstats.php index c0eab1712683ceb0236678559fbb2961f91ee1e4..5f2fce2c91e5543f2e1b8bc27f808c9bfed31e70 100644 --- a/showstats.php +++ b/showstats.php @@ -10,13 +10,13 @@ require_once __DIR__ . '/config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); $dbh || die('Error in connection: ' . pg_last_error()); -$sql = 'SELECT pingdomurl FROM pods WHERE domain = $1'; +$sql = 'SELECT statsurl FROM pods WHERE domain = $1'; $result = pg_query_params($dbh, $sql, [$_domain]); $result || die('Error in SQL query: ' . pg_last_error()); $apikey = pg_fetch_all($result); $upti = curl_init(); -$key = $apikey[0]['pingdomurl']; +$key = $apikey[0]['statsurl']; $data = ['all_time_uptime_ratio' => 1, 'format' => 'json', 'custom_uptime_ratios' => '7-30-60-90', 'response_times' => 1, 'response_times_average' => 86400, 'api_key' => $key, 'callback' => 'jsonpUptimeRobot']; curl_setopt($upti, CURLOPT_URL, 'https://api.uptimerobot.com/v2/getMonitors'); curl_setopt($upti, CURLOPT_HEADER, 0);