From dd2c0a686ea23c3f49720e11b066aa18c7f9e750 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Sat, 24 Apr 2010 09:48:06 -0400 Subject: [PATCH] Move these to the base activesync class so the Provision class doesn't need to be loaded just to check rwstatus --- framework/ActiveSync/lib/Horde/ActiveSync.php | 7 ++++++- framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 2 +- .../ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 13 ++++--------- framework/ActiveSync/lib/Horde/ActiveSync/State/File.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/State/History.php | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php index 66ce6e252..ee00de4d2 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync.php @@ -305,6 +305,11 @@ class Horde_ActiveSync const CHANGE_ORIGIN_SERVER = 1; const CHANGE_ORIGIN_NA = 3; + const RWSTATUS_NA = 0; + const RWSTATUS_OK = 1; + const RWSTATUS_PENDING = 2; + const RWSTATUS_WIPED = 3; + /** * Logger * @@ -994,7 +999,7 @@ class Horde_ActiveSync $device->userAgent = $this->_request->getHeader('User-Agent'); $device->deviceType = !empty($get['DeviceType']) ? $get['DeviceType'] : ''; $device->policykey = 0; - $device->rwstatus = 0; + $device->rwstatus = self::RWSTATUS_NA; $state->setDeviceInfo($devId, $device); } diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php index 2538bb8b8..c4ab8ed45 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php @@ -144,7 +144,7 @@ class Horde_ActiveSync_Request_Ping extends Horde_ActiveSync_Request_Base * we want the device wiped. */ if ($this->_provisioning === true) { $rwstatus = $this->_state->getDeviceRWStatus($this->_devId); - if ($rwstatus == Horde_ActiveSync::PROVISION_RWSTATUS_PENDING || $rwstatus == Horde_ActiveSync::PROVISION_RWSTATUS_WIPED) { + if ($rwstatus == Horde_ActiveSync::RWSTATUS_PENDING || $rwstatus == Horde_ActiveSync::RWSTATUS_WIPED) { $this->_statusCode = self::STATUS_FOLDERSYNCREQD; break; } diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php index 23be4d56f..12fde6034 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php @@ -36,11 +36,6 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base const STATUS_CLIENT_FAILED = 3; // No policies applied at all. const STATUS_CLIENT_THIRDPARTY = 4; // Client provisioned by 3rd party? - const RWSTATUS_NA = 0; - const RWSTATUS_OK = 1; - const RWSTATUS_PENDING = 2; - const RWSTATUS_WIPED = 3; - const POLICYTYPE_XML = 'MS-WAP-Provisioning-XML'; const POLICYTYPE_WBXML = 'MS-EAS-Provisioning-WBXML'; @@ -88,7 +83,7 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base return $this->_globalError(self::STATUS_PROTERROR); } if ($status == self::STATUS_CLIENT_SUCCESS) { - $state->setDeviceRWStatus($this->_devId, self::RWSTATUS_WIPED); + $state->setDeviceRWStatus($this->_devId, Horde_ActiveSync::RWSTATUS_WIPED); } /* Need to send *something* in the policytype field even if wiping */ @@ -151,7 +146,7 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base return $this->_globalError(self::STATUS_PROTERROR); } if ($status == self::STATUS_CLIENT_SUCCESS) { - $state->setDeviceRWStatus($this->_devId, self::RWSTATUS_WIPED); + $state->setDeviceRWStatus($this->_devId, Horde_ActiveSync::RWSTATUS_WIPED); } } } @@ -187,9 +182,9 @@ class Horde_ActiveSync_Request_Provision extends Horde_ActiveSync_Request_Base /* Wipe data if status is pending or wiped */ $rwstatus = $state->getDeviceRWStatus($this->_devId); - if ($rwstatus == self::RWSTATUS_PENDING || $rwstatus == self::RWSTATUS_WIPED) { + if ($rwstatus == Horde_ActiveSync::RWSTATUS_PENDING || $rwstatus == Horde_ActiveSync::RWSTATUS_WIPED) { $this->_encoder->startTag(Horde_ActiveSync::PROVISION_REMOTEWIPE, false, true); - $state->setDeviceRWStatus($this->_devId, self::RWSTATUS_WIPED); + $state->setDeviceRWStatus($this->_devId, Horde_ActiveSync::RWSTATUS_WIPED); } else { $this->_encoder->startTag(Horde_ActiveSync::PROVISION_POLICIES); $this->_encoder->startTag(Horde_ActiveSync::PROVISION_POLICY); diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php index 904360ff6..7475a74eb 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php @@ -352,7 +352,7 @@ class Horde_ActiveSync_State_File extends Horde_ActiveSync_State_Base /* Default structure */ $device = new StdClass(); $device->policykey = 0; - $device->rwstatus = 0; // ?? + $device->rwstatus = Horde_ActiveSync::RWSTATUS_NA; $device->deviceType = ''; $device->userAgent = ''; diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php index fd1f5cb4a..b3593586f 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php @@ -400,7 +400,7 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base } else { /* Default structure */ $this->_deviceInfo->policykey = 0; - $this->_deviceInfo->rwstatus = 0; // ?? + $this->_deviceInfo->rwstatus = Horde_ActiveSync::RWSTATUS_NA; $this->_deviceInfo->deviceType = ''; $this->_deviceInfo->userAgent = ''; $this->_deviceInfo->id = $devId; -- 2.11.0