From: yamat0jp <terukohietori@gmail.com>
Date: Sun, 2 Feb 2020 04:15:08 +0000 (+0900)
Subject: self.tag の使い方が無理やりになっていたのでtagstrに変更
X-Git-Url: http://git.osdn.net/view?p=newbbs%2Fnewbbs.git;a=commitdiff_plain;h=3c7d9124cbf3bbe1a82da143a9f451861feac2b4

self.tag の使い方が無理やりになっていたのでtagstrに変更
fdtable1を一度閉じる命令が名残で残っていたのを削除
---

diff --git a/WebModuleUnit1.dfm b/WebModuleUnit1.dfm
index e8ea1da..9fb8647 100644
--- a/WebModuleUnit1.dfm
+++ b/WebModuleUnit1.dfm
@@ -1865,9 +1865,9 @@ object WebModule1: TWebModule1
   object footer: TPageProducer
     HTMLDoc.Strings = (
       '<nav aria-label="Page naigation">'
-      '  <ui class="pagination justify-content-center pagination-sm">'
+      '  <ul class="pagination justify-content-center pagination-sm">'
       '   <#link>'
-      '  </ui>'
+      '  </ul>'
       '</nav>')
     OnHTMLTag = footerHTMLTag
     Left = 112
diff --git a/WebModuleUnit1.pas b/WebModuleUnit1.pas
index 88042aa..5b7eb10 100644
--- a/WebModuleUnit1.pas
+++ b/WebModuleUnit1.pas
@@ -198,11 +198,11 @@ procedure TWebModule1.adminFormatCell(Sender: TObject;
 begin
   if CellRow = 0 then
   begin
-    BgColor:='Silver';
+    BgColor := 'Silver';
     Exit;
   end;
   if CellRow mod 2 = 0 then
-    BgColor:='snow';
+    BgColor := 'snow';
   case CellColumn of
     0:
       CellData := Format('<input name=check%d type=checkbox>', [CellRow]);
@@ -289,7 +289,7 @@ begin
       ReplaceText := ReplaceText + footerLink([i, i, x]);
     end;
     x := index.Tag = -1;
-    s:='‚³‚¢‚²';
+    s := '‚³‚¢‚²';
     ReplaceText := ReplaceText + footerLink([-1, s, x]);
   end;
 end;
@@ -298,17 +298,17 @@ function TWebModule1.footerLink(Data: array of const): string;
 var
   s, t: string;
 begin
-  if data[1].VType = vtInteger then
-    t:=data[1].VInteger.toString
+  if Data[1].VType = vtInteger then
+    t := Data[1].VInteger.toString
   else
-    t:=data[1].VString^;
+    t := Data[1].VString^;
   if Data[2].VBoolean = true then
     s := ' active'
   else
     s := '';
   result := Format
     ('<li class="page-item%s"><a class=page-link href="%s?db=%d&num=%d">%s</a></li>',
-    [s, Request.ScriptName + PString(Self.Tag)^, FDTable1.FieldByName('dbnum')
+    [s, Request.ScriptName + tagstr, FDTable1.FieldByName('dbnum')
     .AsInteger, Data[0].VInteger, t]);
 end;
 
@@ -499,8 +499,6 @@ begin
   else if TagString = 'uri' then
     ReplaceText := Request.ScriptName
   else if TagString = 'request' then
-  begin
-    FDTable1.Close;
     with FDTable4 do
     begin
       First;
@@ -519,9 +517,6 @@ begin
         ReplaceText := '<table border=1 align=center>' + ReplaceText +
           '</table>';
     end;
-    FDTable1.Open;
-    FDTable1.Refresh;
-  end;
 end;
 
 function TWebModule1.mente: Boolean;
@@ -736,7 +731,7 @@ begin
   if TagString = 'uri' then
     ReplaceText := Request.ScriptName
   else if TagString = 'count' then
-    ReplaceText := FDTable2.RecordCount.ToString
+    ReplaceText := FDTable2.RecordCount.toString
   else if TagString = 'database' then
     ReplaceText := FDTable1.FieldByName('database').AsString
   else if TagString = 'date' then
@@ -885,7 +880,6 @@ begin
   pages(FDTable2.RecordCount, i);
   index.Tag := i;
   tagstr := '/admin';
-  Self.Tag := Integer(@tagstr);
   admin.header.text := adhead.Content;
   admin.footer.Clear;
   admin.footer.Add
@@ -1065,7 +1059,6 @@ begin
   pages(FDTable2.RecordCount, i);
   index.Tag := i;
   tagstr := '/index';
-  Self.Tag := Integer(@tagstr);
   Response.Content := index.Content;
 end;
 
@@ -1131,7 +1124,7 @@ begin
     if s = 'master' then
       Response.SendRedirect(Request.ScriptName + '/master')
     else
-      Response.SendRedirect(Request.ScriptName + '/admin?db=' + i.ToString);
+      Response.SendRedirect(Request.ScriptName + '/admin?db=' + i.toString);
   end
   else if VarIsNull(v) = false then
   begin
@@ -1181,13 +1174,12 @@ begin
   if Request.MethodType = mtPost then
   begin
     s := Request.ContentFields.Values['delete'];
+    FDTable4.First;
     with FDTable4 do
       if s = 'all' then
         while not((Bof = true) and (Eof = true)) do
           Delete
       else
-      begin
-        First;
         while Eof = false do
         begin
           i := FieldByName('dbname').AsInteger;
@@ -1202,7 +1194,6 @@ begin
           else
             Delete;
         end;
-      end;
   end;
   FDTable4.First;
   Response.ContentType := 'text/html;charset=utf-8';
@@ -1285,7 +1276,7 @@ begin
       setLastArticle;
       number := FDTable2.FieldByName('number').AsInteger + 1;
       FDTable2.AppendRecord([i, number, title, na, temp, raw, Now, pass]);
-      Response.SendRedirect(Request.ScriptName + '/index?db=' + i.ToString +
+      Response.SendRedirect(Request.ScriptName + '/index?db=' + i.toString +
         '#article');
     end;
     Exit;
@@ -1359,7 +1350,7 @@ begin
     FDTable1.AppendRecord([0, 'info']);
     FDTable1.AppendRecord([1, 'master']);
     for i := 1 to 10 do
-      FDTable1.AppendRecord([i + 1, 'ŒfŽ¦”Â' + i.ToString]);
+      FDTable1.AppendRecord([i + 1, 'ŒfŽ¦”Â' + i.toString]);
   end;
   if (FDTable3.Bof = true) and (FDTable3.Eof = true) then
   begin
diff --git a/bbs_isapi.res b/bbs_isapi.res
index ce028b8..6be65e6 100644
Binary files a/bbs_isapi.res and b/bbs_isapi.res differ
diff --git a/newbbs.dproj b/newbbs.dproj
index 988e963..85c4d67 100644
--- a/newbbs.dproj
+++ b/newbbs.dproj
@@ -497,16 +497,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
             </Deployment>
             <Platforms>
                 <Platform value="Win32">True</Platform>
diff --git a/yourBBS.res b/yourBBS.res
index 0f3facb..307f1cb 100644
Binary files a/yourBBS.res and b/yourBBS.res differ