From patchwork Tue Feb 14 17:24:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Show Updatewarning in WebUI From: Christian Dresel X-Patchwork-Id: 305 Message-Id: <1487093064-6584-1-git-send-email-fff@chrisi01.de> To: franken-dev@freifunk.net Date: Tue, 14 Feb 2017 18:24:24 +0100 Dieses Patch zeigt im Loginbereich des WebUI eine Warnung an, wenn es eine neue Firmwareversion gibt Signed-off-by: Christian Dresel --- src/packages/fff/fff-web/Makefile | 2 +- .../fff/fff-web/files/www/ssl/cgi-bin/header | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index 5772f87..723d9a9 100644 --- a/src/packages/fff/fff-web/Makefile +++ b/src/packages/fff/fff-web/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web -PKG_VERSION:=0.0.3 +PKG_VERSION:=0.0.4 PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-web diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header index 92bdbc6..6a414b1 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header @@ -1,6 +1,8 @@ #!/usr/bin/haserl <% +. /etc/community.cfg +. /etc/firmware_release echo -en "Content-Type: text/html\r\n\r\n" nav_entry() { script_file="/cgi-bin/$1" @@ -12,6 +14,20 @@ nav_entry() { HOSTNAME=$(uci -q get 'system.@system[0].hostname') +NOW=$(date +%s) +#Check if new Firmware check older then 1 day +if [ "$(cat /tmp/fwcheck)" -lt "$NOW" ] ; then + rm -f /tmp/isupdate + NEXTUPDATE=$(($(date +%s)+86400)) + echo $NEXTUPDATE > /tmp/fwcheck + wget "${UPGRADE_PATH}/release.nfo" -P /tmp + VERSION=$(cat /tmp/release.nfo|awk -F: '/VERSION:/ { print $2 }') + rm -f release.nfo + if [ "$VERSION" != "$FIRMWARE_VERSION" ]; then + echo 1 > /tmp/isupdate + fi +fi + %> @@ -47,3 +63,12 @@ HOSTNAME=$(uci -q get 'system.@system[0].hostname')
+ <% + if [ "$(cat /tmp/isupdate)" -eq 1 ] ; then + %> + + + + +
Es ist eine neue Firmware für deinen Freifunkrouter verfügbar
+ <% fi %>