Merge pull request #297 in ZP/z-push from...

Merge pull request #297 in ZP/z-push from bugfix/ZP-981-error-deleting-an-all-day-occurrence to develop

* commit 'e1c51ed4':
  ZP-981 Error deleting an all-day occurrence on a mobile device. Some code style fixes.

src/backend/kopano/mapiprovider.php

@@ -6,7 +6,7 @@
 *
 * Created   :   14.02.2011
 *
-* Copyright 2007 - 2015 Zarafa Deutschland GmbH
+* Copyright 2007 - 2016 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
@@ -1263,8 +1263,9 @@ class MAPIProvider {
                         if(!isset($recur["deleted_occurences"]))
                             $recur["deleted_occurences"] = array();
 
-                        array_push($recur["deleted_occurences"], $this->getDayStartOfTimestamp($exception->exceptionstarttime));
-                    } else {
+                        array_push($recur["deleted_occurences"], $this->getDayStartOfTimestamp($this->getLocaltimeByTZ($exception->exceptionstarttime, $tz)));
+                    }
+                    else {
                         // Change exception
                         $basedate = $this->getDayStartOfTimestamp($exception->exceptionstarttime);
                         $mapiexception = array("basedate" => $basedate);
@@ -1668,7 +1669,7 @@ class MAPIProvider {
      */
 
     /**
-     * Returns the tiemstamp offset
+     * Returns the timestamp offset.
      *
      * @param string            $ts
      *
@@ -1686,7 +1687,7 @@ class MAPIProvider {
     }
 
     /**
-     * Localtime of the timestamp
+     * Localtime of the timestamp.
      *
      * @param long              $time
      *
@@ -1703,7 +1704,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets the properties in a MAPI object according to an Sync object and a property mapping
+     * Sets the properties in a MAPI object according to an Sync object and a property mapping.
      *
      * @param mixed             $mapimessage
      * @param SyncObject        $message
@@ -1784,7 +1785,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets the properties one by one in a MAPI object
+     * Sets the properties one by one in a MAPI object.
      *
      * @param mixed             &$mapimessage
      * @param array             &$propsToSet
@@ -1804,7 +1805,7 @@ class MAPIProvider {
     }
 
     /**
-     * Gets the properties from a MAPI object and sets them in the Sync object according to mapping
+     * Gets the properties from a MAPI object and sets them in the Sync object according to mapping.
      *
      * @param SyncObject        &$message
      * @param mixed             $mapimessage
@@ -1852,7 +1853,7 @@ class MAPIProvider {
     }
 
     /**
-     * Wraps getPropIdsFromStrings() calls
+     * Wraps getPropIdsFromStrings() calls.
      *
      * @param mixed             &$mapiprops
      *
@@ -1864,7 +1865,7 @@ class MAPIProvider {
     }
 
     /**
-     * Wraps mapi_getprops() calls
+     * Wraps mapi_getprops() calls.
      *
      * @param mixed             &$mapiprops
      *
@@ -1877,7 +1878,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns an GMT timezone array
+     * Returns an GMT timezone array.
      *
      * @access private
      * @return array
@@ -1911,7 +1912,7 @@ class MAPIProvider {
     }
 
     /**
-     * Unpack timezone info from MAPI
+     * Unpack timezone info from MAPI.
      *
      * @param string    $data
      *
@@ -1926,7 +1927,7 @@ class MAPIProvider {
     }
 
     /**
-     * Unpack timezone info from Sync
+     * Unpack timezone info from Sync.
      *
      * @param string    $data
      *
@@ -1946,7 +1947,7 @@ class MAPIProvider {
     }
 
     /**
-     * Pack timezone info for MAPI
+     * Pack timezone info for MAPI.
      *
      * @param array     $tz
      *
@@ -1963,7 +1964,7 @@ class MAPIProvider {
     }
 
     /**
-     * Checks the date to see if it is in DST, and returns correct GMT date accordingly
+     * Checks the date to see if it is in DST, and returns correct GMT date accordingly.
      *
      * @param long      $localtime
      * @param array     $tz
@@ -1982,7 +1983,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns the local time for the given GMT time, taking account of the given timezone
+     * Returns the local time for the given GMT time, taking account of the given timezone.
      *
      * @param long      $gmttime
      * @param array     $tz
@@ -2001,7 +2002,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns TRUE if it is the summer and therefore DST is in effect
+     * Returns TRUE if it is the summer and therefore DST is in effect.
      *
      * @param long      $localtime
      * @param array     $tz
@@ -2038,7 +2039,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns the local timestamp for the $week'th $wday of $month in $year at $hour:$minute:$second
+     * Returns the local timestamp for the $week'th $wday of $month in $year at $hour:$minute:$second.
      *
      * @param int       $year
      * @param int       $month
@@ -2082,7 +2083,7 @@ class MAPIProvider {
     }
 
     /**
-     * Normalize the given timestamp to the start of the day
+     * Normalize the given timestamp to the start of the day.
      *
      * @param long      $timestamp
      *
@@ -2094,7 +2095,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns an SMTP address from an entry id
+     * Returns an SMTP address from an entry id.
      *
      * @param string    $entryid
      *
@@ -2127,7 +2128,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns fullname from an entryid
+     * Returns fullname from an entryid.
      *
      * @param binary $entryid
      * @return string fullname or false on error
@@ -2149,7 +2150,7 @@ class MAPIProvider {
     }
 
     /**
-     * Builds a displayname from several separated values
+     * Builds a displayname from several separated values.
      *
      * @param SyncContact       $contact
      *
@@ -2167,7 +2168,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets all dependent properties for an email address
+     * Sets all dependent properties for an email address.
      *
      * @param string            $emailAddress
      * @param string            $displayName
@@ -2195,7 +2196,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets the properties for an address string
+     * Sets the properties for an address string.
      *
      * @param string            $type               which address is being set
      * @param string            $city
@@ -2226,7 +2227,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets the properties for a mailing address
+     * Sets the properties for a mailing address.
      *
      * @param string            $city
      * @param string            $country
@@ -2250,7 +2251,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets data in a recurrence array
+     * Sets data in a recurrence array.
      *
      * @param SyncObject        $message
      * @param array             &$recur
@@ -2349,7 +2350,7 @@ class MAPIProvider {
 
     /**
      * Extracts the email address (mailbox@host) from an email address because
-     * some devices send email address as "Firstname Lastname" <email@me.com>
+     * some devices send email address as "Firstname Lastname" <email@me.com>.
      *
      *  @link http://developer.berlios.de/mantis/view.php?id=486
      *
@@ -2367,7 +2368,7 @@ class MAPIProvider {
     }
 
     /**
-     * Returns the message body for a required format
+     * Returns the message body for a required format.
      *
      * @param MAPIMessage       $mapimessage
      * @param int               $bpReturnType
@@ -2452,7 +2453,7 @@ class MAPIProvider {
     }
 
     /**
-     * A wrapper for mapi_inetmapi_imtoinet function
+     * A wrapper for mapi_inetmapi_imtoinet function.
      *
      * @param MAPIMessage       $mapimessage
      * @param SyncObject        $message
@@ -2492,7 +2493,7 @@ class MAPIProvider {
     }
 
     /**
-     * Sets the message body
+     * Sets the message body.
      *
      * @param MAPIMessage       $mapimessage
      * @param ContentParameters $contentparameters
@@ -2550,7 +2551,7 @@ class MAPIProvider {
     }
 
     /**
-     * Calculates the native body type of a message using available properties. Refer to oxbbody
+     * Calculates the native body type of a message using available properties. Refer to oxbbody.
      *
      * @param array             $messageprops
      *
@@ -2651,7 +2652,7 @@ class MAPIProvider {
     }
 
     /**
-    * Sets properties for an email message
+    * Sets properties for an email message.
     *
     * @param mixed             $mapimessage
     * @param SyncMail          $message
@@ -2703,7 +2704,7 @@ class MAPIProvider {
     }
 
     /**
-     * Get MAPI addressbook object
+     * Get MAPI addressbook object.
      *
      * @access private
      * @return MAPIAddressbook object to be used with mapi_ab_* or false on failure