Changeset 578

Timestamp:

Oct 10, 2013, 8:50:31 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Hlavní spouštěcí kód přesunut z jednotky Global do aplikace System.

Location:

trunk

Files:

• Common/Application.php (added)
• Common/Global.php (modified) (2 diffs)
• Common/Page.php (modified) (1 diff)
• Common/System.php (modified) (4 diffs)
• Common/Version.php (modified) (1 diff)
• block/index.php (modified) (2 diffs)
• index.php (modified) (1 diff)
• missing.php (modified) (2 diffs)

trunk/Common/Global.php

@@ -21 +21 @@
 include_once(dirname(__FILE__).'/../FormClasses.php');
 
-function GlobalInit()
-{
-  global $Config, $Database, $System, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
-    $DatabaseRevision;
-  
-  date_default_timezone_set('Europe/Prague');
-  mb_internal_encoding("UTF-8");
-  $ScriptTimeStart = GetMicrotime();
-  
-  if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/">zde</a>.');
-   
-  // SQL injection hack protection
-  foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
-  foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
-
-  if(isset($_SERVER['REMOTE_ADDR'])) session_start();
-
-  $System = new System();
-  // TODO: unset general global variable $Config after setting is loaded to objects 
-  $System->Config = &$Config;
-  $System->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], 
-    $Config['Database']['Password'], $Config['Database']['Database']);
-  $System->Database->Prefix = $Config['Database']['Prefix'];
-  $System->Database->charset($Config['Database']['Charset']);
-  $System->Database->ShowSQLError = $Config['Web']['ShowSQLError'];
-  $System->Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
-  $System->RootURLFolder = $Config['Web']['RootFolder'];
-  $System->FormManager->Root = $Config['Web']['RootFolder'];
-  
-  // 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.');
-  
-  $Database = $System->Database; 
-  RegisterFormClasses($System->FormManager);  
-  
-  // Register and start existing modules
-  include_once(dirname(__FILE__).'/../Modules/System/System.php');
-  $System->ModuleManager->RegisterModule(new ModuleSystem($System));
-  $System->ModuleManager->Modules['System']->Start();
-  $System->ModuleManager->LoadModules();
-  $System->ModuleManager->StartAll();
-}
-
 $MonthNames = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 
         'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
@@ -389 +342 @@
   return($PathItems);
 }
-
-GlobalInit();

trunk/Common/Page.php

@@ -20 +20 @@
     $this->FormatHTML = $this->System->Config['Web']['FormatHTML'];
     $this->ShowRuntimeInfo = $this->System->Config['Web']['ShowRuntimeInfo'];
+  }
+  
+  function Show()
+  {
+        return('');
   }
 

trunk/Common/System.php

@@ -1 +1 @@
 <?php
 
-class System
+include_once(dirname(__FILE__).'/Application.php');
+include_once(dirname(__FILE__).'/Global.php');
+
+class System extends Application
 {
   /** @var Database */
@@ -13 +16 @@
   var $PathItems;
   var $RootURLFolder;
+  var $ShowPage;
 
   function __construct()
@@ -21 +25 @@
     $this->Database = new Database();
     $this->FormManager = new FormManager($this->Database);
+    $this->ShowPage = true;
   }  
   
@@ -87 +92 @@
   {
     return($this->RootURLFolder.$Target);
-  }   
+  }
+  
+  function Run()
+  {
+        global $Config, $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
+      $DatabaseRevision;
+  
+    date_default_timezone_set('Europe/Prague');
+    mb_internal_encoding("UTF-8");
+    $ScriptTimeStart = GetMicrotime();
+  
+    if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/">zde</a>.');
+   
+    // SQL injection hack protection
+    foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
+    foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
+
+    if(isset($_SERVER['REMOTE_ADDR'])) session_start();
+
+    // TODO: unset general global variable $Config after setting is loaded to objects 
+    $this->Config = &$Config;
+    $this->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], 
+      $Config['Database']['Password'], $Config['Database']['Database']);
+    $this->Database->Prefix = $Config['Database']['Prefix'];
+    $this->Database->charset($Config['Database']['Charset']);
+    $this->Database->ShowSQLError = $Config['Web']['ShowSQLError'];
+    $this->Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
+    $this->RootURLFolder = $Config['Web']['RootFolder'];
+    $this->FormManager->Root = $Config['Web']['RootFolder'];
+  
+    // Check database persistence structure
+    $UpdateManager = new UpdateManager();
+    $UpdateManager->Database = &$this->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.');
+  
+    $Database = $this->Database; 
+    RegisterFormClasses($this->FormManager);  
+  
+    // Register and start existing modules
+    //include_once(dirname(__FILE__).'/../Modules/Setup/Setup.php');
+    //$this->ModuleManager->RegisterModule(new ModuleSetup($this));
+    //$this->ModuleManager->Modules['Setup']->Start();
+    $this->ModuleManager->LoadModules();
+    $this->ModuleManager->StartAll();
+    if($this->ShowPage)
+    {
+      $this->PathItems = ProcessURL();
+      $this->ShowPage();
+    }   
+  }
 }

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 577; // Subversion revision
+$Revision = 578; // Subversion revision
 $DatabaseRevision = 574; // SQL structure revision
-$ReleaseTime = '2013-10-03';
+$ReleaseTime = '2013-10-10';

trunk/block/index.php

@@ -1 +1 @@
 <?php
 
-include_once('../Common/Global.php');
+include_once('../Common/System.php');
 
 class BlockPage extends Page
@@ -42 +42 @@
 }
 
+$System = new System();
+$System->ShowPage = false;
+$System->Run();
 $System->AddModule(new BlockPage($System));
 $System->Modules['BlockPage']->GetOutput();
+

trunk/index.php

@@ -1 +1 @@
 <?php
 
-include_once('Common/Global.php');
-$System->PathItems = ProcessURL();
-$System->ShowPage();
+include_once('Common/System.php');
+
+$System = new System();
+$System->Run();

trunk/missing.php

@@ -1 +1 @@
 <?php
-include_once('Common/Global.php');
+include_once('Common/System.php');
 
 class MissingPage extends Page
@@ -13 +13 @@
 }
 
+$System = new System();
+$System->ShowPage = false;
+$System->Run();
 $System->AddModule(new MissingPage($System));
 $System->Modules['MissingPage']->GetOutput();
+