・プラグイン使用時にスキンの<THREADURL/>が設定されないバグを修正。

・プラグイン使用時にFooter.htmlが読み込まれていないバグを修正。

diff --git a/GikoSystem.pas b/GikoSystem.pas
index e468dea..cee8bbd 100644 (file)
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -855,10 +855,10 @@ begin
 
                        // \82â\82è\82©\82½\82ª\8bê\82µ\82¢\82¯\82Ç\81A\83I\83v\83V\83\87\83\93\83_\83C\83A\83\8d\83O\82Ì\83v\83\8c\83r\83\85\81[\97p try
                        try
-                               if ThreadItem.ParentBoard.ParentCategory <> nil then
-                                       Skin.Text := StringReplace( Skin.Text, '<BBSNAME/>', ThreadItem.ParentBoard.ParentCategory.ParentBBS2ch.Title, [rfReplaceAll] );
-                               if ThreadItem.ParentBoard.BBSID <> '' then
-                                       Skin.Text := StringReplace( Skin.Text, '<THREADURL/>', GikoSys.GetURL(ThreadItem.ParentBoard.BBSID, ThreadItem.FileName), [rfReplaceAll] );
+       if ThreadItem.ParentBoard <> nil then
+                                       if ThreadItem.ParentBoard.ParentCategory <> nil then
+                                               Skin.Text := StringReplace( Skin.Text, '<BBSNAME/>', ThreadItem.ParentBoard.ParentCategory.ParentBBS2ch.Title, [rfReplaceAll] );
+                               Skin.Text := StringReplace( Skin.Text, '<THREADURL/>', ThreadItem.URL, [rfReplaceAll] );
                        except end;
                        Skin.Text := StringReplace( Skin.Text, '<BOARDNAME/>', ThreadItem.ParentBoard.Title, [rfReplaceAll] );
                        Skin.Text := StringReplace( Skin.Text, '<BOARDURL/>', ThreadItem.ParentBoard.URL, [rfReplaceAll] );
@@ -876,10 +876,10 @@ begin
                        //----- \82Æ\82è\82 \82¦\82¸\82©\82¿\82ã\81`\82µ\82á\8cÝ\8a·\97p\81B\83R\83\81\83\93\83g\83A\83E\83g\82µ\82Ä\82à\82æ\82µ
                        // \82â\82è\82©\82½\82ª\8bê\82µ\82¢\82¯\82Ç\81A\83I\83v\83V\83\87\83\93\83_\83C\83A\83\8d\83O\82Ì\83v\83\8c\83r\83\85\81[\97p try
                        try
-                               if ThreadItem.ParentBoard.ParentCategory <> nil then
-                                       Skin.Text := StringReplace( Skin.Text, '&BBSNAME', ThreadItem.ParentBoard.ParentCategory.ParentBBS2ch.Title, [rfReplaceAll] );
-                               if ThreadItem.ParentBoard.BBSID <> '' then
-                                       Skin.Text := StringReplace( Skin.Text, '&THREADURL', GikoSys.GetURL(ThreadItem.ParentBoard.BBSID, ThreadItem.FileName), [rfReplaceAll] );
+       if ThreadItem.ParentBoard <> nil then
+                                       if ThreadItem.ParentBoard.ParentCategory <> nil then
+                                               Skin.Text := StringReplace( Skin.Text, '&BBSNAME', ThreadItem.ParentBoard.ParentCategory.ParentBBS2ch.Title, [rfReplaceAll] );
+                               Skin.Text := StringReplace( Skin.Text, '&THREADURL', ThreadItem.URL, [rfReplaceAll] );
                        except end;
                        Skin.Text := StringReplace( Skin.Text, '&BOARDNAME', ThreadItem.ParentBoard.Title, [rfReplaceAll] );
                        Skin.Text := StringReplace( Skin.Text, '&BOARDURL', ThreadItem.ParentBoard.URL, [rfReplaceAll] );
