Removed twitter from about page, reindent, show svn revision

git-svn-id: http://www.observium.org/svn/observer/trunk@1868 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-16 11:51:01 +00:00
parent 50f873bffc
commit 1b35158517
+115 -113
View File
@@ -1,128 +1,128 @@
<div style="margin: 10px;"> <div style="margin: 10px;">
<h3>Observium <?php echo($config['version']);?></h3> <h3>Observium <?php
<div style="float: right; padding: 0px; width: 49%"> echo($config['version']);
<?php print_optionbar_start(NULL); ?>
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%">
<?php print_optionbar_start(NULL); ?>
<h3>License</h3> <h3>License</h3>
<pre>Observium Network Management and Monitoring System <pre>Observium Network Management and Monitoring System
Copyright (C) 2006-2010 Adam Armstrong Copyright (C) 2006-2010 Adam Armstrong
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</pre> along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</pre>
<?php print_optionbar_end(); ?> <?php print_optionbar_end(); ?>
&nbsp; &nbsp;
<?php print_optionbar_start(NULL); ?> <?php print_optionbar_start(NULL); ?>
<h3>Statistics</h3>
<h3>Statistics</h3>
<?php <?php
$stat_devices = mysql_result(mysql_query("SELECT COUNT(*) FROM `devices`"),0); $stat_devices = mysql_result(mysql_query("SELECT COUNT(*) FROM `devices`"),0);
$stat_ports = mysql_result(mysql_query("SELECT COUNT(*) FROM `ports`"),0); $stat_ports = mysql_result(mysql_query("SELECT COUNT(*) FROM `ports`"),0);
$stat_syslog = mysql_result(mysql_query("SELECT COUNT(*) FROM `syslog`"),0); $stat_syslog = mysql_result(mysql_query("SELECT COUNT(*) FROM `syslog`"),0);
$stat_events = mysql_result(mysql_query("SELECT COUNT(*) FROM `eventlog`"),0); $stat_events = mysql_result(mysql_query("SELECT COUNT(*) FROM `eventlog`"),0);
$stat_apps = mysql_result(mysql_query("SELECT COUNT(*) FROM `applications`"),0); $stat_apps = mysql_result(mysql_query("SELECT COUNT(*) FROM `applications`"),0);
$stat_services = mysql_result(mysql_query("SELECT COUNT(*) FROM `services`"),0); $stat_services = mysql_result(mysql_query("SELECT COUNT(*) FROM `services`"),0);
$stat_storage = mysql_result(mysql_query("SELECT COUNT(*) FROM `storage`"),0); $stat_storage = mysql_result(mysql_query("SELECT COUNT(*) FROM `storage`"),0);
$stat_diskio = mysql_result(mysql_query("SELECT COUNT(*) FROM `ucd_diskio`"),0); $stat_diskio = mysql_result(mysql_query("SELECT COUNT(*) FROM `ucd_diskio`"),0);
$stat_processors = mysql_result(mysql_query("SELECT COUNT(*) FROM `processors`"),0); $stat_processors = mysql_result(mysql_query("SELECT COUNT(*) FROM `processors`"),0);
$stat_memory = mysql_result(mysql_query("SELECT COUNT(*) FROM `mempools`"),0); $stat_memory = mysql_result(mysql_query("SELECT COUNT(*) FROM `mempools`"),0);
$stat_sensors = mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors`"),0); $stat_sensors = mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors`"),0);
$stat_toner = mysql_result(mysql_query("SELECT COUNT(*) FROM `toner`"),0); $stat_toner = mysql_result(mysql_query("SELECT COUNT(*) FROM `toner`"),0);
$stat_hrdev = mysql_result(mysql_query("SELECT COUNT(*) FROM `hrDevice`"),0); $stat_hrdev = mysql_result(mysql_query("SELECT COUNT(*) FROM `hrDevice`"),0);
$stat_entphys = mysql_result(mysql_query("SELECT COUNT(*) FROM `entPhysical`"),0); $stat_entphys = mysql_result(mysql_query("SELECT COUNT(*) FROM `entPhysical`"),0);
$stat_ipv4_addy = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_addresses`"),0); $stat_ipv4_addy = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_addresses`"),0);
$stat_ipv4_nets = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_networks`"),0); $stat_ipv4_nets = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_networks`"),0);
$stat_ipv6_addy = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv6_addresses`"),0); $stat_ipv6_addy = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv6_addresses`"),0);
$stat_ipv6_nets = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv6_networks`"),0); $stat_ipv6_nets = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv6_networks`"),0);
$stat_pw = mysql_result(mysql_query("SELECT COUNT(*) FROM `pseudowires`"),0); $stat_pw = mysql_result(mysql_query("SELECT COUNT(*) FROM `pseudowires`"),0);
$stat_vrf = mysql_result(mysql_query("SELECT COUNT(*) FROM `vrfs`"),0); $stat_vrf = mysql_result(mysql_query("SELECT COUNT(*) FROM `vrfs`"),0);
$stat_vlans = mysql_result(mysql_query("SELECT COUNT(*) FROM `vlans`"),0); $stat_vlans = mysql_result(mysql_query("SELECT COUNT(*) FROM `vlans`"),0);
echo("
echo(" <table width=95% cellpadding=5 cellspacing=0>
<tr>
<table width=95% cellpadding=5 cellspacing=0> <td width=45%><img src='images/icons/device.png' class='optionicon'> <b>Devices</b></td><td align=right>$stat_devices</td>
<tr> <td width=45%><img src='images/icons/port.png' class='optionicon'> <b>Ports</b></td><td align=right>$stat_ports</td>
<td width=45%><img src='images/icons/device.png' class='optionicon'> <b>Devices</b></td><td align=right>$stat_devices</td> </tr>
<td width=45%><img src='images/icons/port.png' class='optionicon'> <b>Ports</b></td><td align=right>$stat_ports</td> <tr>
</tr> <td><img src='images/icons/ipv4.png' class='optionicon'> <b>IPv4 Addresses<b></td><td align=right>$stat_ipv4_addy</td>
<tr> <td><img src='images/icons/ipv4.png' class='optionicon'> <b>IPv4 Networks</b></td><td align=right>$stat_ipv4_nets</td>
<td><img src='images/icons/ipv4.png' class='optionicon'> <b>IPv4 Addresses<b></td><td align=right>$stat_ipv4_addy</td> </tr>
<td><img src='images/icons/ipv4.png' class='optionicon'> <b>IPv4 Networks</b></td><td align=right>$stat_ipv4_nets</td> <tr>
</tr> <td><img src='images/icons/ipv6.png' class='optionicon'> <b>IPv6 Addresses<b></td><td align=right>$stat_ipv6_addy</td>
<tr> <td><img src='images/icons/ipv6.png' class='optionicon'> <b>IPv6 Networks</b></td><td align=right>$stat_ipv6_nets</td>
<td><img src='images/icons/ipv6.png' class='optionicon'> <b>IPv6 Addresses<b></td><td align=right>$stat_ipv6_addy</td> </tr>
<td><img src='images/icons/ipv6.png' class='optionicon'> <b>IPv6 Networks</b></td><td align=right>$stat_ipv6_nets</td> <tr>
</tr> <td><img src='images/icons/services.png' class='optionicon'> <b>Services<b></td><td align=right>$stat_services</td>
<tr> <td><img src='images/icons/apps.png' class='optionicon'> <b>Applications</b></td><td align=right>$stat_apps</td>
<td><img src='images/icons/services.png' class='optionicon'> <b>Services<b></td><td align=right>$stat_services</td> </tr>
<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>
<tr> <td><img src='images/icons/memory.png' class='optionicon'> <b>Memory</b></td><td align=right>$stat_memory</td>
<td ><img src='images/icons/processors.png' class='optionicon'> <b>Processors</b></td><td align=right>$stat_processors</td> </tr>
<td><img src='images/icons/memory.png' class='optionicon'> <b>Memory</b></td><td align=right>$stat_memory</td> <tr>
</tr> <td><img src='images/icons/storage.png' class='optionicon'> <b>Storage</b></td><td align=right>$stat_storage</td>
<tr> <td><img src='images/icons/diskio.png' class='optionicon'> <b>Disk I/O</b></td><td align=right>$stat_diskio</td>
<td><img src='images/icons/storage.png' class='optionicon'> <b>Storage</b></td><td align=right>$stat_storage</td> </tr>
<td><img src='images/icons/diskio.png' class='optionicon'> <b>Disk I/O</b></td><td align=right>$stat_diskio</td> <tr>
</tr> <td><img src='images/icons/inventory.png' class='optionicon'> <b>HR-MIB</b></td><td align=right>$stat_hrdev</td>
<tr> <td><img src='images/icons/inventory.png' class='optionicon'> <b>Entity-MIB</b></td><td align=right>$stat_entphys</td>
<td><img src='images/icons/inventory.png' class='optionicon'> <b>HR-MIB</b></td><td align=right>$stat_hrdev</td> </tr>
<td><img src='images/icons/inventory.png' class='optionicon'> <b>Entity-MIB</b></td><td align=right>$stat_entphys</td> <tr>
</tr> <td ><img src='images/icons/syslog.png' class='optionicon'> <b>Syslog Entries</b></td><td align=right>$stat_syslog</td>
<tr> <td><img src='images/icons/eventlog.png' class='optionicon'> <b>Eventlog Entries</b></td><td align=right>$stat_events</td>
<td ><img src='images/icons/syslog.png' class='optionicon'> <b>Syslog Entries</b></td><td align=right>$stat_syslog</td> </tr>
<td><img src='images/icons/eventlog.png' class='optionicon'> <b>Eventlog Entries</b></td><td align=right>$stat_events</td> <tr>
</tr> <td ><img src='images/icons/sensors.png' class='optionicon'> <b>Sensors</b></td><td align=right>$stat_sensors</td>
<tr> <td><img src='images/icons/toner.png' class='optionicon'> <b>Toner</b></td><td align=right>$stat_toner</td>
<td ><img src='images/icons/sensors.png' class='optionicon'> <b>Sensors</b></td><td align=right>$stat_sensors</td> </tr>
<td><img src='images/icons/toner.png' class='optionicon'> <b>Toner</b></td><td align=right>$stat_toner</td> </table>
</tr>
</table>
"); ");
print_optionbar_end(); ?> print_optionbar_end(); ?>
</div>
<div style="float: left; padding: 0px; width: 49%">
</div> <?php
<div style="float: left; padding: 0px; width: 49%">
<?php
$Observium_version = $config['version'];
if (file_exists('.svn/entries'))
{
$svn = File('.svn/entries');
$Observium_version .='-SVN r' . trim($svn[3]);
unset($svn);
}
$Observium_version = $config['version'];
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']); $apache_version = str_replace("Apache/", "", $_SERVER['SERVER_SOFTWARE']);
$php_version = phpversion(); $php_version = phpversion();
$t=mysql_query("select version() as ve"); $t = mysql_query("select version() as ve");
$r=mysql_fetch_object($t); $r = mysql_fetch_object($t);
$mysql_version = $r->ve; $mysql_version = $r->ve;
$netsnmp_version = shell_exec($config['snmpget'] . " --version"); $netsnmp_version = shell_exec($config['snmpget'] . " --version");
@@ -130,38 +130,40 @@ $netsnmp_version = shell_exec($config['snmpget'] . " --version");
print_optionbar_start(NULL); print_optionbar_start(NULL);
echo(" echo("
<h3>Versions</h3> <h3>Versions</h3>
<table width=100% cellpadding=3 cellspacing=0 border=0> <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>Observium</b></td><td>$Observium_version</td></tr>
<tr valign=top><td><b>Apache</b></td><td>$apache_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>PHP</b></td><td>$php_version</td></tr>
<tr valign=top><td><b>MySQL</b></td><td>$mysql_version</td></tr> <tr valign=top><td><b>MySQL</b></td><td>$mysql_version</td></tr>
</table> </table>
"); ");
print_optionbar_end(); print_optionbar_end();
?> ?>
<h5>Observium is an autodiscovering PHP/MySQL based network monitoring system.</h5> <h5>Observium is an autodiscovering PHP/MySQL based network monitoring system.</h5>
<p><a href="http://www.observium.org">Website</a> | <p>
<a href="http://www.observium.org/wiki/">Support Wiki</a> | <a href="http://www.observium.org">Website</a> |
<a href="http://www.observium.org/forum/">Forum</a> | <a href="http://www.observium.org/wiki/">Support Wiki</a> |
<a href="http://www.observium.org/bugs/">Bugtracker</a> | <a href="http://www.observium.org/forum/">Forum</a> |
<a href="http://www.observium.org/pmwiki.php/Main/MailingLists">Mailing List</a> | <a href="http://www.observium.org/bugs/">Bugtracker</a> |
<a href="http://twitter.com/Observium">Twitter</a> | <a href="http://www.observium.org/pmwiki.php/Main/MailingLists">Mailing List</a> |
<a href="http://www.facebook.com/pages/Observer/128354461353">Facebook</a></p> <?php /*
<a href="http://twitter.com/Observium">Twitter</a> |
*/ ?>
<a href="http://www.facebook.com/pages/Observer/128354461353">Facebook</a>
</p>
<h4>The Team</h4>
<h4>The Team</h4>
<img src="images/icons/flags/gb.png"> <strong>Adam Armstrong</strong> Project Founder<br /> <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>Geert Hauwaerts</strong> Developer<br />
<img src="images/icons/flags/be.png"> <strong>Tom Laermans</strong> Developer<br /> <img src="images/icons/flags/be.png"> <strong>Tom Laermans</strong> Developer<br />
</ul>
<h4>Acknowledgements</h4> <h4>Acknowledgements</h4>
<b>Stu Nicholls</b> Dropdown menu CSS code. <br /> <b>Stu Nicholls</b> Dropdown menu CSS code. <br />
<b>Mark James</b> Silk Iconset. <br /> <b>Mark James</b> Silk Iconset. <br />
@@ -170,5 +172,5 @@ print_optionbar_end();
<b>Xiaochi Jin</b> Logo design. <br /> <b>Xiaochi Jin</b> Logo design. <br />
<b>Bruno Pramont</b> Collectd code. <br /> <b>Bruno Pramont</b> Collectd code. <br />
</div>
</div> </div>