Changeset 659 for trunk/Modules/News/NewsPage.php

Timestamp:

May 29, 2014, 11:59:39 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení hodnoty času trvání změn stavu rozhraní.
• Upraveno: Vzdálenou IP klienta nezjišťovat z proxy adres. Tyto adresy se dají falšovat a tedy nejsou spolehlivé.

File:

• trunk/Modules/News/NewsPage.php (modified) (28 diffs)

trunk/Modules/News/NewsPage.php

@@ -14 +14 @@
     $this->UploadedFilesFolder = $this->System->ModuleManager->Modules['News']->UploadedFilesFolder;
     if(count($this->System->PathItems) > 1)
-    { 
+    {
       if($this->System->PathItems[1] == 'subscription') return($this->ShowSubscription());
         else if($this->System->PathItems[1] == 'rss') return($this->ShowRSS());
@@ -20 +20 @@
     } else return($this->ShowMain());
   }
-  
+
   function ShowView()
   {
@@ -52 +52 @@
           foreach($Enclosures as $Enclosure)
           {
-            if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
+            if(file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->System->Link('/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
           }
@@ -61 +61 @@
     return($Output);
   }
-  
+
   function ShowAdd()
   {
@@ -78 +78 @@
         if($this->System->User->CheckPermission('News', 'Insert', 'Group', $DbRow['Id']))
         {
-          if($DbRow['Id'] == $Category['Id']) $Selected = ' selected="1"'; 
+          if($DbRow['Id'] == $Category['Id']) $Selected = ' selected="1"';
             else $Selected = '';
           $Output .= '<option value="'.$DbRow['Id'].'"'.$Selected.'>'.$DbRow['Caption'].'</option>';
@@ -96 +96 @@
     return($Output);
   }
-  
+
   function ShowAdd2()
   {
@@ -122 +122 @@
         }
         $Enclosures = substr($Enclosures, 1);
-    
+
         $_POST['content'] = str_replace("\n",'<br />',$_POST['content']);
         $this->Database->insert('News', array('Category' => $Category['Id'], 'Title' => $_POST['title'],
           'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr,
-          'Enclosure' => $Enclosures, 'Author' => $this->System->User->User['Name'], 
+          'Enclosure' => $Enclosures, 'Author' => $this->System->User->User['Name'],
           'User' => $this->System->User->User['Id'], 'Link' => $_POST['link']));
         $Output .= 'Aktualita přidána!<br />Pokud budete chtít vaši aktualitu smazat, klikněte na odkaz Smazat v seznamu všech aktualit v kategorii.<br /><br />';
@@ -134 +134 @@
     return($Output);
   }
-  
+
   function ShowEdit()
   {
@@ -159 +159 @@
     return($Output);
   }
-  
+
   function ShowUpdate()
   {
     $Output = '';
-    $RemoteAddr = GetRemoteAddress();  
+    $RemoteAddr = GetRemoteAddress();
     $Category = $this->GetCategory();
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
@@ -175 +175 @@
         {
           $_POST['content'] = str_replace("\n", '<br />', $_POST['content']);
-          $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'], 
+          $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'],
             'Content' => $_POST['content'], 'Link' => $_POST['link']));
           $Output .= 'Aktualita uložena!<br />';
@@ -184 +184 @@
     return($Output);
   }
-  
+
   function ShowDelete()
   {
@@ -197 +197 @@
         // TODO: Make upload using general File class
         if($Row['Enclosure'] != '')
-        { 
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
@@ -211 +211 @@
     return($Output);
   }
-  
+
   function ShowList()
   {
@@ -226 +226 @@
       $Output .= '<strong>Seznam aktualit kategorie '.$Category['Caption'].':</strong><div style="font-size: small;">';
       $Output .= PagesList('?category='.$Category['Id'].'&amp;page=', $Page, $PageMax, $PerPage);
-    
+
       $DbResult = $this->Database->query('SELECT `News`.*, `User`.`Name` FROM `News` '.
         'LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `Category`='.$Category['Id'].' ORDER BY `News`.`Id` DESC LIMIT '.($Page * $PerPage).','.$PerPage);
@@ -249 +249 @@
           foreach($Enclosures as $Enclosure)
           {
-            if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
+            if(file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->System->Link('/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
           }
@@ -260 +260 @@
     return($Output);
   }
-  
+
   function GetCategory()
   {
@@ -267 +267 @@
     if(array_key_exists('category', $_POST)) $Category['Id'] = $_POST['category'] * 1;
     //if(is_null($Category)) throw new Exception('Kategorie neurčena');
-    else 
+    else
     {
       $DbResult = $this->Database->select('NewsCategory', '*', '`Id`='.$Category['Id'].' ORDER BY `Sequence`');
@@ -275 +275 @@
     return($Category);
   }
-  
+
   function ShowMain()
   {
-    $Output = '';    
+    $Output = '';
     if(array_key_exists('action',$_GET)) $Action = $_GET['action'];
       else $Action = '';
@@ -290 +290 @@
     return($Output);
   }
-  
+
   function ShowSubscription()
-  {     
+  {
     if(array_key_exists('build', $_GET))
     {
@@ -302 +302 @@
       $Select = $this->System->Config['Web']['RootFolder'].'/aktuality/rss/?select='.substr($Select, 1);
       $Output = 'Výsledný RSS kanál: <a href="'.$Select.'">'.$Select.'</a>';
-    } else 
+    } else
     {
       $Output = 'Vytvořte si vlastní RSS kanál, díky kterému budete moci automaticky sledovat novinky pomocí vaší RSS čtečky. Informace o technologii RSS a programech pro čtení kanálů najdete např. <a href="http://www.lupa.cz/clanky/prehled-rss-ctecek/">zde</a><br />'.
@@ -314 +314 @@
       $Output.= '<input type="submit" value="Sestavit"/>'.
         '</form>';
-    }  
-    return($Output);
-  }
-  
+    }
+    return($Output);
+  }
+
   function ShowRSS()
   {
@@ -332 +332 @@
     $CategoryName = '';
 
-    // Prepare WHERE condition 
-    if(array_key_exists('select', $_GET)) 
+    // Prepare WHERE condition
+    if(array_key_exists('select', $_GET))
     {
       $Where = '';
@@ -339 +339 @@
       foreach($Parts as $Part)
       {
-        $Where .= 'OR (`Category`='.($Part * 1).')'; 
+        $Where .= 'OR (`Category`='.($Part * 1).')';
       }
       $Where = substr($Where, 2);
@@ -354 +354 @@
     // Update news from discussion forum
     /*
-    $ForumCategory = 4;   
+    $ForumCategory = 4;
     $Database->select_db('forum');
     $DbResult = $Database->query('SELECT posts.post_time, posts_text.post_subject, posts_text.post_text, users.username, topics.topic_title FROM posts JOIN posts_text ON posts.post_id = posts_text.post_id JOIN users ON users.user_id = posts.poster_id JOIN topics ON topics.topic_id= posts.topic_id ORDER BY post_time DESC LIMIT '.$NewsCount);
@@ -361 +361 @@
     while($Row = $DbResult->fetch_array())
     {
-      $Row['post_text'] = StrTr($Row['post_text'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE"); 
-      $Row['post_text'] = str_replace("\n","<br>", $Row['post_text']); 
-      $Row['post_subject'] = StrTr($Row['post_subject'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE"); 
-      $Row['topic_title'] = StrTr($Row['topic_title'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE"); 
-      $Index = $Index + 1;    
-      
+      $Row['post_text'] = StrTr($Row['post_text'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
+      $Row['post_text'] = str_replace("\n","<br>", $Row['post_text']);
+      $Row['post_subject'] = StrTr($Row['post_subject'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
+      $Row['topic_title'] = StrTr($Row['topic_title'], "\x8A\x8D\x8E\x9A\x9D\x9E", "\xA9\xAB\xAE\xB9\xBB\xBE");
+      $Index = $Index + 1;
+
       $Title = $Row['topic_title'].'-'.$Row['post_subject'];
       $Content = $Row['post_text'];
@@ -374 +374 @@
       //echo('category='.$ForumCategory.' AND title="'.addslashes($Title).'" AND content="'.addslashes($Content).'" AND author="'.addslashes($Author).'" AND date="'.$Date.'"');
       $DbResult2 = $Database->select('news', '*', 'category='.$ForumCategory.' AND title="'.addslashes($Title).'" AND content="'.addslashes($Content).'" AND author="'.addslashes($Author).'" AND date="'.$Date.'"');
-      if($DbResult2->num_rows == 0) //echo('.'); else echo('x'); 
+      if($DbResult2->num_rows == 0) //echo('.'); else echo('x');
         $Database->insert('news', array('category' => $ForumCategory, 'title' => $Title, 'content' => $Content, 'author' => $Author, 'date' => $Date));
-        //echo($Date);  
+        //echo($Date);
       $Database->select_db('forum');
     }
@@ -388 +388 @@
       $EnclosuresText = '';
       if($Row['Enclosure'] != '')
-      { 
+      {
         $EnclosuresText .= '<br />Přílohy: ';
         $Enclosures = explode(';', $Row['Enclosure']);
         foreach($Enclosures as $Enclosure)
         {
-          if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
-            $EnclosuresText .= ' <a href="'.$this->System->Link('/aktuality/'.$UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
+          if(file_exists($this->UploadedFilesFolder.$Enclosure))
+            $EnclosuresText .= ' <a href="'.$this->System->Link('/aktuality/'.$this->UploadedFilesFolder.$Enclosure).'">'.$Enclosure.'</a>';
         }
       }
@@ -409 +409 @@
     $RSS = new RSS();
     $RSS->Title = $this->System->Config['Web']['Title'].' - Aktuality';
-    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/'; 
-    $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description']; 
-    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail']; 
+    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/';
+    $RSS->Description = 'Aktuality '.$this->System->Config['Web']['Description'];
+    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail'];
     $RSS->Items = $Items;
-    return($RSS->Generate());      
-  }  
+    return($RSS->Generate());
+  }
 }