From 2eb7943f2aeaec8efc74b16b7bedb56da9913abf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 23 Apr 2010 07:25:37 -0400
Subject: [PATCH] - code cleanup (mostly identation fixes)

---
 program/include/bugs.inc |  111 ++++++++++++++++++++++---------------------------------
 1 files changed, 45 insertions(+), 66 deletions(-)

diff --git a/program/include/bugs.inc b/program/include/bugs.inc
index 56b88c6..cf5855e 100644
--- 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-2010, RoudCube Dev - Switzerland                   |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -40,22 +40,21 @@
  * @param boolean Terminate script execution
  */
 function raise_error($arg=array(), $log=false, $terminate=false)
-  {
-  global $__page_content, $CONFIG, $OUTPUT, $ERROR_CODE, $ERROR_MESSAGE;
+{
+    global $__page_content, $CONFIG, $OUTPUT, $ERROR_CODE, $ERROR_MESSAGE;
   
-  // report bug (if not incompatible browser)
-  if ($log && $arg['type'] && $arg['message'])
-    log_bug($arg);
+    // report bug (if not incompatible browser)
+    if ($log && $arg['type'] && $arg['message'])
+        log_bug($arg);
 
-  // display error page and terminate script
-  if ($terminate)
-    {
-    $ERROR_CODE = $arg['code'];
-    $ERROR_MESSAGE = $arg['message'];
-    include("program/steps/error.inc");
-    exit;
+    // display error page and terminate script
+    if ($terminate) {
+        $ERROR_CODE = $arg['code'];
+        $ERROR_MESSAGE = $arg['message'];
+        include("program/steps/error.inc");
+        exit;
     }
-  }
+}
 
 
 /**
@@ -66,62 +65,42 @@
  */
 function log_bug($arg_arr)
 {
-  global $CONFIG;
-  $program = strtoupper($arg_arr['type']);
+    global $CONFIG;
+    $program = strtoupper($arg_arr['type']);
 
-  // write error to local log file
-  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 in %s on line %d (%s %s)\n",
-      date("d-M-Y H:i:s O", mktime()),
-      $program,
-      $arg_arr['message'],
-      $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')
-    {
-      syslog(LOG_ERR, $log_entry);
+    // write error to local log file
+    if ($CONFIG['debug_level'] & 1) {
+        $post_query = ($_SERVER['REQUEST_METHOD'] == 'POST' ? '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']) : '');
+        $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 (!write_log('errors', $log_entry)) {
+            // send error to PHPs error handler if write_log didn't succeed
+            trigger_error($arg_arr['message']);
+        }
     }
-    else if ($fp = @fopen($CONFIG['log_dir'].'/errors', 'a'))
-    {
-      // log_driver == 'file' is the default, assumed here.
-      fwrite($fp, $log_entry);
-      fclose($fp);
+
+    // resport the bug to the global bug reporting system
+    if ($CONFIG['debug_level'] & 2) {
+        // TODO: Send error via HTTP
     }
-    else
-    {
-      // send error to PHPs error handler
-      trigger_error($arg_arr['message']);
+
+    // show error if debug_mode is on
+    if ($CONFIG['debug_level'] & 4) {
+        print "<b>$program Error";
+
+        if (!empty($arg_arr['file']) && !empty($arg_arr['line']))
+            print " in $arg_arr[file] ($arg_arr[line])";
+
+        print ':</b>&nbsp;';
+        print nl2br($arg_arr['message']);
+        print '<br />';
+        flush();
     }
-  }
-
-  // resport the bug to the global bug reporting system
-  if ($CONFIG['debug_level'] & 2)
-  {
-    // TODO: Send error via HTTP
-  }
-
-  // show error if debug_mode is on
-  if ($CONFIG['debug_level'] & 4)
-  {
-    print "<b>$program Error";
-
-    if (!empty($arg_arr['file']) && !empty($arg_arr['line']))
-      print " in $arg_arr[file] ($arg_arr[line])";
-
-    print ":</b>&nbsp;";
-    print nl2br($arg_arr['message']);
-    print '<br />';
-    flush();
-  }
 }
 
 ?>

--
Gitblit v1.9.1