Changeset 595 for trunk/Common/Setup/Setup.php

Timestamp:

Nov 3, 2013, 11:39:59 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Zahrnutí konfiguračního souboru přesunuto do aplikačního souboru z globálního obecného.
• Upraveno: V modulu Setup použití již existující instance UpdateManager.
• Opraveno: Chybné vracení pole aktualizací.

File:

• trunk/Common/Setup/Setup.php (modified) (4 diffs)

trunk/Common/Setup/Setup.php

@@ -69 +69 @@
           global $ConfigDefinition, $DatabaseRevision, $Config, $Updates;
           
+          $this->UpdateManager = $this->System->Setup->UpdateManager;
           $DefaultConfig = new DefaultConfig();
           $this->ConfigDefinition = $DefaultConfig->Get();
           $this->DatabaseRevision = $DatabaseRevision;
-          $this->Config = &$Config;
-          $Updates = new Updates();
-          $this->Updates = $Updates->Get();
+          $this->Config = &$Config; 
 
           $Output = '';
@@ -85 +84 @@
         $Output .= $this->LoginPanel();
       } else
-      {
-        $this->UpdateManager = new UpdateManager();
-        $this->UpdateManager->Database = $this->Database;
-        $this->UpdateManager->Revision = $this->DatabaseRevision;
-        $this->UpdateManager->Trace = $this->Updates;
-        $this->UpdateManager->InstallMethod = 'FullInstall';
-  
+      {  
         if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
           else $Action = '';
@@ -322 +315 @@
   function CreateConfig($Config)
   {
-  
     $Output = "<?php\n\n".
         "\$IsDeveloper = in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n";
@@ -378 +370 @@
     // Check database persistence structure
     $this->UpdateManager = new UpdateManager();
-    $this->UpdateManager->Database = &$this->Database;
+    $this->UpdateManager->Database = $this->Database;
     $this->UpdateManager->Revision = $DatabaseRevision;
+    $Updates = new Updates();
+    $this->UpdateManager->Trace = $Updates->Get();
+    $this->UpdateManager->InstallMethod = 'FullInstall';
   }