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
5b2ad7da
Commit
5b2ad7da
authored
Jun 26, 2017
by
Sebastian Kummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-1238 Save Atendee->type in MAPI.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
774744c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
mapiprovider.php
src/backend/kopano/mapiprovider.php
+3
-3
syncattendee.php
src/lib/syncobjects/syncattendee.php
+2
-0
No files found.
src/backend/kopano/mapiprovider.php
View file @
5b2ad7da
...
@@ -1430,7 +1430,7 @@ class MAPIProvider {
...
@@ -1430,7 +1430,7 @@ class MAPIProvider {
$org
[
PR_EMAIL_ADDRESS
]
=
isset
(
$representingprops
[
$appointmentprops
[
"sentrepresentingemail"
]])
?
$representingprops
[
$appointmentprops
[
"sentrepresentingemail"
]]
:
$props
[
$appointmentprops
[
"sentrepresentingemail"
]];
$org
[
PR_EMAIL_ADDRESS
]
=
isset
(
$representingprops
[
$appointmentprops
[
"sentrepresentingemail"
]])
?
$representingprops
[
$appointmentprops
[
"sentrepresentingemail"
]]
:
$props
[
$appointmentprops
[
"sentrepresentingemail"
]];
$org
[
PR_SEARCH_KEY
]
=
isset
(
$representingprops
[
$appointmentprops
[
"sentrepresentinsrchk"
]])
?
$representingprops
[
$appointmentprops
[
"sentrepresentinsrchk"
]]
:
$props
[
$appointmentprops
[
"sentrepresentinsrchk"
]];
$org
[
PR_SEARCH_KEY
]
=
isset
(
$representingprops
[
$appointmentprops
[
"sentrepresentinsrchk"
]])
?
$representingprops
[
$appointmentprops
[
"sentrepresentinsrchk"
]]
:
$props
[
$appointmentprops
[
"sentrepresentinsrchk"
]];
$org
[
PR_RECIPIENT_FLAGS
]
=
recipOrganizer
|
recipSendable
;
$org
[
PR_RECIPIENT_FLAGS
]
=
recipOrganizer
|
recipSendable
;
$org
[
PR_RECIPIENT_TYPE
]
=
MAPI_TO
;
$org
[
PR_RECIPIENT_TYPE
]
=
MAPI_TO
;
// TODO: shouldn't that be MAPI_ORIG ?
array_push
(
$recips
,
$org
);
array_push
(
$recips
,
$org
);
...
@@ -1449,14 +1449,14 @@ class MAPIProvider {
...
@@ -1449,14 +1449,14 @@ class MAPIProvider {
$recip
[
PR_SEARCH_KEY
]
=
$userinfo
[
0
][
PR_SEARCH_KEY
];
$recip
[
PR_SEARCH_KEY
]
=
$userinfo
[
0
][
PR_SEARCH_KEY
];
$recip
[
PR_ADDRTYPE
]
=
$userinfo
[
0
][
PR_ADDRTYPE
];
$recip
[
PR_ADDRTYPE
]
=
$userinfo
[
0
][
PR_ADDRTYPE
];
$recip
[
PR_ENTRYID
]
=
$userinfo
[
0
][
PR_ENTRYID
];
$recip
[
PR_ENTRYID
]
=
$userinfo
[
0
][
PR_ENTRYID
];
$recip
[
PR_RECIPIENT_TYPE
]
=
MAPI_TO
;
$recip
[
PR_RECIPIENT_TYPE
]
=
isset
(
$attendee
->
attendeetype
)
?
$attendee
->
attendeetype
:
MAPI_TO
;
$recip
[
PR_RECIPIENT_FLAGS
]
=
recipSendable
;
$recip
[
PR_RECIPIENT_FLAGS
]
=
recipSendable
;
}
}
else
{
else
{
$recip
[
PR_DISPLAY_NAME
]
=
u2w
(
$attendee
->
name
);
$recip
[
PR_DISPLAY_NAME
]
=
u2w
(
$attendee
->
name
);
$recip
[
PR_SEARCH_KEY
]
=
"SMTP:"
.
$recip
[
PR_EMAIL_ADDRESS
]
.
"
\0
"
;
$recip
[
PR_SEARCH_KEY
]
=
"SMTP:"
.
$recip
[
PR_EMAIL_ADDRESS
]
.
"
\0
"
;
$recip
[
PR_ADDRTYPE
]
=
"SMTP"
;
$recip
[
PR_ADDRTYPE
]
=
"SMTP"
;
$recip
[
PR_RECIPIENT_TYPE
]
=
MAPI_TO
;
$recip
[
PR_RECIPIENT_TYPE
]
=
isset
(
$attendee
->
attendeetype
)
?
$attendee
->
attendeetype
:
MAPI_TO
;
$recip
[
PR_ENTRYID
]
=
mapi_createoneoff
(
$recip
[
PR_DISPLAY_NAME
],
$recip
[
PR_ADDRTYPE
],
$recip
[
PR_EMAIL_ADDRESS
]);
$recip
[
PR_ENTRYID
]
=
mapi_createoneoff
(
$recip
[
PR_DISPLAY_NAME
],
$recip
[
PR_ADDRTYPE
],
$recip
[
PR_EMAIL_ADDRESS
]);
}
}
...
...
src/lib/syncobjects/syncattendee.php
View file @
5b2ad7da
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
class
SyncAttendee
extends
SyncObject
{
class
SyncAttendee
extends
SyncObject
{
public
$email
;
public
$email
;
public
$name
;
public
$name
;
public
$attendeestatus
;
public
$attendeetype
;
function
__construct
()
{
function
__construct
()
{
$mapping
=
array
(
$mapping
=
array
(
...
...
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