move more settings to defaults.inc.php, vastly simplify config.php.default. move collectd functions to html/includes/, include them only where needed.

git-svn-id: http://www.observium.org/svn/observer/trunk@1390 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-17 20:30:05 +00:00
parent 3063e0e517
commit b0297704e5
12 changed files with 123 additions and 243 deletions
+1 -7
View File
@@ -5,7 +5,7 @@
include_once("Net/IPv4.php");
include_once("Net/IPv6.php");
## ObserverNMS Includes
## Observium Includes
include_once($config['install_dir'] . "/includes/common.php");
include_once($config['install_dir'] . "/includes/rrdtool.inc.php");
@@ -19,12 +19,6 @@ include_once($config['install_dir'] . "/includes/rewrites.php");
include_once($config['install_dir'] . "/includes/snmp.inc.php");
include_once($config['install_dir'] . "/includes/services.inc.php");
## CollectD
require('collectd/config.php');
require('collectd/functions.php');
require('collectd/definitions.php');
function mac_clean_to_readable($mac)
{
$r = substr($mac, 0, 2);