Changeset 545 for trunk

Timestamp:

Jun 18, 2013, 6:07:52 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Prvotní podpora pro modulární systém.
• Přidáno: Podpora pro používání pěkných URL.
• Upraveno: Vstupní stránka se generuje z modulu FrontPage.
• Upraveno: Stránka banners převedena na modul Referrer.

Location:

trunk

Files:

• . (modified) (1 prop)
• .htaccess (added)
• Modules (added)
• Modules/AoWoW (added)
• Modules/AoWoW/AoWoW.php (added)
• Modules/FrontPage (added)
• Modules/FrontPage/FrontPage.php (added)
• Modules/Referrer (added)
• Modules/Referrer/Referrer.php (added)
• TranslationList.php (modified) (2 diffs)
• banners.php (deleted)
• includes/AppModule.php (added)
• includes/Page.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (4 diffs)
• includes/system.php (modified) (3 diffs)
• index.php (modified) (2 diffs)

trunk

@@ -5 +5 @@
 .project
 .buildpath
+Query.log

@@ -5 +5 @@
 .project
 .buildpath
+Query.log

trunk/TranslationList.php

@@ -109 +109 @@
   }
   $Output .= '</select></td>';
-  if($Filter['Language'] != 0) $LanguageFilter = ' AND (`Language` = '.$Filter['Language'].')';
+  if($Filter['Language'] != 0) $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
     else $LanguageFilter = '';
 
@@ -153 +153 @@
   {
     if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
-    else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`Language` = '.$Config['OriginalLanguage'].') '.
+    else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$Config['OriginalLanguage'].') '.
       'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
       '(`Sub`.`Language` <> '.$Config['OriginalLanguage'].')'.$LanguageFilter.$UserFilter.

trunk/includes/Page.php

@@ -1 +1 @@
 <?php
-
-function ShowShoutbox()
-{
-  global $System, $Config, $User, $System;
-  
-  $Output = '<strong><a href="'.$System->Link('/action.php?action=ShoutBoxView').'">Kecátko:</a></strong>';
-  if($User->Licence(LICENCE_USER)) 
-    $Output .= ' <a href="'.$System->Link('/action.php?action=shoutbox').'">Vložit</a>';
-  $Output .= '<div class="box"><table>';
-  $DbResult = $System->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
-  while($Line = $DbResult->fetch_assoc())
-    $Output .= '<tr><td><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>';
-  $Output .= '</table></div>';
-  return($Output);
-}
 
 function ShowTopBar()
@@ -340 +325 @@
 }
 
+class Page
+{
+  var $System;
+  var $Database;
+  
+  function __construct($System)
+  {
+    $this->System = &$System;
+    $this->Database = &$System->Database;    
+  }
+        
+        function Show()
+        {
+                return('');
+  } 
+  
+  function GetOutput()
+  {
+        $Output = $this->Show();
+        $Output = ShowPage($Output);     
+        return($Output);
+  }
+}
+
 ?>

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 543; // Subversion revision
+$Revision = 545; // Subversion revision
 $DatabaseRevision = 543; // Database structure revision 
-$ReleaseTime = '2013-06-17';
+$ReleaseTime = '2013-06-18';
 
 ?>

trunk/includes/global.php

@@ -11 +11 @@
   include_once(dirname(__FILE__).'/config.php');
 include_once(dirname(__FILE__).'/Version.php');
+include_once(dirname(__FILE__).'/AppModule.php');
+
+// Include application modules
+// TODO: Make modules configurable
+include_once(dirname(__FILE__).'/../Modules/AoWoW/AoWoW.php');
+include_once(dirname(__FILE__).'/../Modules/Referrer/Referrer.php');
+include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
 
 GlobalInit();
@@ -52 +59 @@
   // TODO: Global initialized variable should be removed
   $TranslationTree = GetTranslationTree();
-
-  LogReferrer();
+  
+  // Initialize application modules
+  $System->ModuleManager->RegisterModule(new AoWoW($System));
+  $System->ModuleManager->RegisterModule(new Referrer($System));
+  $System->ModuleManager->Modules['Referrer']->Excluded[] = $System->Config['Web']['Host'];
+  $System->ModuleManager->RegisterModule(new FrontPage($System));
+  $System->ModuleManager->StartAll();
 }
 
