Changeset 24 for branches

Timestamp:

Sep 8, 2010, 4:17:21 PM (14 years ago)

Author:

george

Message:

• Přidáno: Z PHP kódů převedeno zobrazení stránek a hlavního menu. Pro generování kostry použity třídy HTMLClasses a XMLClasses.
• Přidáno: Styly a obrázky.

Location:

branches/lazarus

Files:

• .htaccess (added)
• Application/UCustomCGIApplication.pas (added)
• Common/UHtmlClasses.pas (modified) (12 diffs)
• Common/UXmlClasses.pas (modified) (7 diffs)
• Pages (added)
• Pages/UMainPage.pas (added)
• SQL (added)
• SQL/Updates (added)
• Style (added)
• Style/Basic (added)
• Style/Basic/Global.js (added)
• Style/Basic/Images (added)
• Style/Basic/Images/critical.png (added)
• Style/Basic/Images/delete.png (added)
• Style/Basic/Images/edit.png (added)
• Style/Basic/Images/information.png (added)
• Style/Basic/Images/sort_asc.png (added)
• Style/Basic/Images/sort_desc.png (added)
• Style/Basic/Images/view.png (added)
• Style/Basic/Images/warning.png (added)
• Style/Basic/Style.css (added)
• Style/Basic/jquery.js (added)
• UCore.pas (modified) (5 diffs)
• images (added)
• images/cast_vsetina.jpg (added)
• images/icons (added)
• images/icons/jpg.gif (added)
• images/icons/pdf.gif (added)
• images/icons/png.gif (added)
• images/icons/web.gif (added)
• images/icons/word.gif (added)
• images/icons/zip.gif (added)
• images/leftbar.gif (added)
• images/mainbar.gif (added)
• images/mapa_pokryti.png (added)
• images/pohlednice_stara.jpg (added)
• images/pohlednice_stara_mala.jpg (added)
• images/pokryti.jpg (added)
• images/pokryti_nahled.jpg (added)
• images/rightbar.gif (added)
• images/umisteni.gif (added)
• images/vsetin_z_filky(dalekohled).jpg (added)
• images/zdechov(filka)-vsetin_nahled.jpg (added)
• index.lpi (modified) (41 diffs)
• index.pas (modified) (1 diff)

branches/lazarus/Common/UHtmlClasses.pas

@@ -6 +6 @@
 
 uses
-  UXmlClasses, Classes, SysUtils;
+  UXmlClasses, Classes, SysUtils, Contnrs, UStringListEx;
 
 type
-  TStringArray = array of string;
-
   TDomainAddress = class(TPersistent)
   private
@@ -97 +95 @@
   public
     BlockType: TBlockType;
-    SubItems: TList; // of THtmlElement;
+    SubItems: TObjectList; // of THtmlElement;
     constructor Create;
     destructor Destroy; override;
@@ -113 +111 @@
 
   TSizeUnits = (suPixels, suPercents);
+
   THtmlSize = record
     Width: Integer;
@@ -130 +129 @@
   end;
 
-  THtmlPage = class
+  THtmlDocument = class
   private
     function GetAsXmlDocument: TXmlDocument;
   public
     Title: string;
-    Charset: string;
+    ContentEncoding: string;
+    ContentLanguage: string;
     Body: THtmlBlock;
+    Styles: TStringList;
+    Scripts: TStringList;
     property AsXmlDocument: TXmlDocument read GetAsXmlDocument;
     constructor Create;
@@ -142 +144 @@
   end;
 
-function Explode(Separator: Char; Source: string): TStringArray;
-
 implementation
-
-function Explode(Separator: Char; Source: string): TStringArray;
-begin
-  SetLength(Result, 0);
-  while Pos(Separator, Source) > 0 do begin
-    SetLength(Result, Length(Result) + 1);
-    Result[High(Result)] := Copy(Source, 1, Pos(Separator, Source) - 1);
-    Delete(Source, 1, Length(Result[High(Result)]) + 1);
-  end;
-  SetLength(Result, Length(Result) + 1);
-  Result[High(Result)] := Source;
-end;
 
 function LeftCutString(var Source, Output: string; Delimiter: string; Allowed: string = ''): Boolean;
@@ -210 +198 @@
 end;
 
