mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor cleanups

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3136 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-06 19:40:57 +00:00
parent 78fe096645
commit 30a72b081a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/static-config.php
View File

@ -1107,7 +1107,7 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
# No changes below this line #
##############################
$config['version'] = "0.11.5.2245";
$config['version'] = "0.SVN.ERROR";
if (file_exists($config['install_dir'] . '/.svn/entries'))
{
@ -1120,7 +1120,8 @@ if (file_exists($config['install_dir'] . '/.svn/entries'))
} else {
// SVN version >= 1.7
$xml = simplexml_load_string(shell_exec($config['svn'] . ' info --xml'));
if ($xml != false) {
if ($xml != false)
{
$svn_rev = $xml->entry->commit->attributes()->revision;
$svn_date = $xml->entry->commit->date;
}
@ -1131,8 +1132,7 @@ if (!empty($svn_rev))
{
$config['version'] = "0." . ($svn_year-2000) . "." . ($svn_month+0) . "." . $svn_rev;
} else {
# FIXME - $config['release'] not needed
$config['version'] = $config['version'] . "." . $config['release'];
$config['version'] = $config['version'];
}
if (isset($config['rrdgraph_def_text']))
@ -1143,7 +1143,7 @@ if (isset($config['rrdgraph_def_text']))
if (!isset($config['log_file']))
{
$config['log_file'] = $config['install_dir'] . "/observium.log";
$config['log_file'] = $config['install_dir'] . "/observium.log";
}
if (isset($config['cdp_autocreate']))
@ -1184,7 +1184,7 @@ if ($config['memcached']['enable'])
else
{
echo("WARNING: You have enabled memcached but have not installed the PHP bindings. Disabling memcached support.\n");
echo("Try 'pecl install memcached'. You will need the php5-dev and libmemcached-dev packages to do so.\n\n");
echo("Try 'apt-get install php5-memcached' or 'pecl install memcached'. You will need the php5-dev and libmemcached-dev packages to use pecl.\n\n");
$config['memcached']['enable'] = 0;
}
}