OSDN Git Service

This commit was manufactured by cvs2svn to create tag 'v1_62_0_811'. v1_62_0_811
authorcvs2git <cvs2git>
Thu, 3 Mar 2011 15:17:41 +0000 (15:17 +0000)
committercvs2git <cvs2git>
Thu, 3 Mar 2011 15:17:41 +0000 (15:17 +0000)
Belib.pas
Editor.pas
GikoSystem.pas
Option.dfm
Option.pas
Setting.pas
gikoNavi.res
readme/gikoSetup.iss
readme/gikoUSetup.iss
readme/language.ini
readme/readme.txt

index 86bfdd7..bbf3cda 100644 (file)
--- a/Belib.pas
+++ b/Belib.pas
@@ -215,7 +215,6 @@ begin
                                                MakeError(FSession, ERROR_INVALID_DATA)
                                        else begin
                         body := Buf;
-                        body := EUCtoSJIS(body);    // 2byte\95\8e\9a\82Ì\95\94\95ª\82Í\8eg\82í\82È\82¢\82¯\82Ç\94O\82Ì\82½\82ß
                         FSession.FDMDM := Copy(body, Pos('"DMDM=', body) + 6, Length(body));
                         FSession.FDMDM := Copy(FSession.FDMDM, 1, Pos(';', FSession.FDMDM) - 1);
                         FSession.FMDMD := Copy(body, Pos('"MDMD=', body) + 6, Length(body));
index 4258d8d..a8a6381 100644 (file)
@@ -22,7 +22,7 @@ uses
 type
 //     TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall;
        //\8f\91\82«\8d\9e\82Ý\96ß\82è\92l\83^\83C\83v
-       TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtNinpou, grtNinpouErr, grtSuiton);
+       TGikoResultType = (grtOK, grtCookie, grtCheck, grtError, grtBouken, grtBoukenErr);
 
        TEditorForm = class(TForm)
                MainMenu: TMainMenu;
@@ -220,7 +220,6 @@ type
                FInputAssistKey: String;        ///< \93ü\97Í\83A\83V\83X\83g\82Ì\83L\81[
                FResistWords: TStringList;      ///< \93ü\97Í\83A\83V\83X\83g\82Ì\8e«\8f\91\82©\82ç\82Ì\8c\9f\8dõ\8c\8b\89Ê
         FSambaTimer: TSambaTimer;   ///< Samba\91Î\8dô\82Ì\83^\83C\83}\81[
-        FCookieDomain: string;        ///< \94E\96@\92\9f\83h\83\81\83C\83\93
                procedure Preview;
                function Check: Boolean;
                procedure SetNameList(sName, sMail: string);
@@ -785,7 +784,7 @@ begin
        Indy.Request.AcceptLanguage := 'ja';
        Indy.Request.Accept := 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
        Indy.Request.ContentType := 'application/x-www-form-urlencoded';
-       Indy.Request.CustomHeaders.Add(getHeaderStr(ACOOKIE, SPID, PON, GikoSys.GetBouken(URL, FCookieDomain), Board));
+       Indy.Request.CustomHeaders.Add(getHeaderStr(ACOOKIE, SPID, PON, GikoSys.GetBoukenCookie(URL), Board));
        TextStream := TStringStream.Create('');
        Source := TStringStream.Create('');
        try
@@ -888,40 +887,23 @@ begin
                                        CancelSend( Board, SysMenu );
                                        Exit;
                                end;
-                       end else if ResultType = grtNinpou then begin
+                       end else if ResultType = grtBouken then begin
                                MsgBox( Handle,
-                                               '\8bM\95û\82Ì\94E\96@\92\9f\82ð\8dì\90¬\92\86\82Å\82·\81B\88ø\82«\95Ô\82·\82È\82ç\82¢\82Ü\82¾\81B(\82Q\95ª\82Ù\82Ç\82©\82©\82è\82Ü\82·)' + #13#10
+                                               '\8bM\95û\82Ì\96`\8c¯\82Ì\8f\91\82ð\8dì\90¬\92\86\82Å\82·\81B\88ø\82«\95Ô\82·\82È\82ç\82¢\82Ü\82¾\81B(\82Q\95ª\82Ù\82Ç\82©\82©\82è\82Ü\82·)' + #13#10
                                                , '\8am\94F',
-                                               MB_OK or MB_ICONINFORMATION);
-                               if (GikoSys.Setting.UseSamba)  and  (FSambaTimer.Enabled) then
-                begin
-                                       FSambaTimer.WriteSambaTime(Now());
-                end;
+                                               MB_OK or MB_ICONQUESTION);
                 Board.PON  := '';
                 Board.SPID := '';
                 Board.Cookie := '';
                 GetCookie(Indy.CookieManager, Board);
                                Exit;
