lib/kolab_sync_logger.php lib/kolab_sync.php

[Aleksander Machniak]

 lib/kolab_sync.php        |    2 +-
 lib/kolab_sync_logger.php |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78339d3ae6720b99c3493edaa2310a436b5f771e
Author: Aleksander Machniak <alec at alec.pl>
Date:   Wed Feb 6 15:19:17 2013 +0100

    Fix logging broken with per-user log implementation

diff --git a/lib/kolab_sync.php b/lib/kolab_sync.php
index d8c7599..66e4de6 100644
--- a/lib/kolab_sync.php
+++ b/lib/kolab_sync.php
@@ -349,7 +349,7 @@ class kolab_sync extends rcube
             }
         }
 
-        $this->config->set('log_dir', $log_dir . DIRECTORY_SEPARATOR);
+        $this->config->set('log_dir', $log_dir);
     }
 
 
diff --git a/lib/kolab_sync_logger.php b/lib/kolab_sync_logger.php
index bea0beb..2807cad 100644
--- a/lib/kolab_sync_logger.php
+++ b/lib/kolab_sync_logger.php
@@ -76,10 +76,10 @@ class kolab_sync_logger extends Zend_Log
                 break;
             }
 
-            $logfile = $log_dir . $file;
+            $logfile = $log_dir . DIRECTORY_SEPARATOR . $file;
         }
         else if ($logfile[0] != '/') {
-            $logfile = $log_dir . $logfile;
+            $logfile = $log_dir . DIRECTORY_SEPARATOR . $logfile;
         }
 
         if (!is_string($message)) {