From fca6fafb608bccd32a8bc4636a532f3237b8091f Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sat, 27 Feb 2010 14:44:38 +0000
Subject: [PATCH] include defaults.php before config.php, not FROM config.php

git-svn-id: http://www.observium.org/svn/observer/trunk@966 61d68cd4-352d-0410-923a-c4978735b2b8
---
 addhost.php                   | 1 +
 adduser.php                   | 1 +
 alerts.php                    | 1 +
 check-errors.php              | 1 +
 check-services.php            | 1 +
 cleanup.php                   | 1 +
 config.php.default            | 1 -
 delhost.php                   | 1 +
 discovery.php                 | 1 +
 generate-iplist.php           | 1 +
 html/ajax/list_interfaces.php | 1 +
 html/billing-graph.php        | 1 +
 html/collectd-graph.php       | 1 +
 html/graph.php                | 2 +-
 html/index.php                | 1 +
 html/map.php                  | 1 +
 html/netcmd.php               | 1 +
 html/percentage.php           | 1 +
 poll-billing.php              | 1 +
 poll-device.php               | 1 +
 poll-reachability.php         | 1 +
 poller.php                    | 1 +
 renamehost.php                | 1 +
 scan-snmp.php                 | 1 +
 snmptrap.php                  | 1 +
 syslog.php                    | 1 +
 test-discovery.php            | 1 +
 test-poll.php                 | 1 +
 versioncheck.php              | 1 +
 29 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/addhost.php b/addhost.php
index 140651f4a..e216ab329 100755
--- a/addhost.php
+++ b/addhost.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php 
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php"); 
 include("includes/functions.php");
 
diff --git a/adduser.php b/adduser.php
index c6ac29575..5909fe1e0 100755
--- a/adduser.php
+++ b/adduser.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/alerts.php b/alerts.php
index 62aca44bc..0c7fc314c 100755
--- a/alerts.php
+++ b/alerts.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/check-errors.php b/check-errors.php
index 854d56b3f..00c1bc2e0 100755
--- a/check-errors.php
+++ b/check-errors.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/check-services.php b/check-services.php
index 36267fbba..365687146 100755
--- a/check-services.php
+++ b/check-services.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php
 <?php
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
   
diff --git a/cleanup.php b/cleanup.php
index 9239f2a89..791890589 100755
--- a/cleanup.php
+++ b/cleanup.php
@@ -3,6 +3,7 @@
 ### Clean up the database removing old IPs and links
 
 <?php
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/config.php.default b/config.php.default
index f22393486..57424edf3 100755
--- a/config.php.default
+++ b/config.php.default
@@ -1,7 +1,6 @@
 <?php
 
 ## Have a look in defaults.inc.php for examples of settinsg you can set here. DO NOT defaults.inc.php!
-include("includes/defaults.inc.php");
 
 ### Database config
 $config['db_host'] = "localhost";
diff --git a/delhost.php b/delhost.php
index 43052c9a5..9582ce398 100755
--- a/delhost.php
+++ b/delhost.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php 
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/discovery.php b/discovery.php
index 2f71689c3..61022da54 100755
--- a/discovery.php
+++ b/discovery.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 include("includes/functions-poller.inc.php");
diff --git a/generate-iplist.php b/generate-iplist.php
index 19161c8ed..91cc6a4af 100755
--- a/generate-iplist.php
+++ b/generate-iplist.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/html/ajax/list_interfaces.php b/html/ajax/list_interfaces.php
index 232ba02b6..06a3d1ae6 100755
--- a/html/ajax/list_interfaces.php
+++ b/html/ajax/list_interfaces.php
@@ -1,5 +1,6 @@
 <?php
 
+  include("../../includes/defaults.inc.php");
   include("../../config.php");
   include("../../includes/functions.php");
   include("../includes/authenticate.inc.php");
diff --git a/html/billing-graph.php b/html/billing-graph.php
index 096157b7b..5f007fb1c 100644
--- a/html/billing-graph.php
+++ b/html/billing-graph.php
@@ -5,6 +5,7 @@
 #ini_set('log_errors', 1);
 #ini_set('error_reporting', E_ALL);
 
+include("../includes/defaults.inc.php");
 include("../config.php");
 include("../includes/functions.php");
 include("includes/authenticate.inc.php");
diff --git a/html/collectd-graph.php b/html/collectd-graph.php
index 1e63079a5..165518e3c 100755
--- a/html/collectd-graph.php
+++ b/html/collectd-graph.php
@@ -24,6 +24,7 @@ if($_GET['debug']) {
   ini_set('error_reporting', E_ALL);
 }
 
