From 104eac324d3e6e79cbd035b8815cc257d4ae278f Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 4 Nov 2010 15:21:49 +0000
Subject: [PATCH] Fixed broken excel reportsfor non-latin1 encoding.

---
 CHANGELOG.txt                   |  4 ++++
 reporting/includes/Workbook.php | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7424b70c..b2a05d80 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+04-Nov-2010 Janusz Dobrowolski
+# Fixed broken excel reprots for non-latin encodings.
+$ /reporting/includes/Workbook.php
+
 03-Nov-2010 Janusz Dobrowolski
 # More corrections in cleanup for input
 $ /includes/session.inc
diff --git a/reporting/includes/Workbook.php b/reporting/includes/Workbook.php
index 56e4c483..40ffd362 100644
--- a/reporting/includes/Workbook.php
+++ b/reporting/includes/Workbook.php
@@ -4876,9 +4876,10 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
     * @access public
     * @param string $encoding The encoding. Ex: 'UTF-16LE', 'utf-8', 'ISO-859-7'
     */
-    function setInputEncoding($encoding)
+    function 
+    setInputEncoding($encoding)
     {
-    	global $encoding_string;
+    	global $encoding_string; 
          if ($encoding != 'UTF-16LE' && !function_exists('iconv')) {
              die("Using an input encoding other than UTF-16LE requires PHP support for iconv");
          }
@@ -4915,6 +4916,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
         }
         elseif ($this->_input_encoding != '')
         {
+        	$x = $str;
             $str = iconv($this->_input_encoding, 'UTF-16LE', $str);
             $strlen = function_exists('mb_strlen') ? mb_strlen($str, 'UTF-16LE') : (strlen($str) / 2);
             $encoding  = 0x1;
@@ -7087,7 +7089,8 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
     * @access public
     * @param integer $version The BIFF version
     */
-    function setVersion($version)
+    function 
+    setVersion($version)
     {
         if ($version == 8) { // only accept version 8
             $version = 0x0600;
@@ -8265,6 +8268,8 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
     */
     function _storeSharedStringsTable()
     {
+    	global $encoding_string;
+
         $record  = 0x00fc;  // Record identifier
         // sizes are upside down
         $this->_block_sizes = array_reverse($this->_block_sizes);
@@ -8287,7 +8292,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
         foreach (array_keys($this->_str_table) as $string) {
 
             $string_length = strlen($string);
-            $encoding      = 0; // assume there are no Unicode strings
+            $encoding      = $encoding_string ? 1:0; // this is FA specific assumption
             $split_string  = 0;
 
             // Block length is the total length of the strings that will be
-- 
2.30.2