1.60.0.783をマージ

diff --git a/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr b/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
index 59ef0ff..1956c36 100644 (file)
--- a/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
@@ -83,7 +83,7 @@ const
        MAJOR_VERSION                   = 1;
        MINOR_VERSION                   = 0;
        RELEASE_VERSION         = 'beta';
-       REVISION_VERSION        = 19;
+       REVISION_VERSION        = 20;
 
 // =========================================================================
 // \8eG\97p\8aÖ\90\94
@@ -472,7 +472,6 @@ var
                                                foundPos := AnsiPos( '<table', downResult.Text ) - 1;
                                                if foundPos > 0 then
                                                        downResult.Text := Copy( downResult.Text, 1, foundPos );
-
                                                // \82Ü\82¿BBS\82Í dat \92¼\93Ç\82Ý\82ª\8fo\97\88\82È\82¢\82µ\81Acgi \88È\8aO\82É\8d·\95ª\93Ç\82Ý\8d\9e\82Ý\82Ì\95û\96@\82ª\82 \82é\82í\82¯\82Å\82à\96³\82¢\82Ì\82Å
                                                // \91f\82Ì\82Ü\82Ü\82ð\96³\97\9d\82É\95Û\82Æ\82¤\82Æ\82Í\82¹\82¸\82É 2ch \82Ì dat \8c`\8e®\82É\95Ï\8a·\82µ\82½\82à\82Ì\82ð\95Û\91¶\82µ\82Ä\82µ\82Ü\82¤
                                                To2chDat( downResult, Count + 1 );
@@ -519,13 +518,13 @@ begin
                if Count = 0 then
                        // 1\81`
                        datURL          :=
-                               uri.Protocol + '://' + uri.Host + '/bbs/read.pl?' +
+                               uri.Protocol + '://' + uri.Host + '/bbs/read.cgi?' +
                                'BBS=' + uriList.Values[ 'BBS' ] + '&KEY=' + uriList.Values[ 'KEY' ] +
                                '&START=' + IntToStr( 1 )
                else
                        // \90V\92\85\82Ì\82Ý
                        datURL          :=
-                               uri.Protocol + '://' + uri.Host + '/bbs/read.pl?' +
+                               uri.Protocol + '://' + uri.Host + '/bbs/read.cgi?' +
                                'BBS=' + uriList.Values[ 'BBS' ] + '&KEY=' + uriList.Values[ 'KEY' ] +
                                '&START=' + IntToStr( Count + 1 ) + '&NOFIRST=TRUE';
                // \83_\83E\83\93\83\8d\81[\83h
@@ -767,7 +766,7 @@ procedure   TMachiBBSThreadItem.To2chDat(
 );
 var
        i, bound                        : Integer;
-       foundPos                        : Integer;
+       foundPos,foundPos2                      : Integer;
        strTmp                          : string;
        res                                             : TStringList;
        no                                              : Integer;
@@ -804,6 +803,7 @@ begin
                // \82 \82Ú\81[\82ñ\83`\83F\83b\83N\82Å\96â\91è\82ª\94­\90¶\82µ\82Ä\82à\90æ\82Ö\90i\82ß\82½\82¢\82Ì\82Å
        end;
 
+
        // \83g\83\8a\83b\83v\82Ì\8cã\82Ì '<b> </b>' \82ð\8bó\82É
     if AnsiPos('\81\9f</b>', ioHTML.Text) <> 0 then begin
        ioHTML.Text     := CustomStringReplace( ioHTML.Text, '<b> </b></font>', '</b></font>', true );
@@ -828,6 +828,7 @@ begin
        try
                bound := ioHTML.Count - 1;
                for i := 0 to bound do begin
+            // \83X\83N\83\8a\83v\83g\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82½\82ç\8dí\8f\9c\82·\82é\81i\8dL\8d\90\91Î\8dô\81j
                        res.Text := CustomStringReplace( ioHTML[ i ], '<>', #10 );
                                                //StringReplace( ioHTML[ i ], '<>', #10, [rfReplaceAll] );
                        if res.Count >= 3 then begin    // 3 \96¢\96\9e\82Í\82 \82è\82¦\82È\82¢\82Æ\8ev\82¤\82¯\82Ç\88À\91S\82Ì\82½\82ß
@@ -855,7 +856,15 @@ begin
                 end;
                        end;
                        ioHTML[ i ] := CustomStringReplace( res.Text, #13#10, '<>');
-                       //StringReplace( res.Text, #13#10, '<>', [rfReplaceAll] );
+            // \8dL\8d\90\83X\83N\83\8a\83v\83g\91Î\8dô
+            foundPos := Pos( '<script', ioHTML[ i ] );
+            if foundPos > 0 then begin
+                foundPos2 := Pos( '</script>', ioHTML[ i ] );
+                if (foundPos2 > foundPos) then begin
+                    ioHTML[ i ] := Copy(ioHTML[ i ], 1, foundPos-1) +
+                                   Copy(ioHTML[ i ], foundPos2 + 9, Length(ioHTML[ i ]));
+                end;
+            end;
                end;
        finally
                res.Free;

diff --git a/res/ExternalBoardPlugIn/MachiBBSPlugIn.res b/res/ExternalBoardPlugIn/MachiBBSPlugIn.res
index ff159e5..149ddcf 100644 (file)
Binary files a/res/ExternalBoardPlugIn/MachiBBSPlugIn.res and b/res/ExternalBoardPlugIn/MachiBBSPlugIn.res differ