From patchwork Wed Oct 18 21:30:55 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v11,3/6] fff-web: Added options to disable update notification
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 601
Message-Id: <1508362258-8918-3-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Wed, 18 Oct 2017 23:30:55 +0200

Update notification is enabled by default. If required, this
allows disabling it either until next firmware upgrade or
permanently.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-web/Makefile                            |  2 +-
 .../files/etc/uci-defaults/06-fff-reset-update-notification  |  9 +++++++++
 .../fff-web/files/usr/sbin/disable_update_notification.sh    | 12 ++++++++++++
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/header        |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/packages/fff/fff-web/files/etc/uci-defaults/06-fff-reset-update-notification
 create mode 100755 src/packages/fff/fff-web/files/usr/sbin/disable_update_notification.sh

diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile
index d7201e2..c885218 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)/$(PKG_NAME)
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 f98a3f3..42a5760 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
@@ -17,7 +17,7 @@ hood="$(uci -q get "system.@system[0].hood")"
 
 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