From cefd1d8c913aa81ddce83e9de7f5bfb22aa4b2d9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 25 Sep 2008 09:30:18 -0400
Subject: [PATCH] DRY: set (secure) cookies using rcmail::setcookie() + set session.only_use_cookies
---
program/include/bugs.inc | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/program/include/bugs.inc b/program/include/bugs.inc
index 78808c3..56b88c6 100644
--- a/program/include/bugs.inc
+++ b/program/include/bugs.inc
@@ -67,25 +67,32 @@
function log_bug($arg_arr)
{
global $CONFIG;
- $program = $arg_arr['type']=='xpath' ? 'XPath' : strtoupper($arg_arr['type']);
+ $program = strtoupper($arg_arr['type']);
// write error to local log file
if ($CONFIG['debug_level'] & 1)
{
- $log_entry = sprintf(
- "[%s] %s Error: %s in %s on line %d\n",
+ $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']);
-
+ $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 ($fp = @fopen($CONFIG['log_dir'].'/errors', 'a'))
+ if ($CONFIG['log_driver'] == 'syslog')
{
+ 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);
}
--
Gitblit v1.9.1