Changeset 893 for trunk/Modules/News

Timestamp:

Mar 6, 2023, 1:48:45 AM (21 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

Location:

trunk/Modules/News

Files:

• News.php (modified) (7 diffs)
• RSS.php (modified) (2 diffs)

trunk/Modules/News/News.php

@@ -5 +5 @@
 class ModuleNews extends Module
 {
-  var $RSSChannels;
+  public array $RSSChannels;
+  public array $RSSChannelsPos;
 
   function __construct(System $System)
@@ -56 +57 @@
   function ShowRSSHeader()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
     foreach ($this->RSSChannels as $Channel)
     {
-      if ($this->System->User->Licence($Channel['Permission']))
+      if ($User->Licence($Channel['Permission']))
         $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
-          $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
+        $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
     }
     return $Output;
@@ -84 +86 @@
   function ShowList()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `News`');
     $DbRow = $DbResult->fetch_row();
@@ -89 +92 @@
 
     $Output = '<h3>'.T('News').'</h3>';
-    if ($this->System->User->Licence(LICENCE_ADMIN))
+    if ($User->Licence(LICENCE_ADMIN))
       $Output .= ' <a href="?a=add">'.T('Add').'</a>';
     $Output .= $PageList['Output'];
@@ -122 +125 @@
   function ShowAddForm()
   {
-    if ($this->System->User->Licence(LICENCE_ADMIN))
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_ADMIN))
     {
       $Output = '<form action="?" method="POST">'.
         '<fieldset><legend>'.T('New news').'</legend>'.
-        T('User').': '.$this->System->User->Name.'('.$this->System->User->Id.')<br/> '.
+        T('User').': '.$User->Name.'('.$User->Id.')<br/> '.
         T('Title').': <input type="text" name="title" size="40"/><br/>'.
         T('Content').': <textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea><br/>'.
@@ -139 +143 @@
   function SaveNew()
   {
-    if ($this->System->User->Licence(LICENCE_ADMIN))
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_ADMIN))
     {
       if (array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
       {
         $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
-           $this->System->User->Id.', "'.$_POST['text'].'")';
+           $User->Id.', "'.$_POST['text'].'")';
         $this->System->Database->query($querty);
         $Output = ShowMessage(T('News added'));
@@ -162 +167 @@
     while ($DbRow = $DbResult->fetch_assoc())
     {
-     $Items[] = array
-     (
-       'Title' => $DbRow['Title'],
-       'Link' =>  'https://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/?a=item&amp;i='.$DbRow['Id']),
-       'Description' => $DbRow['Text'].' ('.$DbRow['Name'].')',
-       'Time' => $DbRow['UnixTime'],
-     );
+      $Items[] = array
+      (
+        'Title' => $DbRow['Title'],
+        'Link' =>  'https://'.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/news/?a=item&amp;i='.$DbRow['Id']),
+        'Description' => $DbRow['Text'].' ('.$DbRow['Name'].')',
+        'Time' => $DbRow['UnixTime'],
+      );
     }
     $Output = GenerateRSS(array
     (
-      'Title' => $this->System->Config['Web']['Title'].' - '.T('System changes'),
-      'Link' => 'https://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/'),
-      'Description' => $this->System->Config['Web']['Description'],
-      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
+      'Title' => Core::Cast($this->System)->Config['Web']['Title'].' - '.T('System changes'),
+      'Link' => 'https://'.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/news/'),
+      'Description' => Core::Cast($this->System)->Config['Web']['Description'],
+      'WebmasterEmail' => Core::Cast($this->System)->Config['Web']['AdminEmail'],
       'Items' => $Items,
     ));

trunk/Modules/News/RSS.php

@@ -33 +33 @@
   function Show(): string
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $this->RawPage = true;
 
@@ -42 +43 @@
     {
       $Channel = $this->System->ModuleManager->Modules['News']->RSSChannels[$ChannelName];
-      if ($this->System->User->Licence($Channel['Permission']) or
-      $this->System->User->CheckToken($Channel['Permission'], $Token))
+      if ($User->Licence($Channel['Permission']) or
+      $User->CheckToken($Channel['Permission'], $Token))
       {
         if (is_string($Channel['Callback'][0]))