Skip to content

Z
z-push
Commit e079ce95 authored by Sebastian Kummer's avatar Sebastian Kummer
Browse files
Options

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.

Conflicts:
	src/backend/zarafa/mapiprovider.php
parent 67be1d68
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 32 deletions
src/backend/zarafa/mapiprovider.php
View file @ e079ce95
......@@ -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,
......@@ -1260,8 +1260,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);
......@@ -1658,7 +1659,7 @@ class MAPIProvider {
*/
/**
* Returns the tiemstamp offset
* Returns the timestamp offset.
*
* @param string $ts
*
......@@ -1676,7 +1677,7 @@ class MAPIProvider {
}
/**
* Localtime of the timestamp
* Localtime of the timestamp.
*
* @param long $time
*
......@@ -1693,7 +1694,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
......@@ -1774,7 +1775,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
......@@ -1794,7 +1795,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
......@@ -1842,7 +1843,7 @@ class MAPIProvider {
}
/**
* Wraps getPropIdsFromStrings() calls
* Wraps getPropIdsFromStrings() calls.
*
* @param mixed &$mapiprops
*
......@@ -1854,7 +1855,7 @@ class MAPIProvider {
}
/**
* Wraps mapi_getprops() calls
* Wraps mapi_getprops() calls.
*
* @param mixed &$mapiprops
*
......@@ -1867,7 +1868,7 @@ class MAPIProvider {
}
/**
* Returns an GMT timezone array
* Returns an GMT timezone array.
*
* @access private
* @return array
......@@ -1901,7 +1902,7 @@ class MAPIProvider {
}
/**
* Unpack timezone info from MAPI
* Unpack timezone info from MAPI.
*
* @param string $data
*
......@@ -1916,7 +1917,7 @@ class MAPIProvider {
}
/**
* Unpack timezone info from Sync
* Unpack timezone info from Sync.
*
* @param string $data
*
......@@ -1936,7 +1937,7 @@ class MAPIProvider {
}
/**
* Pack timezone info for MAPI
* Pack timezone info for MAPI.
*
* @param array $tz
*
......@@ -1953,7 +1954,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
......@@ -1972,7 +1973,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
......@@ -1991,7 +1992,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
......@@ -2028,7 +2029,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
......@@ -2072,7 +2073,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
*
......@@ -2084,7 +2085,7 @@ class MAPIProvider {
}
/**
* Returns an SMTP address from an entry id
* Returns an SMTP address from an entry id.
*
* @param string $entryid
*
......@@ -2117,7 +2118,7 @@ class MAPIProvider {
}
/**
* Returns fullname from an entryid
* Returns fullname from an entryid.
*
* @param binary $entryid
* @return string fullname or false on error
......@@ -2139,7 +2140,7 @@ class MAPIProvider {
}
/**
* Builds a displayname from several separated values
* Builds a displayname from several separated values.
*
* @param SyncContact $contact
*
......@@ -2157,7 +2158,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
......@@ -2185,7 +2186,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
......@@ -2216,7 +2217,7 @@ class MAPIProvider {
}
/**
* Sets the properties for a mailing address
* Sets the properties for a mailing address.
*
* @param string $city
* @param string $country
......@@ -2240,7 +2241,7 @@ class MAPIProvider {
}
/**
* Sets data in a recurrence array
* Sets data in a recurrence array.
*
* @param SyncObject $message
* @param array &$recur
......@@ -2339,7 +2340,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
*
......@@ -2357,7 +2358,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
......@@ -2448,7 +2449,7 @@ class MAPIProvider {
}
/**
* Sets the message body
* Sets the message body.
*
* @param MAPIMessage $mapimessage
* @param ContentParameters $contentparameters
......@@ -2507,7 +2508,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
*
......@@ -2608,7 +2609,7 @@ class MAPIProvider {
}
/**
* Sets properties for an email message
* Sets properties for an email message.
*
* @param mixed $mapimessage
* @param SyncMail $message
......@@ -2659,7 +2660,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