Survey: Fix image when filling survey as anon user BT#17972

pull/3749/head^2
Julio 5 years ago
parent 929c9a69d9
commit ab68f9ee45
  1. 5
      main/document/download.php
  2. 6
      main/survey/fillsurvey.php

@ -2,6 +2,8 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/** /**
* This file is responsible for passing requested documents to the browser. * This file is responsible for passing requested documents to the browser.
* Many functions updated and moved to lib/document.lib.php. * Many functions updated and moved to lib/document.lib.php.
@ -49,6 +51,9 @@ if (substr($refer_script, 0, 15) === '/fillsurvey.php') {
$course = isset($queryParts['course']) ? $queryParts['course'] : ''; $course = isset($queryParts['course']) ? $queryParts['course'] : '';
$invitation = isset($queryParts['invitationcode']) ? $queryParts['invitationcode'] : ''; $invitation = isset($queryParts['invitationcode']) ? $queryParts['invitationcode'] : '';
include '../survey/survey.download.inc.php'; include '../survey/survey.download.inc.php';
if ('auto' === $invitation && $queryParts['scode']) {
$invitation = Session::read('auto_invitation_code_'.$queryParts['scode']);
}
$_course = check_download_survey($course, $invitation, $doc_url); $_course = check_download_survey($course, $invitation, $doc_url);
$_course['path'] = $_course['directory']; $_course['path'] = $_course['directory'];
} else { } else {

@ -145,6 +145,7 @@ if ('auto' === $invitationcode && isset($_GET['scode'])) {
} }
// From here we use the new invitationcode auto-userid-surveycode string // From here we use the new invitationcode auto-userid-surveycode string
$_GET['invitationcode'] = $autoInvitationcode; $_GET['invitationcode'] = $autoInvitationcode;
Session::write('auto_invitation_code_'.$surveyCode, $autoInvitationcode);
$invitationcode = $autoInvitationcode; $invitationcode = $autoInvitationcode;
} }
} }
@ -574,6 +575,8 @@ if (
// The first thing we do is delete the session // The first thing we do is delete the session
Session::erase('paged_questions'); Session::erase('paged_questions');
Session::erase('page_questions_sec'); Session::erase('page_questions_sec');
Session::erase('auto_invitation_code_'.$survey_data['code']);
$paged_questions_sec = []; $paged_questions_sec = [];
if (!empty($survey_data['survey_introduction'])) { if (!empty($survey_data['survey_introduction'])) {
echo '<div class="survey_content">'.Security::remove_XSS($survey_data['survey_introduction']).'</div>'; echo '<div class="survey_content">'.Security::remove_XSS($survey_data['survey_introduction']).'</div>';
@ -629,12 +632,14 @@ if ($survey_data['form_fields'] &&
// We unset the sessions // We unset the sessions
Session::erase('paged_questions'); Session::erase('paged_questions');
Session::erase('page_questions_sec'); Session::erase('page_questions_sec');
Session::erase('auto_invitation_code_'.$survey_data['code']);
$paged_questions_sec = []; $paged_questions_sec = [];
} else { } else {
echo '<div id="survey_content" class="survey_content">'.get_lang('UpdateInformation').'</div>'; echo '<div id="survey_content" class="survey_content">'.get_lang('UpdateInformation').'</div>';
// We unset the sessions // We unset the sessions
Session::erase('paged_questions'); Session::erase('paged_questions');
Session::erase('page_questions_sec'); Session::erase('page_questions_sec');
Session::erase('auto_invitation_code_'.$survey_data['code']);
$paged_questions_sec = []; $paged_questions_sec = [];
$form->display(); $form->display();
} }
@ -667,6 +672,7 @@ if (isset($_POST['finish_survey'])) {
Session::erase('paged_questions'); Session::erase('paged_questions');
Session::erase('page_questions_sec'); Session::erase('page_questions_sec');
Session::erase('auto_invitation_code_'.$survey_data['code']);
Display::display_footer(); Display::display_footer();
exit(); exit();
} }

Loading…
Cancel
Save