@@ -633 +645 @@
   if($Session) $_SESSION[$Name] = $Result;
   return($Result);
-}
-
-function LogReferrer()
-{
-  global $System;
-
-  if(array_key_exists('HTTP_REFERER', $_SERVER)) 
-  {
-    $Referrer = addslashes($_SERVER['HTTP_REFERER']);
-    $HostName = substr($Referrer, strpos($Referrer, '/') + 2);
-    $HostName = substr($HostName, 0, strpos($HostName, '/'));
-    if($HostName != $System->Config['Web']['Host'])
-    {
-      $DbResult = $System->Database->query('SELECT `Id` FROM `Referrer` WHERE `Web` = "'.$HostName.'"');
-      if($DbResult->num_rows > 0)
-      {
-        $DbRow = $DbResult->fetch_assoc();
-        $System->Database->query('UPDATE `Referrer` SET `Hits` = `Hits` + 1, `DateLast` = NOW(), `LastURL` = "'.addslashes($Referrer).'" WHERE `Id` = '.$DbRow['Id']);
-      } else $System->Database->query('INSERT INTO `Referrer` (`Web`, `DateFirst`, `DateLast`, `LastURL`, `Hits`) VALUES ("'.$HostName.'", NOW(), NOW( ), "'.addslashes($Referrer).'", 1)');
-    }
-  }
 }
 
@@ -744 +735 @@
 }
 
+function ProcessURL()
+{
+        if(array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
+                $PathString = $_SERVER['REDIRECT_QUERY_STRING'];
+        else $PathString = '';
+        if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
+        $PathItems = explode('/', $PathString);
+        if(strpos($_SERVER['REQUEST_URI'], '?') !== false)
+                $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
+        else $_SERVER['QUERY_STRING'] = '';
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
+        return($PathItems);
+}
+
 ?>

trunk/includes/system.php

@@ -21 +21 @@
   var $Database;
   var $Config;
+  var $ModuleManager;
+  var $PathItems;
   
   function __construct()
@@ -40 +42 @@
     $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
     $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
+    $this->ModuleManager = new AppModuleManager();
   }
   
@@ -50 +53 @@
   function Link($Target)
   {
-    global $Config;
-    
-    return($Config['Web']['BaseURL'].$Target);
+    return($this->Config['Web']['BaseURL'].$Target);
   } 
+  
+  function RegisterPage($Path, $Handler)
+  {
+    if(is_array($Path))
+    {
+      $Page = &$this->Pages;
+      $LastKey = array_pop($Path);
+      foreach($Path as $PathItem)
+      {
+        $Page = &$Page[$PathItem];       
+      }
+      if(!is_array($Page)) $Page = array('' => $Page);
+      $Page[$LastKey] = $Handler;
+    } else $this->Pages[$Path] = $Handler;
+  }
+  
+  function SearchPage($PathItems, $Pages)
+  {
+    if(count($PathItems) > 0) $PathItem = $PathItems[0];
+      else $PathItem = '';
+    if(array_key_exists($PathItem, $Pages))
+    {
+      if(is_array($Pages[$PathItem])) 
+      {
+        array_shift($PathItems);
+        return($this->SearchPage($PathItems, $Pages[$PathItem]));
+      } else return($Pages[$PathItem]);
+    } else return('');
+  }
+  
+  function PageNotFound()
+  {
+    return('Page '.implode('/', $this->PathItems).' not found.');
+  }
+  
+  function ShowPage()
+  {
+    /* @var $Page Page */
+    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);     
+    if($ClassName != '') 
+    {
+      $Page = new $ClassName($this);
+      $Page->GetOutput();
+    } else echo($this->PageNotFound());
+  }
 } 
-
-?>

trunk/index.php

@@ -2 +2 @@
 
 include_once('includes/global.php');
