Changeset 896 for trunk/Application

Timestamp:

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

Author:

chronos

Message:

• Fixed: Correct typecasting of System class.

Location:

trunk/Application

Files:

• Core.php (modified) (2 diffs)
• View.php (modified) (1 diff)

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 |';