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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Paul Gear
2013-10-29 07:49:09 +10:00
parent 2c3959f7cd 02247267c0
commit 82e4e3e7c8
4 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
html/includes/functions.inc.php
View File

@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @package librenms
* @subpackage functions
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @author LibreNMS Contributors <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/

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

@@ -523,12 +523,13 @@ if(is_file("includes/print-menubar-custom.inc.php"))
<div class="dropdown_3columns align_right"><!-- Begin 2 columns container -->
<div class="col_3">
<h2>Observium <?php echo($config['version']); ?> </h2>
<h2>LibreNMS <?php echo($config['version']); ?> </h2>
</div>
<div class="col_2">
<p>Network Management and Monitoring<br />
Copyright (C) 2006-<?php echo date("Y"); ?> Adam Armstrong</p>
Copyright (C) 2006-2012 Adam Armstrong
Copyright (C) 2013-<?php echo date("Y"); ?> LibreNMS Contributors
</div>
<div class="col_1">
@@ -548,9 +549,8 @@ if(is_file("includes/print-menubar-custom.inc.php"))
<div class="col_2">
<h2>The Team</h2>
<p>
<img src="images/icons/flags/gb.png"> <strong>Adam Armstrong</strong> Project Founder<br />
<img src="images/icons/flags/be.png"> <strong>Geert Hauwaerts</strong> Developer<br />
<img src="images/icons/flags/be.png"> <strong>Tom Laermans</strong> Developer<br />
<img src="images/icons/flags/au.png"> <strong>Paul Gear</strong> Project Founder<br />
<img src="images/icons/flags/us.png"> <strong>Tyler Christiansen</strong> Developer<br />
</p>
</div>
<div class="col_1">
@@ -584,7 +584,7 @@ $rrdtool_version = implode(" ",array_slice(explode(" ",shell_exec($config['rrdto
<tr valign=top><td><b>RRDtool</b></td><td><?php echo($rrdtool_version); ?></td></tr>
</table>
<ul>
<li><a href="about/"><img src="images/16/information.png" border="0" align="absmiddle" /> About Observium</a></li>
<li><a href="about/"><img src="images/16/information.png" border="0" align="absmiddle" /> About LibreNMS</a></li>
</ul>
</div>

1
html/index.php
View File

@@ -270,6 +270,7 @@ $gentime = substr($runtime, 0, 5);
echo('<br /> <br /> <br /> <br /> <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
echo('<br />Powered by <a href="https://github.com/librenms/librenms" target="_blank">LibreNMS ' . $config['version']);
echo('</a>. Copyright &copy; 2006-2012 by Adam Armstrong. All rights reserved.');
echo('</a>. Copyright &copy; '. date("Y"). ' by the LibreNMS Contributors.<br/>LibreNMS is <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, released under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU GPLv3</a>.');
if ($config['page_gen'])

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

@@ -1,5 +1,5 @@
<div style="margin: 10px;">
<h3>Observium <?php
<h3>LibreNMS <?php
echo($config['version']);
@@ -14,8 +14,9 @@ echo($config['version']);
<div style="float: right; padding: 0px; width: 49%">
<?php print_optionbar_start(NULL); ?>
<h3>License</h3>
<pre>Observium Network Management and Monitoring System
Copyright (C) 2006-<?php echo date("Y"); ?> Adam Armstrong
<pre>LibreNMS Network Management and Monitoring System
Copyright (C) 2006-2012 Adam Armstrong
Copyright (C) 2013-<?php echo date("Y"); ?> LibreNMS Contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -109,11 +110,11 @@ print_optionbar_end(); ?>
<div style="float: left; padding: 0px; width: 49%">
<?php
$Observium_version = $config['version'];
$librenms_version = $config['version'];
#if (file_exists('.svn/entries'))
#{
# $svn = File('.svn/entries');
# $Observium_version .='-SVN r' . trim($svn[3]);
# $librenms_version .='-SVN r' . trim($svn[3]);
# unset($svn);
#}
@@ -122,7 +123,7 @@ print_optionbar_start(NULL);
echo("
<h3>Versions</h3>
<table width=100% cellpadding=3 cellspacing=0 border=0>
<tr valign=top><td width=150><b>Observium</b></td><td>$Observium_version</td></tr>
<tr valign=top><td width=150><b>LibreNMS</b></td><td>$librenms_version</td></tr>
<tr valign=top><td><b>Apache</b></td><td>$apache_version</td></tr>
<tr valign=top><td><b>PHP</b></td><td>$php_version</td></tr>
<tr valign=top><td><b>MySQL</b></td><td>$mysql_version</td></tr>
@@ -134,33 +135,25 @@ print_optionbar_end();
?>
<h5>Observium is an autodiscovering PHP/MySQL based network monitoring system.</h5>
<h5>LibreNMS is an autodiscovering PHP/MySQL based network monitoring system forked from Observium.</h5>
<p>
<a href="http://www.observium.org">Website</a> |
<a href="http://www.observium.org/wiki/">Support Wiki</a> |
<a href="http://jira.observium.org/">Bugtracker</a> |
<a href="http://www.observium.org/wiki/Mailing_Lists">Mailing List</a> |
<a href="http://twitter.com/Observium">Twitter</a> |
<a href="http://www.facebook.com/pages/Observium/128354461353">Facebook</a>
<a href="https://github.com/librenms/librenms/">Website</a> |
<a href="https://github.com/librenms/librenms/wiki">Support Wiki</a> |
<a href="https://github.com/librenms/librenms/issues">Bugtracker</a> |
<a href="https://groups.google.com/forum/#!forum/librenms-project">Mailing List</a> |
<a href="http://twitter.com/librenms">Twitter</a>
</p>
<h3>Observium is a Free, Open project. Please donate to support continued development.</h3>
<h3>LibreNMS is a Free, Open project. Please contribute code, documentation, and bug reports to support continued development.</h3>
<div style="margin-top:10px;">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="W2ZJ3JRZR72Z6">
<input type="image" src="https://www.paypalobjects.com/en_US/GB/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal . The safer, easier way to pay online.">
<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
</form>
</div>
<h4>The Team</h4>
<img src="images/icons/flags/gb.png"> <strong>Adam Armstrong</strong> Project Founder<br />
<img src="images/icons/flags/be.png"> <strong>Geert Hauwaerts</strong> Developer<br />
<img src="images/icons/flags/be.png"> <strong>Tom Laermans</strong> Developer<br />
<img src="images/icons/flags/au.png"> <strong>Paul Gear</strong> Project Founder<br />
<img src="images/icons/flags/us.png"> <strong>Tyler Christiansen</strong> Developer<br />
<h4>Acknowledgements</h4>
@@ -171,6 +164,7 @@ print_optionbar_end();
<b>Xiaochi Jin</b> Logo design. <br />
<b>Bruno Pramont</b> Collectd code. <br />
<b>Dennis de Houx</b> Application monitors for PowerDNS, Shoutcast, NTPD (Client, Server). <br />
<b>Observium</b> Codebase for LibreNMS fork. <br />
</div>
</div>