Changeset 912

Timestamp:

Aug 3, 2021, 11:38:29 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

Location:

trunk

Files:

• Application/BaseView.php (modified) (5 diffs)
• Application/Core.php (modified) (3 diffs)
• Modules/API/API.php (modified) (1 diff)
• Modules/Chat/Chat.php (modified) (1 diff)
• Modules/Contract/Contract.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/EmailQueue/EmailQueue.php (modified) (1 diff)
• Modules/File/File.php (modified) (3 diffs)
• Modules/Finance/Import.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Finance/Trade.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (10 diffs)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/Map/Map.php (modified) (1 diff)
• Modules/Meals/Meals.php (modified) (2 diffs)
• Modules/Meteostation/Meteostation.php (modified) (1 diff)
• Modules/Monitoring/Monitoring.php (modified) (1 diff)
• Modules/Network/HostList.php (modified) (1 diff)
• Modules/Network/Hosting.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (4 diffs)
• Modules/Network/Subnet.php (modified) (1 diff)
• Modules/Network/UserHosts.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)
• Modules/NetworkShare/SharePage.php (modified) (1 diff)
• Modules/NetworkTopology/NetworkTopology.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (5 diffs)
• Modules/Notify/Notify.php (modified) (2 diffs)
• Modules/OpeningHours/OpeningHours.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (1 diff)
• Modules/RSS/RSS.php (modified) (1 diff)
• Modules/Search/Search.php (modified) (1 diff)
• Modules/SpeedTest/SpeedTest.php (modified) (1 diff)
• Modules/TV/TV.php (modified) (2 diffs)
• Modules/TV/tkr.php (modified) (1 diff)
• Modules/TimeMeasure/Graph.php (modified) (1 diff)
• Modules/TimeMeasure/Main.php (modified) (2 diffs)
• Modules/User/UserList.php (modified) (1 diff)
• Modules/User/UserPage.php (modified) (1 diff)
• Modules/WebCam/WebCam.php (modified) (1 diff)
• Modules/Wiki/Wiki.php (modified) (1 diff)
• Packages/Common/Database.php (modified) (6 diffs)
• Packages/Common/Modules/ModuleManager.php (modified) (1 diff)
• Packages/Common/Modules/Setup.php (modified) (1 diff)
• Packages/Common/Page.php (modified) (2 diffs)
• Packages/Common/System.php (modified) (1 diff)
• block/index.php (modified) (1 diff)

trunk/Application/BaseView.php

@@ -8 +8 @@
   public bool $FormatHTML = false;
   public bool $ShowRuntimeInfo = false;
-  public bool $ClearPage = false;
+  public bool $RawPage = false;
   public bool $BasicHTML = false;
   public string $ParentClass = '';
-  public string $ShortTitle;
-  public string $FullTitle;
+  public string $Title;
+  public string $Description;
   public string $Encoding;
   public string $Style;
