Diff of /WebModuleUnit1.pas

OSDN > Find Software > mybbs

 Browse Subversion Repository



/[bbs-as-pbbs]/WebModuleUnit1.pas




Diff of /WebModuleUnit1.pas



 Parent Directory

|  Revision Log



|  Patch














revision 1 by yamat0jp,
Wed Sep 23 09:26:54 2015 UTC




revision 2 by yamat0jp,
Thu Sep 24 00:46:08 2015 UTC






#

Line 171 
 var


Line 171 
 var












171
 begin
 begin

















172
   if TagString = 'home' then
   if TagString = 'home' then

















173
   begin
   begin















174


     if (uri = 'admin')or(uri = 'login') then


     if (uri = 'admin')or(uri = 'login')or(TagParams.Values['ssl'] = 'true') then













175


       ReplaceText := String(AnsiReplaceText(FDTable2.FieldByName('home')


       ReplaceText := String(AnsiReplaceText(FDTable2.FieldByName('home').AsAnsiString, 'http', 'https'))
















         .AsAnsiString, 'http', 'https'))


 















176
     else
     else

















177
       ReplaceText := FDTable2.FieldByName('home').AsString;
       ReplaceText := FDTable2.FieldByName('home').AsString;

















178
   end;
   end;











#

Line 307 
 begin


Line 306 
 begin












306
   then
   then

















307
     something;
     something;

















308
   if x = True then
   if x = True then















309


     Response.SendRedirect(FDTable2.FieldByName('home').AsAnsiString + 'login');


     Response.SendRedirect(AnsiReplaceText(FDTable2.FieldByName('home').AsAnsiString,'http','https') + 'login');















310
 end;
 end;

















311
 
 

















312
 procedure TWebModule1.WebModule1admindelAction(Sender: TObject;
 procedure TWebModule1.WebModule1admindelAction(Sender: TObject;











#

Line 484 
 var


Line 483 
 var












483
   i: integer;
   i: integer;

















484
   s: string;
   s: string;

















485
 begin
 begin















486


   for i := 0 to Request.ContentFields.count - 1 do


   for i := 0 to Request.ContentFields.Count - 1 do















487
   begin
   begin

















488
     s := Request.ContentFields.Names[i];
     s := Request.ContentFields.Names[i];

















489
     if s <> 'home' then
     if s <> 'home' then











#

Line 513 
 end;


Line 512 
 end;












512
 procedure TWebModule1.WebModuleBeforeDispatch(Sender: TObject;
 procedure TWebModule1.WebModuleBeforeDispatch(Sender: TObject;

















513
   Request: TWebRequest; Response: TWebResponse; var Handled: Boolean);
   Request: TWebRequest; Response: TWebResponse; var Handled: Boolean);

















514
 var
 var















515


   s: string;


   s, t: string;















516
   m: TResourceStream;
   m: TResourceStream;












517
 
   ssl: TStringList;












518
 begin
 begin

















519
   if FDTable1.Exists = false then
   if FDTable1.Exists = false then

















520
     FDTable1.CreateTable(false, [tpTable]);
     FDTable1.CreateTable(false, [tpTable]);











#

Line 567 
 begin


Line 567 
 begin












567
     Response.Content := PageProducer1.Content;
     Response.Content := PageProducer1.Content;

















568
     Handled := True;
     Handled := True;

















569
   end;
   end;












570
 
   {







571
 
   t:='';







572
 
   ssl:=TStringList.Create;







573
 
   try







574
 
     ssl.Add('/login');







575
 
     ssl.Add('/admin');







576
 
     if (ssl.IndexOf(Request.PathInfo) > -1)and(StartsText('https',FDTable2.FieldByName('home').AsString) = false) then







577
 
     begin







578
 
       s:=FDTable2.FieldByName('home').AsAnsiString;







579
 
       Delete(s,Length(s),1);







580
 
       t:='https'+Copy(s,5,Length(s))+Request.PathInfo;







581
 
     end;







582
 
   finally







583
 
     ssl.Free;







584
 
   end;







585
 
   if t <> '' then







586
 
   begin







587
 
     Response.SendRedirect(t);







588
 
     Exit;







589
 
   end;







590
 
   }












591
 end;
 end;

















592
 
 

















593
 procedure TWebModule1.WebModuleCreate(Sender: TObject);
 procedure TWebModule1.WebModuleCreate(Sender: TObject);





























Legend:



Removed from v.1
 


changed lines


 
Added in v.2













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[bbs-as-pbbs]/WebModuleUnit1.pas
-revision 1 by yamat0jp,
Wed Sep 23 09:26:54 2015 UTC
+revision 2 by yamat0jp,
Thu Sep 24 00:46:08 2015 UTC
 Line 171 
 var
  begin
    if TagString = 'home' then
    begin
-     if (uri = 'admin')or(uri = 'login') then
+     if (uri = 'admin')or(uri = 'login')or(TagParams.Values['ssl'] = 'true') then
-       ReplaceText := String(AnsiReplaceText(FDTable2.FieldByName('home')
+       ReplaceText := String(AnsiReplaceText(FDTable2.FieldByName('home').AsAnsiString, 'http', 'https'))
-         .AsAnsiString, 'http', 'https'))
      else
        ReplaceText := FDTable2.FieldByName('home').AsString;
    end;
-Line 307 
 begin
+Line 306 
 begin
    then
      something;
    if x = True then
-     Response.SendRedirect(FDTable2.FieldByName('home').AsAnsiString + 'login');
+     Response.SendRedirect(AnsiReplaceText(FDTable2.FieldByName('home').AsAnsiString,'http','https') + 'login');
  end;
  procedure TWebModule1.WebModule1admindelAction(Sender: TObject;
-Line 484 
 var
+Line 483 
 var
    i: integer;
    s: string;
  begin
-   for i := 0 to Request.ContentFields.count - 1 do
+   for i := 0 to Request.ContentFields.Count - 1 do
    begin
      s := Request.ContentFields.Names[i];
      if s <> 'home' then
-Line 513 
 end;
+Line 512 
 end;
  procedure TWebModule1.WebModuleBeforeDispatch(Sender: TObject;
    Request: TWebRequest; Response: TWebResponse; var Handled: Boolean);
  var
-   s: string;
+   s, t: string;
    m: TResourceStream;
+   ssl: TStringList;
  begin
    if FDTable1.Exists = false then
      FDTable1.CreateTable(false, [tpTable]);
 Line 567 
 begin
      Response.Content := PageProducer1.Content;
      Handled := True;
    end;
+   {
+   t:='';
+   ssl:=TStringList.Create;
+   try
+     ssl.Add('/login');
+     ssl.Add('/admin');
+     if (ssl.IndexOf(Request.PathInfo) > -1)and(StartsText('https',FDTable2.FieldByName('home').AsString) = false) then
+     begin
+       s:=FDTable2.FieldByName('home').AsAnsiString;
+       Delete(s,Length(s),1);
+       t:='https'+Copy(s,5,Length(s))+Request.PathInfo;
+     end;
+   finally
+     ssl.Free;
+   end;
+   if t <> '' then
+   begin
+     Response.SendRedirect(t);
+     Exit;
+   end;
+   }
  end;
  procedure TWebModule1.WebModuleCreate(Sender: TObject);
 Legend:



Removed from v.1
 


changed lines


 
Added in v.2
 Legend:



Removed from v.1
 


changed lines


 
Added in v.2
-Removed from v.1
+Added in v.2
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

mybbs

Browse Subversion Repository