From 55be40e2f52252a3dd721883bae05dfb3c9f0128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armando=20L=C3=BCscher?= Date: Thu, 22 Dec 2016 01:16:13 +0100 Subject: [PATCH] Replace "if" error statements with simpler "or die" statements. Also use this for required $_GET parameters. --- api.php | 24 +++++++++--------------- cleanup.php | 10 ++++------ db/add.php | 15 ++++++--------- db/api-more.php | 10 ++++------ db/edit.php | 23 ++++++++--------------- db/gettoken.php | 10 ++++------ db/kill.php | 10 ++++------ db/pull.php | 21 ++++++++------------- db/saverating.php | 30 +++++++++--------------------- db/showuptimerobot.php | 12 ++++-------- random.php | 10 ++++------ rate.php | 17 ++++++++--------- show.php | 10 ++++------ showfull.php | 10 ++++------ showmap.php | 10 ++++------ 15 files changed, 84 insertions(+), 138 deletions(-) diff --git a/api.php b/api.php index 37b832f..46f0abd 100644 --- a/api.php +++ b/api.php @@ -1,15 +1,12 @@ EOF; $sql = "SELECT * FROM pods WHERE hidden <> 'yes'"; $result = pg_query($dbh, $sql); - if (!$result) { - die('Error in SQL query: ' . pg_last_error()); - } + $result || die('Error in SQL query: ' . pg_last_error()); + $numrows = pg_num_rows($result); while ($row = pg_fetch_array($result)) { $pod_name = htmlentities($row['name'], ENT_QUOTES); @@ -61,9 +57,8 @@ EOF; } elseif ($_GET['format'] == 'json') { $sql = 'SELECT id,domain,status,secure,score,userrating,adminrating,city,state,country,lat,long,ip,ipv6,pingdomurl,monthsmonitored,uptimelast7,responsetimelast7,local_posts,comment_counts,dateCreated,dateUpdated,dateLaststats,hidden FROM pods'; $result = pg_query($dbh, $sql); - if (!$result) { - die('Error in SQL query: ' . pg_last_error()); - } + $result || die('Error in SQL query: ' . pg_last_error()); + $numrows = pg_num_rows($result); //json output, thx Vipul A M for fixing this header('Content-type: application/json'); @@ -79,9 +74,8 @@ EOF; $i = 0; $sql = "SELECT * FROM pods WHERE hidden <> 'yes' ORDER BY uptimelast7 DESC"; $result = pg_query($dbh, $sql); - if (!$result) { - die('Error in SQL query: ' . pg_last_error()); - } + $result || die('Error in SQL query: ' . pg_last_error()); + $numrows = pg_num_rows($result); while ($row = pg_fetch_array($result)) { if ($row['status'] == 'up') { diff --git a/cleanup.php b/cleanup.php index 154621a..13c6b93 100644 --- a/cleanup.php +++ b/cleanup.php @@ -3,14 +3,12 @@ $tt = 0; require_once __DIR__ . '/config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + $sql = "SELECT * FROM pods WHERE hidden <> 'no' AND score < 50 ORDER BY weightedscore"; $result = pg_query($dbh, $sql); -if (!$result) { - die('Error in SQL query: ' . pg_last_error()); -} +$result || die('Error in SQL query: ' . pg_last_error()); + $numrows = pg_num_rows($result); ?> diff --git a/db/add.php b/db/add.php index 2e1eded..a2b89b2 100644 --- a/db/add.php +++ b/db/add.php @@ -29,14 +29,12 @@ if (strlen($_POST['url']) < 14) { require_once __DIR__ . '/../config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + $sql = 'SELECT domain,pingdomurl FROM pods'; $result = pg_query($dbh, $sql); -if (!$result) { - die('Error in SQL query: ' . pg_last_error()); -} +$result || die('Error in SQL query: ' . pg_last_error()); + while ($row = pg_fetch_array($result)) { if ($row['domain'] == $_POST['domain']) { $log->lwrite('domain already exists ' . $_POST['domain']); @@ -82,9 +80,8 @@ if (stristr($output, 'nodeName')) { if ($valid == '1') { $sql = "INSERT INTO pods (domain, pingdomurl, email) VALUES($1, $2, $3)"; $result = pg_query_params($dbh, $sql, [$_POST['domain'], $_POST['url'], $_POST['email']]); - if (!$result) { - die('Error in SQL query: ' . pg_last_error()); - } + $result || die('Error in SQL query: ' . pg_last_error()); + $to = $adminemail; $cc = $_POST['email']; $subject = 'New pod added to podupti.me '; diff --git a/db/api-more.php b/db/api-more.php index 410ef1d..e0d26da 100644 --- a/db/api-more.php +++ b/db/api-more.php @@ -4,14 +4,12 @@ require_once __DIR__ . '/../config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + $sql = "SELECT id,domain,status,secure,score,userrating,adminrating,city,state,country,lat,long,ip,ipv6,pingdomurl,monthsmonitored,uptimelast7,responsetimelast7,local_posts,comment_counts,dateCreated,dateUpdated,dateLaststats,hidden FROM pods WHERE domain = $1"; $result = pg_query_params($dbh, $sql, [$_GET['url']]); -if (!$result) { - die('Error in SQL query: ' . pg_last_error()); -} +$result || die('Error in SQL query: ' . pg_last_error()); + while ($row = pg_fetch_array($result)) { if ($_GET['format'] == 'json') { echo json_encode($row); diff --git a/db/edit.php b/db/edit.php index 3730882..d73d6bb 100644 --- a/db/edit.php +++ b/db/edit.php @@ -1,26 +1,19 @@ $_GET['token']) { die('token not a match'); diff --git a/db/gettoken.php b/db/gettoken.php index 1ec803f..6ce13eb 100644 --- a/db/gettoken.php +++ b/db/gettoken.php @@ -8,14 +8,12 @@ $domain = $_POST['domain']; require_once __DIR__ . '/../config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + $sql = "SELECT email FROM pods WHERE domain = '$domain'"; $result = pg_query($dbh, $sql); -if (!$result) { - die('Error in SQL query: ' . pg_last_error()); -} +$result || die('Error in SQL query: ' . pg_last_error()); + $rows = pg_num_rows($result); if ($rows <= 0) { die('domain not found'); diff --git a/db/kill.php b/db/kill.php index 6d1b7b9..4117322 100644 --- a/db/kill.php +++ b/db/kill.php @@ -13,14 +13,12 @@ $domain = $_POST['domain']; require_once __DIR__ . '/../config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + $sql = "SELECT email FROM pods WHERE domain = '$domain'"; $result = pg_query($dbh, $sql); -if (!$result) { - die('one Error in SQL query: ' . pg_last_error()); -} +$result || die('one Error in SQL query: ' . pg_last_error()); + while ($row = pg_fetch_array($result)) { if ($adminkey <> $_POST['adminkey']) { die('admin key fail'); diff --git a/db/pull.php b/db/pull.php index 26118f5..9edc2a8 100644 --- a/db/pull.php +++ b/db/pull.php @@ -38,9 +38,8 @@ if ($debug) { } $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); $dbh2 = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + //foreach pod check it and update db $domain = isset($_GET['domain']) ? $_GET['domain'] : null; @@ -53,10 +52,8 @@ if ($domain) { $sleep = '1'; $result = pg_query($dbh, $sql); } -if (!$result) { - die('Error in SQL query1: ' . pg_last_error()); -} - +$result || die('Error in SQL query1: ' . pg_last_error()); + while ($row = pg_fetch_all($result)) { $numrows = pg_num_rows($result); for ($i = 0; $i < $numrows; $i ++) { @@ -74,9 +71,8 @@ while ($row = pg_fetch_all($result)) { $adminrating = []; $sqlforr = "SELECT * FROM rating_comments WHERE domain = $1"; $ratings = pg_query_params($dbh, $sqlforr, [$domain]); - if (!$ratings) { - die('Error in SQL query2: ' . pg_last_error()); - } + $ratings || die('Error in SQL query2: ' . pg_last_error()); + $numratings = pg_num_rows($ratings); while ($myrow = pg_fetch_assoc($ratings)) { if ($myrow['admin'] == 0) { @@ -406,9 +402,8 @@ while ($row = pg_fetch_all($result)) { comment_counts=$35, service_facebook=$36, service_tumblr=$37, service_twitter=$38, service_wordpress=$39, weightedscore=$40, 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, $xmpp, $softwarename, $outputsslerror]); - if (!$result) { - die('Error in SQL query3: ' . pg_last_error()); - } + $result || die('Error in SQL query3: ' . pg_last_error()); + if ($debug) { echo '
Score out of 100: ' . $score . '
'; } diff --git a/db/saverating.php b/db/saverating.php index cd250f1..37c3123 100644 --- a/db/saverating.php +++ b/db/saverating.php @@ -1,31 +1,19 @@ monitors[0]->status == 9) { echo 'Status: ' . $live; pg_free_result($result); pg_close($dbh); - -?> diff --git a/random.php b/random.php index 64a3d7a..5a5c982 100644 --- a/random.php +++ b/random.php @@ -2,14 +2,12 @@ require_once __DIR__ . '/config.php'; $dbh = pg_connect("dbname=$pgdb user=$pguser password=$pgpass"); -if (!$dbh) { - die('Error in connection: ' . pg_last_error()); -} +$dbh || die('Error in connection: ' . pg_last_error()); + $sql = "SELECT * FROM pods WHERE adminrating <> -1 AND hidden <> 'yes' AND uptimelast7 > 95 AND masterversion = shortversion AND signup = 1 ORDER BY RANDOM() LIMIT 1"; $result = pg_query($dbh, $sql); -if (!$result) { - die('Error in SQL query1: ' . pg_last_error()); -} +$result || die('Error in SQL query1: ' . pg_last_error()); + $row = pg_fetch_all($result); if ($row[0]['secure'] == 'true') { $ssl = 's'; diff --git a/rate.php b/rate.php index 2f7c7b9..f114344 100644 --- a/rate.php +++ b/rate.php @@ -1,3 +1,7 @@ + +