@@ -972,9 +972,10 @@ begin
        else
                boardPlugIn := nil;
        if boardPlugIn <> nil then begin
+               //===== \83v\83\89\83O\83C\83\93\82É\82æ\82é\95\\8e¦
                if Assigned( Pointer( boardPlugIn.Module ) ) then begin
                        NewReceiveNo := ThreadItem.NewReceive;
-      
+
                        // \83t\83H\83\93\83g\82â\83T\83C\83Y\82Ì\90Ý\92è
                        if Length( GikoSys.Setting.BrowserFontName ) > 0 then
                                UserOptionalStyle := UserOptionalStyle +
@@ -1000,12 +1001,13 @@ begin
                        SaveList := TStringList.Create;
                        try
                                doc.open;
-                               //doc.charset := 'Shift_JIS';
-        threadItem.SizeByte := 0;
+                               // \95¶\8e\9a\83R\81[\83h\82Í\83v\83\89\83O\83C\83\93\82É\94C\82¹\82é
+                               // doc.charset := 'Shift_JIS';
+                               threadItem.SizeByte := 0;
 
                                // \83w\83b\83_
                                SaveList.Add( boardPlugIn.GetHeader( DWORD( threadItem ),
-               '<style type="text/css">body {' + UserOptionalStyle + '}</style>' ) );
+                                       '<style type="text/css">body {' + UserOptionalStyle + '}</style>' ) );
                                SaveList.Add('<a name="top"></a>');
 
                                for i := 0 to threadItem.AllResCount - 1 do begin
@@ -1013,26 +1015,26 @@ begin
                                                Continue;
                                        end;
 
-          // \90V\92\85\83}\81[\83N
-          if (NewReceiveNo = (i + 1)) or ((NewReceiveNo = 0) and (i = 0)) then begin
-            try
-              SaveList.Add( LoadSkin( GetSkinNewmarkFileName ) );
-            except
-              SaveList.Add( '<a name="new"></a>' );
-            end;
-          end;
-
-          // \83\8c\83X
-          SaveList.Add( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ) );
-
-          if ThreadItem.Kokomade = (i + 1) then begin
-            // \82±\82±\82Ü\82Å\93Ç\82ñ\82¾
-            try
-              SaveList.Add( LoadSkin( GetSkinBookmarkFileName ) );
-            except
-              SaveList.Add( '<a name="koko"></a>' );
-            end;
-          end;
+                                       // \90V\92\85\83}\81[\83N
+                                       if (NewReceiveNo = (i + 1)) or ((NewReceiveNo = 0) and (i = 0)) then begin
+                                               try
+                                                       SaveList.Add( LoadSkin( GetSkinNewmarkFileName ) );
+                                               except
+                                                       SaveList.Add( '<a name="new"></a>' );
+                                               end;
+                                       end;
+
+                                       // \83\8c\83X
+                                       SaveList.Add( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ) );
+
+                                       if ThreadItem.Kokomade = (i + 1) then begin
+                                               // \82±\82±\82Ü\82Å\93Ç\82ñ\82¾
+                                               try
+                                                       SaveList.Add( LoadSkin( GetSkinBookmarkFileName ) );
+                                               except
+                                                       SaveList.Add( '<a name="koko"></a>' );
+                                               end;
+                                       end;
 
                                        threadItem.SizeByte := SizeByte + Length( SaveList.Text );
                                        doc.Write(SaveList.Text);
@@ -1043,7 +1045,7 @@ begin
                                threadItem.SizeByte := SizeByte + Length( SaveList.Text );
 
                                // \83X\83L\83\93(\83t\83b\83^)
-                               boardPlugIn.GetFooter( DWORD( threadItem ), '' );
+                               SaveList.Add( boardPlugIn.GetFooter( DWORD( threadItem ), '' ) );
 
                                doc.Write(SaveList.Text);
                        finally