Changeset 138 for trunk/Packages/CoolWeb


Ignore:
Timestamp:
Sep 9, 2022, 8:20:25 PM (2 years ago)
Author:
chronos
Message:
  • Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.
Location:
trunk/Packages/CoolWeb
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Packages/CoolWeb/Common/UHtmlClasses.pas

    r137 r138  
    44
    55uses
    6   UXmlClasses, Classes, SysUtils, SpecializedList;
     6  UXmlClasses, Classes, SysUtils, Generics.Collections, UGenerics, UIpAddress;
    77
    88type
    9 
    10   { TDomainAddress }
    11 
    12   TDomainAddress = class(TPersistent)
    13   private
    14     function GetAsString: string;
    15     procedure SetAsString(const Value: string);
    16   public
    17     Levels: TListString;
    18     constructor Create;
    19     destructor Destroy; override;
    20     property AsString: string read GetAsString write SetAsString;
    21   end;
    22 
    23   TAddrClass = (acA, acB, acC, acD, acE);
    24 
    25   { TIpAddress }
    26 
    27   TIpAddress = class(TPersistent)
    28   private
    29     function GetAddrClass: TAddrClass;
    30     function GetAsCardinal: Cardinal;
    31     function GetAsString: string;
    32     function GetBroadcast: Boolean;
    33     procedure SetBroadcast(const Value: Boolean);
    34     procedure SetAsCardinal(const Value: Cardinal);
    35     procedure SetAsString(const Value: string);
    36   public
    37     Octets: array[0..3] of Byte;
    38     procedure Assign(Source: TPersistent); override;
    39     function IsAddressString(Value: string): Boolean;
    40     property AsCardinal: Cardinal read GetAsCardinal write SetAsCardinal;
    41     property AsString: string read GetAsString write SetAsString;
    42     property AddrClass: TAddrClass read GetAddrClass;
    43     property Broadcast: Boolean read GetBroadcast write SetBroadcast;
    44   end;
    45 
    46   THostAddressState = (asDomainName, asIpAddress);
    47   THostAddress = class(TPersistent)
    48   private
    49     function GetAsString: string;
    50     procedure SetAsString(const Value: string);
    51   public
    52     State: THostAddressState;
    53     DomainName: TDomainAddress;
    54     IpAddress: TIpAddress;
    55     constructor Create;
    56     destructor Destroy; override;
    57     property AsString: string read GetAsString write SetAsString;
    58   end;
     9  { TURL }
    5910
    6011  TURL = class(TPersistent)
    … …  
    9041  end;
    9142
     43  THtmlString = class;
     44  THtmlBlock = class;
     45  THtmlList = class;
     46  THtmlInput = class;
     47
     48  { THtmlElements }
     49
     50  THtmlElements = class(TObjectList<THtmlElement>)
     51    function AddString(Text: string = ''): THtmlString;
     52    function AddBlock: THtmlBlock;
     53    function AddList: THtmlList;
     54    function AddInput: THtmlInput;
     55  end;
     56
    9257  TBlockType = (btNoTag, btBlockLevel, btInline);
    9358
    … …  
    9560
    9661  THtmlString = class(THtmlElement)
    97   private
     62  protected
    9863    function GetAsXmlElement: TXmlElement; override;
    9964  public
    … …  
    10570
    10671  THtmlLineBreak = class(THtmlElement)
    107   private
     72  protected
    10873    function GetAsXmlElement: TXmlElement; override;
    10974  public
    … …  
    11681  public
    11782    BlockType: TBlockType;
    118     SubItems: TListObject; // TListObject<THtmlElement>;
     83    SubItems: THtmlElements;
     84    constructor Create;
     85    destructor Destroy; override;
     86  end;
     87
     88  TListType = (ltUnordered, ltOrdered);
     89
     90  { THtmlList }
     91
     92  THtmlList = class(THtmlElement)
     93  protected
     94    function GetAsXmlElement: TXmlElement; override;
     95  public
     96    ListType: TListType;
     97    SubItems: THtmlElements;
    11998    constructor Create;
    12099    destructor Destroy; override;
    … …  
    122101
    123102  THtmlLink = class(THtmlElement)
    124   private
     103  protected
    125104    function GetAsXmlElement: TXmlElement; override;
    126105  public
    … …  
    140119
    141120  THtmlImage = class(THtmlElement)
    142   private
     121  protected
    143122    function GetAsXmlElement: TXmlElement; override;
    144123  public
    … …  
    156135
    157136  THtmlInput = class(THtmlElement)
    158   private
     137  protected
    159138    function GetAsXmlElement: TXmlElement; override;
    160139  public
    … …  
    197176
    198177  THtmlCell = class(THtmlElement)
    199   private
     178  protected
    200179    function GetAsXmlElement: TXmlElement; override;
    201180  public
    … …  
    207186  end;
    208187
     188  { THtmlCells }
     189
     190  THtmlCells = class(TObjectList<THtmlCell>)
     191    function AddCell: THtmlCell;
     192  end;
     193
    209194  { THtmlRow }
    210195
    211196  THtmlRow = class(THtmlElement)
    212   private
    213     function GetAsXmlElement: TXmlElement; override;
    214   public
    215     Cells: TListObject; // TListObject<THtmlCell>
    216     constructor Create;
    217     destructor Destroy; override;
     197  protected
     198    function GetAsXmlElement: TXmlElement; override;
     199  public
     200    Cells: THtmlCells;
     201    constructor Create;
     202    destructor Destroy; override;
     203  end;
     204
     205  { THtmlRows }
     206
     207  THtmlRows = class(TObjectList<THtmlRow>)
     208    function AddRow: THtmlRow;
    218209  end;
    219210
    … …  
    224215    function GetAsXmlElement: TXmlElement; override;
    225216  public
    226     Rows: TListObject; // TListObject<THtmlRow>
     217    Rows: THtmlRows;
    227218    constructor Create;
    228219    destructor Destroy; override;
    … …  
    242233
    243234implementation
    244 
    245 resourcestring
    246   SStringToIPConversionError = 'String to IP address conversion error';
    247235
    248236function LeftCutString(var Source, Output: string; Delimiter: string; Allowed: string = ''): Boolean;
    … …  
    298286end;
    299287
     288{ THtmlCells }
     289
     290function THtmlCells.AddCell: THtmlCell;
     291begin
     292  Result := THtmlCell.Create;
     293  Add(Result);
     294end;
     295
     296{ THtmlRows }
     297
     298function THtmlRows.AddRow: THtmlRow;
     299begin
     300  Result := THtmlRow.Create;
     301  Add(Result);
     302end;
     303
     304{ THtmlList }
     305
     306function THtmlList.GetAsXmlElement: TXmlElement;
     307var
     308  I: Integer;
     309begin
     310  Result := TXmlTag.Create;
     311  with TXmlTag(Result) do begin
     312    case ListType of
     313      ltOrdered: Name := 'ol';
     314      ltUnordered: Name := 'ul';
     315    end;
     316    for I := 0 to SubItems.Count - 1 do begin
     317      with SubElements.AddTag('li') do
     318        SubElements.Add(SubItems[I].AsXmlElement);
     319    end;
     320  end;
     321end;
     322
     323constructor THtmlList.Create;
     324begin
     325  inherited;
     326  SubItems := THtmlElements.Create;
     327end;
     328
     329destructor THtmlList.Destroy;
     330begin
     331  FreeAndNil(SubItems);
     332  inherited;
     333end;
     334
     335{ THtmlElements }
     336
     337function THtmlElements.AddString(Text: string = ''): THtmlString;
     338begin
     339  Result := THtmlString.Create;
     340  Result.Text := Text;
     341  Add(Result);
     342end;
     343
     344function THtmlElements.AddBlock: THtmlBlock;
     345begin
     346  Result := THtmlBlock.Create;
     347  Add(Result);
     348end;
     349
     350function THtmlElements.AddList: THtmlList;
     351begin
     352  Result := THtmlList.Create;
     353  Add(Result);
     354end;
     355
     356function THtmlElements.AddInput: THtmlInput;
     357begin
     358  Result := THtmlInput.Create;
     359  Add(Result);
     360end;
     361
    300362{ THtmlCell }
    301363
    … …  
    319381destructor THtmlCell.Destroy;
    320382begin
    321   Value.Free;
     383  FreeAndNil(Value);
    322384  inherited;
    323385end;
    … …  
    332394  TXmlTag(Result).Name := 'tr';
    333395  for Column := 0 to Cells.Count - 1 do
    334     TXmlTag(Result).SubElements.AddNew(THtmlCell(Cells[Column]).AsXmlElement);
     396    TXmlTag(Result).SubElements.Add(Cells[Column].AsXmlElement);
    335397end;
    336398
    337399constructor THtmlRow.Create;
    338400begin
    339   Cells := TListObject.Create;
     401  Cells := THtmlCells.Create;
    340402end;
    341403
    342404destructor THtmlRow.Destroy;
    343405begin
    344   Cells.Free;
     406  FreeAndNil(Cells);
    345407  inherited;
    346408end;
    … …  
    350412function THtmlTable.GetAsXmlElement: TXmlElement;
    351413var
    352   Row, Column: Integer;
     414  Row: Integer;
    353415begin
    354416  Result := inherited;
    … …  
    356418    Name := 'table';
    357419    for Row := 0 to Rows.Count - 1 do
    358       SubElements.AddNew(THtmlRow(Rows[Row]).AsXmlElement);
     420      SubElements.Add(Rows[Row].AsXmlElement);
    359421  end;
    360422end;
    … …  
    362424constructor THtmlTable.Create;
    363425begin
    364   Rows := TListObject.Create;
     426  Rows := THtmlRows.Create;
    365427end;
    366428
    367429destructor THtmlTable.Destroy;
    368430begin
    369   Rows.Free;
     431  FreeAndNil(Rows);
    370432  inherited;
    371433end;
    … …  
    448510destructor THtmlForm.Destroy;
    449511begin
    450   Action.Free;
     512  FreeAndNil(Action);
    451513  inherited;
    452514end;
    … …  
    465527destructor THtmlDocument.Destroy;
    466528begin
    467   Body.Free;
    468   Styles.Free;
    469   Scripts.Free;
     529  FreeAndNil(Body);
     530  FreeAndNil(Styles);
     531  FreeAndNil(Scripts);
    470532  inherited;
    471533end;
    … …  
    473535function THtmlDocument.GetAsXmlDocument: TXmlDocument;
    474536var
    475   DocType: TXMLTag;
    476   HTMLTag: TXMLTag;
    477537  I: Integer;
    478538begin
    479539  Result := TXmlDocument.Create;
    480540  with Result, Content do begin
    481     DocType := TXMlTag.Create;
    482     DocType.Name := '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"';
    483     Doctype.EndTagSymbol := '';
    484     SubElements.Add(DocType);
    485     HTMLTag := TXMLTag.Create;
    486     with HTMLTag do begin
    487       Name := 'html';
    488       with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    489         Name := 'head';
    490         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    491           Name := 'title';
    492           with TXmlString(SubElements[SubElements.Add(TXmlString.Create)]) do begin
    493             Text := Title;
    494           end;
     541    with SubElements.AddTag('!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"') do begin
     542      EndTagSymbol := '';
     543    end;
     544    with SubElements.AddTag('html') do begin
     545      with SubElements.AddTag('head') do begin
     546        with SubElements.AddTag('title') do begin
     547          SubElements.AddString(Title);
    495548        end;
    496         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    497           Name := 'meta';
     549        with SubElements.AddTag('meta') do begin
    498550          Attributes.Add('http-equiv', 'Content-Language');
    499551          Attributes.Add('content', ContentLanguage);
    500552        end;
    501         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    502           Name := 'meta';
     553        with SubElements.AddTag('meta') do begin
    503554          Attributes.Add('http-equiv', 'Content-Type');
    504555          Attributes.Add('content', 'text/html; charset=' + ContentEncoding);
    505556        end;
    506557        for I := 0 to Styles.Count - 1 do
    507         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    508           Name := 'link';
     558        with SubElements.AddTag('link') do begin
    509559          Attributes.Add('rel', 'stylesheet');
    510560          Attributes.Add('href', Styles[I]);
    … …  
    513563        end;
    514564        for I := 0 to Scripts.Count - 1 do
    515         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    516           Name := 'script';
     565        with SubElements.AddTag('script') do begin
    517566          ShringEmpty := False;
    518567          Attributes.Add('type', 'text/javascript');
    … …  
    520569        end;
    521570      end;
    522       with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
    523         Name := 'body';
     571      with SubElements.AddTag('body') do begin
    524572        SubElements.Add(Body.AsXmlElement);
    525573      end;
    526574    end;
    527     SubElements.Add(HTMLTag);
    528575  end;
    529576end;
    … …  
    534581begin
    535582  inherited;
    536   SubItems := TListObject.Create;
     583  SubItems := THtmlElements.Create;
    537584end;
    538585
    539586destructor THtmlBlock.Destroy;
    540587begin
    541   SubItems.Free;
     588  FreeAndNil(SubItems);
    542589  inherited;
    543590end;
    … …  
    555602    end;
    556603    for I := 0 to SubItems.Count - 1 do
    557       SubElements.Add(THtmlElement(SubItems[I]).AsXmlElement);
     604      SubElements.Add(SubItems[I].AsXmlElement);
    558605   end;
    559606end;
    … …  
    580627end;
    581628
    582 { TIpAddress }
    583 
    584 procedure TIpAddress.Assign(Source: TPersistent);
    585 var
    586   I: Integer;
    587 begin
    588   if Assigned(Source) then begin
    589     if Source is TIpAddress then begin
    590       for I := 0 to High(Octets) do
    591         Octets[I] := TIpAddress(Source).Octets[I];
    592     end else inherited;
    593   end else inherited;
    594 end;
    595 
    596 function TIpAddress.IsAddressString(Value: string): Boolean;
    597 var
    598   Parts: TListString;
    599 begin
    600   Result := True;
    601   try
    602     Parts := TListString.Create;
    603     Parts.Explode(Value, '.', StrToStr);
    604     if Parts.Count = 4 then begin
    605       if (StrToInt(Parts[3]) < 0) or (StrToInt(Parts[3]) > 255) then Result := False;
    606       if (StrToInt(Parts[2]) < 0) or (StrToInt(Parts[2]) > 255) then Result := False;
    607       if (StrToInt(Parts[1]) < 0) or (StrToInt(Parts[1]) > 255) then Result := False;
    608       if (StrToInt(Parts[0]) < 0) or (StrToInt(Parts[0]) > 255) then Result := False;
    609     end else Result := False;
    610   finally
    611     Parts.Free;
    612   end;
    613 end;
    614 
    615 function TIpAddress.GetAddrClass: TAddrClass;
    616 begin
    617   if (Octets[3] and $80) = 0 then Result := acA
    618   else begin
    619     if (Octets[3] and $40) = 0 then Result := acB
    620     else begin
    621       if (Octets[3] and $20) = 0 then Result := acC
    622       else begin
    623         if (Octets[3] and $10) = 0 then Result := acD
    624         else Result := acE;
    625       end;
    626     end;
    627   end;
    628 end;
    629 
    630 function TIpAddress.GetAsCardinal: Cardinal;
    631 begin
    632   Result := Octets[0] or (Octets[1] shl 8) or (Octets[2] shl 16) or (Octets[3] shl 24);
    633 end;
    634 
    635 function TIpAddress.GetAsString: string;
    636 begin
    637   Result := IntToStr(Octets[3]) + '.' + IntToStr(Octets[2]) + '.' +
    638     IntToStr(Octets[1]) + '.' + IntToStr(Octets[0]);
    639 end;
    640 
    641 function TIpAddress.GetBroadcast: Boolean;
    642 begin
    643   Result := AsCardinal = High(Cardinal);
    644 end;
    645 
    646 procedure TIpAddress.SetAsCardinal(const Value: Cardinal);
    647 begin
    648   Octets[0] := Byte(Value);
    649   Octets[1] := Byte(Value shr 8);
    650   Octets[2] := Byte(Value shr 16);
    651   Octets[3] := Byte(Value shr 24);
    652 end;
    653 
    654 procedure TIpAddress.SetAsString(const Value: string);
    655 var
    656   Parts: TListString;
    657 begin
    658   try
    659     Parts := TListString.Create;
    660     Parts.Explode(Value, '.', StrToStr);
    661     try
    662 //    if Length(Parts) = 4 then begin
    663       Octets[0] := StrToInt(Parts[3]);
    664       Octets[1] := StrToInt(Parts[2]);
    665       Octets[2] := StrToInt(Parts[1]);
    666       Octets[3] := StrToInt(Parts[0]);
    667 //    end else raise EConvertError.Create('String to IP address conversion error');
    668     except
    669       raise EConvertError.Create(SStringToIPConversionError);
    670     end;
    671   finally
    672     Parts.Free;
    673   end;
    674 end;
    675 
    676 procedure TIpAddress.SetBroadcast(const Value: Boolean);
    677 begin
    678   AsCardinal := High(Cardinal);
    679 end;
     629{ TURL }
    680630
    681631constructor TURL.Create;
    … …  
    686636destructor TURL.Destroy;
    687637begin
    688   Host.Free;
     638  FreeAndNil(Host);
    689639  inherited;
    690640end;
    … …  
    724674end;
    725675
    726 
    727 { TDomainAddress }
    728 
    729 function TDomainAddress.GetAsString: string;
    730 begin
    731   try
    732     Levels.Reverse;
    733     Result := Levels.Implode('.', StrToStr);
    734   finally
    735     Levels.Reverse;
    736   end;
    737 end;
    738 
    739 procedure TDomainAddress.SetAsString(const Value: string);
    740 begin
    741   Levels.Explode(Value, '.', StrToStr);
    742   Levels.Reverse;
    743 end;
    744 
    745 constructor TDomainAddress.Create;
    746 begin
    747   Levels := TListString.Create;
    748 end;
    749 
    750 destructor TDomainAddress.Destroy;
    751 begin
    752   Levels.Free;
    753   inherited;
    754 end;
    755 
    756676{ THtmlLink }
    757677
    … …  
    763683destructor THtmlLink.Destroy;
    764684begin
    765   Target.Free;
     685  FreeAndNil(Target);
    766686  inherited;
    767687end;
    … …  
    791711end;
    792712
    793 { THostAddress }
    794 
    795 constructor THostAddress.Create;
    796 begin
    797   DomainName := TDomainAddress.Create;
    798   IpAddress := TIpAddress.Create;
    799   State := asDomainName;
    800   DomainName.AsString := 'localhost';
    801 end;
    802 
    803 destructor THostAddress.Destroy;
    804 begin
    805   DomainName.Free;
    806   IpAddress.Free;
    807   inherited;
    808 end;
    809 
    810 function THostAddress.GetAsString: string;
    811 begin
    812   case State of
    813     asDomainName: Result := DomainName.AsString;
    814     asIpAddress: Result := IpAddress.AsString;
    815   end;
    816 end;
    817 
    818 procedure THostAddress.SetAsString(const Value: string);
    819 begin
    820   if IpAddress.IsAddressString(Value) then begin
    821     State := asIpAddress;
    822     IpAddress.AsString := Value;
    823   end else begin
    824     State := asDomainName;
    825     DomainName.AsString := Value;
    826   end;
    827 end;
    828 
    829713{ THtmlImage }
    830714
    … …  
    836720destructor THtmlImage.Destroy;
    837721begin
    838   Source.Free;
     722  FreeAndNil(Source);
    839723  inherited;
    840724end;
    … …  
    889773destructor TQueryString.Destroy;
    890774begin
    891   Data.Free;
     775  FreeAndNil(Data);
    892776  inherited;
    893777end;

  • trunk/Packages/CoolWeb/Common/UXmlClasses.pas

    r137 r138  
    44
    55uses
    6   Classes, SysUtils, StrUtils, SpecializedList, SpecializedDictionary;
     6  Classes, SysUtils, StrUtils, Generics.Collections, UGenerics;
    77
    88type
    … …  
    1212  public
    1313    property AsString: string read GetAsString;
     14  end;
     15
     16  TXmlTag = class;
     17  TXmlString = class;
     18
     19  { TXmlElements }
     20
     21  TXmlElements = class(TObjectList<TXmlElement>)
     22    function AddTag(Name: string): TXmlTag;
     23    function AddString(Text: string): TXmlString;
    1424  end;
    1525
    … …  
    2939    Name: string;
    3040    Attributes: TDictionaryStringString;
    31     SubElements: TListObject; // TListObject<TXmlElement>;
     41    SubElements: TXmlElements;
    3242    constructor Create;
    3343    destructor Destroy; override;
    … …  
    5262implementation
    5363
     64{ TXmlElements }
     65
     66function TXmlElements.AddTag(Name: string): TXmlTag;
     67begin
     68  Result := TXmlTag.Create;
     69  Result.Name := Name;
     70  Add(Result);
     71end;
     72
     73function TXmlElements.AddString(Text: string): TXmlString;
     74begin
     75  Result := TXmlString.Create;
     76  Result.Text := Text;
     77  Add(Result);
     78end;
     79
    5480{ THtmlElement }
    5581
    … …  
    5884  ShringEmpty := True;
    5985  Attributes := TDictionaryStringString.Create;
    60   SubElements := TListObject.Create;
     86  SubElements := TXmlElements.Create;
    6187  EndTagSymbol := '/';
    6288end;
    … …  
    6490destructor TXmlTag.Destroy;
    6591begin
    66   Attributes.Free;
    67   SubElements.Free;
     92  FreeAndNil(Attributes);
     93  FreeAndNil(SubElements);
    6894  inherited;
    6995end;
    … …  
    74100  I: Integer;
    75101  Content: string;
     102  Attribute: TPair<string, string>;
    76103begin
    77104  Content := '';
    … …  
    80107
    81108  AttributesText := '';
    82   for I := 0 to Attributes.Count - 1 do
    83     AttributesText := AttributesText + ' ' + Attributes.Keys[I] + '="' + Attributes[I].Value + '"';
     109  for Attribute in Attributes do
     110    AttributesText := AttributesText + ' ' + Attribute.Key + '="' + Attribute.Value + '"';
    84111
    85112  if Name <> '' then begin
    … …  
    123150destructor TXmlDocument.Destroy;
    124151begin
    125   Content.Free;
    126   MainTag.Free;
     152  FreeAndNil(Content);
     153  FreeAndNil(MainTag);
    127154  inherited;
    128155end;

  • trunk/Packages/CoolWeb/CoolWeb.lpk

    r132 r138  
    4040    <License Value="GNU/GPL"/>
    4141    <Version Minor="3"/>
    42     <Files Count="18">
     42    <Files Count="19">
    4343      <Item1>
    4444        <Filename Value="WebServer/UHTTPServer.pas"/>
    … …  
    121121        <UnitName Value="UWebUser"/>
    122122      </Item18>
     123      <Item19>
     124        <Filename Value="Common/UIpAddress.pas"/>
     125        <UnitName Value="UIpAddress"/>
     126      </Item19>
    123127    </Files>
    124128    <CompatibilityMode Value="True"/>
    125     <RequiredPkgs Count="8">
     129    <RequiredPkgs Count="7">
    126130      <Item1>
    127131        <PackageName Value="TurboPowerIProDsgn"/>
    … …  
    140144      </Item5>
    141145      <Item6>
    142         <PackageName Value="TemplateGenerics"/>
    143         <MaxVersion Minor="3"/>
    144         <MinVersion Minor="3" Valid="True"/>
     146        <PackageName Value="synapse"/>
    145147      </Item6>
    146148      <Item7>
    147         <PackageName Value="synapse"/>
    148       </Item7>
    149       <Item8>
    150149        <PackageName Value="FCL"/>
    151150        <MinVersion Major="1" Valid="True"/>
    152       </Item8>
     151      </Item7>
    153152    </RequiredPkgs>
    154153    <UsageOptions>

  • trunk/Packages/CoolWeb/CoolWeb.pas

    r115 r138  
    55unit CoolWeb;
    66
     7{$warn 5023 off : no warning about unused units}
    78interface
    89
    … …  
    1112  UTurboPowerForm, UHTTPSessionFile, UHTTPSessionMySQL, USqlDatabase,
    1213  UTCPServer, UPageList, UHtmlClasses, UMemoryStreamEx, UMIMEType,
    13   UXmlClasses, UWebPage, UWebApp, LazIDEReg, UWebUser, LazarusPackageIntf;
     14  UXmlClasses, UWebPage, UWebApp, LazIDEReg, UWebUser, UIpAddress,
     15  LazarusPackageIntf;
    1416
    1517implementation

  • trunk/Packages/CoolWeb/Modules/UPageList.pas

    r137 r138  
    77
    88type
     9
     10  { TPageList }
     11
    912  TPageList = class
    1013    TotalCount: Integer;
    … …  
    1922    Around: Integer;
    2023    constructor Create;
     24    destructor Destroy; override;
    2125    function Hyperlink: string;
    2226    function Process: string;
    … …  
    3337  QueryItems.SetStringServer;
    3438  HTMLId := '';
     39end;
     40
     41destructor TPageList.Destroy;
     42begin
     43  FreeAndNil(QueryItems);
     44  inherited;
    3545end;
    3646

  • trunk/Packages/CoolWeb/Modules/UWebUser.pas

    r137 r138  
    55uses
    66  Classes, SysUtils, synacode, USqlDatabase, UCommon, UHTTPServer,
    7   SpecializedDictionary;
     7  UGenerics;
    88
    99const
    … …  
    6060  DbRows: TDbRows;
    6161  Id: Integer;
    62 begin
    63   try
    64     DbRows := TDbRows.Create;
    65     if HandlerData.Request.Cookies.SearchKey('SessionId') <> -1 then begin
     62  Value: string;
     63begin
     64  try
     65    DbRows := TDbRows.Create;
     66    if HandlerData.Request.Cookies.TryGetValue('SessionId', Value) then begin
    6667    Database.Query(DbRows, 'SELECT * FROM `UserOnline` WHERE `SessionId`="' +
    67       HandlerData.Request.Cookies.Values['SessionId'] + '"');
     68      Value + '"');
    6869    if DbRows.Count > 0 then begin
    6970      // Update exited
    70       Id := StrToInt(DbRows[0].Values['Id']);
    71       User := StrToInt(DbRows[0].Values['User']);
     71      Id := StrToInt(DbRows[0].Items['Id']);
     72      User := StrToInt(DbRows[0].Items['User']);
    7273      Database.Query(DbRows, 'UPDATE `UserOnline` SET `ActivityTime` = NOW() WHERE `Id`=' + IntToStr(Id));
    7374    end else begin
    7475      // Create new record
    7576      Database.Query(DbRows, 'INSERT INTO `UserOnline` (`User`, `ActivityTime`, `SessionId`, `ScriptName`) ' +
    76         'VALUES (1, NOW(), "' + HandlerData.Request.Cookies.Values['SessionId'] + '", "")');
     77        'VALUES (1, NOW(), "' + Value + '", "")');
    7778      Id := Database.LastInsertId;
    7879      User := 1;
    … …  
    8889var
    8990  DbRows: TDbRows;
     91  SessionId: string;
    9092begin
    9193  Logout;
     94  if HandlerData.Request.Cookies.TryGetValue('SessionId', SessionId) then
    9295  try
    9396    DbRows := TDbRows.Create;
    9497    Database.Query(DbRows, 'UPDATE `UserOnline` SET `User` = ' + IntToStr(User) + ', `LoginTime` = NOW() WHERE `SessionId`="' +
    95       HandlerData.Request.Cookies.Values['SessionId'] + '"');
     98      SessionId + '"');
    9699  finally
    97100    DbRows.Free;
    … …  
    103106var
    104107  DbRows: TDbRows;
     108  SessionId: string;
    105109begin
    106110  if Id = AnonymousUserId then Update;
    107   if User <> AnonymousUserId then begin
     111  if (User <> AnonymousUserId) and
     112    HandlerData.Request.Cookies.TryGetValue('SessionId', SessionId) then begin
    108113    try
    109114      DbRows := TDbRows.Create;
    110115      Database.Query(DbRows, 'UPDATE `UserOnline` SET `User` = ' + IntToStr(AnonymousUserId) + ' WHERE `SessionId`="' +
    111         HandlerData.Request.Cookies.Values['SessionId'] + '"');
     116        SessionId + '"');
    112117    finally
    113118      DbRows.Free;
    … …  
    178183    DbRows := TDbRows.Create;
    179184    Database.Query(DbRows, 'SELECT `Id` FROM `User` WHERE `Name`="' + Name + '"');
    180     if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items[0].Value)
     185    if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items['Id'])
    181186      else Result := -1;
    182187  finally
    … …  
    193198    Database.Query(DbRows, 'SELECT `Id` FROM `User` WHERE `Name`="' + Name + '" AND ' +
    194199      '`Password` = SHA1(CONCAT("' + Password + '", Salt))');
    195     if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items[0].Value)
     200    if DbRows.Count = 1 then Result := StrToInt(DbRows[0].Items['Id'])
    196201      else Result := -1;
    197202  finally
    … …  
    208213    Database.Query(DbRows, 'SELECT * FROM `User` WHERE `Id`="' + IntToStr(Id) + '"');
    209214    if DbRows.Count = 1 then begin
    210       Name := DbRows[0].Values['Name'];
    211       FullName := DbRows[0].Values['FullName'];
    212       Email := DbRows[0].Values['Email'];
     215      Name := DbRows[0].Items['Name'];
     216      FullName := DbRows[0].Items['FullName'];
     217      Email := DbRows[0].Items['Email'];
    213218    end; // else raise ENotFound.Create(Format(SUserNotFound, [IntToStr(Id)]));
    214219  finally
    … …  
    233238    try
    234239      DbRows2 := TDbRows.Create;
    235       OperationId := StrToInt(DbRows[0].Values['Id']);
     240      OperationId := StrToInt(DbRows[0].Items['Id']);
    236241
    237242      // Check user-operation relation
    … …  
    247252        '`User` = ' + IntToStr(Id) + ' AND `AssignedGroup` IS NOT NULL');
    248253      if DbRows2.Count > 0 then begin
    249         if CheckGroupPermission(StrToInt(DbRows2[0].Values['AssignedGroup']), OperationId) then begin
     254        if CheckGroupPermission(StrToInt(DbRows2[0].Items['AssignedGroup']), OperationId) then begin
    250255          Result := True;
    251256          Exit;
    … …  
    280285      '`User` = ' + IntToStr(Id) + ' AND `AssignedGroup` IS NOT NULL');
    281286    if DbRows2.Count > 0 then begin
    282       if CheckGroupPermission(StrToInt(DbRows2[0].Values['AssignedGroup']), Operation) then begin
     287      if CheckGroupPermission(StrToInt(DbRows2[0].Items['AssignedGroup']), Operation) then begin
    283288        Result := True;
    284289        Exit;

  • trunk/Packages/CoolWeb/Persistence/USqlDatabase.pas

    r137 r138  
    66
    77uses
    8   SysUtils, Classes, Dialogs, mysql50, TypInfo, SpecializedDictionary,
    9   SpecializedList;
     8  SysUtils, Classes, Dialogs, mysql50, TypInfo, UGenerics, Generics.Collections;
    109
    1110type
    … …  
    2120  TLogEvent = procedure(Sender: TObject; Text: string) of object;
    2221
    23   TDbRows = class(TListObject)
     22  TDbRows = class(TList<TDictionaryStringString>)
    2423  private
    2524    function GetData(Index: Integer): TDictionaryStringString;
    … …  
    155154    TimeParts := TListString.Create;
    156155
    157     Parts.Explode(Value, ' ', StrToStr);
    158     DateParts.Explode(Parts[0], '-', StrToStr);
     156    Parts.Explode(' ', Value);
     157    DateParts.Explode('-', Parts[0]);
    159158    Result := EncodeDate(StrToInt(DateParts[0]), StrToInt(DateParts[1]),
    160159      StrToInt(DateParts[2]));
    161160    if Parts.Count > 1 then begin
    162       TimeParts.Explode(Parts[1], ':', StrToStr);
     161      TimeParts.Explode(':', Parts[1]);
    163162      Result := Result + EncodeTime(StrToInt(TimeParts[0]), StrToInt(TimeParts[1]),
    164163        StrToInt(TimeParts[2]), 0);
    … …  
    210209  Value: string;
    211210  DbResult: TDbRows;
     211  Item: TPair<string, string>;
    212212begin
    213213  LastUsedTable := ATable;
    214214  DbNames := '';
    215215  DbValues := '';
    216   for I := 0 to Data.Count - 1 do begin
    217     Value := Data.Items[I].Value;
     216  for Item in Data do begin
     217    Value := Item.Value;
    218218    StringReplace(Value, '"', '\"', [rfReplaceAll]);
    219219    if Value = 'NOW()' then DbValues := DbValues + ',' + Value
    220220    else DbValues := DbValues + ',"' + Value + '"';
    221     DbNames := DbNames + ',`' + Data.Keys[I] + '`';
     221    DbNames := DbNames + ',`' + Item.Key + '`';
    222222  end;
    223223  System.Delete(DbNames, 1, 1);
    … …  
    274274  I: Integer;
    275275  DbResult: TDbRows;
     276  Item: TPair<string, string>;
    276277begin
    277278  LastUsedTable := ATable;
    278279  DbNames := '';
    279280  DbValues := '';
    280   for I := 0 to Data.Count - 1 do begin
    281     Value := Data.Items[I].Value;
     281  for Item in Data do begin
     282    Value := Item.Value;
    282283    StringReplace(Value, '"', '\"', [rfReplaceAll]);
    283284    if Value = 'NOW()' then DbValues := DbValues + ',' + Value
    284285    else DbValues := DbValues + ',"' + Value + '"';
    285     DbNames := DbNames + ',`' + Data.Keys[I] + '`';
     286    DbNames := DbNames + ',`' + Item.Key + '`';
    286287  end;
    287288  System.Delete(DbNames, 1, 1);
    … …  
    314315  I: Integer;
    315316  DbResult: TDbRows;
     317  Item: TPair<string, string>;
    316318begin
    317319  LastUsedTable := ATable;
    318320  DbValues := '';
    319   for I := 0 to Data.Count - 1 do begin
    320     Value := Data.Items[I].Value;
     321  for Item in Data do begin
     322    Value := Item.Value;
    321323    StringReplace(Value, '"', '\"', [rfReplaceAll]);
    322324    if Value = 'NOW()' then DbValues := DbValues + ',' + Value
    323     else DbValues := DbValues + ',`' + Data.Keys[I] + '` =' + '"' + Value + '"';
     325    else DbValues := DbValues + ',`' + Item.Key + '` =' + '"' + Value + '"';
    324326  end;
    325327  System.Delete(DbValues, 1, 1);

  • trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas

    r137 r138  
    44
    55uses
    6   Classes, SysUtils, UCommon, UMemoryStreamEx, UMIMEType,
    7   Synautil, SpecializedList, SpecializedDictionary, Syncobjs;
     6  Classes, SysUtils, UCommon, UMemoryStreamEx, UMIMEType, Synautil, Syncobjs,
     7  Generics.Collections, UGenerics;
    88
    99type
    … …  
    7575  { TRequestHandlerList }
    7676
    77   TRequestHandlerList = class(TListObject)
     77  TRequestHandlerList = class(TObjectList<TRequestHandler>)
    7878    procedure Add(AName: string; AHandler: TRequestEvent);
    7979    function IndexOfName(AName: string): TRequestHandler;
    … …  
    131131var
    132132  I: Integer;
     133  Item: TPair<string, string>;
    133134begin
    134135  with HandlerData, Response.Content do begin
    … …  
    145146
    146147    WriteString('<h5>Request HTTP headers</h5>');
    147     for I := 0 to Request.Headers.Count - 1 do begin;
    148       with Request.Headers.Items[I] do
    149         WriteString(Key + ': ' + Value + '<br/>');
     148    for Item in Request.Headers do begin;
     149      WriteString(Item.Key + ': ' + Item.Value + '<br/>');
    150150    end;
    151151
    152152    WriteString('<h5>Request HTTP GET</h5>');
    153     for I := 0 to Request.Query.Count - 1 do begin
    154       with Request.Query.Items[I] do
    155       WriteString(Key + ': ' + Value + '<br/>');
     153    for Item in Request.Query do begin
     154      WriteString(Item.Key + ': ' + Item.Value + '<br/>');
    156155    end;
    157156
    158157    WriteString('<h5>Request HTTP cookies</h5>');
    159158    for I := 0 to Request.Cookies.Count - 1 do begin
    160       with Request.Cookies.Items[I] do
    161       WriteString(Key + ': ' + Value + '<br/>');
     159      WriteString(Item.Key + ': ' + Item.Value + '<br/>');
    162160    end;
    163161
    … …  
    170168
    171169    WriteString('<h5>Request HTTP POST</h5>');
    172     for I := 0 to Request.Post.Count - 1 do begin
    173       with Request.Post.Items[I] do
    174       WriteString(Key + ': ' + Value + '<br/>');
     170    for Item in Request.Post do begin
     171      WriteString(Item.Key + ': ' + Item.Value + '<br/>');
    175172    end;
    176173
    … …  
    181178    WriteString('<h5>Response HTTP headers</h5>');
    182179    with Response.Content do
    183     for I := 0 to Response.Headers.Count - 1 do begin
    184       with Response.Headers.Items[I] do
    185       WriteString(Key + ': ' + Value + '<br/>');
     180    for Item in Response.Headers do begin
     181      WriteString(Item.Key + ': ' + Item.Value + '<br/>');
    186182    end;
    187183
    188184    WriteString('<h5>Response HTTP cookies</h5>');
    189     for I := 0 to Response.Cookies.Count - 1 do begin;
    190       with Response.Cookies.Items[I] do
    191       WriteString(Key + ': ' + Value + '<br/>');
     185    for Item in Response.Cookies do begin;
     186      WriteString(Item.Key + ': ' + Item.Value + '<br/>');
    192187    end;
    193188  end;
    … …  
    197192begin
    198193  with HandlerData, Response.Content do begin
    199     WriteString('<html><body>' + Format(SPageNotFound, [Request.Path.Implode('/', StrToStr)]) + '</body></html>');
     194    WriteString('<html><body>' + Format(SPageNotFound, [Implode('/', Request.Path)]) + '</body></html>');
    200195  end;
    201196end;
    … …  
    218213begin
    219214  with HandlerData do begin
    220     FileName := DocumentRoot + DirectorySeparator + Request.Path.Implode('/', StrToStr);
     215    FileName := DocumentRoot + DirectorySeparator + Implode('/', Request.Path);
    221216    if FileExists(FileName) then begin
    222       Response.Headers.Values['Content-Type'] := GetMIMEType(Copy(ExtractFileExt(FileName), 2, 255));
     217      Response.Headers.Items['Content-Type'] := GetMIMEType(Copy(ExtractFileExt(FileName), 2, 255));
    223218      try
    224219        BinaryFile := TFileStream.Create(FileName, fmOpenRead);
    … …  
    230225    with Response.Content do begin
    231226      //WriteLn(Format(SFileNotFound, [Request.Path.Implode('/', StrToStr)]));
    232       WriteString('<html><body>' + Format(SFileNotFound, [Request.Path.Implode('/', StrToStr)]) + '</body></html>');
     227      WriteString('<html><body>' + Format(SFileNotFound, [Implode('/', Request.Path)]) + '</body></html>');
    233228    end;
    234229  end;
    … …  
    357352    Pair := TListString.Create;
    358353    Clear;
    359     Parts.Explode(Text, '&', StrToStr);
     354    Parts.Explode('&', Text);
    360355    for I := 0 to Parts.Count - 1 do begin
    361       Pair.Explode(Parts[I], '=', StrToStr);
     356      Pair.Explode('=', Parts[I]);
    362357      if Pair.Count >= 2 then
    363358        Add(Pair[0], Pair[1]);
    … …  
    371366function TQueryParameterList.Syntetize: string;
    372367var
    373   I: Integer;
     368  Item: TPair<string, string>;
    374369begin
    375370  Result := '';
    376   for I := 0 to Count - 1 do
    377     Result := Result + '&amp;' + Keys[I] + '=' + Items[I].Value;
     371  for Item in Self do
     372    Result := Result + '&amp;' + Item.Key + '=' + Item.Value;
    378373  Result := Copy(Result, 6, Length(Result));
    379374end;
    … …  
    391386    Pair := TListString.Create;
    392387    Clear;
    393     Parts.Explode(Text, ';', StrToStr);
     388    Parts.Explode(';', Text);
    394389    for I := 0 to Parts.Count - 1 do begin
    395       Pair.Explode(Parts[I], '=', StrToStr);
     390      Pair.Explode('=', Parts[I]);
    396391      if Pair.Count >= 2 then
    397392        Add(Trim(Pair[0]), Trim(Pair[1]));
    … …  
    405400function TCookieList.Syntetize: string;
    406401var
    407   I: Integer;
     402  Item: TPair<string, string>;
    408403begin
    409404  Result := '';
    410   for I := 0 to Count - 1 do
    411     Result := Result + '; ' + Keys[I] + '=' + Items[I].Value;
     405  for Item in Self do
     406    Result := Result + '; ' + Item.Key + '=' + Item.Value;
    412407  Result := Copy(Result, 2, Length(Result));
    413408end;

  • trunk/Packages/CoolWeb/WebServer/UHTTPServerCGI.pas

    r137 r138  
    44
    55uses
    6   Classes, SysUtils, UHTTPServer, SpecializedList, IOStream;
     6  Classes, SysUtils, UHTTPServer, IOStream, Generics.Collections;
    77
    88type
    … …  
    5454  Buffer: string;
    5555  Count: Integer;
     56  Item: TPair<string, string>;
    5657begin
    5758  HandlerData := THTTPHandlerData.Create;
    … …  
    9697      EnvVars.Values['QUERY_STRING'] := Copy(EnvVars.Values['QUERY_STRING'], 1,
    9798        Length(EnvVars.Values['QUERY_STRING']) - 1);
    98     Request.Path.Explode(EnvVars.Values['QUERY_STRING'], '/', StrToStr);
     99    Request.Path.Explode('/', EnvVars.Values['QUERY_STRING']);
    99100    if Pos('?', EnvVars.Values['REQUEST_URI']) > 0 then begin
    100101      Request.Query.Parse(Copy(EnvVars.Values['REQUEST_URI'],
    … …  
    129130    with Response do begin
    130131      // Generate cookies
    131       for I := 0 to Cookies.Count - 1 do
    132         Headers.Add('Set-Cookie', Cookies.Keys[I] + '=' + Cookies.Items[I].Value);
     132      for Item in Cookies do
     133        Headers.Add('Set-Cookie', Item.Key + '=' + Item.Value);
    133134        // + ';path=/;expires=' + RFC822DateTime(Now);
    134135
    135136      // Generate headers
    136       for I := 0 to Headers.Count - 1 do begin
    137         WriteLn(Headers.Keys[I] + ': ' + Headers.Items[I].Value);
     137      for Item in Headers do begin
     138        WriteLn(Item.Key + ': ' + Item.Value);
    138139      end;
    139140

  • trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas

    r137 r138  
    44
    55uses
    6   Classes, SysUtils, UHTTPServer, UTCPServer, SpecializedList, SynaUtil;
     6  Classes, SysUtils, UHTTPServer, UTCPServer, SynaUtil, Generics.Collections,
     7  UGenerics;
    78
    89type
    … …  
    4243  I: Integer;
    4344  ContentLength: Integer;
     45  Value: string;
     46  Item: TPair<string, string>;
    4447begin
    4548  with TTCPClientThread(Sender), Socket do begin
    … …  
    6063          WriteLn(IntToStr(Id) + ' ' + Line);
    6164          if (LineIndex = 0) then begin
    62             LineParts.Explode(Line, ' ', StrToStr);
     65            LineParts.Explode(' ', Line);
    6366            if (LineParts.Count >= 3) then begin
    6467              Request.Method := LineParts[0];
    6568              if Pos('?', LineParts[1]) > 0 then begin
    6669                Request.Query.Parse(Copy(LineParts[1], Pos('?', LineParts[1]) + 1, Length(LineParts[1])));
    67                 Request.Path.Explode(Copy(LineParts[1], 1, Pos('?', LineParts[1]) - 1), '/', StrToStr);
     70                Request.Path.Explode('/', Copy(LineParts[1], 1, Pos('?', LineParts[1]) - 1));
    6871              end else begin
    69                 Request.Path.Explode(LineParts[1], '/', StrToStr);
     72                Request.Path.Explode('/', LineParts[1]);
    7073                Request.Query.Clear;
    7174              end;
    … …  
    7578            end;
    7679          end else begin
    77             LineParts.Explode(Line, ' ', StrToStr, 2);
     80            LineParts.Explode(' ', Line, 2);
    7881            if (LineParts.Count = 2) and (LineParts[0][Length(LineParts[0])] = ':') then begin
    7982              LineParts[0] := Copy(LineParts[0], 1, Length(LineParts[0]) - 1);
    8083              Request.Headers.Add(LineParts[0], LineParts[1]);
    81               //WriteLn(Line);
    8284            end;
    8385          end;
    … …  
    8688
    8789        if Request.Method = 'POST' then begin
    88           ContentLength := StrToInt(Request.Headers.Values['Content-Length']);
     90          if Request.Headers.TryGetValue('Content-Length', Value) then
     91            ContentLength := StrToInt(Value);
    8992          SetLength(Line, ContentLength);
    9093          RecvBufferEx(PByte(Line), ContentLength, 1000);
    … …  
    9699
    97100    // Process cookies
    98     if Request.Headers.SearchKey('Cookie') <> -1 then
    99       Request.Cookies.Parse(Request.Headers.Values['Cookie']);
     101    if Request.Headers.TryGetValue('Cookie', Value) then
     102      Request.Cookies.Parse(Value);
    100103
    101104    // Load session variables
    … …  
    120123
    121124      // Handle cookies
    122       for I := 0 to Cookies.Count - 1 do
    123         Headers.Add('Set-Cookie', Cookies.Keys[I] + '=' + Cookies.Items[I].Value);
     125      for Item in Cookies do
     126        Headers.Add('Set-Cookie', Item.Key + '=' + Item.Value);
    124127        // + ';path=/;expires=' + RFC822DateTime(Now);
    125128
    126129      // Send headers
    127       for I := 0 to Headers.Count - 1 do begin
     130      for Item in Headers do begin
    128131        //WriteLn(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
    129         SendString(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
     132        SendString(Item.Key + ': ' + Item.Value + #13#10);
    130133      end;
    131134      SendString(#13#10);

  • trunk/Packages/CoolWeb/WebServer/UHTTPSessionFile.pas

    r137 r138  
    5555
    5656procedure THTTPSessionStorageFile.GetSessionId(HandlerData: THTTPHandlerData);
     57var
     58  Value: string;
    5759begin
    5860  with HandlerData do begin
    59     if Request.Cookies.SearchKey(SessionIdCookieName) <> -1 then begin
    60       SessionId := Request.Cookies.Values[SessionIdCookieName];
     61    if Request.Cookies.TryGetValue(SessionIdCookieName, Value) then begin
     62      SessionId := Value;
    6163    end else begin
    6264      SessionId := GetNewSessionId;
    63       Response.Cookies.Values[SessionIdCookieName] := SessionId;
     65      Response.Cookies.Items[SessionIdCookieName] := SessionId;
    6466    end;
    6567  end;
    … …  
    9698    end else raise Exception.Create(SCantCreateSessionStorageDirectory);
    9799
    98     HandlerData.Response.Cookies.Values[SessionIdCookieName] := HandlerData.SessionId;
     100    HandlerData.Response.Cookies.Items[SessionIdCookieName] := HandlerData.SessionId;
    99101  finally
    100102    Lock.Release;

  • trunk/Packages/CoolWeb/WebServer/UHTTPSessionMySQL.pas

    r137 r138  
    6464
    6565procedure THTTPSessionStorageMySQL.GetSessionId(HandlerData: THTTPHandlerData);
     66var
     67  Value: string;
    6668begin
    6769  with HandlerData do begin
    68     if Request.Cookies.SearchKey(SessionIdCookieName) <> -1 then begin
    69       SessionId := Request.Cookies.Values[SessionIdCookieName];
     70    if Request.Cookies.TryGetValue(SessionIdCookieName, Value) then begin
     71      SessionId := Value;
    7072    end else begin
    7173      SessionId := GetNewSessionId;
    … …  
    8789      HandlerData.SessionId + '"');
    8890    if DbRows.Count > 0 then begin
    89       HandlerData.Session.Text := DbRows[0].Values['Variables'];
     91      HandlerData.Session.Text := DbRows[0].Items['Variables'];
    9092    end else begin
    9193      HandlerData.SessionId := GetNewSessionId;
    … …  
    114116    else Database.Query(DbRows2, 'INSERT INTO `HTTPSession` (`Time`,  `Variables`, `Identification`) VALUES (' +
    115117    'NOW(), "' + HandlerData.Session.Text + '", "' + HandlerData.SessionId + '")');
    116     HandlerData.Response.Cookies.Values[SessionIdCookieName] := HandlerData.SessionId;
     118    HandlerData.Response.Cookies.Items[SessionIdCookieName] := HandlerData.SessionId;
    117119  finally
    118120    DbRows2.Free;
Note: See TracChangeset for help on using the changeset viewer.