Changeset 36 for trunk/Application

Timestamp:

Oct 29, 2010, 10:44:13 PM (14 years ago)

Author:

george

Message:

• Přidáno: Neodokončená třída TPageList a TQueryString.
• Přidáno: Částečná podpora pro přihlašování uživatelů.

Location:

trunk/Application

Files:

• UCustomApplication.pas (modified) (6 diffs)
• UPageList.pas (added)
• UUser.pas (modified) (5 diffs)

trunk/Application/UCustomApplication.pas

@@ -8 +8 @@
   Classes, SysUtils, UHTTPServerCGI, Contnrs, USqlDatabase, UConfig, DateUtils,
   UXmlClasses, UHtmlClasses, UCore, UStringListEx, UHTTPServer, UHTTPServerTCP,
-  UHTTPSessionMySQL, UHTTPSessionFile;
+  UHTTPSessionMySQL, UHTTPSessionFile, UUser;
 
 type
@@ -46 +46 @@
     ModuleName: string;
     BaseURL: string;
+    User: TWebUser;
+    UserOnline: TWebOnlineUser;
     procedure Run;
     procedure Execute(HandlerData: THTTPHandlerData);
@@ -95 +97 @@
   TitleTag: THtmlString;
 begin
+  User.HandlerData := HandlerData;
+  UserOnline.HandlerData := HandlerData;
+  UserOnline.Update;
   with HandlerData do begin
   Style := ConfigStyle;
@@ -133 +138 @@
   Pages := TObjectList.Create;
   HtmlDocument := THtmlDocument.Create;
+  User := TWebUser.Create;
+  User.Database := Database;
+  UserOnline := TWebOnlineUser.Create;
+  UserOnline.Database := Database;
 end;
 
@@ -141 +150 @@
   Pages.Free;
   HTTPServer.Free;
+  User.Free;
+  UserOnline.Free;
   inherited Destroy;
 end;
@@ -230 +241 @@
       '<li><a href="https://mail.zdechov.net/">Pošta</a></li>' +
       '<li><a href="http://wiki.zdechov.net/">Wiki</a></li>' +
-      '</ul><ul class="MenuItem2"><li>&nbsp;</li>';
-(*    if System.UserOnline.User = System.UserOnline.AnonymousUserId then begin
+      '</ul><ul class="MenuItem2">'; //<li>&nbsp;</li>';
+    if UserOnline.User = AnonymousUserId then begin
       Text := Text + '</ul>' +
         '<ul class="MenuItem2">' +
-        '<li>' + MakeLink('Přihlášení', NavigationMakeLink('User', 'Login')) + '</li>';
+        '<li>' + MakeLink('Přihlášení', NavigationLink('/uzivatel/prihlaseni/')) + '</li>';
       //$Output .= '<li>'.$this->System->HTML->MakeLink($this->System->Translate('UserRegistration'), $this->System->MakeLink('UserList', 'Register')).'</li>';
     end else begin
       Text := Text + '</ul>' +
         '<ul class="MenuItem2">' +
-        '<li>' + System.User.FullName + '</li>' +
-        '<li>' + MakeLink('Odhlášení', NavigationMakeLink('User', 'Logout')) + '</li>' +
-        '<li>' + MakeLink('Profil', NavigationMakeLink('User', 'View',
-        array('Id' => $this->System->User->Id))).'</li>';
-    end;
-    *)
+        '<li>' + User.FullName + '</li>' +
+        '<li>' + MakeLink('Odhlášení', NavigationLink('/uzivatel/odhlaseni/')) + '</li>' +
+        '<li>' + MakeLink('Profil', NavigationLink('/uzivatel/profil/')) + '</li>';
+    end;
     Text := Text + '</ul></div>';
   end;

trunk/Application/UUser.pas

@@ -8 +8 @@
   Classes, SysUtils, synacode, USqlDatabase, UCommon, UHTTPServer;
 
+const
+  AnonymousUserId = 1;
+
 type
   EDuplicateItem = class(Exception);
@@ -15 +18 @@
 
   TWebUser = class
+    FullName: string;
     Database: TSqlDatabase;
     HandlerData: THTTPHandlerData;
@@ -47 +51 @@
   Id: Integer;
 begin
-  DbRows := Database.Query('SELECT * FROM `UserOnline` WHERE `SessionId`="' +
-    HandlerData.Request.Cookies.Values['SessionId'] + '"');
-  if DbRows.Count > 0 then begin
-    // Update exited
-    Id := StrToInt(DbRows[0].Values['Id']);
+  try
+    DbRows := Database.Query('SELECT * FROM `UserOnline` WHERE `SessionId`="' +
+      HandlerData.Request.Cookies.Values['SessionId'] + '"');
+    if DbRows.Count > 0 then begin
+      // Update exited
+      Id := StrToInt(DbRows[0].Values['Id']);
+      User := StrToInt(DbRows[0].Values['User']);
+      DbRows.Free;
+      DbRows := Database.Query('UPDATE `UserOnline` SET `ActivityTime` = NOW() WHERE `Id`=' + IntToStr(Id));
+    end else begin
+      // Create new record
+      DbRows.Free;
+      DbRows := Database.Query('INSERT INTO `UserOnline` (`User`, `ActivityTime`, `SessionId`) ' +
+        'VALUES (1, NOW(), "' + HandlerData.Request.Cookies.Values['SessionId'] + '")');
+      Id := Database.LastInsertId;
+      User := 1;
+    end;
+  finally
     DbRows.Free;
-    DbRows := Database.Query('UPDATE `UserOnline` SET `ActivityTime` = NOW() WHERE `Id`=' + IntToStr(Id));
-  end else begin
-    // Create new record
-    DbRows.Free;
-    DbRows := Database.Query('INSERT INTO `UserOnline` (`User`, `ActivityTime`, `SessionId`) ' +
-      'VALUES (1, NOW(), "' + HandlerData.Request.Cookies.Values['SessionId'] + '")');
-    Id := Database.LastInsertId;
   end;
-  DbRows.Destroy;
 end;
 
@@ -69 +78 @@
 begin
   Logout;
-  DbRows := Database.Query('UPDATE `UserOnline` SET `User` = ' + IntToStr(User) + ', `LoginTime` = NOW() WHERE `SessionId`="' +
-    HandlerData.Request.Cookies.Values['SessionId'] + '"');
-  DbRows.Destroy;
+  try
+    DbRows := Database.Query('UPDATE `UserOnline` SET `User` = ' + IntToStr(User) + ', `LoginTime` = NOW() WHERE `SessionId`="' +
+      HandlerData.Request.Cookies.Values['SessionId'] + '"');
+  finally
+    DbRows.Free;
+  end;
   Self.User := User;
 end;
@@ -79 +91 @@
   DbRows: TDbRows;
 begin
-  if Id = 1 then Update;
-  if User <> 1 then begin
-    DbRows := Database.Query('UPDATE `UserOnline` SET `User` = 1 WHERE `SessionId`="' +
+  if Id = AnonymousUserId then Update;
+  if User <> AnonymousUserId then begin
+    DbRows := Database.Query('UPDATE `UserOnline` SET `User` = ' + IntToStr(AnonymousUserId) + ' WHERE `SessionId`="' +
       HandlerData.Request.Cookies.Values['SessionId'] + '"');
     DbRows.Destroy;
-    User := 1;
+    User := AnonymousUserId;
   end;
 end;