Lp: Implement surveys in lps with reporting - refs BT#19049

main/survey/surveyUtil.class.php

@@ -151,7 +151,7 @@ class SurveyUtil
         }
         // To select the answers by session
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
             $sessionCondition = " , session_id = $sessionId";
         }
 
@@ -340,7 +340,7 @@ class SurveyUtil
 
             // To delete or update the answer by session
             $sessionCondition = '';
-            if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+            if (api_get_configuration_value('show_surveys_base_in_sessions')) {
                 $sessionId = api_get_session_id();
                 $sessionCondition = api_get_session_condition($sessionId);
             }
@@ -484,10 +484,12 @@ class SurveyUtil
             }
             // To select the answers by session
             $sessionCondition = '';
-            if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
             $sessionId = api_get_session_id();
+            if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+                if (!empty($sessionId)) {
                     $sessionCondition = api_get_session_condition($sessionId);
                 }
+            }
 
             // To select the answers by Lp item
             $lpItemCondition = '';
@@ -723,10 +725,13 @@ class SurveyUtil
 
         // To select the answers by session
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
+            if (!empty($sessionId)) {
                 $sessionCondition = api_get_session_condition($sessionId);
             }
+        }
 
+        // To select the aswers by lp item
         $lpItemCondition = '';
         $urlParams = '';
         if (api_get_configuration_value('allow_survey_tool_in_lp')) {
@@ -1038,13 +1043,15 @@ class SurveyUtil
         $table_survey_answer = Database::get_course_table(TABLE_SURVEY_ANSWER);
         $course_id = api_get_course_int_id();
         $surveyId = $survey_data['survey_id'];
+        $sessionId = api_get_session_id();
 
         // To select the answers by session
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
-            $sessionId = api_get_session_id();
+            if (!empty($sessionId)) {
                 $sessionCondition = api_get_session_condition($sessionId);
             }
+        }
 
         // Getting the options
         $sql = "SELECT * FROM $table_survey_question_option
@@ -1172,13 +1179,17 @@ class SurveyUtil
 
         $surveyId = (int) $survey_data['survey_id'];
         $course_id = (int) $survey_data['c_id'];
+        $sessionId = api_get_session_id();
 
         // To select the answers by session
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
-            $sessionId = api_get_session_id();
+            if (!empty($sessionId)) {
                 $sessionCondition = api_get_session_condition($sessionId);
             }
+        }
+
+        // To select the answers by lp item
         $lpItemCondition = '';
         if (true === api_get_configuration_value('allow_survey_tool_in_lp')) {
             $lpItemCondition = " AND c_lp_item_id = $lpItemId";
@@ -1629,13 +1640,15 @@ class SurveyUtil
 
         $course = api_get_course_info();
         $course_id = $course['real_id'];
+        $sessionId = api_get_session_id();
 
         // To select the answers by session
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
-            $sessionId = api_get_session_id();
+            if (!empty($sessionId)) {
                 $sessionCondition = api_get_session_condition($sessionId);
             }
+        }
 
         $table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION);
         $table_survey_question_option = Database::get_course_table(TABLE_SURVEY_QUESTION_OPTION);
@@ -2016,11 +2029,13 @@ class SurveyUtil
         $table_survey_answer = Database::get_course_table(TABLE_SURVEY_ANSWER);
 
         // To select the answers by session
-        $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
         $sessionId = api_get_session_id();
+        $sessionCondition = '';
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
+            if (!empty($sessionId)) {
                 $sessionCondition = api_get_session_condition($sessionId);
             }
+        }
 
         // First line (questions)
         $sql = "SELECT
@@ -2575,8 +2590,10 @@ class SurveyUtil
         // To select the answers by session
         $sessionCondition = '';
         if (api_get_configuration_value('show_surveys_base_in_sessions')) {
+            if (!empty($sessionId)) {
                 $sessionCondition = api_get_session_condition($sessionId);
             }
+        }
         // To select the answers by Lp item
         $lpItemCondition = '';
         if (api_get_configuration_value('allow_survey_tool_in_lp') && !empty($lpItemId)) {
@@ -3624,7 +3641,7 @@ class SurveyUtil
         }
         // To list the surveys base too
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
             $sessionCondition = api_get_session_condition(api_get_session_id(), true, true);
         }
 
@@ -3690,8 +3707,8 @@ class SurveyUtil
 
         // To list the surveys base too
         $sessionCondition = '';
-        if (true === api_get_configuration_value('show_surveys_base_in_sessions')) {
         $sessionId = api_get_session_id();
+        if (api_get_configuration_value('show_surveys_base_in_sessions')) {
             $sessionCondition = api_get_session_condition($sessionId, true, true);
         }
         $course_id = api_get_course_int_id();