* commit '6ed7292c':
  fix(ZP-646): BackendSearchLDAP uses bad range limit

(cherry picked from commit 08dddcd7)

Merge pull request #14 in ZP/z-push from bugfix/ZP-647-backendcombined-sendmail-source--folderid to develop

* commit 'bfc4c616':
  fix(ZP-647): BackendCombined: SendMail source->folderid

(cherry picked from commit 21a2d658)

ZP-632

* commit '61453208':
  Allow to create own entrypoint / index.php with unmodified z-push sources If you use composer or upstream git repo as sub-project you cant modify config.php to your needs. Patch allows to create an own index.php as follows: <?php define('ZPUSH_CONFIG', __DIR__.'/config.php'); $_SERVER['SCRIPT_FILENAME'] = realpath(__DIR__.'/../vendor/zarafa/zpush2/index.php'); chdir('../vendor/zarafa/zpush2'); include('../vendor/zarafa/zpush2/src/index.php');

(cherry picked from commit 119acfdc)

the Affero GNU General Public License (AGPL) version 3.

git-svn-id: https://z-push.org/svn/z-push/trunk@1978 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1977 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1976 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1975 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-577 #comment remove http_response_code(401); because there already is header('HTTP/1.1 401 Unauthorized'); call which does the same.

git-svn-id: https://z-push.org/svn/z-push/trunk@1974 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-555 #comment Do not change PR_BODY for an email sent via mobile device as PR_BODY is always unicode. Only convert PR_HTML property to unicode if this property is set and the encoding of the email sent via mobile is not UTF-8.

git-svn-id: https://z-push.org/svn/z-push/trunk@1973 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1970 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1968 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-624 #comment do the sync-interval-check only after opening the message, if message opening fails and we should move to the waste basket, we just tell the mobile "success" to avoid other errors

git-svn-id: https://z-push.org/svn/z-push/trunk@1967 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1966 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1965 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1964 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-623 #comment if exporting more than 1000 delete requests throw StatusException, remove folder states if statusexception is received during export, reset status to success only after saving the folder states, do no throw hierarchy-changed in ping when a state can not be found and no ping parameters were sent

git-svn-id: https://z-push.org/svn/z-push/trunk@1963 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1962 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1961 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-621 #comment added new SyncCollections state "HIERARCHY_CHANGED" which does not indicate an error and let Ping return SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED as well in this case

git-svn-id: https://z-push.org/svn/z-push/trunk@1960 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1959 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-621 #comment do not let LoopDetection perform a full FolderResync after several SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED if the following FolderSync command exports changes

git-svn-id: https://z-push.org/svn/z-push/trunk@1958 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1955 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1954 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1953 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-451 #comment normalize SyncParameters after unserializing, save SyncParameters if updated and not invalidaded when replying with empty response in Sync, do not update FolderSyncRemaining counter with 0 if it's not set or already zero (prevent unecessary state update)


git-svn-id: https://z-push.org/svn/z-push/trunk@1952 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1949 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-608 #comment moved StringStreamWrapper to lib/utils, in case of issues during wbxml decoding, include the wbxml data in the error log for easier debugging, added stand alone wbxml decoding tool

git-svn-id: https://z-push.org/svn/z-push/trunk@1948 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1947 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-586 #comment Meeting shows correctly as accepted on iOS when the "attendeestatus" flag is NOT included when synchronizing the attendees appointment. Including it for the organizer shows the status of the attendees correctly.

git-svn-id: https://z-push.org/svn/z-push/trunk@1946 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-554 #comment added option to statically define and also pass certificate path and password on the command line

git-svn-id: https://z-push.org/svn/z-push/trunk@1945 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1944 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1943 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1942 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1941 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

git-svn-id: https://z-push.org/svn/z-push/trunk@1940 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-581 #comment before processing a meeting request confirmation or cancellation, check if the current user is not the sender and only process it then. Should fix the auto-cancellation when cancelling one attendee.

git-svn-id: https://z-push.org/svn/z-push/trunk@1936 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

ZP-575 #comment add working elsewhere status 4 to definitions, add conversion to busy status -1 to 1

git-svn-id: https://z-push.org/svn/z-push/trunk@1935 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5