@@ -58 +58 @@
     while ($Page)
     {
-      $Output = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Output;
+      $Output = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->Title.'</a>'.$Output;
 
       if (class_exists($Page->ParentClass))
@@ -73 +73 @@
   function ShowHeader(Page $Page): string
   {
-    $Title = $Page->FullTitle;
-    $Path = $Page->ShortTitle;
+    $Path = $Page->Title;
 
     $Navigation = $this->ShowNavigation($Page);
@@ -87 +86 @@
     '<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$this->Encoding.'" />'.
     '<script type="text/javascript" src="'.$this->System->Link('/style/').$this->Style.'/global.js"></script>'.
-    '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>';
+    '<title>'.$Path.' - '.$this->System->Config['Web']['Title'].'</title>';
 
     // Show page headers
@@ -133 +132 @@
 
     $Output = $Page->Show();
-    if ($Page->ClearPage == false)
+    if ($Page->RawPage == false)
     {
       $Output = $this->ShowHeader($Page).$Output.$this->ShowFooter();

trunk/Application/Core.php

@@ -152 +152 @@
     if (file_exists($this->ModuleManager->FileName)) $this->ModuleManager->LoadState();
     if (ModuleSetup::Cast($ModuleSetup)->CheckState())
-        {
+    {
       $this->ModuleManager->StartAll(array(ModuleCondition::Enabled));
     }
@@ -236 +236 @@
       return $System;
     }
-    throw new Exception('Expected ModuleSetup type but '.gettype($System));
+    throw new Exception('Expected Core type but '.gettype($System));
   }
 }
@@ -245 +245 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Stránka nenalezena';
-    $this->ShortTitle = 'Stránka nenalezena';
+    $this->Title = 'Stránka nenalezena';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/API/API.php

@@ -53 +53 @@
   {
     parent::__construct($System);
-    $this->ClearPage = true;
+    $this->RawPage = true;
     $this->DataFormat = '';
   }

trunk/Modules/Chat/Chat.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Výpis z historie chatu';
-    $this->ShortTitle = 'Historie chatu';
+    $this->Title = 'Historie chatu';
+    $this->Description = 'Výpis historie chatu';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Contract/Contract.php

@@ -76 +76 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Generování smlouvy';
-    $this->ShortTitle = 'Generování smlouvy';
+    $this->Title = 'Generování smlouvy';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Customer/Customer.php

@@ -264 +264 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Dokumenty klienta';
-    $this->ShortTitle = 'Dokumenty';
+    $this->Title = 'Dokumenty';
+    $this->Description = 'Dokumenty klienta';
     $this->ParentClass = 'PageUser';
   }

trunk/Modules/EmailQueue/EmailQueue.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Odeslání pošty z fronty';
-    $this->ShortTitle = 'Fronta pošty';
+    $this->Title = 'Fronta pošty';
+    $this->Description = 'Odeslání pošty z fronty';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/File/File.php

@@ -122 +122 @@
     {
       $Hash = $_GET['h'];
-      $this->ClearPage = true;
+      $this->RawPage = true;
       ModuleFile::Cast($this->System->GetModule('File'))->File->DownloadHash($Hash);
       return '';
@@ -129 +129 @@
     {
       $Id = $_GET['i'] * 1;
-      $this->ClearPage = true;
+      $this->RawPage = true;
       ModuleFile::Cast($this->System->GetModule('File'))->File->DownloadId($Id);
     }
@@ -153 +153 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'File check';
-    $this->ShortTitle = 'File check';
+    $this->Title = 'File check';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Finance/Import.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Import plateb';
-    $this->ShortTitle = 'Import plateb';
+    $this->itle = 'Import plateb';
     $this->ParentClass = 'PageFinance';
   }

trunk/Modules/Finance/Manage.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Správa financí';
-    $this->ShortTitle = 'Správa financí';
+    $this->Title = 'Správa financí';
     $this->ParentClass = 'PageFinance';
   }

trunk/Modules/Finance/Trade.php

@@ -8 +8 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Daňová evidence';
-    $this->ShortTitle = 'Daňová evidence';
+    $this->Title = 'Daňová evidence';
     $this->ParentClass = 'PageFinance';
   }

trunk/Modules/Finance/UserState.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Stav financí účastníka';
-    $this->ShortTitle = 'Stav financí';
+    $this->Title = 'Stav financí';
+    $this->Description = 'Stav financí účastníka';
     $this->ParentClass = 'PageUser';
   }

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -72 +72 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Import plateb přes API';
-    $this->ShortTitle = 'Import plateb přes API';
+    $this->Title = 'Import plateb přes API';
     $this->ParentClass = 'PageFinance';
   }
@@ -115 +114 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Import plateb ze souboru';
-    $this->ShortTitle = 'Import plateb ze souboru';
+    $this->Title = 'Import plateb ze souboru';
     $this->ParentClass = 'PageFinance';
   }

trunk/Modules/IS/IS.php

