From ec5e826b30b9a626dd7d303d927f03e7840d304d Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 5 May 2011 13:04:38 +0000
Subject: [PATCH] cleanups

git-svn-id: http://www.observium.org/svn/observer/trunk@2248 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/print-menubar.php |  4 ++--
 html/index.php                  | 12 ++++++------
 html/pages/about.inc.php        | 26 +++++++++++++-------------
 includes/defaults.inc.php       |  6 ++++++
 includes/static-config.php      | 13 ++++++++++++-
 5 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index ac507de7dc..6e70bbed26 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -336,8 +336,8 @@ if ($_SESSION['userlevel'] >= '5')
 <!--[if IE 7]><!--></a><!--<![endif]-->
         <table><tr><td>
         <ul>
-          <li><a href="search/ipv4/"><img src="images/16/email_link.png" border="0" align="absmiddle" /> IPv4 Search</a></li>
-          <li><a href="search/ipv6/"><img src="images/16/email_link.png" border="0" align="absmiddle" /> IPv6 Search</a></li>
+          <li><a href="search/ipv4/"><img src="images/icons/ipv4.png" border="0" align="absmiddle" /> IPv4 Search</a></li>
+          <li><a href="search/ipv6/"><img src="images/icons/ipv6.png" border="0" align="absmiddle" /> IPv6 Search</a></li>
           <li><a href="search/mac/"><img src="images/16/email_link.png" border="0" align="absmiddle" /> MAC Search</a></li>
         </ul>
       </td></tr></table>
diff --git a/html/index.php b/html/index.php
index 89a9900e05..5cd4290810 100755
--- a/html/index.php
+++ b/html/index.php
@@ -128,12 +128,12 @@ $gentime = substr($run, 0, 5);
 echo('<br /> <br /> <br /> <br />  <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
 echo('<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version']);
 
-if (file_exists('.svn/entries'))
-{
-  $svn = File('.svn/entries');
-  echo('-SVN r' . trim($svn[3]));
-  unset($svn);
-}
+#if (file_exists('.svn/entries'))
+#{
+#  $svn = File('.svn/entries');
+#  echo('-SVN r' . trim($svn[3]));
+#  unset($svn);
+#}
 
 echo('</a>. Copyright &copy; 2006-'. date("Y"). ' by Adam Armstrong. All rights reserved.');
 
diff --git a/html/pages/about.inc.php b/html/pages/about.inc.php
index 885b2fd81f..6df610abec 100644
--- a/html/pages/about.inc.php
+++ b/html/pages/about.inc.php
@@ -3,12 +3,12 @@
 
 echo($config['version']);
 
-if (file_exists('.svn/entries'))
-{
-  $svn = File('.svn/entries');
-  echo('-SVN r' . trim($svn[3]));
-  unset($svn);
-}
+#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%">
@@ -81,7 +81,7 @@ echo("
         <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>
+        <td ><img src='images/icons/processor.png' class='optionicon'> <b>Processors</b></td><td align=right>$stat_processors</td>
         <td><img src='images/icons/memory.png' class='optionicon'> <b>Memory</b></td><td align=right>$stat_memory</td>
       </tr>
       <tr>
@@ -110,12 +110,12 @@ print_optionbar_end(); ?>
 <?php
 
 $Observium_version = $config['version'];
-if (file_exists('.svn/entries'))
-{
-  $svn = File('.svn/entries');
-  $Observium_version .='-SVN r' . trim($svn[3]);
-  unset($svn);
-}
+#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']);
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 83ac47d421..0407d6fe8a 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -124,6 +124,12 @@ $config['show_overview_tab'] = true;
 
 $config['overview_show_sysDescr'] = true;
 
+### Enable version checker & stats
+
+$config['version_check']                = 1; # Enable checking of version in discovery
+                                             # and submittal of basic stats used
+                                             # to prioritise development effort :)
+
 ### Poller/Discovery Modules
 
 $config['enable_bgp']           	= 1; # Enable BGP session collection and display
diff --git a/includes/static-config.php b/includes/static-config.php
index f7fa85ebc6..ebf0ed3d4b 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -884,7 +884,18 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
 # No changes below this line #
 ##############################
 
-$config['version'] = "0.11";
+$config['version']  = "0.11.5.2245";
+
+if (file_exists('.svn/entries'))
+{
+  $svn = File('.svn/entries');
+  $svn_rev = trim($svn[3]);
+  list($svn_date) = explode("T", trim($svn[9]));
+  list($svn_year, $svn_month, $svn_day) = explode("-", $svn_date);
+  $config['version'] = "0." . ($svn_year-2000) . "." . ($svn_month+0) . "." . $svn_rev;
+} else {
+  $config['version'] = $config['version'] . "." . $config['release'];
+}
 
 if (isset($config['rrdgraph_def_text']))
 {