Changeset 562 for trunk

Timestamp:

Aug 13, 2013, 11:45:33 PM (11 years ago)

Author:

chronos

Message:

• Modified: News admin announcement message system transformed to application module.

Location:

trunk

Files:

• Modules/FrontPage/FrontPage.php (modified) (2 diffs)
• Modules/News (added)
• Modules/News/News.php (added)
• action.php (modified) (2 diffs)
• admin/index.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (2 diffs)

trunk/Modules/FrontPage/FrontPage.php

@@ -11 +11 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Main welcome page';
-    $this->Dependencies = array();
+    $this->Dependencies = array('News', 'User', 'ShoutBox', 'Translation');
   }
   
@@ -81 +81 @@
                         '</td></tr>'.
                         '<tr><td>'.$this->ShowLastTranslated().'</td>'.
-                        '<td class="news-box">'.$this->ShowNews().'</td>'.
+                        '<td class="news-box">'.$this->System->ModuleManager->Modules['News']->ShowBox().'</td>'.
                         '<td>'.$this->System->ModuleManager->Modules['ShoutBox']->ShowBox().'</td>'.
                         '</tr></table>';
          return($Output);
-  } 
-
-  function ShowNews()
-  {
-        $Output = '<strong>Změny systému:</strong><div class="NewsBox">';
-        $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`'.
-                        ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-        while($DbRow = $DbResult->fetch_assoc())
-                $Output .= '<div><strong>'.$DbRow['Title'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].' ('.$DbRow['Name'].')</div>';
-        $Output .= '<a href="action.php?action=news">Všechny zprávy</a>';
-        $Output .= '</div>';
-        return($Output);
-  }
+  }  
   
   function ShowLastTranslated()

trunk/action.php

@@ -184 +184 @@
 }
 
-function ShowNewsHistory()
-{
-  global $System, $User;
-  
-  $DbResult = $System->Database->query('SELECT COUNT(*) FROM `News`');
-  $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);    
-
-  $Output = '<h3>Novinky</h3>'.$PageList['Output']; 
-  if($User->Licence(LICENCE_ADMIN)) $Output .= ' <a href="admin/?action=addnew">Vložit</a>';
-  $Output .= '<div class="shoutbox">';
-  $DbResult = $System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
-        '`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())
-    $Output .= '<div><strong>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</strong><br/> '.$Line['Text'].' ('.$Line['User'].')</div>';
-  $Output .= '</div>'.$PageList['Output'];
-  return($Output); 
-}
 
 if(array_key_exists('group', $_GET)) $GroupId = LoadGroupIdParameter();
@@ -209 +191 @@
 if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
 
-if($Action == 'news') $Output = ShowNewsHistory();
 else if($Action == 'search') $Output = Search();
 else if($Action == 'dbkit') $Output = DatabaseKit();

trunk/admin/index.php

@@ -21 +21 @@
   '<a href="'.$System->Link('/admin/?action=delerrlog').'">Vymázání chybových záznamů</a><br/>'.
   '<small>Provede vymazání všech chybových záznamů v logu</small><br/><br/>'.    
-  '<a href="'.$System->Link('/admin/?action=addnew').'">Přidání aktuality</a><br/>'.
+  '<a href="'.$System->Link('/news/?a=add').'">Přidání aktuality</a><br/>'.
   '<small>Přidá aktulitu na hlavní stranu projektu</small><br/><br/>'.    
   '<a href="'.$System->Link('/admin/?action=testing').'">Testování</a><br/>'.
   '<small>Testovací funkce</small><br/><br/>';    
-  return($Output);
-}
-
-function ShowNewForm()
-{
-  global $User;
-  
-  $Output = '<form action="?action=addnew" method="POST">'.
-  'Uživatel: '.$User->Name.'('.$User->Id.')<br/> '.  
-  'Nadpis: <input type="text" name="title" size="40"/><br/>'.
-  'Obsah: <textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea><br/>'.
-  '<input type="submit" value="Uložit"/><br/>'.
-  '</form>';
-  return($Output);
-}
-
-function SaveNew()
-{
-  global $System, $Config, $User;
-  
-  if(array_key_exists('text', $_POST) and array_key_exists('title', $_POST)) 
-  {
-    $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
-      $User->Id.', "'.$_POST['text'].'")';
-    $System->Database->query($querty);
-    $Output = ShowMessage('Aktualita uložena.');
-    WriteLog('Vložena nová aktualita', LOG_TYPE_ADMINISTRATION);
-  } else $Output = ShowMessage('Nezadány údaje', MESSAGE_CRITICAL);
   return($Output);
 }
@@ -117 +89 @@
     else if($_GET['action'] == 'testing') $Output .= Testing();
     else if($_GET['action'] == 'phpinfo') $Output .= ShowPHPInfo();
-    else if($_GET['action'] == 'addnew') 
-    {
-      $Output .= SaveNew();
-      $Output .= ShowNewForm();
-    } else
-      $Output .= ShowMenu();
+    else $Output .= ShowMenu();
   } else $Output .= ShowMenu();  
 } else $Output .= ShowMessage('Nemáte oprávnění.', MESSAGE_CRITICAL);
       
 ShowPage($Output);
-
-?>

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 561; // Subversion revision
+$Revision = 562; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
 $ReleaseTime = '2013-08-13';

trunk/includes/global.php

@@ -25 +25 @@
 include_once(dirname(__FILE__).'/../Modules/ClientVersion/ClientVersion.php');
 include_once(dirname(__FILE__).'/../Modules/ShoutBox/ShoutBox.php');
+include_once(dirname(__FILE__).'/../Modules/News/News.php');
 include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
 
@@ -80 +81 @@
   $System->ModuleManager->RegisterModule(new ModuleClientVersion($System));
   $System->ModuleManager->RegisterModule(new ModuleShoutBox($System));
+  $System->ModuleManager->RegisterModule(new ModuleNews($System));
   $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
   $System->ModuleManager->StartAll();
 }
-
-$System->RegisterRSS(array('Title' => 'Změny systému', 'Channel' => 'news'));
 
 function GetMicrotime()