Changeset 492

Timestamp:

Feb 27, 2013, 10:12:48 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Kontrola instalace z hlavního globálního skriptu.

Location:

trunk

Files:

• Common/Global.php (modified) (4 diffs)
• admin/index.php (modified) (1 diff)

trunk/Common/Global.php

@@ -3 +3 @@
 $Revision = 
 
-$ConfigFileName = dirname(__FILE__).'/../config.php';
 /* @var $System System */
 $System = NULL;
@@ -9 +8 @@
 $Database = NULL;
       
+$ConfigFileName = dirname(__FILE__).'/../config.php';
 if(file_exists($ConfigFileName)) include_once($ConfigFileName);
-  else die('Nenalezen konfigurační soubor '.$ConfigFileName.'!');
 include_once(dirname(__FILE__).'/Version.php');
+include_once(dirname(__FILE__).'/Update.php');
 include_once(dirname(__FILE__).'/Module.php');
 include_once(dirname(__FILE__).'/AppModule.php');
@@ -267 +267 @@
 function GlobalInit()
 {
-  global $Config, $Database, $System, $ScriptTimeStart, $ConfigFileName, $Mail, $Type;
+  global $Config, $Database, $System, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
+    $DatabaseRevision;
   
   date_default_timezone_set('Europe/Prague');
   $ScriptTimeStart = GetMicrotime();
+  
+  if(!isset($Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
+  
+   
   // SQL injection hack protection
   foreach($_POST as $Index => $Item) $_POST[$Index] = addslashes($Item);
@@ -282 +287 @@
   $Database->ShowSQLError = $Config['Web']['ShowSQLError'];
   $Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
+  
+  // Check database persistence structure
+  $UpdateManager = new UpdateManager();
+  $UpdateManager->Database = &$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.');
   
   $System = new System();

trunk/admin/index.php

@@ -16 +16 @@
 $UpdateInterface->DatabaseRevision = $DatabaseRevision;
 $UpdateInterface->Config = &$Config;
+$UpdateInterface->Updates = &$Updates;
+$UpdateInterface->FullInstall = 'FullInstall';
 $UpdateInterface->Show();