-{ THtmlPage }
-
-constructor THtmlPage.Create;
+{ THtmlDocument }
+
+constructor THtmlDocument.Create;
 begin
   Body := THtmlBlock.Create;
-end;
-
-destructor THtmlPage.Destroy;
+  Styles := TStringList.Create;
+  Scripts := TStringList.Create;
+  ContentLanguage := 'en';
+  ContentEncoding := 'utf-8';
+end;
+
+destructor THtmlDocument.Destroy;
 begin
   Body.Free;
+  Styles.Free;
+  Scripts.Free;
   inherited;
 end;
 
-function THtmlPage.GetAsXmlDocument: TXmlDocument;
+function THtmlDocument.GetAsXmlDocument: TXmlDocument;
+var
+  DocType: TXMLTag;
+  HTMLTag: TXMLTag;
+  I: Integer;
 begin
   Result := TXmlDocument.Create;
   with Result, Content do begin
     Formated := True;
-    TagName := 'html';
-    with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
-      TagName := 'head';
+    DocType := TXMlTag.Create;
+    DocType.Name := '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"';
+    Doctype.EndTagSymbol := '';
+    SubElements.Add(DocType);
+    HTMLTag := TXMLTag.Create;
+    with HTMLTag do begin
+      Name := 'html';
       with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
-        TagName := 'title';
-        with TXmlString(SubElements[SubElements.Add(TXmlString.Create)]) do begin
-          Text := Title;
+        Name := 'head';
+        with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
+          Name := 'title';
+          with TXmlString(SubElements[SubElements.Add(TXmlString.Create)]) do begin
+            Text := Title;
+          end;
+        end;
+        with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
+          Name := 'meta';
+          Attributes.AddNameValue('http-equiv', 'Content-Language');
+          Attributes.AddNameValue('content', ContentLanguage);
+        end;
+        with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
+          Name := 'meta';
+          Attributes.AddNameValue('http-equiv', 'Content-Type');
+          Attributes.AddNameValue('content', 'text/html; charset=' + ContentEncoding);
+        end;
+        for I := 0 to Styles.Count - 1 do
+        with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
+          Name := 'link';
+          Attributes.AddNameValue('rel', 'stylesheet');
+          Attributes.AddNameValue('href', Styles[I]);
+          Attributes.AddNameValue('type', 'text/css');
+          Attributes.AddNameValue('media', 'all');
+        end;
+        for I := 0 to Scripts.Count - 1 do
+        with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
+          Name := 'script';
+          ShringEmpty := False;
+          Attributes.AddNameValue('type', 'text/javascript');
+          Attributes.AddNameValue('src', Scripts[I]);
         end;
       end;
       with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
-        TagName := 'meta';
-        Attributes.AddNameValue('http-equiv', 'Content-Language');
-        Attributes.AddNameValue('content', 'cs');
-      end;
-      with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
-        TagName := 'meta';
-        Attributes.AddNameValue('http-equiv', 'Content-Type');
-        Attributes.AddNameValue('content', 'text/html; charset=' + Charset);
+        Name := 'body';
+        SubElements.Add(Body.AsXmlElement);
       end;
     end;
-    with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
-      TagName := 'body';
-      SubElements.Add(Body.AsXmlElement);
-
-
-    end;
+    SubElements.Add(HTMLTag);
   end;
 end;
@@ -261 +280 @@
 constructor THtmlBlock.Create;
 begin
-  SubItems := TList.Create;
+  SubItems := TObjectList.Create;
 end;
 
 destructor THtmlBlock.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to SubItems.Count - 1 do THtmlElement(SubItems[I]).Free;
+begin
   SubItems.Free;
   inherited;
@@ -280 +296 @@
   with TXmlTag(Result) do begin
     case BlockType of
-      btBlockLevel: TagName := 'div';
-      btInline: TagName := 'span';
-      btNoTag: TagName := '';
+      btBlockLevel: Name := 'div';
+      btInline: Name := 'span';
+      btNoTag: Name := '';
     end;
     for I := 0 to SubItems.Count - 1 do
@@ -351 +367 @@
 procedure TIpAddress.SetAsString(const Value: string);
 var
