Changeset 582 for trunk/Common/System.php

Timestamp:

Oct 18, 2013, 11:35:13 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Nová třída pro správu konfigurace bude prozatím pokusně řešena souběžně se starou konfigurací.

File:

• trunk/Common/System.php (modified) (5 diffs)

trunk/Common/System.php

@@ -26 +26 @@
     $this->FormManager = new FormManager($this->Database);
     $this->ShowPage = true;
+    $this->ConfigManager = new Config();
   }  
   
@@ -96 +97 @@
   function Run()
   {
-        global $Config, $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
-      $DatabaseRevision;
+        global $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
+      $DatabaseRevision, $Config;
   
     date_default_timezone_set('Europe/Prague');
@@ -103 +104 @@
     $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);
@@ -111 +110 @@
     if(isset($_SERVER['REMOTE_ADDR'])) session_start();
 
-    // TODO: unset general global variable $Config after setting is loaded to objects 
+    $ConfigFileName = dirname(__FILE__).'/../config.php';     
+    if(file_exists($ConfigFileName)) 
+      $this->ConfigManager->LoadFromFile($ConfigFileName);
+    //$this->Config = $this->ConfigManager->GetAsArray();
     $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'];
+    
+    $this->Database->Connect($this->Config['Database']['Host'], $this->Config['Database']['User'], 
+      $this->Config['Database']['Password'], $this->Config['Database']['Database']);
+    $this->Database->Prefix = $this->Config['Database']['Prefix'];
+    $this->Database->charset($this->Config['Database']['Charset']);
+    $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
+    $this->Database->ShowSQLQuery = $this->Config['Web']['ShowSQLQuery'];
+    $this->RootURLFolder = $this->Config['Web']['RootFolder'];
+    $this->FormManager->Root = $this->Config['Web']['RootFolder'];
   
     // Check database persistence structure
@@ -133 +136 @@
   
     // Register and start existing modules
-    //include_once(dirname(__FILE__).'/../Modules/Setup/Setup.php');
-    //$this->ModuleManager->RegisterModule(new ModuleSetup($this));
-    //$this->ModuleManager->Modules['Setup']->Start();
+    include_once(dirname(__FILE__).'/../Modules/Setup/Setup.php');
+    $this->ModuleManager->RegisterModule(new ModuleSetup($this));
+    $this->ModuleManager->Modules['Setup']->Start();
     $this->ModuleManager->LoadModules();
     $this->ModuleManager->Modules['Setup']->Start();