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

cleanups

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2248 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-05 13:04:38 +00:00
parent 63b25bb2f7
commit ec5e826b30
5 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/print-menubar.php
View File

@@ -336,8 +336,8 @@ if ($_SESSION['userlevel'] >= '5')
<!--[if IE 7]><!--></a><!--<![endif]-->
<table><tr><td>
<ul>
<li><a href="search/ipv4/"><img src="images/16/email_link.png" border="0" align="absmiddle" /> IPv4 Search</a></li>
<li><a href="search/ipv6/"><img src="images/16/email_link.png" border="0" align="absmiddle" /> IPv6 Search</a></li>
<li><a href="search/ipv4/"><img src="images/icons/ipv4.png" border="0" align="absmiddle" /> IPv4 Search</a></li>
<li><a href="search/ipv6/"><img src="images/icons/ipv6.png" border="0" align="absmiddle" /> IPv6 Search</a></li>
<li><a href="search/mac/"><img src="images/16/email_link.png" border="0" align="absmiddle" /> MAC Search</a></li>
</ul>
</td></tr></table>

12
html/index.php
View File

@@ -128,12 +128,12 @@ $gentime = substr($run, 0, 5);
echo('<br /> <br /> <br /> <br /> <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
echo('<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version']);
if (file_exists('.svn/entries'))
{
$svn = File('.svn/entries');
echo('-SVN r' . trim($svn[3]));
unset($svn);
}
#if (file_exists('.svn/entries'))
#{
# $svn = File('.svn/entries');
# echo('-SVN r' . trim($svn[3]));
# unset($svn);
#}
echo('</a>. Copyright &copy; 2006-'. date("Y"). ' by Adam Armstrong. All rights reserved.');

26
html/pages/about.inc.php
View File

@@ -3,12 +3,12 @@
echo($config['version']);
if (file_exists('.svn/entries'))
{
$svn = File('.svn/entries');
echo('-SVN r' . trim($svn[3]));
unset($svn);
}
#if (file_exists('.svn/entries'))
#{
# $svn = File('.svn/entries');
# echo('-SVN r' . trim($svn[3]));
# unset($svn);
#}
?></h3>
<div style="float: right; padding: 0px; width: 49%">
@@ -81,7 +81,7 @@ echo("
<td><img src='images/icons/apps.png' class='optionicon'> <b>Applications</b></td><td align=right>$stat_apps</td>
</tr>
<tr>
<td ><img src='images/icons/processors.png' class='optionicon'> <b>Processors</b></td><td align=right>$stat_processors</td>
<td ><img src='images/icons/processor.png' class='optionicon'> <b>Processors</b></td><td align=right>$stat_processors</td>
<td><img src='images/icons/memory.png' class='optionicon'> <b>Memory</b></td><td align=right>$stat_memory</td>
</tr>
<tr>
@@ -110,12 +110,12 @@ print_optionbar_end(); ?>
<?php
$Observium_version = $config['version'];
if (file_exists('.svn/entries'))
{
$svn = File('.svn/entries');
$Observium_version .='-SVN r' . trim($svn[3]);
unset($svn);
}
#if (file_exists('.svn/entries'))
#{
# $svn = File('.svn/entries');
# $Observium_version .='-SVN r' . trim($svn[3]);
# unset($svn);
#}
$apache_version = str_replace("Apache/", "", $_SERVER['SERVER_SOFTWARE']);

6
includes/defaults.inc.php
View File

@@ -124,6 +124,12 @@ $config['show_overview_tab'] = true;
$config['overview_show_sysDescr'] = true;
### Enable version checker & stats
$config['version_check'] = 1; # Enable checking of version in discovery
# and submittal of basic stats used
# to prioritise development effort :)
### Poller/Discovery Modules
$config['enable_bgp'] = 1; # Enable BGP session collection and display

13
includes/static-config.php
View File

@@ -884,7 +884,18 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
# No changes below this line #
##############################
$config['version'] = "0.11";
$config['version'] = "0.11.5.2245";
if (file_exists('.svn/entries'))
{
$svn = File('.svn/entries');
$svn_rev = trim($svn[3]);
list($svn_date) = explode("T", trim($svn[9]));
list($svn_year, $svn_month, $svn_day) = explode("-", $svn_date);
$config['version'] = "0." . ($svn_year-2000) . "." . ($svn_month+0) . "." . $svn_rev;
} else {
$config['version'] = $config['version'] . "." . $config['release'];
}
if (isset($config['rrdgraph_def_text']))
{