-  Parts: TStringArray;
-begin
-  Parts := Explode('.', Value);
+  Parts: TStringListEx;
+begin
   try
+    Parts := TStringListEx.Create;
+    Parts.Explode('.', Value);
+    try
 //    if Length(Parts) = 4 then begin
-    Octets[0] := StrToInt(Parts[3]);
-    Octets[1] := StrToInt(Parts[2]);
-    Octets[2] := StrToInt(Parts[1]);
-    Octets[3] := StrToInt(Parts[0]);
+      Octets[0] := StrToInt(Parts[3]);
+      Octets[1] := StrToInt(Parts[2]);
+      Octets[2] := StrToInt(Parts[1]);
+      Octets[3] := StrToInt(Parts[0]);
 //    end else raise EConvertError.Create('String to IP address conversion error');
-  except
-    raise EConvertError.Create('String to IP address conversion error');
+    except
+      raise EConvertError.Create('String to IP address conversion error');
+    end;
+  finally
+    Parts.Free;
   end;
 end;
@@ -430 +451 @@
 procedure TDomainAddress.SetAsString(const Value: string);
 var
-  StrArray: TStringArray;
+  StrArray: TStringListEx;
   I: Integer;
 begin
-  StrArray := Explode('.', Value);
-  SetLength(Levels, Length(StrArray));
-  for I := 0 to High(StrArray) do Levels[High(StrArray) - I] := StrArray[I];
+  try
+    StrArray := TStringListEx.Create;
+    StrArray.Explode('.', Value);
+    SetLength(Levels, StrArray.Count);
+    for I := 0 to StrArray.Count do
+      Levels[StrArray.Count - I] := StrArray[I];
+  finally
+    StrArray.Free;
+  end;
 end;
 
@@ -455 +482 @@
   Result := TXmlTag.Create;
   with TXmlTag(Result) do begin
-    TagName := 'a';
+    Name := 'a';
     Attributes.Add('href='+Target.AsString);
     if Assigned(Content) then SubElements.Add(Content.AsXmlElement);
@@ -522 +549 @@
   Result := TXmlTag.Create;
   with TXmlTag(Result) do begin
-    TagName := 'img';
+    Name := 'img';
     Attributes.AddNameValue('src', Source.AsString);
     Attributes.AddNameValue('width', IntToStr(Size.Width));

branches/lazarus/Common/UXmlClasses.pas

@@ -5 +5 @@
 interface
 
-uses Classes, SysUtils, Contnrs, StrUtils;
+uses Classes, SysUtils, Contnrs, StrUtils, UStringListEx;
 
 type
-  TStringListEx = class(TStringList)
-  public
-    procedure AddNameValue(Name, Value: string);
-  end;
-
   TXmlElement = class
   private
@@ -31 +26 @@
     function GetAsString: string; override;
   public
-    EndTagSymbol: Char;
-    TagName: string;
+    EndTagSymbol: string;
+    ShringEmpty: Boolean;
+    Name: string;
     Attributes: TStringListEx;
-    SubElements: TList; // of TXmlElement;
+    SubElements: TObjectList; // of TXmlElement;
     constructor Create;
     destructor Destroy; override;
@@ -41 +37 @@
   TXmlDocument = class
   private
+    MainTag: TXmlTag;
     function FormatStructure(Text: string): string;
     function GetAsString: string;
   public
     Formated: Boolean;
-    MainTag: TXmlTag;
     Content: TXmlTag;
     XmlVersion: string;
@@ -60 +56 @@
 constructor TXmlTag.Create;
 begin
+  ShringEmpty := True;
   Attributes := TStringListEx.Create;
   Attributes.NameValueSeparator := '=';
-  SubElements := TList.Create;
+  SubElements := TObjectList.Create;
   EndTagSymbol := '/';
 end;
 
 destructor TXmlTag.Destroy;
-var
-  I: Integer;
 begin
   Attributes.Free;
-  for I := 0 to SubElements.Count - 1 do TXmlElement(SubElements[I]).Free;
   SubElements.Free;
   inherited;
@@ -90 +84 @@
     AttributesText := AttributesText + ' ' + Attributes.Names[I] + '="' + Attributes.ValueFromIndex[I] + '"';
 
