Imported Upstream version 0.3

[roundcube.git] / program / include / bugs.inc

diff --git a/program/include/bugs.inc b/program/include/bugs.inc
index e5dcf42236b4771d79969f3608770f704f72331a..4ce4998c4efdde65243a0c7322eda5d566f9a63f 100644 (file)
--- a/program/include/bugs.inc
+++ b/program/include/bugs.inc
@@ -5,7 +5,7 @@
  | program/include/bugs.inc                                              |
  |                                                                       |
  | This file is part of the RoudCube Webmail client                      |
- | Copyright (C) 2005-2007, RoudCube Dev - Switzerland                   |
+ | Copyright (C) 2005-2009, RoudCube Dev - Switzerland                   |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: bugs.inc 2025 2008-10-30 09:15:01Z alec $
+ $Id: bugs.inc 2862 2009-08-17 09:54:53Z thomasb $
 
 */
 
@@ -73,31 +73,16 @@ function log_bug($arg_arr)
   if ($CONFIG['debug_level'] & 1)
   {
     $post_query = ($_SERVER['REQUEST_METHOD'] == 'POST' ? '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']) : '');
-    $log_entry = sprintf("[%s] %s Error: %s%s (%s %s)\n",
-      date("d-M-Y H:i:s O", mktime()),
+    $log_entry = sprintf("%s Error: %s%s (%s %s)",
       $program,
       $arg_arr['message'],
       $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
       $_SERVER['REQUEST_METHOD'],
       $_SERVER['REQUEST_URI'] . $post_query);
-      
-    if (empty($CONFIG['log_dir']))
-      $CONFIG['log_dir'] = INSTALL_PATH.'logs';
-      
-    // try to open specific log file for writing
-    if ($CONFIG['log_driver'] == 'syslog')
+    
+    if (!write_log('errors', $log_entry))
     {
-      syslog(LOG_ERR, $log_entry);
-    }
-    else if ($fp = @fopen($CONFIG['log_dir'].'/errors', 'a'))
-    {
-      // log_driver == 'file' is the default, assumed here.
-      fwrite($fp, $log_entry);
-      fclose($fp);
-    }
-    else
-    {
-      // send error to PHPs error handler
+      // send error to PHPs error handler if write_log didn't succeed
       trigger_error($arg_arr['message']);
     }
   }