Request 1582 (accepted)

Overview

Request 1582 (accepted)

No description set

Created by vanmeeuwen over 8 years ago
In state accepted
Open review for Admin

Submit kolab-syncroton

Submit package Kolab:Winterfell / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.3.2.tar.gz/config/config.inc.php.dist -> kolab-syncroton-2.3.3.tar.gz/config/config.inc.php.dist Changed

kolab-syncroton-2.3.2.tar.gz/lib/kolab_sync_backend_state.php -> kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync_backend_state.php Changed

kolab-syncroton-2.3.2.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -254,12 +254,12 @@
         }
 
         // Event reminder time
-        if ($config['ALARMS'] && ($minutes = $this->from_kolab_alarm($event))) {
-            $result['reminder'] = $minutes;
+        if ($config['ALARMS']) {
+            $result['reminder'] = $this->from_kolab_alarm($event);
         }
 
         $result['categories'] = array();
-        $result['attendees'] = array();
+        $result['attendees']  = array();
 
         // Categories, Roundcube Calendar plugin supports only one category at a time
         if (!empty($event['categories'])) {
@@ -543,10 +543,14 @@
             }
         }
 
-        if ($value && preg_match('/^-[PT]*([0-9]+)([WDHMS])$/', $value, $matches)) {
-            $value = intval($matches[1]);
+        if ($value && preg_match('/^([-+]*)[PT]*([0-9]+)([WDHMS])$/', $value, $matches)) {
+            $value = intval($matches[2]);
+
+            if ($value && $matches[1] != '-') {
+                return null;
+            }
 
-            switch ($matches[2]) {
+            switch ($matches[3]) {
             case 'S': $value = intval(round($value/60)); break;
             case 'H': $value *= 60; break;
             case 'D': $value *= 24 * 60; break;
@@ -562,6 +566,10 @@
      */
     protected function to_kolab_alarm($value, $event)
     {
+        if ($value === null || $value === '') {
+            return (array) $event['valarms'];
+        }
+
         $valarms     = array();
         $unsupported = array();
 
@@ -576,13 +584,11 @@
             }
         }
 
-        if ($value) {
-            $valarms[] = array(
-                'action'      => $current['action'] ?: 'DISPLAY',
-                'description' => $current['description'] ?: '',
-                'trigger'     => sprintf('-PT%dM', $value),
-            );
-        }
+        $valarms[] = array(
+            'action'      => $current['action'] ?: 'DISPLAY',
+            'description' => $current['description'] ?: '',
+            'trigger'     => sprintf('-PT%dM', $value),
+        );
 
         if (!empty($unsupported)) {
             $valarms = array_merge($valarms, $unsupported);
@@ -590,5 +596,4 @@
 
         return $valarms;
     }
-
 }

kolab-syncroton-2.3.2.tar.gz/lib/kolab_sync_data_email.php -> kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync_data_email.php Changed

kolab-syncroton-2.3.2.tar.gz/lib/kolab_sync_logger.php -> kolab-syncroton-2.3.3.tar.gz/lib/kolab_sync_logger.php Changed

kolab-syncroton-2.3.3.tar.gz/tests/data_calendar.php Added

@@ -0,0 +1,88 @@
+<?php
+
+class data_calendar extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test for kolab_sync_data_calendar::from_kolab_alarm()
+     */
+    function test_from_kolab_alarm()
+    {
+        $obj = new kolab_sync_data_calendar_test;
+
+        $result = $obj->from_kolab_alarm(array());
+        $this->assertSame(null, $result);
+
+        $event  = array('valarms' => array(array(
+            'action'  => 'DISPLAY',
+            'trigger' => 'PT5M',
+        )));
+        $result = $obj->from_kolab_alarm($event);
+        $this->assertSame(null, $result);
+
+        $event  = array('valarms' => array(array(
+            'action'  => 'DISPLAY',
+            'trigger' => '-PT5M',
+        )));
+        $result = $obj->from_kolab_alarm($event);
+        $this->assertSame(5, $result);
+
+        $event  = array('valarms' => array(array(
+            'action'  => 'DISPLAY',
+            'trigger' => 'PT0M',
+        )));
+        $result = $obj->from_kolab_alarm($event);
+        $this->assertSame(0, $result);
+
+        $event  = array('valarms' => array(array(
+            'action'  => 'DISPLAY',
+            'trigger' => '-PT0M',
+        )));
+        $result = $obj->from_kolab_alarm($event);
+        $this->assertSame(0, $result);
+
+        $event  = array('valarms' => array(array(
+            'action'  => 'DISPLAY',
+            'trigger' => 'PT0S',
+        )));
+        $result = $obj->from_kolab_alarm($event);
+        $this->assertSame(0, $result);
+    }
+
+    /**
+     * Test for kolab_sync_data_calendar::to_kolab_alarm()
+     */
+    function test_to_kolab_alarm()
+    {
+        $obj = new kolab_sync_data_calendar_test;
+
+        $result = $obj->to_kolab_alarm(null, array());
+        $this->assertSame(array(), $result);
+
+        $result = $obj->to_kolab_alarm(0, array());
+        $this->assertSame('-PT0M', $result[0]['trigger']);
+
+        $result = $obj->to_kolab_alarm(15, array());
+        $this->assertSame('-PT15M', $result[0]['trigger']);
+        $this->assertSame('DISPLAY', $result[0]['action']);
+    }
+}
+
+/**
+ * kolab_sync_data_calendar wrapper, so we can test protected methods too
+ */
+class kolab_sync_data_calendar_test extends kolab_sync_data_calendar
+{
+    function __construct()
+    {
+    }
+
+    public function from_kolab_alarm($value)
+    {
+        return parent::from_kolab_alarm($value);
+    }
+
+    public function to_kolab_alarm($value, $event)
+    {
+        return parent::to_kolab_alarm($value, $event);
+    }
+}

kolab-syncroton-2.3.2.tar.gz/tests/phpunit.xml -> kolab-syncroton-2.3.3.tar.gz/tests/phpunit.xml Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 1582 0

Request History

vanmeeuwen created request over 8 years ago

vanmeeuwen accepted review over 8 years ago

vanmeeuwen accepted request over 8 years ago

Please add a comment