@@ -37,7 +37,7 @@

 %global upstream_version 2.4.2

 Name:           kolab-syncroton

-Version: 2.4.2.11

+Version: 2.4.2.12

 Release:        1%{?dist}

 Summary:        ActiveSync for Kolab Groupware

​

@@ -1,4 +1,4 @@

-kolab-syncroton (2.4.2.11-0~kolab1) unstable; urgency=low

+kolab-syncroton (2.4.2.12-0~kolab1) unstable; urgency=low

   * Release version 2.4.2

​

@@ -30,6 +30,7 @@

 {

     public $mode;

+    protected $log_driver;

     protected $logfile;

     protected $format;

     protected $log_dir;

@@ -44,6 +45,7 @@

         $this->mode    = intval($mode);

         $this->logfile = $rcube->config->get('activesync_log_file');

+        $this->log_driver = $rcube->config->get('log_driver');

         $this->format  = $rcube->config->get('log_date_format', 'd-M-Y H:i:s O');

         $this->log_dir = $rcube->config->get('log_dir');

@@ -149,6 +151,13 @@

         $date    = rcube_utils::date_format($this->format);

         $logline = sprintf("%s: %s %s\n", $date, $method, $message);

+        // write message with file name when configured to log to STDOUT

+        if ($this->log_driver == 'stdout') {

+            $stdout = "php://stdout";

+            file_put_contents($stdout, $logline, FILE_APPEND);

+            return;

+        }

+

         if ($fp = @fopen($logfile, 'a')) {

             fwrite($fp, $logline);

             fflush($fp);

​

@@ -1749,13 +1749,13 @@

         if (strcasecmp($folder, 'INBOX') === 0) {

             // INBOX is always inbox, prevent from issues related with a change of

             // folder type annotation (it can be initially unset).

-            $type = 2;

+            $as_type = 2;

         } else {

-            $type = self::type_kolab2activesync($type);

+            $as_type = self::type_kolab2activesync($type);

             // fix type, if there's no type annotation it's detected as UNKNOWN we'll use 'mail' (12)

-            if ($type == 1) {

-                $type = 12;

+            if ($as_type == 1) {

+                $as_type = 12;

             }

         }

@@ -1764,7 +1764,7 @@

             'serverId'    => $folder_id,

             'parentId'    => count($items) ? $this->folder_id(implode($delim, $items), $type) : 0,

             'displayName' => rcube_charset::convert($name, 'UTF7-IMAP', kolab_sync::CHARSET),

-            'type'        => $type,

+            'type'        => $as_type,

             // for internal use

             'imap_name'   => $folder,

         ;

​

@@ -11,7 +11,6 @@

     ignoreErrors:

         - |Access to an undefined property Syncroton_Model_.*|

         - |Access to offset .* on an unknown class An.|

-        - |Property rcube::\$user .*|

     paths:

         - lib

​

@@ -2,7 +2,7 @@

 Source: kolab-syncroton

 Binary: kolab-syncroton

 Architecture: all

-Version: 1:2.4.2.11-1~kolab1

+Version: 1:2.4.2.12-1~kolab1

 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Homepage: http://www.kolab.org/

​