Merge pull request #128 in ZP/z-push from...

Merge pull request #128 in ZP/z-push from bugfix/ZP-766-outlook-sends-autodiscover-outlook to develop

* commit '289ed5cf':
  ZP-766 Accept outlook response schema on autodiscover, send XML response only for mobile response schema or empty otherwise.

(cherry picked from commit 4dba2866)

src/autodiscover/autodiscover.php

@@ -58,7 +58,8 @@ include_once('../version.php');
 include_once('config.php');
 
 class ZPushAutodiscover {
-    const ACCEPTABLERESPONSESCHEMA = 'http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006';
+    const ACCEPTABLERESPONSESCHEMAMOBILESYNC = 'http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006';
+    const ACCEPTABLERESPONSESCHEMAOUTLOOK = 'http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a';
     const MAXINPUTSIZE = 8192; // Bytes, the autodiscover request shouldn't exceed that value
 
     private static $instance;
@@ -111,8 +112,11 @@ class ZPushAutodiscover {
             $email = ($this->getAttribFromUserDetails($userDetails, 'emailaddress')) ? $this->getAttribFromUserDetails($userDetails, 'emailaddress') : $incomingXml->Request->EMailAddress;
             $userFullname = ($this->getAttribFromUserDetails($userDetails, 'fullname')) ? $this->getAttribFromUserDetails($userDetails, 'fullname') : $email;
             ZLog::Write(LOGLEVEL_WBXML, sprintf("Resolved user's '%s' fullname to '%s'", $username, $userFullname));
-            $response = $this->createResponse($email, $userFullname);
-            setcookie("membername", $username);
+            // At the moment Z-Push only supports mobile response schema for autodiscover. Send empty response if the client request outlook response schema.
+            if ($incomingXml->Request->AcceptableResponseSchema == ZPushAutodiscover::ACCEPTABLERESPONSESCHEMAMOBILESYNC) {
+                $response = $this->createResponse($email, $userFullname);
+                setcookie("membername", $username);
+            }
         }
 
         catch (AuthenticationRequiredException $ex) {
@@ -175,7 +179,7 @@ class ZPushAutodiscover {
             throw new FatalException('Invalid input XML: no AcceptableResponseSchema.');
         }
 
-        if ($xml->Request->AcceptableResponseSchema != ZPushAutodiscover::ACCEPTABLERESPONSESCHEMA) {
+        if ($xml->Request->AcceptableResponseSchema != ZPushAutodiscover::ACCEPTABLERESPONSESCHEMAMOBILESYNC && $xml->Request->AcceptableResponseSchema != ZPushAutodiscover::ACCEPTABLERESPONSESCHEMAOUTLOOK) {
             throw new FatalException('Invalid input XML: not a mobilesync responseschema.');
         }
 
@@ -276,4 +280,4 @@ class ZPushAutodiscover {
     }
 
 ZPushAutodiscover::DoZPushAutodiscover();
-?>
+?>
\ No newline at end of file