From: b <rowerynaksiezycu@gmail.com>
Date: Sun, 26 Mar 2023 11:26:53 +0000 (+0200)
Subject: Update from "pro" as of 26.03.2023
X-Git-Url: http://bicyclesonthemoon.info/git-projects/?a=commitdiff_plain;h=HEAD;p=ott%2Faftertime

Update from "pro" as of 26.03.2023
---

diff --git a/post.cpp b/post.cpp
index 4ccac67..a5ebe16 100644
--- a/post.cpp
+++ b/post.cpp
@@ -1,8 +1,7 @@
 // post.cpp (1190.bicyclesonthemoon.info/aftertime/post)
 // The post edit interface
-// 15.04.2019
 // 
-// Copyright (C) 2015, 2019  Balthasar Szczepański
+// Copyright (C) 2015, 2019, 2023  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
@@ -596,7 +595,7 @@ int main()
 	{
 		story=arg;
 		if(!strcmp(story,"time")); //really shouldn't be hardcoded!
-		else if(!strcmp(story,"prickly"));
+		else if(!strcmp(story,"prickly"));
 		else if(!strcmp(story,"potm"));
 		else if(!strcmp(story,"lucky"));
 		else if(!strcmp(story,"beany"));
@@ -608,6 +607,7 @@ int main()
 		else if(!strcmp(story,"bsta"));
 		else if(!strcmp(story,"advent"));
 		else if(!strcmp(story,"phys"));
+		else if(!strcmp(story,"10y"));
 		else
 		{
 			missing=true;
diff --git a/upload.awk b/upload.awk
index 728701d..bbeef82 100644
--- a/upload.awk
+++ b/upload.awk
@@ -1,8 +1,7 @@
 #// upload.awk
 #// The post upload interface
-#// 25.05.2021
 #// 
-#// Copyright (C) 2015, 2019, 2021  Balthasar Szczepański
+#// Copyright (C) 2015, 2019, 2021, 2023  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
@@ -374,7 +373,7 @@ function post(   postid,replaceid,postfile,passfile,replacefile,temp,i,eq,tn,tv,
 		print "Story name missing."
 		return
 	}
-	if(story !~ /^(time|prickly|potm|lucky|beany|bean2|t1i|zodiac|bftf|t-1|bsta|advent|phys)$/) #this really shouldn't be hardcoded!
+	if(story !~ /^(time|prickly|potm|lucky|beany|bean2|t1i|zodiac|bftf|t-1|bsta|advent|phys|10y)$/) #this really shouldn't be hardcoded!
 	{
 		print "Unknown story."
 		return
diff --git a/viewer.awk b/viewer.awk
index 50e2713..4857297 100644
--- a/viewer.awk
+++ b/viewer.awk
@@ -1,8 +1,7 @@
 #// viewer.awk
 #// The viewer
-#// 25.05.2021
 #// 
-#// Copyright (C) 2015-2021  Balthasar Szczepański
+#// Copyright (C) 2015-2021, 2023  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
@@ -549,13 +548,13 @@ END{
 			print "<tr width=\""width"\"><td colspan=\"4\" width=\"100%\">"argtab["HTML"]"</td></tr>"
 		}
 		
-		for(i=-1; i<=n; ++i)
+		for(i=-1; i<=n+1; ++i)
 		{
+			# print "<!-- ######## "i"######## -->" 
 			if(i<0)
 				noticepost=noticepath argtab["story"]"-i"
 			else
-				noticepost=noticepath argtab["story"]"-"sprintf("%04u%s",f,s)"-"sprintf("%02u",i+1)
-			# print "<!-- ######## "noticepost"######## -->" 
+				noticepost=noticepath argtab["story"]"-"sprintf("%04u%s",f,s)"-"sprintf("%02u",i)
 			split("", noticetab, ":")
 			for(j=0;(getline line < noticepost)>0;++j)
 			{
@@ -566,7 +565,7 @@ END{
 			close(noticepost)
 			if(j==0)
 			{
-				if(i<0)
+				if(i<=0)
 					continue;
 				else
 					break;
@@ -574,10 +573,10 @@ END{
 			if(i>=0)
 			{
 				nposttime=noticetab["y"]noticetab["m"]noticetab["d"]noticetab["h"]
-				if (thistime<nposttime)
+				if ((thistime<nposttime) && (i>0))
 					break;
 			}
-			if(i<n)
+			if(i<=n)
 			{
 				if(i>=0)
 					print "<tr width=\""width"\"><td colspan=\"4\" width=\"100%\"><i>"noticetab["subject_h"]"</i> "(noticetab["ID"]!=""?"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(<a href=\"/ott/view?p="noticetab["ID"]"#p"noticetab["ID"]"\">OTT time travel</a>)":"")"</td></tr>"
@@ -585,7 +584,7 @@ END{
 			}
 			else
 			{
-				print "<tr width=\""width"\" align=\"center\"><td colspan=\"4\" width=\"100%\"><a href=\"/aftertime/viewer?story="argtab["story"](max_enhance>0?"&amp;e="e:"")"&amp;f="f s"&amp;n="i+1"\">"noticetab["subject_h"]"</a></td></tr>"
+				print "<tr width=\""width"\" align=\"center\"><td colspan=\"4\" width=\"100%\"><a href=\"/aftertime/viewer?story="argtab["story"](max_enhance>0?"&amp;e="e:"")"&amp;f="f s"&amp;n="i"\">"noticetab["subject_h"]"</a></td></tr>"
 			}
 		}