Changeset 896 for trunk

Timestamp:

Jan 14, 2021, 7:38:26 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Correct typecasting of System class.

Location:

trunk

Files:

• Application/Core.php (modified) (2 diffs)
• Application/View.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (3 diffs)
• Modules/System/System.php (modified) (2 diffs)
• Modules/User/User.php (modified) (3 diffs)
• Packages/Common/AppModule.php (modified) (1 diff)
• Packages/Common/Setup.php (modified) (2 diffs)

trunk/Application/Core.php

@@ -85 +85 @@
   {
     return $this->RootURLFolder.$Target;
-  }
-
-  function ShowAction(string $Id): string
-  {
-    $Output = '';
-    $DbResult = $this->Database->query('SELECT *, `ActionIcon`.`Name` AS `Icon` FROM `Action` '.
-      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
-      'WHERE (`Action`.`Id`='.$Id.')');
-    if ($DbResult->num_rows > 0)
-    {
-      $Action = $DbResult->fetch_assoc();
-      if ($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
-      if (substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->Link($Action['URL']);
-      if (!defined('NEW_PERMISSION') or ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('System', 'Read', 'Item', $Id))
-        $Output .= '<img alt="'.$Action['Title'].'" src="'.$this->Link('/images/favicons/'.$Action['Icon']).
-        '" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a>';
-    }
-    return $Output;
   }
 
@@ -233 +215 @@
     unset($this->PageHeaders[$Name]);
   }
+
+  static function Cast(System $System): Core
+  {
+    if ($System instanceof Core)
+    {
+      return $System;
+    }
+    throw new Exception('Expected ModuleSetup type but '.gettype($System));
+  }
 }
 

trunk/Application/View.php

@@ -119 +119 @@
       $Output .= '<div id="Footer">'.
       '<i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' | '.
-      ' Verze: '.$Revision.' ('.$this->System->HumanDate($ReleaseTime).') |';
+      ' Verze: '.$Revision.' ('.Core::Cast($this->System)->HumanDate($ReleaseTime).') |';
       if ($this->ShowRuntimeInfo == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').
         ' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';

trunk/Modules/Customer/Customer.php

@@ -195 +195 @@
     ));
 
-    ModuleIS::Cast($this->System->GetModule('IS'))->RegisterDashboardItem('Customer',
+    ModuleIS::Cast(Core::Cast($this->System)->GetModule('IS'))->RegisterDashboardItem('Customer',
       array($this, 'ShowDashboardItem'));
   }

trunk/Modules/Portal/Portal.php

@@ -43 +43 @@
   function DoStart(): void
   {
-    $this->System->RegisterPage([''], 'PagePortal');
+    Core::Cast($this->System)->RegisterPage([''], 'PagePortal');
     $this->System->FormManager->RegisterClass('MemberOptions', array(
       'Title' => 'Nastavení zákazníka',
@@ -59 +59 @@
       ),
     ));
-    ModuleUser::Cast($this->System->GetModule('User'))->UserPanel[] = array('PagePortal', 'UserPanel');
+    ModuleUser::Cast(Core::Cast($this->System)->GetModule('User'))->UserPanel[] = array('PagePortal', 'UserPanel');
   }
 }
@@ -102 +102 @@
     while ($Action = $DbResult->fetch_assoc())
     {
-      $Output .= $this->System->ShowAction($Action['Id']).'<br/>';
+      $Output .= ModuleSystem::Cast($this->System->GetModule('System'))->ShowAction($Action['Id']).'<br/>';
     }
     return $this->Panel($ActionGroup['Name'], $Output);

trunk/Modules/System/System.php

@@ -202 +202 @@
     $this->Manager->OnUninstallModel = array($this, 'UninstallModel');
 
