Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Updated Limesurvey to revision 11354

Browse Source
This commit is contained in:
azammitdcarf
2011-11-11 01:59:29 +00:00
parent 82a45813b4
commit a4935b7f08
27 changed files with 23399 additions and 20008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/limesurvey/admin/export_data_functions.php
View File

@@ -19,33 +19,15 @@
* @param $string
* @return $string
*/
function strip_tags_full($string, $is_csv=false ) {
function strip_tags_full($string) {
$string=html_entity_decode($string, ENT_QUOTES, "UTF-8");
//combining these into one mb_ereg_replace call ought to speed things up
//$string = str_replace(array("\r\n","\r","\n",'-oth-'), '', $string);
//The backslashes must be escaped twice, once for php, and again for the regexp
//$string = str_replace("'|\\\\'", "'", $string);
if($is_csv==true)
return FlattenText($string,true);
else
return FlattenText($string);
}
/**
* Strips html tags
*
* @param $string
* @return $string
*/
function strip_tags_full_save_newline($string) {
$string=html_entity_decode($string, ENT_QUOTES, "UTF-8");
//combining these into one mb_ereg_replace call ought to speed things up
//$string = str_replace(array("\r\n","\r","\n",'-oth-'), '', $string);
//The backslashes must be escaped twice, once for php, and again for the regexp
//$string = str_replace("'|\\\\'", "'", $string);
return FlattenTextWithNewline($string);
}
/**
* Returns true if passed $value is numeric
*
@@ -64,7 +46,7 @@ function my_is_numeric($value) {
return ($eng_or_world);
}
function spss_export_data ($na = null, $is_csv = false) {
function spss_export_data ($na = null) {
global $length_data;
// Build array that has to be returned
@@ -156,19 +138,9 @@ function spss_export_data ($na = null, $is_csv = false) {
echo("'0'");
}
} elseif (!$field['hide']) {
if($is_csv == true) {
$strTmp=mb_substr(strip_tags_full($row[$fieldno],true), 0, $length_data);
}
else {
$strTmp=mb_substr(strip_tags_full($row[$fieldno]), 0, $length_data);
}
if (trim($strTmp) != ''){
if($is_csv == true) {
$strTemp=str_replace(array("'"),array("''"),trim($strTmp));
}
else {
$strTemp=str_replace(array("'","\n","\r"),array("''",' ',' '),trim($strTmp));
}
/*
* Temp quick fix for replacing decimal dots with comma's
if (my_is_numeric($strTemp)) {