From 05b189a0c7038577bb7ea35dcb3130dd99e2f5b8 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 21 Aug 2010 14:02:24 +0000
Subject: [PATCH] solve some php warnings

git-svn-id: http://www.observium.org/svn/observer/trunk@1689 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/defaults.inc.php  |  4 +++-
 includes/functions.php     |  2 +-
 includes/static-config.php | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 1fa68f99f..42e761530 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -29,7 +29,9 @@ $config['nagios_plugins'] = "/usr/lib/nagios/plugins";
 
 ### Web Interface Settings
 
-$config['base_url'] 	    = "http://" . $_SERVER["SERVER_NAME"] .":".$_SERVER["SERVER_PORT"];
+if(isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["SERVER_PORT"])) {
+  $config['base_url'] 	    = "http://" . $_SERVER["SERVER_NAME"] .":".$_SERVER["SERVER_PORT"];
+}
 $config['title_image']      = "images/observium-logo.png";
 $config['stylesheet']       = "css/styles.css";
 $config['mono_font']        = "DejaVuSansMono";
diff --git a/includes/functions.php b/includes/functions.php
index 21a987091..3db4124c4 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -276,7 +276,7 @@ function addHost($host, $community, $snmpver, $port = 161)
 
 function scanUDP ($host, $port, $timeout) 
 { 
-  $handle = fsockopen($host, $port, &$errno, &$errstr, 2); 
+  $handle = fsockopen($host, $port, $errno, $errstr, 2); 
   if (!$handle) { 
   } 
   socket_set_timeout ($handle, $timeout); 
diff --git a/includes/static-config.php b/includes/static-config.php
index 7bd57d303..c250e9d24 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -725,15 +725,18 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
 
 $config['version'] = "0.10";
 
-$config['rrdgraph_def_text'] = str_replace("  ", " ", $config['rrdgraph_def_text']);
-$config['rrd_opts_array'] = explode(" ", trim($config['rrdgraph_def_text']));
+if(isset($config['rrdgraph_def_text'])) 
+{
+  $config['rrdgraph_def_text'] = str_replace("  ", " ", $config['rrdgraph_def_text']);
+  $config['rrd_opts_array'] = explode(" ", trim($config['rrdgraph_def_text']));
+}
 
 if(!isset($config['log_file'])) 
 {
   $config['log_file']     = $config['install_dir'] . "/observium.log";
 }
 
-if(!$config['mibdir']) 
+if(isset($config['mibdir'])) 
 {
   $config['mibdir'] =  $config['install_dir']."/mibs/";
 }
@@ -749,13 +752,15 @@ $nagios_db = mysql_select_db($config['nagios_db_name'], $nagios_link);
 }
 
 # If we're on SSL, let's properly detect it
-if(isset($_SERVER['HTTPS'])) {
+if(isset($_SERVER['HTTPS'])) 
+{
   $config['base_url'] = preg_replace('/^http:/','https:', $config['base_url']);
 }
 
 ### Connect to database
 $observium_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
-if (!$observium_link) {
+if (!$observium_link) 
+{
         echo "<h2>Observer MySQL Error</h2>";
         echo mysql_error();
         die;