-  if TagName <> '' then begin
-    if Content <> '' then
-      Result :=  '<' + TagName + AttributesText + '>' + Content + '<' + EndTagSymbol + TagName + '>'
-      else Result :=  '<' + TagName + AttributesText + EndTagSymbol + '>';
+  if Name <> '' then begin
+    if (Content <> '') or not ShringEmpty then
+      Result :=  '<' + Name + AttributesText + '>' + Content + '<' + EndTagSymbol + Name + '>'
+      else Result :=  '<' + Name + AttributesText + EndTagSymbol + '>';
   end else Result := Content;
 end;
@@ -116 +110 @@
 begin
   inherited;
-  Encoding := 'windows-1250';
+  Encoding := 'utf-8';
   XmlVersion := '1.0';
   MainTag := TXmlTag.Create;
   with MainTag do begin
-    TagName := '?xml';
+    Name := '?xml';
     EndTagSymbol := '?';
-    Attributes.Add('version=1.0');
-    Attributes.Add('encoding=windows-1250');
+    Attributes.AddNameValue('version', '1.0');
+    Attributes.AddNameValue('encoding', 'utf-8');
   end;
   Content := TXmlTag.Create;
@@ -172 +166 @@
 function TXmlDocument.GetAsString: string;
 begin
-  Result := MainTag.AsString +
-    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
-    + Content.AsString;
+  Result := MainTag.AsString + Content.AsString;
   if Formated then Result := FormatStructure(Result);
 end;
 
-{ TStringListEx }
-
-procedure TStringListEx.AddNameValue(Name, Value: string);
-begin
-  Add(Name + NameValueSeparator + Value); 
-end;
-
 end.

branches/lazarus/UCore.pas

@@ -6 +6 @@
 
 uses
-  USqlDatabase;
+  USqlDatabase, Classes, SysUtils, StrUtils;
   
 type
@@ -12 +12 @@
   TPageProducer = function: string;
 
+function MakeLink(Text, URL: string): string;
+function NavigationMakeLink(Module, Page: string): string;
 function InsertIcon(FileName: string): string;
+function IconedLink(Link, Text: string): string;
 function HtmlLink(Text, Target: string): string;
 function ShowHeader(Title, Path: string): string;
@@ -18 +21 @@
 function Explode(Separator: Char; Data: string): TArrayOfString;
 function HumanDate(Date: string): string;
-procedure RegisterPage(Name: string; Producer: TPageProducer);
 function PagesList(URL: string; Page, TotalCount, CountPerPage: Integer): string;
 function StrRepeat(Data: string; Count: Integer): string;
-
-type
-  TRegistredPage = record
-    Name: string;
-        Producer: TPageProducer;
-  end;
-  
-var
-  Pages: array of TRegistredPage;
-  Database: TSqlDatabase;
 
 implementation
 
 uses  
-  SysUtils, UConfig;
-
-procedure RegisterPage(Name: string; Producer: TPageProducer);
-begin
-  SetLength(Pages, Length(Pages) + 1);
-  Pages[High(Pages)].Name := Name;
-  Pages[High(Pages)].Producer := Producer;
-end;
+  UConfig;
 
 function HtmlLink(Text, Target: string): string;
@@ -110 +95 @@
 end;
 
-procedure Init;
-var
-  DbRows: TDbRows;
+function LastPos(const SubStr: String; const S: String): Integer;
 begin
-  Database := TSqlDatabase.Create;
-  with Database do begin
-    Hostname := DatabaseHostName;
-    Database := DatabaseDatabase;
-    UserName := DatabaseUserName;
-    Password := DatabasePassword;
-    Connect;
-  end;
-  DbRows := Database.Query('SET NAMES utf8');
-  DbRows.Free;
+  Result := Pos(ReverseString(SubStr), ReverseString(S));
+
+  if (Result <> 0) then
+    Result := ((Length(S) - Length(SubStr)) + 1) - Result + 1;
 end;
 
-procedure Done;
+function IconedLink(Link, Text: string): string;
+var
+  Extension: string;
+  Icon: string;
 begin
