Skip to content

Z
z-push
Commit e1c51ed4 authored by Manfred Kutas's avatar Manfred Kutas
Browse files
Options

ZP-981 Error deleting an all-day occurrence on a mobile device. Some 

code style fixes.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 19824533
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 33 deletions
src/backend/kopano/mapiprovider.php
View file @ e1c51ed4
......@@ -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,
......@@ -1257,8 +1257,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);
......@@ -1662,7 +1663,7 @@ class MAPIProvider {
*/
/**
* Returns the tiemstamp offset
* Returns the timestamp offset.
*
* @param string $ts
*
......@@ -1680,7 +1681,7 @@ class MAPIProvider {
}
/**
* Localtime of the timestamp
* Localtime of the timestamp.
*
* @param long $time
*
......@@ -1697,7 +1698,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
......@@ -1778,7 +1779,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
......@@ -1798,7 +1799,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
......@@ -1846,7 +1847,7 @@ class MAPIProvider {
}
/**
* Wraps getPropIdsFromStrings() calls
* Wraps getPropIdsFromStrings() calls.
*
* @param mixed &$mapiprops
*
......@@ -1858,7 +1859,7 @@ class MAPIProvider {
}
/**
* Wraps mapi_getprops() calls
* Wraps mapi_getprops() calls.
*
* @param mixed &$mapiprops
*
......@@ -1871,7 +1872,7 @@ class MAPIProvider {
}
/**
* Returns an GMT timezone array
* Returns an GMT timezone array.
*
* @access private
* @return array
......@@ -1905,7 +1906,7 @@ class MAPIProvider {
}
/**
* Unpack timezone info from MAPI
* Unpack timezone info from MAPI.
*
* @param string $data
*
......@@ -1920,7 +1921,7 @@ class MAPIProvider {
}
/**
* Unpack timezone info from Sync
* Unpack timezone info from Sync.
*
* @param string $data
*
......@@ -1940,7 +1941,7 @@ class MAPIProvider {
}
/**
* Pack timezone info for MAPI
* Pack timezone info for MAPI.
*
* @param array $tz
*
......@@ -1957,7 +1958,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
......@@ -1976,7 +1977,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
......@@ -1995,7 +1996,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
......@@ -2032,7 +2033,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
......@@ -2076,7 +2077,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
*
......@@ -2088,7 +2089,7 @@ class MAPIProvider {
}
/**
* Returns an SMTP address from an entry id
* Returns an SMTP address from an entry id.
*
* @param string $entryid
*
......@@ -2121,7 +2122,7 @@ class MAPIProvider {
}
/**
* Returns fullname from an entryid
* Returns fullname from an entryid.
*
* @param binary $entryid
* @return string fullname or false on error
......@@ -2143,7 +2144,7 @@ class MAPIProvider {
}
/**
* Builds a displayname from several separated values
* Builds a displayname from several separated values.
*
* @param SyncContact $contact
*
......@@ -2161,7 +2162,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
......@@ -2189,7 +2190,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
......@@ -2220,7 +2221,7 @@ class MAPIProvider {
}
/**
* Sets the properties for a mailing address
* Sets the properties for a mailing address.
*
* @param string $city
* @param string $country
......@@ -2244,7 +2245,7 @@ class MAPIProvider {
}
/**
* Sets data in a recurrence array
* Sets data in a recurrence array.
*
* @param SyncObject $message
* @param array &$recur
......@@ -2343,7 +2344,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
*
......@@ -2361,7 +2362,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
......@@ -2446,7 +2447,7 @@ class MAPIProvider {
}
/**
* A wrapper for mapi_inetmapi_imtoinet function
* A wrapper for mapi_inetmapi_imtoinet function.
*
* @param MAPIMessage $mapimessage
* @param SyncObject $message
......@@ -2486,7 +2487,7 @@ class MAPIProvider {
}
/**
* Sets the message body
* Sets the message body.
*
* @param MAPIMessage $mapimessage
* @param ContentParameters $contentparameters
......@@ -2544,7 +2545,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
*
......@@ -2645,7 +2646,7 @@ class MAPIProvider {
}
/**
* Sets properties for an email message
* Sets properties for an email message.
*
* @param mixed $mapimessage
* @param SyncMail $message
......@@ -2697,7 +2698,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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment