Changeset 887 for trunk/Modules/Wiki/Wiki.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Modules/Wiki/Wiki.php (modified) (13 diffs)

trunk/Modules/Wiki/Wiki.php

@@ -3 +3 @@
 class ModuleWiki extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -15 +15 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
     parent::Install();
@@ -42 +42 @@
   }
 
-  function DoUnInstall()
+  function DoUnInstall(): void
   {
     $this->Database->query('DELETE TABLE `WikiPageContent`');
@@ -48 +48 @@
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->LoadPages();
   }
 
-  function DoStop()
-  {
-  }
-
-  function LoadPages()
+  function DoStop(): void
+  {
+  }
+
+  function LoadPages(): void
   {
     $DbResult = $this->Database->select('WikiPage', '*', 'VisibleInMenu=1');
     while ($DbRow = $DbResult->fetch_assoc())
     {
-      $this->System->RegisterPage($DbRow['NormalizedName'], 'PageWiki');
+      $this->System->RegisterPage([$DbRow['NormalizedName']], 'PageWiki');
       $this->System->RegisterMenuItem(array(
         'Title' => $DbRow['Name'],
@@ -76 +76 @@
 class PageWiki extends Page
 {
-  var $FullTitle = 'Wiki stránky';
-  var $ShortTitle = 'Wiki';
-  var $ParentClass = 'PagePortal';
-
-  function Show()
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Wiki stránky';
+    $this->ShortTitle = 'Wiki';
+    $this->ParentClass = 'PagePortal';
+  }
+
+  function Show(): string
   {
     if (array_key_exists('Action', $_GET))
@@ -92 +96 @@
   }
 
-  function ShowContent()
+  function ShowContent(): string
   {
     $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
@@ -107 +111 @@
           $Output = '<h3>Archív stránky '.$DbRow['Name'].' ('.HumanDateTime($DbRow2['Time']).')</h3>';
           $Output .= $DbRow2['Content'];
-          if ($this->System->User->Licence(LICENCE_MODERATOR))
+          if (ModuleUser::Cast($this->System->GetModule('User'))->User->Licence(LICENCE_MODERATOR))
             $Output .= '<div><a href="?Action=Edit">Upravit nejnovější</a> <a href="?Action=History">Historie</a></div>';
-        } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+        } else $Output = ShowmMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
       } else
       {
@@ -118 +122 @@
           $Output = '<h3>'.$DbRow['Name'].'</h3>';
           $Output .= $DbRow2['Content'];
-          if ($this->System->User->Licence(LICENCE_MODERATOR))
+          if (ModuleUser::Cast($this->System->GetModule('User'))->User->Licence(LICENCE_MODERATOR))
             $Output .= '<div><a href="?Action=Edit">Upravit</a> <a href="?Action=History">Historie</a></div>';
         } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
@@ -126 +130 @@
   }
 
-  function EditContent()
-  {
-    if ($this->System->User->Licence(LICENCE_MODERATOR))
+  function EditContent(): string
+  {
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->Licence(LICENCE_MODERATOR))
     {
     $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
@@ -151 +155 @@
   }
 
-  function SaveContent()
-  {
-    if ($this->System->User->Licence(LICENCE_MODERATOR))
+  function SaveContent(): string
+  {
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->Licence(LICENCE_MODERATOR))
     {
     $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
@@ -162 +166 @@
       if (array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
       {
-        $DbResult2 = $this->Database->insert('WikiPageContent', array('Content' => stripslashes($_POST['content']),
-          'User' => $this->System->User->Id, 'Time' => 'NOW()', 'Page' => $DbRow['Id']));
+        $this->Database->insert('WikiPageContent', array('Content' => stripslashes($_POST['content']),
+          'User' => ModuleUser::Cast($this->System->GetModule('User'))->User->Id, 'Time' => 'NOW()', 'Page' => $DbRow['Id']));
         $Output = ShowMessage('Wiki stránka uložena', MESSAGE_INFORMATION);
       } else $Output = ShowMessage('Nezadána platná data', MESSAGE_CRITICAL);
@@ -172 +176 @@
   }
 
-  function ShowHistory()
-  {
-    if ($this->System->User->Licence(LICENCE_MODERATOR))
+  function ShowHistory(): string
+  {
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->Licence(LICENCE_MODERATOR))
     {
       $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
@@ -218 +222 @@
   }
 
-  function ToHtml($text)
+  function ToHtml(string $text): string
   {
     $text = preg_replace('/&lt;source lang=&quot;(.*?)&quot;&gt;(.*?)&lt;\/source&gt;/', '<pre lang="$1">$2</pre>', $text);