fff-web: remove included files from HTTP-accessible folder

Certain files are only included, but are not meant to be accessed
via HTTP directly. Move those to a dedicated directory that is not
served via HTTP.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Christian Dresel <freifunk@dresel.systems>

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)
 

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
 </td></tr>
 </table>
 
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>

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 %>
 <form method="POST">
 <input type="text" name="username" value="root" style="display: none;" />
@@ -43,7 +43,7 @@ fi
 </table>
 <input type="submit" style="margin-top: 5px; margin-left: 3px;" />
 </form>
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>
 <%
 #force instant password change
 if [ "$restart_uhttpd" = "1" ] ; then

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 %>
 <form method="post">
 <table style="width: 100%;">
@@ -237,7 +237,7 @@ format_port() {
 <% fi %>
 </table>
 </form>
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>
 <%
 # write
 if [ "$do_reboot" = "1" ] ; then

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 %>
 <form method="POST">
 <table style="width: 100%;">
@@ -26,7 +26,7 @@ fi
 </td></tr>
 </table>
 </form>
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>
 <%
 # write
 if [ "$do_reboot" = "1" ] ; then

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
 </td></tr>
 </table>
 </form>
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>

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 %>
 <form method="post" enctype="multipart/form-data">
 <table style="width: 100%;">
@@ -60,7 +60,7 @@ fi
 </td></tr>
 </table>
 </form>
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>
 <%
 # write
 if [ "$do_reset" = "1" ] ; then

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 %>
 <table style="width: 100%">
 <tr><td>
 <fieldset>
@@ -23,4 +23,4 @@ iw dev w2mesh scan | sed 's/^BSS/\nBSS/g' |\
 </td></tr>
 </table>
 
-<%in /www/ssl/cgi-bin/footer %>
+<%in /www/include/footer %>