@@ -12 +12 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Správa dat';
-    $this->ShortTitle = 'Správa dat';
+    $this->Title = 'Správa dat';
     $this->ParentClass = 'PagePortal';
 
@@ -173 +172 @@
         $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
-        $this->ShortTitle .= ' - '.$Form->Definition['Title'].' úprava';
+        $this->Title .= ' - '.$Form->Definition['Title'].' úprava';
         try
         {
@@ -215 +214 @@
       $Form->SetClass($Table);
       $Form->LoadValuesFromDatabase($Id);
-      $this->ShortTitle .= ' - '.$Form->Definition['Title'].' úprava';
+      $this->Title .= ' - '.$Form->Definition['Title'].' úprava';
       $Form->OnSubmit = '?a=edit&t='.$Table.'&i='.$_GET['i'].'&o=save';
       $Output .= $Form->ShowEditForm();
@@ -246 +245 @@
         $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
-        $this->ShortTitle .= ' - '.$Form->Definition['Title'].' duplikování';
+        $this->Title .= ' - '.$Form->Definition['Title'].' duplikování';
         try
         {
@@ -286 +285 @@
       $Form->SetClass($Table);
       $Form->LoadValuesFromDatabase($Id);
-      $this->ShortTitle .= ' - '.$Form->Definition['Title'].' duplikování';
+      $this->Title .= ' - '.$Form->Definition['Title'].' duplikování';
       $Form->OnSubmit = '?a='.$_GET['a'].'&t='.$Table.'&o=save';
       $Output .= $Form->ShowEditForm();
@@ -318 +317 @@
         $Form->SetClass($Table);
         $Form->LoadValuesFromDatabase($Id);
-        $this->ShortTitle .= ' - '.$Form->Definition['Title'].' odstranění';
+        $this->Title .= ' - '.$Form->Definition['Title'].' odstranění';
         if (array_key_exists('BeforeDelete', $Form->Definition))
         {
@@ -355 +354 @@
         $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
-        $this->ShortTitle .= ' - '.$Form->Definition['Title'].' přidání';
+        $this->Title .= ' - '.$Form->Definition['Title'].' přidání';
         try
         {
@@ -405 +404 @@
       $Form = new Form($this->System->FormManager);
       $Form->SetClass($Table);
-      $this->ShortTitle .= ' - '.$Form->Definition['Title'].' přidání';
+      $this->Title .= ' - '.$Form->Definition['Title'].' přidání';
       // Load presets from URL
       foreach ($_GET as $Key => $Value)
@@ -477 +476 @@
     $Form = new Form($this->System->FormManager);
     $Form->SetClass($Table);
-    $this->ShortTitle .= ' - '.$Form->Definition['Title'].' položka';
+    $this->Title .= ' - '.$Form->Definition['Title'].' položka';
     $Form->LoadValuesFromDatabase($Id);
     $Form->OnSubmit = '?a=view';
@@ -797 +796 @@
       $FormClass = $this->System->FormManager->Classes[$Table];
       else return $this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena');
-    if ($ExcludeColumn == '') $this->ShortTitle .= ' - '.$FormClass['Title'];
+    if ($ExcludeColumn == '') $this->Title .= ' - '.$FormClass['Title'];
     if (array_key_exists('ItemActions', $FormClass))
     {

trunk/Modules/Log/Log.php

@@ -51 +51 @@
   function ShowRSS(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
     $this->FormatHTML = false;
     Header('Content-Type: text/xml');

trunk/Modules/Map/Map.php

@@ -8 +8 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Mapa sítě';
-    $this->ShortTitle = 'Mapa sítě';
+    $this->Title = 'Mapa sítě';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Meals/Meals.php

@@ -11 +11 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Jídleníček jídelny Na kopečku';
-    $this->ShortTitle = 'Jídelníček';
+    $this->Title = 'Jídelníček';
+    $this->Description = 'Jídleníček jídelny Na kopečku';
     $this->ParentClass = 'PagePortal';
   }
@@ -50 +50 @@
   function ShowPrint(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
 
     $Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

trunk/Modules/Meteostation/Meteostation.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Stav meteostanice';
-    $this->ShortTitle = 'Meteostanice';
+    $this->Title = 'Meteostanice';
+    $this->Description = 'Stav meteostanice';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Monitoring/Monitoring.php

@@ -24 +24 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Monitoring';
-    $this->ShortTitle = 'Monitoring';
+    $this->Title = 'Monitoring';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Network/HostList.php

@@ -8 +8 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Seznam registrovaných počítačů';
-    $this->ShortTitle = 'Seznam počítačů';
+    $this->Title = 'Seznam počítačů';
+    $this->Description = 'Seznam registrovaných počítačů';
     $this->ParentClass = 'PageNetwork';
   }

trunk/Modules/Network/Hosting.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Hostované projekty';
-    $this->ShortTitle = 'Hostované projekty';
+    $this->Title = 'Hostované projekty';
     $this->ParentClass = 'PageNetwork';
   }

trunk/Modules/Network/Network.php

@@ -12 +12 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Výpis obsazení frekvenčních kanálů';
-    $this->ShortTitle = 'Frekvenční plán';
+    $this->Title = 'Frekvenční plán';
+    $this->Description = 'Výpis obsazení frekvenčních kanálů';
     $this->ParentClass = 'PageNetwork';
   }
@@ -83 +83 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Technické informace o síti';
-    $this->ShortTitle = 'Síť';
+    $this->Title = 'Síť';
+    $this->Description = 'Technické informace o síti';
     $this->ParentClass = 'PagePortal';
   }
@@ -895 +895 @@
     $Output .= $StillOffline['Report'];
     $Offline = $this->OnlineList('Offline', 0, -1, 0);
-    return array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Odezva');
+    return array('Report' => $Output, 'Count' => $Offline['Count'], 'Title' => 'Odezva');
   }
 
@@ -947 +947 @@
     $Output .= $StillOffline['Report'];
     $Offline = $this->PortCheckList('Offline', 0, -1, 0);
-    return array('Report' => $Output, 'Count' => $Offline['Count'], 'ShortTitle' => 'Port');
+    return array('Report' => $Output, 'Count' => $Offline['Count'], 'Title' => 'Port');
   }
 }

