Changeset 561 for trunk/includes

Timestamp:

Aug 13, 2013, 11:31:34 PM (12 years ago)

Author:

chronos

Message:

• Modified: New RSS channels are now registered by modules itself.
• Modified: ShoutBox transformed to application module.

Location:

trunk/includes

Files:

• Page.php (modified) (2 diffs)
• Version.php (modified) (1 diff)
• global.php (modified) (3 diffs)
• system.php (modified) (2 diffs)

trunk/includes/Page.php

@@ -156 +156 @@
 '<script type="text/javascript" src="'.$System->Link('/style/global.js').'"></script>'.
 '<link rel="shortcut icon" href="'.$System->Link('/images/favicon.ico').'" />';
-  if(isset($RSSChannels)) 
-  foreach($RSSChannels as $Channel)
+  foreach($System->RSSChannels as $Channel)
   {
     $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
@@ -180 +179 @@
   global $System, $ScriptStartTime, $User, $Revision, $ReleaseTime;
 
-    $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
-
-    $Output = '</td>'.
-      '<td class="menu2">';
-    $Output .= ShowTranslatedMenu();
-    $Output .= '</td>'.
-    '</tr><tr>'.
-    '<td colspan="4" class="page-bottom">Verze: '.$Revision.' ('.HumanDate($ReleaseTime).')'.
-    ' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a> &nbsp; '.
-    '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">Novinky</a> &nbsp; '.
-    $System->Config['Web']['WebCounter'];
-  
-    $Output .= '</td></tr>';
-    if($System->Config['Web']['ShowRuntimeInfo'] == true) 
-      $Output .= '<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>';
-    $Output .= '</table>'.
-      '</body>'.
-      '</html>';
-    $User->Store();
-    return($Output); 
+  $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
+  
+  $Output = '</td>'.
+                '<td class="menu2">';
+  $Output .= ShowTranslatedMenu();
+  $Output .= '</td>'.
+                '</tr><tr>'.
+                '<td colspan="4" class="page-bottom">Verze: '.$Revision.' ('.HumanDate($ReleaseTime).')'.
+                ' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a> &nbsp; '.
+                '<a href="http://svn.zdechov.net/trac/wowpreklad/log/trunk?verbose=on">Novinky</a> &nbsp; '.
+                $System->Config['Web']['WebCounter'];
+  
+  $Output .= '</td></tr>';
+  if($System->Config['Web']['ShowRuntimeInfo'] == true)
+        $Output .= '<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B &nbsp;&nbsp; <a href="http://validator.w3.org/check?uri='.htmlentities('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'?'.$_SERVER['QUERY_STRING']).'">HTML validator</a></td></tr>';
+  $Output .= '</table>'.
+                '</body>'.
+                '</html>';
+  $User->Store();
+  return($Output);
 }
 

trunk/includes/Version.php

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

trunk/includes/global.php

@@ -24 +24 @@
 include_once(dirname(__FILE__).'/../Modules/Server/Server.php');
 include_once(dirname(__FILE__).'/../Modules/ClientVersion/ClientVersion.php');
+include_once(dirname(__FILE__).'/../Modules/ShoutBox/ShoutBox.php');
 include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
 
@@ -71 +72 @@
   $System->ModuleManager->RegisterModule(new ModuleReferrer($System));
   $System->ModuleManager->Modules['Referrer']->Excluded[] = $System->Config['Web']['Host'];
-  $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
   $System->ModuleManager->RegisterModule(new ModuleTeam($System));
   $System->ModuleManager->RegisterModule(new ModuleDictionary($System));
@@ -79 +79 @@
   $System->ModuleManager->RegisterModule(new ModuleServer($System));
   $System->ModuleManager->RegisterModule(new ModuleClientVersion($System));
+  $System->ModuleManager->RegisterModule(new ModuleShoutBox($System));
+  $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
   $System->ModuleManager->StartAll();
 }
 
-$RSSChannels = array(
-  array('Title' => 'Změny systému', 'Channel' => 'news'),
-  array('Title' => 'Poslední překlady', 'Channel' => 'translation'),
-  array('Title' => 'Kecátko', 'Channel' => 'shoutbox'),
-);
+$System->RegisterRSS(array('Title' => 'Změny systému', 'Channel' => 'news'));
 
 function GetMicrotime()

trunk/includes/system.php

@@ -23 +23 @@
   var $ModuleManager;
   var $PathItems;
+  var $Menu;
+  var $RSSChannels;
   
   function __construct()
   {
     $this->Config = array();
+    $this->Menu = array();
+    $this->RSSChannels = array();
   }
   
@@ -133 +137 @@
   }
   
+  function RegisterRSS($Channel, $Pos = NULL)
+  {
+        if(is_null($Pos)) $this->RSSChannels[] = $Channel;
+          else {
+                array_splice($this->RSSChannels, $Pos, 0, array($Channel));
+          }
+  }
+  
   function SearchPage($PathItems, $Pages)
   {