Changeset 516 for trunk/Common/Global.php

Timestamp:

Apr 9, 2013, 11:36:09 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Obsluha chybových stavů přepracována na aplikační modul.

File:

• trunk/Common/Global.php (modified) (5 diffs)

trunk/Common/Global.php

@@ -12 +12 @@
 include_once(dirname(__FILE__).'/Version.php');
 include_once(dirname(__FILE__).'/Update.php');
+include_once(dirname(__FILE__).'/VarDumper.php');
 include_once(dirname(__FILE__).'/Module.php');
 include_once(dirname(__FILE__).'/AppModule.php');
 include_once(dirname(__FILE__).'/Database.php');
-include_once(dirname(__FILE__).'/Error.php');
 include_once(dirname(__FILE__).'/Code.php');
 include_once(dirname(__FILE__).'/Mail.php');
@@ -28 +28 @@
   
 // Application modules
+include_once(dirname(__FILE__).'/../Modules/Error/Error.php');
 include_once(dirname(__FILE__).'/../Modules/File/File.php');
 include_once(dirname(__FILE__).'/../Modules/Meteostation/Meteostation.php');
@@ -174 +175 @@
 
   $System = new System();
-  $System->Config = $Config;
+  $System->Config = &$Config;
   $System->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
   $System->Database->Prefix = $Config['Database']['Prefix'];
@@ -190 +191 @@
   // Init old modules
   $System->AddModule(new Log());
-  $System->AddModule(new ErrorHandler());
-  $System->Modules['ErrorHandler']->ShowErrors = $Config['Web']['ShowPHPError'];
-  $System->Modules['ErrorHandler']->Init();
   $System->AddModule(new User());
   if(isset($_SERVER['REMOTE_ADDR'])) $System->Modules['User']->Check();
@@ -200 +198 @@
   $System->Modules['Finance']->DirectoryId = $Config['Finance']['DirectoryId'];
   $System->Modules['Finance']->LoadMonthParameters(0);
+  $System->Modules['Log']->Database->LastQuery = 'ssd';
   RegisterFormClasses($System->FormManager);
   
+  
   // Register new modules
+  $System->ModuleManager->RegisterModule(new ModuleError($System));
   $System->ModuleManager->RegisterModule(new ModuleFile($System));
   $System->ModuleManager->RegisterModule(new ModuleMeteostation($System));