Merge pull request #242 in ZP/z-push from feature/ZP-835-istatemachine-cleanstates-should-get to develop

* commit '1ad4e7c8':
  ZP-835 Added new parameter to the IStateMachine->CleanStates() that indicates if only the defined counter should be deleted, implemented new flag in file state machine and sql state machine, introduced Sql->returnNullified() to nullify false keys and Sql->getSQLOp() to have the operator determination at one place, added logging to the file->db migration script, changed ZPushAdmin->RemoveDevice() to use the new flag, Utils::PrintAsString() understands "null" now.

* commit '9d44080f':
  ZP-891 Show folderstats log in LOGLEVEL_DEBUG.

Merge pull request #249 in ZP/z-push from feature/ZP-939-z-push-admin-can-show-foldernames to develop

* commit 'cf877ef6':
  ZP-939 Now with file.
  ZP-939 ZPushAdmin::GetDeviceDetails() should load all states (also the hierarchy cache), mark the KOE GAB folder as gab in the overview of folders of z-push-admin, show folder name of currently synchronizing folders.

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

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

hierarchy cache), mark the KOE GAB folder as gab in the overview of
folders of z-push-admin, show folder name of currently synchronizing
folders.

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

Merge pull request #247 in ZP/z-push from bugfix/ZP-937-memcache-logs-blockmutex-warnings to develop

* commit '9e530cde':
  ZP-937 Warn on mutex block only if it takes longer than 50ms.

Merge pull request #246 in ZP/z-push from bugfix/ZP-936-mapistreamwrapper-looses-data-when to develop

* commit 'b62fd521':
  ZP-936 Only read 4 additional bytes when we need to truncate and are at end of stream.

Merge pull request #243 in ZP/z-push from feature/ZP-933-z-push-admin-could-expose-functionality to develop

* commit 'fc4f9d52':
  ZP-933 Now with file.
  ZP-933 Fixed wording in ZPushAdmin::ResyncFolder() if no folderid has been submitted for resynching, removed always false check, always strtolower() the searchFor as well.
  ZP-933 Added "gab" option for resync type, lookup gab folderid in configuration or device data, fixed resynching long and short folderids, to lookup folderids from backendIds stripdata should not unset backend2folderidCache.

* commit 'd39f0ce4':
  ZP-934 Use is_resource() to check the stream, check if categories are set before intersecting.

Merge pull request #244 in ZP/z-push from bugfix/ZP-935-devicedata-is-deleted-when-requesting to develop

* commit '6c16c4a8':
  ZP-935 Check if ASDevice changed before saving it.

Merge pull request #241 in ZP/z-push from bugfix/ZP-250-meta-ticket-for-documentation-typo to develop

* commit '12af4336':
  ZP-250 Fixed typo in Terminate output message.

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

end of stream.

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

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

been submitted for resynching, removed always false check, always
strtolower() the searchFor as well.

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

set before intersecting.

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

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

configuration or device data, fixed resynching long and short folderids,
to lookup folderids from backendIds stripdata should not unset
backend2folderidCache.

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

indicates if only the defined counter should be deleted, implemented new
flag in file state machine and sql state machine, introduced
Sql->returnNullified() to nullify false keys and Sql->getSQLOp() to have
the operator determination at one place, added logging to the file->db
migration script, changed ZPushAdmin->RemoveDevice() to use the new
flag, Utils::PrintAsString() understands "null" now.

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

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

Merge pull request #238 in ZP/z-push from feature/ZP-932-z-push-admin-should-list-old-longid to develop

* commit '921c650e':
  ZP-932 z-push-admins actions lastsync and list on a user indicate if the device has already short folder ids or not.

Merge pull request #239 in ZP/z-push from bugfix/ZP-905-kopanochangeswrapper-and-other-new1 to develop

* commit 'd1d2e98f':
  ZP-905 Assign intersect result to variables before checking it with empty().

empty().

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

device has already short folder ids or not.

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

Merge pull request #236 in ZP/z-push from bugfix/ZP-930-z-push-top-doesn-t-work-in-another to develop

* commit 'aecb70f2':
  ZP-930 Define include path correctly.

Merge pull request #235 in ZP/z-push from feature/ZP-929-koe-make-syncgab-script-executable to develop

* commit 'd958cbd8':
  ZP-929 Added php shebang, don't check if worker exists, just try to include it.

Merge pull request #234 in ZP/z-push from bugfix/ZP-928-put-apache-configuration-files-in to develop

* commit 'b7adbe9f':
  ZP-928 Fixed indentation, removed debug.txt block.
  ZP-928 Add default apache configurations to config directory.

Merge pull request #233 in ZP/z-push from bugfix/ZP-905-kopanochangeswrapper-throws-fatal to develop

* commit '028d66d8':
  ZP-905 Assign to variable before checking with empty().

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

include it.

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

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

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

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

Merge pull request #232 in ZP/z-push from bugfix/ZP-927-when-setting-up-additionallogusers to develop

* commit 'f1f2b17e':
  ZP-927 Check if user is in special log with the logger class.

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

Merge pull request #228 in ZP/z-push from bugfix/ZP-904-autodiscover-is-not-syslog-compatible to develop

* commit '75c887bf':
  ZP-904 Fixed logging in autodiscover. Include autodiscover config instead of general Z-Push config. Added static CheckConfig() function for autodiscover.

* commit 'fd79ff58':
  ZP-925 Set executable flag.

Merge pull request #231 in ZP/z-push from bugfix/ZP-924-koe-gab-sync-calls-wrong-mapi-error to develop

* commit 'd3fbd5ba':
  ZP-924 Fix mapi_last_hresult() calls.

Merge pull request #229 in ZP/z-push from bugfix/ZP-923-ping-fails-to-load-state-for-zero to develop

* commit '2ccb6a09':
  ZP-923 Don't load collection if the synckey has counter 0 (zero synckey used for movestates).