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,6 +1,7 @@
 #!/usr/bin/php 
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php"); 
 include("includes/functions.php");
 

adduser.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

alerts.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

check-errors.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

check-services.php

@@ -1,5 +1,6 @@
 #!/usr/bin/php
 <?php
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
   

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");
 

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";

delhost.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php 
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

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");

generate-iplist.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

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");

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");

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");

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");

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");

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");

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");

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");

poll-billing.php

@@ -4,6 +4,7 @@
 $debug = "1";
 
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

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");

poll-reachability.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

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");

renamehost.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php 
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

scan-snmp.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 

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");
 

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");

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");

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");

versioncheck.php

@@ -1,6 +1,7 @@
 #!/usr/bin/php
 <?php
 
+include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");