Rewrite form generation.

[platal.git] / modules / survey / survey.inc.php

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index df0a9f9..865a148 100644 (file)
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -156,13 +156,24 @@ class Survey extends PlDBTableEntry implements SurveyQuestionContainer
     public function export()
     {
         $export = parent::export();
-        $export['questions'] = array();
+        $export['questions'] = $this->exportQuestions();
+        return $export;
+    }
+
+    public function exportQuestions()
+    {
+        $export = array();
         foreach ($this->questions as $question) {
-            $export['questions'][] = $question->export();
+            $export[] = $question->export();
         }
         return $export;
     }
 
+    public function exportQuestionsToJSON()
+    {
+        return json_encode($this->exportQuestions());
+    }
+
     /* Return an indicator of the progression of the survey:
      *  negative values means 'the survey is not started'
      *  0 means 'the survey is in progress'