Changeset 104 for trunk/Modules/Portal/UPagePortal.pas

Timestamp:

Oct 8, 2012, 10:22:08 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení hlavní stránky modulu Portál.

File:

• trunk/Modules/Portal/UPagePortal.pas (modified) (10 diffs)

trunk/Modules/Portal/UPagePortal.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
-  SpecializedDictionary, UWebSession, SpecializedList;
+  SpecializedDictionary, UWebSession, SpecializedList, UHtmlClasses,
+  UModularSystem;
 
 type
@@ -20 +21 @@
     function SystemMessage(Title, Text: string): string;
     function ShowLinks(GroupId: Integer): string;
-    function Show: string;
+    procedure Show(HandlerData: THTTPHandlerData);
     function OnlineHostList: string;
     function UserPanel: string;
@@ -48 +49 @@
   Session := TWebSession(HandlerData);
   with TWebSession(HandlerData) do begin
-
+    Show(HandlerData);
+    GeneratePage(Self);
   end;
 end;
@@ -85 +87 @@
 end;
 
-function TWebPagePortal.Show: string;
+procedure TWebPagePortal.Show(HandlerData: THTTPHandlerData);
 var
   Output: string;
@@ -97 +99 @@
   I, J: Integer;
 begin
+  try
+    DbRows := TDbRows.Create;
+    DbRows2 := TDbRows.Create;
   Output := '';
   with Session.Request do
@@ -117 +122 @@
       TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Username').Value.Value,
         TQueryFormGroup(Form.Groups[0]).Rows.FindByName('Password').Value.Value));
-      Output := Output + SystemMessage('Přihlášení', Result);
+      Output := Output + SystemMessage('Přihlášení', 'Přihlášení provedeno');
       if Session.User.Id <> UnknownUser then begin
         //Form.LoadValuesFromForm;
@@ -165 +170 @@
       Form.Load(Session.Request.Post);
       //Result = Session.User.PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
-      Output := Output + SystemMessage('Obnova hesla', Result);
+      Output := Output + SystemMessage('Obnova hesla', 'Heslo obnoveno');
       //if Result <> USER_PASSWORD_RECOVERY_SUCCESS then begin
         Output := Output + Form.AsXmlElement.AsString;
@@ -219 +224 @@
       end;
     end *);
+    end;
 
     //Session.Database.Database := Config['Database']['Database'];
@@ -235 +241 @@
       Session.Database.Query(DbRows2, 'SELECT * FROM `Panel` WHERE `PanelColumn`=' +
         PanelColumn.Values['Id'] + ' ORDER BY `Order`');
-      for J := 0 to DbRows2.Count - 1 do
-        Panel := DbRows[J];
+      for J := 0 to DbRows2.Count - 1 do begin
+        Panel := DbRows2[J];
         if Panel.Values['Module'] = 'HyperlinkGroup' then
           Output := Output + ShowLinks(StrToInt(Panel.Values['Parameters']))
@@ -253 +259 @@
       Output := Output + '</td>';
     end;
-    Output := Output + '</table>';
-    Result := Output;
+    Output := Output + '</tr></table>';
+    with TWebSession(HandlerData) do begin
+      with HtmlDocument.Body, THtmlString(SubItems.AddNew(THtmlString.Create)) do
+        Text := Text + Output;
+    end;
+  finally
+    DbRows2.Free;
+    DbRows.Free;
   end;
+end;
 
 function TWebPagePortal.OnlineHostList: string;