debug build target; updated config tool; install script

author b <rowerynaksiezycu@gmail.com>

Thu, 22 Feb 2024 23:52:04 +0000 (23:52 +0000)

committer b <rowerynaksiezycu@gmail.com>

Thu, 22 Feb 2024 23:52:04 +0000 (23:52 +0000)
author b <rowerynaksiezycu@gmail.com>
Thu, 22 Feb 2024 23:52:04 +0000 (23:52 +0000)
committer b <rowerynaksiezycu@gmail.com>
Thu, 22 Feb 2024 23:52:04 +0000 (23:52 +0000)
diff --git a/403.1.htm b/403.1.htm

deleted file mode 100644 (file)

index c285df8..0000000
--- a/403.1.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<html lang="pl">
-       <head>
-               <title>It's 403fication time! &bull; Bicycles on the Moon</title>
-               <meta http-equiv="Content-type" content="text/html; charset=iso-8859-2">
-               <link rel="icon" type="image/png" href="/img/favicon.png"/>
-       </head>
-       <body>
-               <a href="/"><img src="/img/botmlogo2.png" alt="1190.bicyclesonthemoon.dnsd.info" border="0"></a>
-               <h1>It's 403fication time!</h1>
-               <form method="post" action="/cgi/npb/npbd/403">
-                       403 by URL<br>
-                       URL of image:
-                       <input type="text" name="inpix">
-                       <input type="submit" value="403">
-               </form>
-               <br>
-               <form method="post" action="/cgi/npb/npbd/403" enctype="multipart/form-data">
-                       403 by file upload<br>
-                       Upload the image:
-                       <input type="file" name="inpix">
-                       <input type="submit" value="403">
-               </form>
-               <br>
-               Source code available at <a href="svn://bicyclesonthemoon.dnsd.info/npb">svn://bicyclesonthemoon.dnsd.info/npb</a> (use "e" to login) or <a href="http://1190.bicyclesonthemoon.dnsd.info/pro/npb">http://1190.bicyclesonthemoon.dnsd.info/pro/npb</a>.
-               
-       </body>
-</html>
diff --git a/bluenh.1.htm b/bluenh.1.htm

index c63c6dbb3cba7c1a6701b2006f5b5e5dee1c767d..0c0a7c31f586eed3177f8ca5049ab0c82b5bc674 100644 (file)
--- a/bluenh.1.htm
+++ b/bluenh.1.htm
@@ -1,5 +1,5 @@
                 <h1>ENHANCE!</h1>
                 <h1>ENHANCE!</h1>
-               <form method="post" action="/enhance/bluenh" enctype='multipart/form-data'>
+               <form method="post" action="###HTML_BLUENH_PATH;" enctype='multipart/form-data'>
                         <img src="param.png" alt="parameter explanation picture"><br>
                         <br>
                         a=<input class="pt" type="text" name="a" value=  "0" size="3">, b=<input class="pt" type="text" name="b" value= "34" size="3">, c=<input class="pt" type="text" name="c" value= "41" size="3">,<br>
                         <img src="param.png" alt="parameter explanation picture"><br>
                         <br>
                         a=<input class="pt" type="text" name="a" value=  "0" size="3">, b=<input class="pt" type="text" name="b" value= "34" size="3">, c=<input class="pt" type="text" name="c" value= "41" size="3">,<br>
diff --git a/config b/config

index 1c21433837c5bc34100f04bbfeb8ce403844e91d..fc9affec336a16cde93b2675a836bdd01d1c2210 160000 (submodule)
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit 1c21433837c5bc34100f04bbfeb8ce403844e91d
+Subproject commit fc9affec336a16cde93b2675a836bdd01d1c2210
diff --git a/diff.1.htm b/diff.1.htm

index a9e8274b980260774e003abb98061342962ff87e..d61362483e74ec0375275de87cd3eea7c39bdfc0 100644 (file)
--- a/diff.1.htm
+++ b/diff.1.htm
@@ -1,5 +1,5 @@
                 <h1>See the difference!</h1>
                 <h1>See the difference!</h1>
