Code:
system/modules/efg/drivers/DC_Formdata.php
==========================================
--- system/modules/efg/drivers/DC_Formdata.php 2013-03-17 14:16:32.000000000 +0100
+++ system/modules/efg/drivers/DC_Formdata.php 2013-11-19 23:52:32.502909188 +0100
@@ -5380,6 +5380,10 @@
{
$blnCustomXlsExport = true;
}
+ else
+ {
+ include(TL_ROOT.'/plugins/xls_export/xls_export.php');
+ }
}
elseif ($strMode!='csv')
{
@@ -5570,7 +5574,7 @@
if ($strMode=='csv')
{
- header('Content-Type: appplication/csv; charset='.($this->blnExportUTF8Decode ? 'CP1252' : 'utf-8'));
+ header('Content-Type: appplication/csv; charset='.($this->blnExportUTF8Decode ? 'CP1250' : 'utf-8'));
header('Content-Transfer-Encoding: binary');
header('Content-Disposition: attachment; filename="export_' . $this->strFormKey . '_' . date("Ymd_His") .'.csv"');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
@@ -5668,7 +5672,7 @@
if ($this->blnExportUTF8Decode || ($strMode == 'xls' && !$blnCustomXlsExport))
{
- $strName = $this->convertEncoding($strName, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
+ $strName = $this->convertEncoding($strName, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1250');
}
if ($strMode=='csv')
@@ -5896,7 +5900,7 @@
if ($this->blnExportUTF8Decode || ($strMode == 'xls' && !$blnCustomXlsExport))
{
- $strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
+ $strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1250');
}
}
@@ -5978,12 +5982,13 @@
*/
public function convertEncoding($strString, $from, $to)
{
- if (USE_MBSTRING)
- {
- @mb_substitute_character('none');
- return @mb_convert_encoding($strString, $to, $from);
- }
- elseif (function_exists('iconv'))
+ #if (USE_MBSTRING)
+ #{
+ # @mb_substitute_character('none');
+ # return @mb_convert_encoding($strString, $to, $from);
+ #}
+ #elseif (function_exists('iconv'))
+ if (function_exists('iconv'))
{
if (strlen($iconv = @iconv($from, $to . '//IGNORE', $strString)))
{
system/modules/efg/modules/ModuleFormdataListing.php
====================================================
--- system/modules/efg/modules/ModuleFormdataListing.php 2013-03-17 14:16:32.000000000 +0100
+++ system/modules/efg/modules/ModuleFormdataListing.php 2013-11-19 20:17:43.014309347 +0100
@@ -1216,7 +1216,7 @@
}
else // defaults to csv
{
- header('Content-Type: appplication/csv; charset=' . ($this->blnExportUTF8Decode ? 'CP1252' : 'utf-8'));
+ header('Content-Type: appplication/csv; charset=' . ($this->blnExportUTF8Decode ? 'CP1250' : 'utf-8'));
header('Content-Transfer-Encoding: binary');
header('Content-Disposition: attachment; filename="export_' . $this->strFormKey . '_' . date("Ymd_His") . '.csv"');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
@@ -1263,7 +1263,7 @@
if ($this->blnExportUTF8Decode || ($strExportMode=='xls' && !$blnCustomXlsExport))
{
- $strName = $this->convertEncoding($strName, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
+ $strName = $this->convertEncoding($strName, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1250');
}
if ($strExportMode=='csv')
@@ -1830,7 +1830,7 @@
if ($this->blnExportUTF8Decode || ($strExportMode=='xls' && !$blnCustomXlsExport))
{
- $strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
+ $strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1250');
}
}
@@ -2508,7 +2508,7 @@
}
else // defaults to csv
{
- header('Content-Type: appplication/csv; charset='.($this->blnExportUTF8Decode ? 'CP1252' : 'utf-8'));
+ header('Content-Type: appplication/csv; charset='.($this->blnExportUTF8Decode ? 'CP1250' : 'utf-8'));
header('Content-Transfer-Encoding: binary');
header('Content-Disposition: attachment; filename="export_' . $this->strFormKey . '_' . date("Ymd_His") . '.csv"');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
@@ -2574,7 +2574,7 @@
if ($this->blnExportUTF8Decode || ($strExportMode == 'xls' && !$blnCustomXlsExport))
{
- $strName = $this->convertEncoding($strName, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
+ $strName = $this->convertEncoding($strName, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1250');
}
}
@@ -2766,7 +2766,7 @@
if ($this->blnExportUTF8Decode || ($strExportMode == 'xls' && !$blnCustomXlsExport))
{
- $strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1252');
+ $strVal = $this->convertEncoding($strVal, $GLOBALS['TL_CONFIG']['characterSet'], 'CP1250');
}
}
@@ -3215,12 +3215,12 @@
*/
public function convertEncoding($strString, $from, $to)
{
- if (USE_MBSTRING)
- {
- @mb_substitute_character('none');
- return @mb_convert_encoding($strString, $to, $from);
- }
- elseif (function_exists('iconv'))
+ #if (USE_MBSTRING)
+ #{
+ # @mb_substitute_character('none');
+ # return @mb_convert_encoding($strString, $to, $from);
+ #}
+ if (function_exists('iconv'))
{
if (strlen($iconv = @iconv($from, $to . '//IGNORE', $strString)))
{
Bookmarks