From ce45e69774828b3a24f786dbd7b47af2389938f2 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sun, 19 Mar 2017 21:21:08 +0100
Subject: [PATCH] added config check

---
 contrib/updatecheck/calcversions.sh |  7 ++++---
 contrib/updatecheck/index.php       | 30 +++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/contrib/updatecheck/calcversions.sh b/contrib/updatecheck/calcversions.sh
index cf22c172..da502b97 100755
--- a/contrib/updatecheck/calcversions.sh
+++ b/contrib/updatecheck/calcversions.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-version=`head -n 1 VERSION`
+version=`head -n 1 ../../VERSION`
 revision=`git describe --always`
-echo "ebusd=${version}.${revision}" > versions.txt
-#TODO add calculation for config files
+echo "ebusd=${version},${revision}" > versions.txt
+files=`find config/ -type f -or -type l`
+../../src/lib/ebus/test/test_filereader $files|sed -e 's#^config/##' -e 's#^\([^ ]*\) #\1=#' -e 's# #,#g'|sort >> versions.txt
diff --git a/contrib/updatecheck/index.php b/contrib/updatecheck/index.php
index 67f127c4..3be24e92 100644
--- a/contrib/updatecheck/index.php
+++ b/contrib/updatecheck/index.php
@@ -1,8 +1,6 @@
 <?php
 $agent = $_SERVER['HTTP_USER_AGENT'];
 if (substr($agent, 0, 5)==='ebusd') {
-  $t = time();
-  $a = $_SERVER["REMOTE_ADDR"];
   $r = @file_get_contents('php://input');
   $v = @file_get_contents('versions.txt');
   $versions = array();
@@ -20,17 +18,37 @@ if (substr($agent, 0, 5)==='ebusd') {
   header('Content-Type: text/plain');
   $ret = 'unknown';
   $r = @json_decode($r, true);
-  if (!$r || !isset($r['v'])) {
+  if (!$r || !isset($r['v']) || !isset($r['r'])) {
     $ret = 'invalid request';
   } else {
     if (isset($versions['ebusd'])) {
-      if ($r['v']==$versions['ebusd'][0]) {
+      if ($r['v']==$versions['ebusd'][0] && $r['r']==$versions['ebusd'][1]) {
         $ret = 'OK';
+      } else if ($r['v']==$versions['ebusd'][0]) {
+        $ret = 'revision '.$versions['ebusd'][1].' available';
       } else {
-        $ret = 'ebusd '.$versions['ebusd'][0].' available';
+        $ret = 'version '.$versions['ebusd'][0].' available';
       }
     }
-    // TODO add check for config files
+    $configs = '';
+    $neweravail = 0;
+    $func = function($val, $k) {
+      global $versions, $configs, $neweravail;
+      $v = $versions[$k];
+      if ($v) {
+        $newer = $v[2]>$val['t'];
+        if ($newer || $v[0]!=$val['h'] || $v[1]!=$val['s']) {
+          if ($newer) $neweravail++;
+          $configs .= ', '.$k.': '.($newer?'newer':'different').' version available';
+        }
+      }
+    };
+    array_walk($r['l'], $func);
+    if (strlen($configs)>100) {
+      $ret .= ($neweravail?$neweravail.', newer ':', different').' configuration files available';
+    } else {
+       $ret .= $configs;
+     }
   }
   echo $ret;
   exit;