-            end else if ResultType = grtSuiton then begin
-                               MsgBox( Handle,
-                                               '\8bM\95û\82Ì\94E\96@\92\9f\82Í\8fÄ\82©\82ê\82Ü\82µ\82½\81B' + #13#10 +
-                        '\94E\96@\92\9f\82ð\8dí\8f\9c\82µ\82Ü\82µ\82½\81A\8dÄ\91\97\90M\82µ\82Ä\82­\82¾\82³\82¢\81B'
-                                               , '\8am\94F',
-                                               MB_OK or MB_ICONINFORMATION);
-                // \94E\96@\92\9f\8aª\95¨\82ð\8fÁ\82·
-                GikoSys.DelBoukenCookie(FCookieDomain);
-                GikoSys.Setting.WriteBoukenSettingFile;
-                Board.PON  := '';
-                Board.SPID := '';
-                Board.Cookie := '';
-                Exit;
                        end else begin
                                if (GikoSys.Setting.UseSamba)  and  (FSambaTimer.Enabled) then
                 begin
                                        FSambaTimer.WriteSambaTime(Now());
                 end;
-                // \94E\96@\92\9f\8aª\95¨\83G\83\89\81[\82ÍCookie\82ð\8dX\90V\82·\82é
-                if ResultType = grtNinpouErr then begin
+                // \96`\8c¯\82Ì\8f\91\83G\83\89\81[\82ÍCookie\82ð\8dX\90V\82·\82é
+                if ResultType = grtBoukenErr then begin
                     GetCookie(Indy.CookieManager, Board);
                 end;
                                State := gdsError;
@@ -999,17 +981,13 @@ function TEditorForm.GetResultType(ResponseText: string): TGikoResultType;
 begin
        if AnsiPos('\8f\91\82«\82±\82Ý\82ª\8fI\82í\82è\82Ü\82µ\82½', ResponseText) <> 0 then
                Result := grtOK
-    else if ( (AnsiPos('<b>\82æ\82¤\82±\82»\81F\8bM\95û\82Ì\94E\96@\92\9f\82ð\8dì\90¬\82µ\82Ü\82·\81B\82Q\95ª\8cã\82É\8dÄ\93x\8f\91\82«\8d\9e\82Þ\82©\81A\82¨\8bA\82è\82­\82¾\82³\82¢', ResponseText) > 0) or
-              (AnsiPos('\82d\82q\82q\82n\82q\81F\8bM\95û\82Ì\96`\8c¯\82Ì\8f\91\82ð\8dì\90¬\92\86\82Å\82·', ResponseText) > 0) )
+    else if (AnsiPos('\82d\82q\82q\82n\82q\81F\8bM\95û\82Ì\96`\8c¯\82Ì\8f\91\82ð\8dì\90¬\92\86\82Å\82·', ResponseText) > 0)
                 and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0)         then
-        Result := grtNinpou
+        Result := grtBouken
     else if ( (AnsiPos('\82d\82q\82q\82n\82q\81F\8fC\8ds\82ª\91«\82è\82Ü\82¹\82ñ', ResponseText) > 0) or   // \83G\83\89\81[\88µ\82¢
               (AnsiPos('\82d\82q\82q\82n\82q\81FLv\82ª\91«\82è\82È\82­\82Ä\83X\83\8c\83b\83h\97§\82Ä', ResponseText) > 0) ) // \83G\83\89\81[\88µ\82¢
               and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0)   then
-        Result := grtNinpouErr
-    else if( AnsiPos('<b>\82â\82ç\82ê\82½\82Å\82²\82´\82é\81FLv=0 <br>\82³\82Ä\8e©\97Í\82Å\95\9c\8a\88\82Å\82«\82é\82©\82È?', ResponseText) > 0) 
-              and (AnsiPos(RES2CH_COOKIE, ResponseText) > 0)   then
-        Result := grtSuiton
+        Result := grtBoukenErr
        else if ( AnsiPos('\83N\83b\83L\81[\82ª\82È\82¢\82©\8aú\8cÀ\90Ø\82ê\82Å\82·', ResponseText) > 0) or
                                        (AnsiPos('<title>\83N\83b\83L\81[\8am\94F\81I</title>', ResponseText) > 0)    or
                                        (AnsiPos('<title>\81¡\83N\83b\83L\81[\8am\94F\81I\81¡</title>', ResponseText) > 0) or
@@ -1942,8 +1920,6 @@ begin
     curCookies := TStringList.Create;
     curCookies.Delimiter := ';';
     curCookies.DelimitedText := ABoard.Cookie;