-  
-function ShowNews()
-{
-  global $System;
 
-  $Output = '<strong>Změny systému:</strong><div class="NewsBox">';
-  $DbResult = $System->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()
-{
-  global $System, $Config;
-
-  $Count = 40;
-  $Output = '<strong>Poslední překlady:</strong>';
-  //'<div class="NewsBox">';
-  
-  $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
-  $Query = '';
-  $UnionItems = array();
-  $DbResult = $System->Database->query($GroupListQuery);
-  if($DbResult->num_rows > 0)
-  {
-  while($DbRow = $DbResult->fetch_assoc())
-  {
-    $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
-    'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
-    $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
-    $DbRow['TablePrefix'].'` AS `T`'.
-    ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.$Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
-    $Count.') AS `T`';
-  }
-  $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
-  ' FROM ('.implode(' UNION ', $UnionItems).') AS `TT`'.
-  ' JOIN `User` ON `User`.`Id` = `TT`.`User`'.
-  ' ORDER BY `ModifyTime` DESC LIMIT '.$Count;
-  $DbResult = $System->Database->query($Query);
-  $Output .= '<table class="MiniTable"><tr><th>Datum</th><th>Kdo</th><th>Nový</th><th>Zdroj</th><th>Skupina</th></tr>';
-  while($DbRow = $DbResult->fetch_assoc())
-  {
-    $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
-    '<td><a href="user.php?user='.$DbRow['UserId'].'">'.$DbRow['UserName'].'</a></td>'.
-    '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a></td>'.
-    '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a></td>'.
-    '<td><a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a></td></tr>';  
-  }
-  $Output .= '</table>';
-  } 
-  return($Output);
-}
-
-function ShowWelcome()
-{
-  global $Config;
-  
-  // Cookies have to be used before any text is sent to output 
-  if(!array_key_exists('HideWelcome', $_COOKIE)) $_COOKIE['HideWelcome'] = 0;
-  if(isset($_GET['Action']))
-  {
-    if($_GET['Action'] == 'HideWelcome') $_COOKIE['HideWelcome'] = 1;
-    if($_GET['Action'] == 'UnHideWelcome') $_COOKIE['HideWelcome'] = 0;
-  }
-  setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
-  
-  if(isset($_COOKIE['HideWelcome']) and ($_COOKIE['HideWelcome'] == 1))
-  {
-    $Action = '<a href="?Action=UnHideWelcome">Odkrýt úvod</a>';
-    $HideWelcome = 'display: none';
-  } else 
-  {
-    $Action = '<a href="?Action=HideWelcome">Skrýt úvod</a>';
-    $HideWelcome = '';
-  }
-
-  // Echo text even if it is hidden because of caching by external searching engines
-  return('<div style="'.$HideWelcome.'">'.
-  '<div id="bannertitle">'.$Config['Web']['Title'].'</div>'.
-  'Otevřený webový systém pro překládání textů ze hry World of Warcraft (WoW).<br />'.
-  '<ul>'.
-  '<li>Projekt je provozován jako otevřený vyznává principy volnosti a otevřenosti. Proto jsou texty volně ke stažení.</li>'.
-  '<li>Projekt slouží k týmovému překladu. Kdokoliv může přispět přeložením textů a uveřejněním odkazu popř. banneru na svých stránkách.</li>'.
-  '<li>Projekt není zaměřen pouze na jeden server a umožňuje společné překládání lidem z různých serverů. Překladatelé mohou překládat v týmech podle jména svého serveru a exportovat texty pouze od vybraných překladatelů.</li>'.
-  '<li>Přeložené texty lze volně stahovat v různých tvarech jako XML, SQL, Addon a Lua. Přeložené texty lze tedy snadno importovat do svého free serveru nebo použít v jiných projektech.</li>'.
-  '<li>Cílem projektu je přeložit všechny texty ze hry. Nikoliv pouze texty výprav (questů).</li>'.
-  '<li>Texty lze překládat do dvou jazyků, češtiny a slovenštiny.</li>'.
-  '</ul></div>'.$Action);
-}
 
 HandleLoginForm();
@@ -100 +8 @@
 $Output = '';
 if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
-$Output .= '<br />'.  
-'<table class="Home"><tr><td colspan="3">'.ShowWelcome().
-'</td></tr>'.
-'<tr><td>'.ShowLastTranslated().'</td>'.
-'<td class="news-box">'.ShowNews().'</td>'.
-'<td>'.ShowShoutBox().'</td>'.
-'</tr></table>'; 
-         
-ShowPage($Output);
+
+$System->PathItems = ProcessURL();
+$System->ShowPage();       
 
 ?>

@@ -5 +5 @@
 .project
 .buildpath
+Query.log