-               <form method="post" action="/enhance/diff" enctype='multipart/form-data'>
+               <form method="post" action="###HTML_DIFF_PATH;" enctype='multipart/form-data'>
                         Enhance by URL<br>
                         URL 1: <input class="pt" type="text" name="inpix0"><br>
                         URL 2: <input class="pt" type="text" name="inpix1"><br>
                         Enhance by URL<br>
                         URL 1: <input class="pt" type="text" name="inpix0"><br>
                         URL 2: <input class="pt" type="text" name="inpix1"><br>
diff --git a/enhance.1.conf b/enhance.1.conf

index ef0a1741cb3a04a062701e1fddff057c006072b2..9f63f2c86120f49844f3beae4ac6d20689df0cba 100644 (file)
--- a/enhance.1.conf
+++ b/enhance.1.conf
@@ -1,21 +1,13 @@
  # Enhance tools
  
  # Enhance tools
  
-ScriptAlias /enhance/bluenh   ###CONF_bluenh;
-ScriptAlias /enhance/diff     ###CONF_diff;
-ScriptAlias /enhance/nofading ###CONF_nofading;
-ScriptAlias /enhance/npb      ###CONF_npb;
-ScriptAlias /enhance/pal      ###CONF_pal;
-ScriptAlias /enhance/reveal   ###CONF_reveal;
-ScriptAlias /enhance/t-1      ###CONF_t-1;
+ScriptAlias ###CONF_cgi_bluenh;   ###CONF_bin_bluenh;
+ScriptAlias ###CONF_cgi_diff;     ###CONF_bin_diff;
+ScriptAlias ###CONF_cgi_nofading; ###CONF_bin_nofading;
+ScriptAlias ###CONF_cgi_npb;      ###CONF_bin_npb;
+ScriptAlias ###CONF_cgi_pal;      ###CONF_bin_pal;
+ScriptAlias ###CONF_cgi_reveal;   ###CONF_bin_reveal;
+ScriptAlias ###CONF_cgi_t-1;      ###CONF_bin_t-1;
  
  <Directory ###CONF_bin;>
         Require all granted
  </Directory>
  
  <Directory ###CONF_bin;>
         Require all granted
  </Directory>
-
-# legacy redirections
-Redirect permanent /pro/npb/npb.htm /enhance/npb.htm
-Redirect permanent /pro/npb/403.htm /enhance/npb.htm
-Redirect permanent /pro/bluenh/bluenh.htm /enhance/bluenh.htm
-Redirect permanent /pro/nofading/nofading.htm /enhance/nofading.htm
-Redirect permanent /pro/insertframe/insertframe.htm /enhance/pal.htm
-Redirect permanent /pro /enhance?
-\ No newline at end of file
diff --git a/install.sh b/install.sh

new file mode 100755 (executable)

index 0000000..27f5a30
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+make clean
+make -B TARGET=release makefile
+make install
+make clean
diff --git a/makefile b/makefile

index 15bf9ead81bf9eea60247707c63d5beecd687bb1..93446e1f2f3fc64ff9d21250990ec881578abbbb 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,7 +1,6 @@
  # "makefile" is automatically generated from "makefile.1.mak"
  # "makefile" is automatically generated from "makefile.1.mak"
-# 07.12.2022
  # 
  # 
-# Copyright (C) 2022  Balthasar Szczepański
+# Copyright (C) 2022, 2024  Balthasar Szczepański
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as
@@ -17,8 +16,10 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  
+
+DEFAULT_TARGET = debug
  ifndef TARGET
  ifndef TARGET
-TARGET    = release
+TARGET    = debug
  # when want to change target run this first:
  # make -B TARGET=target_name makefile
  endif
  # when want to change target run this first:
  # make -B TARGET=target_name makefile
  endif
@@ -37,18 +38,19 @@ MKDIR=/usr/bin/mkdir
  PERL =/usr/bin/perl
  RM   =/usr/bin/rm
  
  PERL =/usr/bin/perl
  RM   =/usr/bin/rm
  
