TomaHost/Chamilo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade 1-11.38

Browse Source
This commit is contained in:
xesmyd
2026-03-30 14:10:30 +02:00
parent f2a7e6d1fc
commit ac648ef29d
24665 changed files with 69682 additions and 2205004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/survey/fillsurvey.php
+9 -7
View File
@@ -252,8 +252,10 @@ if (empty($survey_data)) {
// Checking time availability
SurveyManager::checkTimeAvailability($survey_data);
$survey_data['survey_id'] = $survey_invitation['survey_id'];
// Normalize to int to avoid strict type mismatch on PHP 8.3 (DB may return int, not string)
$surveyType = (int) $survey_data['survey_type'];
if ($survey_data['survey_type'] === '3') {
if ($surveyType === 3) {
header('Location: '.
api_get_path(WEB_CODE_PATH).
'survey/meeting.php?cidReq='.$courseInfo['code'].'&id_session='.$sessionId.'&invitationcode='.Security::remove_XSS($invitationcode)
@@ -267,7 +269,7 @@ if (!empty($survey_data['anonymous'])) {
// Storing the answers
if (count($_POST) > 0) {
if ($survey_data['survey_type'] === '0') {
if ($surveyType === 0) {
$types = [];
$required = [];
// Getting all the types of the question
@@ -379,7 +381,7 @@ if (count($_POST) > 0) {
}
}
}
} elseif ($survey_data['survey_type'] === '1') {
} elseif ($surveyType === 1) {
//conditional/personality-test type surveys
// Getting all the types of the question (because of the special treatment of the score question type
$shuffle = '';
@@ -740,7 +742,7 @@ if ((isset($_GET['show']) && $_GET['show'] != '') ||
}
// If non-conditional survey
if ($survey_data['survey_type'] == '0') {
if ($surveyType === 0) {
if (empty($paged_questions)) {
$sql = "SELECT * FROM $table_survey_question
WHERE
@@ -877,7 +879,7 @@ if ((isset($_GET['show']) && $_GET['show'] != '') ||
}
}
}
} elseif ('1' === $survey_data['survey_type']) {
} elseif ($surveyType === 1) {
$my_survey_id = (int) $survey_invitation['survey_id'];
$current_user = Database::escape_string($survey_invitation['user']);
@@ -1442,7 +1444,7 @@ if (isset($questions) && is_array($questions)) {
}
$form->addHtml('<div class="start-survey">');
if ($survey_data['survey_type'] == '0') {
if ($surveyType === 0) {
if ($survey_data['show_form_profile'] == 0) {
// The normal survey as always
if ($show < $numberOfPages) {
@@ -1514,7 +1516,7 @@ if ($survey_data['survey_type'] == '0') {
}
}
}
} elseif ($survey_data['survey_type'] == '1') {
} elseif ($surveyType === 1) {
// Conditional/personality-test type survey
if (isset($_GET['show']) || isset($_POST['personality'])) {
$numberOfPages = count($paged_questions);
main/survey/surveyUtil.class.php
+6 -6
View File
@@ -2078,11 +2078,11 @@ class SurveyUtil
return false;
}
$spreadsheet = new PHPExcel();
$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
$spreadsheet->setActiveSheetIndex(0);
$worksheet = $spreadsheet->getActiveSheet();
$line = 1;
$column = 1; // Skip the first column (row titles)
$column = 2; // Skip the first column (row titles); was column 1 (0-indexed B) in PHPExcel
// Show extra fields blank space (enough for extra fields on next line)
// Show user fields section with a big th colspan that spans over all fields
@@ -2175,7 +2175,7 @@ class SurveyUtil
}
$line++;
$column = 1;
$column = 2;
// Show extra field values
if ($display_extra_user_fields && !$survey_data['anonymous']) {
// Show the fields names for user fields
@@ -2274,7 +2274,7 @@ class SurveyUtil
// Getting all the answers of the users
$line++;
$column = 0;
$column = 1;
$old_user = '';
$answers_of_user = [];
$sql = "SELECT * FROM $table_survey_answer
@@ -2302,7 +2302,7 @@ class SurveyUtil
}
$answers_of_user = [];
$line++;
$column = 0;
$column = 1;
}
if ($possible_answers_type[$row['question_id']] === 'open' ||
$possible_answers_type[$row['question_id']] === 'comment'
@@ -2332,7 +2332,7 @@ class SurveyUtil
}
$file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
$writer = new PHPExcel_Writer_Excel2007($spreadsheet);
$writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
$writer->save($file);
if ($returnFile) {
main/survey/survey_list.php
+34 -37
View File
@@ -354,7 +354,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$surveyList[] = $surveyData;
}
@$spreadsheet = new PHPExcel();
@$spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
$counter = 0;
foreach ($classes as $class) {
$classId = $class['id'];
@@ -368,16 +368,16 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$page = @$spreadsheet->createSheet($counter);
@$page->setTitle($class['name']);
$firstColumn = 3;
$column = 3;
$columnQuestion = 3;
$firstColumn = 4;
$column = 4;
$columnQuestion = 4;
@$page->setCellValueByColumnAndRow(
0,
1,
1,
$class['name']
);
$columnsWithData = [0, 1, 2];
$columnsWithData = [1, 2, 3];
$previousSurveyQuestionsCount = 0;
$skipThisClass = true;
foreach ($surveyList as $survey) {
@@ -402,7 +402,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$userId = $userInClass['id'];
$completeName = $userInClass['firstname'].' '.$userInClass['lastname'];
if (empty($previousSurveyQuestionsCount)) {
$userColumn = 3;
$userColumn = 4;
} else {
$userColumn = $previousSurveyQuestionsCount;
}
@@ -479,7 +479,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
}
if (empty($previousSurveyQuestionsCount)) {
$previousSurveyQuestionsCount = 3;
$previousSurveyQuestionsCount = 4;
}
//$previousSurveyQuestionsCount += $questionsInSurvey;
@@ -493,14 +493,14 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
trim(strip_tags(str_replace('{{student_full_name}}', '', $question['question'])))
);
// Add question title.
$cell = @$page->setCellValueByColumnAndRow(
@$page->setCellValueByColumnAndRow(
$column,
1,
$questionTitle,
true
$questionTitle
);
$cell = $page->getCellByColumnAndRow($column, 1);
$cell->getStyle()->getAlignment()->setHorizontal(
PHPExcel_Style_Alignment::HORIZONTAL_CENTER
\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER
);
$coordinate = $page->getCellByColumnAndRow($column, 1)->getCoordinate();
$firstCoordinate = $coordinate;
@@ -515,23 +515,21 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$userId = $userAnswer['user_id'];
$title = $survey['group_title'].' - '.$userAnswer['complete_name'];
$cell = @$page->setCellValueByColumnAndRow(
@$page->setCellValueByColumnAndRow(
$column,
1,
$questionTitle,
true
$questionTitle
);
if ($debug) {
$title = 's:'.$surveyId.' - q '.$question['question_id'].' prev:'.$previousSurveyQuestionsCount.' '.$userAnswer['lastname'];
}
$cell = @$page->setCellValueByColumnAndRow(
@$page->setCellValueByColumnAndRow(
$column,
2,
$title,
true
$title
);
$cell->getStyle()->getAlignment()->setTextRotation(90);
$page->getCellByColumnAndRow($column, 2)->getStyle()->getAlignment()->setTextRotation(90);
$spreadsheet->getActiveSheet()->getRowDimension(2)->setRowHeight(250);
$lastColumn = $column;
@@ -555,7 +553,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
// Remove cols with no data.
$less = 0;
$index = 0;
$index = 1;
foreach ($page->getColumnIterator('A') as $col) {
if (!in_array($index, $columnsWithData)) {
if (!$debug) {
@@ -566,10 +564,10 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$index++;
}
$counterColumn = 2;
$counterColumn = 3;
$categories = [];
$letterList = [];
$highestRow = $page->getHighestRow(0); // Name list
$highestRow = $page->getHighestRow('A'); // Name list
// Sets $page->getColumnIterator('C')
$dimension = $page->getColumnDimension('C');
foreach ($page->getColumnIterator('C') as $col) {
@@ -612,14 +610,14 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
}
// Merge similar cols.
$counterColumn = 3;
$counterColumn = 4;
$oldValue = '';
$data = [];
foreach ($page->getColumnIterator('C') as $col) {
$index = $col->getColumnIndex();
$cell = $page->getCellByColumnAndRow($counterColumn, 1);
$cell->getStyle()->getAlignment()->setHorizontal(
PHPExcel_Style_Alignment::HORIZONTAL_CENTER
\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER
);
$coordinate = $page->getCellByColumnAndRow($counterColumn, 1)->getCoordinate();
$value = $cell->getValue();
@@ -644,7 +642,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$row = 3;
foreach ($usersInClass as $user) {
$columnUser = 0;
$columnUser = 1;
$lastname = $user['lastname'];
if ($debug) {
$lastname = $user['id'].': '.$user['lastname'];
@@ -671,21 +669,20 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
if (false === strpos($question['question'], '{{')) {
$questionTitle = strip_tags($question['question']);
$questionId = $question['question_id'];
$firstColumn = 3;
$column = 3;
$columnQuestion = 3;
$firstColumn = 4;
$column = 4;
$columnQuestion = 4;
foreach ($usersWithInvitation as $userAnswer) {
$myUserId = $userAnswer['id'];
$columnUser = 0;
$cell = @$page->setCellValueByColumnAndRow($columnUser++, $row, $questionTitle, true);
$page->getColumnDimensionByColumn($cell->getColumn())->setAutoSize(0);
$page->getColumnDimensionByColumn($cell->getColumn())->setWidth(50);
$columnUser = 1;
@$page->setCellValueByColumnAndRow($columnUser++, $row, $questionTitle);
$page->getColumnDimension('A')->setAutoSize(false);
$page->getColumnDimension('A')->setWidth(50);
$cell2 = @$page->setCellValueByColumnAndRow(
@$page->setCellValueByColumnAndRow(
$columnUser++,
$row,
$survey['group_title'].' - '.$userAnswer['complete_name'],
true
$survey['group_title'].' - '.$userAnswer['complete_name']
);
$data = '';
if (isset($survey['user_answers'][$myUserId]) &&
@@ -694,7 +691,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$data = $survey['user_answers'][$myUserId][$survey['survey_id']][$questionId];
}
// Question answer.
$cell = @$page->setCellValueByColumnAndRow($columnUser++, $row, $data, true);
@$page->setCellValueByColumnAndRow($columnUser++, $row, $data);
$row++;
}
} else {
@@ -706,7 +703,7 @@ if (isset($_POST['action']) && $_POST['action'] && isset($_POST['id']) && is_arr
$spreadsheet->setActiveSheetIndex(0);
$file = api_get_path(SYS_ARCHIVE_PATH).uniqid('report', true);
@$writer = new PHPExcel_Writer_Excel2007($spreadsheet);
@$writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
@$writer->save($file);
DocumentManager::file_send_for_download($file, true, get_lang('Report').'.xlsx');