trunk/Modules/Network/Subnet.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Informace o podsítích';
-    $this->ShortTitle = 'Podsítě';
+    $this->Title = 'Podsítě';
+    $this->Description = 'Informace o podsítích';
     $this->ParentClass = 'PageNetwork';
   }

trunk/Modules/Network/UserHosts.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Registrované počítače';
-    $this->ShortTitle = 'Registrované počítače';
+    $this->Title = 'Registrované počítače';
     $this->ParentClass = 'PageNetwork';
   }

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -52 +52 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Přístup zdarma k Internetu';
-    $this->ShortTitle = 'Internet zdarma';
+    $this->Title = 'Internet zdarma';
+    $this->Description = 'Přístup zdarma k Internetu';
     $this->ParentClass = 'PagePortal';
 

trunk/Modules/NetworkShare/SharePage.php

@@ -20 +20 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Prohledávání sdílených souborů';
-    $this->ShortTitle = 'Sdílené soubory';
+    $this->Title = 'Sdílené soubory';
+    $this->Description = 'Prohledávání sdílených souborů';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/NetworkTopology/NetworkTopology.php

@@ -8 +8 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Grafické zobrazení topologie sítě';
-    $this->ShortTitle = 'Topologie sítě';
+    $this->Title = 'Topologie sítě';
+    $this->Description = 'Grafické zobrazení topologie sítě';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/News/NewsPage.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Aktualní informace';
-    $this->ShortTitle = 'Aktuality';
+    $this->Title = 'Aktuality';
+    $this->Description = 'Aktualní informace';
     $this->ParentClass = 'PagePortal';
   }