-BIN_PATH = /botm/bin/enhance
-TMP_PATH = /botm/tmp/enhance
-WWW_PATH = /botm/www/1190/enhance
+BIN_PATH = /botm/bin/test-enhance
+TMP_PATH = /botm/tmp/test-enhance
+WWW_PATH = /botm/www/1190/enhancetest
  
  
-CONF = /botm/etc/www/conf/1190/enhance.conf
+CONF = /botm/etc/www/conf/1190/test-enhance.conf
  
  
  CONFIGFILE = settings-$(TARGET).txt settings.txt
  
  
  CONFIGFILE = settings-$(TARGET).txt settings.txt
+DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt
  
  # The configuration tool
  # http://bicyclesonthemoon.info/git/botm-config 
  
  # The configuration tool
  # http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE = $(PERL) ./configure.pl
+CONFIGURE = $(PERL) ./configure.pl --do
  CONFIGURE_CMD = $(CONFIGURE) $(CONFIGFILE)
  
  
  CONFIGURE_CMD = $(CONFIGURE) $(CONFIGFILE)
  
  
@@ -173,10 +175,10 @@ all: $(BIN) $(WWW) enhance.conf
         
  
  makefile: makefile.1.mak $(CONFIGFILE) configure.pl
         
  
  makefile: makefile.1.mak $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) < makefile.1.mak > makefile 
+       $(CONFIGURE_CMD) --in makefile.1.mak --out makefile 
  
  configure.pl: $(CONFIGFILE) config/configure.1.pl
  
  configure.pl: $(CONFIGFILE) config/configure.1.pl
-       $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
+       $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
  
  
  enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG)
  
  
  enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG)
@@ -192,7 +194,7 @@ $(H_SUBTOOL): %.h: settings-subtool.txt subtool.h configure.pl
         $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@
  
  $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)  configure.pl
         $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@
  
  $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)  configure.pl
-       $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
+       $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE)
         
  $(CGI): %: %.c online-core.c online-core.h $(H_PNG)
         $(CC) $(CF) -o $@ $*.c online-core.c $(L_CGI)
         
  $(CGI): %: %.c online-core.c online-core.h $(H_PNG)
         $(CC) $(CF) -o $@ $*.c online-core.c $(L_CGI)
@@ -204,10 +206,10 @@ f2h: f2h.c
         $(CC) $(CF) -o f2h f2h.c
  
  $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE) configure.pl
         $(CC) $(CF) -o f2h f2h.c
  
  $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE) configure.pl
-       $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) > $*.htm
+       $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) --out $*.htm
  
  index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE) configure.pl
  
  index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE) configure.pl
-       $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) > index.htm
+       $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) --out index.htm
  
  
  setuid: $(SETUID)
  
  
  setuid: $(SETUID)
@@ -230,9 +232,11 @@ cp_www: $(WWW) | mktree
         $(CP) -r $(WWW) $(WWW_PATH)
  
  install: all cp_bin cp_www cp_conf
         $(CP) -r $(WWW) $(WWW_PATH)
  
  install: all cp_bin cp_www cp_conf
+       
  
  clean:
         $(RM) -f enhance configure.pl $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI)
  
  clean:
         $(RM) -f enhance configure.pl $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI)
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile
  
  PHONY: all clean install setuid mktree cp_bin cp_www
  
  
  PHONY: all clean install setuid mktree cp_bin cp_www
  
diff --git a/makefile.1.mak b/makefile.1.mak

index 65a80a71fefc7923cb67c277a25376ccce5bae24..923901c9ae1f7e78a72d94afb9362aa3c3ecda0f 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -1,7 +1,6 @@
  # "makefile" is automatically generated from "makefile.1.mak"
  # "makefile" is automatically generated from "makefile.1.mak"
-# 07.12.2022
  # 
  # 
-# Copyright (C) 2022  Balthasar Szczepański
+# Copyright (C) 2022, 2024  Balthasar Szczepański
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as
@@ -17,8 +16,10 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  
+
+DEFAULT_TARGET = debug
  ifndef TARGET
  ifndef TARGET
-TARGET = debug ###MAKE_TARGET:
+TARGET = $(DEFAULT_TARGET) ###MAKE_TARGET:
  # when want to change target run this first:
  # make -B TARGET=target_name makefile
  endif
  # when want to change target run this first:
  # make -B TARGET=target_name makefile
  endif