-    curCookies.Sort;
-    curCookies.Duplicates := dupIgnore;
        ABoard.Cookie := '';
     try
         for i := 0 to CookieMng.CookieCollection.Count - 1 do begin
@@ -1965,7 +1941,7 @@ begin
                 if Length( curCookies.Values[ Cookie.CookieName ] ) > 0 then begin
                     // \8aù\91\92l\82Ì\95t\82¯\91Ö\82¦
                     curCookies[curCookies.IndexOfName(Cookie.CookieName)] :=
-                        Cookie.ClientCookie;
+                        Cookie.Value;
                 end else begin
                     // \92Ç\89Á
                     curCookies.Add(Cookie.ClientCookie);
@@ -1973,8 +1949,8 @@ begin
             end;
         end;
         for i := 0 to curCookies.Count - 1 do begin
-            if (curCookies[i] <> '') then begin
-                ABoard.Cookie := ABoard.Cookie + curCookies[i] + '; ';
+            if (curCookies.Strings[i] <> '') then begin
+                ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; ';
             end;
         end;
     finally
index 2c1e4d7..1a0b414 100644 (file)
@@ -265,8 +265,6 @@ type
         procedure DelBoukenCookie(ADomain: String);
         //! \96`\8c¯\82Ì\8f\91Domain\88ê\97\97\8eæ\93¾
         procedure GetBoukenDomain(var ADomain: TStringList);
-        //! \96`\8c¯\82Ì\8f\91\83h\83\81\83C\83\93\96¼Cookie\8eæ\93¾
-        function GetBouken(AURL: String; var Domain: String): String;
        end;
 
 var
@@ -3499,19 +3497,7 @@ begin
         end;
     end;
 end;
-function TGikoSys.GetBouken(AURL: String; var Domain: String): String;
-var
-       Protocol, Host, Path, Document, Port,Bookmark : String;
-    Cookie : String;
-begin
-    Domain := '';
-    Cookie := '';
-    GikoSys.ParseURI(AURL, Protocol, Host, Path, Document, Port,Bookmark);
-    if ( Length(Host) > 0 ) then begin
-        Setting.GetBouken(Host, Domain, Cookie);
-        Result := Cookie;
-    end;
-end;
+
 
 initialization
        GikoSys := TGikoSys.Create;
index 6a3a3de..50446b9 100644 (file)
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
           Top = 43
           Width = 417
           Height = 20
-          ItemHeight = 0
+          ItemHeight = 12
           TabOrder = 0
           Text = 'BoardURLComboBox'
         end
@@ -1689,7 +1689,7 @@ object OptionDialog: TOptionDialog
         Top = 256
         Width = 477
         Height = 81
-        Caption = #24525#27861#24086
+        Caption = #20882#38522#12398#26360
         TabOrder = 2
         object Label25: TLabel
           Left = 40
index 89d9562..1274f05 100644 (file)
@@ -1725,7 +1725,7 @@ procedure TOptionDialog.BoukenDelButtonClick(Sender: TObject);
 begin
     if ( BoukenComboBox.Items.IndexOf( BoukenComboBox.Text ) <> -1 ) then begin
         if MsgBox(Self.Handle, BoukenComboBox.Text + ' \82ð\8dí\8f\9c\82µ\82Ü\82·\81B'#13#10 +
-            '\8dí\8f\9c\82·\82é\82Æ\95\9c\8c³\82Å\82«\82Ü\82¹\82ñ\81B\82æ\82ë\82µ\82¢\82Å\82·\82©\81H', '\94E\96@\92\9f\81@\83h\83\81\83C\83\93\8dí\8f\9c', MB_YESNO or MB_ICONQUESTION) = IDYES then begin
+            '\8dí\8f\9c\82·\82é\82Æ\95\9c\8c³\82Å\82«\82Ü\82¹\82ñ\81B\82æ\82ë\82µ\82¢\82Å\82·\82©\81H', '\96`\8c¯\82Ì\8f\91\81@\83h\83\81\83C\83\93\8dí\8f\9c', MB_YESNO or MB_ICONQUESTION) = IDYES       then begin
             GikoSys.DelBoukenCookie(BoukenComboBox.Text);
             GikoSys.Setting.WriteBoukenSettingFile;
             BoukenComboBox.Items.Delete(BoukenComboBox.ItemIndex);
index cfbf9ec..27b66fa 100644 (file)
@@ -550,7 +550,6 @@ type
         function GetExtprevieFileName: String;
         function GetBoukenCookie(AHostName: String): String;
         procedure SetBoukenCookie(ACookieValue, AHostName: String);
