Ignore:
Timestamp:
Dec 29, 2023, 11:44:26 PM (5 months ago)
Author:
chronos
Message:
  • Modified: Unit names without U prefix.
File:
1 moved

Legend:

Unmodified
Added
Removed

  • 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ěť: ' +
Note: See TracChangeset for help on using the changeset viewer.