Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

TMSWhite · Mar 25, 2014 · 6bfa0bf · 6bfa0bf
2 parents a1e06e2 + bf7fb09
commit 6bfa0bf
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 15 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
@@ -2972,7 +2972,7 @@ function CSVImportSurvey($sFullFilePath,$iDesiredSurveyId=NULL,$bTranslateLinks=
             // Set a warning if question title was updated
             if(isset($sNewTitle))
             {
-                $importresults['importwarnings'][] = sprintf("Question code %s was updated to %s.",$sOldTitle,$sNewTitle);
+                $importresults['importwarnings'][] = sprintf($clang->gT("Question code %s was updated to %s."),$sOldTitle,$sNewTitle);
                 $aQuestionCodeReplacements[$sOldTitle]=$sNewTitle;
                 unset($sNewTitle);
                 unset($sOldTitle);
@@ -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;
@@ -3798,7 +3798,7 @@ function XMLImportSurvey($sFullFilePath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
             // Set a warning if question title was updated
             if(isset($sNewTitle))
             {
-                $results['importwarnings'][] = sprintf("Question code %s was updated to %s.",$sOldTitle,$sNewTitle);
+                $results['importwarnings'][] = sprintf($clang->gT("Question code %s was updated to %s."),$sOldTitle,$sNewTitle);
                 $aQuestionCodeReplacements[$sOldTitle]=$sNewTitle;
                 unset($sNewTitle);
                 unset($sOldTitle);

diff --git a/application/views/admin/participants/displayParticipants_view.php b/application/views/admin/participants/displayParticipants_view.php
@@ -63,6 +63,7 @@
     var sAddCaption = "<?php $clang->eT("Add participant", 'js') ?>";
     var sAddButtonCaption = "<?php $clang->eT("Add", 'js') ?>";
     var sDeleteButtonCaption = "<?php $clang->eT("Delete", 'js') ?>";
+    var sDeleteDialogCaption = "<?php $clang->eT("Delete one or more participants...", 'js') ?>";
     var sCancel = "<?php $clang->eT("Cancel", 'js') ?>";
     var sSubmit = "<?php $clang->eT("Save", 'js') ?>";
     var fullSearchTitle = "<?php $clang->eT("Full search"); ?>";

diff --git a/application/views/admin/participants/importCSV_view.php b/application/views/admin/participants/importCSV_view.php
@@ -69,6 +69,6 @@
     <p>
         <?php $clang->eT("File should be a standard CSV (comma delimited) file with optional double quotes around values (default for OpenOffice and Excel). The first line must contain the field names. The fields can be in any order."); ?>
     </p>
-    <span style="font-weight:bold;">Mandatory fields:</span> firstname, lastname, email    <br/>
-    <span style="font-weight:bold;">Optional fields:</span> blacklist,language
+    <span style="font-weight:bold;"><?php $clang->eT("Mandatory fields:") ?></span> firstname, lastname, email    <br/>
+    <span style="font-weight:bold;"><?php $clang->eT("Optional fields:") ?></span> blacklist,language
 </div>
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;
diff --git a/scripts/admin/participantdisplay.js b/scripts/admin/participantdisplay.js
@@ -289,6 +289,7 @@ $(document).ready(function() {
         }, //default settings for add
         {msg:deleteMsg, 
             bCancel: sCancel,
+            caption: sDeleteDialogCaption,
             bSubmit: sDeleteButtonCaption,
             width : 900,
             afterShowForm: function($form) {