-  Database.Free;
+  Extension := Copy(Link, LastPos(Link, '.') + 1, Length(Link));
+  Icon := '<img src="images/icons/' + Extension + '.gif" alt="' + Extension + '"> ';
+  Result := Icon + '<a href="' + Link + '">' + Text + '</a>';
+end;
+
+function MakeLink(Text, URL: string): string;
+begin
+  Result := '<a href="' + URL + '">' + Text + '</a>';
+end;
+
+function NavigationMakeLink(Module, Page: string): string;
+begin
+  Result := '?m=' + Module + '&amp;p=' + Page;
 end;
 
@@ -179 +171 @@
 initialization
 
-Init;
-
 finalization
 
-Done;
 end.

branches/lazarus/index.lpi

@@ -28 +28 @@
       </local>
     </RunParams>
-    <Units Count="46">
+    <Units Count="49">
       <Unit0>
         <Filename Value="index.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="index"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
-        <CursorPos X="20" Y="7"/>
-        <UsageCount Value="145"/>
+        <CursorPos X="50" Y="18"/>
+        <UsageCount Value="155"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -47 +46 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UMainPage"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="68"/>
-        <CursorPos X="1" Y="89"/>
-        <UsageCount Value="145"/>
+        <EditorIndex Value="10"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="224"/>
+        <CursorPos X="20" Y="238"/>
+        <UsageCount Value="151"/>
+        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit1>
@@ -59 +60 @@
         <TopLine Value="291"/>
         <CursorPos X="1" Y="311"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit2>
       <Unit3>
         <Filename Value="UXmlClasses.pas"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit3>
       <Unit4>
         <Filename Value="UCore.pas"/>
+        <IsPartOfProject Value="True"/>
         <UnitName Value="UCore"/>
-        <EditorIndex Value="9"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="10"/>
-        <CursorPos X="1" Y="23"/>
-        <UsageCount Value="145"/>
+        <EditorIndex Value="16"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="1" Y="16"/>
+        <UsageCount Value="155"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -84 +86 @@
         <TopLine Value="217"/>
         <CursorPos X="5" Y="236"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit5>
       <Unit6>
         <Filename Value="Pages/UFinancePage.pas"/>
-        <IsPartOfProject Value="True"/>
         <UnitName Value="UFinancePage"/>
         <WindowIndex Value="0"/>
         <TopLine Value="10"/>
         <CursorPos X="27" Y="19"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit6>
@@ -102 +103 @@
         <TopLine Value="17"/>
         <CursorPos X="34" Y="30"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit7>
@@ -111 +112 @@
         <TopLine Value="204"/>
         <CursorPos X="25" Y="226"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit8>
       <Unit9>
         <Filename Value="Pages/UNewsPage.pas"/>
-        <IsPartOfProject Value="True"/>
         <UnitName Value="UNewsPage"/>
         <WindowIndex Value="0"/>
         <TopLine Value="102"/>
         <CursorPos X="25" Y="107"/>
-        <UsageCount Value="145"/>
+        <UsageCount Value="144"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit9>
@@ -129 +129 @@
         <TopLine Value="2320"/>
         <CursorPos X="30" Y="2342"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="13"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit10>
@@ -138 +138 @@
         <TopLine Value="40"/>
         <CursorPos X="9" Y="59"/>
-        <UsageCount Value="133"/>
+        <UsageCount Value="132"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit11>
       <Unit12>
         <Filename Value="/usr/share/fpcsrc/rtl/objpas/sysutils/datih.inc"/>
-        <TopLine Value="115"/>
-        <CursorPos X="10" Y="117"/>
-        <UsageCount Value="1"/>
+        <EditorIndex Value="15"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="105"/>
+        <CursorPos X="10" Y="119"/>
+        <UsageCount Value="14"/>
+        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit12>
@@ -152 +155 @@
         <TopLine Value="34"/>
         <CursorPos X="3" Y="624"/>
-        <UsageCount Value="1"/>
+        <UsageCount Value="0"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit13>
@@ -159 +162 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UConfig"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="88" Y="11"/>
-        <UsageCount Value="120"/>
+        <UsageCount Value="130"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -172 +175 @@
         <TopLine Value="108"/>
         <CursorPos X="1" Y="134"/>
-        <UsageCount Value="120"/>
+        <UsageCount Value="130"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit15>
@@ -180 +183 @@
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="120"/>
+        <UsageCount Value="130"/>
         <DefaultSyntaxHighlighter Value="JScript"/>
       </Unit16>