@@ -312 +312 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Aktualizace aktualit';
-    $this->ShortTitle = 'Aktualizace aktualit';
+    $this->Title = 'Aktualizace aktualit';
     $this->ParentClass = 'PageNews';
   }
@@ -332 +331 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Odběry aktualit';
-    $this->ShortTitle = 'Odběry aktualit';
+    $this->Title = 'Odběry aktualit';
     $this->ParentClass = 'PageNews';
   }
@@ -371 +369 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'RSS kanál aktualit';
-    $this->ShortTitle = 'Aktuality RSS';
+    $this->Title = 'Aktuality RSS';
+    $this->Description = 'RSS kanál aktualit';
     $this->ParentClass = 'PageNews';
   }
@@ -378 +376 @@
   function Show(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
     $this->FormatHTML = false;
     Header('Content-Type: text/xml');

trunk/Modules/Notify/Notify.php

@@ -80 +80 @@
         }
         if (strlen($Title) > 0) $Title .= ', ';
-        $Title .= $Status['ShortTitle'].':'.$Status['Count'];
+        $Title .= $Status['Title'].':'.$Status['Count'];
       }
     }
@@ -143 +143 @@
   function ShowLogRSS(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
     $this->FormatHTML = false;
     Header('Content-Type: text/xml');

trunk/Modules/OpeningHours/OpeningHours.php

@@ -11 +11 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Otvírací doby místních subjektů';
-    $this->ShortTitle = 'Otvírací doby';
+    $this->Title = 'Otvírací doby';
+    $this->Description = 'Otvírací doby místních subjektů';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Portal/Portal.php

@@ -96 +96 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Zděchovský rozcestník';
-    $this->ShortTitle = 'Rozcestník';
+    $this->Title = 'Rozcestník';
+    $this->Description = 'Zděchovský rozcestník';
   }
 

trunk/Modules/RSS/RSS.php

@@ -65 +65 @@
   function Show(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
 
     if (array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];

trunk/Modules/Search/Search.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Hledání v obsahu';
-    $this->ShortTitle = 'Vyhledávání';
+    $this->Title = 'Vyhledávání';
+    $this->Description = 'Hledání v obsahu';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/SpeedTest/SpeedTest.php

@@ -35 +35 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Test rychlosti připojení';
-    $this->ShortTitle = 'Test rychlosti';
+    $this->Title = 'Test rychlosti';
+    $this->Description = 'Test rychlosti připojení';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/TV/TV.php

@@ -8 +8 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Síťová televize';
-    $this->ShortTitle = 'IPTV';
+    $this->Title = 'IPTV';
+    $this->Description = 'Síťová televize';
     $this->ParentClass = 'PagePortal';
   }
@@ -71 +71 @@
   function Show(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
 
     Header("Content-Type: audio/mpegurl");

trunk/Modules/TV/tkr.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Seznam televizních kanálů místní kabelové televize';
-    $this->ShortTitle = 'Kanály kabelové televize';
+    $this->Title = 'Kanály kabelové televize';
+    $this->Description = 'Seznam televizních kanálů místní kabelové televize';
   }
 

trunk/Modules/TimeMeasure/Graph.php

