Changeset 516

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.

Location:

trunk

Files:

• Common/Global.php (modified) (5 diffs)
• Common/VarDumper.php (added)
• Common/Version.php (modified) (1 diff)
• Modules/Error (added)
• Modules/Error/Error.php (moved) (moved from trunk/Common/Error.php ) (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));

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 515; // Subversion revision
+$Revision = 516; // Subversion revision
 $DatabaseRevision = 515; 
 $ReleaseTime = '2013-04-08';

trunk/Modules/Error/Error.php

@@ -1 +1 @@
 <?php
 
-class ErrorHandler extends Module
+class ModuleError extends AppModule
 {
   var $Encoding;
@@ -7 +7 @@
   var $UserErrors;
     
-  function __construct()
+  function __construct($System)
   {
+    parent::__construct($System);
+    $this->Name = 'Error';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPLv3';
+    $this->Description = 'Error logging and reporting';
+    $this->Dependencies = array('Log');
+
     $this->Encoding = 'utf-8';
     $this->ShowError = false;
@@ -14 +22 @@
   }
   
-  function Init()
+  function Install()
   {
-    set_error_handler(array($this, 'Handle'));
+    parent::Install();
+  }
+
+  function UnInstall()
+  {
+    parent::UnInstall();
+  }  
+  
+  function Start()
+  {
+    parent::Start();
+        $this->ShowError = $this->System->Config['Web']['ShowPHPError'];
+    set_error_handler(array($this, 'ErrorHandler'));
+    set_exception_handler(array($this, 'ExceptionHandler'));
   }
   
-  function Handle($Number, $Message, $FileName, $LineNumber, $Variables)
+  function Stop()
   {
-    $Date = date('Y-m-d H:i:s');                // časové razítko položky
+        restore_error_handler();
+        restore_exception_handler();
+        parent::Stop();
+  }
+  
+  function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)
+  {
     $ErrorType = array
     (
@@ -39 +66 @@
     if(($this->UserErrors & $Number))
     {
-      $Error = '# '.$Date."\n";
       $Backtrace = debug_backtrace();
       $Backtrace[0]['function'] = $Message;
@@ -45 +71 @@
       $Backtrace[0]['file'] = $FileName;
       $Backtrace[0]['line'] = $LineNumber;
-      //$First = array_shift($Backtrace);
+      $this->Report($Backtrace);
+      if((E_ERROR | E_PARSE) & $Number) die(); 
+    }
+  }
+  
+  function ExceptionHandler(Exception $Exception) 
+  {
+    $Backtrace = $Exception->getTrace();    
+    array_unshift($Backtrace, array(
+      'function' => $Exception->getMessage(),
+      'file' => $Exception->getFile(),
+      'line' => $Exception->getLine(),
+    ));
+    $this->Report($Backtrace);
+    die();
+  }
+  
+  function Report($Backtrace)
+  {
+    $Date = date('Y-m-d H:i:s');                
+    $Error = '# '.$Date."\n";
+    foreach($Backtrace as $Item)
+    {
+      if(!array_key_exists('line', $Item)) $Item['line'] = '';
+      if(!array_key_exists('file', $Item)) $Item['file'] = '';
     
-      //array_unshift($Backtrace, $First);
-      //array_shift($Backtrace);
-      foreach($Backtrace as $Item)
-      {
-        $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
-        $Arguments = '';
-        if(array_key_exists('args', $Item) and is_array($Item['args']))
+      $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
+      $Arguments = '';
+      if(array_key_exists('args', $Item) and is_array($Item['args']))
         foreach($Item['args'] as $Item)
         {
-          if(is_object($Item)) ; 
+          if(is_object($Item)) ;
           else if(is_array($Item)) $Arguments .= "'".serialize($Item)."',";
           else $Arguments .= "'".$Item."',";
         }
         if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
-        $Error .= "\n";     
-      }
-      $Error .= "\n";
+        $Error .= "\n";
+    }
+    $Error .= "\n";
      
-      $this->System->Modules['Log']->NewRecord('Error', 'Log', $Error);    
+    $this->System->Modules['Log']->NewRecord('Error', 'Log', $Error);
     
-      //if($Config['Web']['ErrorLogFile'] != '')
-        // error_log($Error, 3, $Config['Web']['ErrorLogFile']);
-            // Pošli mi zprávu (pokud je to kritická chyba)
-         //mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $Error);
-          // Show error message
-            if($this->ShowError == true)
-          {
-              echo('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
-        '<meta http-equiv="Content-Language" content="cs">'."\n".
-        '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".
-        'Došlo k vnitřní chybě!<br/> O chybě byl uvědoměn správce webu a chybu brzy odstraní.<br/><br/>');
-            echo('<pre>'.$Error.'</pre><br/>');                 // V případě ladění chybu i zobraz
-          echo('</body></html>');
-            }
-      if((E_ERROR | E_PARSE) & $Number) die(); 
-    }
+    //if($Config['Web']['ErrorLogFile'] != '')
+    // error_log($Error, 3, $Config['Web']['ErrorLogFile']);
+    // Pošli mi zprávu (pokud je to kritická chyba)
+    //mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $Error);
+    // Show error message
+    if($this->ShowError == true)
+    {
+      echo('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
+          '<meta http-equiv="Content-Language" content="cs">'."\n".
+          '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".
+          'Došlo k vnitřní chybě!<br/> O chybě byl uvědoměn správce webu a chybu brzy odstraní.<br/><br/>');
+      echo('<pre>'.$Error.'</pre><br/>');                       // V případě ladění chybu i zobraz
+      echo('</body></html>');
+    }    
   }
 }