@@ -189 +192 @@
         <TopLine Value="608"/>
         <CursorPos X="44" Y="627"/>
-        <UsageCount Value="114"/>
+        <UsageCount Value="113"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit17>
@@ -198 +201 @@
         <TopLine Value="39"/>
         <CursorPos X="25" Y="58"/>
-        <UsageCount Value="114"/>
+        <UsageCount Value="113"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit18>
       <Unit19>
         <Filename Value="Pages/UUserPage.pas"/>
-        <IsPartOfProject Value="True"/>
         <UnitName Value="UUserPage"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="69" Y="19"/>
-        <UsageCount Value="110"/>
+        <UsageCount Value="109"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit19>
@@ -217 +219 @@
         <TopLine Value="1"/>
         <CursorPos X="52" Y="124"/>
-        <UsageCount Value="107"/>
+        <UsageCount Value="106"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit20>
@@ -225 +227 @@
         <TopLine Value="1"/>
         <CursorPos X="19" Y="4"/>
-        <UsageCount Value="5"/>
+        <UsageCount Value="4"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit21>
@@ -231 +233 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/dynpwu.pas"/>
         <UnitName Value="dynpwu"/>
-        <EditorIndex Value="10"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="19"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="29"/>
         <CursorPos X="2" Y="38"/>
-        <UsageCount Value="35"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="34"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit22>
@@ -242 +242 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwbuffer.pas"/>
         <UnitName Value="pwbuffer"/>
-        <EditorIndex Value="11"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="67"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="62"/>
         <CursorPos X="6" Y="62"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit23>
@@ -253 +251 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwbase64enc.pas"/>
         <UnitName Value="pwbase64enc"/>
-        <EditorIndex Value="14"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="53"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="125"/>
         <CursorPos X="9" Y="141"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit24>
@@ -264 +260 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwdirutil_test.pas"/>
         <UnitName Value="pwdirutil_test"/>
-        <EditorIndex Value="12"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit25>
@@ -275 +269 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwdefaultcfg.pas"/>
         <UnitName Value="pwdefaultcfg"/>
-        <EditorIndex Value="13"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="92"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="103"/>
         <CursorPos X="29" Y="112"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit26>
@@ -286 +278 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmtils.pas"/>
         <UnitName Value="pwHTMtils"/>
-        <EditorIndex Value="15"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="12" Y="10"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit27>
@@ -300 +290 @@
         <TopLine Value="1"/>
         <CursorPos X="8" Y="1"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit28>
@@ -306 +296 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
         <UnitName Value="pwHTMw"/>
-        <EditorIndex Value="16"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1803"/>
         <CursorPos X="39" Y="1806"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit29>
@@ -320 +308 @@
         <TopLine Value="173"/>
         <CursorPos X="10" Y="192"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit30>
@@ -326 +314 @@
         <Filename Value="../../../../other/powtils/release/1.7.1/main/pwmailprep.pas"/>
         <UnitName Value="pwmailprep"/>
-        <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
         <TopLine Value="31"/>
         <CursorPos X="3" Y="49"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="11"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit31>
@@ -340 +326 @@
         <TopLine Value="2569"/>
         <CursorPos X="27" Y="2594"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit32>
@@ -349 +335 @@
         <TopLine Value="112"/>
         <CursorPos X="23" Y="125"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="20"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit33>
@@ -358 +344 @@
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="20"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit34>
@@ -365 +351 @@
         <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="562"/>
-        <CursorPos X="14" Y="579"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="254"/>
+        <CursorPos X="15" Y="268"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -377 +363 @@
         <TopLine Value="10"/>
         <CursorPos X="22" Y="23"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -388 +374 @@
         <TopLine Value="1140"/>
         <CursorPos X="26" Y="1143"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -398 +384 @@
         <TopLine Value="43"/>
         <CursorPos X="5" Y="61"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -408 +394 @@
         <TopLine Value="50"/>
         <CursorPos X="10" Y="63"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -419 +405 @@
         <WindowIndex Value="0"/>
         <TopLine Value="22"/>
-        <CursorPos X="40" Y="41"/>
-        <UsageCount Value="20"/>
+        <CursorPos X="58" Y="29"/>
+        <UsageCount Value="30"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
@@ -427 +413 @@
         <Filename Value="Common/UCGIApplication.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="20"/>
