Changeset 589 for trunk/Common/System.php

Timestamp:

Nov 1, 2013, 4:22:59 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Správa instalace webu přetvořena z podadresáře admin do modulu Setup. Modul setup musí být funkční i v případě nenastavené nebo nedostupné databáze, konfiguračního souboru či neinstalované nebo neaktuální databáze.
• Přidáno: Metody Disconnect a Connected do třídy Database.

File:

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

trunk/Common/System.php

@@ -119 +119 @@
     $this->Config = &$Config;
     
-    $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'];
+    try { 
+      $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'];
+    } catch (Exception $E) {
+      //$Output .= 'Nelze se připojit k databázi.';
+    }
     $this->RootURLFolder = $this->Config['Web']['RootFolder'];
     $this->FormManager->Root = $this->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; 
@@ -142 +139 @@
     $this->ModuleManager->RegisterModule(new ModuleSetup($this));
     $this->ModuleManager->Modules['Setup']->Start();
-    $this->ModuleManager->LoadModules();
-    $this->ModuleManager->Modules['Setup']->Start();
-    $this->ModuleManager->StartAll();
+    if($this->ModuleManager->Modules['Setup']->CheckState())
+    {
+      $this->ModuleManager->LoadModules();
+      $this->ModuleManager->Modules['Setup']->Start();
+      $this->ModuleManager->StartAll();
+    }
     if($this->ShowPage)
     {