Fixed issue #6478: Unable to import excel survey

Dev Fixed incorrect URL description reading in Excel reader
LimeSurvey · Aug 17, 2012 · 3e96fa1 · 3e96fa1
1 parent f003d3d
commit 3e96fa1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -4275,15 +4275,11 @@ function ExcelImportSurvey($sFullFilepath)
     }
 
     // Create the survey entry
-    $iNewSID=GetNewSurveyID($iOldSID);
     $surveyinfo['startdate']=NULL;
-    $surveyinfo['sid']=$iNewSID;
     $surveyinfo['active']='N';
-    $surveyinfo['owner_id']=$_SESSION['loginID'];
-    $surveyinfo['datecreated']=new CDbExpression('NOW()');
-
     switchMSSQLIdentityInsert('surveys',true);
     $iNewSID = Survey::model()->insertNewSurvey($surveyinfo) or safeDie($clang->gT("Error").": Failed to insert survey<br />");
+    $surveyinfo['sid']=$iNewSID;
     $results['surveys']++;
     switchMSSQLIdentityInsert('surveys',false);
     $results['newsid']=$iNewSID;

diff --git a/application/libraries/admin/excel/excel_reader2.php b/application/libraries/admin/excel/excel_reader2.php
@@ -858,7 +858,7 @@ function dump($row_numbers=false,$col_letters=false,$sheet=0,$table_class='excel
 	function read16bitstring($data, $start) {
 		$len = 0;
 		while (ord($data[$start + $len]) + ord($data[$start + $len + 1]) > 0) $len++;
-		return substr($data, $start, $len);
+		return substr($data, $start, $len+1);
 	}
 
 	// ADDED by Matt Kruse for better formatting

diff --git a/tmp/.gitignore b/tmp/.gitignore
@@ -2,3 +2,4 @@
 *.html
 /*.lss
 /*.png
+/*.xls