Commit 07eae252 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #52 in ZP/z-push from bugfix/ZP-651-wp-does-not-set-http_user_agent to develop

* commit '20281136':
  ZP-651 Only contact DeviceManager if DeviceID is set. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 57437225)
parent 5dc54e6b
...@@ -167,7 +167,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -167,7 +167,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
// send Z-Push version and user agent to ZCP - ZP-589 // send Z-Push version and user agent to ZCP - ZP-589
if (Utils::CheckMapiExtVersion('7.2.0')) { if (Utils::CheckMapiExtVersion('7.2.0')) {
$zpush_version = 'Z-Push_' . @constant('ZPUSH_VERSION'); $zpush_version = 'Z-Push_' . @constant('ZPUSH_VERSION');
$user_agent = ZPush::GetDeviceManager()->GetUserAgent(); $user_agent = (Request::GetDeviceID()) ? ZPush::GetDeviceManager()->GetUserAgent() : "unknown";
$this->session = @mapi_logon_zarafa($user, $pass, MAPI_SERVER, null, null, 0, $zpush_version, $user_agent); $this->session = @mapi_logon_zarafa($user, $pass, MAPI_SERVER, null, null, 0, $zpush_version, $user_agent);
} }
else { else {
...@@ -1901,4 +1901,4 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -1901,4 +1901,4 @@ class BackendZarafa implements IBackend, ISearchProvider {
*/ */
class BackendICS extends BackendZarafa {} class BackendICS extends BackendZarafa {}
?> ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment