Changeset 146 for trunk


Ignore:
Timestamp:
Dec 29, 2023, 11:44:26 PM (12 months ago)
Author:
chronos
Message:
  • Modified: Unit names without U prefix.
Location:
trunk
Files:
4 edited
64 moved

Legend:

Unmodified
Added
Removed

  • trunk/Application/WebObjects.pas

    r145 r146  
    1 unit UWebObjects;
     1unit WebObjects;
    22
    33interface

  • trunk/Application/WebSession.pas

    r145 r146  
    1 unit UWebSession;
     1unit WebSession;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UHTTPServer, USqlDatabase, UHTTPSessionMySQL, UUser,
    7   UHtmlClasses, UWebPage, UUtils, UXmlClasses, DateUtils, UModularSystem,
     6  Classes, SysUtils, UHTTPServer, USqlDatabase, UHTTPSessionMySQL, User,
     7  UHtmlClasses, UWebPage, Utils, UXmlClasses, DateUtils, UModularSystem,
    88  UPageList, UWebApp, UGenerics;
    99
    … …  
    3838
    3939uses
    40   UCore, UModuleSystem, UModuleZdechovNET, UModuleUser, UPageAdmin, UModuleTV,
    41   UModuleFinance, UModuleNetwork, UModulePortal, UModuleIS, UModuleBase,
    42   UModuleNews, UPageNotFound;
     40  Core, ModuleSystem, ModuleZdechovNET, ModuleUser, PageAdmin, ModuleTV,
     41  ModuleFinance, ModuleNetwork, ModulePortal, ModuleIS, ModuleBase,
     42  ModuleNews, PageNotFound;
    4343
    4444resourcestring
    … …  
    111111    end;
    112112  end else begin
    113     Core.WebApp1.HTTPServer.FileResponse(Self)
     113    Core.Core.WebApp1.HTTPServer.FileResponse(Self)
    114114  end;
    115115end;

  • trunk/Common/Utils.pas

    r145 r146  
    1 unit UUtils;
     1unit Utils;
    22
    33interface
    … …  
    2020
    2121uses
    22   UCore;
     22  Core;
    2323
    2424function HtmlLink(Text, Target: string): string;
    … …  
    9696begin
    9797  if (Length(URL) > 0) and (URL[1] = '/') then
    98     Result := Core.BaseURL + URL
     98    Result := Core.Core.BaseURL + URL
    9999    else Result := URL;
    100100end;

  • trunk/Core.pas

    r145 r146  
    1 unit UCore;
     1unit Core;
    22
    33interface
    … …  
    66  Classes, SysUtils, FileUtil, LResources, UHTTPServerCGI, UHTTPSessionMySQL,
    77  UHTTPServer, USqlDatabase, INIFiles, DateUtils, UWebPage, UWebApp,
    8   UXmlClasses, UHtmlClasses, UUtils, UApplicationInfo, UHTTPServerTCP,
    9   UHTTPSessionFile, UUser, Registry, UModularSystem, UWebSession, LazUTF8;
     8  UXmlClasses, UHtmlClasses, Utils, UApplicationInfo, UHTTPServerTCP,
     9  UHTTPSessionFile, User, Registry, UModularSystem, WebSession, LazUTF8;
    1010
    1111const
    … …  
    191191initialization
    192192
    193 {$I UCore.lrs}
     193{$I Core.lrs}
    194194
    195195end.

  • trunk/Modules/Base/ModuleBase.pas

    r145 r146  
    1 unit UModuleBase;
     1unit ModuleBase;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, UModularSystem, UGenerics, UWebPage, UWebApp,
    7   UWebSession, UHTTPServer;
     7  WebSession, UHTTPServer;
    88
    99type
    … …  
    3030
    3131uses
    32   UPageAdmin;
     32  PageAdmin;
    3333
    3434{ TModuleBase }

  • trunk/Modules/Finance/ModuleFinance.pas

    r145 r146  
    1 unit UModuleFinance;
     1unit ModuleFinance;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, UModuleBase, UWebPage;
     6  Classes, SysUtils, UModularSystem, ModuleBase, UWebPage;
    77
    88type
    … …  
    2626
    2727uses
    28   UCore, UPageFinance, USqlDatabase;
     28  Core, PageFinance, USqlDatabase;
    2929
    3030{ TModuleFinance }
    … …  
    6767    DbRows := TDbRows.Create;
    6868
    69     Core.CommonDatabase.Query(DbRows,
     69    Core.Core.CommonDatabase.Query(DbRows,
    7070    'CREATE TABLE IF NOT EXISTS `FinanceTariff` (' +
    7171    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    8484    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    8585
    86     Core.CommonDatabase.Query(DbRows,
     86    Core.Core.CommonDatabase.Query(DbRows,
    8787    'CREATE TABLE IF NOT EXISTS `FinanceYear` (' +
    8888    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    9393    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    9494
    95     Core.CommonDatabase.Query(DbRows,
     95    Core.Core.CommonDatabase.Query(DbRows,
    9696    'CREATE TABLE IF NOT EXISTS `DocumentLine` (' +
    9797    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    102102    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1; ');
    103103
    104     Core.CommonDatabase.Query(DbRows,
     104    Core.Core.CommonDatabase.Query(DbRows,
    105105    'CREATE TABLE IF NOT EXISTS `DocumentLineSequence` (' +
    106106    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    114114    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    115115
    116     Core.CommonDatabase.Query(DbRows,
     116    Core.Core.CommonDatabase.Query(DbRows,
    117117    'CREATE TABLE IF NOT EXISTS `FinanceBankAccount` (' +
    118118    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    123123    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1; ');
    124124
    125     Core.CommonDatabase.Query(DbRows,
     125    Core.Core.CommonDatabase.Query(DbRows,
    126126    'CREATE TABLE IF NOT EXISTS `FinanceBillingPeriod` (' +
    127127    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    144144  try
    145145    DbRows := TDbRows.Create;
    146     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceBillingPeriod`');
    147     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceBankAccount`');
    148     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `DocumentLine`');
    149     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `DocumentLineSequence`');
    150     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceTariff`');
    151     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceYear`');
     146    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceBillingPeriod`');
     147    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceBankAccount`');
     148    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `DocumentLine`');
     149    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `DocumentLineSequence`');
     150    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceTariff`');
     151    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `FinanceYear`');
    152152  finally
    153153    DbRows.Free;

  • trunk/Modules/Finance/PageFinance.pas

    r145 r146  
    1 unit UPageFinance;
     1unit PageFinance;
    22
    33interface

  • trunk/Modules/IS/ModuleIS.pas

    r145 r146  
    1 unit UModuleIS;
     1unit ModuleIS;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, USqlDatabase, UModuleBase, UGenerics;
     6  Classes, SysUtils, UModularSystem, USqlDatabase, ModuleBase, UGenerics;
    77
    88type
    … …  
    2727
    2828uses
    29   UCore, UPagePortal;
     29  Core, PagePortal;
    3030
    3131{ TModuleIS }
    … …  
    7272    Data := TDictionaryStringString.Create;
    7373
    74     Core.CommonDatabase.Query(DbRows,
     74    Core.Core.CommonDatabase.Query(DbRows,
    7575    'CREATE TABLE IF NOT EXISTS `User` (' +
    7676    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    9191    Data.Add('Salt', '');
    9292    Data.Add('Email', '');
    93     Core.CommonDatabase.Insert('User', Data);
     93    Core.Core.CommonDatabase.Insert('User', Data);
    9494
    95     Core.CommonDatabase.Query(DbRows,
     95    Core.Core.CommonDatabase.Query(DbRows,
    9696    'CREATE TABLE IF NOT EXISTS `UserOnline` (' +
    9797    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    120120  try
    121121    DbRows := TDbRows.Create;
    122     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `User`');
    123     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `UserOnline`');
     122    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `User`');
     123    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `UserOnline`');
    124124  finally
    125125    DbRows.Free;

  • trunk/Modules/Network/ModuleNetwork.pas

    r145 r146  
    1 unit UModuleNetwork;
     1unit ModuleNetwork;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, UModuleBase,
    7   UWebPage;
     6  Classes, SysUtils, UModularSystem, ModuleBase, UWebPage;
    87
    98type
    … …  
    2928
    3029uses
    31   UCore, UPageNetwork, USqlDatabase;
     30  Core, PageNetwork, USqlDatabase;
    3231
    3332{ TModuleNetwork }
    … …  
    7574    DbRows := TDbRows.Create;
    7675
    77     Core.CommonDatabase.Query(DbRows,
     76    Core.Core.CommonDatabase.Query(DbRows,
    7877    'CREATE TABLE IF NOT EXISTS `NetworkConfiguration` (' +
    7978    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    8988    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1; ');
    9089
    91     Core.CommonDatabase.Query(DbRows,
     90    Core.Core.CommonDatabase.Query(DbRows,
    9291    'CREATE TABLE IF NOT EXISTS `NetworkDevice` (' +
    9392    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    110109    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    111110
    112     Core.CommonDatabase.Query(DbRows,
     111    Core.Core.CommonDatabase.Query(DbRows,
    113112    'CREATE TABLE IF NOT EXISTS `NetworkInterface` (' +
    114113    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    127126    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    128127
    129     Core.CommonDatabase.Query(DbRows,
     128    Core.Core.CommonDatabase.Query(DbRows,
    130129    'CREATE TABLE IF NOT EXISTS `NetworkInterfaceType` (' +
    131130    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    137136    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    138137
    139     Core.CommonDatabase.Query(DbRows,
     138    Core.Core.CommonDatabase.Query(DbRows,
    140139    'CREATE TABLE IF NOT EXISTS `NetworkDeviceType` (' +
    141140    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    159158  try
    160159    DbRows := TDbRows.Create;
    161     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkInterfaceType`');
    162     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkInterface`');
    163     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkDeviceType`');
    164     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkDevice`');
    165     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkConfiguration`');
     160    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkInterfaceType`');
     161    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkInterface`');
     162    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkDeviceType`');
     163    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkDevice`');
     164    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NetworkConfiguration`');
    166165  finally
    167166    DbRows.Free;

  • trunk/Modules/Network/PageNetwork.pas

    r145 r146  
    1 unit UPageNetwork;
     1unit PageNetwork;
    22
    33interface

  • trunk/Modules/News/ModuleNews.pas

    r145 r146  
    1 unit UModuleNews;
     1unit ModuleNews;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, UModuleBase, UNews, UHTTPServer, UModuleUser;
     6  Classes, SysUtils, UModularSystem, ModuleBase, News, UHTTPServer, ModuleUser;
    77
    88type
    … …  
    2727
    2828uses
    29   UCore, UUserControlPage, USqlDatabase;
     29  Core, UserControlPage, USqlDatabase;
    3030
    3131{ TModuleNews }
    … …  
    8383    DbRows := TDbRows.Create;
    8484
    85     Core.CommonDatabase.Query(DbRows,
     85    Core.Core.CommonDatabase.Query(DbRows,
    8686    'CREATE TABLE IF NOT EXISTS `News` (' +
    8787    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    103103    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    104104
    105     Core.CommonDatabase.Query(DbRows,
     105    Core.Core.CommonDatabase.Query(DbRows,
    106106    'CREATE TABLE IF NOT EXISTS `NewsCategory` (' +
    107107    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    116116    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1; ');
    117117
    118     Core.CommonDatabase.Query(DbRows,
     118    Core.Core.CommonDatabase.Query(DbRows,
    119119    'ALTER TABLE `News`' +
    120120    '  ADD CONSTRAINT `News_ibfk_1` FOREIGN KEY (`Category`) REFERENCES `NewsCategory` (`Id`);');
    … …  
    133133    DbRows := TDbRows.Create;
    134134
    135     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `News`');
    136     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NewsGroup`');
     135    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `News`');
     136    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `NewsGroup`');
    137137  finally
    138138    DbRows.Free;

  • trunk/Modules/News/News.pas

    r145 r146  
    1 unit UNews;
     1unit News;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, USqlDatabase, UModuleUser, UUtils, Generics.Collections, UWebSession,
    7   UHTTPServer, UModuleBase, UCommon;
     6  Classes, SysUtils, USqlDatabase, ModuleUser, Utils, Generics.Collections, WebSession,
     7  UHTTPServer, ModuleBase, UCommon;
    88
    99type

  • trunk/Modules/Portal/ModulePortal.pas

    r145 r146  
    1 unit UModulePortal;
     1unit ModulePortal;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, USqlDatabase, UUtils, UWebSession, UUser,
    7   UWebPage, UHtmlClasses, UModuleBase, UModuleUser, UModuleNews, UGenerics;
     6  Classes, SysUtils, UModularSystem, USqlDatabase, Utils, WebSession, User,
     7  UWebPage, UHtmlClasses, ModuleBase, ModuleUser, ModuleNews, UGenerics;
    88
    99type
    … …  
    3434
    3535uses
    36   UCore, UPagePortal;
     36  Core, PagePortal;
    3737
    3838{ TModulePortal }
    … …  
    8686    DbRows := TDbRows.Create;
    8787
    88     Core.CommonDatabase.Query(DbRows,
     88    Core.Core.CommonDatabase.Query(DbRows,
    8989    'CREATE TABLE IF NOT EXISTS `Panel` (' +
    9090    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    9797    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    9898
    99     Core.CommonDatabase.Query(DbRows,
     99    Core.Core.CommonDatabase.Query(DbRows,
    100100    'CREATE TABLE IF NOT EXISTS `PanelColumn` (' +
    101101    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    104104    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    105105
    106     Core.CommonDatabase.Query(DbRows,
     106    Core.Core.CommonDatabase.Query(DbRows,
    107107    'ALTER TABLE `Panel`' +
    108108    '  ADD CONSTRAINT `Panel_ibfk_1` FOREIGN KEY (`PanelColumn`) REFERENCES `panelcolumn` (`Id`);');
    109109
    110     Core.CommonDatabase.Query(DbRows,
     110    Core.Core.CommonDatabase.Query(DbRows,
    111111    'CREATE TABLE IF NOT EXISTS `HyperlinkGroup` (' +
    112112    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    115115    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    116116
    117     Core.CommonDatabase.Query(DbRows,
     117    Core.Core.CommonDatabase.Query(DbRows,
    118118    'CREATE TABLE IF NOT EXISTS `Hyperlink` (' +
    119119    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    130130    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    131131
    132     Core.CommonDatabase.Query(DbRows,
     132    Core.Core.CommonDatabase.Query(DbRows,
    133133    'ALTER TABLE `Hyperlink`' +
    134134    '  ADD CONSTRAINT `Hyperlink_ibfk_1` FOREIGN KEY (`Group`) REFERENCES `hyperlinkgroup` (`Id`);');
    … …  
    147147  try
    148148    DbRows := TDbRows.Create;
    149     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Panel`');
    150     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PanelColumn`');
    151     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Hyperlink`');
    152     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `HyperlinkGroup`');
     149    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Panel`');
     150    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PanelColumn`');
     151    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Hyperlink`');
     152    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `HyperlinkGroup`');
    153153  finally
    154154    DbRows.Free;
    … …  
    185185    //PathTreeItem := PathTree;
    186186    //Navigation := '<a href="' + NavigationLink(PathTreePath) + '">' + PathTreeItem[0] + '</a> &gt; ';
    187     ScriptName := Copy(ScriptName, Length(Core.BaseURL), Length(ScriptName));
     187    ScriptName := Copy(ScriptName, Length(Core.Core.BaseURL), Length(ScriptName));
    188188    ScriptNameParts.Explode('/', ScriptName);
    189189    ScriptNameParts.Delete(0);
    … …  
    210210    //if(isset($this->Load)) BodyParam := BodyParam + ' onload="'.$this->Load.'"';
    211211    //if(isset($this->Unload)) BodyParam := BodyParam + ' onunload="'.$this->Unload.'"';
    212     Output := '<?xml version="1.0" encoding="' + Core.Charset + '"?>' + LineEnding +
     212    Output := '<?xml version="1.0" encoding="' + Core.Core.Charset + '"?>' + LineEnding +
    213213    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' +
    214214    '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">' +
    215     '<head><link rel="stylesheet" href="' + NavigationLink('/style/' + Core.Style + '/style.css') + '" type="text/css" media="all" />' +
    216     '<meta http-equiv="content-type" content="application/xhtml+xml; charset=' + Core.Charset + '" />' +
    217     '<script type="text/javascript" src="' + Core.BaseURL + '/style/' + Core.Style + '/global.js"></script>' +
     215    '<head><link rel="stylesheet" href="' + NavigationLink('/style/' + Core.Core.Style + '/style.css') + '" type="text/css" media="all" />' +
     216    '<meta http-equiv="content-type" content="application/xhtml+xml; charset=' + Core.Core.Charset + '" />' +
     217    '<script type="text/javascript" src="' + Core.Core.BaseURL + '/style/' + Core.Core.Style + '/global.js"></script>' +
    218218    '<title>' + Session.GlobalTitle + ' - ' + Path + '</title>' +
    219219    '</head><body' + BodyParam + '>' +
    … …  
    275275  //Time := Round(Now - $ScriptTimeStart, 2);
    276276  Result := Result + '<div id="Footer">' +
    277     '<i>| Správa webu: ' + Core.Admin + ' | e-mail: ' + Core.AdminEmail + ' |';
     277    '<i>| Správa webu: ' + Core.Core.Admin + ' | e-mail: ' + Core.Core.AdminEmail + ' |';
    278278//    if Core.ShowRuntimeInfo then Output := Output + ' Doba generování: ' +
    279279//     Time + ' s / ' + ini_get('max_execution_time') + ' s | Použitá paměť: ' +

  • trunk/Modules/Portal/PagePortal.pas

    r145 r146  
    1 unit UPagePortal;
     1unit PagePortal;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
    7   UGenerics, UWebSession, UHtmlClasses, UModularSystem, UModuleUser,
    8   UModuleNews;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, Utils,
     7  UGenerics, WebSession, UHtmlClasses, UModularSystem, ModuleUser,
     8  ModuleNews;
    99
    1010type
    … …  
    3737
    3838uses
    39   UCore, UWebObjects, UUser;
     39  Core, WebObjects, User;
    4040
    4141function TWebPagePortal.SystemMessage(Title, Text: string): string;

  • trunk/Modules/System/ModuleSystem.pas

    r145 r146  
    1 unit UModuleSystem;
     1unit ModuleSystem;
    22
    33interface
    … …  
    2828
    2929uses
    30   UCore, USqlDatabase;
     30  Core, USqlDatabase;
    3131
    3232{ TModuleSystem }
    … …  
    4242    if Module.Installed then Data.Add('Installed', '1')
    4343      else Data.Add('Installed', '0');
    44     Core.CommonDatabase.Update('SystemModule', Data, 'Name="' + Module.Identification + '"');
     44    Core.Core.CommonDatabase.Update('SystemModule', Data, 'Name="' + Module.Identification + '"');
    4545  finally
    4646    Data.Free;
    … …  
    7272  try
    7373    DbRows := TDbRows.Create;
    74     Core.CommonDatabase.Select(DbRows, 'SystemModule', '`Name`, `Installed`');
     74    Core.Core.CommonDatabase.Select(DbRows, 'SystemModule', '`Name`, `Installed`');
    7575    for I := 0 to DbRows.Count - 1 do
    7676    with DbRows[I] do begin
    … …  
    100100  try
    101101    DbRows := TDbRows.Create;
    102     Core.CommonDatabase.Query(DbRows,
     102    Core.Core.CommonDatabase.Query(DbRows,
    103103      'CREATE TABLE IF NOT EXISTS `SystemModule` (' +
    104104      '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    127127  try
    128128    DbRows := TDbRows.Create;
    129     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `SystemModule`');
     129    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `SystemModule`');
    130130  finally
    131131    DbRows.Free;
    … …  
    149149    Data := TDictionaryStringString.Create;
    150150
    151     Core.CommonDatabase.Select(DbRows, 'SystemModule', 'Name');
     151    Core.Core.CommonDatabase.Select(DbRows, 'SystemModule', 'Name');
    152152
    153153    for I := 0 to Manager.Modules.Count - 1 do
    … …  
    166166      Index := 0;
    167167      while (Index < DbRows.Count) and (DbRows[Index].Items['Name'] <> Identification) do Inc(Index);
    168       if Index >= DbRows.Count then Core.CommonDatabase.Insert('SystemModule', Data)
    169         else Core.CommonDatabase.Update('SystemModule', Data, 'Name="' + Identification + '"');
     168      if Index >= DbRows.Count then Core.Core.CommonDatabase.Insert('SystemModule', Data)
     169        else Core.Core.CommonDatabase.Update('SystemModule', Data, 'Name="' + Identification + '"');
    170170    end;
    171171  finally

  • trunk/Modules/TV/ModuleTV.pas

    r145 r146  
    1 unit UModuleTV;
     1unit ModuleTV;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, UModuleBase, UWebPage;
     6  Classes, SysUtils, UModularSystem, ModuleBase, UWebPage;
    77
    88type
    … …  
    2828
    2929uses
    30   UCore, UPageTV, USqlDatabase;
     30  Core, PageTV, USqlDatabase;
    3131
    3232{ TModuleTV }
    … …  
    7373    DbRows := TDbRows.Create;
    7474
    75     Core.CommonDatabase.Query(DbRows,
     75    Core.Core.CommonDatabase.Query(DbRows,
    7676    'CREATE TABLE IF NOT EXISTS `TV` (' +
    7777    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    102102  try
    103103    DbRows := TDbRows.Create;
    104     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `TV`');
     104    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `TV`');
    105105  finally
    106106    DbRows.Free;

  • trunk/Modules/TV/PageTV.pas

    r145 r146  
    1 unit UPageTV;
     1unit PageTV;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UHtmlClasses,
    7   UUtils, UModuleUser;
     7  Utils, ModuleUser;
    88
    99type
    … …  
    2929
    3030uses
    31   UCore, UWebSession;
     31  Core, WebSession;
    3232
    3333{ TWebPageTV }

  • trunk/Modules/TV/Playlist.pas

    r145 r146  
    1 unit UPlaylist;
     1unit Playlist;
    22
    33interface

  • trunk/Modules/User/ModuleUser.pas

    r145 r146  
    1 unit UModuleUser;
     1unit ModuleUser;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, UUser, UModuleBase, UWebPage;
     6  Classes, SysUtils, UModularSystem, User, ModuleBase, UWebPage;
    77
    88type
    … …  
    3030
    3131uses
    32   UCore, USqlDatabase, UUserControlPage;
     32  Core, USqlDatabase, UserControlPage;
    3333
    3434{ TModuleUser }
    … …  
    8484    DbRows := TDbRows.Create;
    8585
    86     Core.CommonDatabase.Query(DbRows,
     86    Core.Core.CommonDatabase.Query(DbRows,
    8787    'CREATE TABLE IF NOT EXISTS `User` (' +
    8888    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    9696    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
    9797
    98     Core.CommonDatabase.Query(DbRows,
     98    Core.Core.CommonDatabase.Query(DbRows,
    9999    'CREATE TABLE IF NOT EXISTS `UserOnline` (' +
    100100    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    110110    ') ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    111111
    112     Core.CommonDatabase.Query(DbRows,
     112    Core.Core.CommonDatabase.Query(DbRows,
    113113    'CREATE TABLE IF NOT EXISTS `PermissionGroup` (' +
    114114    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    117117    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    118118
    119     Core.CommonDatabase.Query(DbRows,
     119    Core.Core.CommonDatabase.Query(DbRows,
    120120    'CREATE TABLE IF NOT EXISTS `PermissionGroupAssignment` (' +
    121121    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    129129    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    130130
    131     Core.CommonDatabase.Query(DbRows,
     131    Core.Core.CommonDatabase.Query(DbRows,
    132132    'CREATE TABLE IF NOT EXISTS `PermissionOperation` (' +
    133133    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    143143    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    144144
    145     Core.CommonDatabase.Query(DbRows,
     145    Core.Core.CommonDatabase.Query(DbRows,
    146146    '  CREATE TABLE IF NOT EXISTS `PermissionUserAssignment` (' +
    147147    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    155155    ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    156156
    157     Core.CommonDatabase.Query(DbRows,
     157    Core.Core.CommonDatabase.Query(DbRows,
    158158    'ALTER TABLE `PermissionGroupAssignment`' +
    159159    '  ADD CONSTRAINT `PermissionGroupAssignment_ibfk_1` FOREIGN KEY (`Group`) REFERENCES `permissiongroup` (`Id`),' +
    … …  
    161161    '  ADD CONSTRAINT `PermissionGroupAssignment_ibfk_3` FOREIGN KEY (`AssignedOperation`) REFERENCES `permissionoperation` (`Id`);');
    162162
    163     Core.CommonDatabase.Query(DbRows,
     163    Core.Core.CommonDatabase.Query(DbRows,
    164164    'ALTER TABLE `PermissionUserAssignment`' +
    165165    '  ADD CONSTRAINT `PermissionUserAssignment_ibfk_1` FOREIGN KEY (`User`) REFERENCES `user` (`Id`),' +
    … …  
    180180    DbRows := TDbRows.Create;
    181181
    182     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionUserAssignment`');
    183     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroupAssignment`');
    184     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroup`');
    185     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionOperation`');
    186     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `User`');
    187     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `UserOnline`');
     182    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionUserAssignment`');
     183    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroupAssignment`');
     184    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionGroup`');
     185    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PermissionOperation`');
     186    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `User`');
     187    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `UserOnline`');
    188188  finally
    189189    DbRows.Free;

  • trunk/Modules/User/User.pas

    r145 r146  
    1 unit UUser;
     1unit User;
    22
    33interface

  • trunk/Modules/User/UserControlPage.pas

    r145 r146  
    1 unit UUserControlPage;
     1unit UserControlPage;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UXmlClasses,
    7   UWebObjects, UModuleUser, UModuleBase;
     7  WebObjects, ModuleUser, ModuleBase;
    88
    99type
    … …  
    3232
    3333uses
    34   UCore, UUtils, UUser, UWebSession;
     34  Core, Utils, User, WebSession;
    3535
    3636  { TUserControlPage }
    … …  
    6363  UserId: Integer;
    6464begin
    65   with TWebSession(HandlerData), Core, HtmlDocument.Body do begin
     65  with TWebSession(HandlerData), Core.Core, HtmlDocument.Body do begin
    6666    Form := TQueryForm.Create;
    6767    with Form do begin
    … …  
    108108  UserId: Integer;
    109109begin
    110   with TWebSession(HandlerData), Core, HtmlDocument.Body do begin
     110  with TWebSession(HandlerData), Core.Core, HtmlDocument.Body do begin
    111111    Form := TQueryForm.Create;
    112112    with Form do begin
    … …  
    162162procedure TUserControlPage.HandleLogout(HandlerData: THTTPHandlerData);
    163163begin
    164   with TWebSession(HandlerData), Core, HtmlDocument.Body do begin
     164  with TWebSession(HandlerData), Core.Core, HtmlDocument.Body do begin
    165165    ModuleUser.UserOnline.Logout;
    166166    with SubItems.AddString do

  • trunk/Modules/ZdechovNET/AboutPage.pas

    r145 r146  
    1 unit UAboutPage;
     1unit AboutPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UUtils, UWebSession, USqlDatabase;
     27  Core, Utils, WebSession, USqlDatabase;
    2828
    2929{ TAboutPage }

  • trunk/Modules/ZdechovNET/ContactPage.pas

    r145 r146  
    1 unit UContactPage;
     1unit ContactPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UWebSession;
     27  Core, WebSession;
    2828
    2929procedure TContactPage.DataModuleProduce(HandlerData: THTTPHandlerData);

  • trunk/Modules/ZdechovNET/DocumentsPage.pas

    r145 r146  
    1 unit UDocumentsPage;
     1unit DocumentsPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UUtils, UWebSession;
     27  Core, Utils, WebSession;
    2828
    2929{ TDocumentsPage }

  • trunk/Modules/ZdechovNET/HistoryPage.pas

    r145 r146  
    1 unit UHistoryPage;
     1unit HistoryPage;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, USqlDatabase,
    7   UModuleUser;
     7  ModuleUser;
    88
    99type
    … …  
    2626
    2727uses
    28   UCore, UUtils, UWebSession;
     28  Core, Utils, WebSession;
    2929
    3030{ THistoryPage }

  • trunk/Modules/ZdechovNET/HostingPage.pas

    r145 r146  
    1 unit UHostingPage;
     1unit HostingPage;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UHtmlClasses,
    7   UModuleUser;
     7  ModuleUser;
    88
    99type
    … …  
    2626
    2727uses
    28   UCore, UWebSession;
     28  Core, WebSession;
    2929
    3030{ THostingPage }

  • trunk/Modules/ZdechovNET/IPTVPage.pas

    r145 r146  
    1 unit UIPTVPage;
     1unit IPTVPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UModuleUser,
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, ModuleUser,
    77  Generics.Collections;
    88
    … …  
    4444
    4545uses
    46   UCore, UHtmlClasses, UWebSession;
     46  Core, UHtmlClasses, WebSession;
    4747
    4848{ TChannels }

  • trunk/Modules/ZdechovNET/InternetPage.lfm

    r145 r146  
    11object InternetPage: TInternetPage
    22  OldCreateOrder = False
     3  Raw = False
    34  Caption = 'Internet'
    45  OnProduce = DataModuleProduce

  • trunk/Modules/ZdechovNET/InternetPage.pas

    r145 r146  
    1 unit UInternetPage;
     1unit InternetPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UHtmlClasses, UWebSession;
     27  Core, UHtmlClasses, WebSession;
    2828
    2929{ TInternetPage }
    … …  
    4545      '<table class="WideTable">' +
    4646      '<tr><th>Označení</th><th>Minimální rychlost</th><th>Běžně dostupná rychlost</th><th>Maximální rychlost</th><th>Bonusová rychlost</th><th>Cena</th></tr>' +
    47       '<tr><td>Zdarma</td><td align="center">0</td><td align="center">&nbsp;</td><td align="center">256 kbit/s</td><td align="center">&nbsp;</td><td align="center">0 Kč</td></tr>' +
    48       '<tr><td>Internet 20M</td><td align="center">6 Mbit/s</td><td align="center">12 Mbit/s</td><td align="center">20 Mbit/s</td><td align="center">240 Mbit/s</td><td align="center">190 Kč</td></tr>' +
    49       '<tr><td>Internet 40M</td><td align="center">12 Mbit/s</td><td align="center">24 Mbit/s</td><td align="center">40 Mbit/s</td><td align="center">240 Mbit/s</td><td align="center">260 Kč</td></tr>' +
    50       '<tr><td>Internet 60M</td><td align="center">18 Mbit/s</td><td align="center">36 Mbit/s</td><td align="center">60 Mbit/s</td><td align="center">240 Mbit/s</td><td align="center">360 Kč</td></tr>' +
    51       '<tr><td>Internet 80M</td><td align="center">24 Mbit/s</td><td align="center">48 Mbit/s</td><td align="center">80 Mbit/s</td><td align="center">240 Mbit/s</td><td align="center">520 Kč</td></tr>' +
    52       '<tr><td>Internet 100M</td><td align="center">30 Mbit/s</td><td align="center">60 Mbit/s</td><td align="center">100 Mbit/s</td><td align="center">240 Mbit/s</td><td align="center">750 Kč</td></tr>' +
     47      '<tr><td>Zdarma</td><td align="center">0</td><td align="center">&nbsp;</td><td align="center">1 Mbit/s</td><td align="center">&nbsp;</td><td align="center">0 Kč</td></tr>' +
     48      '<tr><td>Internet 50M</td><td align="center">16 Mbit/s</td><td align="center">30 Mbit/s</td><td align="center">50 Mbit/s</td><td align="center">250 Mbit/s</td><td align="center">190 Kč</td></tr>' +
     49      '<tr><td>Internet 100M</td><td align="center">30 Mbit/s</td><td align="center">60 Mbit/s</td><td align="center">100 Mbit/s</td><td align="center">250 Mbit/s</td><td align="center">260 Kč</td></tr>' +
     50      '<tr><td>Internet 150M</td><td align="center">45 Mbit/s</td><td align="center">90 Mbit/s</td><td align="center">150 Mbit/s</td><td align="center">250 Mbit/s</td><td align="center">360 Kč</td></tr>' +
     51      '<tr><td>Internet 200M</td><td align="center">60 Mbit/s</td><td align="center">120 Mbit/s</td><td align="center">200 Mbit/s</td><td align="center">250 Mbit/s</td><td align="center">520 Kč</td></tr>' +
     52      '<tr><td>Internet 250M</td><td align="center">75 Mbit/s</td><td align="center">150 Mbit/s</td><td align="center">250 Mbit/s</td><td align="center">250 Mbit/s</td><td align="center">750 Kč</td></tr>' +
    5353      '</table>' +
    5454      '<br/>' +
    … …  
    5858      'Bonusová rychlost je negarantovaná rychlost ze společné sdílené kapacity, na kterou může rychlost stoupnout nad rámec maximální rychlosti.<br/>' +
    5959      '<br/>' +
    60       '<i>Ceny platné od: 1.1.2021</i><br/>' +
     60      '<i>Ceny platné od: 1.1.2024</i><br/>' +
    6161      '<br/>' +
    6262      '<strong>Maximální rychlosti pro jednotlivé technologie:</strong><br/>' +
    6363      '<ul>' +
    6464      '<li>Kabelové připojení Ethernet - 100 Mbit/s nebo 1 Gbit/s</li>' +
    65       '<li>Bezdrátové připojení Wifi 802.11g - 20 Mbit/s</li>' +
    66       '<li>Bezdrátové připojení Wifi 802.11n - 100 Mbit/s</li>' +
    67       '<li>Bezdrátové připojení Wifi 802.11ac - 200 Mbit/s</li>' +
     65      '<li>Bezdrátové připojení Wifi 2,4 GHz (802.11g) - 20 Mbit/s</li>' +
     66      '<li>Bezdrátové připojení Wifi 5 GHz (802.11n) - 100 Mbit/s</li>' +
     67      '<li>Bezdrátové připojení Wifi 5 GHz (802.11ac) - 200 Mbit/s</li>' +
     68      '<li>Bezdrátové připojení Wifi 60 GHz (802.11ad) - 1000 Mbit/s</li>' +
    6869      '</ul>' +
    6970      'Podle minimální a maximální rychlosti se také určuje poměrově přerozdělení sdílené rychlosti při vytížené lince. ' +
    … …  
    7778      '<i>V případě velkých odchylek od běžně dostupné rychlosti stahování nebo vkládání dat, má účastník právo službu reklamovat.</i><br/>' +
    7879      '<br/>' +
    79       'Aktualizováno: 1.1.2023';
     80      'Aktualizováno: 1.1.2024';
    8081    end;
    8182    GeneratePage(Self);

  • trunk/Modules/ZdechovNET/LinksPage.pas

    r145 r146  
    1 unit ULinksPage;
     1unit LinksPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UWebSession;
     27  Core, WebSession;
    2828
    2929{ TLinksPage }

  • trunk/Modules/ZdechovNET/ModuleZdechovNET.pas

    r145 r146  
    1 unit UModuleZdechovNET;
     1unit ModuleZdechovNET;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, UModularSystem, UWebPage, URobotsPage,
    7   UWebSession, DateUtils, UModuleBase, UModuleUser, UIPTVPage,
    8   UInternetPage, UHostingPage, UHistoryPage, UDocumentsPage, UVoIPPage,
    9   ULinksPage, UPlansPage, UServerInfoPage, UWebCamPage, UUser,
    10   UNetworkPage, UAboutPage, UContactPage, UProjectsPage;
     6  Classes, SysUtils, UModularSystem, UWebPage, RobotsPage,
     7  WebSession, DateUtils, ModuleBase, ModuleUser, IPTVPage,
     8  InternetPage, HostingPage, HistoryPage, DocumentsPage, VoIPPage,
     9  LinksPage, PlansPage, ServerInfoPage, WebCamPage, User,
     10  NetworkPage, AboutPage, ContactPage, ProjectsPage;
    1111
    1212type
    … …  
    4949
    5050uses
    51   UCore, USqlDatabase, UXmlClasses, UHtmlClasses, UUtils;
     51  Core, USqlDatabase, UXmlClasses, UHtmlClasses, Utils;
    5252
    5353{ TModuleZdechovNET }
    … …  
    169169    DbRows := TDbRows.Create;
    170170
    171     Core.CommonDatabase.Query(DbRows,
     171    Core.Core.CommonDatabase.Query(DbRows,
    172172    'CREATE TABLE IF NOT EXISTS `VPSHosting` (' +
    173173    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    181181    ') ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
    182182
    183     Core.CommonDatabase.Query(DbRows,
     183    Core.Core.CommonDatabase.Query(DbRows,
    184184    'CREATE TABLE IF NOT EXISTS `History` (' +
    185185    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    189189    ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    190190
    191     Core.CommonDatabase.Query(DbRows,
     191    Core.Core.CommonDatabase.Query(DbRows,
    192192    'CREATE TABLE IF NOT EXISTS `Webcam` (' +
    193193    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    204204    ') ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
    205205
    206     Core.CommonDatabase.Query(DbRows,
     206    Core.Core.CommonDatabase.Query(DbRows,
    207207    '  CREATE TABLE IF NOT EXISTS `Plans` (' +
    208208    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    217217    ') ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
    218218
    219     Core.CommonDatabase.Query(DbRows,
     219    Core.Core.CommonDatabase.Query(DbRows,
    220220    'CREATE TABLE IF NOT EXISTS `HostedProject` (' +
    221221    '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
    … …  
    245245  try
    246246    DbRows := TDbRows.Create;
    247     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `HostedProject`');
    248     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Plans`');
    249     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Webcam`');
    250     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `VPSHosting`');
    251     Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `History`');
     247    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `HostedProject`');
     248    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Plans`');
     249    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Webcam`');
     250    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `VPSHosting`');
     251    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `History`');
    252252  finally
    253253    DbRows.Free;

  • trunk/Modules/ZdechovNET/NetworkPage.pas

    r145 r146  
    1 unit UNetworkPage;
     1unit NetworkPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UUtils, UWebSession;
     27  Core, Utils, WebSession;
    2828
    2929{ TNetworkPage }

  • trunk/Modules/ZdechovNET/PlansPage.pas

    r145 r146  
    1 unit UPlansPage;
     1unit PlansPage;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHtmlClasses, UHTTPServer, USqlDatabase,
    7   UModuleUser;
     7  ModuleUser;
    88
    99type
    … …  
    2626
    2727uses
    28   UCore, UWebSession;
     28  Core, WebSession;
    2929
    3030{ TPlansPage }

  • trunk/Modules/ZdechovNET/ProjectsPage.pas

    r145 r146  
    1 unit UProjectsPage;
     1unit ProjectsPage;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHtmlClasses, UHTTPServer, USqlDatabase,
    7   UModuleUser;
     7  ModuleUser;
    88
    99type
    … …  
    2626
    2727uses
    28   UCore, UWebSession;
     28  Core, WebSession;
    2929
    3030{ TProjectsPage }

  • trunk/Modules/ZdechovNET/RobotsPage.pas

    r145 r146  
    1 unit URobotsPage;
     1unit RobotsPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UUtils, UWebSession, USqlDatabase;
     27  Core, Utils, WebSession, USqlDatabase;
    2828
    2929{ TRobotsPage }

  • trunk/Modules/ZdechovNET/VoIPPage.lfm

    r145 r146  
    11object VoIPPage: TVoIPPage
    22  OldCreateOrder = False
     3  Raw = False
    34  Caption = 'VoIP'
    45  OnProduce = DataModuleProduce

  • trunk/Modules/ZdechovNET/VoIPPage.pas

    r145 r146  
    1 unit UVoIPPage;
     1unit VoIPPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UHtmlClasses, UHTTPServer, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UHtmlClasses, UHTTPServer, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UWebSession;
     27  Core, WebSession;
    2828
    2929{ TVoIPPage }

  • trunk/Modules/ZdechovNET/WebCamPage.pas

    r145 r146  
    1 unit UWebCamPage;
     1unit WebCamPage;
    22
    33interface
    … …  
    55uses
    66  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, USqlDatabase,
    7   UModuleUser, DateUtils;
     7  ModuleUser, DateUtils;
    88
    99type
    … …  
    3232
    3333uses
    34   UCore, UUtils, UWebSession;
     34  Core, Utils, WebSession;
    3535
    3636

  • trunk/Pages/PageAdmin.pas

    r145 r146  
    1 unit UPageAdmin;
     1unit PageAdmin;
    22
    33interface
    … …  
    2929
    3030uses
    31   UCore, UXmlClasses, UHtmlClasses, UUtils, USqlDatabase, UModularSystem,
    32   UModuleSystem, UWebSession;
     31  Core, UXmlClasses, UHtmlClasses, Utils, USqlDatabase, UModularSystem,
     32  ModuleSystem, WebSession;
    3333
    3434{$R *.lfm}

  • trunk/Pages/PageNotFound.pas

    r145 r146  
    1 unit UPageNotFound;
     1unit PageNotFound;
    22
    33interface
    … …  
    2323
    2424uses
    25   UWebSession;
     25  WebSession;
    2626
    2727{ TPageNotFound }

  • trunk/Pages/ServerInfoPage.pas

    r145 r146  
    1 unit UServerInfoPage;
     1unit ServerInfoPage;
    22
    33interface
    44
    55uses
    6   Classes, SysUtils, FileUtil, UWebPage, UWebApp, UHTTPServer, UModuleUser;
     6  Classes, SysUtils, FileUtil, UWebPage, UWebApp, UHTTPServer, ModuleUser;
    77
    88type
    … …  
    2525
    2626uses
    27   UCore, UWebSession;
     27  Core, WebSession;
    2828
    2929{ TServerInfoPage }

  • trunk/ZdechovNET.lpi

    r143 r146  
    124124      </Unit0>
    125125      <Unit1>
    126         <Filename Value="Common/UUtils.pas"/>
     126        <Filename Value="Common/Utils.pas"/>
    127127        <IsPartOfProject Value="True"/>
    128128      </Unit1>
    129129      <Unit2>
    130         <Filename Value="Application/UWebObjects.pas"/>
     130        <Filename Value="Application/WebObjects.pas"/>
    131131        <IsPartOfProject Value="True"/>
    132132      </Unit2>
    133133      <Unit3>
    134         <Filename Value="Pages/UServerInfoPage.pas"/>
     134        <Filename Value="Pages/ServerInfoPage.pas"/>
    135135        <IsPartOfProject Value="True"/>
    136136        <ComponentName Value="ServerInfoPage"/>
    … …  
    143143      </Unit4>
    144144      <Unit5>
    145         <Filename Value="Modules/User/UModuleUser.pas"/>
     145        <Filename Value="Modules/User/ModuleUser.pas"/>
    146146        <IsPartOfProject Value="True"/>
    147147      </Unit5>
    148148      <Unit6>
    149         <Filename Value="UCore.pas"/>
     149        <Filename Value="Core.pas"/>
    150150        <IsPartOfProject Value="True"/>
    151151        <ComponentName Value="Core"/>
    … …  
    154154      </Unit6>
    155155      <Unit7>
    156         <Filename Value="Modules/User/UUserControlPage.pas"/>
     156        <Filename Value="Modules/User/UserControlPage.pas"/>
    157157        <IsPartOfProject Value="True"/>
    158158        <ComponentName Value="UserControlPage"/>
    … …  
    161161      </Unit7>
    162162      <Unit8>
    163         <Filename Value="Modules/System/UModuleSystem.pas"/>
     163        <Filename Value="Modules/System/ModuleSystem.pas"/>
    164164        <IsPartOfProject Value="True"/>
    165165      </Unit8>
    166166      <Unit9>
    167         <Filename Value="Pages/UPageAdmin.pas"/>
     167        <Filename Value="Pages/PageAdmin.pas"/>
    168168        <IsPartOfProject Value="True"/>
    169169        <ComponentName Value="PageAdmin"/>
    … …  
    172172      </Unit9>
    173173      <Unit10>
    174         <Filename Value="Modules/ZdechovNET/UModuleZdechovNET.pas"/>
     174        <Filename Value="Modules/ZdechovNET/ModuleZdechovNET.pas"/>
    175175        <IsPartOfProject Value="True"/>
    176176      </Unit10>
    177177      <Unit11>
    178         <Filename Value="Modules/ZdechovNET/UAboutPage.pas"/>
     178        <Filename Value="Modules/ZdechovNET/AboutPage.pas"/>
    179179        <IsPartOfProject Value="True"/>
    180180        <ComponentName Value="AboutPage"/>
    … …  
    183183      </Unit11>
    184184      <Unit12>
    185         <Filename Value="Modules/ZdechovNET/UContactPage.pas"/>
     185        <Filename Value="Modules/ZdechovNET/ContactPage.pas"/>
    186186        <IsPartOfProject Value="True"/>
    187187        <ComponentName Value="ContactPage"/>
    … …  
    190190      </Unit12>
    191191      <Unit13>
    192         <Filename Value="Modules/ZdechovNET/UDocumentsPage.pas"/>
     192        <Filename Value="Modules/ZdechovNET/DocumentsPage.pas"/>
    193193        <IsPartOfProject Value="True"/>
    194194        <HasResources Value="True"/>
    195195      </Unit13>
    196196      <Unit14>
    197         <Filename Value="Modules/ZdechovNET/UHistoryPage.pas"/>
     197        <Filename Value="Modules/ZdechovNET/HistoryPage.pas"/>
    198198        <IsPartOfProject Value="True"/>
    199199        <HasResources Value="True"/>
    200200      </Unit14>
    201201      <Unit15>
    202         <Filename Value="Modules/ZdechovNET/UHostingPage.pas"/>
     202        <Filename Value="Modules/ZdechovNET/HostingPage.pas"/>
    203203        <IsPartOfProject Value="True"/>
    204204        <ComponentName Value="HostingPage"/>
    … …  
    207207      </Unit15>
    208208      <Unit16>
    209         <Filename Value="Modules/ZdechovNET/UInternetPage.pas"/>
     209        <Filename Value="Modules/ZdechovNET/InternetPage.pas"/>
    210210        <IsPartOfProject Value="True"/>
    211211        <ComponentName Value="InternetPage"/>
    … …  
    214214      </Unit16>
    215215      <Unit17>
    216         <Filename Value="Modules/ZdechovNET/ULinksPage.pas"/>
     216        <Filename Value="Modules/ZdechovNET/LinksPage.pas"/>
    217217        <IsPartOfProject Value="True"/>
    218218        <ComponentName Value="LinksPage"/>
    … …  
    221221      </Unit17>
    222222      <Unit18>
    223         <Filename Value="Modules/ZdechovNET/UNetworkPage.pas"/>
     223        <Filename Value="Modules/ZdechovNET/NetworkPage.pas"/>
    224224        <IsPartOfProject Value="True"/>
    225225        <ComponentName Value="NetworkPage"/>
    … …  
    228228      </Unit18>
    229229      <Unit19>
    230         <Filename Value="Modules/ZdechovNET/UPlansPage.pas"/>
     230        <Filename Value="Modules/ZdechovNET/PlansPage.pas"/>
    231231        <IsPartOfProject Value="True"/>
    232232        <ComponentName Value="PlansPage"/>
    … …  
    235235      </Unit19>
    236236      <Unit20>
    237         <Filename Value="Modules/ZdechovNET/UProjectsPage.pas"/>
     237        <Filename Value="Modules/ZdechovNET/ProjectsPage.pas"/>
    238238        <IsPartOfProject Value="True"/>
    239239        <ComponentName Value="ProjectsPage"/>
    … …  
    242242      </Unit20>
    243243      <Unit21>
    244         <Filename Value="Modules/ZdechovNET/UVoIPPage.pas"/>
     244        <Filename Value="Modules/ZdechovNET/VoIPPage.pas"/>
    245245        <IsPartOfProject Value="True"/>
    246246        <ComponentName Value="VoIPPage"/>
    … …  
    249249      </Unit21>
    250250      <Unit22>
    251         <Filename Value="Modules/ZdechovNET/UWebCamPage.pas"/>
     251        <Filename Value="Modules/ZdechovNET/WebCamPage.pas"/>
    252252        <IsPartOfProject Value="True"/>
    253253        <ComponentName Value="WebCamPage"/>
    … …  
    256256      </Unit22>
    257257      <Unit23>
    258         <Filename Value="Modules/TV/UModuleTV.pas"/>
     258        <Filename Value="Modules/TV/ModuleTV.pas"/>
    259259        <IsPartOfProject Value="True"/>
    260260      </Unit23>
    261261      <Unit24>
    262         <Filename Value="Modules/TV/UPageTV.pas"/>
     262        <Filename Value="Modules/TV/PageTV.pas"/>
    263263        <IsPartOfProject Value="True"/>
    264264        <ComponentName Value="WebPageTV"/>
    … …  
    266266      </Unit24>
    267267      <Unit25>
    268         <Filename Value="Modules/TV/UPlaylist.pas"/>
     268        <Filename Value="Modules/TV/Playlist.pas"/>
    269269        <IsPartOfProject Value="True"/>
    270270      </Unit25>
    271271      <Unit26>
    272         <Filename Value="Modules/Finance/UModuleFinance.pas"/>
     272        <Filename Value="Modules/Finance/ModuleFinance.pas"/>
    273273        <IsPartOfProject Value="True"/>
    274274      </Unit26>
    275275      <Unit27>
    276         <Filename Value="Modules/Finance/UPageFinance.pas"/>
     276        <Filename Value="Modules/Finance/PageFinance.pas"/>
    277277        <IsPartOfProject Value="True"/>
    278278        <ComponentName Value="WebPageFinance"/>
    … …  
    281281      </Unit27>
    282282      <Unit28>
    283         <Filename Value="Modules/Network/UModuleNetwork.pas"/>
     283        <Filename Value="Modules/Network/ModuleNetwork.pas"/>
    284284        <IsPartOfProject Value="True"/>
    285285      </Unit28>
    286286      <Unit29>
    287         <Filename Value="Modules/Network/UPageNetwork.pas"/>
     287        <Filename Value="Modules/Network/PageNetwork.pas"/>
    288288        <IsPartOfProject Value="True"/>
    289289        <ComponentName Value="WebPageNetwork"/>
    … …  
    292292      </Unit29>
    293293      <Unit30>
    294         <Filename Value="Modules/Portal/UModulePortal.pas"/>
     294        <Filename Value="Modules/Portal/ModulePortal.pas"/>
    295295        <IsPartOfProject Value="True"/>
    296296      </Unit30>
    297297      <Unit31>
    298         <Filename Value="Modules/Portal/UPagePortal.pas"/>
     298        <Filename Value="Modules/Portal/PagePortal.pas"/>
    299299        <IsPartOfProject Value="True"/>
    300300        <ComponentName Value="WebPagePortal"/>
    … …  
    303303      </Unit31>
    304304      <Unit32>
    305         <Filename Value="Modules/IS/UModuleIS.pas"/>
     305        <Filename Value="Modules/IS/ModuleIS.pas"/>
    306306        <IsPartOfProject Value="True"/>
    307307      </Unit32>
    308308      <Unit33>
    309         <Filename Value="Application/UWebSession.pas"/>
     309        <Filename Value="Application/WebSession.pas"/>
    310310        <IsPartOfProject Value="True"/>
    311311      </Unit33>
    312312      <Unit34>
    313         <Filename Value="Modules/User/UUser.pas"/>
     313        <Filename Value="Modules/User/User.pas"/>
    314314        <IsPartOfProject Value="True"/>
    315315      </Unit34>
    316316      <Unit35>
    317         <Filename Value="Modules/News/UModuleNews.pas"/>
     317        <Filename Value="Modules/News/ModuleNews.pas"/>
    318318        <IsPartOfProject Value="True"/>
    319319      </Unit35>
    320320      <Unit36>
    321         <Filename Value="Modules/Base/UModuleBase.pas"/>
     321        <Filename Value="Modules/Base/ModuleBase.pas"/>
    322322        <IsPartOfProject Value="True"/>
    323323      </Unit36>
    324324      <Unit37>
    325         <Filename Value="Modules/News/UNews.pas"/>
     325        <Filename Value="Modules/News/News.pas"/>
    326326        <IsPartOfProject Value="True"/>
    327327      </Unit37>
    328328      <Unit38>
    329         <Filename Value="Modules/ZdechovNET/UIPTVPage.pas"/>
     329        <Filename Value="Modules/ZdechovNET/IPTVPage.pas"/>
    330330        <IsPartOfProject Value="True"/>
    331331        <ComponentName Value="IPTVPage"/>
    … …  
    334334      </Unit38>
    335335      <Unit39>
    336         <Filename Value="Modules/ZdechovNET/URobotsPage.pas"/>
     336        <Filename Value="Modules/ZdechovNET/RobotsPage.pas"/>
    337337        <IsPartOfProject Value="True"/>
    338338        <ComponentName Value="RobotsPage"/>
    … …  
    341341      </Unit39>
    342342      <Unit40>
    343         <Filename Value="Pages/UPageNotFound.pas"/>
     343        <Filename Value="Pages/PageNotFound.pas"/>
    344344        <IsPartOfProject Value="True"/>
    345345        <ComponentName Value="PageNotFound"/>

  • trunk/ZdechovNET.lpr

    r132 r146  
    77  cthreads, clocale,
    88  {$ENDIF}
    9   UUtils, USqlDatabase, SysUtils, Forms,
    10   UUser, UHTTPSessionMySQL, UHTTPSessionFile, Printers,
     9  Utils, USqlDatabase, SysUtils, Forms,
     10  User, UHTTPSessionMySQL, UHTTPSessionFile, Printers,
    1111  UCommon, UHTTPServer, UHTTPServerTCP, UHTTPServerCGI, UTCPServer, UPool,
    12   UMemoryStreamEx, UMIMEType, UPageList, Interfaces, UCore, UWebApp;
     12  UMemoryStreamEx, UMIMEType, UPageList, Interfaces, Core, UWebApp;
    1313
    1414{$if declared(UseHeapTrace)}
    … …  
    2525  with Application do begin
    2626    Initialize;
    27     Core := TCore.Create(Application);
    28     Core.Run;
     27    Core.Core := TCore.Create(Application);
     28    Core.Core.Run;
    2929    Run;
    3030    //Printer.RawMode := True; // Avoid printer finalization exception

  • trunk/languages/index.cs.po

    r130 r146  
    1212"X-Generator: Poedit 3.0\n"
    1313
    14 #: uuser.scannotuseanonymous
     14#: user.scannotuseanonymous
     15#, fuzzy
     16msgctxt "user.scannotuseanonymous"
    1517msgid "Cannot use anonymous user"
    1618msgstr "Nelze použít anonymního uživatele"
    1719
    18 #: uuser.sduplicateuseritem
    19 #, object-pascal-format
     20#: user.sduplicateuseritem
     21#, object-pascal-format, fuzzy
     22msgctxt "user.sduplicateuseritem"
    2023msgid "User name \"%s\" already used."
    2124msgstr "Uživatelské jméno \"%s\" již použito."
    2225
    23 #: uuser.semptyuserparameters
     26#: user.semptyuserparameters
     27#, fuzzy
     28msgctxt "user.semptyuserparameters"
    2429msgid "Missing user parameters"
    2530msgstr "Chybějící uživatelský parametr"
    2631
    27 #: uuser.susernotfound
    28 #, object-pascal-format
     32#: user.susernotfound
     33#, object-pascal-format, fuzzy
     34msgctxt "user.susernotfound"
    2935msgid "User \"%s\" not found"
    3036msgstr "Uživatel \"%s\" nebyl nalezen"
    3137
    32 #: uwebsession.serror
    33 #, object-pascal-format
    34 msgctxt "uwebsession.serror"
     38#: websession.serror
     39#, object-pascal-format, fuzzy
     40msgctxt "websession.serror"
    3541msgid "<div>Error: %s</div>"
    3642msgstr "<div>Chyba: %s</div>"
     43

  • trunk/languages/index.pot

    r130 r146  
    22msgstr "Content-Type: text/plain; charset=UTF-8"
    33
    4 #: uuser.scannotuseanonymous
     4#: user.scannotuseanonymous
     5msgctxt "user.scannotuseanonymous"
    56msgid "Cannot use anonymous user"
    67msgstr ""
    78
    8 #: uuser.sduplicateuseritem
     9#: user.sduplicateuseritem
    910#, object-pascal-format
     11msgctxt "user.sduplicateuseritem"
    1012msgid "User name \"%s\" already used."
    1113msgstr ""
    1214
    13 #: uuser.semptyuserparameters
     15#: user.semptyuserparameters
     16msgctxt "user.semptyuserparameters"
    1417msgid "Missing user parameters"
    1518msgstr ""
    1619
    17 #: uuser.susernotfound
     20#: user.susernotfound
    1821#, object-pascal-format
     22msgctxt "user.susernotfound"
    1923msgid "User \"%s\" not found"
    2024msgstr ""
    2125
    22 #: uwebsession.serror
     26#: websession.serror
    2327#, object-pascal-format
     28msgctxt "websession.serror"
    2429msgid "<div>Error: %s</div>"
    2530msgstr ""
Note: See TracChangeset for help on using the changeset viewer.