Changeset 880 for trunk/Modules/News

Timestamp:

Apr 7, 2020, 10:15:48 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

Location:

trunk/Modules/News

Files:

• News.php (modified) (12 diffs)
• RSS.php (modified) (4 diffs)

trunk/Modules/News/News.php

@@ -35 +35 @@
     $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`, `News`.`Id` '.
       ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT '.$Count);
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Output .= '<h4><a href="'.$this->System->Link('/news/?a=item&amp;i='.$DbRow['Id']).'">'.$DbRow['Title'].'</a> ('.HumanDate($DbRow['Time']).')</h4>'.
@@ -41 +41 @@
     }
     $Output .= '</div></div>';
-    return($Output);
+    return $Output;
   }
 
@@ -48 +48 @@
     $this->RSSChannels[$Channel['Channel']] = $Channel;
 
-    if(is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
+    if (is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
     else {
       array_splice($this->RSSChannelsPos, $Pos, 0, $Channel['Channel']);
@@ -57 +57 @@
   {
     $Output = '';
-    foreach($this->RSSChannels as $Channel)
+    foreach ($this->RSSChannels as $Channel)
     {
-      if($this->System->User->Licence($Channel['Permission']))
+      if ($this->System->User->Licence($Channel['Permission']))
         $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
           $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
     }
-    return($Output);
+    return $Output;
   }
 }
@@ -72 +72 @@
   {
     $this->Title = T('News');
-    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+    if (array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
-    if($Action == 'add2') $Output = $this->SaveNew();
-    else if($Action == 'add') $Output = $this->ShowAddForm();
-    else if($Action == 'item') $Output = $this->ShowItem();
+    if ($Action == 'add2') $Output = $this->SaveNew();
+    else if ($Action == 'add') $Output = $this->ShowAddForm();
+    else if ($Action == 'item') $Output = $this->ShowItem();
     else $Output = $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
@@ -89 +89 @@
 
     $Output = '<h3>'.T('News').'</h3>';
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
       $Output .= ' <a href="?a=add">'.T('Add').'</a>';
     $Output .= $PageList['Output'];
@@ -95 +95 @@
     $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
         '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
-    while($Line = $DbResult->fetch_assoc())
+    while ($Line = $DbResult->fetch_assoc())
     {
       $Output .= '<h4><a href="?a=item&amp;i='.$Line['Id'].'">'.$Line['Title'].'</a> ('.HumanDate($Line['Time']).')</h4><div>'.$Line['Text'].' ('.$Line['User'].')</div>';
     }
     $Output .= '</div>'.$PageList['Output'];
-    return($Output);
+    return $Output;
   }
 
   function ShowItem()
   {
-    if(array_key_exists('i', $_GET))
+    if (array_key_exists('i', $_GET))
     {
       $Output = '<h3>'.T('News').'</h3>';
       $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
         '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id` = '.($_GET['i'] * 1));
-      if($DbResult->num_rows == 1)
+      if ($DbResult->num_rows == 1)
       {
         $Line = $DbResult->fetch_assoc();
@@ -117 +117 @@
     } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     $Output .= '<br/><a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
-    return($Output);
+    return $Output;
   }
 
   function ShowAddForm()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
       $Output = '<form action="?" method="POST">'.
@@ -134 +134 @@
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     $Output .= $this->ShowList();
-    return($Output);
+    return $Output;
   }
 
   function SaveNew()
   {
-    if($this->System->User->Licence(LICENCE_ADMIN))
+    if ($this->System->User->Licence(LICENCE_ADMIN))
     {
-      if(array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
+      if (array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
       {
         $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
@@ -151 +151 @@
       } else $Output = ShowMessage(T('Data not specified'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
+    return $Output;
   }
 
@@ -160 +160 @@
       '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text`, `News`.`Id` '.
       'FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
      $Items[] = array
@@ -178 +178 @@
       'Items' => $Items,
     ));
-    return($Output);
+    return $Output;
   }
 }

trunk/Modules/News/RSS.php

@@ -15 +15 @@
       "    <pubDate>".date('r')."</pubDate>\n".
       "    <ttl>20</ttl>\n";
-  foreach($Data['Items'] as $Item)
+  foreach ($Data['Items'] as $Item)
   {
     $Result .= "    <item>\n".
@@ -26 +26 @@
   $Result .= "  </channel>\n".
       "</rss>";
-  return($Result);
+  return $Result;
 }
 
@@ -35 +35 @@
     $this->RawPage = true;
 
-    if(array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
+    if (array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
       else $ChannelName = '';
-    if(array_key_exists('token', $_GET)) $Token = $_GET['token'];
+    if (array_key_exists('token', $_GET)) $Token = $_GET['token'];
       else $Token = '';
-    if(array_key_exists($ChannelName, $this->System->ModuleManager->Modules['News']->RSSChannels))
+    if (array_key_exists($ChannelName, $this->System->ModuleManager->Modules['News']->RSSChannels))
     {
       $Channel = $this->System->ModuleManager->Modules['News']->RSSChannels[$ChannelName];
-      if($this->System->User->Licence($Channel['Permission']) or
+      if ($this->System->User->Licence($Channel['Permission']) or
       $this->System->User->CheckToken($Channel['Permission'], $Token))
       {
-        if(is_string($Channel['Callback'][0]))
+        if (is_string($Channel['Callback'][0]))
         {
           $Class = new $Channel['Callback'][0]($this->System);
@@ -53 +53 @@
       } else $Output = T('Access denied');
     } else $Output = 'Nezadán žádný kanál';
-    return($Output);
+    return $Output;
   }
 }