Fixed issue #6685 : Export of results broken

Dev : just fix Undefined variable: sFilter : can export all result or one answer line. But another bug report for filter
LimeSurvey · Oct 11, 2012 · 5faaa17 · 5faaa17
1 parent cca22a3
commit 5faaa17
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -228,42 +228,40 @@ public function exportresults()
         $options->headerSpacesToUnderscores = $convertspacetous;
         $options->headingFormat = $exportstyle;
         $options->responseCompletionState = incompleteAnsFilterState();
+        if ( $options->responseCompletionState =='all' ){$options->responseCompletionState =='show';}
 
-        //If we have no data for the filter state then default to show all.
-        if ( $options->responseCompletionState =='all' )
+        // Replace token information by the column name
+        if ( in_array('first_name', Yii::app()->request->getPost('attribute_select', array())) )
         {
+            $options->selectedColumns[]="firstname";
+        }
 
-            $dquery = '';
-            if ( in_array('first_name', Yii::app()->request->getPost('attribute_select', array())) )
-            {
-                $options->selectedColumns[]="firstname";
-            }
-
-            if ( in_array('last_name', Yii::app()->request->getPost('attribute_select', array())) )
-            {
-                $options->selectedColumns[]="lastname";
-            }
-
-            if ( in_array('email_address', Yii::app()->request->getPost('attribute_select', array())) )
-            {
-                $options->selectedColumns[]="email";
-            }
-
-            $attributeFields = getTokenFieldsAndNames($iSurveyID, TRUE);
+        if ( in_array('last_name', Yii::app()->request->getPost('attribute_select', array())) )
+        {
+            $options->selectedColumns[]="lastname";
+        }
 
-            foreach ($attributeFields as $attr_name => $attr_desc)
+        if ( in_array('email_address', Yii::app()->request->getPost('attribute_select', array())) )
+        {
+            $options->selectedColumns[]="email";
+        }
+        $attributeFields = getTokenFieldsAndNames($iSurveyID, TRUE);
+        foreach ($attributeFields as $attr_name => $attr_desc)
+        {
+            if ( in_array($attr_name, Yii::app()->request->getPost('attribute_select',array())) )
             {
-                if ( in_array($attr_name, Yii::app()->request->getPost('attribute_select',array())) )
-                {
-                    $options->selectedColumns[]=$attr_name;
-                }
+                $options->selectedColumns[]=$attr_name;
             }
         }
+
         if (Yii::app()->request->getPost('response_id'))
         {
             $sFilter='id='.(int)Yii::app()->request->getPost('response_id');
         }
-
+        else
+        {
+            $sFilter='';
+        }
         $resultsService = new ExportSurveyResultsService();
         $resultsService->exportSurvey($iSurveyID, $explang, $type, $options, $sFilter);