@@ -19 +19 @@
   function Show(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
     $this->Render();
     return '';

trunk/Modules/TimeMeasure/Main.php

@@ -11 +11 @@
   {
     parent::__construct($System);
-    $this->ShortTitle = 'Grafy';
-    $this->FullTitle = 'Časové grafy veličin';
+    $this->Title = 'Grafy';
+    $this->Description = 'Časové grafy veličin';
     $this->ImageWidth = 800;
     $this->ImageHeight = 200;
@@ -268 +268 @@
   function Show(): string
   {
-    $this->ClearPage = true;
+    $this->RawPage = true;
 
     $Output = '';

trunk/Modules/User/UserList.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Seznam registrovaných uživatelů';
-    $this->ShortTitle = 'Seznam uživatelů';
+    $this->Title = 'Seznam uživatelů';
+    $this->Description = 'Seznam registrovaných uživatelů';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/User/UserPage.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Uživatel';
-    $this->ShortTitle = 'Uživatel';
+    $this->Title = 'Uživatel';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/WebCam/WebCam.php

@@ -6 +6 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Webová kamera';
-    $this->ShortTitle = 'Kamera';
+    $this->Title = 'Kamera';
+    $this->Description = 'Webová kamera';
     $this->ParentClass = 'PagePortal';
   }

trunk/Modules/Wiki/Wiki.php

@@ -67 +67 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Wiki stránky';
-    $this->ShortTitle = 'Wiki';
+    $this->Title = 'Wiki';
+    $this->Description = 'Wiki stránky';
     $this->ParentClass = 'PagePortal';
   }

trunk/Packages/Common/Database.php

@@ -60 +60 @@
   }
 
-  function Connect(string $Host, string $User, string $Password, string $Database)
+  function Connect(string $Host, string $User, string $Password, string $Database): void
   {
     if ($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
@@ -75 +75 @@
   }
 
-  function Disconnect()
+  function Disconnect(): void
   {
     unset($this->PDO);
@@ -166 +166 @@
   }
 
-  function update(string $Table, string $Condition, array $Data)
+  function update(string $Table, string $Condition, array $Data): void
   {
     $this->query($this->GetUpdate($Table, $Condition, $Data));
@@ -187 +187 @@
   }
 
-  function replace(string $Table, array $Data)
+  function replace(string $Table, array $Data): void
   {
     $Name = '';
@@ -208 +208 @@
   }
 
-  function charset(string $Charset)
+  function charset(string $Charset): void
   {
     $this->query('SET NAMES "'.$Charset.'"');
@@ -223 +223 @@
   }
 
-  public function __sleep()
+  public function __sleep(): array
   {
     return array('LastQuery');
   }
 
-  public function __wakeup()
-  {
-  }
-
-  public function Transaction(array $Queries)
+  public function __wakeup(): void
+  {
+  }
+
+  public function Transaction(array $Queries): void
   {
     //echo('|'."\n");

trunk/Packages/Common/Modules/ModuleManager.php

@@ -404 +404 @@
   {
     parent::__construct($System);
-    $this->FullTitle = T('Modules');
-    $this->ShortTitle = T('Modules');
+    $this->Title = T('Modules');
     $this->ParentClass = 'PageSetup';
     $this->YesNo = array(false => T('No'), true => T('Yes'));

trunk/Packages/Common/Modules/Setup.php

@@ -75 +75 @@
   {
     parent::__construct($System);
-    $this->FullTitle = T('Application setup');
-    $this->ShortTitle = T('Application setup');
+    $this->Title = T('Application setup');
     //$this->ParentClass = 'PageSetupRedirect';
     $this->ConfigDir = dirname(dirname(dirname(__FILE__))).'/Config';

trunk/Packages/Common/Page.php

@@ -3 +3 @@
 class Page extends View
 {
-  public string $FullTitle;
-  public string $ShortTitle;
+  public string $Title;
+  public string $Description;
   public string $ParentClass;
-  public bool $ClearPage;
+  public bool $RawPage;
   public $OnSystemMessage;
   public string $Load;
@@ -14 +14 @@
   {
     parent::__construct($System);
-    $this->ClearPage = false;
+    $this->RawPage = false;
     $this->OnSystemMessage = array();
-    $this->FullTitle = "";
-    $this->ShortTitle = "";
+    $this->Title = "";
+    $this->Description = "";
     $this->ParentClass = "";
   }

trunk/Packages/Common/System.php

@@ -134 +134 @@
     return $Target;
   }
+
+  function AbsoluteLink(string $Target): string
+  {
+    return $Target;
+  }
 }

trunk/block/index.php

@@ -16 +16 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Blokování internetu';
-    $this->ShortTitle = 'Blokování internetu';
+    $this->Title = 'Blokování internetu';
   }