Horde_Stream#substream() feels more natural here.

horde · Oct 1, 2013 · c2a8a51 · c2a8a51
1 parent a90206a
commit c2a8a51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php b/framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php
@@ -1015,7 +1015,8 @@ protected function _buildMailMessage(
         // Preview?
         if ($version >= Horde_ActiveSync::VERSION_FOURTEEN && !empty($options['bodyprefs']['preview'])) {
             $message_body_data['plain']['body']->rewind();
-            $eas_message->airsyncbasebody->preview = $message_body_data['plain']['body']->getString(null, $options['bodyprefs']['preview']);
+            $eas_message->airsyncbasebody->preview =
+                $message_body_data['plain']['body']->substring(0, $options['bodyprefs']['preview']);
         }
 
         // Check for special message types.

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php b/framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php
@@ -106,7 +106,7 @@ public function getString()
     public function getHeaders()
     {
         $this->_stream->rewind();
-        $hdr_text = $this->_stream->getString(null, $this->_hdr_pos);
+        $hdr_text = $this->_stream->substring(0, $this->_hdr_pos);
         return Horde_Mime_Headers::parseHeaders($hdr_text);
     }
 
@@ -148,7 +148,7 @@ protected function _findHeader()
     {
         $i = 0;
         while (!$this->_stream->eof()) {
-            $data = $this->_stream->getString(null, $this->_stream->pos() + 8192);
+            $data = $this->_stream->substring(0, 8192);
             $hdr_pos = strpos($data, "\r\n\r\n");
             if ($hdr_pos !== false) {
                 return array($hdr_pos + ($i * 8192), 4);

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php b/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php
@@ -599,7 +599,7 @@ private function _getOpaque($len)
         while (1) {
             $l = (($len - strlen($d)) > 8192) ? 8192 : ($len - strlen($d));
             if ($l > 0) {
-                $data = $this->_stream->getString(null, $this->_stream->pos() + $l);
+                $data = $this->_stream->substring(0, $l);
                 // Stream ends prematurely on instable connections and big mails
                 if ($data === false || $this->_stream->eof()) {
                     throw new Horde_ActiveSync_Exception(sprintf(
@@ -665,7 +665,7 @@ private function _getStringTable()
         $stringtable = '';
         $length = $this->_getMBUInt();
         if ($length > 0) {
-            $stringtable = $this->_stream->getString(null, $this->_stream->pos() + $length);
+            $stringtable = $this->_stream->substring(0, $length);
         }
 
         return $stringtable;