@@ -45,10 +46,11 @@ PERL = perl
  
  
  CONFIGFILE = settings-$(TARGET).txt settings.txt
  
  
  CONFIGFILE = settings-$(TARGET).txt settings.txt
+DEFAULT_CONFIGFILE = settings-$(DEFAULT_TARGET).txt settings.txt
  
  # The configuration tool
  # http://bicyclesonthemoon.info/git/botm-config 
  
  # The configuration tool
  # http://bicyclesonthemoon.info/git/botm-config 
-CONFIGURE = $(PERL) ./configure.pl
+CONFIGURE = $(PERL) ./configure.pl --do
  CONFIGURE_CMD = $(CONFIGURE) $(CONFIGFILE)
  
  
  CONFIGURE_CMD = $(CONFIGURE) $(CONFIGFILE)
  
  
@@ -173,10 +175,10 @@ all: $(BIN) $(WWW) enhance.conf
         
  
  makefile: makefile.1.mak $(CONFIGFILE) configure.pl
         
  
  makefile: makefile.1.mak $(CONFIGFILE) configure.pl
-       $(CONFIGURE_CMD) < makefile.1.mak > makefile 
+       $(CONFIGURE_CMD) --in makefile.1.mak --out makefile 
  
  configure.pl: $(CONFIGFILE) config/configure.1.pl
  
  configure.pl: $(CONFIGFILE) config/configure.1.pl
-       $(PERL) config/configure.1.pl target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
+       $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
  
  
  enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG)
  
  
  enhance: enhance.c core.h core.c $(H_SUBTOOL) $(C_SUBTOOL) $(H_PNG)
@@ -192,7 +194,7 @@ $(H_SUBTOOL): %.h: settings-subtool.txt subtool.h configure.pl
         $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@
  
  $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)  configure.pl
         $(CONFIGURE) subtool=$* settings-subtool.txt --in subtool.h --out $@
  
  $(TO_GENERATE): $(GENERATE_FROM) $(CONFIGFILE)  configure.pl
-       $(CONFIGURE_CMD) --in $(GENERATE_FROM) --out $(TO_GENERATE)
+       $(CONFIGURE_CMD) --v --in $(GENERATE_FROM) --out $(TO_GENERATE)
         
  $(CGI): %: %.c online-core.c online-core.h $(H_PNG)
         $(CC) $(CF) -o $@ $*.c online-core.c $(L_CGI)
         
  $(CGI): %: %.c online-core.c online-core.h $(H_PNG)
         $(CC) $(CF) -o $@ $*.c online-core.c $(L_CGI)
@@ -204,10 +206,10 @@ f2h: f2h.c
         $(CC) $(CF) -o f2h f2h.c
  
  $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE) configure.pl
         $(CC) $(CF) -o f2h f2h.c
  
  $(HTM_CGI): %.htm: enhance-top.htm enhance-bottom.htm %.1.htm $(CONFIGFILE) configure.pl
-       $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) > $*.htm
+       $(CAT) enhance-top.htm $*.1.htm enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_$* $(CONFIGFILE) --out $*.htm
  
  index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE) configure.pl
  
  index.htm: enhance-top.htm enhance-bottom.htm $(HTM_CGI_1) $(CONFIGFILE) configure.pl
-       $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) > index.htm
+       $(CAT) enhance-top.htm $(HTM_CGI_1) enhance-bottom.htm | $(CONFIGURE) _HTML_TITLE=\$$title_enhance $(CONFIGFILE) --out index.htm
  
  
  setuid: $(SETUID)
  
  
  setuid: $(SETUID)
@@ -230,9 +232,11 @@ cp_www: $(WWW) | mktree
         $(CP) -r $(WWW) $(WWW_PATH)
  
  install: all cp_bin cp_www cp_conf
         $(CP) -r $(WWW) $(WWW_PATH)
  
  install: all cp_bin cp_www cp_conf