-        procedure GetBouken(AHostName: String; var Domain:String; var Cookie:String);
         {
         \brief  \83\8a\83\93\83N\97\9a\97ð\82Ì\95Û\8e\9d\83T\83C\83Y\82Ìsetter
         \param  AVal    \90Ý\92è\82·\82é\83T\83C\83Y( >0)
@@ -2504,19 +2503,5 @@ begin
         FBoukenCookieList.Add(AHostName + '=' + ACookieValue);
     end;
 end;
-procedure TSetting.GetBouken(AHostName: String; var Domain:String; var Cookie:String);
-var
-    i : Integer;
-begin
-    Cookie := '';
-    for i := 0 to FBoukenCookieList.Count - 1 do begin
-        if ( AnsiPos(FBoukenCookieList.Names[i], AHostName) > 0 ) then begin
-            Domain := FBoukenCookieList.Names[i];
-            Cookie := FBoukenCookieList.Values[FBoukenCookieList.Names[i]];
-            Break;
-        end;
-    end;
-end;
-
 end.
 
index 4a6fc8a..3c48b28 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ
index 32f95eb..9e1512f 100644 (file)
@@ -9,12 +9,12 @@ DefaultDirName={pf}\gikonavi
 VersionInfoDescription=\83M\83R\83i\83r\83Z\83b\83g\83A\83b\83v\83v\83\8d\83O\83\89\83\80
 DefaultGroupName=\83M\83R\83i\83r
 ; \8e©\95ª\82Ì\8aÂ\8b«\82É\8d\87\82í\82¹\82Ä\82­\82¾\82³\82¢
-SourceDir=G:\Release62
+SourceDir=G:\Release61
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; \83M\83R\83i\83r\82Ì\83o\81[\83W\83\87\83\93\82É\82 \82í\82¹\82Ä\82­\82¾\82³\82¢
-VersionInfoVersion=1.62.1.813
-OutputBaseFilename=gikoNavi_b62_setup
+VersionInfoVersion=1.61.1.801
+OutputBaseFilename=gikoNavi_b61_setup
 
 
 
index 97669b2..7018b39 100644 (file)
@@ -18,8 +18,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; \83M\83R\83i\83r\82Ì\83o\81[\83W\83\87\83\93\82É\82 \82í\82¹\82Ä\82­\82¾\82³\82¢
-VersionInfoVersion=1.62.1.813
-OutputBaseFilename=gikoNavi_b62_usetup
+VersionInfoVersion=1.62.0.810
+OutputBaseFilename=gikoNavi_b62_810_usetup
 CreateUninstallRegKey=no
 
 [Tasks]
index f5337f5..7057a19 100644 (file)
@@ -12,6 +12,4 @@ Error=[
 NewRes=[\90V\83\8c\83X\91\97\90M\8fI\97¹\82µ\82Ü\82·\82½(\81\83Ö¥\81L)]
 NewSure=[\90V\83X\83\8c\91\97\90M\8fI\97¹\82µ\82Ü\82·\82½(\81\83Ö¥\81L)]
 ResError=[\83\8c\83X\91\97\90M\8e¸\94s(\81\83Ö¥`)]
-SureError=[\90V\83X\83\8c\91\97\90M\8e¸\94s(\81\83Ö¥`)]
-BELogout=BE\83\8d\83O\83A\83E\83g\82µ\82Ü\82·\82½
-BELogin=BE\83\8d\83O\83C\83\93\82µ\82Ü\82·\82½ - 
+SureError= [\90V\83X\83\8c\91\97\90M\8e¸\94s(\81\83Ö¥`)]
index cb18a6e..93ba4e1 100644 (file)
@@ -121,13 +121,9 @@ LICENSE
 ------------------------------
 \97\9a\97ð
 ------------------------------
-2011/03/06
+200X/XX/XX
   Version ÊÞÀ62
-  \83\8c\83X\83G\83f\83B\83^\82Å\82Ì\83g\83\8a\83b\83v\82Ì\83v\83\8c\83r\83\85\81[\82Ì\95s\8bï\8d\87\8fC\90³
-  \83\8c\83X\83|\83b\83v\83A\83b\83v\82Å\81A\95¡\90\94\83\82\83j\83^\8aÂ\8b«\82Å\81A\89E\92[\82Å\90Ø\82ê\82é\95s\8bï\8d\87\82Ì\8fC\90³
-  \94E\96@\92\9f\91Î\89\9e
-  BE\83\8d\83O\83C\83\93\82É\91Î\89\9e
-  
+
 2009/10/18
   Version ÊÞÀ61
   \82µ\82½\82ç\82ÎJBBS\82Å\83X\83\8c\83b\83h\82ð\8c\9a\82Ä\82é\82±\82Æ\82ª\82Å\82«\82È\82¢\95s\8bï\8d\87\82Ì\8fC\90³