+        <UnitName Value="UCGIApplication"/>
+        <EditorIndex Value="9"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="1" Y="1"/>
+        <UsageCount Value="30"/>
+        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit41>
@@ -433 +425 @@
         <Filename Value="Common/UDatabase.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="20"/>
+        <UsageCount Value="30"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit42>
@@ -439 +431 @@
         <Filename Value="Common/UHtmlClasses.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="20"/>
+        <UnitName Value="UHtmlClasses"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="13"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="229"/>
+        <CursorPos X="76" Y="246"/>
+        <UsageCount Value="30"/>
+        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit43>
@@ -445 +444 @@
         <Filename Value="Common/USqlDatabase.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="20"/>
+        <UnitName Value="USqlDatabase"/>
+        <EditorIndex Value="11"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="1" Y="1"/>
+        <UsageCount Value="30"/>
+        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit44>
@@ -451 +456 @@
         <Filename Value="Common/UXmlClasses.pas"/>
         <IsPartOfProject Value="True"/>
-        <UsageCount Value="20"/>
+        <UnitName Value="UXmlClasses"/>
+        <EditorIndex Value="8"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="110"/>
+        <CursorPos X="1" Y="113"/>
+        <UsageCount Value="30"/>
+        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit45>
+      <Unit46>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UCustomCGIApplication"/>
+        <EditorIndex Value="12"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="24"/>
+        <CursorPos X="5" Y="38"/>
+        <UsageCount Value="30"/>
+        <Loaded Value="True"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit46>
+      <Unit47>
+        <Filename Value="/usr/share/fpcsrc/rtl/inc/varianth.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="501"/>
+        <CursorPos X="10" Y="503"/>
+        <UsageCount Value="9"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit47>
+      <Unit48>
+        <Filename Value="/usr/share/fpcsrc/rtl/inc/mathh.inc"/>
+        <EditorIndex Value="14"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="64"/>
+        <CursorPos X="14" Y="78"/>
+        <UsageCount Value="14"/>
+        <Loaded Value="True"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit48>
     </Units>
-    <JumpHistory Count="20" HistoryIndex="19">
+    <JumpHistory Count="30" HistoryIndex="28">
       <Position1>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="203" Column="24" TopLine="189"/>
       </Position1>
       <Position2>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="63" Column="6" TopLine="43"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="217" Column="14" TopLine="204"/>
       </Position2>
       <Position3>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="682" Column="1" TopLine="663"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="254" Column="13" TopLine="241"/>
       </Position3>
       <Position4>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="63" Column="8" TopLine="44"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="174" Column="1" TopLine="162"/>
       </Position4>
       <Position5>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="1399" Column="76" TopLine="1380"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="248" Column="28" TopLine="239"/>
       </Position5>
       <Position6>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="73" Column="9" TopLine="45"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="247" Column="28" TopLine="239"/>
       </Position6>
       <Position7>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="1399" Column="76" TopLine="1380"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="212" Column="16" TopLine="201"/>
       </Position7>
       <Position8>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="1837" Column="1" TopLine="1799"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="175" Column="14" TopLine="161"/>
       </Position8>
       <Position9>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="75" Column="31" TopLine="61"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="259" Column="18" TopLine="247"/>
       </Position9>
       <Position10>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwhtmw.pas"/>
-        <Caret Line="1399" Column="76" TopLine="1380"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="98" Column="86" TopLine="74"/>
       </Position10>
       <Position11>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwmailprep.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="261" Column="1" TopLine="247"/>
       </Position11>
       <Position12>
-        <Filename Value="../../../../other/powtils/release/1.7.1/main/pwmailprep.pas"/>
-        <Caret Line="49" Column="3" TopLine="29"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="98" Column="79" TopLine="84"/>
       </Position12>
       <Position13>
-        <Filename Value="index.pas"/>
-        <Caret Line="14" Column="1" TopLine="1"/>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="428" Column="34" TopLine="414"/>
       </Position13>
       <Position14>
-        <Filename Value="index.pas"/>
-        <Caret Line="45" Column="9" TopLine="19"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="98" Column="81" TopLine="84"/>
       </Position14>
       <Position15>
