fix mistake in write_data_file call; temporarily disable addpost

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

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

diff --git a/makefile b/makefile
index 27c240f3fb3bbaa3c9f2896da16aa53d42c66f49..9517734051017731d626919e59642069b3e66173 100644 (file)
--- a/makefile
+++ b/makefile
@@ -49,16 +49,16 @@ CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE)
 
 # keep these 2 lists in the same order!:
 GENERATE_FROM=\
-addpost.1.pl\
 sendpost.1.pl\
 preview.1.pl\
 post_common.1.pm
+#addpost.1.pl\
 
 TO_GENERATE=\
-addpost.pl\
 sendpost.pl\
 preview.pl\
 post_common.pm
+#addpost.pl\
 
 DIR=\
 $(BIN_PATH)\
@@ -76,13 +76,14 @@ $(DATA_WAIT_PATH)\
 $(TMP_PATH)
 
 SETUID=\
-addpost\
 sendpost
+#addpost\
+
 
 EXEC=\
-addpost.pl\
 sendpost.pl\
 preview.pl
+#addpost.pl\
 
 PERL_WRAP_EXEC=\
 addpost\

diff --git a/makefile.1.mak b/makefile.1.mak
index 06819d869fb7f0332f679d9a92b6172f6728c3fe..f7a5cfdb7e72b5d24e7826e6ff989eeab3ec2d2f 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -49,16 +49,16 @@ CONFIGURE_CMD = $(PERL) ./configure.pl --do $(CONFIGFILE)
 \r
 # keep these 2 lists in the same order!:\r
 GENERATE_FROM=\\r
-addpost.1.pl\\r
 sendpost.1.pl\\r
 preview.1.pl\\r
 post_common.1.pm\r
+#addpost.1.pl\\r
 \r
 TO_GENERATE=\\r
-addpost.pl\\r
 sendpost.pl\\r
 preview.pl\\r
 post_common.pm\r
+#addpost.pl\\r
 \r
 DIR=\\r
 $(BIN_PATH)\\r
@@ -76,13 +76,14 @@ $(DATA_WAIT_PATH)\
 $(TMP_PATH)\r
 \r
 SETUID=\\r
-addpost\\r
 sendpost\r
+#addpost\\r
+\r
 \r
 EXEC=\\r
-addpost.pl\\r
 sendpost.pl\\r
 preview.pl\r
+#addpost.pl\\r
 \r
 PERL_WRAP_EXEC=\\r
 addpost\\r

diff --git a/post_common.1.pm b/post_common.1.pm
index cc174f8569f9525851c253c3734a3e7127889777..fc4137eecd37e5931dae1b9316572e0c5a2c4d29 100644 (file)
--- a/post_common.1.pm
+++ b/post_common.1.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2023  Balthasar Szczepański
+# Copyright (C) 2023, 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
@@ -13,6 +13,9 @@
 # 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/>.
 
+# TODO: rethink prepare_post: when to use deefault?
+# TODO: get unspecified options from edit page instead of defaults
+
 package post_common;
 
 use strict;

diff --git a/sendpost.1.pl b/sendpost.1.pl
index ac19a13020104907df20b17dbffa58ee5c750759..e07cfdc4beb7a1855afbed5a2a1717c6a6907261 100644 (file)
--- a/sendpost.1.pl
+++ b/sendpost.1.pl
@@ -344,7 +344,7 @@ sub post_to_mirror {
                        print "PREVIOUS POST\n";
                        write_data_file(
                                \*STDOUT, \%previous_post, 'console_out',
-                               0, 0, 0
+                               0, 0, 0,
                                '>>', 1
                        );
                        print "\n";