Minor: Clean code, remarks in PR - refs BT#19049

main/install/configuration.dist.php

@@ -498,10 +498,13 @@ ALTER TABLE sys_announcement ADD COLUMN visible_boss INT DEFAULT 0;
 //
 // Allow survey tool in learnpath
 // ALTER TABLE c_survey_answer ADD COLUMN c_lp_item_id INT(11) DEFAULT 0;
+// Edit src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php and add a '@' character in front of 'ORM\Column(name="c_lp_item_id"
 // ALTER TABLE c_survey_invitation ADD COLUMN c_lp_item_id int(11) DEFAULT 0;
+// Edit src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php and add a '@' character in front of 'ORM\Column(name="c_lp_item_id"
 //$_configuration['allow_survey_tool_in_lp'] = false;
 // Show surveys from main course in all course sessions
 // ALTER TABLE c_survey_answer ADD COLUMN session_id INT(11) DEFAULT 0;
+// Edit src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php and add a '@' character in front of 'ORM\Column(name="session_id"
 //$_configuration['show_surveys_base_in_sessions'] = false;
 //
 // ------ HTTP headers security

main/lp/learnpath.class.php

@@ -8095,7 +8095,7 @@ class learnpath
         } elseif (is_numeric($extraInfo)) {
             $sql = "SELECT title, intro as comment
                     FROM $tblSurvey
-                    WHERE c_id = $courseId AND survey_id = ".$extraInfo;
+                    WHERE c_id = $courseId AND survey_id = ".(int) $extraInfo;
 
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
@@ -13804,7 +13804,7 @@ EOD;
                     ."?id=$id&$extraParams";
             case TOOL_SURVEY:
                 $table = Database::get_course_table(TABLE_SURVEY);
-                $sql = "SELECT code FROM $table WHERE c_id = $course_id AND survey_id = $id";
+                $sql = "SELECT code FROM $table WHERE c_id = $course_id AND survey_id =".(int) $id;
                 $result = Database::query($sql);
                 $surveyCode = Database::result($result, 0, 0);
                 $autoSurveyLink = SurveyUtil::generateFillSurveyLink(

main/survey/fillsurvey.php

@@ -814,10 +814,8 @@ if ((isset($_GET['show']) && $_GET['show'] != '') ||
                                 SELECT sa.question_id
                                 FROM ".$table_survey_answer." sa
                                 WHERE
-                                    sa.user='".$my_user_id."') AND
+                                    sa.user='".$my_user_id."' $sessionCondition $lpItemCondition) AND
                                     survey_question.c_id =  $course_id
-                                    $sessionCondition
-                                    $lpItemCondition
                                 ORDER BY survey_question.sort, survey_question_option.sort ASC";
             } else {
                 $sql = "SELECT