Changeset 589 for trunk/Common

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.

Location:

trunk/Common

Files:

• Database.php (modified) (2 diffs)
• Global.php (modified) (1 diff)
• System.php (modified) (2 diffs)
• Version.php (modified) (1 diff)

trunk/Common/Database.php

@@ -28 +28 @@
 {
   var $Prefix = '';
-  var $Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
-  var $Type = 'mysql';  // mysql, pgsql
+  var $Functions;
+  var $Type;
   var $PDO;
   var $Error = '';
   var $insert_id;
   var $LastQuery = '';
-  var $ShowSQLError = false;
-  var $ShowSQLQuery = false;
+  var $ShowSQLError;
+  var $ShowSQLQuery;
   
   function __construct()
-  {    
+  { 
+    $this->Type = 'mysql';  // mysql, pgsql
+    $this->ShowSQLError = false;
+    $this->ShowSQLQuery = false;
+    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
   }
   
@@ -46 +50 @@
       else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
       else $ConnectionString = '';
-    $this->PDO = new PDO($ConnectionString, $User, $Password);
+    try {
+      $this->PDO = new PDO($ConnectionString, $User, $Password);
+
+    } catch (Exception $E)
+    {
+      unset($this->PDO);
+      throw new Exception($E->getMessage());
+    }
+  }
+  
+  function Disconnect()
+  {
+    unset($this->PDO);
+  }
+  
+  function Connected()
+  {
+    return(isset($this->PDO));
   }
   

trunk/Common/Global.php

@@ -9 +9 @@
 if(file_exists($ConfigFileName)) include_once($ConfigFileName);
 include_once(dirname(__FILE__).'/Version.php');
-include_once(dirname(__FILE__).'/Update.php');
 include_once(dirname(__FILE__).'/VarDumper.php');
 include_once(dirname(__FILE__).'/Base.php');

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)
     {

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 588; // Subversion revision
+$Revision = 589; // Subversion revision
 $DatabaseRevision = 584; // SQL structure revision
 $ReleaseTime = '2013-11-01';