From 402acf67e949a3e5fc783b0cecc1bd8bfa3fe02c Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 3 Apr 2011 17:09:09 +0000
Subject: [PATCH] enchancements from robje

git-svn-id: http://www.observium.org/svn/observer/trunk@2008 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/services/dns/check.inc   | 5 ++++-
 includes/services/mysql/check.inc | 5 ++++-
 versioncheck.php                  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/includes/services/dns/check.inc b/includes/services/dns/check.inc
index 14bc151e0..d8fb11c2c 100644
--- a/includes/services/dns/check.inc
+++ b/includes/services/dns/check.inc
@@ -1,6 +1,9 @@
 <?php
 
-$check = shell_exec($config['nagios_plugins'] . "/check_dns -H ".$service['param']." -s ".$service['hostname']);
+// provide some sane default
+if ($service['service_param']) { $nsquery = $service['service_param']; } else { $nsquery = "localhost"; }
+
+$check = shell_exec($config['nagios_plugins'] . "/check_dns -H ".$nsquery." -s ".$service['hostname']);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/includes/services/mysql/check.inc b/includes/services/mysql/check.inc
index 4b4df4506..d63f36f9f 100644
--- a/includes/services/mysql/check.inc
+++ b/includes/services/mysql/check.inc
@@ -1,6 +1,9 @@
 <?php
 
-$check = shell_exec($config['nagios_plugins'] . "/check_mysql -H ".$service['hostname']." ".$service['service_param']);
+// provide some sane default
+if ($service['service_param']) { $dbname = $service['service_param']; } else { $dbname = "mysql"; }
+
+$check = shell_exec($config['nagios_plugins'] . "/check_mysql -H ".$service['hostname']." ".$dbname);
 
 list($check, $time) = split("\|", $check);
 
diff --git a/versioncheck.php b/versioncheck.php
index ee7613e40..983ab03c9 100755
--- a/versioncheck.php
+++ b/versioncheck.php
@@ -8,7 +8,7 @@ include("includes/functions.php");
 $ports = mysql_result(mysql_query("SELECT count(*) FROM ports"),0);
 $devices    = mysql_result(mysql_query("SELECT count(*) FROM devices"),0);
 
-$dataHandle = fopen("http://www.observium.org/latest.php?i=$ports&d=$devices&v=".$config['version'], r);
+$dataHandle = fopen("http://www.observium.org/latest.php?i=$ports&d=$devices&v=".$config['version'], 'r');
 
 if ($dataHandle)
 {