+include("../includes/defaults.inc.php");
 include("../config.php");
 include("../includes/functions.php");
 include("includes/authenticate.inc.php");
diff --git a/html/graph.php b/html/graph.php
index 70fe6cc6e..76ec3ce2d 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -1,6 +1,5 @@
 <?php
 
-
 if($_GET['debug']) {
   ini_set('display_errors', 1);
   ini_set('display_startup_errors', 0);
@@ -9,6 +8,7 @@ if($_GET['debug']) {
   ini_set('error_reporting', E_ALL);
 }
 
+  include("../includes/defaults.inc.php");
   include("../config.php");
   include("../includes/common.php");
   include("../includes/graphing.php");
diff --git a/html/index.php b/html/index.php
index 1d4de9705..a0f027e4a 100755
--- a/html/index.php
+++ b/html/index.php
@@ -12,6 +12,7 @@ if($debug) {
   ini_set('error_reporting', E_ALL);
 }
 
+  include("../includes/defaults.inc.php");
   include("../config.php"); 
   include("../includes/functions.php");  
   include("includes/functions.inc.php");
diff --git a/html/map.php b/html/map.php
index a07c812cf..4754a4008 100755
--- a/html/map.php
+++ b/html/map.php
@@ -1,5 +1,6 @@
 <?php
 
+include("../includes/defaults.inc.php");
 include("../config.php");
 include("../includes/functions.php");
 include("includes/authenticate.inc.php");
diff --git a/html/netcmd.php b/html/netcmd.php
index 9255411ed..e1b9bc8a5 100644
--- a/html/netcmd.php
+++ b/html/netcmd.php
@@ -10,6 +10,7 @@ if($_GET[debug]) {
   ini_set('error_reporting', E_ALL);
 }
 
+include("../includes/defaults.inc.php");
 include("../config.php");
 include("../includes/functions.php");
 include("includes/authenticate.inc.php");
diff --git a/html/percentage.php b/html/percentage.php
index 2cab79524..2b2d8744f 100644
--- a/html/percentage.php
+++ b/html/percentage.php
@@ -1,5 +1,6 @@
 <?php 
 
+include("../includes/defaults.inc.php");
 include("../config.php");
 include("../includes/functions.php");
 include("includes/authenticate.inc.php");
diff --git a/poll-billing.php b/poll-billing.php
index 33dca998c..231d8106e 100644
--- a/poll-billing.php
+++ b/poll-billing.php
@@ -4,6 +4,7 @@
 $debug = "1";
 
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/poll-device.php b/poll-device.php
index 1050c01a6..829ec8887 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 include("includes/functions-poller.inc.php");
diff --git a/poll-reachability.php b/poll-reachability.php
index cc9c3cf4f..14110e936 100755
--- a/poll-reachability.php
+++ b/poll-reachability.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/poller.php b/poller.php
index 255b9b45e..00e4b3dca 100755
--- a/poller.php
+++ b/poller.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 
 echo("Observer Poller v".$config['version']."\n\n");
diff --git a/renamehost.php b/renamehost.php
index 5abe2b7f9..db4a46183 100755
--- a/renamehost.php
+++ b/renamehost.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php 
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/scan-snmp.php b/scan-snmp.php
index 590729164..ee8734d9b 100755
--- a/scan-snmp.php
+++ b/scan-snmp.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
diff --git a/snmptrap.php b/snmptrap.php
index 231c526f0..51dfb8ec0 100755
--- a/snmptrap.php
+++ b/snmptrap.php
@@ -6,6 +6,7 @@
   ini_set('log_errors', 1);
   ini_set('error_reporting', E_ALL);
 
+  include("includes/defaults.inc.php");
   include("config.php");
   include("includes/functions.php");
 
diff --git a/syslog.php b/syslog.php
index 64fd88fb1..3a95d2fe4 100755
--- a/syslog.php
+++ b/syslog.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/syslog.php");
 include("includes/common.php");
diff --git a/test-discovery.php b/test-discovery.php
index 856efce7c..0cb7b4513 100755
--- a/test-discovery.php
+++ b/test-discovery.php
@@ -2,6 +2,7 @@
 <?php
 
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 include("includes/functions-poller.inc.php");
diff --git a/test-poll.php b/test-poll.php
index a5b54068d..886253138 100755
--- a/test-poll.php
+++ b/test-poll.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 include("includes/functions-poller.inc.php");
diff --git a/versioncheck.php b/versioncheck.php
index b2341add6..4048a45df 100755
--- a/versioncheck.php
+++ b/versioncheck.php
@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");