Changeset 838 for trunk/includes/system.php

Timestamp:

Jan 9, 2016, 11:45:01 PM (8 years ago)

Author:

chronos

Message:

• Modified: Some libraries moved to Common package located at Packages directory.
• Modified: Application class System renamed to Core. System class is not just basic parent class for application.
• Fixed: alert file now use same application class as other files.
• Modified: Error application module.

File:

• trunk/includes/system.php (modified) (8 diffs)

trunk/includes/system.php

@@ -1 +1 @@
 <?php
 
-include_once('Database.php');
-include_once('Application.php');
-
-class System extends Application
+class Core extends Application
 {
-  var $Database;
   var $Config;
-  var $ModuleManager;
   var $PathItems;
   var $Menu;
   var $DoNotShowPage;
   var $OnPageNotFound;
+  var $Pages;
 
   function __construct()
   {
+    parent::__construct();
     $this->Config = array();
     $this->Menu = array();
@@ -21 +18 @@
     $this->DoNotShowPage = false;
     $this->OnPageNotFound = array();
+    $this->Pages = array();
   }
 
@@ -28 +26 @@
 
     $this->Config = $Config;
-    $this->Database = new Database();
     $this->Database->Connect($this->Config['Database']['Host'],
       $this->Config['Database']['User'], $this->Config['Database']['Password'],
@@ -36 +33 @@
     $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
     $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
-    $this->ModuleManager = new AppModuleManager();
 
     $this->PathItems = ProcessURL();
@@ -59 +55 @@
     $this->Menu = array
     (
-   /*     array(
-            'Title' => T('Files'),
-            'Hint' => 'Stahování různých pomocných souborů a programů',
-            'Link' => $this->Link('/download.php'),
-            'Permission' => LICENCE_ANONYMOUS,
-            'Icon' => '',
-        ),
-        */
-        array(
-            'Title' => T('Instructions'),
-            'Hint' => 'Informace k překladu hry',
-            'Link' => $this->Link('/info.php'),
-            'Permission' => LICENCE_ANONYMOUS,
-            'Icon' => '',
-        ),
-        array(
-            'Title' => T('Data source'),
-            'Hint' => 'Informace o překladových skupinách',
-            'Link' => $this->Link('/TranslationList.php?action=grouplist'),
-            'Permission' => LICENCE_ANONYMOUS,
-            'Icon' => '',
-        ),
-        array(
-            'Title' => T('Presentation'),
-            'Hint' => 'Prezentace a motivace překladu',
-            'Link' => $this->Link('/promotion.php'),
-            'Permission' => LICENCE_ANONYMOUS,
-            'Icon' => '',
-        ),
-        array(
-            'Title' => T('IRC chat'),
-            'Hint' => 'IRC chat pro překladatele',
-            'Link' => 'http://embed.mibbit.com/?server=game.zdechov.net%3A6667&amp;channel=%23wowpreklad&amp;forcePrompt=true&amp;charset=utf-8',
-            'Permission' => LICENCE_ANONYMOUS,
-            'Icon' => '',
-        ),
-        array(
-            'Title' => T('Administration'),
-            'Hint' => 'Volby pro správu',
-            'Link' => $this->Link('/admin/'),
-            'Permission' => LICENCE_ADMIN,
-            'Icon' => '',
-        ),
+      /*     array(
+       'Title' => T('Files'),
+       'Hint' => 'Stahování různých pomocných souborů a programů',
+       'Link' => $this->Link('/download.php'),
+       'Permission' => LICENCE_ANONYMOUS,
+       'Icon' => '',
+      ),
+    */
+      array(
+        'Title' => T('Instructions'),
+        'Hint' => 'Informace k překladu hry',
+        'Link' => $this->Link('/info.php'),
+        'Permission' => LICENCE_ANONYMOUS,
+        'Icon' => '',
+      ),
+      array(
+        'Title' => T('Data source'),
+        'Hint' => 'Informace o překladových skupinách',
+        'Link' => $this->Link('/TranslationList.php?action=grouplist'),
+        'Permission' => LICENCE_ANONYMOUS,
+        'Icon' => '',
+      ),
+      array(
+        'Title' => T('Presentation'),
+        'Hint' => 'Prezentace a motivace překladu',
+        'Link' => $this->Link('/promotion.php'),
+        'Permission' => LICENCE_ANONYMOUS,
+        'Icon' => '',
+      ),
+      array(
+        'Title' => T('IRC chat'),
+        'Hint' => 'IRC chat pro překladatele',
+        'Link' => 'http://embed.mibbit.com/?server=game.zdechov.net%3A6667&amp;channel=%23wowpreklad&amp;forcePrompt=true&amp;charset=utf-8',
+        'Permission' => LICENCE_ANONYMOUS,
+        'Icon' => '',
+      ),
+      array(
+        'Title' => T('Administration'),
+        'Hint' => 'Volby pro správu',
+        'Link' => $this->Link('/admin/'),
+        'Permission' => LICENCE_ADMIN,
+        'Icon' => '',
+      ),
     );
   }
@@ -107 +103 @@
   function Run()
   {
-    global $System, $ScriptStartTime, $TranslationTree, $User, $StopAfterUpdateManager,
+    global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager,
       $UpdateManager, $Config, $DatabaseRevision;
 
@@ -139 +135 @@
 
     // Initialize application modules
-    $this->ModuleManager->RegisterModule(new ModuleError($System));
-    $this->ModuleManager->Modules['Error']->ShowError = $Config['Web']['ShowPHPError'];
-    $this->ModuleManager->RegisterModule(new ModuleLog($System));
-    $this->ModuleManager->RegisterModule(new ModuleUser($System));
-    $this->ModuleManager->RegisterModule(new ModuleAoWoW($System));
-    $this->ModuleManager->RegisterModule(new ModuleReferrer($System));
-    $this->ModuleManager->Modules['Referrer']->Excludes[] = $System->Config['Web']['Host'];
-    $this->ModuleManager->RegisterModule(new ModuleTeam($System));
-    $this->ModuleManager->RegisterModule(new ModuleDictionary($System));
-    $this->ModuleManager->RegisterModule(new ModuleTranslation($System));
-    $this->ModuleManager->RegisterModule(new ModuleImport($System));
-    $this->ModuleManager->RegisterModule(new ModuleExport($System));
-    $this->ModuleManager->RegisterModule(new ModuleServer($System));
-    $this->ModuleManager->RegisterModule(new ModuleClientVersion($System));
-    $this->ModuleManager->RegisterModule(new ModuleShoutBox($System));
-    $this->ModuleManager->RegisterModule(new ModuleNews($System));
-    $this->ModuleManager->RegisterModule(new ModuleWiki($System));
-    $this->ModuleManager->RegisterModule(new ModuleSearch($System));
-    $this->ModuleManager->RegisterModule(new ModuleFrontPage($System));
-    $this->ModuleManager->RegisterModule(new ModuleDownload($System));
-    $this->ModuleManager->RegisterModule(new ModuleForum($System));
-    $this->ModuleManager->RegisterModule(new ModuleRedirection($System));
+    $this->ModuleManager->RegisterModule(new ModuleError($this));
+    $this->ModuleManager->Modules['Error']->ErrorHandler->ShowError = $Config['Web']['ShowPHPError'];
+    $this->ModuleManager->RegisterModule(new ModuleLog($this));
+    $this->ModuleManager->RegisterModule(new ModuleUser($this));
+    $this->ModuleManager->RegisterModule(new ModuleAoWoW($this));
+    $this->ModuleManager->RegisterModule(new ModuleReferrer($this));
+    $this->ModuleManager->Modules['Referrer']->Excludes[] = $this->Config['Web']['Host'];
+    $this->ModuleManager->RegisterModule(new ModuleTeam($this));
+    $this->ModuleManager->RegisterModule(new ModuleDictionary($this));
+    $this->ModuleManager->RegisterModule(new ModuleTranslation($this));
+    $this->ModuleManager->RegisterModule(new ModuleImport($this));
+    $this->ModuleManager->RegisterModule(new ModuleExport($this));
+    $this->ModuleManager->RegisterModule(new ModuleServer($this));
+    $this->ModuleManager->RegisterModule(new ModuleClientVersion($this));
+    $this->ModuleManager->RegisterModule(new ModuleShoutBox($this));
+    $this->ModuleManager->RegisterModule(new ModuleNews($this));
+    $this->ModuleManager->RegisterModule(new ModuleWiki($this));
+    $this->ModuleManager->RegisterModule(new ModuleSearch($this));
+    $this->ModuleManager->RegisterModule(new ModuleFrontPage($this));
+    $this->ModuleManager->RegisterModule(new ModuleDownload($this));
+    $this->ModuleManager->RegisterModule(new ModuleForum($this));
+    $this->ModuleManager->RegisterModule(new ModuleRedirection($this));
+    $this->ModuleManager->FileName = dirname(__FILE__).'/../Config/ModulesConfig.php';
+    // TODO: Allow control from web which modules should be installed
+    $this->ModuleManager->InstallAll();
     $this->ModuleManager->StartAll();
 
@@ -276 +275 @@
     if($this->System->User->Licence(LICENCE_USER))
     {
-      //$DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);
+      //$DbResult =$this->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$this->System->User->Team);
       //$Team = $DbResult->fetch_assoc();
       //$Output .= ''<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>';