From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 7 May 2010 21:32:16 +0000 (-0400)
Subject: Fix provision command for devices that support provisioning, and server does not... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f6f6fc27ca085bae0bec435775968e835f5d19a0;p=horde.git

Fix provision command for devices that support provisioning, and server does not have it enabled.
---

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
index 9133694cd..41bf0d0c2 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php
@@ -106,6 +106,13 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base
                 $this->_encoder->startTag(Horde_ActiveSync::PROVISION_STATUS);
                 $this->_encoder->content($status);
                 $this->_encoder->endTag();
+                $this->_encoder->startTag(Horde_ActiveSync::PROVISION_POLICIES);
+                $this->_encoder->startTag(Horde_ActiveSync::PROVISION_POLICY);
+                $this->_encoder->startTag(Horde_ActiveSync::PROVISION_STATUS);
+                $this->_encoder->content($policyStatus);
+                $this->_encoder->endTag();
+                $this->_encoder->endTag();
+                $this->_encoder->endTag();
                 $this->_encoder->endTag();
 
                 return true;
@@ -141,7 +148,6 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base
                 if (!$this->_decoder->getElementStartTag(Horde_ActiveSync::PROVISION_STATUS)) {
                     return $this->_globalError(self::STATUS_PROTERROR);
                 }
-                // @TODO: look at status here??
                 $status = $this->_decoder->getElementContent();
                 if (!$this->_decoder->getElementEndTag() ||
                     !$this->_decoder->getElementEndTag()) {
@@ -170,6 +176,7 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base
                 /* Set the final key */
                 $policykey = $this->_state->generatePolicyKey();
                 $this->_state->setPolicyKey($this->_device->id, $policykey);
+                $this->_state->setDeviceRWStatus($this->_device->id, Horde_ActiveSync::RWSTATUS_OK);
             }
         } elseif (empty($policykey)) {
             // This is phase2 - we need to set the intermediate key