use optimised HTML entity encoding

diff --git a/botm-common b/botm-common
index 44fbe59bfd7652a0975e601591df4a4b218da40d..f0a6abfdebbbfd1b578d7339df1627f1afacd2be 160000 (submodule)
--- a/botm-common
+++ b/botm-common
@@ -1 +1 @@
-Subproject commit 44fbe59bfd7652a0975e601591df4a4b218da40d
+Subproject commit f0a6abfdebbbfd1b578d7339df1627f1afacd2be

diff --git a/makefile b/makefile
index e0608aef2bffc5587bc437926e652c81d6f1ba16..2388b5ef538b814c2e0428dab93624a380a3b3c5 100644 (file)
--- a/makefile
+++ b/makefile
@@ -153,7 +153,7 @@ all: $(BIN) setuid exec
        
 
 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
        $(PERL) config/configure.1.pl --do target=direct settings-$(TARGET).txt config/settings.txt --in config/configure.1.pl --out configure.pl
@@ -204,7 +204,7 @@ install: all cp_bin cp_lib cp_www cp_conf cp_cron
 
 clean:
        $(RM) -f configure.pl $(TO_GENERATE) $(PERL_WRAP_EXEC) $(PERL_WRAP_EXEC:=.c)
-       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) < makefile.1.mak > makefile
+       $(PERL) config/configure.1.pl --do $(DEFAULT_CONFIGFILE) --in makefile.1.mak --out makefile
 
 PHONY: all clean install setuid exec mktree cp_bin cp_lib cp_www cp_conf cp_cron
        

diff --git a/settings.txt b/settings.txt
index 363757bd7fd48c9a8517a9c123c5099fa334e101..1d7117d7e3e29b25fbb6b70fe73734facad776ee 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-_version: 1.2.7
+_version: 1.2.8
 
 _SHEBANG: #!$0