Commit MetaInfo

Revisão3c7d9124cbf3bbe1a82da143a9f451861feac2b4 (tree)
Hora2020-02-02 13:15:08
Autoryamat0jp <terukohietori@gmai...>
Commiteryamat0jp

Mensagem de Log

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

Mudança Sumário

Diff

--- a/WebModuleUnit1.dfm
+++ b/WebModuleUnit1.dfm
@@ -1865,9 +1865,9 @@ object WebModule1: TWebModule1
18651865 object footer: TPageProducer
18661866 HTMLDoc.Strings = (
18671867 '<nav aria-label="Page naigation">'
1868- ' <ui class="pagination justify-content-center pagination-sm">'
1868+ ' <ul class="pagination justify-content-center pagination-sm">'
18691869 ' <#link>'
1870- ' </ui>'
1870+ ' </ul>'
18711871 '</nav>')
18721872 OnHTMLTag = footerHTMLTag
18731873 Left = 112
--- a/WebModuleUnit1.pas
+++ b/WebModuleUnit1.pas
@@ -198,11 +198,11 @@ procedure TWebModule1.adminFormatCell(Sender: TObject;
198198 begin
199199 if CellRow = 0 then
200200 begin
201- BgColor:='Silver';
201+ BgColor := 'Silver';
202202 Exit;
203203 end;
204204 if CellRow mod 2 = 0 then
205- BgColor:='snow';
205+ BgColor := 'snow';
206206 case CellColumn of
207207 0:
208208 CellData := Format('<input name=check%d type=checkbox>', [CellRow]);
@@ -289,7 +289,7 @@ begin
289289 ReplaceText := ReplaceText + footerLink([i, i, x]);
290290 end;
291291 x := index.Tag = -1;
292- s:='さいご';
292+ s := 'さいご';
293293 ReplaceText := ReplaceText + footerLink([-1, s, x]);
294294 end;
295295 end;
@@ -298,17 +298,17 @@ function TWebModule1.footerLink(Data: array of const): string;
298298 var
299299 s, t: string;
300300 begin
301- if data[1].VType = vtInteger then
302- t:=data[1].VInteger.toString
301+ if Data[1].VType = vtInteger then
302+ t := Data[1].VInteger.toString
303303 else
304- t:=data[1].VString^;
304+ t := Data[1].VString^;
305305 if Data[2].VBoolean = true then
306306 s := ' active'
307307 else
308308 s := '';
309309 result := Format
310310 ('<li class="page-item%s"><a class=page-link href="%s?db=%d&num=%d">%s</a></li>',
311- [s, Request.ScriptName + PString(Self.Tag)^, FDTable1.FieldByName('dbnum')
311+ [s, Request.ScriptName + tagstr, FDTable1.FieldByName('dbnum')
312312 .AsInteger, Data[0].VInteger, t]);
313313 end;
314314
@@ -499,8 +499,6 @@ begin
499499 else if TagString = 'uri' then
500500 ReplaceText := Request.ScriptName
501501 else if TagString = 'request' then
502- begin
503- FDTable1.Close;
504502 with FDTable4 do
505503 begin
506504 First;
@@ -519,9 +517,6 @@ begin
519517 ReplaceText := '<table border=1 align=center>' + ReplaceText +
520518 '</table>';
521519 end;
522- FDTable1.Open;
523- FDTable1.Refresh;
524- end;
525520 end;
526521
527522 function TWebModule1.mente: Boolean;
@@ -736,7 +731,7 @@ begin
736731 if TagString = 'uri' then
737732 ReplaceText := Request.ScriptName
738733 else if TagString = 'count' then
739- ReplaceText := FDTable2.RecordCount.ToString
734+ ReplaceText := FDTable2.RecordCount.toString
740735 else if TagString = 'database' then
741736 ReplaceText := FDTable1.FieldByName('database').AsString
742737 else if TagString = 'date' then
@@ -885,7 +880,6 @@ begin
885880 pages(FDTable2.RecordCount, i);
886881 index.Tag := i;
887882 tagstr := '/admin';
888- Self.Tag := Integer(@tagstr);
889883 admin.header.text := adhead.Content;
890884 admin.footer.Clear;
891885 admin.footer.Add
@@ -1065,7 +1059,6 @@ begin
10651059 pages(FDTable2.RecordCount, i);
10661060 index.Tag := i;
10671061 tagstr := '/index';
1068- Self.Tag := Integer(@tagstr);
10691062 Response.Content := index.Content;
10701063 end;
10711064
@@ -1131,7 +1124,7 @@ begin
11311124 if s = 'master' then
11321125 Response.SendRedirect(Request.ScriptName + '/master')
11331126 else
1134- Response.SendRedirect(Request.ScriptName + '/admin?db=' + i.ToString);
1127+ Response.SendRedirect(Request.ScriptName + '/admin?db=' + i.toString);
11351128 end
11361129 else if VarIsNull(v) = false then
11371130 begin
@@ -1181,13 +1174,12 @@ begin
11811174 if Request.MethodType = mtPost then
11821175 begin
11831176 s := Request.ContentFields.Values['delete'];
1177+ FDTable4.First;
11841178 with FDTable4 do
11851179 if s = 'all' then
11861180 while not((Bof = true) and (Eof = true)) do
11871181 Delete
11881182 else
1189- begin
1190- First;
11911183 while Eof = false do
11921184 begin
11931185 i := FieldByName('dbname').AsInteger;
@@ -1202,7 +1194,6 @@ begin
12021194 else
12031195 Delete;
12041196 end;
1205- end;
12061197 end;
12071198 FDTable4.First;
12081199 Response.ContentType := 'text/html;charset=utf-8';
@@ -1285,7 +1276,7 @@ begin
12851276 setLastArticle;
12861277 number := FDTable2.FieldByName('number').AsInteger + 1;
12871278 FDTable2.AppendRecord([i, number, title, na, temp, raw, Now, pass]);
1288- Response.SendRedirect(Request.ScriptName + '/index?db=' + i.ToString +
1279+ Response.SendRedirect(Request.ScriptName + '/index?db=' + i.toString +
12891280 '#article');
12901281 end;
12911282 Exit;
@@ -1359,7 +1350,7 @@ begin
13591350 FDTable1.AppendRecord([0, 'info']);
13601351 FDTable1.AppendRecord([1, 'master']);
13611352 for i := 1 to 10 do
1362- FDTable1.AppendRecord([i + 1, '掲示板' + i.ToString]);
1353+ FDTable1.AppendRecord([i + 1, '掲示板' + i.toString]);
13631354 end;
13641355 if (FDTable3.Bof = true) and (FDTable3.Eof = true) then
13651356 begin
Binary files a/bbs_isapi.res and b/bbs_isapi.res differ
--- a/newbbs.dproj
+++ b/newbbs.dproj
@@ -497,16 +497,16 @@
497497 <Operation>1</Operation>
498498 </Platform>
499499 </DeployClass>
500- <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
500+ <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
501501 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
502502 <ProjectRoot Platform="iOSDevice" Name="$(PROJECTNAME).app"/>
503503 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
504504 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
505505 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
506506 <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
507+ <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
507508 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
508509 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
509- <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
510510 </Deployment>
511511 <Platforms>
512512 <Platform value="Win32">True</Platform>
Binary files a/yourBBS.res and b/yourBBS.res differ
Show on old repository browser