Fixed issue #8894: Error when importing an invalid file

LimeSurvey · Mar 24, 2014 · dfd813a · dfd813a
1 parent 29c994b
commit dfd813a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -1100,10 +1100,13 @@ function attributeMapCSV()
         }
         else
         {
-            $templateData['error_msg'] = sprintf($clang->gT("This is not a .csv file."), Yii::app()->getConfig('tempdir'));
-            $errorinupload = array('error' => $this->upload->display_errors());
-            Yii::app()->session['summary'] = array('errorinupload' => $errorinupload);
-            $this->_renderWrappedTemplate('participants', array('participantsPanel', 'uploadSummary'),array('aAttributes' => ParticipantAttributeName::model()->getAllAttributes()));
+            $templateData['errorinupload']['error'] = $clang->gT("This is not a .csv file.");
+            $templateData['aAttributes'] = ParticipantAttributeName::model()->getAllAttributes();
+            $templateData['aGlobalErrors'] = array();
+          //  $errorinupload = array('error' => $this->upload->display_errors());
+          //  Yii::app()->session['summary'] = array('errorinupload' => $errorinupload);
+            $this->_renderWrappedTemplate('participants', array('participantsPanel', 'uploadSummary'),$templateData);
+            exit;
         }
 
 

diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -923,7 +923,11 @@ public function copy()
             if ($action == 'importsurvey' && !$aData['bFailed'])
             {
                 $aImportResults=importSurveyFile($sFullFilepath,(isset($_POST['translinksfields'])));
-                if (is_null($aImportResults)) $importerror = true;
+                if (is_null($aImportResults) || isset($aImportResults['error']))
+                {
+                    $aData['sErrorMessage']=$aImportResults['error'];
+                    $aData['bFailed'] = true;
+                } 
             }
             elseif ($action == 'copysurvey' && !$aData['bFailed'])
             {
@@ -940,7 +944,7 @@ public function copy()
             }
             else
             {
-                $importerror = true;
+                $aData['bFailed'] = true;
             }
             if ($action == 'importsurvey' && isset($sFullFilepath))
             {

diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -3511,9 +3511,9 @@ function XMLImportSurvey($sFullFilePath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
     {
         $sXMLdata = file_get_contents($sFullFilePath);
     } 
-    $xml = simplexml_load_string($sXMLdata,'SimpleXMLElement',LIBXML_NONET);
+    $xml = @simplexml_load_string($sXMLdata,'SimpleXMLElement',LIBXML_NONET);
 
-    if ($xml->LimeSurveyDocType!='Survey')
+    if (!$xml || $xml->LimeSurveyDocType!='Survey')
     {
         $results['error'] = $clang->gT("This is not a valid LimeSurvey survey structure XML file.");
         return $results;

diff --git a/application/views/admin/participants/uploadSummary_view.php b/application/views/admin/participants/uploadSummary_view.php
@@ -77,13 +77,13 @@
                     $uploadSummary .= "</ul></div></li>";
                 }
             }
-            $uploadSummary .= "</div></div>";
         }
         else
         {
-            echo $errorinupload['error'];
-            $uploadSummary .= "<div class='warningheader'>" . $errorinupload['error'] . "</div>";
+            $uploadSummary .= "<div class='warningheader'>" . $clang->gT('Error') . "</div>";
+            $uploadSummary .= $errorinupload['error'];
         }
         foreach($aGlobalErrors as $sGlobalError)
             echo "<script> \$notifycontainer.notify('create', 'error-notify', { message:'{$sGlobalError}'});</script>";
+        $uploadSummary .= "</div></div>";
         echo $uploadSummary;