From d9af2c6a7330baac14421b4cd8c42f49b64c5809 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 24 Mar 2009 13:56:47 +0000
Subject: [PATCH] updates

git-svn-id: http://www.observium.org/svn/observer/trunk@372 61d68cd4-352d-0410-923a-c4978735b2b8
---
 README                     | 23 ++++++++++++++++++-----
 cron-hourly.sh             |  2 ++
 includes/static-config.php |  3 ++-
 versioncheck.php           | 12 +++++++++---
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 6c4436faa8..c6a946f0b0 100644
--- a/README
+++ b/README
@@ -25,12 +25,25 @@ Installation
 Installation of Observer is currently not for the faint of heart! There is no automated
 install script, so it'll probably take quite a bit of fiddling!
 
-Please see http://www.project-observer.org.
+Please see http://www.observernms.org.
 
 Changelog
 ---------
 
-Release 0.4.0.1 ( 20th Nov 2008 )
+Release 0.5 ( 24 March 2009 )
+
+Cleaned up a lot of hardcoded paths
+Cleaned up BGP session polling
+Added CDP-based device link map
+Added sysName tracking for more accurate CDP linking
+Added more search features for syslog, device list and inventory
+Replaced old syslog system with new version, without pipes
+Added more Pseudowire/X-Connect tracking information
+Fixed a lot of URLs to be absolute URLs built from base_url
+Fixed some mod_rewrite rules
+Added basic MAC accounting polling
+
+Release 0.4.1 ( 20th Nov 2008 )
 
 Cleaned up some configuration settings
 Added more connection type rewrites
@@ -135,11 +148,11 @@ Release 0.1.2 - Late November 2006
 Graphing of additional server-related data
 
 Release 0.1.1 - November 2006
-Removal of large amounts of perl.
+Removal of large amounts of perl
 
 Release 0.1.0 - October 2006
-Initial Release.
-Basic discovery in place. Graphing in place.
+Initial Release
+Basic discovery in place. Graphing in place
 
 
 Feature Waiting List
diff --git a/cron-hourly.sh b/cron-hourly.sh
index ee8174dbde..9f5f02337f 100755
--- a/cron-hourly.sh
+++ b/cron-hourly.sh
@@ -7,3 +7,5 @@
 ./generate-map.sh
 ./check-errors.php
 ./versioncheck.php --cron
+./mac-accounting.sh && ./discover-macaccounting.php
+
diff --git a/includes/static-config.php b/includes/static-config.php
index da7e35d9eb..097b06c0c0 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -2,13 +2,14 @@
 
 ## ifDescr whitelist (used instead of ifName)
 $config['ifdescr']['IOS'] = true;
+$config['ifdescr']['IOS XE'] = true;
 
 
 ##############################
 # No changes below this line #
 ##############################
 
-$config['version'] = "0.4.1";
+$config['version'] = "0.4.2";
 
 ### Connect to database
 if (!@mysql_connect($config['db_host'], $config['db_user'], $config['db_pass'])) {
diff --git a/versioncheck.php b/versioncheck.php
index 1bb25b4c37..68fff9862c 100755
--- a/versioncheck.php
+++ b/versioncheck.php
@@ -4,7 +4,10 @@
 include("config.php");
 include("includes/functions.php");
 
-$dataHandle = fopen("http://www.observernms.org/latest.php", r);
+$interfaces = mysql_result(mysql_query("SELECT count(*) FROM interfaces"),0); 
+$devices    = mysql_result(mysql_query("SELECT count(*) FROM devices"),0);
+
+$dataHandle = fopen("http://www.observernms.org/latest.php?i=$interfaces&d=$devices&v=".$config['version'], r);
 
 if($dataHandle)
 {
@@ -28,13 +31,16 @@ if($dataHandle)
 
 		if($major > $cur_major) {
 	          echo("New major release : $major.$minor.$release");
-                } elseif ($minor > $cur_minor) {
+                } elseif ($major == $cur_major && $minor > $cur_minor) {
 	          echo("New minor release : $major.$minor.$release");
-                } elseif ($release > $cur_release) {
+                } elseif ($major == $cur_major && $minor == $cur_minor && $release > $cur_release) {
                   echo("New trivial release : $major.$minor.$release");
+                } elseif($major < $cur_major || ($major == $cur_major && $minor < $cur_minor) || ($major == $cur_major && $minor == $cur_minor && $release < $cur_release)) {
+		  echo("Your release is newer than the official version!\n");
                 } else {
 		  echo("Your release is up to date\n");
                 }
+                echo("\n");
              }
 	}
 	fclose($dataHandle);