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
7ba0beb9
Commit
7ba0beb9
authored
Jun 15, 2016
by
Sebastian Kummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-915 Fixes for single GAB environments.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
84e997f4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
kopano.php
tools/gab-sync/lib/kopano.php
+5
-3
syncworker.php
tools/gab-sync/lib/syncworker.php
+4
-4
No files found.
tools/gab-sync/lib/kopano.php
View file @
7ba0beb9
...
...
@@ -245,9 +245,11 @@ class Kopano extends SyncWorker {
protected
function
GetGABs
()
{
$names
=
array
();
$companies
=
mapi_zarafa_getcompanylist
(
$this
->
store
);
if
(
is_array
(
$companies
))
{
foreach
(
$companies
as
$c
)
{
$names
[
$c
[
'companyname'
]]
=
bin2hex
(
$c
[
'companyid'
]);
}
}
return
$names
;
}
...
...
@@ -417,7 +419,7 @@ class Kopano extends SyncWorker {
$store
=
$this
->
getStore
(
$gabId
,
$gabName
);
$chunkdata
=
$this
->
findChunk
(
$store
,
$folderid
,
$chunkName
);
if
(
$chunkdata
[
PR_ENTRYID
]
)
{
if
(
isset
(
$chunkdata
[
PR_ENTRYID
])
)
{
$message
=
mapi_msgstore_openentry
(
$store
,
$chunkdata
[
PR_ENTRYID
]);
return
$this
->
readPropStream
(
$message
,
PR_BODY
);
}
...
...
tools/gab-sync/lib/syncworker.php
View file @
7ba0beb9
...
...
@@ -89,7 +89,7 @@ abstract class SyncWorker {
$gabs
=
$this
->
GetGABs
();
if
(
empty
(
$gabs
))
{
if
(
!
$targetGab
)
{
if
(
$targetGab
)
{
$this
->
Terminate
(
"Multiple GABs not found, target should not be set. Aborting."
);
}
// no multi-GABs, just go default
...
...
@@ -203,7 +203,7 @@ abstract class SyncWorker {
$gabs
=
$this
->
GetGABs
();
if
(
empty
(
$gabs
))
{
if
(
!
$targetGab
)
{
if
(
$targetGab
)
{
$this
->
Terminate
(
"Multiple GABs not found, target should not be set. Aborting."
);
}
// default case, no multi-GABs, just go default
...
...
@@ -289,7 +289,7 @@ abstract class SyncWorker {
$gabs
=
$this
->
GetGABs
();
if
(
empty
(
$gabs
))
{
if
(
!
$targetGab
)
{
if
(
$targetGab
)
{
$this
->
Terminate
(
"Multiple GABs not found, target should not be set. Aborting."
);
}
// no multi-GABs, just go default
...
...
@@ -342,7 +342,7 @@ abstract class SyncWorker {
$gabs
=
$this
->
GetGABs
();
if
(
empty
(
$gabs
))
{
if
(
!
$targetGab
)
{
if
(
$targetGab
)
{
$this
->
Terminate
(
"Multiple GABs not found, target should not be set. Aborting."
);
}
// no multi-GABs, just go default
...
...
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