remove dead map.php code, rename some .inc to .inc.php files, general trailing space cleanup part 1, some reindent. No expected functionality change whatsoever ;)

git-svn-id: http://www.observium.org/svn/observer/trunk@1824 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-12 08:50:47 +00:00
parent 90e2dee34a
commit c6428480bc
32 changed files with 339 additions and 423 deletions
+5 -5
View File
@@ -767,18 +767,18 @@ 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/";
}
@@ -794,14 +794,14 @@ $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());