From 2c09e30153d8ea6980962777705dacf73baa1766 Mon Sep 17 00:00:00 2001
From: b <b@23ac2ed3-cec8-4626-8109-7118d8ca9799>
Date: Mon, 4 Apr 2016 17:59:54 +0000
Subject: [PATCH] Changed to make it work with the new phpBB Fixed makefile bug

git-svn-id: svn://botcastle1b/ottmirror@6 23ac2ed3-cec8-4626-8109-7118d8ca9799
---
 index.htm              | 37 ++++++++++++++++++++++++++-----------
 pro.zip/bot2.1.awk     | 18 ++++++++++++++++--
 pro.zip/bot3.1.cpp     | 17 +++++++++--------
 pro.zip/findlatest.awk |  6 +++---
 pro.zip/index.1.awk    | 16 ++++++++++++----
 pro.zip/makefile       |  4 ++--
 pro.zip/upload.awk     | 24 +++++++++++++++++++-----
 7 files changed, 87 insertions(+), 35 deletions(-)

diff --git a/index.htm b/index.htm
index 79ec66a..d122ba2 100644
--- a/index.htm
+++ b/index.htm
@@ -12,7 +12,15 @@
 <p>If you want to run your own copy of the <a href="http://1190.bicyclesonthemoon.info/ott/">ЯOЯЯIM TTO</a>, you
 can, because I made it available. Follow these instructions to download and
 setup your own ЯOЯЯIM TTO.</p>
-<p>This is about version 1.4.</p>
+<p>This is about version 1.5.</p>
+
+<h2>Read this</h2>
+<p>To have the mirror rendered correctly after migration the bots should re-read
+the whole thread. When some posts are archived before and some after the page
+will have HTML errors.</p>
+<p>I reccomend keeping a copy of the data archived by version 1.4 before moving
+to this one,</p>
+
 <h2>Dependencies</h2>
 The mirror depends on some things:
 <ul>
@@ -46,8 +54,9 @@ and put its contents there. Don't build it yet.</li></ul>
 <p>This and earlier versions can also be downloaded from <a href=
 "svn://bicyclesonthemoon.info/ottmirror">svn://bicyclesonthemoon.info/ottmirror</a>.
 Use "e" for read-only access.<br>
-If you want the source as it is right now, get it from <a href=
+If you want the source as it is exactly now, it's available at <a href=
 "http://1190.bicyclesonthemoon.info/ott/src/">http://1190.bicyclesonthemoon.info/ott/src/</a>.
