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
2013-11-05 09:33:32 +10:00
parent 346ca22a97
commit aa9dded019
32 changed files with 109 additions and 169 deletions
+9
View File
@@ -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';
}
?>
+4 -51
View File
@@ -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 -->
+6 -6
View File
@@ -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]