From b2a6a7f10a2d523ec8b4633f24f27d527ea4fb46 Mon Sep 17 00:00:00 2001 From: dmorley Date: Sun, 21 Sep 2014 12:32:03 -0700 Subject: [PATCH] add services from json data and new comments from json --- css/newstyle.css | 19 +++++++++++++++++++ db/pull.php | 20 ++++++++++++++++++-- db/tables.sql | 5 +++++ show.php | 12 ++++++++++-- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/css/newstyle.css b/css/newstyle.css index 04da3f9..87aea3e 100644 --- a/css/newstyle.css +++ b/css/newstyle.css @@ -19,3 +19,22 @@ font-size:9px; .content { margin-left: 2px !important; } +.smlogo { + width: 16px; + height: 16px; + background: url(../img/smlogo.png) 0 0; + display: inline-block; +} + +#twitter { +background-position: 0 -776px; +} +#facebook { +background-position: 0 -824px; +} +#tumblr { +background-position: 0 -792px; +} +#wordpress { +background-position: 0 -656px; +} diff --git a/db/pull.php b/db/pull.php index 8f3aeb4..b825bf3 100644 --- a/db/pull.php +++ b/db/pull.php @@ -88,6 +88,11 @@ unset($active_users_halfyear); unset($active_users_monthly); unset($local_posts); unset($registrations_open); +unset($comment_counts); +unset($service_facebook); +unset($service_twitter); +unset($service_tumblr); +unset($service_wordpess); unset($dver); unset($dverr); unset($xdver); @@ -147,6 +152,11 @@ $total_users = isset($jsonssl->total_users)?$jsonssl->total_users:0; $active_users_halfyear = isset($jsonssl->active_users_halfyear)?$jsonssl->active_users_halfyear:0; $active_users_monthly = isset($jsonssl->active_users_monthly)?$jsonssl->active_users_monthly:0; $local_posts = isset($jsonssl->local_posts)?$jsonssl->local_posts:0; +$comment_counts = isset($jsonssl->local_comments)?$jsonssl->local_comments:0; +$service_facebook = isset($jsonssl->facebook)?$jsonssl->facebook:false; +$service_twitter = isset($jsonssl->twitter)?$jsonssl->twitter:false; +$service_tumblr = isset($jsonssl->tumblr)?$jsonssl->tumblr:false; +$service_wordpress = isset($jsonssl->wordpress)?$jsonssl->wordpress:false; } elseif (stristr($output, 'registrations_open')) { "not";$secure="false"; //$hidden="no"; @@ -175,6 +185,11 @@ $total_users = isset($jsonssl->total_users)?$jsonssl->total_users:0; $active_users_halfyear = isset($jsonssl->active_users_halfyear)?$jsonssl->active_users_halfyear:0; $active_users_monthly = isset($jsonssl->active_users_monthly)?$jsonssl->active_users_monthly:0; $local_posts = isset($jsonssl->local_posts)?$jsonssl->local_posts:0; +$comment_counts = isset($jsonssl->local_comments)?$jsonssl->local_comments:0; +$service_facebook = isset($jsonssl->facebook)?$jsonssl->facebook:false; +$service_twitter = isset($jsonssl->twitter)?$jsonssl->twitter:false; +$service_tumblr = isset($jsonssl->tumblr)?$jsonssl->tumblr:false; +$service_wordpress = isset($jsonssl->wordpress)?$jsonssl->wordpress:false; } else { $secure="false"; $score = $score - 1; @@ -309,10 +324,11 @@ $score=$score-2; $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, -masterversion=$27, signup=$28, total_users=$29, active_users_halfyear=$30, active_users_monthly=$31, local_posts=$32, name=$33 +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 WHERE domain=$34"; - $result = pg_query_params($dbh, $sql, array($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)); + $result = pg_query_params($dbh, $sql, array($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)); if (!$result) { die("Error in SQL query3: " . pg_last_error()); } diff --git a/db/tables.sql b/db/tables.sql index fd6ee60..240b3f6 100644 --- a/db/tables.sql +++ b/db/tables.sql @@ -35,6 +35,11 @@ CREATE TABLE pods ( uptimelast7 numeric(5,2), status text, responsetimelast7 text, + service_facebook booleen, + service_twitter booleen, + service_tumblr booleen, + service_wordpress booleen, + comment_counts int, dateUpdated timestamp DEFAULT current_timestamp, dateLaststats timestamp DEFAULT current_timestamp, dateCreated timestamp DEFAULT current_timestamp diff --git a/show.php b/show.php index 32909af..fc2b317 100644 --- a/show.php +++ b/show.php @@ -10,9 +10,11 @@ Total Users? Active Users? Posts? +Comments? Months? Rating? Location? +Services? @@ -70,6 +72,7 @@ if ($row["signup"] == 1) {$signup="Open";} else {$signup="Closed";} echo "" . $row["total_users"] . ""; echo "" . $row["active_users_halfyear"] . ""; echo "" . $row["local_posts"] . ""; + echo "" . $row["comment_counts"] . ""; if (strpos($row["pingdomurl"], "pingdom.com")) {$moreurl = $row["pingdomurl"];} else {$moreurl = "http://api.uptimerobot.com/getMonitors?format=json&customUptimeRatio=7-30-60-90&apiKey=".$row["pingdomurl"];} echo "
" . $row["monthsmonitored"] . "
"; if ($row["userrating"] >6) {$userratingclass="green";} elseif ($row["userrating"] <7) {$userratingclass="yellow";} elseif ($row["userrating"] <3) {$userratingclass="red";} @@ -85,8 +88,13 @@ echo "✪"; } echo ""; - echo "" . $row["country"] . "\n"; - + echo "" . $row["country"] . "\n"; + echo ""; + if ($row["service_facebook"] == true) {echo "";} + if ($row["service_twitter"] == true) {echo "";} + if ($row["service_tumblr"] == true) {echo "";} + if ($row["service_wordpress"] == true) {echo "";} + echo "\n"; } pg_free_result($result); pg_close($dbh); -- GitLab