From 438aa30bd93cbc5a024f31d382c3686f88286152 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Tue, 5 Nov 2013 10:23:15 +1000
Subject: [PATCH] Tidy about page

- Restore previous Apache/PHP/MySQL/RRDtool versions
- Reorder and clean up headers
- Turn off ugly page generation stats by default
---
 html/index.php            | 10 +++++-----
 html/pages/about.inc.php  | 17 ++++++++---------
 includes/defaults.inc.php |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/html/index.php b/html/index.php
index 662e00e5a5..f0f06cdbdf 100755
--- a/html/index.php
+++ b/html/index.php
@@ -269,12 +269,12 @@ if ($_SESSION['authenticated'])
 $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="' . $config['project_url'] . '" target="_blank">' . $config['project_name_version']);
-
-echo('</a>. Copyright &copy; 2006-2012 by Adam Armstrong. All rights reserved.');
-echo('</a>. Copyright &copy; '. 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>.');
+echo('<br /> <br />  <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
+echo('<br />Powered by <a href="' . $config['project_url'] . '" target="_blank">' . $config['project_name_version'].'</a>. ');
+echo($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>.<br/>');
+echo('Copyright &copy; 2006-2012 by Adam Armstrong. Copyright &copy; 2013-'.date("Y").' by the '.$config['project_name'].' Contributors.');
 
+# FIXME - move this
 if ($config['page_gen'])
 {
     echo('<br />MySQL: Cell    '.($db_stats['fetchcell']+0).'/'.round($db_stats['fetchcell_sec']+0,3).'s'.
diff --git a/html/pages/about.inc.php b/html/pages/about.inc.php
index 51d0d9a1a2..e80cb7ca25 100644
--- a/html/pages/about.inc.php
+++ b/html/pages/about.inc.php
@@ -1,9 +1,4 @@
 <div style="margin: 10px;">
-  <h3><?php
-
-echo($config['project_name_version']);
-
-  ?></h3>
   <div style="float: right; padding: 0px; width: 49%">
 <?php print_optionbar_start(NULL); ?>
     <h3>License</h3>
@@ -101,15 +96,21 @@ print_optionbar_end(); ?>
   </div>
 
   <div style="float: left; padding: 0px; width: 49%">
+
+    <h3>LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system forked from the last GPL-licensed revision of Observium.</h3>
 <?php
 
 $project_name = $config['project_name'];
 $project_version = $config['version'];
+$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));
 
 print_optionbar_start(NULL);
 
 echo("
-    <h3>Versions</h3>
     <table width=100% cellpadding=3 cellspacing=0 border=0>
       <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>
@@ -123,7 +124,7 @@ print_optionbar_end();
 
 ?>
 
-    <h5>LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system forked from the last GPL-licensed revision of Observium.</h5>
+    <h5>LibreNMS is a community-based project. Please feel free to join us and contribute code, documentation, and bug reports:</h5>
 
     <p>
       <a href="https://github.com/librenms/">Web site</a> |
@@ -132,8 +133,6 @@ print_optionbar_end();
       <a href="http://twitter.com/librenms">Twitter</a>
     </p>
 
-    <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>
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index a264c5e5b0..262f99cd6c 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -114,7 +114,7 @@ $config['front_page']       = "pages/front/default.php";
 $config['page_title_prefix'] = "";
 $config['page_title_suffix'] = $config['project_name'];
 $config['timestamp_format'] = 'd-m-Y H:i:s';
-$config['page_gen']         = 1;
+$config['page_gen']         = 0;                 # display MySqL & PHP stats in footer?
 $config['web_header']       = "header.inc.php";  # in html/includes
 $config['login_message']    = "Unauthorised access or use shall render the user liable to criminal and/or civil prosecution.";