Changeset 146 for trunk/Modules/Portal

Timestamp:

Dec 29, 2023, 11:44:26 PM (11 months ago)

Author:

chronos

Message:

• Modified: Unit names without U prefix.

Location:

trunk/Modules/Portal

Files:

• ModulePortal.pas (moved) (moved from trunk/Modules/Portal/UModulePortal.pas ) (11 diffs)
• PagePortal.lfm (moved) (moved from trunk/Modules/Portal/UPagePortal.lfm )
• PagePortal.pas (moved) (moved from trunk/Modules/Portal/UPagePortal.pas ) (2 diffs)

trunk/Modules/Portal/ModulePortal.pas

@@ -1 @@
-unit UModulePortal;
+unit ModulePortal;
 
 interface
 
 uses
-  Classes, SysUtils, UModularSystem, USqlDatabase, UUtils, UWebSession, UUser,
-  UWebPage, UHtmlClasses, UModuleBase, UModuleUser, UModuleNews, UGenerics;
+  Classes, SysUtils, UModularSystem, USqlDatabase, Utils, WebSession, User,
+  UWebPage, UHtmlClasses, ModuleBase, ModuleUser, ModuleNews, UGenerics;
 
 type
@@ -34 +34 @@
 
 uses
-  UCore, UPagePortal;
+  Core, PagePortal;
 
 { TModulePortal }
@@ -86 +86 @@
     DbRows := TDbRows.Create;
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `Panel` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -97 +97 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `PanelColumn` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -104 +104 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'ALTER TABLE `Panel`' +
     '  ADD CONSTRAINT `Panel_ibfk_1` FOREIGN KEY (`PanelColumn`) REFERENCES `panelcolumn` (`Id`);');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `HyperlinkGroup` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -115 +115 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'CREATE TABLE IF NOT EXISTS `Hyperlink` (' +
     '  `Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -130 +130 @@
     ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;');
 
-    Core.CommonDatabase.Query(DbRows,
+    Core.Core.CommonDatabase.Query(DbRows,
     'ALTER TABLE `Hyperlink`' +
     '  ADD CONSTRAINT `Hyperlink_ibfk_1` FOREIGN KEY (`Group`) REFERENCES `hyperlinkgroup` (`Id`);');
@@ -147 +147 @@
   try
     DbRows := TDbRows.Create;
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Panel`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PanelColumn`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Hyperlink`');
-    Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `HyperlinkGroup`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Panel`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `PanelColumn`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `Hyperlink`');
+    Core.Core.CommonDatabase.Query(DbRows, 'DROP TABLE IF EXISTS `HyperlinkGroup`');
   finally
     DbRows.Free;
@@ -185 +185 @@
     //PathTreeItem := PathTree;
     //Navigation := '<a href="' + NavigationLink(PathTreePath) + '">' + PathTreeItem[0] + '</a> &gt; ';
-    ScriptName := Copy(ScriptName, Length(Core.BaseURL), Length(ScriptName));
+    ScriptName := Copy(ScriptName, Length(Core.Core.BaseURL), Length(ScriptName));
     ScriptNameParts.Explode('/', ScriptName);
     ScriptNameParts.Delete(0);
@@ -210 +210 @@
     //if(isset($this->Load)) BodyParam := BodyParam + ' onload="'.$this->Load.'"';
     //if(isset($this->Unload)) BodyParam := BodyParam + ' onunload="'.$this->Unload.'"';
-    Output := '<?xml version="1.0" encoding="' + Core.Charset + '"?>' + LineEnding +
+    Output := '<?xml version="1.0" encoding="' + Core.Core.Charset + '"?>' + LineEnding +
     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' +
     '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">' +
-    '<head><link rel="stylesheet" href="' + NavigationLink('/style/' + Core.Style + '/style.css') + '" type="text/css" media="all" />' +
-    '<meta http-equiv="content-type" content="application/xhtml+xml; charset=' + Core.Charset + '" />' +
-    '<script type="text/javascript" src="' + Core.BaseURL + '/style/' + Core.Style + '/global.js"></script>' +
+    '<head><link rel="stylesheet" href="' + NavigationLink('/style/' + Core.Core.Style + '/style.css') + '" type="text/css" media="all" />' +
+    '<meta http-equiv="content-type" content="application/xhtml+xml; charset=' + Core.Core.Charset + '" />' +
+    '<script type="text/javascript" src="' + Core.Core.BaseURL + '/style/' + Core.Core.Style + '/global.js"></script>' +
     '<title>' + Session.GlobalTitle + ' - ' + Path + '</title>' +
     '</head><body' + BodyParam + '>' +
@@ -275 +275 @@
   //Time := Round(Now - $ScriptTimeStart, 2);
   Result := Result + '<div id="Footer">' +
-    '<i>| Správa webu: ' + Core.Admin + ' | e-mail: ' + Core.AdminEmail + ' |';
+    '<i>| Správa webu: ' + Core.Core.Admin + ' | e-mail: ' + Core.Core.AdminEmail + ' |';
 //    if Core.ShowRuntimeInfo then Output := Output + ' Doba generování: ' +
 //     Time + ' s / ' + ini_get('max_execution_time') + ' s | Použitá paměť: ' +

trunk/Modules/Portal/PagePortal.pas

@@ -1 @@
-unit UPagePortal;
+unit PagePortal;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, UUtils,
-  UGenerics, UWebSession, UHtmlClasses, UModularSystem, UModuleUser,
-  UModuleNews;
+  Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, USqlDatabase, Utils,
+  UGenerics, WebSession, UHtmlClasses, UModularSystem, ModuleUser,
+  ModuleNews;
 
 type
@@ -37 +37 @@
 
 uses
-  UCore, UWebObjects, UUser;
+  Core, WebObjects, User;
 
 function TWebPagePortal.SystemMessage(Title, Text: string): string;