From 3bb95acb92af97165543fdaec0e13f0523bf6f23 Mon Sep 17 00:00:00 2001
From: Michael J Rubinsky <mrubinsk@horde.org>
Date: Mon, 7 Oct 2013 19:07:47 -0400
Subject: [PATCH] Revert "Allow Windows 8 Mail app to connect without
 provisioning."

This reverts commit 65e1132c09238f85d20f5d945906db1dc0ddd557.

Conflicts:
	framework/ActiveSync/lib/Horde/ActiveSync/Device.php
---
 framework/ActiveSync/lib/Horde/ActiveSync.php |  3 +-
 .../lib/Horde/ActiveSync/Device.php           | 38 ++-----------------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php
index de825d2e9fc..f64087f9383 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync.php
@@ -745,9 +745,8 @@ public function handleRequest($cmd, $devId)
             // Device might exist, but with a new (additional) user account
             if ($this->_state->deviceExists($devId)) {
                 $device = $this->_state->loadDeviceInfo($devId);
-                $device->headers = $this->_request->getHeaders();
             } else {
-                $device = new Horde_ActiveSync_Device($this->_state, $this->_request->getHeaders());
+                $device = new Horde_ActiveSync_Device($this->_state);
             }
             $device->policykey = 0;
             $device->userAgent = $this->_request->getHeader('User-Agent');
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Device.php b/framework/ActiveSync/lib/Horde/ActiveSync/Device.php
index 5b7c6a27368..98988bf9094 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Device.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Device.php
@@ -34,7 +34,7 @@
  * @property array properties         The device properties, sent in DEVICEINFO.
  * @property string announcedVersion  The most last EAS supported versions
  *                                    announced to the device.
- * @property array headers            Current request headers.
+ *
  */
 class Horde_ActiveSync_Device
 {
@@ -60,24 +60,16 @@ class Horde_ActiveSync_Device
      */
     protected $_state;
 
-    /**
-     * Request headers
-     *
-     * @var array
-     */
-    protected $_headers;
-
     /**
      * Const'r
      *
      * @param Horde_ActiveSync_State_Base $state  The state driver.
      * @param array $data                         The current device data.
      */
-    public function __construct(Horde_ActiveSync_State_Base $state, array $data = array(), array $headers = array())
+    public function __construct(Horde_ActiveSync_State_Base $state, array $data = array())
     {
         $this->_state = $state;
         $this->_properties = $data;
-        $this->_headers = $headers;
     }
 
     /**
@@ -85,10 +77,6 @@ public function __construct(Horde_ActiveSync_State_Base $state, array $data = ar
      */
     public function &__get($property)
     {
-        if ($property == 'headers') {
-            return $this->_headers;
-        }
-
         return $this->_properties[$property];
     }
 
@@ -97,11 +85,7 @@ public function &__get($property)
      */
     public function __set($property, $value)
     {
-        if ($value == 'headers') {
-            $this->_headers = $value;
-        } else {
-            $this->_properties[$property] = $value;
-        }
+        $this->_properties[$property] = $value;
     }
 
     /**
@@ -146,7 +130,7 @@ public function isNonProvisionable()
     {
         // Outlook? The specs say that "Windows Communication Apps" should
         // provide the 'OS' parameter of the ITEMSETTINGS data equal to 'Windows',
-        // but Outlook 2013 doesn't even send the ITEMSETTINGS command, so we
+        // but Outlook 2013 doesn't even sent the ITEMSETTINGS command, so we
         // need to check the userAgent header. Early versions used Microsoft.Outlook,
         // but after some update it was changed to 'Outlook/15.0'
         if (strpos($this->deviceType, 'MicrosoftOutlook') !== false ||
@@ -154,20 +138,6 @@ public function isNonProvisionable()
             return true;
         }
 
-        // X-MS-WL header check for Outlook and Windows 8 Mail.
-        if (!empty($this->_headers['x-ms-wl']) &&
-            (strpos($this->_headers['x-ms-wl'], 'WindowsMail') !== false ||
-             strpos($this->_headers['x-ms-wl'], 'Outlook') !== false)) {
-
-                return true;
-            }
-        }
-
-        // Last chance to catch Windows 8 Mail.
-        if (strpos($this->_deviceType, 'WindowsMail') !== false) {
-            return true;
-        }
-
         return false;
     }