+       
  
  clean:
         $(RM) -f enhance configure.pl $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI)
  
  clean:
         $(RM) -f enhance configure.pl $(C_STANDALONE) $(STANDALONE) $(TO_GENERATE) f2h $(H_PNG) $(H_SUBTOOL) $(CGI) index.htm $(HTM_CGI)
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile
  
  PHONY: all clean install setuid mktree cp_bin cp_www
  
  
  PHONY: all clean install setuid mktree cp_bin cp_www
  
diff --git a/nofading.1.htm b/nofading.1.htm

index 9326bc9a347e3cb1a8bac6a52f8ce39219b52dcc..bfa9a81599befb3e34363c8ee764ca4493c4a009 100644 (file)
--- a/nofading.1.htm
+++ b/nofading.1.htm
@@ -1,5 +1,5 @@
                 <h1>No fading!</h1>
                 <h1>No fading!</h1>
-               <form method="post" action="/enhance/nofading">
+               <form method="post" action="###HTML_NOFADING_PATH;">
                         Enhance by URL<br>
                         URL of image:
                         <input class="pt" type="text" name="inpix">
                         Enhance by URL<br>
                         URL of image:
                         <input class="pt" type="text" name="inpix">
@@ -11,7 +11,7 @@
                         <input type="checkbox" class="pt" name="a"> enhance alpha
                 </form>
                 <br>
                         <input type="checkbox" class="pt" name="a"> enhance alpha
                 </form>
                 <br>
-               <form method="post" action="/enhance/nofading" enctype="multipart/form-data">
+               <form method="post" action="###HTML_NOFADING_PATH;" enctype="multipart/form-data">
                         Enhance by file upload<br>
                         Upload the image:
                         <input class="pt" type="file" name="inpix">
                         Enhance by file upload<br>
                         Upload the image:
                         <input class="pt" type="file" name="inpix">
diff --git a/npb-ong1.htm b/npb-ong1.htm

deleted file mode 100644 (file)

index 2db3d27..0000000
--- a/npb-ong1.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<html lang="pl">
-       <head>
-               <title>It's NewpixbOTTification time! &bull; Bicycles on the Moon</title>
-               <meta http-equiv="Content-type" content="text/html; charset=iso-8859-2">
-               <link rel="stylesheet" href="/css/botm.css">
-               <link rel="icon" type="image/png" href="/img/favicon.png"/>
-       </head>
-       <body>
-               <a href="/"><img src="/img/botmlogo2.png" alt="1190.bicyclesonthemoon.info" border="0"></a>
-               <h1>It's NewpixbOTTification time!</h1>
-               <form method="post" action="/ongoing/npb">
-                       NewpixbOTTify by URL<br>
-                       URL of image:
-                       <input class="pt" type="text" name="inpix">
-                       <input class="pk" type="submit" value="NewpixbOTTify!">
-               </form>
-               <br>
-               <form method="post" action="/ongoing/npb" enctype="multipart/form-data">
-                       NewpixbOTTify by file upload<br>
-                       Upload the image:
-                       <input class="pt" type="file" name="inpix">
-                       <input class="pk" type="submit" value="NewpixbOTTify!">
-               </form>
-               <br>
-               Source code available at <a href="svn://bicyclesonthemoon.info/npb">svn://bicyclesonthemoon.info/npb</a> (use "e" to login) or <a href="http://1190.bicyclesonthemoon.info/pro/npb">http://1190.bicyclesonthemoon.info/pro/npb</a>.
-               
-       </body>
-</html>
diff --git a/npb.1.htm b/npb.1.htm

index c4f9e20dd26b9972d57e19f89ad1d3013bf5cdda..09787b01a1b16a77823107363d1789d11b7c1ec1 100644 (file)
--- a/npb.1.htm
+++ b/npb.1.htm
@@ -1,5 +1,5 @@
                 <h1>It's NewpixbOTTification time!</h1>
                 <h1>It's NewpixbOTTification time!</h1>
-               <form method="post" action="/enhance/npb" enctype="multipart/form-data">
+               <form method="post" action="###HTML_NPB_PATH;" enctype="multipart/form-data">
                         NewpixbOTTify by URL<br>
                         URL of image:
                         <input class="pt" type="text" name="inpix2">
                         NewpixbOTTify by URL<br>
                         URL of image:
                         <input class="pt" type="text" name="inpix2">
