Changeset 589 for trunk/Modules/Setup/Update.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/Modules/Setup/Update.php (moved) (moved from trunk/Common/Update.php ) (6 diffs)

trunk/Modules/Setup/Update.php

@@ -1 +1 @@
 <?php
-
-include_once('Database.php');
 
 class UpdateManager
@@ -30 +28 @@
   function IsInstalled()
   {      
+    debug_backtrace();
           $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
     return($DbResult->num_rows > 0);    
@@ -88 +87 @@
   var $Revision;
   var $Updates;
+  var $Database;
   
   function __construct()
@@ -108 +108 @@
   {
     $YesNo = array(false => 'Ne', true => 'Ano');
-    $Output = '<h3>Správa instance</h3>'.
-      'Je instalováno: '.$YesNo[$this->UpdateManager->IsInstalled()].'<br/>';
-    if($this->UpdateManager->IsInstalled())
-      $Output .= 'Je aktuální: '.$YesNo[$this->UpdateManager->IsUpToDate()].'<br/>'.
-      'Verze databáze: '.$this->UpdateManager->GetDbVersion().'<br/>';
-    $Output .= 'Verze databáze kódu: '.$this->UpdateManager->Revision.'<br/>'.
-      '<form action="" method="post">';
-    if($this->UpdateManager->IsInstalled())
-    {
-      if(!$this->UpdateManager->IsUpToDate())
-        $Output .= '<input type="submit" name="update" value="Aktualizovat"/> ';
-      $Output .= '<input type="submit" name="insert_sample_data" value="Vložit vzorová data"/> ';
-      $Output .= '<input type="submit" name="uninstall" value="Odinstalovat"/> ';
-    } else $Output .= '<input type="submit" name="install" value="Instalovat"/> ';
+    $Output = '<form action="" method="post">';
+    
+    $Output .= 'Je připojení k databázi: '.$YesNo[$this->UpdateManager->Database->Connected()].'<br/>';
+    if($this->UpdateManager->Database->Connected())
+    {
+      $Output .= 'Je instalováno: '.$YesNo[$this->UpdateManager->IsInstalled()].'<br/>';
+      if($this->UpdateManager->IsInstalled())
+        $Output .= 'Je aktuální: '.$YesNo[$this->UpdateManager->IsUpToDate()].'<br/>'.
+        'Verze databáze: '.$this->UpdateManager->GetDbVersion().'<br/>';
+      $Output .= 'Verze databáze kódu: '.$this->UpdateManager->Revision.'<br/>';
+      if($this->UpdateManager->IsInstalled())
+      {
+        if(!$this->UpdateManager->IsUpToDate())
+          $Output .= '<input type="submit" name="update" value="Aktualizovat"/> ';
+        $Output .= '<input type="submit" name="insert_sample_data" value="Vložit vzorová data"/> ';
+        $Output .= '<input type="submit" name="uninstall" value="Odinstalovat"/> ';
+      } else $Output .= '<input type="submit" name="install" value="Instalovat"/> ';
+    }
     $Output .= '<input type="submit" name="configure" value="Nastavit"/> ';
     $Output .= '<input type="submit" name="logout" value="Odhlásit"/> ';
@@ -146 +150 @@
       } else
       {
-        date_default_timezone_set('Europe/Prague');
-        // 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();
-    
-        $Database = new Database();
-        $Database->Connect($this->Config['Database']['Host'], $this->Config['Database']['User'], 
-           $this->Config['Database']['Password'], $this->Config['Database']['Database']);
-        $Database->Prefix = $this->Config['Database']['Prefix'];
-        $Database->charset($this->Config['Database']['Charset']);
-        $Database->ShowSQLError = $this->Config['Web']['ShowSQLError'];
-        $Database->ShowSQLQuery = $this->Config['Web']['ShowSQLQuery'];
-    
         $this->UpdateManager = new UpdateManager();
-        $this->UpdateManager->Database = $Database;
+        $this->UpdateManager->Database = $this->Database;
         $this->UpdateManager->Revision = $this->DatabaseRevision;
         $this->UpdateManager->Trace = $this->Updates;
@@ -222 +211 @@
     }
     $Output .= '</body></html>';
-    echo($Output);
+    return($Output);
   }