moar restructure

git-svn-id: http://www.observium.org/svn/observer/trunk@1859 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-15 15:41:57 +00:00
parent d077282444
commit 0a86e1c675
6 changed files with 39 additions and 35 deletions
+5 -5
View File
@@ -767,24 +767,24 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
$config['version'] = "0.10";
if(isset($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']))
if (!isset($config['log_file']))
{
$config['log_file'] = $config['install_dir'] . "/observium.log";
}
if(!isset($config['mibdir']))
if (!isset($config['mibdir']))
{
$config['mibdir'] = $config['install_dir']."/mibs/";
}
$config['mib_dir'] = $config['mibdir'];
if(isset($config['enable_nagios']) && $config['enable_nagios']) {
if (isset($config['enable_nagios']) && $config['enable_nagios']) {
$nagios_link = mysql_connect($config['nagios_db_host'], $config['nagios_db_user'], $config['nagios_db_pass']);
if (!$nagios_link) {
echo("<h2>Nagios MySQL Error</h2>");
@@ -794,7 +794,7 @@ $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']);
}