diff --git a/pal.1.htm b/pal.1.htm

index e3a00f9b2a373836ce701129f3d1ea19ef9a4931..9028eae00d95da823fbfca9dcd011c0b8c1a45c1 100644 (file)
--- a/pal.1.htm
+++ b/pal.1.htm
@@ -1,5 +1,5 @@
              <h1>Hidden frames</h1>\r
              <h1>Hidden frames</h1>\r
-               <form method="post" action="/enhance/pal" enctype="multipart/form-data">\r
+               <form method="post" action="###HTML_PAL_PATH;" enctype="multipart/form-data">\r
                         Upload frame(s):<br>\r
                         Frame 1: <input class="pt" type="file" name="inpixf0"><br>\r
                         Frame 2: <input class="pt" type="file" name="inpixf1"><br>\r
                         Upload frame(s):<br>\r
                         Frame 1: <input class="pt" type="file" name="inpixf0"><br>\r
                         Frame 2: <input class="pt" type="file" name="inpixf1"><br>\r
diff --git a/reveal.1.htm b/reveal.1.htm

index 0648c1ebb083c3aced4869925cf2320a830d0fd0..2b6d97f933621755782a76cc81c1ee0e3c656f05 100644 (file)
--- a/reveal.1.htm
+++ b/reveal.1.htm
@@ -1,12 +1,12 @@
                 <h1>Reveal hidden detail!</h1>
                 <h1>Reveal hidden detail!</h1>
-               <form method="post" action="/enhance/reveal">
+               <form method="post" action="###HTML_REVEAL_PATH;">
                         Enhance by URL<br>
                         URL of image:
                         <input class="pt" type="text" name="inpix">
                         <input class="pk" type="submit" value="ENHANCE!"><br>
                 </form>
                 <br>
                         Enhance by URL<br>
                         URL of image:
                         <input class="pt" type="text" name="inpix">
                         <input class="pk" type="submit" value="ENHANCE!"><br>
                 </form>
                 <br>
-               <form method="post" action="/enhance/reveal" enctype="multipart/form-data">
+               <form method="post" action="###HTML_REVEAL_PATH;" enctype="multipart/form-data">
                         Enhance by file upload<br>
                         Upload the image:
                         <input class="pt" type="file" name="inpix">
                         Enhance by file upload<br>
                         Upload the image:
                         <input class="pt" type="file" name="inpix">
diff --git a/settings-debug.txt b/settings-debug.txt

new file mode 100644 (file)

