Message ID | 1503333785-5003-3-git-send-email-freifunk@adrianschmutzler.de |
---|---|
State | Superseded |
Delegated to: | Adrian Schmutzler |
Headers | show |
diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index 7f2cbb5..76d68f1 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:=5 +PKG_VERSION:=6 PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-web diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/06-fff-reset-update-notification b/src/packages/fff/fff-web/files/etc/uci-defaults/06-fff-reset-update-notification new file mode 100644 index 0000000..4d270b4 --- /dev/null +++ b/src/packages/fff/fff-web/files/etc/uci-defaults/06-fff-reset-update-notification @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$(uci -q get fff.notifyupdate.resetonupgrade)" = "1" ] ; then + uci -q set "fff.notifyupdate.value=1" + uci -q commit fff + /bin/rm -f /tmp/fwcheck +fi + +exit 0 diff --git a/src/packages/fff/fff-web/files/usr/sbin/disable_update_notification.sh b/src/packages/fff/fff-web/files/usr/sbin/disable_update_notification.sh new file mode 100755 index 0000000..65b02e0 --- /dev/null +++ b/src/packages/fff/fff-web/files/usr/sbin/disable_update_notification.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# This disables the WebUI update notification permanently +# (until next firmware upgrade) + +uci -q set "fff.notifyupdate=webui" +uci -q set "fff.notifyupdate.value=0" +uci -q set "fff.notifyupdate.resetonupgrade=1" + +uci -q commit fff + +/bin/rm -f /tmp/isupdate +/bin/rm -f /tmp/fwcheck 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 dffca6d..775133d 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 @@ -16,7 +16,7 @@ HOSTNAME=$(uci -q get 'fff.@system[0].hostname') NOW=$(date +%s) #Check if new Firmware check older then 1 day -if [ ! -s /tmp/fwcheck ] || [ "$(cat /tmp/fwcheck)" -lt "$NOW" ] ; then +if ( [ ! -s /tmp/fwcheck ] || [ "$(cat /tmp/fwcheck)" -lt "$NOW" ] ) && [ ! "$(uci -q get fff.notifyupdate.value)" = "0" ] ; then rm -f /tmp/isupdate NEXTUPDATE=$(($(date +%s)+86400)) echo $NEXTUPDATE > /tmp/fwcheck