Changeset 100 for trunk/Packages

Timestamp:

Oct 2, 2012, 2:52:20 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: V balíčku CoolWeb některé seznamy změněny z typu TStringList na TListString.

Location:

trunk/Packages

Files:

• CoolWeb/Modules/UUser.pas (modified) (2 diffs)
• CoolWeb/WebServer/UHTTPServer.pas (modified) (9 diffs)
• CoolWeb/WebServer/UHTTPServerCGI.pas (modified) (1 diff)
• CoolWeb/WebServer/UHTTPServerTCP.pas (modified) (1 diff)
• CoolWeb/WebServer/UHTTPSessionFile.pas (modified) (1 diff)
• CoolWeb/WebServer/UHTTPSessionMySQL.pas (modified) (1 diff)
• TemplateGenerics/Generic/GenericDictionary.inc (modified) (1 diff)

trunk/Packages/CoolWeb/Modules/UUser.pas

@@ -61 +61 @@
   try
     DbRows := TDbRows.Create;
+    if HandlerData.Request.Cookies.SearchKey('SessionId') <> -1 then begin
     Database.Query(DbRows, 'SELECT * FROM `UserOnline` WHERE `SessionId`="' +
       HandlerData.Request.Cookies.Values['SessionId'] + '"');
@@ -75 +76 @@
       User := 1;
     end;
+
+    end;
   finally
     DbRows.Free;

trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas

@@ -13 +13 @@
   EEmptyHTTPHandler = class(Exception);
 
-  TQueryParameterList = class(TStringList)
+  TQueryParameterList = class(TDictionaryStringString)
     procedure Parse(Text: string);
     function Syntetize: string;
@@ -20 +20 @@
   { TCookieList }
 
-  TCookieList = class(TStringList)
+  TCookieList = class(TDictionaryStringString)
     procedure Parse(Text: string);
     function Syntetize: string;
@@ -148 +148 @@
     WriteString('<h5>Request HTTP headers</h5>');
     for I := 0 to Request.Headers.Count - 1 do begin;
-      WriteString(Request.Headers.Items[I].Value + '<br/>');
+      with Request.Headers.Items[I] do
+        WriteString(Key + ': ' + Value + '<br/>');
+    end;
+
+    WriteString('<h5>Request HTTP GET</h5>');
+    for I := 0 to Request.Query.Count - 1 do begin
+      with Request.Query.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
     WriteString('<h5>Request HTTP cookies</h5>');
-    for I := 0 to Request.Cookies.Count - 1 do begin;
-      WriteString(Request.Cookies.Strings[I] + '<br/>');
+    for I := 0 to Request.Cookies.Count - 1 do begin
+      with Request.Cookies.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
     //WriteString('Session id: ' + SessionId);
     WriteString('<h5>Session variables</h5>');
-    for I := 0 to Session.Count - 1 do begin;
-      WriteString(Session.Strings[I] + '<br/>');
+    for I := 0 to Session.Count - 1 do begin
+      with Session do
+      WriteString(Names[I] + ': ' + ValueFromIndex[I] + '<br/>');
     end;
 
     WriteString('<h5>Request HTTP POST</h5>');
-    for I := 0 to Request.Post.Count - 1 do begin;
-      WriteString(Request.Post.Strings[I] + '<br/>');
+    for I := 0 to Request.Post.Count - 1 do begin
+      with Request.Post.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
@@ -173 +183 @@
     WriteString('<h5>Response HTTP headers</h5>');
     with Response.Content do
-    for I := 0 to Response.Headers.Count - 1 do begin;
-      WriteString(Response.Headers.Items[I].Value + '<br/>');
+    for I := 0 to Response.Headers.Count - 1 do begin
+      with Response.Headers.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
     WriteString('<h5>Response HTTP cookies</h5>');
     for I := 0 to Response.Cookies.Count - 1 do begin;
-      WriteString(Response.Cookies.Strings[I] + '<br/>');
+      with Response.Cookies.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
   end;
@@ -352 +364 @@
       Pair.Explode(Parts[I], '=', StrToStr);
       if Pair.Count >= 2 then
-        Values[Pair[0]] := Pair[1];
+        Add(Pair[0], Pair[1]);
     end;
 
@@ -367 +379 @@
   Result := '';
   for I := 0 to Count - 1 do
-    Result := Result + '&amp;' + Names[I] + '=' + ValueFromIndex[I];
+    Result := Result + '&amp;' + Keys[I] + '=' + Items[I].Value;
   Result := Copy(Result, 6, Length(Result));
 end;
@@ -387 +399 @@
       Pair.Explode(Parts[I], '=', StrToStr);
       if Pair.Count >= 2 then
-        Values[Trim(Pair[0])] := Trim(Pair[1]);
+        Add(Trim(Pair[0]), Trim(Pair[1]));
     end;
   finally
@@ -401 +413 @@
   Result := '';
   for I := 0 to Count - 1 do
-    Result := Result + '; ' + Names[I] + '=' + ValueFromIndex[I];
+    Result := Result + '; ' + Keys[I] + '=' + Items[I].Value;
   Result := Copy(Result, 2, Length(Result));
 end;
@@ -447 +459 @@
 destructor THTTPHandlerData.Destroy;
 begin
-  Request.Free;
-  Response.Free;
-  Session.Free;
-  inherited Destroy;
+  FreeAndNil(Request);
+  FreeAndNil(Response);
+  FreeAndNil(Session);
+  inherited;
 end;
 

trunk/Packages/CoolWeb/WebServer/UHTTPServerCGI.pas

@@ -133 +133 @@
       // Generate cookies
       for I := 0 to Cookies.Count - 1 do
-        Headers.Add('Set-Cookie', Cookies.Names[I] + '=' + Cookies.ValueFromIndex[I]);
+        Headers.Add('Set-Cookie', Cookies.Keys[I] + '=' + Cookies.Items[I].Value);
         // + ';path=/;expires=' + RFC822DateTime(Now);
 

trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas

@@ -121 +121 @@
       // Handle cookies
       for I := 0 to Cookies.Count - 1 do
-        Headers.Add('Set-Cookie', Cookies.Names[I] + '=' + Cookies.ValueFromIndex[I]);
+        Headers.Add('Set-Cookie', Cookies.Keys[I] + '=' + Cookies.Items[I].Value);
         // + ';path=/;expires=' + RFC822DateTime(Now);
 

trunk/Packages/CoolWeb/WebServer/UHTTPSessionFile.pas

@@ -58 +58 @@
 begin
   with HandlerData do begin
-    if Request.Cookies.IndexOfName(SessionIdCookieName) <> -1 then begin
+    if Request.Cookies.SearchKey(SessionIdCookieName) <> -1 then begin
       SessionId := Request.Cookies.Values[SessionIdCookieName];
     end else begin

trunk/Packages/CoolWeb/WebServer/UHTTPSessionMySQL.pas

@@ -68 +68 @@
 begin
   with HandlerData do begin
-    if Request.Cookies.IndexOfName(SessionIdCookieName) <> -1 then begin
+    if Request.Cookies.SearchKey(SessionIdCookieName) <> -1 then begin
       SessionId := Request.Cookies.Values[SessionIdCookieName];
     end else begin

trunk/Packages/TemplateGenerics/Generic/GenericDictionary.inc

@@ -99 +99 @@
     Result := Result + 1;
   end;
+  if Result >= Count then Result := -1;
 end;