diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index c0783b7..139cd24 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_RELEASE:=11 +PKG_RELEASE:=12 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/footer b/src/packages/fff/fff-web/files/www/include/footer similarity index 100% rename from src/packages/fff/fff-web/files/www/ssl/cgi-bin/footer rename to src/packages/fff/fff-web/files/www/include/footer diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header b/src/packages/fff/fff-web/files/www/include/header similarity index 100% rename from src/packages/fff/fff-web/files/www/ssl/cgi-bin/header rename to src/packages/fff/fff-web/files/www/include/header diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers b/src/packages/fff/fff-web/files/www/include/helpers similarity index 100% rename from src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers rename to src/packages/fff/fff-web/files/www/include/helpers diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html index eda5d15..ad42433 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html @@ -13,8 +13,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then fi fi %> -<%in /www/ssl/cgi-bin/header %> -<%in /www/ssl/cgi-bin/helpers %> +<%in /www/include/header %> +<%in /www/include/helpers %> <% show_msg %> <% if pidof fastd >/dev/null ; then @@ -116,4 +116,4 @@ fi -<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/password.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/password.html index fc3055a..e65d072 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/password.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/password.html @@ -20,8 +20,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then fi fi %> -<%in /www/ssl/cgi-bin/header %> -<%in /www/ssl/cgi-bin/helpers %> +<%in /www/include/header %> +<%in /www/include/helpers %> <% show_msg %>
@@ -43,7 +43,7 @@ fi
-<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %> <% #force instant password change if [ "$restart_uhttpd" = "1" ] ; then diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html index 01506fc..e13929e 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html @@ -71,8 +71,8 @@ format_port() { %> -<%in /www/ssl/cgi-bin/header %> -<%in /www/ssl/cgi-bin/helpers %> +<%in /www/include/header %> +<%in /www/include/helpers %> <% show_msg %>
@@ -237,7 +237,7 @@ format_port() { <% fi %>
-<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %> <% # write if [ "$do_reboot" = "1" ] ; then diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/reboot.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/reboot.html index 2efdf3e..7d4e47d 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/reboot.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/reboot.html @@ -9,8 +9,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then fi fi %> -<%in /www/ssl/cgi-bin/header %> -<%in /www/ssl/cgi-bin/helpers %> +<%in /www/include/header %> +<%in /www/include/helpers %> <% show_msg %>
@@ -26,7 +26,7 @@ fi
-<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %> <% # write if [ "$do_reboot" = "1" ] ; then diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html index 7dd5eed..776532a 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/settings.html @@ -65,8 +65,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then fi fi %> -<%in /www/ssl/cgi-bin/header %> -<%in /www/ssl/cgi-bin/helpers %> +<%in /www/include/header %> +<%in /www/include/helpers %> <% # read chkd='checked="checked" ' @@ -154,4 +154,4 @@ fi -<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html index 5fe1526..d20c1b4 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/upgrade.html @@ -29,8 +29,8 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then fi fi %> -<%in /www/ssl/cgi-bin/header %> -<%in /www/ssl/cgi-bin/helpers %> +<%in /www/include/header %> +<%in /www/include/helpers %> <% show_msg %>
@@ -60,7 +60,7 @@ fi
-<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %> <% # write if [ "$do_reset" = "1" ] ; then diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html index 9905297..1191252 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/wifiscan.html @@ -1,6 +1,6 @@ #!/usr/bin/haserl -<%in /www/ssl/cgi-bin/header %> +<%in /www/include/header %>
@@ -23,4 +23,4 @@ iw dev w2mesh scan | sed 's/^BSS/\nBSS/g' |\
-<%in /www/ssl/cgi-bin/footer %> +<%in /www/include/footer %>