+(It's updated immediately and may contain errors).
 </p>
 
 <h2>Preparing the enviroment</h2>
@@ -60,9 +69,9 @@ have to be double-escaped. The directories should not end with a
 point to mawk.</li>
 <li>Create a directory where the programs will be run from. Can be the same
 where you downloaded the source. Set <code>propath</code> to point there.</li>
-<li>Create a directory for temporary files. Only you should have read access
-there. While someone makes a post, their password can be found in a temporary
-file. Set <code>tmppath</code> to point there.</li>
+<li>Create a directory for temporary files. Only you should have read and execute
+access there. While someone makes a post, their password can be found in a
+temporary file. Set <code>tmppath</code> to point there.</li>
 <li>Create a directory where the bots will remember things. Set
 <code>mempath</code> to point there. Create a file named "<code>name</code>"
 there. Put your URL-encoded xkcd fora login in the first line and your
@@ -76,8 +85,8 @@ Create the following subdirectories:
 	<li><code>mpost/ok</code></li>
 	<li><code>mpost/pm</code></li>
 </ul>
-Only you should have read access to <code>mpost</code>. Passwords can be found
-there.</li>
+Only you should have read and execute access to <code>mpost</code>. Passwords
+can be found there.</li>
 <li>Create a directory where the bots will write their reports. set
 <code>logpath</code> to point there. 
 </li><li>Set <code>mirrpath</code> to point at the directory where the mirror is
@@ -255,14 +264,20 @@ This bot runs every
 This moves the log files once in a week. Otherwise they would grow to infinity.
 </p>
 
-<!-- <h2>Bugs</h2>
--->
+<h2>Bugs</h2>
+<p>This is a quick fix. It does work with the new phpBB but not everything is
+rendered as good as in the original.</p>
 
 <h2>Changes</h2>
 <ul>
-	<li>v.1.4 (31.08.2015):
+	<li>v1.4 (31.03.2016)
+	<ul>
+		<li>Changed to make it work with the new phpBB</li>
+		<li>Fixed makefile bug</li>
+	</ul></li>
+	<li><a href="http://1190.bicyclesonthemoon.info/ottmirror/1.4">v.1.4 (31.08.2015):</a>
 	<ul>
-		<li>Added an additional field in the post form to stop spambots.</li>
+		<li>Added an additional field in the post form to stop spambots</li>
 	</ul></li>
 	<li><a href="http://1190.bicyclesonthemoon.info/ottmirror/1.3">v.1.3 (8.03.2015):</a>
 	<ul>
diff --git a/pro.zip/bot2.1.awk b/pro.zip/bot2.1.awk
index bcb23b6..e4c1f56 100644
--- a/pro.zip/bot2.1.awk
+++ b/pro.zip/bot2.1.awk
@@ -1,8 +1,8 @@
 # OTT mirror
-# Copyright (C) 2014 Balthasar Szczepański
+# Copyright (C) 2014-2016 Balthasar Szczepański
 # bot2.awk (bothasar_t)
 # relinking, archiving avatars, attachments, images.
-#  5.03.2015
+# 28.03.2016
 
 # This file is part of OTT mirror.
 #
@@ -49,6 +49,7 @@ BEGIN {
 		hex=sprintf("%02X",i);
 		ch2hex[ch]=hex
 	}
+	noquot=0;
 };
 {
 	gsub(/href=\"\./, "href=\"" fora, $0)
@@ -75,6 +76,15 @@ BEGIN {
 			split($i, arr, "\"p?")
 			id=arr[2]
 		}
+		if ($(i-1) ~ /^class=\"post-buttons\"/ ) #")
+		{
+			noquot=1
+			print ">" >> outfile
+		}
+		if ($(i) ~ /^<\/ul/)
+		{
+			noquot=0;
+		}
 		
 		# relink OTT links to mirror links
 		if($i ~ /###links_regexp;/)
@@ -368,6 +378,10 @@ BEGIN {
 		else if (related6==1)
 		{
 			printf("%s\"/ott/image/%s\"\n",arr[1],imgdir imgname) >>outfile
+		}
+		else if(noquot != 0)
+		{
+		
 		}
 		else
 		{
diff --git a/pro.zip/bot3.1.cpp b/pro.zip/bot3.1.cpp
index 2c7daa5..bc66d54 100644
--- a/pro.zip/bot3.1.cpp
+++ b/pro.zip/bot3.1.cpp
@@ -269,14 +269,15 @@ int main(int argc, char *argv[])
 			case INDELIVERABLE:
 			default:
 				sleep(pwait);
-				printf("send a PM: ");
-				sub=fork();
-				if(!sub)
-				{
-					r=execl(MAWK_PATH,MAWK_PATH,"-f",AWK_PM,"-v",argp1,"-v",argp2,"-v",argp3,"-v",argp4,"-v",argp5,postpath,(char *)0);
-					exit(r);
-				}
-				waitpid(sub,&r,0);
+				printf("send a PM: (Temporary disabled)");
+				// sub=fork();
+				// if(!sub)
+				// {
+					// r=execl(MAWK_PATH,MAWK_PATH,"-f",AWK_PM,"-v",argp1,"-v",argp2,"-v",argp3,"-v",argp4,"-v",argp5,postpath,(char *)0);
+					// exit(r);
+				// }
+				// waitpid(sub,&r,0);
+				r = INDELIVERABLE;
 				switch(r)
 				{
 				case POST_MSTD:
diff --git a/pro.zip/findlatest.awk b/pro.zip/findlatest.awk
index f18a055..15398ed 100644
--- a/pro.zip/findlatest.awk
+++ b/pro.zip/findlatest.awk
@@ -1,8 +1,8 @@
 # OTT mirror
-# Copyright (C) 2014 Balthasar Szczepañski
+# Copyright (C) 2014, 2016 Balthasar Szczepañski
 # findlatest.awk 
 # find the latest page and number of posts.
-# 12.09.2014
+# 28.03.2016
 
 # This file is part of OTT mirror.
 #
@@ -27,7 +27,7 @@ BEGIN {
 	{
 		for(i=1;i<=NF;i++)
 		{
-			if(tolower($i) ~ /posts/)
+			if(tolower($i) ~ /posts/ && $(i-1) ~ /^[0-9]+$/)
 				posts=$(i-1)
 		}
 	}
diff --git a/pro.zip/index.1.awk b/pro.zip/index.1.awk
index e3f1a92..3324b74 100644
--- a/pro.zip/index.1.awk
+++ b/pro.zip/index.1.awk
@@ -1,8 +1,8 @@
 # OTT mirror
-# Copyright (C) 2014 Balthasar Szczepański
+# Copyright (C) 2014, 2016 Balthasar Szczepański
 # index.awk
 # separate the topic from index page.
-# 12.09.2014
+# 31.03.2016
 
 # This file is part of OTT mirror.
 #
@@ -29,8 +29,11 @@ BEGIN{
 	if((related!=0)&& ($0 ~ /<li class=.row/))
 	{
 		where=1
+		level=0;
 		printf("%s","") > outfile
 	}
+	else if ($0 ~ /<li/ && where==1)
+		++level
 	
 	if ($0 ~ /t=###threadID;/)
 	{
@@ -44,8 +47,13 @@ BEGIN{
 	
 	if($0 ~ /<\/li>/)
 	{
-		where=0
-		close(outfile)
+		if(level>0)
+			--level
+		else
+		{
+			where=0
+			close(outfile)
+		}
 	}
 };
 END{
diff --git a/pro.zip/makefile b/pro.zip/makefile
index 05d4d0d..3483c07 100644
--- a/pro.zip/makefile
+++ b/pro.zip/makefile
@@ -43,8 +43,8 @@ posted: posted.cpp posted.awk makefile
 redirect: redirect.cpp makefile
 	$(CC) $(CF) -o redirect redirect.cpp $(LF1)
 
-enable: post update view mview posted
-	chmod u+s post update view mview posted
+enable: post update view mview posted mpview
+	chmod u+s post update view mview posted mpview
 
 
 	
diff --git a/pro.zip/upload.awk b/pro.zip/upload.awk
index 45161ad..c971903 100644
--- a/pro.zip/upload.awk
+++ b/pro.zip/upload.awk
@@ -1,8 +1,8 @@
 # OTT mirror
-# Copyright (C) 2014 Balthasar Szczepański
+# Copyright (C) 2014, 2016 Balthasar Szczepański
 # upload.awk
 # separate userinfo, signatures and content from page and upload it.
-# 12.09.2014
+# 30.03.2016
 
 # This file is part of OTT mirror.
 #
@@ -39,6 +39,7 @@ BEGIN{
 
 };
 {
+	
 	if((where==6) && ($0 == "</div>"))
 	{
 		exit
@@ -58,6 +59,10 @@ BEGIN{
 	{
 		where=2
 	}
+	if($0 ~ /<div class=.postbody/)
+	{
+		where=2
+	}
 	
 	if((where==2) && ($0 ~ /<p class=.author./))
 	{
@@ -85,6 +90,12 @@ BEGIN{
 	if(($0 ~ /<div class=.content./)&&(where=2))
 	{
 		where=3
+		print ("###inf&" uid) >> outfile
+		if(otterinfD != "")
+		{
+			print otterinfD > otterinf2
+			otterinfD = ""
+		}
 	}
 	
 	if($0 ~ /<div id=.sig[0-9]/)
@@ -97,8 +108,8 @@ BEGIN{
 	if($0 ~ /<dl class=.postprofile/)
 	{
 		where=5
-		print ("###inf&" uid) >> outfile
-		printf ("%s","") > otterinf2
+		# print ("###inf&" uid) >> outfile
+		# printf ("%s","") > otterinf2
 	}
 	
 	if($0 ~ /<hr class=.divider/)
@@ -120,6 +131,9 @@ BEGIN{
 	
 	if(where==5)
 	{
-		print $0 >> otterinf2
+		if(otterinfD!="")
+			otterinfD = otterinfD "\n"
+		otterinfD = otterinfD $0
+		# print $0 >> otterinf2
 	}
 };
\ No newline at end of file
-- 
2.30.2