index 0000000..cbaeafd
--- /dev/null
+++ b/settings-debug.txt
@@ -0,0 +1,37 @@
+# Name must be unique, not shared with other projects / targets.
+# otherwise config files will collide
+name: test-enhance
+
+# target name. settings file (THIS FILE) is "settings-TARGET_NAME.txt"
+# where TARGET_NAME is the value
+target: debug
+
+useragent: ENHANCE!ment tool (http://1190.bicyclesonthemoon.info/enhancetest)
+
+title_bluenh  : ENHANCE!
+title_diff    : See the difference!
+title_enhance : ENHANCE!
+title_nofading: No fading!
+title_npb     : It's NewpixbOTTification time!
+title_pal     : Hidden frames
+title_reveal  : Reveal hidden detail!
+title_t-1     : Remap t-1
+
+bin_path : /botm/bin/test-enhance
+cgi_path : /enhancetest
+conf_path: /botm/etc/www/conf/1190
+tmp_path : /botm/tmp/test-enhance
+www_path : /botm/www/1190/enhancetest
+
+cat  : /usr/bin/cat
+cp   : /usr/bin/cp
+chmod: /usr/bin/chmod
+mkdir: /usr/bin/mkdir
+perl : /usr/bin/perl
+rm   : /usr/bin/rm
+wget : /usr/bin/wget
+
+CC   : gcc
+CF   : -g -Wall
+L_IL : -lIL
+L_CGI: -lcgi
diff --git a/settings-release.txt b/settings-release.txt

index a24fe6e854a3575f487813d6bb90923516f5fdfe..7c71fa9f05600456f65fe682f81504d087093fcb 100644 (file)
--- a/settings-release.txt
+++ b/settings-release.txt
@@ -8,29 +8,30 @@ target: release
  
  useragent: ENHANCE!ment tool (http://1190.bicyclesonthemoon.info/enhance)
  
  
  useragent: ENHANCE!ment tool (http://1190.bicyclesonthemoon.info/enhance)
  
-title_bluenh: ENHANCE!
-title_diff: See the difference!
-title_enhance: ENHANCE!
+title_bluenh  : ENHANCE!
+title_diff    : See the difference!
+title_enhance : ENHANCE!
  title_nofading: No fading!
  title_nofading: No fading!
-title_npb: It's NewpixbOTTification time!
-title_pal: Hidden frames
-title_reveal: Reveal hidden detail!
-title_t-1: Remap t-1
+title_npb     : It's NewpixbOTTification time!
+title_pal     : Hidden frames
+title_reveal  : Reveal hidden detail!
+title_t-1     : Remap t-1
  
  
-bin_path: /botm/bin/enhance
+bin_path : /botm/bin/enhance
+cgi_path : /enhance
  conf_path: /botm/etc/www/conf/1190
  conf_path: /botm/etc/www/conf/1190
-tmp_path: /botm/tmp/enhance
-www_path: /botm/www/1190/enhance
+tmp_path : /botm/tmp/enhance
+www_path : /botm/www/1190/enhance
  
  
-cat: /usr/bin/cat
-cp: /usr/bin/cp
+cat  : /usr/bin/cat
+cp   : /usr/bin/cp
  chmod: /usr/bin/chmod
  mkdir: /usr/bin/mkdir
  chmod: /usr/bin/chmod
  mkdir: /usr/bin/mkdir
-perl: /usr/bin/perl
-rm: /usr/bin/rm
-wget: /usr/bin/wget
+perl : /usr/bin/perl
+rm   : /usr/bin/rm
+wget : /usr/bin/wget
  
  
-CC: gcc
-CF: -g -Wall
-L_IL: -lIL
+CC   : gcc
+CF   : -g -Wall
+L_IL : -lIL
  L_CGI: -lcgi
  L_CGI: -lcgi
diff --git a/settings.txt b/settings.txt

index fc883ae0c7780b0878f9e1a4ed3894de3aa420c3..c6fde1721f9f324c67fc8ce8ee442a947e690414 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -1,7 +1,6 @@
  # settings.txt
  # settings.txt
-# 04.12.2022
  # 
  # 
-# Copyright (C) 2022  Balthasar Szczepański
+# Copyright (C) 2022, 2024  Balthasar Szczepański
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as
  # 
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as
@@ -36,19 +35,44 @@ _bin_reveal_path       = @_PATH($bin_path, reveal)
  _bin_reveal_cgi_path   = @_PATH($bin_path, reveal-cgi)
  _bin_t-1_cgi_path      = @_PATH($bin_path, t-1-cgi)
  
  _bin_reveal_cgi_path   = @_PATH($bin_path, reveal-cgi)
  _bin_t-1_cgi_path      = @_PATH($bin_path, t-1-cgi)
  
+_cgi_bluenh_path   = @_PATH($cgi_path, bluenh)
+_cgi_diff_path     = @_PATH($cgi_path, diff)
+_cgi_nofading_path = @_PATH($cgi_path, nofading)
+_cgi_npb_path      = @_PATH($cgi_path, npb)
+_cgi_pal_path      = @_PATH($cgi_path, pal)
+_cgi_reveal_path   = @_PATH($cgi_path, reveal)
+_cgi_t-1_path      = @_PATH($cgi_path, t-1)
+
  _conf_path = @_PATH($conf_path, $name\.conf)
  
  _conf_path = @_PATH($conf_path, $name\.conf)
  
-HTML_TITLE = @_HTML_TITLE()
+
+HTML_TITLE = @_HT_ENCODE(@_HTML_TITLE())
+
+HTML_BLUENH_PATH   = @_HT_ENCODE($_cgi_bluenh_path)
+HTML_DIFF_PATH     = @_HT_ENCODE($_cgi_diff_path)
+HTML_NOFADING_PATH = @_HT_ENCODE($_cgi_nofading_path)
+HTML_NPB_PATH      = @_HT_ENCODE($_cgi_npb_path)
+HTML_PAL_PATH      = @_HT_ENCODE($_cgi_pal_path)
+HTML_REVEAL_PATH   = @_HT_ENCODE($_cgi_reveal_path)
+HTML_T-1_PATH      = @_HT_ENCODE($_cgi_t-1_path)
  
  
  CONF_bin      = $bin_path
  
  
  CONF_bin      = $bin_path
-CONF_bluenh   = $_bin_bluenh_cgi_path
-CONF_diff     = $_bin_diff_cgi_path
-CONF_nofading = $_bin_nofading_cgi_path
-CONF_npb      = $_bin_npb_cgi_path
-CONF_pal      = $_bin_pal_cgi_path
-CONF_reveal   = $_bin_reveal_cgi_path
-CONF_t-1      = $_bin_t-1_cgi_path
+CONF_bin_bluenh   = $_bin_bluenh_cgi_path
+CONF_bin_diff     = $_bin_diff_cgi_path
+CONF_bin_nofading = $_bin_nofading_cgi_path
+CONF_bin_npb      = $_bin_npb_cgi_path
+CONF_bin_pal      = $_bin_pal_cgi_path
+CONF_bin_reveal   = $_bin_reveal_cgi_path
+CONF_bin_t-1      = $_bin_t-1_cgi_path
+
+CONF_cgi_bluenh   = $_cgi_bluenh_path
+CONF_cgi_diff     = $_cgi_diff_path
+CONF_cgi_nofading = $_cgi_nofading_path
+CONF_cgi_npb      = $_cgi_npb_path
+CONF_cgi_pal      = $_cgi_pal_path
+CONF_cgi_reveal   = $_cgi_reveal_path
+CONF_cgi_t-1      = $_cgi_t-1_path
  
  
  MAKE_TARGET    = TARGET    = $target
  
  
  MAKE_TARGET    = TARGET    = $target
diff --git a/t-1.1.htm b/t-1.1.htm

index a271ac44cf63f9c3df9fa671044ee30c84738d5b..c330a584f55e26726b40c80fb27e187f82b4e7ad 100644 (file)
--- a/t-1.1.htm
+++ b/t-1.1.htm
@@ -1,5 +1,5 @@
              <h1>Remap t-1</h1>\r
              <h1>Remap t-1</h1>\r
-               <form method="post" action="/enhance/t-1" enctype="multipart/form-data">\r
+               <form method="post" action="###HTML_T-1_PATH;" enctype="multipart/form-data">\r
                         Remap by file upload<br>\r
                         File: <input class="pt" type="file" name="inpix2"><br>\r
                         <br>\r
                         Remap by file upload<br>\r
                         File: <input class="pt" type="file" name="inpix2"><br>\r
                         <br>\r
author	b <rowerynaksiezycu@gmail.com>
	Thu, 22 Feb 2024 23:52:04 +0000 (23:52 +0000)
committer	b <rowerynaksiezycu@gmail.com>
	Thu, 22 Feb 2024 23:52:04 +0000 (23:52 +0000)
403.1.htm	[deleted file]	patch \| blob \| history
bluenh.1.htm		patch \| blob \| history
config		patch \| blob \| history
diff.1.htm		patch \| blob \| history
enhance.1.conf		patch \| blob \| history
install.sh	[new file with mode: 0755]	patch \| blob
makefile		patch \| blob \| history
makefile.1.mak		patch \| blob \| history
nofading.1.htm		patch \| blob \| history
npb-ong1.htm	[deleted file]	patch \| blob \| history
npb.1.htm		patch \| blob \| history
pal.1.htm		patch \| blob \| history
reveal.1.htm		patch \| blob \| history
settings-debug.txt	[new file with mode: 0644]	patch \| blob
settings-release.txt		patch \| blob \| history
settings.txt		patch \| blob \| history
t-1.1.htm		patch \| blob \| history