Changed to make it work with the new phpBB

Fixed makefile bug

git-svn-id: svn://botcastle1b/ottmirror@6 23ac2ed3-cec8-4626-8109-7118d8ca9799

diff --git a/index.htm b/index.htm
index 79ec66a2d87a21a126c172d8003d3499162a4a2a..d122ba2a75a304822b5cdc685709c73f0c435feb 100644 (file)
--- 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\r
 can, because I made it available. Follow these instructions to download and\r
 setup your own ЯOЯЯIM TTO.</p>\r
-<p>This is about version 1.4.</p>\r
+<p>This is about version 1.5.</p>\r
+\r
+<h2>Read this</h2>\r
+<p>To have the mirror rendered correctly after migration the bots should re-read\r
+the whole thread. When some posts are archived before and some after the page\r
+will have HTML errors.</p>\r
+<p>I reccomend keeping a copy of the data archived by version 1.4 before moving\r
+to this one,</p>\r
+\r
 <h2>Dependencies</h2>\r
 The mirror depends on some things:\r
 <ul>\r
@@ -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=\r
 "svn://bicyclesonthemoon.info/ottmirror">svn://bicyclesonthemoon.info/ottmirror</a>.\r
 Use "e" for read-only access.<br>\r
-If you want the source as it is right now, get it from <a href=\r
+If you want the source as it is exactly now, it's available at <a href=\r
 "http://1190.bicyclesonthemoon.info/ott/src/">http://1190.bicyclesonthemoon.info/ott/src/</a>.\r
+(It's updated immediately and may contain errors).\r
 </p>\r
 \r
 <h2>Preparing the enviroment</h2>\r
@@ -60,9 +69,9 @@ have to be double-escaped. The directories should not end with a
 point to mawk.</li>\r
 <li>Create a directory where the programs will be run from. Can be the same\r
 where you downloaded the source. Set <code>propath</code> to point there.</li>\r
-<li>Create a directory for temporary files. Only you should have read access\r
-there. While someone makes a post, their password can be found in a temporary\r
-file. Set <code>tmppath</code> to point there.</li>\r
+<li>Create a directory for temporary files. Only you should have read and execute\r
+access there. While someone makes a post, their password can be found in a\r
+temporary file. Set <code>tmppath</code> to point there.</li>\r
 <li>Create a directory where the bots will remember things. Set\r
 <code>mempath</code> to point there. Create a file named "<code>name</code>"\r
 there. Put your URL-encoded xkcd fora login in the first line and your\r
@@ -76,8 +85,8 @@ Create the following subdirectories:
        <li><code>mpost/ok</code></li>\r
        <li><code>mpost/pm</code></li>\r
 </ul>\r
-Only you should have read access to <code>mpost</code>. Passwords can be found\r
-there.</li>\r
+Only you should have read and execute access to <code>mpost</code>. Passwords\r
+can be found there.</li>\r
 <li>Create a directory where the bots will write their reports. set\r
 <code>logpath</code> to point there. \r
 </li><li>Set <code>mirrpath</code> to point at the directory where the mirror is\r
@@ -255,14 +264,20 @@ This bot runs every
 This moves the log files once in a week. Otherwise they would grow to infinity.\r
 </p>\r
 \r
-<!-- <h2>Bugs</h2>\r
--->\r
+<h2>Bugs</h2>\r
+<p>This is a quick fix. It does work with the new phpBB but not everything is\r
+rendered as good as in the original.</p>\r
 \r
 <h2>Changes</h2>\r
 <ul>\r
-       <li>v.1.4 (31.08.2015):\r
+       <li>v1.4 (31.03.2016)\r
+       <ul>\r
+               <li>Changed to make it work with the new phpBB</li>\r
+               <li>Fixed makefile bug</li>\r
+       </ul></li>\r
+       <li><a href="http://1190.bicyclesonthemoon.info/ottmirror/1.4">v.1.4 (31.08.2015):</a>\r
        <ul>\r
-               <li>Added an additional field in the post form to stop spambots.</li>\r
+               <li>Added an additional field in the post form to stop spambots</li>\r
        </ul></li>\r
        <li><a href="http://1190.bicyclesonthemoon.info/ottmirror/1.3">v.1.3 (8.03.2015):</a>\r
        <ul>\r

diff --git a/pro.zip/bot2.1.awk b/pro.zip/bot2.1.awk
index bcb23b632bacd0d325508552c9e89fd5d92b87e0..e4c1f56efc511af18542c6320b429cdea4e9a892 100644 (file)
--- 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 2c7daa5c8f6640df3feedf4d382ce2119d398619..bc66d545adb30c0aa4978d9340819e1af7ac0eb7 100644 (file)
--- 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 f18a05550af9bc682b21ea39a4074b86ac6c65e2..15398ed95491961472bafd20e052428bb4a32238 100644 (file)
--- 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 e3f1a92382a70d787df409d768a9f7ad7b4a02e4..3324b74583d5bce94d01473b5ecd3547eb36fad3 100644 (file)
--- 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 05d4d0d98a338c74becc489ecccb59bf177c1a0f..3483c074965780835b1904f62f4c95de43b2c65e 100644 (file)
--- 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 45161ad6ca10aeb8514c755be52f2a757bad328f..c9719038eb375329eb78fd6e34bb9099e979e383 100644 (file)
--- a/pro.zip/upload.awk
+++ b/pro.zip/upload.awk
@@ -1,8 +1,8 @@
 # OTT mirror\r
-# Copyright (C) 2014 Balthasar Szczepański\r
+# Copyright (C) 2014, 2016 Balthasar Szczepański\r
 # upload.awk\r
 # separate userinfo, signatures and content from page and upload it.\r
-# 12.09.2014\r
+# 30.03.2016\r
 \r
 # This file is part of OTT mirror.\r
 #\r
@@ -39,6 +39,7 @@ BEGIN{
 \r
 };\r
 {\r
+       \r
        if((where==6) && ($0 == "</div>"))\r
        {\r
                exit\r
@@ -58,6 +59,10 @@ BEGIN{
        {\r
                where=2\r
        }\r
+       if($0 ~ /<div class=.postbody/)\r
+       {\r
+               where=2\r
+       }\r
        \r
        if((where==2) && ($0 ~ /<p class=.author./))\r
        {\r
@@ -85,6 +90,12 @@ BEGIN{
        if(($0 ~ /<div class=.content./)&&(where=2))\r
        {\r
                where=3\r
+               print ("###inf&" uid) >> outfile\r
+               if(otterinfD != "")\r
+               {\r
+                       print otterinfD > otterinf2\r
+                       otterinfD = ""\r
+               }\r
        }\r
        \r
        if($0 ~ /<div id=.sig[0-9]/)\r
@@ -97,8 +108,8 @@ BEGIN{
        if($0 ~ /<dl class=.postprofile/)\r
        {\r
                where=5\r
-               print ("###inf&" uid) >> outfile\r
-               printf ("%s","") > otterinf2\r
+               # print ("###inf&" uid) >> outfile\r
+               # printf ("%s","") > otterinf2\r
        }\r
        \r
        if($0 ~ /<hr class=.divider/)\r
@@ -120,6 +131,9 @@ BEGIN{
        \r
        if(where==5)\r
        {\r
-               print $0 >> otterinf2\r
+               if(otterinfD!="")\r
+                       otterinfD = otterinfD "\n"\r
+               otterinfD = otterinfD $0\r
+               # print $0 >> otterinf2\r
        }\r
 };
\ No newline at end of file