-    $this->System->RegisterPage(['module'], 'PageModules');
+    Core::Cast($this->System)->RegisterPage(['module'], 'PageModules');
     $this->System->FormManager->RegisterClass('Action', array(
       'Title' => 'Akce',
@@ -624 +624 @@
     throw new Exception('Expected ModuleSystem type but got '.gettype($AppModule));
   }
+
+  function ShowAction(string $Id): string
+  {
+    $Output = '';
+    $DbResult = $this->Database->query('SELECT *, `ActionIcon`.`Name` AS `Icon` FROM `Action` '.
+      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
+      'WHERE (`Action`.`Id`='.$Id.')');
+    if ($DbResult->num_rows > 0)
+    {
+      $Action = $DbResult->fetch_assoc();
+      if ($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
+      if (substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = Core::Cast($this->System)->Link($Action['URL']);
+      if (!defined('NEW_PERMISSION') or ModuleUser::Cast(Core::Cast($this->System)->GetModule('User'))->User->CheckPermission('System', 'Read', 'Item', $Id))
+        $Output .= '<img alt="'.$Action['Title'].'" src="'.Core::Cast($this->System)->Link('/images/favicons/'.$Action['Icon']).
+        '" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a>';
+    }
+    return $Output;
+  }
 }

trunk/Modules/User/User.php

@@ -41 +41 @@
   {
     if (isset($_SERVER['REMOTE_ADDR'])) $this->User->Check();
-    $this->System->RegisterPage(['userlist'], 'PageUserList');
-    $this->System->RegisterPage(['user'], 'PageUser');
-    $this->System->RegisterPageBarItem('Top', 'User', array($this, 'TopBarCallback'));
+    Core::Cast($this->System)->RegisterPage(['userlist'], 'PageUserList');
+    Core::Cast($this->System)->RegisterPage(['user'], 'PageUser');
+    Core::Cast($this->System)->RegisterPageBarItem('Top', 'User', array($this, 'TopBarCallback'));
     $this->System->FormManager->RegisterClass('UserLogin', array(
       'Title' => 'Přihlášení uživatele',
@@ -180 +180 @@
       'Filter' => '1',
     ));
-    ModuleIS::Cast($this->System->GetModule('IS'))->RegisterDashboardItem('User',
+    ModuleIS::Cast(Core::Cast($this->System)->GetModule('IS'))->RegisterDashboardItem('User',
       array($this, 'ShowDashboardItem'));
   }
@@ -196 +196 @@
     if ($this->User->User['Id'] == null)
     {
-      $Output = '<a href="'.$this->System->Link('/user/?Action=LoginForm').'">Přihlášení</a> '.
-        '<a href="'.$this->System->Link('/user/?Action=UserRegister').'">Registrace</a>';
+      $Output = '<a href="'.Core::Cast($this->System)->Link('/user/?Action=LoginForm').'">Přihlášení</a> '.
+        '<a href="'.Core::Cast($this->System)->Link('/user/?Action=UserRegister').'">Registrace</a>';
     } else
     {
       $Output = $this->User->User['Name'].
-        ' <a href="'.$this->System->Link('/user/?Action=UserMenu').'">Nabídka</a>'.
-        ' <a href="'.$this->System->Link('/user/?Action=Logout').'">Odhlásit</a>';
+        ' <a href="'.Core::Cast($this->System)->Link('/user/?Action=UserMenu').'">Nabídka</a>'.
+        ' <a href="'.Core::Cast($this->System)->Link('/user/?Action=Logout').'">Odhlásit</a>';
       //   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
     }

trunk/Packages/Common/AppModule.php

@@ -53 +53 @@
   public array $Dependencies;
   public Database $Database;
-  public Application $System;
+  public System $System;
   public AppModuleManager $Manager;
   public $OnChange;

trunk/Packages/Common/Setup.php

@@ -425 +425 @@
   function DoStart(): void
   {
-    $this->System->RegisterPage([''], 'PageSetupRedirect');
-    $this->System->RegisterPage(['setup'], 'PageSetup');
-    $this->System->RegisterPage(['setup', 'modules'], 'PageSetupModules');
+    Core::Cast($this->System)->RegisterPage([''], 'PageSetupRedirect');
+    Core::Cast($this->System)->RegisterPage(['setup'], 'PageSetup');
+    Core::Cast($this->System)->RegisterPage(['setup', 'modules'], 'PageSetupModules');
   }
 
@@ -433 +433 @@
   {
     unset($this->UpdateManager);
-    $this->System->UnregisterPage(['']);
-    $this->System->UnregisterPage(['setup']);
-    $this->System->UnregisterPage(['setup', 'modules']);
+    Core::Cast($this->System)->UnregisterPage(['']);
+    Core::Cast($this->System)->UnregisterPage(['setup']);
+    Core::Cast($this->System)->UnregisterPage(['setup', 'modules']);
   }