mirror of
https://github.com/stylersnico/librenms.git
synced 2026-07-27 16:08:55 +02:00
Remove user-facing references to Observium
This eliminates nearly all of the user-facing references to Observium, including in the names of temporary files and in the metadata of PDFs. Many of these may not be used any more, but I've adjusted them anyway. These changes should also make it easier to change the branding later if it is needed. There are a few references of which I still don't understand the significance, so I've left them as-is for now. The Unix agent in particular is rather untidy.
This commit is contained in:
Paul Gear
@@ -613,5 +613,14 @@ function generate_ap_url($ap, $vars=array())
|
||||
return generate_url(array('page' => 'device', 'device' => $ap['device_id'], 'tab' => 'accesspoint', 'ap' => $ap['accesspoint_id']), $vars);
|
||||
}
|
||||
|
||||
function report_this($message)
|
||||
{
|
||||
return '<h2>'.$message.' Please <a href="'.$config['project_issues'].'">report this</a> to the developers.</h2>';
|
||||
}
|
||||
|
||||
function report_this_text($message)
|
||||
{
|
||||
return $message.'\nPlease report this to the developers at '.$config['project_issues'].'\n';
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
@@ -520,35 +520,6 @@ if(is_file("includes/print-menubar-custom.inc.php"))
|
||||
?>
|
||||
<li class="menu_right"><a href="#" class="drop"><img src="images/16/wrench.png" border="0" align="absmiddle" /> System</a><!-- Begin Home Item -->
|
||||
|
||||
<div class="dropdown_3columns align_right"><!-- Begin 2 columns container -->
|
||||
|
||||
<div class="col_3">
|
||||
<h2>LibreNMS <?php echo($config['version']); ?> </h2>
|
||||
</div>
|
||||
|
||||
<div class="col_2">
|
||||
<p>Network Management and Monitoring<br />
|
||||
Copyright (C) 2006-2012 Adam Armstrong
|
||||
Copyright (C) 2013-<?php echo date("Y"); ?> LibreNMS Contributors
|
||||
</div>
|
||||
|
||||
<!-- Old donation stuff
|
||||
<div class="col_1">
|
||||
<p>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="col_3">
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div class="col_2">
|
||||
<h2>The Team</h2>
|
||||
<p>
|
||||
<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">
|
||||
<h2>Settings</h2>
|
||||
<ul>
|
||||
@@ -563,27 +534,6 @@ if ($_SESSION['userlevel'] >= '10')
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
$apache_version = str_replace("Apache/", "", $_SERVER['SERVER_SOFTWARE']);
|
||||
$php_version = phpversion();
|
||||
$mysql_version = dbFetchCell("SELECT version()");
|
||||
$netsnmp_version = shell_exec($config['snmpget'] . " --version 2>&1");
|
||||
$rrdtool_version = implode(" ",array_slice(explode(" ",shell_exec($config['rrdtool'] . " --version |head -n1")),1,1));
|
||||
?>
|
||||
|
||||
<div class="col_2">
|
||||
<h2>Versions</h2>
|
||||
<table width=100% cellpadding=3 cellspacing=0 border=0>
|
||||
<tr valign=top><td><b>Apache</b></td><td><?php echo($apache_version); ?></td></tr>
|
||||
<tr valign=top><td><b>PHP</b></td><td><?php echo($php_version); ?></td></tr>
|
||||
<tr valign=top><td><b>MySQL</b></td><td><?php echo($mysql_version); ?></td></tr>
|
||||
<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 LibreNMS</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col_1">
|
||||
<h2>Users</h2>
|
||||
<ul>
|
||||
@@ -605,7 +555,10 @@ $rrdtool_version = implode(" ",array_slice(explode(" ",shell_exec($config['rrdto
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div><!-- End 2 columns container -->
|
||||
<div class="col_1">
|
||||
<li><a href="about/"><img src="images/16/information.png" border="0" align="absmiddle" /> About <?php echo($config['project_name']); ?></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</li><!-- End Home Item -->
|
||||
|
||||
|
||||
@@ -111,32 +111,32 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
|
||||
/**
|
||||
* document creator
|
||||
*/
|
||||
define ('PDF_CREATOR', 'Observium');
|
||||
define ('PDF_CREATOR', $config['project_name']);
|
||||
|
||||
/**
|
||||
* document author
|
||||
*/
|
||||
define ('PDF_AUTHOR', 'Observium');
|
||||
define ('PDF_AUTHOR', $config['project_name']);
|
||||
|
||||
/**
|
||||
* header title
|
||||
*/
|
||||
define ('PDF_HEADER_TITLE', 'Observium');
|
||||
define ('PDF_HEADER_TITLE', $config['project_name']);
|
||||
|
||||
/**
|
||||
* header description string
|
||||
*/
|
||||
define ('PDF_HEADER_STRING', "Observium");
|
||||
define ('PDF_HEADER_STRING', $config['project_name']);
|
||||
|
||||
/**
|
||||
* image logo
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO', 'observium-logo.png');
|
||||
//define ('PDF_HEADER_LOGO', 'observium-logo.png');
|
||||
|
||||
/**
|
||||
* header logo image width [mm]
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO_WIDTH', 110);
|
||||
//define ('PDF_HEADER_LOGO_WIDTH', 110);
|
||||
|
||||
/**
|
||||
* document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
|
||||
|
||||
+2
-2
@@ -270,10 +270,10 @@ $runtime_end = utime(); $runtime = $runtime_end - $runtime_start;
|
||||
$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('<br />Powered by <a href="' . $config['project_url'] . '" target="_blank">' . $config['project_name_version']);
|
||||
|
||||
echo('</a>. Copyright © 2006-2012 by Adam Armstrong. All rights reserved.');
|
||||
echo('</a>. Copyright © '. 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>.');
|
||||
echo('</a>. Copyright © '. date("Y"). ' by the $config[\'project_name\'] Contributors.<br/>$config[\'project_name\'] 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'])
|
||||
{
|
||||
|
||||
+13
-26
@@ -1,22 +1,15 @@
|
||||
<div style="margin: 10px;">
|
||||
<h3>LibreNMS <?php
|
||||
<h3><?php
|
||||
|
||||
echo($config['version']);
|
||||
|
||||
#if (file_exists('.svn/entries'))
|
||||
#{
|
||||
# $svn = File('.svn/entries');
|
||||
# echo('-SVN r' . trim($svn[3]));
|
||||
# unset($svn);
|
||||
#}
|
||||
echo($config['project_name_version']);
|
||||
|
||||
?></h3>
|
||||
<div style="float: right; padding: 0px; width: 49%">
|
||||
<?php print_optionbar_start(NULL); ?>
|
||||
<h3>License</h3>
|
||||
<pre>LibreNMS Network Management and Monitoring System
|
||||
<pre>
|
||||
Copyright (C) 2006-2012 Adam Armstrong
|
||||
Copyright (C) 2013-<?php echo date("Y"); ?> LibreNMS Contributors
|
||||
Copyright (C) 2013-<?php echo date("Y") . " " . $config['project_name']; ?> 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
|
||||
@@ -110,20 +103,15 @@ print_optionbar_end(); ?>
|
||||
<div style="float: left; padding: 0px; width: 49%">
|
||||
<?php
|
||||
|
||||
$librenms_version = $config['version'];
|
||||
#if (file_exists('.svn/entries'))
|
||||
#{
|
||||
# $svn = File('.svn/entries');
|
||||
# $librenms_version .='-SVN r' . trim($svn[3]);
|
||||
# unset($svn);
|
||||
#}
|
||||
$project_name = $config['project_name'];
|
||||
$project_version = $config['version'];
|
||||
|
||||
print_optionbar_start(NULL);
|
||||
|
||||
echo("
|
||||
<h3>Versions</h3>
|
||||
<table width=100% cellpadding=3 cellspacing=0 border=0>
|
||||
<tr valign=top><td width=150><b>LibreNMS</b></td><td>$librenms_version</td></tr>
|
||||
<tr valign=top><td width=150><b>$project_name</b></td><td>$project_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>
|
||||
@@ -135,17 +123,16 @@ print_optionbar_end();
|
||||
|
||||
?>
|
||||
|
||||
<h5>LibreNMS is an autodiscovering PHP/MySQL based network monitoring system forked from Observium.</h5>
|
||||
<h5>LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system forked from the last GPL-licensed revision of Observium.</h5>
|
||||
|
||||
<p>
|
||||
<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="https://github.com/librenms/">Web site</a> |
|
||||
<a href="https://github.com/librenms/librenms/issues">Bug tracker</a> |
|
||||
<a href="https://groups.google.com/forum/#!forum/librenms-project">Mailing list</a> |
|
||||
<a href="http://twitter.com/librenms">Twitter</a>
|
||||
</p>
|
||||
|
||||
<h3>LibreNMS is a Free, Open project. Please contribute code, documentation, and bug reports to support continued development.</h3>
|
||||
<h3>LibreNMS is a Free, Open project. Please feel free to join us and contribute code, documentation, and bug reports.</h3>
|
||||
|
||||
<div style="margin-top:10px;">
|
||||
</div>
|
||||
@@ -157,6 +144,7 @@ print_optionbar_end();
|
||||
|
||||
<h4>Acknowledgements</h4>
|
||||
|
||||
<b>Observium</b> Codebase for fork. <br />
|
||||
<b>Stu Nicholls</b> Dropdown menu CSS code. <br />
|
||||
<b>Mark James</b> Silk Iconset. <br />
|
||||
<b>Erik Bosrup</b> Overlib Library. <br />
|
||||
@@ -164,7 +152,6 @@ 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>
|
||||
|
||||
@@ -26,7 +26,7 @@ switch ($vars['section'])
|
||||
break;
|
||||
default:
|
||||
print_optionbar_end();
|
||||
echo("<h2>Error. No section ".$vars['section'].".<br /> Please report this to observium developers.</h2>");
|
||||
echo(report_this('Unknown section '.$vars['section']));
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ switch ($vars['protocol'])
|
||||
include('pages/routing/'.$vars['protocol'].'.inc.php');
|
||||
break;
|
||||
default:
|
||||
echo("<h2>Error. Please report this to observium developers.</h2>");
|
||||
echo(report_this('Unknown protocol '.$vars['protocol']));
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ switch ($vars['search'])
|
||||
include('pages/search/'.$vars['search'].'.inc.php');
|
||||
break;
|
||||
default:
|
||||
echo("<h2>Error. Please report this to observium developers.</h2>");
|
||||
echo(report_this('Unknown search type '.$vars['search']));
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ if (strpos($_SERVER['REQUEST_URI'], "debug"))
|
||||
ini_set('error_reporting', 0);
|
||||
}
|
||||
|
||||
$filename = "observium-report.pdf";
|
||||
$filename = $config['project_id']."-report.pdf";
|
||||
$html = "";
|
||||
$type = (isset($_GET['type']) ? $_GET['type'] : "");
|
||||
$report = (isset($_GET['report']) ? $_GET['report'] : "");
|
||||
|
||||
Reference in New Issue
Block a user