Changeset 858 for trunk/includes

Timestamp:

Jan 21, 2016, 9:54:58 AM (9 years ago)

Author:

chronos

Message:

• Modified: Custom install script replaced by more sophisticated Setup class which also allows to configure system parameters and application modules.

Location:

trunk/includes

Files:

• Global.php (modified) (1 diff)
• System.php (modified) (4 diffs)
• Update.php (deleted)

trunk/includes/Global.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
-include_once(dirname(__FILE__).'/System.php');
-include_once(dirname(__FILE__).'/Update.php');
-include_once(dirname(__FILE__).'/PageEdit.php');
 if(file_exists(dirname(__FILE__).'/../Config/Config.php'))
   include_once(dirname(__FILE__).'/../Config/Config.php');
-  else die('Config file Config/Config.php not found');
+include_once(dirname(__FILE__).'/System.php');
+include_once(dirname(__FILE__).'/../Application/DefaultConfig.php');
+include_once(dirname(__FILE__).'/PageEdit.php');
 include_once(dirname(__FILE__).'/../Application/Version.php');
 require_once(dirname(__FILE__).'/../HTML/BBCodeParser2.php');

trunk/includes/System.php

@@ -29 +29 @@
     $this->Config = $Config;
     date_default_timezone_set($this->Config['Web']['Timezone']);
-
+    mb_internal_encoding("UTF-8");
+
+    if(isset($this->Config['Database']))
+    {
     $this->Database->Connect($this->Config['Database']['Host'],
       $this->Config['Database']['User'], $this->Config['Database']['Password'],
@@ -37 +40 @@
     $this->Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
     $this->Database->LogSQLQuery = $this->Config['Web']['LogSQLQuery'];
+    }
 
     $this->LocaleManager = new LocaleManager($this);
@@ -88 +92 @@
   {
     global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager,
-      $UpdateManager, $DatabaseRevision;
+      $UpdateManager;
 
     $ScriptStartTime = GetMicrotime();
     if(GetRemoteAddress() != '') session_start();
-
-    if(!isset($this->Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
-
-    $this->Init();
-
-    // 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. Pokračujte <a href="'.$this->Link('/Application/install.php').'">zde</a>');
-    if(!$UpdateManager->IsUpToDate()) die('Systém vyžaduje aktualizaci databáze. Pokračujte <a href="'.$this->Link('/Application/install.php').'">zde</a>');
 
     // SQL injection hack protection
@@ -112 +105 @@
     }
     foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($_GET[$Index]);
+
+    $this->Init();
+
+    // Register and start existing modules
+    $this->Setup = new Setup($this);
+    $this->Setup->Start();
+    $this->Setup->UpdateManager->VersionTable = 'DbVersion';
+    if($this->Setup->CheckState())
+    {
+      $this->ModuleManager->Start();
+    }
 
     // TODO: Global initialized variable should be removed