From d079afd44fdfca34631ca6d0c85d406aee25b3bd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 02 Dec 2009 05:48:06 -0500
Subject: [PATCH] - use absolute paths to prevent errors when writing to logfiles from shutdown function
---
plugins/filesystem_attachments/filesystem_attachments.php | 5 ++---
program/include/rcube_config.php | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
index dce2de2..d5f5553 100644
--- a/plugins/filesystem_attachments/filesystem_attachments.php
+++ b/plugins/filesystem_attachments/filesystem_attachments.php
@@ -52,8 +52,7 @@
$rcmail = rcmail::get_instance();
// use common temp dir for file uploads
- // #1484529: we need absolute path on Windows for move_uploaded_file()
- $temp_dir = realpath($rcmail->config->get('temp_dir'));
+ $temp_dir = $rcmail->config->get('temp_dir');
$tmpfname = tempnam($temp_dir, 'rcmAttmnt');
if (move_uploaded_file($args['path'], $tmpfname) && file_exists($tmpfname)) {
@@ -77,7 +76,7 @@
if (!$args['path']) {
$rcmail = rcmail::get_instance();
- $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+ $temp_dir = $rcmail->config->get('temp_dir');
$tmp_path = tempnam($temp_dir, 'rcmAttmnt');
if ($fp = fopen($tmp_path, 'w')) {
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 0aa6f8c..e30b625 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -68,9 +68,9 @@
$this->prop['skin'] = 'default';
// fix paths
- $this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
- $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
-
+ $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
+ $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp';
+
// fix default imap folders encoding
foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
$this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
--
Gitblit v1.9.1