Remove dead code, clean up some @todos

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php
index 298c647..06f2245 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php
@@ -151,26 +151,4 @@ abstract class Horde_ActiveSync_Request_Base
         $this->_logger->info('Request received from device: ' . $devId . ' Supporting protocol version: ' . $this->_version);
     }
 
-    /**
-     * Read input from the php input stream
-     *
-     * @TODO: Get rid of this - the wbxml classes have a php:// stream already
-     *        and when we need *just* the stream and not wbxml, we can use
-     *        $request->body
-     *
-     * @return string
-     */
-    protected function _readStream()
-    {
-        $s = "";
-        while (1) {
-            $data = fread($this->_inputStream, 4096);
-            if (strlen($data) == 0) {
-                break;
-            }
-            $s .= $data;
-        }
-
-        return $s;
-    }
 }

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
index cde1ff3..7e58688 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
@@ -18,7 +18,6 @@ class Horde_ActiveSync_Request_Ping extends Horde_ActiveSync_Request_Base
     const STATUS_NEEDSYNC = 2;
     const STATUS_MISSING = 3;
     const STATUS_PROTERROR = 4;
-    // Hearbeat out of bounds (TODO)
     const STATUS_HBOUTOFBOUNDS = 5;
 
     // Requested more then the max folders (TODO)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
index edd645a..4842c9d 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
@@ -87,11 +87,9 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base
                 }
             }
 
-            /* Looks like we ignore the SYNC_SUPPORTED Tag? */
-            // @TODO: This needs to be captured and stored in the state so we
-            // can correctly support ghosted properties
+            /* SYNC_SUPPORTED */
             if ($this->_decoder->getElementStartTag(Horde_ActiveSync::SYNC_SUPPORTED)) {
-                // SUPPORTED only allowed on initial sync request
+                // Only allowed on initial sync request
                 if ($collection['synckey'] != 0) {
                     $this->_statusCode = Horde_ActiveSync::SYNC_STATUS_PROTERROR;
                     $this->_handleError($collection);

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php b/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php
index 91cd94f..63379dd 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php
@@ -177,7 +177,6 @@ class Horde_ActiveSync_Wbxml_Decoder extends Horde_ActiveSync_Wbxml
     }
 
     /**
-     * @TODO: Do we need?
      * @return unknown_type
      */
     public function getToken()