Merge pull request #122 from trougakoss/Yii

Bug fixes 8129, 8130
LimeSurvey · Sep 25, 2013 · e2a4576 · e2a4576
2 parents 9abc384 + 3282a0b
commit e2a4576
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/controllers/admin/remotecontrol.php b/application/controllers/admin/remotecontrol.php
@@ -362,14 +362,14 @@ public function import_survey($sSessionKey, $sImportData, $sImportDataType, $sNe
         {
             if (hasGlobalPermission('USER_RIGHT_CREATE_SURVEY'))
             {
-                if (!in_array($sImportDataType,array('zip','csv','xls','lss'))) return array('status' => 'Invalid extension');
+                if (!in_array($sImportDataType,array('zip','csv','xls','lss','txt'))) return array('status' => 'Invalid extension');
                 Yii::app()->loadHelper('admin/import');
                 // First save the data to a temporary file
                 $sFullFilePath = Yii::app()->getConfig('tempdir') . DIRECTORY_SEPARATOR . randomChars(40).'.'.$sImportDataType;
                 file_put_contents($sFullFilePath,base64_decode(chunk_split($sImportData)));
                 $aImportResults = importSurveyFile($sFullFilePath, true, $sNewSurveyName, $DestSurveyID);
                 unlink($sFullFilePath);
-                if (isset($aImportResults['error'])) return array('status' => 'Error: '.$aImportResults['error']);
+                if (isset($aImportResults['error']) && !empty($aImportResults['error'])) return array('status' => 'Error: '.$aImportResults['error']);
                 else
                 {
                     return (int)$aImportResults['newsid'];