2011-02-22 Sancho Lerena <slerena@artica.es>

* include/streams.php: Fixed bug 3184746.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3973 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,7 @@
+2011-02-22 Sancho Lerena <slerena@artica.es>
+
+        * include/streams.php: Fixed bug 3184746.
+
 2011-02-22  Sergio Martin <sergio.martin@artica.es>
 
 	* include/languages/et.mo

pandora_console/include/streams.php

@@ -1,10 +1,10 @@
 <?php
-/**
+/*l Library: StreamReader classes
- * @package Include
+ *
- * @subpackage External_Scripts
+ * @package External
- */
+ * @subpackage PHP-gettext
-
+ *
-/*
+ * @internal
    Copyright (c) 2003, 2005 Danilo Segan <danilo@kvota.net>.
 
    This file is part of PHP-gettext.
@@ -25,12 +25,15 @@
 
  */
 
-/**
+ //------------------------------------ BUGFIX related to WordPress 2.5.x upto 2.6.0 -----------------------------------------------------------
- * Simple class to wrap file streams, string streams, etc.
+ // all contained patches have been marked with BUGFIX-HR handling the the issues of "mbstring.func_overload = x" 
- * seek is essential, and it should be byte stream
+ // where x & 2 != 0 (str* function overloads)
- * @package Include
+ // this bug at WordPress forces any translation file to fail with gettext / unpack errors and maximum runtime exceeded fatal stop
- * @subpackage Streams
+ // Autor: Heiko Rabe  info@code-styling.de
- */
+ //-------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+// Simple class to wrap file streams, string streams, etc.
+// seek is essential, and it should be byte stream
 class StreamReader {
   // should return a string [FIXME: perhaps return array of bytes?]
   function read($bytes) {
@@ -53,10 +56,6 @@ class StreamReader {
   }
 }
 
-/**
- * @package Include
- * @subpackage Streams
- */
 class StringReader {
   var $_pos;
   var $_str;
@@ -64,9 +63,13 @@ class StringReader {
   function StringReader($str='') {
     $this->_str = $str;
     $this->_pos = 0;
+	//BUGFIX-HR: 2008-07-21 we have to detect, if we need mb_str* functions instead of normal functions !
+	$this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
   }
 
   function read($bytes) {
+	//BUGFIX-HR: 2008-07-21 if we are overloaded, use the mb_str* functions
+	if ($this->is_overloaded) return $this->mb_read($bytes);
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
     if (strlen($this->_str)<$this->_pos)
@@ -75,27 +78,51 @@ class StringReader {
     return $data;
   }
   
+  //BUGFIX-HR: 2008-07-21 corresponding multi byte method
+  function mb_read($bytes) {
+    $data = mb_substr($this->_str, $this->_pos, $bytes, 'ascii');
+    $this->_pos += $bytes;
+    if (mb_strlen($this->_str, 'ascii')<$this->_pos)
+      $this->_pos = mb_strlen($this->_str, 'ascii');
+
+    return $data;
+  }
+
   function seekto($pos) {
+	//BUGFIX-HR: 2008-07-21 if we are overloaded, use the mb_str* functions
+	if ($this->is_overloaded) return $this->mb_seekto($pos);
     $this->_pos = $pos;
     if (strlen($this->_str)<$this->_pos)
       $this->_pos = strlen($this->_str);
     return $this->_pos;
   }
   
+  //BUGFIX-HR: 2008-07-21 corresponding multi byte method
+  function mb_seekto($pos) {
+    $this->_pos = $pos;
+    if (mb_strlen($this->_str, 'ascii')<$this->_pos)
+      $this->_pos = mb_strlen($this->_str, 'ascii');
+    return $this->_pos;
+  }
+
   function currentpos() {
     return $this->_pos;
   }
   
   function length() {
+	//BUGFIX-HR: 2008-07-21 if we are overloaded, use the mb_str* functions
+	if ($this->is_overloaded) return $this->mb_length();
     return strlen($this->_str);
   }
 
+  //BUGFIX-HR: 2008-07-21 corresponding multi byte method
+  function mb_length() {
+	return mb_strlen($this->str, 'ascii');
   }
   
-/**
+}
- * @package Include
+
- * @subpackage Streams
+
- */
 class FileReader {
   var $_pos;
   var $_fd;
@@ -154,14 +181,11 @@ class FileReader {
 
 }
 
-/**
+// Preloads entire file in memory first, then creates a StringReader
- * Preloads entire file in memory first, then creates a StringReader 
+// over it (it assumes knowledge of StringReader internals)
- * over it (it assumes knowledge of StringReader internals)
- * @package Include
- * @subpackage Streams
- */
 class CachedFileReader extends StringReader {
   function CachedFileReader($filename) {
+	parent::StringReader(); //BUGFIX-HR: 2008-07-21 missing parent constructor call
     if (file_exists($filename)) {
 
       $length=filesize($filename);
@@ -172,6 +196,8 @@ class CachedFileReader extends StringReader {
 		return false;
       }
       $this->_str = fread($fd, $length);
+//BUGFIX-HR: 2008-07-21 not longer nessessary, cause parent contructor properly called now
+//	  $this->_pos = 0;
 	  fclose($fd);
 
     } else {