-        <Filename Value="index.pas"/>
-        <Caret Line="28" Column="12" TopLine="10"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="33" Column="1" TopLine="30"/>
       </Position15>
       <Position16>
-        <Filename Value="index.pas"/>
-        <Caret Line="43" Column="18" TopLine="19"/>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="91" Column="39" TopLine="77"/>
       </Position16>
       <Position17>
-        <Filename Value="index.pas"/>
-        <Caret Line="28" Column="8" TopLine="19"/>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="171" Column="29" TopLine="157"/>
       </Position17>
       <Position18>
-        <Filename Value="index.pas"/>
-        <Caret Line="24" Column="1" TopLine="11"/>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="16" Column="7" TopLine="2"/>
       </Position18>
       <Position19>
-        <Filename Value="UCore.pas"/>
-        <Caret Line="179" Column="1" TopLine="28"/>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="62" Column="18" TopLine="48"/>
       </Position19>
       <Position20>
-        <Filename Value="/usr/share/fpcsrc/rtl/unix/sysutils.pp"/>
-        <Caret Line="1143" Column="26" TopLine="1140"/>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="82" Column="18" TopLine="68"/>
       </Position20>
+      <Position21>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="139" Column="18" TopLine="125"/>
+      </Position21>
+      <Position22>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="169" Column="18" TopLine="155"/>
+      </Position22>
+      <Position23>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="217" Column="18" TopLine="203"/>
+      </Position23>
+      <Position24>
+        <Filename Value="Pages/UMainPage.pas"/>
+        <Caret Line="238" Column="16" TopLine="224"/>
+      </Position24>
+      <Position25>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="253" Column="43" TopLine="234"/>
+      </Position25>
+      <Position26>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="250" Column="1" TopLine="234"/>
+      </Position26>
+      <Position27>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="258" Column="1" TopLine="235"/>
+      </Position27>
+      <Position28>
+        <Filename Value="Application/UCustomCGIApplication.pas"/>
+        <Caret Line="90" Column="6" TopLine="75"/>
+      </Position28>
+      <Position29>
+        <Filename Value="Common/UHtmlClasses.pas"/>
+        <Caret Line="248" Column="76" TopLine="224"/>
+      </Position29>
+      <Position30>
+        <Filename Value="Common/UXmlClasses.pas"/>
+        <Caret Line="113" Column="1" TopLine="110"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
@@ -544 +625 @@
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="/usr/lib/mysql/;/usr/lib64/mysql/;Pages/;Common/"/>
+      <OtherUnitFiles Value="/usr/lib/mysql/;/usr/lib64/mysql/;Pages/;Common/;Application/"/>
       <UnitOutputDirectory Value="bin"/>
       <LCLWidgetType Value="gtk2"/>

branches/lazarus/index.pas

@@ -4 +4 @@
 
 uses
-  UCore, USqlDatabase, SysUtils,
-  UCGIApplication, UStringListEx;
-
-type
-
-  { TMyCGIApplication }
-
-  TMyCGIApplication = class(TCGIApplication)
-    procedure Execute; override;
-  end;
+  UCore, USqlDatabase, SysUtils, Contnrs,
+  UCGIApplication, UStringListEx, UMainPage, UCustomCGIApplication;
 
 var
-  Application: TMyCGIApplication;
-
-{ TMyCGIApplication }
-
-procedure TMyCGIApplication.Execute;
-var
-  I: Integer;
-  PageName: string;
-begin
-  Output.Add('Hello friend');
-  SysInfo;
-
-  PageName := Query.Values['p'];
-  if PageName = '' then PageName := 'index';
-  I := 0;
-  while (I < Length(Pages)) and (Pages[I].Name <> PageName) do Inc(I);
-  if I < Length(Pages) then Output.Add(Pages[I].Producer)
-    else Output.Add('Stránka nenalezena');
-end;
+  Application: TCustomCGIApplication;
 
 begin
-  Application := TMyCGIApplication.Create;
-  Application.Run;
-  Application.Free;
+  Application := TCustomCGIApplication.Create;
+  with Application do
+  try
+    RegisterPage('index', MainPage);
+    Run;
+  finally
+    Free;
+  end;
 end.