From: Michael J. Rubinsky Date: Sun, 28 Mar 2010 15:50:29 +0000 (-0400) Subject: Remove obsolete constants, add some comments X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8477c57f814a1fa8437f1befa2030a93d42ce124;p=horde.git Remove obsolete constants, add some comments --- diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php index 2867ae7a7..8f24c7642 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync.php @@ -464,29 +464,7 @@ define("SYNC_PROVISION_RWSTATUS_WIPED", 3); */ class Horde_ActiveSync { - /* SYNC Status response codes */ - const STATUS_SYNC_SUCCESS = 1; - const STATUS_SYNC_VERSIONMISM = 2; - const STATUS_SYNC_KEYMISM = 3; - const STATUS_SYNC_PROTERROR = 4; - const STATUS_SYNC_SERVERERROR = 5; - - const STATUS_PING_NOCHANGES = 1; - const STATUS_PING_NEEDSYNC = 2; - const STATUS_PING_MISSING = 3; - const STATUS_PING_PROTERROR = 4; - // Hearbeat out of bounds (TODO) - const STATUS_PING_HBOUTOFBOUNDS = 5; - - // Requested more then the max folders (TODO) - const STATUS_PING_MAXFOLDERS = 6; - - // Folder sync is required, hierarchy out of date. - const STATUS_PING_FOLDERSYNCREQD = 7; - const STATUS_PING_SERVERERROR = 8; - - - /** + /** * DTD */ static public $zpushdtd = array( diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php index b2731a9c9..ed9fec468 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php @@ -39,6 +39,7 @@ class Horde_ActiveSync_Request_GetItemEstimate extends Horde_ActiveSync_Request_ return false; } + /* Obtain all the collections we are getting estimates for */ while ($this->_decoder->getElementStartTag(SYNC_GETITEMESTIMATE_FOLDER)) { /* Status - Assume success */ @@ -106,6 +107,7 @@ class Horde_ActiveSync_Request_GetItemEstimate extends Horde_ActiveSync_Request_ $this->_encoder->startWBXML(); + /* Start getting the actual esitmates and outputting the results */ $this->_encoder->startTag(SYNC_GETITEMESTIMATE_GETITEMESTIMATE); foreach ($collections as $collection) { $this->_encoder->startTag(SYNC_GETITEMESTIMATE_RESPONSE);