Changeset 212 for trunk

Timestamp:

May 10, 2009, 12:27:57 PM (15 years ago)

Author:

george

Message:

• Upraveno: Ignorování souborů příloh aktualit. Smazání starých uložených v repozitáři.
• Upraveno: Zformátování kódu obsluhy chyb.

Location:

trunk

Files:

• aktuality/uploads (modified) (1 prop)
• aktuality/uploads/00-evil_nine_-_they_live-(mapacda007)-web-2008-l'offi-front.jpg (deleted)
• aktuality/uploads/2_ZO_Usneseni.pdf (deleted)
• aktuality/uploads/2_ZO_Zapis.pdf (deleted)
• aktuality/uploads/3_ZO_Usneseni.pdf (deleted)
• aktuality/uploads/3_ZO_Zapis.pdf (deleted)
• aktuality/uploads/Cover.jpg (deleted)
• aktuality/uploads/DC081115001.jpg (deleted)
• aktuality/uploads/Folder.jpg (deleted)
• aktuality/uploads/GBOY - GGIRL.jpg (deleted)
• aktuality/uploads/Meat.jpg (deleted)
• aktuality/uploads/P7280002.JPG (deleted)
• aktuality/uploads/P7280003.JPG (deleted)
• aktuality/uploads/Poison Rework(more music for Jilted G).wav (deleted)
• aktuality/uploads/T1.jpg (deleted)
• aktuality/uploads/T2.jpg (deleted)
• aktuality/uploads/Yobi.jpg (deleted)
• aktuality/uploads/asus_a6000u.jpg (deleted)
• aktuality/uploads/autorun.bmp (deleted)
• aktuality/uploads/hp_deskjet_656.gif (deleted)
• aktuality/uploads/ibm_300GL_desktop.jpg (deleted)
• aktuality/uploads/mon17_adi5pd.gif (deleted)
• aktuality/uploads/sonyericsson-k300i.jpg (deleted)
• aktuality/uploads/vizitka.jpg (deleted)
• config.sample.php (modified) (1 diff)
• error.php (modified) (1 diff)
• system (modified) (1 prop)

trunk/config.sample.php

@@ -22 +22 @@
     'Admin' => 'Admin',
     'AdminEmail' => 'admin@localhost',
-    'ShowError' => false,
     'ShowSQLError' => false,
     'ShowSQLQuery' => false,
+    'ShowPHPError' => false,
     'ShowRuntimeInfo' => false,
     'ErrorLogFile' => '/var/www/html/dev/centrala/www/php_script_error.log',    

trunk/error.php

@@ -1 +1 @@
 <?php
 
-// Obsluha chyb v1.1.1 //
-include_once('config.php');
-
-//error_reporting(0);                                   // Vypni interní obsluhu chyb
-
-function CustomErrorHandler($errno, $errmsg, $filename, $linenum, $vars)
+function CustomErrorHandler($Number, $Message, $Filename, $LineNumber, $Variables)
 {
   global $Config;
   
-  $dt = date('Y-m-d H:i:s');            // časové razítko položky
-  $errortype = array(
-    1 => "Error",
-    2 => "Warning",
-    4 => "Parsing Error",
-    8 => "Notice",
-    16 => "Core Error",
-    32 => "Core Warning",
-    64 => "Compile Error",
-    128 => "Compile Warning",
-    256 => "User Error",
-    512 => "User Warning",
-    1024 => "User Notice"
+  $Date = date("Y-m-d H:i:s");          // časové razítko položky
+  $ErrorType = array
+  (
+    1 => 'Error',
+    2 => 'Warning',
+    4 => 'Parsing Error',
+    8 => 'Notice',
+    16 => 'Core Error',
+    32 => 'Core Warning',
+    64 => 'Compile Error',
+    128 => 'Compile Warning',
+    256 => 'User Error',
+    512 => 'User Warning',
+    1024 => 'User Notice'
   );
-  $user_errors = E_ALL;  //E_ERROR | E_WARNING | E_PARSE;
+  $UserErrors = E_ALL;  //E_ERROR | E_WARNING | E_PARSE;
   
-  if(($user_errors & $errno))
+  if(($UserErrors & $Number))
   {
-    $err = '# '.$dt.' : '.$errmsg.' on line '.$linenum."\n";
+    $Error = '# '.$Date.' : '.$Message.' on line '.$LineNumber."\n";
     $Backtrace = debug_backtrace();
-    array_shift($Backtrace);
+    $Backtrace[0]['function'] = '';
+    $Backtrace[0]['args'] = '';
+    //$First = array_shift($Backtrace);
+    print_r($First);
+    
+    //array_unshift($Backtrace, $First);
     //array_shift($Backtrace);
     //print_r($Backtrace);
     foreach($Backtrace as $Item)
     {
-      $err .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
-      $arguments = '';
-      if(array_key_exists('args',$Item))
-      if(is_array($Item['args']))
-      foreach($Item['args'] as $Arg)
-      {
-        if(is_array($Arg)) $arguments .= "'".serialize($Arg)."',";
-        else $arguments .= "'".$Arg."',";
-      }
-      if(strlen($arguments) > 0) $err .= '('.substr($arguments,0,-1).")";
-      $err .= "\n";
+      $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_array($Item)) $Arguments .= "'".serialize($Item)."',";
+          else $Arguments .= "'".$Item."',";
+        }
+      if(strlen($Arguments) > 0) $Error .= '('.substr($Arguments, 0, -1).')';
+      $Error .= "\n";
      
     }
-    $err .= "\n";
-    //echo('Uvnitř'.$errno);
-    if($Config['Web']['ErrorLogFile'] != '')
-      error_log($err, 3, $Config['Web']['ErrorLogFile']);                               // Ulož do chybového protokolu
-          //$err = "Datum: ".$dt."\nHlášení: ".$errmsg."\nSkript: ".$filename."\nŘádek: ".$linenum;
-    // mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $err);          // Pošli mi zprávu (pokud je to kritická chyba)
-          echo('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs"><head>'.
-    '<meta http-equiv="content-language" content="cs" />'.
-    '<meta http-equiv="content-type" content="text/html; charset=utf-8" /></head><body>'.
-    'Došlo k vnitřní chybě!<br /> O chybě byl uvědoměn správce webu a chybu brzy odstraní.<br /><br />');
-        if($Config['Web']['ShowError'] == true) echo('<pre>'.$err.'</pre><br />');                      // V případě ladění chybu i zobraz
-    echo('</body></html>');
-    if((E_ERROR | E_PARSE) & $errno) die(); 
-  }// else echo($errmsg.'<br>');
+    $Error .= "\n";
+    //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($Config['Web']['ShowPHPError'] == 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=iso-8859-2"></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(); 
+  }
 }
 
-set_error_handler('CustomErrorHandler');                                // Aktivuj novou obsluhu chyb
+set_error_handler('CustomErrorHandler');
 
 ?>