Changeset 577 for trunk/includes/global.php

Timestamp:

Sep 11, 2013, 10:37:54 PM (11 years ago)

Author:

chronos

Message:

• Modified: Moved some code from global to system file. System class is now serving as main application class. Now old files which still use ShowPage function need system initialization with $InitSystem = true; before global.php inclusion.
• Modified: Get rid of some global reference to $System, $Config and $User variables.
• Modified: Search result functionality moved to application module from action.php file.

File:

• trunk/includes/global.php (modified) (2 diffs)

trunk/includes/global.php

@@ -29 +29 @@
 include_once(dirname(__FILE__).'/../Modules/News/News.php');
 include_once(dirname(__FILE__).'/../Modules/Wiki/Wiki.php');
+include_once(dirname(__FILE__).'/../Modules/Search/Search.php');
 include_once(dirname(__FILE__).'/../Modules/FrontPage/FrontPage.php');
 
-GlobalInit();
-$User = &$System->User; // Back compatibility
-
-function GlobalInit()
-{
-  global $System, $ScriptStartTime, $TranslationTree, $User, $StopAfterUpdateManager,
-        $UpdateManager, $Config, $DatabaseRevision;
-
-  $ScriptStartTime = GetMicrotime();
-
-  if(isset($_SERVER['REMOTE_ADDR'])) session_start();
-
-  if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
-  date_default_timezone_set($Config['Web']['Timezone']);
-  
+
+// Back compatibility, will be removed
+if(isset($InitSystem) and $InitSystem)
+{
   $System = new System();
-  $System->Init();
-
-  // Check database persistence structure
-  $UpdateManager = new UpdateManager();
-  $UpdateManager->Database = $System->Database;
-  $UpdateManager->Revision = $DatabaseRevision;
-  if(!$UpdateManager->IsInstalled()) die('Systém vyžaduje instalaci databáze.');
-  if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze.');
-
-  // SQL injection hack protection
-  foreach($_POST as $Index => $Item)
-  {
-        if(is_array($_POST[$Index]))
-                foreach($_POST[$Index] as $Index2 => $Item2) $_POST[$Index][$Index2] = addslashes($Item2);
-        else $_POST[$Index] = addslashes($_POST[$Index]);
-  }
-  foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
-    
-  // TODO: Global initialized variable should be removed
-  $TranslationTree = GetTranslationTree();
-  
-  // Initialize application modules
-  $System->ModuleManager->RegisterModule(new ModuleError($System));
-  $System->ModuleManager->Modules['Error']->ShowError = $Config['Web']['ShowPHPError'];
-  $System->ModuleManager->RegisterModule(new ModuleLog($System));
-  $System->ModuleManager->RegisterModule(new ModuleUser($System));
-  $System->ModuleManager->RegisterModule(new ModuleAoWoW($System));
-  $System->ModuleManager->RegisterModule(new ModuleReferrer($System));
-  $System->ModuleManager->Modules['Referrer']->Excluded[] = $System->Config['Web']['Host'];
-  $System->ModuleManager->RegisterModule(new ModuleTeam($System));
-  $System->ModuleManager->RegisterModule(new ModuleDictionary($System));
-  $System->ModuleManager->RegisterModule(new ModuleTranslation($System));
-  $System->ModuleManager->RegisterModule(new ModuleImport($System));
-  $System->ModuleManager->RegisterModule(new ModuleExport($System));
-  $System->ModuleManager->RegisterModule(new ModuleServer($System));
-  $System->ModuleManager->RegisterModule(new ModuleClientVersion($System));
-  $System->ModuleManager->RegisterModule(new ModuleShoutBox($System));
-  $System->ModuleManager->RegisterModule(new ModuleNews($System));
-  $System->ModuleManager->RegisterModule(new ModuleWiki($System));
-  $System->ModuleManager->RegisterModule(new ModuleFrontPage($System));
-  $System->ModuleManager->StartAll();  
-}
+  $System->DoNotShowPage = true;
+        $System->Run();
+}
+
+class TempPage extends Page
+{
+        function Show()
+        {
+                global $TempPageContent;
+                return($TempPageContent);
+        }
+}
+function ShowPage($Content)
+{
+        global $TempPageContent, $System;
+
+        $TempPage = new TempPage($System);
+        $System->Pages['temporary-page'] = 'TempPage';
+        $_SERVER['REDIRECT_QUERY_STRING'] = 'temporary-page';
+        $TempPageContent = $Content;
+        $System->PathItems = ProcessURL();
+        $System->ShowPage();
+}
+
 
 function GetMicrotime()
@@ -634 +606 @@
   
   $IconName = array(
-        MESSAGE_INFORMATION => 'information', 
+          MESSAGE_INFORMATION => 'information', 
     MESSAGE_WARNING => 'warning', 
     MESSAGE_CRITICAL => 'critical'