Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
z-push
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Björn Fischer
z-push
Commits
cf361656
Commit
cf361656
authored
Sep 20, 2016
by
Manfred Kutas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-1013 iOS does not send meeting response.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
65714ee7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
2 deletions
+35
-2
mapiprovider.php
src/backend/kopano/mapiprovider.php
+9
-2
request.php
src/lib/request/request.php
+26
-0
No files found.
src/backend/kopano/mapiprovider.php
View file @
cf361656
...
@@ -588,8 +588,15 @@ class MAPIProvider {
...
@@ -588,8 +588,15 @@ class MAPIProvider {
$props
=
$this
->
getProps
(
$mapimessage
,
$meetingrequestproperties
);
$props
=
$this
->
getProps
(
$mapimessage
,
$meetingrequestproperties
);
// Get the GOID
// Get the GOID
if
(
isset
(
$props
[
$meetingrequestproperties
[
"goidtag"
]]))
if
(
isset
(
$props
[
$meetingrequestproperties
[
"goidtag"
]]))
{
$message
->
meetingrequest
->
globalobjid
=
base64_encode
(
$props
[
$meetingrequestproperties
[
"goidtag"
]]);
// GlobalObjId support was removed in AS 16.0
if
(
Request
::
IsGlobalObjIdHexClient
())
{
$message
->
meetingrequest
->
globalobjid
=
bin2hex
(
$props
[
$meetingrequestproperties
[
"goidtag"
]]);
}
else
{
$message
->
meetingrequest
->
globalobjid
=
base64_encode
(
$props
[
$meetingrequestproperties
[
"goidtag"
]]);
}
}
// Set Timezone
// Set Timezone
if
(
isset
(
$props
[
$meetingrequestproperties
[
"timezonetag"
]]))
if
(
isset
(
$props
[
$meetingrequestproperties
[
"timezonetag"
]]))
...
...
src/lib/request/request.php
View file @
cf361656
...
@@ -654,6 +654,32 @@ class Request {
...
@@ -654,6 +654,32 @@ class Request {
return
(
time
()
-
$_SERVER
[
"REQUEST_TIME"
])
>=
self
::
GetExpectedConnectionTimeout
();
return
(
time
()
-
$_SERVER
[
"REQUEST_TIME"
])
>=
self
::
GetExpectedConnectionTimeout
();
}
}
/**
* Checks the device type if it expects the globalobjid in meeting requests encoded as hex.
* If it's not the case, globalobjid will be base64 encoded.
*
* WindowsOutlook and iOS device since 9.3 (?) version expect globalobjid to be hex encoded.
* @see https://jira.z-hub.io/projects/ZP/issues/ZP-1013
*
* @access public
* @return boolean
*/
static
public
function
IsGlobalObjIdHexClient
()
{
switch
(
self
::
GetDeviceType
())
{
case
"WindowsOutlook"
:
ZLog
::
Write
(
LOGLEVEL_DEBUG
,
"Request->IsGlobalObjIdHexClient(): WindowsOutlook"
);
return
true
;
case
"iPod"
:
case
"iPad"
:
case
"iPhone"
:
$matches
=
array
();
if
(
stripos
(
self
::
GetUserAgent
(),
"Apple-"
)
==
0
&&
preg_match
(
"/\/(\d
{
4
}
)\./"
,
self
::
GetUserAgent
(),
$matches
)
&&
isset
(
$matches
[
1
])
&&
$matches
[
1
]
>=
1305
)
{
ZLog
::
Write
(
LOGLEVEL_DEBUG
,
sprintf
(
"Request->IsGlobalObjIdHexClient(): %s->%s"
,
self
::
GetDeviceType
(),
self
::
GetUserAgent
()));
return
true
;
}
}
return
false
;
}
/**----------------------------------------------------------------------------------------------------------
/**----------------------------------------------------------------------------------------------------------
* Private stuff
* Private stuff
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment