';
-echo '';
+echo '
';
+echo '
'.Security::remove_XSS(strip_tags($survey->getTitle(), '')).'
';
+
if (!empty($survey->getSubtitle())) {
- echo '
'.strip_tags($survey->getSubtitle()).'
';
+ echo '
'.Security::remove_XSS($survey->getSubtitle()).'
';
}
-// Displaying the survey introduction
-if (
- !isset($_GET['show']) ||
- (isset($_GET['show'])) && '' == $_GET['show']) {
- // The first thing we do is delete the session
+// Intro (first load)
+if (!isset($_GET['show']) || (isset($_GET['show']) && '' == $_GET['show'])) {
Session::erase('paged_questions');
Session::erase('page_questions_sec');
$paged_questions_sec = [];
if (!empty($survey->getIntro())) {
- echo '
'.Security::remove_XSS($survey->getIntro()).'
';
+ echo '
'.Security::remove_XSS($survey->getIntro()).'
';
}
$limit = 0;
}
-if ($survey->getFormFields() &&
- 0 == $survey->getAnonymous() &&
- is_array($user_data) &&
- !isset($_GET['show'])
-) {
+// Profile form handling
+if ($survey->getFormFields() && 0 == $survey->getAnonymous() && is_array($user_data) && !isset($_GET['show'])) {
if ($form->validate()) {
$user_data = $form->exportValues();
- if (is_array($user_data)) {
- if (count($user_data) > 0) {
- $extras = [];
- // Build SQL query
- $sql = "UPDATE $table_user SET";
- $update = false;
- $allowedFields = [
- 'firstname',
- 'lastname',
- 'official_code',
- 'email',
- 'phone',
- 'language',
- ];
-
- foreach ($user_data as $key => $value) {
- if (in_array($key, $allowedFields)) {
- $sql .= " $key = '".Database :: escape_string($value)."',";
- $update = true;
- }
+ if (is_array($user_data) && count($user_data) > 0) {
+ $sql = "UPDATE $table_user SET";
+ $update = false;
+ $allowedFields = ['firstname', 'lastname', 'official_code', 'email', 'phone', 'language'];
+
+ foreach ($user_data as $key => $value) {
+ if (in_array($key, $allowedFields)) {
+ $sql .= " $key = '".Database::escape_string($value)."',";
+ $update = true;
}
- // Remove trailing , from the query we have so far
- $sql = rtrim($sql, ',');
- $sql .= " WHERE id = $user_id";
+ }
+ $sql = rtrim($sql, ',')." WHERE id = $user_id";
+ if ($update) {
+ Database::query($sql);
+ }
- if ($update) {
- Database::query($sql);
- }
+ $extraFieldValue = new ExtraFieldValue('user');
+ $extraFieldValue->saveFieldValues($user_data);
- $extraFieldValue = new ExtraFieldValue('user');
- $extraFieldValue->saveFieldValues($user_data);
- echo '
'.
- get_lang('Information updated').' '.get_lang('Please fill survey').'
';
- }
+ echo Display::return_message(get_lang('Information updated').' '.get_lang('Please fill survey'), 'confirm', false);
}
+
$_GET['show'] = 0;
$show = 0;
- // We unset the sessions
+
Session::erase('paged_questions');
Session::erase('page_questions_sec');
$paged_questions_sec = [];
} else {
- echo '
'.get_lang('Update information').'
';
- // We unset the sessions
+ echo '
'.get_lang('Update information').'
';
Session::erase('paged_questions');
Session::erase('page_questions_sec');
$paged_questions_sec = [];
@@ -642,62 +549,67 @@
}
}
-// Displaying the survey thanks message
+// -----------------------------------------------------------------------------
+// Finish screen
+// -----------------------------------------------------------------------------
if (isset($_POST['finish_survey'])) {
echo Display::return_message(get_lang('You have finished this survey.'), 'confirm');
- echo Security::remove_XSS($survey->getSurveythanks());
+ echo '
'.Security::remove_XSS($survey->getSurveythanks()).'
';
+
SurveyManager::updateSurveyAnswered($survey, $survey_invitation['user_id'], $lpItemId);
SurveyUtil::flagSurveyAsAnswered($survey->getCode(), $survey_invitation['c_id']);
if ($courseInfo && !api_is_anonymous() && 'learnpath' !== api_get_origin()) {
- echo '
';
+ echo '
';
echo Display::toolbarButton(
get_lang('Return to Course Homepage'),
api_get_course_url($courseInfo['real_id']),
'home-outline'
);
+ echo '
';
}
- Session::erase('paged_questions');
- Session::erase('page_questions_sec');
+ // Close container + footer and exit early
+ echo '
';
Display::display_footer();
- exit();
+
+ exit;
}
-// Sets the random questions
+// -----------------------------------------------------------------------------
+// Page / question building
+// -----------------------------------------------------------------------------
$shuffle = '';
if (1 == $survey->getShuffle()) {
$shuffle = ' BY RAND() ';
}
$pageBreakText = [];
-if ((isset($_GET['show']) && '' != $_GET['show']) ||
- isset($_POST['personality'])
-) {
- // Getting all the questions for this page and add them to a
- // multidimensional array where the first index is the page.
- // As long as there is no pagebreak fount we keep adding questions to the page
+$paged_questions = []; // keep this defined for later usage
+$questions_exists = true;
+
+if ((isset($_GET['show']) && '' != $_GET['show']) || isset($_POST['personality'])) {
$questions_displayed = [];
$counter = 0;
- $paged_questions = [];
- // If non-conditional survey
- $select = '';
$select = ' survey_question.parent_id, survey_question.parent_option_id, ';
- // If non-conditional survey
if (0 === $survey->getSurveyType()) {
if (empty($paged_questions)) {
- $sql = "SELECT * FROM $table_survey_question
- WHERE
- survey_question NOT LIKE '%{{%' AND
- survey_id = '".$surveyId."'
+ $sql = "SELECT *
+ FROM $table_survey_question
+ WHERE survey_question NOT LIKE '%{{%'
+ AND survey_id = '".$surveyId."'
ORDER BY sort ASC";
$result = Database::query($sql);
+ if (0 == Database::num_rows($result)) {
+ $questions_exists = false;
+ }
while ($row = Database::fetch_assoc($result)) {
if (1 == $survey->getOneQuestionPerPage()) {
if ('pagebreak' !== $row['type']) {
$paged_questions[$counter][] = $row['iid'];
$counter++;
+
continue;
}
} else {
@@ -712,15 +624,13 @@
Session::write('paged_questions', $paged_questions);
}
- // Redefinition of variables and session ids to fix issue of survey not
- // showing questions - see support.chamilo.org #5529
+ // Fix contexts (support ticket #5529)
$courseId = $survey_invitation['c_id'];
Session::write('_cid', $courseId);
Session::write('_real_cid', $courseId);
if (array_key_exists($_GET['show'], $paged_questions)) {
if (isset($_GET['user_id'])) {
- // Get the user into survey answer table (user or anonymus)
$my_user_id = 1 == $survey->getAnonymous() ? $surveyUserFromSession : api_get_user_id();
$sql = "SELECT
@@ -740,17 +650,15 @@
survey_question_option.sort as option_sort
FROM $table_survey_question survey_question
LEFT JOIN $table_survey_question_option survey_question_option
- ON survey_question.iid = survey_question_option.question_id AND
- survey_question_option.c_id = $courseId
- WHERE
- survey_question.survey_id = '".$surveyId."' AND
- survey_question.iid NOT IN (
+ ON survey_question.iid = survey_question_option.question_id
+ AND survey_question_option.c_id = $courseId
+ WHERE survey_question.survey_id = '".$surveyId."'
+ AND survey_question.iid NOT IN (
SELECT sa.question_id
- FROM ".$table_survey_answer." sa
- WHERE
- sa.user='".$my_user_id."') AND
- survey_question.c_id = $courseId
- ORDER BY survey_question.sort, survey_question_option.sort ASC";
+ FROM ".$table_survey_answer." sa
+ WHERE sa.user='".$my_user_id."')
+ AND survey_question.c_id = $courseId
+ ORDER BY survey_question.sort, survey_question_option.sort ASC";
} else {
$sql = "SELECT
survey_question.survey_group_sec1,
@@ -770,12 +678,11 @@
".($allowRequiredSurveyQuestions ? ', survey_question.is_required' : '')."
FROM $table_survey_question survey_question
LEFT JOIN $table_survey_question_option survey_question_option
- ON survey_question.iid = survey_question_option.question_id
- WHERE
- survey_question NOT LIKE '%{{%' AND
- survey_question.survey_id = '".$surveyId."' AND
- survey_question.iid IN (".implode(',', $paged_questions[$_GET['show']]).")
- ORDER BY survey_question.sort, survey_question_option.sort ASC";
+ ON survey_question.iid = survey_question_option.question_id
+ WHERE survey_question NOT LIKE '%{{%'
+ AND survey_question.survey_id = '".$surveyId."'
+ AND survey_question.iid IN (".implode(',', $paged_questions[$_GET['show']]).')
+ ORDER BY survey_question.sort, survey_question_option.sort ASC';
}
$result = Database::query($sql);
@@ -784,7 +691,6 @@
$limit = 0;
$questions = [];
while ($row = Database::fetch_assoc($result)) {
- // If the type is not a pagebreak we store it in the $questions array
if ('pagebreak' !== $row['type']) {
$sort = $row['sort'];
$questions[$sort]['question_id'] = $row['question_id'];
@@ -795,10 +701,9 @@
$questions[$sort]['options'][$row['question_option_id']] = $row['option_text'];
$questions[$sort]['maximum_score'] = $row['max_value'];
$questions[$sort]['sort'] = $sort;
- $questions[$sort]['is_required'] = $allowRequiredSurveyQuestions && $row['is_required'];
+ $questions[$sort]['is_required'] = $allowRequiredSurveyQuestions && ($row['is_required'] ?? 0);
$questions[$sort]['parent_id'] = $row['parent_id'] ?? 0;
- $questions[$sort]['parent_option_id'] =
- isset($row['parent_option_id']) ? $row['parent_option_id'] : 0;
+ $questions[$sort]['parent_option_id'] = $row['parent_option_id'] ?? 0;
}
$counter++;
if (isset($_GET['show']) && (int) $_GET['show'] >= 0) {
@@ -813,77 +718,56 @@
$current_user = Database::escape_string($survey_invitation['user_id']);
if (isset($_POST['personality'])) {
- // Compute the results to get the 3 groups nearest to the user's personality
- if ('' == $shuffle) {
- $order = 'BY sort ASC ';
- } else {
- $order = $shuffle;
- }
- $answer_list = [];
- // Get current user results
+ $order = '' == $shuffle ? 'BY sort ASC ' : $shuffle;
+
+ // Current user results
$results = [];
- $sql = "SELECT
- survey_group_pri,
- user,
- SUM(value) as value
+ $sql = "SELECT survey_group_pri, user, SUM(value) as value
FROM $table_survey_answer as survey_answer
INNER JOIN $table_survey_question as survey_question
- ON (survey_question.iid = survey_answer.question_id)
- WHERE
- survey_answer.survey_id='".$my_survey_id."' AND
- survey_answer.user='".$current_user."'
+ ON (survey_question.iid = survey_answer.question_id)
+ WHERE survey_answer.survey_id='".$my_survey_id."'
+ AND survey_answer.user='".$current_user."'
GROUP BY survey_group_pri
- ORDER BY survey_group_pri
- ";
-
+ ORDER BY survey_group_pri";
$result = Database::query($sql);
- while ($row = Database :: fetch_array($result)) {
- $answer_list['value'] = $row['value'];
- $answer_list['group'] = $row['survey_group_pri'];
- $results[] = $answer_list;
+ while ($row = Database::fetch_array($result)) {
+ $results[] = ['value' => $row['value'], 'group' => $row['survey_group_pri']];
}
- // Get the total score for each group of questions
+ // Totals by group
$totals = [];
$sql = "SELECT SUM(temp.value) as value, temp.survey_group_pri FROM
(
- SELECT
- MAX(value) as value,
- survey_group_pri,
- survey_question.iid question_id
+ SELECT MAX(value) as value, survey_group_pri, survey_question.iid question_id
FROM $table_survey_question as survey_question
INNER JOIN $table_survey_question_option as survey_question_option
- ON (survey_question.iid = survey_question_option.question_id)
- WHERE
- survey_question.survey_id='".$my_survey_id."' AND
- survey_question.c_id = $courseId AND
- survey_question_option.c_id = $courseId AND
- survey_group_sec1='0' AND
- survey_group_sec2='0'
+ ON (survey_question.iid = survey_question_option.question_id)
+ WHERE survey_question.survey_id='".$my_survey_id."'
+ AND survey_question.c_id = $courseId
+ AND survey_question_option.c_id = $courseId
+ AND survey_group_sec1='0' AND survey_group_sec2='0'
GROUP BY survey_group_pri, survey_question.iid
) as temp
GROUP BY temp.survey_group_pri
ORDER BY temp.survey_group_pri";
-
$result = Database::query($sql);
while ($row = Database::fetch_array($result)) {
- $list['value'] = $row['value'];
- $list['group'] = $row['survey_group_pri'];
- $totals[] = $list;
+ $totals[] = ['value' => $row['value'], 'group' => $row['survey_group_pri']];
}
+
+ // Percentages
$final_results = [];
- // Get a percentage score for each group
for ($i = 0; $i < count($totals); $i++) {
for ($j = 0; $j < count($results); $j++) {
if ($totals[$i]['group'] == $results[$j]['group']) {
$group = $totals[$i]['group'];
- $porcen = ($results[$j]['value'] / $totals[$i]['value']);
- $final_results[$group] = $porcen;
+ $percent = ($results[$j]['value'] / $totals[$i]['value']);
+ $final_results[$group] = $percent;
}
}
}
- // Sort the results by score (getting a list of group IDs by score into $groups)
arsort($final_results);
$groups = array_keys($final_results);
$result = [];
@@ -893,15 +777,12 @@
$count_result++;
}
- // i.e 70% - 70% -70% 70% $equal_count =3
$i = 0;
$group_cant = 0;
$equal_count = 0;
- // This is the case if the user does not select any question
if ($count_result > 0) {
- // Count the number of scores equal to the first
while (1) {
- if ($result[$i]['value'] == $result[$i + 1]['value']) {
+ if (($result[$i]['value'] ?? null) == ($result[$i + 1]['value'] ?? null)) {
$equal_count++;
} else {
break;
@@ -909,86 +790,47 @@
$i++;
}
} else {
- // We force the exit of the survey undeterminated
- $equal_count = 10;
+ $equal_count = 10; // force undefined
}
- // If we have only 3 or less equal scores (i.e. 0,1 or 2 equalities), then we can use the three first groups
if ($equal_count < 4) {
- // If there is one or less score equalities
if (0 === $equal_count || 1 === $equal_count) {
- // i.e 70% - 70% -60% - 60% $equal_count = 1 we only get the first 2 options
- if (($result[0]['value'] == $result[1]['value']) &&
- ($result[2]['value'] == $result[3]['value'])
- ) {
+ if (($result[0]['value'] ?? 0) == ($result[1]['value'] ?? 0) && ($result[2]['value'] ?? 0) == ($result[3]['value'] ?? 0)) {
$group_cant = 1;
- } elseif (($result[0]['value'] != $result[1]['value']) &&
- ($result[1]['value'] == $result[2]['value']) && ($result[2]['value'] == $result[3]['value'])
- ) {
- // i.e 70% - 70% -0% - 0% - $equal_count = 0 we only get the first 2 options
- /* elseif (($result[0]['value'] == $result[1]['value']) && ($result[1]['value'] != $result[2]['value'])) {
- $group_cant = 0;
- } */
- /*
- // i.e 70% - 70% -60% - 60% $equal_count = 0 we only get the first 2 options
- elseif (($result[0]['value'] == $result[1]['value']) && ($result[2]['value'] == $result[3]['value'])) {
- $group_cant = 0;
- } */
- // i.e. 80% - 70% - 70% - 70%
+ } elseif (($result[0]['value'] ?? 0) != ($result[1]['value'] ?? 0)
+ && ($result[1]['value'] ?? 0) == ($result[2]['value'] ?? 0)
+ && ($result[2]['value'] ?? 0) == ($result[3]['value'] ?? 0)) {
$group_cant = 0;
} else {
- // i.e. 80% - 70% - 70% - 50
- // i.e. 80% - 80% - 70% - 50
- // By default we choose the highest 3
$group_cant = 2;
}
} else {
- // If there are two score equalities
$group_cant = $equal_count;
}
- //@todo Translate these comments.
- // conditional_status
- // 0 no determinado
- // 1 determinado
- // 2 un solo valor
- // 3 valores iguales
if ($group_cant > 0) {
- //echo '$equal_count'.$group_cant;
- // We only get highest 3
$secondary = '';
- $combi = '';
for ($i = 0; $i <= $group_cant; $i++) {
- $group1 = $groups[$i];
- $group2 = $groups[$i + 1];
- // Here we made all the posibilities with the 3 groups
+ $group1 = $groups[$i] ?? null;
+ $group2 = $groups[$i + 1] ?? null;
+ if (null === $group1 || null === $group2) {
+ continue;
+ }
if (2 == $group_cant && $i == $group_cant) {
$group2 = $groups[0];
- $secondary .= " OR ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') ";
- $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
- $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'
';
- } else {
- if (0 != $i) {
- $secondary .= " OR ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') ";
- $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
- $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'
';
- } else {
- $secondary .= " ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') ";
- $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
- $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'
';
- }
}
+ $secondary .= (empty($secondary) ? '' : ' OR ')
+ ." ( survey_group_sec1 = '$group1' AND survey_group_sec2 = '$group2') "
+ ." OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
}
- // Create the new select with the questions from the secondary phase
- if (empty($_SESSION['page_questions_sec']) &&
- !is_array($_SESSION['page_questions_sec']) &&
- count(0 == $_SESSION['page_questions_sec'])
- ) {
+
+ if (empty($_SESSION['page_questions_sec'])
+ && !is_array($_SESSION['page_questions_sec'])
+ && count(0 == $_SESSION['page_questions_sec'])) {
$sql = "SELECT * FROM $table_survey_question
- WHERE
- survey_id = '".$my_survey_id."' AND
- ($secondary )
- ORDER BY sort ASC";
+ WHERE survey_id = '".$my_survey_id."'
+ AND ($secondary)
+ ORDER BY sort ASC";
$result = Database::query($sql);
$counter = 0;
while ($row = Database::fetch_assoc($result)) {
@@ -999,7 +841,6 @@
$counter++;
$pageBreakText[$counter] = $row['survey_question'];
} else {
- // ids from question of the current survey
$paged_questions_sec[$counter][] = $row['question_id'];
}
}
@@ -1007,7 +848,8 @@
} else {
$paged_questions_sec = Session::read('page_questions_sec');
}
- $paged_questions = Session::read('paged_questions'); // For the sake of pages counting
+
+ $paged_questions = Session::read('paged_questions');
if ('' == $shuffle) {
$shuffle = ' BY survey_question.sort, survey_question_option.sort ASC ';
}
@@ -1029,20 +871,17 @@
survey_question_option.sort as option_sort
FROM $table_survey_question survey_question
LEFT JOIN $table_survey_question_option survey_question_option
- ON survey_question.iid = survey_question_option.question_id AND
- WHERE
- survey_question NOT LIKE '%{{%' AND
- survey_question.survey_id = '".$my_survey_id."'
- survey_question.iid IN (".implode(',', $paged_questions_sec[$val]).")
- ORDER $shuffle ";
-
+ ON survey_question.iid = survey_question_option.question_id
+ WHERE survey_question NOT LIKE '%{{%'
+ AND survey_question.survey_id = '".$my_survey_id."'
+ AND survey_question.iid IN (".implode(',', $paged_questions_sec[$val]).")
+ ORDER $shuffle";
$result = Database::query($sql);
$question_counter_max = Database::num_rows($result);
$counter = 0;
$limit = 0;
$questions = [];
while ($row = Database::fetch_assoc($result)) {
- // If the type is not a pagebreak we store it in the $questions array
if ('pagebreak' !== $row['type']) {
$questions[$row['sort']]['question_id'] = $row['question_id'];
$questions[$row['sort']]['survey_id'] = $row['survey_id'];
@@ -1051,13 +890,11 @@
$questions[$row['sort']]['type'] = $row['type'];
$questions[$row['sort']]['options'][$row['question_option_id']] = $row['option_text'];
$questions[$row['sort']]['maximum_score'] = $row['max_value'];
- // Personality params
$questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
$questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
$questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
$questions[$row['sort']]['sort'] = $row['sort'];
} else {
- // If the type is a pagebreak we are finished loading the questions for this page
break;
}
$counter++;
@@ -1072,24 +909,18 @@
echo get_lang('Survey undefined');
}
} else {
- // We need this variable only in the 2nd set of questions when personality is set.
+ // First personality phase
Session::erase('page_questions_sec');
$paged_questions_sec = [];
- // Only the questions from the basic group
- // the 50 questions A B C D E F G
- $order_sql = $shuffle;
- if ('' == $shuffle) {
- $order_sql = ' BY question_id ';
- }
+ $order_sql = '' == $shuffle ? ' BY question_id ' : $shuffle;
if (empty($_SESSION['paged_questions'])) {
$sql = "SELECT * FROM $table_survey_question
- WHERE
- survey_id = '".$surveyId."' AND
- survey_group_sec1='0' AND
- survey_group_sec2='0'
- ORDER ".$order_sql." ";
+ WHERE survey_id = '".$surveyId."'
+ AND survey_group_sec1='0'
+ AND survey_group_sec2='0'
+ ORDER ".$order_sql.' ';
$result = Database::query($sql);
$counter = 0;
while ($row = Database::fetch_assoc($result)) {
@@ -1101,7 +932,6 @@
$counter++;
$pageBreakText[$counter] = $row['survey_question'];
} else {
- // ids from question of the current survey
$paged_questions[$counter][] = $row['question_id'];
}
}
@@ -1110,18 +940,15 @@
} else {
$paged_questions = Session::read('paged_questions');
}
- $order_sql = $shuffle;
- if ('' == $shuffle) {
- $order_sql = ' BY survey_question.sort, survey_question_option.sort ASC ';
- }
- $val = $_GET['show'];
+
+ $order_sql = '' == $shuffle ? ' BY survey_question.sort, survey_question_option.sort ASC ' : $shuffle;
+ $val = $_GET['show'] ?? '';
$result = null;
if ('' != $val) {
$imploded = Database::escape_string(implode(',', $paged_questions[$val]));
if ('' != $imploded) {
- // The answers are always in the same order NO shuffle
$order_sql = ' BY survey_question.sort, survey_question_option.sort ASC ';
- $sql = "SELECT
+ $sql = 'SELECT
survey_question.survey_group_sec1,
survey_question.survey_group_sec2,
survey_question.survey_group_pri,
@@ -1135,28 +962,26 @@
survey_question_option.question_option_id,
survey_question_option.option_text,
survey_question_option.sort as option_sort
- ".($allowRequiredSurveyQuestions ? ', survey_question.is_required' : '')."
+ '.($allowRequiredSurveyQuestions ? ', survey_question.is_required' : '')."
FROM $table_survey_question survey_question
LEFT JOIN $table_survey_question_option survey_question_option
- ON survey_question.iid = survey_question_option.question_id AND
- survey_question_option.c_id = $courseId
- WHERE
- survey_question NOT LIKE '%{{%' AND
- survey_question.survey_id = '".intval($survey_invitation['survey_id'])."' AND
- survey_question.c_id = $courseId AND
- survey_question.iid IN (".$imploded.")
- ORDER $order_sql ";
+ ON survey_question.iid = survey_question_option.question_id
+ AND survey_question_option.c_id = $courseId
+ WHERE survey_question NOT LIKE '%{{%'
+ AND survey_question.survey_id = '".(int) $survey_invitation['survey_id']."'
+ AND survey_question.c_id = $courseId
+ AND survey_question.iid IN (".$imploded.")
+ ORDER $order_sql";
$result = Database::query($sql);
- $question_counter_max = Database :: num_rows($result);
+ $question_counter_max = Database::num_rows($result);
}
}
- if (!is_null($result)) {
+ if (null !== $result) {
$counter = 0;
$limit = 0;
$questions = [];
while ($row = Database::fetch_assoc($result)) {
- // If the type is not a pagebreak we store it in the $questions array
if ('pagebreak' !== $row['type']) {
$questions[$row['sort']]['question_id'] = $row['question_id'];
$questions[$row['sort']]['survey_id'] = $row['survey_id'];
@@ -1165,28 +990,26 @@
$questions[$row['sort']]['type'] = $row['type'];
$questions[$row['sort']]['options'][$row['question_option_id']] = $row['option_text'];
$questions[$row['sort']]['maximum_score'] = $row['max_value'];
- $questions[$row['sort']]['is_required'] = $allowRequiredSurveyQuestions && $row['is_required'];
- // Personality params
+ $questions[$row['sort']]['is_required'] = $allowRequiredSurveyQuestions && ($row['is_required'] ?? 0);
$questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
$questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
$questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
$questions[$row['sort']]['sort'] = $row['sort'];
- } else {
- // If the type is a page break we are finished loading the questions for this page
- //break;
}
$counter++;
}
}
}
- } else { // In case it's another type than 0 or 1
+ } else {
echo get_lang('Survey type unknown');
}
}
+// -----------------------------------------------------------------------------
+// Page counters / params
+// -----------------------------------------------------------------------------
$numberOfPages = SurveyManager::getCountPages($survey);
-// Displaying the form with the questions
$show = 0;
if (isset($_GET['show']) && '' != $_GET['show']) {
$show = (int) $_GET['show'] + 1;
@@ -1196,54 +1019,46 @@
if (isset($_GET['show']) && '' != $_GET['show']) {
$pagesIndexes = array_keys($paged_questions);
$pagesIndexes[] = count($pagesIndexes);
-
if (end($pagesIndexes) <= $show - 1 && empty($_POST)) {
$displayFinishButton = false;
}
}
-// Displaying the form with the questions
-$personality = 0;
-if (isset($_POST['personality'])) {
- $personality = (int) $_POST['personality'] + 1;
-}
+$personality = isset($_POST['personality']) ? (int) $_POST['personality'] + 1 : 0;
-// Displaying the form with the questions
$g_c = isset($_GET['course']) ? Security::remove_XSS($_GET['course']) : '';
$g_ic = isset($_GET['invitationcode']) ? Security::remove_XSS($_GET['invitationcode']) : '';
$g_cr = isset($_GET['cidReq']) ? Security::remove_XSS($_GET['cidReq']) : '';
$p_l = isset($_POST['language']) ? Security::remove_XSS($_POST['language']) : '';
-$add_parameters = isset($_GET['user_id']) ? '&user_id='.intval($_GET['user_id']) : '';
+
+$add_parameters = isset($_GET['user_id']) ? '&user_id='.(int) $_GET['user_id'] : '';
+
$url = api_get_self().'?'.api_get_cidreq().$add_parameters.
'&course='.$g_c.
'&invitationcode='.$g_ic.
'&show='.$show.
- '&iid='.$surveyId
-;
+ '&iid='.$surveyId;
+
if (!empty($_GET['language'])) {
$lang = Security::remove_XSS($_GET['language']);
$url .= '&language='.$lang;
}
-
if (!empty($lpItemId)) {
$url .= '&lp_item_id='.$lpItemId;
}
-$form = new FormValidator(
- 'question',
- 'post',
- $url,
- null,
- null,
- FormValidator::LAYOUT_INLINE
-);
+// -----------------------------------------------------------------------------
+// Form
+// -----------------------------------------------------------------------------
+$form = new FormValidator('question', 'post', $url, null, null, FormValidator::LAYOUT_HORIZONTAL);
$form->addHidden('language', $p_l);
-$showNumber = true;
-if (SurveyManager::hasDependency($survey)) {
- $showNumber = false;
-}
+// Numbering control
+$showNumber = !SurveyManager::hasDependency($survey);
+// -----------------------------------------------------------------------------
+// Render questions (cards)
+// -----------------------------------------------------------------------------
if (isset($questions) && is_array($questions)) {
$originalShow = isset($_GET['show']) ? (int) $_GET['show'] : 0;
$questionCounter = 1;
@@ -1257,26 +1072,21 @@
$questionCounter = $before + 1;
}
- $form->addHtml('
');
+ // Page-break caption
$js = '';
if (isset($pageBreakText[$originalShow]) && !empty(strip_tags($pageBreakText[$originalShow]))) {
- // Only show page-break texts if there is something there, apart from
- // HTML tags
- $form->addHtml(
- '
'.
- Security::remove_XSS($pageBreakText[$originalShow]).
- '
'
- );
- $form->addHtml('
');
+ $form->addHtml('
'.Security::remove_XSS($pageBreakText[$originalShow]).'
');
}
foreach ($questions as $key => &$question) {
$ch_type = 'ch_'.$question['type'];
$questionNumber = $questionCounter;
+
+ // Use concrete question renderer; keep finalAnswer for prefill
$display = new $ch_type();
$parent = $question['parent_id'];
$parentClass = '';
- // @todo move this in a function.
+
if (!empty($parent)) {
$parentClass = ' with_parent with_parent_'.$question['question_id'];
$parents = survey_question::getParents($question['question_id']);
@@ -1289,18 +1099,18 @@
$js .= survey_question::getQuestionJs($question);
- // @todo move this in a function.
- $form->addHtml('
');
+ $form->addHtml('
');
if ($showNumber && $survey->isDisplayQuestionNumber()) {
- $form->addHtml('
'.$questionNumber.'.
');
+ $form->addHtml('
'.$questionNumber.'.
');
}
- $form->addHtml('
'.Security::remove_XSS($question['survey_question']).'
');
+ $form->addHtml('
'.Security::remove_XSS($question['survey_question']).'
');
+ // Prefill user answer if exists
$userAnswerData = SurveyUtil::get_answers_of_question_by_user($question['survey_id'], $question['question_id'], $lpItemId);
$finalAnswer = null;
-
if (!empty($userAnswerData[$user_id])) {
$userAnswer = $userAnswerData[$user_id];
+
switch ($question['type']) {
case 'score':
$finalAnswer = [];
@@ -1308,16 +1118,22 @@
[$choiceId, $choiceValue] = explode('*', $userChoice);
$finalAnswer[$choiceId] = $choiceValue;
}
+
break;
+
case 'percentage':
[$choiceId, $choiceValue] = explode('*', current($userAnswer));
$finalAnswer = $choiceId;
+
break;
+
default:
$finalAnswer = $userAnswer;
+
break;
}
}
+
$display->render($form, $question, $finalAnswer);
$form->addHtml('
');
$questionCounter++;
@@ -1326,93 +1142,76 @@
$form->addHtml($js);
}
-$form->addHtml('
');
-if ('0' == $survey->getSurveyType()) {
+// -----------------------------------------------------------------------------
+// Navigation buttons (Previous / Next / Finish)
+// -----------------------------------------------------------------------------
+$form->addHtml('
');
+if (
+ isset($_GET['show'])
+ && $_GET['show'] > 0
+ && 'true' === api_get_setting('survey.survey_backwards_enable')
+ && 1 === (int) $survey->getOneQuestionPerPage()
+) {
+ $currentShow = (int) $_GET['show'];
+ $prevShow = max(0, $currentShow - 1);
+
+ $prevUrl = api_get_self().'?'.api_get_cidreq().
+ '&course='.urlencode($g_c).
+ '&invitationcode='.urlencode($g_ic).
+ '&iid='.$surveyId.
+ '&show='.$prevShow;
+
+ if (!empty($_GET['language'])) {
+ $prevUrl .= '&language='.urlencode($_GET['language']);
+ }
+ if (!empty($lpItemId)) {
+ $prevUrl .= '&lp_item_id='.$lpItemId;
+ }
+ if (isset($_GET['user_id'])) {
+ $prevUrl .= '&user_id='.(int) $_GET['user_id'];
+ }
+
+ $form->addHtml(
+ '
+ '.get_lang('Previous question').'
+ '
+ );
+}
+
+// Next / Start
+if ('0' == (string) $survey->getSurveyType()) {
if (0 == $survey->getShowFormProfile()) {
- // The normal survey as always
if ($show < $numberOfPages) {
- if (0 == $show) {
- $form->addButton(
- 'next_survey_page',
- get_lang('Start the Survey'),
- 'arrow-right',
- 'success'
- );
- } else {
- if (
- 'true' === api_get_setting('survey.survey_backwards_enable')
- ) {
- if ($lastQuestion >= 0) {
- $form->addHtml(
- "
".
- " "
- .get_lang('Back')." "
- );
- }
- }
- $form->addButton(
- 'next_survey_page',
- get_lang('Next'),
- 'arrow-right',
- 'success'
- );
- }
+ $label = 0 == $show ? get_lang('Start the Survey') : get_lang('Next question');
+ $form->addButton('next_survey_page', $label, 'arrow-right', 'success');
}
if ($show >= $numberOfPages && $displayFinishButton) {
- $form->addButton(
- 'finish_survey',
- get_lang('Finish survey'),
- 'arrow-right',
- 'success'
- );
+ $form->addButton('finish_survey', get_lang('Finish survey'), 'check', 'success');
}
} else {
- // The normal survey as always but with the form profile
if (isset($_GET['show'])) {
- $numberOfPages = count($paged_questions);
- if ($show < $numberOfPages) {
- if (0 == $show) {
- $form->addButton(
- 'next_survey_page',
- get_lang('Start the Survey'),
- 'arrow-right',
- 'success'
- );
- } else {
- $form->addButton(
- 'next_survey_page',
- get_lang('Next'),
- 'arrow-right',
- 'success'
- );
- }
+ $pageCount = count($paged_questions);
+ if ($show < $pageCount) {
+ $label = 0 == $show ? get_lang('Start the Survey') : get_lang('Next question');
+ $form->addButton('next_survey_page', $label, 'arrow-right', 'success');
}
-
- if ($show >= $numberOfPages && $displayFinishButton) {
- $form->addButton(
- 'finish_survey',
- get_lang('Finish survey'),
- 'arrow-right',
- 'success'
- );
+ if ($show >= $pageCount && $displayFinishButton) {
+ $form->addButton('finish_survey', get_lang('Finish survey'), 'check', 'success');
}
}
}
} elseif (1 === $survey->getSurveyType()) {
- // Conditional/personality-test type survey
if (isset($_GET['show']) || isset($_POST['personality'])) {
- $numberOfPages = count($paged_questions);
+ $pageCount = count($paged_questions);
if (!empty($paged_questions_sec) && count($paged_questions_sec) > 0) {
- // In case we're in the second phase, also sum the second group questions
- $numberOfPages += count($paged_questions_sec);
+ $pageCount += count($paged_questions_sec);
} else {
- // We need this variable only if personality == 1
Session::erase('page_questions_sec');
$paged_questions_sec = [];
}
if (0 === $personality) {
- if (($show <= $numberOfPages) || !$_GET['show']) {
+ if (($show <= $pageCount) || !$_GET['show']) {
$form->addButton('next_survey_page', get_lang('Next'), 'arrow-right', 'success');
if (0 == $survey->getOneQuestionPerPage()) {
if ($personality >= 0) {
@@ -1423,36 +1222,43 @@
$form->addHidden('personality', $personality);
}
}
-
- if ($numberOfPages == $show) {
+ if ($pageCount == $show) {
$form->addHidden('personality', $personality);
}
}
}
- if ($show > $numberOfPages && $_GET['show'] && 0 === $personality) {
+ if ($show > $pageCount && $_GET['show'] && 0 === $personality) {
$form->addHidden('personality', $personality);
} elseif ($personality > 0) {
if (1 == $survey->getOneQuestionPerPage()) {
- if ($show >= $numberOfPages) {
- $form->addButton('finish_survey', get_lang('Finish survey'), 'arrow-right', 'success');
+ if ($show >= $pageCount) {
+ $form->addButton('finish_survey', get_lang('Finish survey'), 'check', 'success');
} else {
$form->addHidden('personality', $personality);
$form->addButton('next_survey_page', get_lang('Next'), 'arrow-right', 'success');
}
} else {
- // if the personality test hidden input was set.
- $form->addButton('finish_survey', get_lang('Finish survey'), 'arrow-right');
+ $form->addButton('finish_survey', get_lang('Finish survey'), 'check');
}
}
- } elseif ('' == $survey->getFormFields()) {
- // This is the case when the show_profile_form is true but there are not form_fields
- $form->addButton('next_survey_page', get_lang('Next'), 'arrow-right', 'success');
- } elseif (!is_array($user_data)) {
- // If the user is not registered in the platform we do not show the form to update his information
+ } elseif ('' == $survey->getFormFields() || !is_array($user_data)) {
$form->addButton('next_survey_page', get_lang('Next'), 'arrow-right', 'success');
}
}
+
$form->addHtml('
');
+
+// No-questions notice at end
+if (isset($_GET['show']) && ($show >= $numberOfPages || empty($questions))) {
+ if (false == $questions_exists) {
+ echo '
'.get_lang('There are no questions for this survey').'
';
+ }
+}
+
+// -----------------------------------------------------------------------------
+// Render form + close container + footer
+// -----------------------------------------------------------------------------
$form->display();
+echo '
';
Display::display_footer();
diff --git a/public/main/survey/preview.php b/public/main/survey/preview.php
index adb6c0711f0..a7d88a67de3 100644
--- a/public/main/survey/preview.php
+++ b/public/main/survey/preview.php
@@ -1,5 +1,7 @@
find($surveyId);
if (null === $survey) {
@@ -38,58 +41,59 @@
$courseInfo = api_get_course_info();
$allowRequiredSurveyQuestions = true;
-// Breadcrumbs
+// -----------------------------------------------------------------------------
+// Breadcrumb
+// -----------------------------------------------------------------------------
$interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq(),
'name' => get_lang('Survey list'),
];
$interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$surveyId.'&'.api_get_cidreq(),
- 'name' => strip_tags($survey->getTitle(), '
'),
+ // Strip HTML from the title safely
+ 'name' => Security::remove_XSS(strip_tags($survey->getTitle())),
];
-//$htmlHeadXtra[] = '';
$htmlHeadXtra[] = ch_selectivedisplay::getJs();
$htmlHeadXtra[] = survey_question::getJs();
-$show = 0;
Display::display_header(get_lang('Survey preview'));
-// We exit here is the first or last question is a pagebreak (which causes errors)
-SurveyUtil::check_first_last_question($surveyId, false);
+// -----------------------------------------------------------------------------
+// Page header
+// -----------------------------------------------------------------------------
+echo '';
+echo '
'.Security::remove_XSS($survey->getTitle()).'
';
-// Survey information
-echo '';
if (!empty($survey->getSubtitle())) {
- echo '
'.Security::remove_XSS($survey->getSubtitle()).'
';
+ echo '
'.Security::remove_XSS($survey->getSubtitle()).'
';
}
-// Displaying the survey introduction
-if (!isset($_GET['show'])) {
- if (!empty($survey->getIntro())) {
- echo '
'.Security::remove_XSS($survey->getIntro()).'
';
- }
+// Introduction
+if (!isset($_GET['show']) && !empty($survey->getIntro())) {
+ echo '
'.Security::remove_XSS($survey->getIntro()).'
';
}
-// Displaying the survey thanks message
+// -----------------------------------------------------------------------------
+// End message if finished
+// -----------------------------------------------------------------------------
if (isset($_POST['finish_survey'])) {
echo Display::return_message(get_lang('You have finished this survey.'), 'confirm');
- echo Security::remove_XSS($survey->getSurveythanks());
+ echo '
'.Security::remove_XSS($survey->getSurveythanks()).'
';
Display::display_footer();
+
exit;
}
+// -----------------------------------------------------------------------------
+// Build questions per page
+// -----------------------------------------------------------------------------
$questions = [];
$pageBreakText = [];
if (isset($_GET['show'])) {
- // Getting all the questions for this page and add them to a
- // multidimensional array where the first index is the page.
- // as long as there is no pagebreak fount we keep adding questions to the page
$paged_questions = [];
$counter = 0;
$sql = "SELECT * FROM $table_survey_question
- WHERE
- survey_question NOT LIKE '%{{%' AND
- survey_id = $surveyId
+ WHERE survey_question NOT LIKE '%{{%' AND survey_id = $surveyId
ORDER BY sort ASC";
$result = Database::query($sql);
$questions_exists = true;
@@ -99,6 +103,7 @@
if ('pagebreak' !== $row['type']) {
$paged_questions[$counter][] = $row['iid'];
$counter++;
+
continue;
}
} else {
@@ -115,8 +120,7 @@
}
if (array_key_exists($_GET['show'], $paged_questions)) {
- $select = '';
- $select = ' survey_question.parent_id, survey_question.parent_option_id, ';
+ $select = 'survey_question.parent_id, survey_question.parent_option_id,';
$sql = "SELECT
survey_question.iid question_id,
survey_question.survey_id,
@@ -132,17 +136,14 @@
".($allowRequiredSurveyQuestions ? ', survey_question.is_required' : '')."
FROM $table_survey_question survey_question
LEFT JOIN $table_survey_question_option survey_question_option
- ON
- survey_question.iid = survey_question_option.question_id
- WHERE
- survey_question.survey_id = '".$surveyId."' AND
- survey_question.iid IN (".Database::escape_string(implode(',', $paged_questions[$_GET['show']]), null, false).") AND
- survey_question NOT LIKE '%{{%'
+ ON survey_question.iid = survey_question_option.question_id
+ WHERE survey_question.survey_id = '".$surveyId."'
+ AND survey_question.iid IN (".Database::escape_string(implode(',', $paged_questions[$_GET['show']]), null, false).")
+ AND survey_question NOT LIKE '%{{%'
ORDER BY survey_question.sort, survey_question_option.sort ASC";
$result = Database::query($sql);
while ($row = Database::fetch_array($result)) {
- // If the type is not a pagebreak we store it in the $questions array
if ('pagebreak' !== $row['type']) {
$sort = $row['sort'];
$questions[$sort]['question_id'] = $row['question_id'];
@@ -152,8 +153,8 @@
$questions[$sort]['type'] = $row['type'];
$questions[$sort]['options'][$row['question_option_id']] = Security::remove_XSS($row['option_text']);
$questions[$sort]['maximum_score'] = $row['max_value'];
- $questions[$sort]['parent_id'] = isset($row['parent_id']) ? $row['parent_id'] : 0;
- $questions[$sort]['parent_option_id'] = isset($row['parent_option_id']) ? $row['parent_option_id'] : 0;
+ $questions[$sort]['parent_id'] = $row['parent_id'] ?? 0;
+ $questions[$sort]['parent_option_id'] = $row['parent_option_id'] ?? 0;
$questions[$row['sort']]['is_required'] = $allowRequiredSurveyQuestions && $row['is_required'];
}
}
@@ -161,24 +162,16 @@
}
$numberOfPages = SurveyManager::getCountPages($survey);
-// Displaying the form with the questions
-if (isset($_GET['show'])) {
- $show = (int) $_GET['show'] + 1;
-}
+$show = isset($_GET['show']) ? (int) $_GET['show'] + 1 : 0;
$originalShow = isset($_GET['show']) ? (int) $_GET['show'] : 0;
-
$url = api_get_self().'?survey_id='.$surveyId.'&show='.$show.'&'.api_get_cidreq();
-$form = new FormValidator(
- 'question-survey',
- 'post',
- $url,
- null,
- null,
- FormValidator::LAYOUT_INLINE
-);
+$form = new FormValidator('question-survey', 'post', $url, null, null, FormValidator::LAYOUT_HORIZONTAL);
-if (is_array($questions) && count($questions) > 0) {
+// -----------------------------------------------------------------------------
+// Question rendering
+// -----------------------------------------------------------------------------
+if (!empty($questions)) {
$counter = 1;
if (!empty($originalShow)) {
$before = 0;
@@ -190,21 +183,11 @@
$counter = $before + 1;
}
- $showNumber = true;
- if (SurveyManager::hasDependency($survey)) {
- $showNumber = false;
- }
-
+ $showNumber = !SurveyManager::hasDependency($survey);
$js = '';
+
if (isset($pageBreakText[$originalShow]) && !empty(strip_tags($pageBreakText[$originalShow]))) {
- // Only show page-break texts if there is something there, apart from
- // HTML tags
- $form->addHtml(
- '
'.
- Security::remove_XSS($pageBreakText[$originalShow]).
- '
'
- );
- $form->addHtml('
');
+ $form->addHtml('
'.Security::remove_XSS($pageBreakText[$originalShow]).'
');
}
foreach ($questions as $key => &$question) {
@@ -224,59 +207,58 @@
}
$js .= survey_question::getQuestionJs($question);
-
- $form->addHtml('
');
+ $form->addHtml('
');
if ($showNumber && $survey->isDisplayQuestionNumber()) {
- $form->addHtml('
'.$counter.'.
');
+ $form->addHtml('
'.$counter.'.
');
}
- $form->addHtml('
'.Security::remove_XSS($question['survey_question']).'
');
+ $form->addHtml('
'.Security::remove_XSS($question['survey_question']).'
');
$display->render($form, $question);
$form->addHtml('
');
$counter++;
}
+
$form->addHtml($js);
}
-$form->addHtml('
');
+
+// -----------------------------------------------------------------------------
+// Navigation buttons
+// -----------------------------------------------------------------------------
+$form->addHtml('
');
+
+// "Previous" button
+if (
+ isset($_GET['show'])
+ && $_GET['show'] > 0
+ && 'true' === api_get_setting('survey.survey_backwards_enable')
+ && 1 === (int) $survey->getOneQuestionPerPage()
+) {
+ $prevShow = (int) $_GET['show'] - 1;
+ $prevUrl = api_get_self().'?survey_id='.$surveyId.'&show='.$prevShow.'&'.api_get_cidreq();
+
+ $form->addHtml(
+ '
+ '.get_lang('Previous question').'
+ '
+ );
+}
if ($show < $numberOfPages) {
- if (0 == $show) {
- $form->addButton(
- 'next_survey_page',
- get_lang('Start the Survey'),
- 'arrow-right',
- 'success'
- );
- } else {
- $form->addButton(
- 'next_survey_page',
- get_lang('Next question'),
- 'arrow-right',
- 'success'
- );
- }
+ $label = 0 == $show ? get_lang('Start the Survey') : get_lang('Next question');
+ $form->addButton('next_survey_page', $label, 'arrow-right', 'success');
}
-if (isset($_GET['show'])) {
- if ($show >= $numberOfPages || 0 == count($questions)) {
- if (false == $questions_exists) {
- echo '
'.get_lang('There are not questions for this survey').'
';
- }
- $form->addButton(
- 'finish_survey',
- get_lang('Finish survey'),
- 'arrow-right',
- 'success'
- );
+if (isset($_GET['show']) && ($show >= $numberOfPages || empty($questions))) {
+ if (false == $questions_exists) {
+ echo '
'.get_lang('There are no questions for this survey').'
';
}
+ $form->addButton('finish_survey', get_lang('Finish survey'), 'check', 'success');
}
$form->addHtml('
');
-$form->display();
-
-echo Display::toolbarButton(
- get_lang('Return to Course Homepage'),
- api_get_course_url($courseInfo['real_id']),
- 'home-outline'
-);
+// -----------------------------------------------------------------------------
+// Render form + footer
+// -----------------------------------------------------------------------------
+$form->display();
+echo '
'; // container
Display::display_footer();