chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - merge from 1.11.x

Browse Source
pull/2487/head
jmontoyaa 7 years ago
parent ee2ea219a7
commit 4f3355a92b
21 changed files with 278 additions and 179 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      main/cron/check_lp_total_time.php
  2. 2
      main/cron/fix_course_spent_time.php
  3. 4
      main/cron/fix_lp_total_time.php
  4. 94
      main/cron/import_csv.php
  5. 50
      main/document/document.php
  6. 2
      main/exercise/exercise.class.php
  7. 2
      main/exercise/exercise_show.php
  8. 8
      main/inc/ajax/lp.ajax.php
  9. 114
      main/inc/lib/CourseChatUtils.php
  10. 22
      main/inc/lib/document.lib.php
  11. 38
      main/inc/lib/exercise.lib.php
  12. 20
      main/inc/lib/fileUpload.lib.php
  13. 19
      main/inc/lib/userportal.lib.php
  14. 2
      main/inc/lib/webservices/Rest.php
  15. 25
      main/lp/blank.php
  16. 5
      main/lp/learnpath.class.php
  17. 36
      main/lp/lp_content.php
  18. 2
      main/lp/lp_edit.php
  19. 4
      main/work/work.lib.php
  20. 1
      src/CoreBundle/Controller/LegacyController.php
  21. 1
      src/CoreBundle/Menu/NavBuilder.php

6
main/cron/check_lp_total_time.php
Unescape View File

@ -133,9 +133,9 @@ function compareLpTimeAndCourseTime($user, $courseInfo, $sessionId = 0)
$content .= 'Top 1 high lp item times'.PHP_EOL.PHP_EOL;
foreach ($results as $item) {
$lpId = $item['lp_id'];
$link = api_get_path(WEB_CODE_PATH).'mySpace/lp_tracking.php?cidReq='.$courseCode.'&course='.$courseCode.'&origin=&lp_id='.$lpId.'&student_id='.$userId.'&id_session='.$sessionId;
$content .= "total_time = ".api_time_to_hms($item['total_time']).PHP_EOL;
$link = api_get_path(WEB_CODE_PATH).'mySpace/lp_tracking.php?cidReq='.$courseCode.
'&course='.$courseCode.'&origin=&lp_id='.$lpId.'&student_id='.$userId.'&id_session='.$sessionId;
$content .= "total_time to be reduced = ".api_time_to_hms($item['total_time']).PHP_EOL;
$content .= Display::url('See report before update', $link, ['target' => '_blank']).PHP_EOL;
$content .= "SQL with possible fix:".PHP_EOL;

2
main/cron/fix_course_spent_time.php
Unescape View File

@ -10,6 +10,8 @@ require_once __DIR__.'/../../main/inc/global.inc.php';
exit;
opcache_reset();
$maxSeconds = 10 * 60 * 60; // Check records higher than 7 hours
$addSecondsToLogin = 2 * 60 * 60; // Update this abusive records with 3 hours
$limit = 10; // Only fix first 10

4
main/cron/fix_lp_total_time.php
Unescape View File

@ -9,6 +9,8 @@ exit;
require_once __DIR__.'/../../main/inc/global.inc.php';
opcache_reset();
$maxSeconds = 5 * 60 * 60; // Check records higher than 5 hours
$valueToUpdate = 1 * 60 * 60; // Update this abusive records with 1 hours
$limit = 10; // Only fix first 10
@ -34,7 +36,7 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
}
$oldTotalTime = round($oldTotalTime / 3600, 2);
$report = "Previous total_time : ".round($oldTotalTime / 3600, 2)." hours";
$report = "Previous total_time : ".$oldTotalTime." hours";
$report .= PHP_EOL;
$report .= "New total_time: $valueToUpdate";
$report .= PHP_EOL;

94
main/cron/import_csv.php
Unescape View File

@ -131,7 +131,8 @@ class ImportCsv
foreach ($files as $file) {
$fileInfo = pathinfo($file);
if (isset($fileInfo['extension']) && $fileInfo['extension'] === 'csv') {
// Checking teachers_yyyymmdd.csv, courses_yyyymmdd.csv, students_yyyymmdd.csv and sessions_yyyymmdd.csv
// Checking teachers_yyyymmdd.csv,
// courses_yyyymmdd.csv, students_yyyymmdd.csv and sessions_yyyymmdd.csv
$parts = explode('_', $fileInfo['filename']);
$preMethod = ucwords($parts[1]);
$preMethod = str_replace('-static', 'Static', $preMethod);
@ -178,9 +179,9 @@ class ImportCsv
} else {
echo "Error - This file '$file' can't be processed.".PHP_EOL;
echo "Trying to call $method".PHP_EOL;
echo "The file have to has this format:".PHP_EOL;
echo "prefix_students_ddmmyyyy.csv, prefix_teachers_ddmmyyyy.csv, prefix_courses_ddmmyyyy.csv, prefix_sessions_ddmmyyyy.csv ".PHP_EOL;
echo "prefix_students_ddmmyyyy.csv, prefix_teachers_ddmmyyyy.csv,
prefix_courses_ddmmyyyy.csv, prefix_sessions_ddmmyyyy.csv ".PHP_EOL;
exit;
}
}
@ -208,14 +209,12 @@ class ImportCsv
];
foreach ($sections as $section) {
$this->logger->addInfo("-- Import $section --");
if (isset($fileToProcess[$section]) && !empty($fileToProcess[$section])) {
$this->logger->addInfo("-- Import $section --");
$files = $fileToProcess[$section];
foreach ($files as $fileInfo) {
$method = $fileInfo['method'];
$file = $fileInfo['file'];
echo 'File: '.$file.PHP_EOL;
echo 'Method : '.$method.PHP_EOL;
echo PHP_EOL;
@ -249,11 +248,10 @@ class ImportCsv
];
foreach ($sections as $section) {
$this->logger->addInfo("-- Import static files $section --");
if (isset($fileToProcessStatic[$section]) &&
!empty($fileToProcessStatic[$section])
) {
$this->logger->addInfo("-- Import static files $section --");
$files = $fileToProcessStatic[$section];
foreach ($files as $fileInfo) {
$method = $fileInfo['method'];
@ -788,8 +786,12 @@ class ImportCsv
$language = $this->defaultLanguage;
$this->logger->addInfo(count($data)." records found.");
$expirationDateOnCreate = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserCreation)."years"));
$expirationDateOnUpdate = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserUpdate)."years"));
$expirationDateOnCreate = api_get_utc_datetime(
strtotime("+".intval($this->expirationDateInUserCreation)."years")
);
$expirationDateOnUpdate = api_get_utc_datetime(
strtotime("+".intval($this->expirationDateInUserUpdate)."years")
);
$counter = 1;
$secondsInYear = 365 * 24 * 60 * 60;
@ -1030,7 +1032,6 @@ class ImportCsv
$this->logger->addInfo("external_sessionID: ".$externalSessionId." does not exists.");
}
$teacherId = null;
if (!empty($sessionId) && !empty($courseInfo)) {
$courseIncluded = SessionManager::relation_session_course_exist(
$sessionId,
@ -1106,9 +1107,7 @@ class ImportCsv
}
if (empty($eventsToCreate)) {
$this->logger->addInfo(
"No events to add"
);
$this->logger->addInfo("No events to add");
return 0;
}
@ -1207,6 +1206,34 @@ class ImportCsv
$em->flush();
}
}
$this->logger->addInfo('Move from course #'.$calendarEvent->getCId().' to #'.$courseInfo['real_id']);
// Checking if session still exists
$calendarSessionId = (int) $calendarEvent->getSessionId();
if (!empty($calendarSessionId)) {
$calendarSessionInfo = api_get_session_info($calendarSessionId);
if (empty($calendarSessionInfo)) {
$calendarId = (int) $calendarEvent->getIid();
// Delete calendar events because the session was deleted!
$this->logger->addInfo(
"Delete event # $calendarId because session # $calendarSessionId doesn't exist"
);
$sql = "DELETE FROM c_calendar_event
WHERE iid = $calendarId AND session_id = $calendarSessionId";
Database::query($sql);
$this->logger->addInfo($sql);
$sql = "DELETE FROM c_item_property
WHERE
tool = 'calendar_event' AND
ref = $calendarSessionId AND
session_id = $calendarSessionId";
Database::query($sql);
$this->logger->addInfo($sql);
}
}
} else {
$this->logger->addInfo('Calendar event not found '.$item['item_id']);
}
@ -1235,7 +1262,7 @@ class ImportCsv
$item = $event['item'];
$update = $event['update'];
$externalEventId = $event['external_event_id'];
$info = 'Course: '.$courseInfo['real_id'].' ('.$courseInfo['code'].') - Session: '.$event['session_id'];
$info = 'Course: '.$courseInfo['real_id'].' ('.$courseInfo['code'].') - Session: '.$event['session_id'].' external event id: '.$externalEventId;
$agenda = new Agenda(
'course',
@ -1284,15 +1311,19 @@ class ImportCsv
$days = 5;
$startDatePlusDays = api_strtotime("$days weekdays");
/*
$timePart = date('H:i:s', api_strtotime('now'));
$datePart = date('Y-m-d', api_strtotime("$days weekdays"));
$startDatePlusDays = "$timePart $datePart";
*/
$this->logger->addInfo(
"startDatePlusDays: ".api_get_utc_datetime($startDatePlusDays).' - First date: '.$firstDate
);
// Send
$sendMail = false;
if ($startDatePlusDays > api_strtotime($firstDate)) {
$sendMail = true;
} else {
$sendMail = false;
}
// Send announcement to users
@ -1317,7 +1348,6 @@ class ImportCsv
}
$courseTitle = $courseInfo['title'].$sessionName;
$emailBody = get_lang('Dear').' ((user_firstname)) <br />'.
sprintf(
get_lang('YouHaveBeenSubscribedToCourseXTheStartDateXAndCommentX'),
@ -1366,19 +1396,21 @@ class ImportCsv
);
if ($announcementId) {
$this->logger->addInfo(
"Announcement added: ".(int) ($announcementId)." in $info"
);
$this->logger->addInfo(
"<<--SENDING MAIL-->>"
);
$this->logger->addInfo("Announcement added: ".(int) ($announcementId)." in $info");
$this->logger->addInfo("<<--SENDING MAIL-->>");
$report['mail_sent']++;
AnnouncementManager::sendEmail(
$courseInfo,
$event['session_id'],
$announcementId,
false
false,
false,
$this->logger,
$this->defaultAdminId
);
} else {
$this->logger->addError(
"Error when trying to add announcement with title ".$subject." here: $info"
);
}
} else {
@ -1388,6 +1420,9 @@ class ImportCsv
);
}
} else {
$this->logger->addInfo(
"Send Mail: ".intval($sendMail).' - Already added: '.intval($alreadyAdded)
);
if ($sendMail == false) {
$report['mail_not_sent_because_date']++;
}
@ -1430,7 +1465,8 @@ class ImportCsv
];
$extraFieldValue->update($params);
$this->logger->addInfo(
'Updating calendar extra field #'.$extraFieldValueItem['id'].' new item_id: '.$eventId.' old item_id: '.$item['item_id']
'Updating calendar extra field #'.$extraFieldValueItem['id'].'
new item_id: '.$eventId.' old item_id: '.$item['item_id']
);
}
} else {
@ -2550,6 +2586,7 @@ class ImportCsv
$name = $row['CourseName'];
$notes = $row['Notes'];
$groupValue = $row['Group'];
$boxColumn = $row['Column'];
$rowValue = $row['Row'];
$color = isset($row['DefinedColor']) ? $row['DefinedColor'] : '';
$arrow = isset($row['DrawArrowFrom']) ? $row['DrawArrowFrom'] : '';
@ -2567,12 +2604,11 @@ class ImportCsv
$current->setAttribute('Notes', $notes);
$current->setAttribute('Row', $rowValue);
$current->setAttribute('Group', $groupValue);
$current->setAttribute('Column', $boxColumn);
$current->setAttribute('DrawArrowFrom', $arrow);
$current->setAttribute('SubGroup', $subGroup);
$current->setAttribute('Connections', $connections);
$current->setAttribute('LinkedElement', $linkedElement);
//$current->setAttribute('graphviz.color', 'blue');
$current->setAttribute('graphviz.shape', 'box');
$current->setGroup($column);
}

50
main/document/document.php
Unescape View File

@ -134,7 +134,7 @@ $sessionId = api_get_session_id();
$course_code = api_get_course_id();
$groupId = api_get_group_id();
$isAllowedToEdit = api_is_allowed_to_edit(null, true);
$group_member_with_upload_rights = false;
$groupMemberWithUploadRights = false;
// If the group id is set, we show them group documents
$group_properties = [];
@ -142,7 +142,7 @@ $group_properties['directory'] = null;
// For sessions we should check the parameters of visibility
if (api_get_session_id() != 0) {
$group_member_with_upload_rights = $group_member_with_upload_rights && api_is_allowed_to_session_edit(false, true);
$groupMemberWithUploadRights = $groupMemberWithUploadRights && api_is_allowed_to_session_edit(false, true);
}
// Get group info
@ -160,7 +160,7 @@ if (!empty($groupId)) {
$groupMemberWithEditRights = $isAllowedToEdit || $isTutorGroup;
// Let's assume the user cannot upload files for the group
$group_member_with_upload_rights = false;
$groupMemberWithUploadRights = false;
if ($group_properties['doc_state'] == 2) {
// Documents are private
if ($isAllowedToEdit || GroupManager::is_user_in_group($userId, $group_properties)) {
@ -174,7 +174,7 @@ if (!empty($groupId)) {
'name' => get_lang('GroupSpace').' '.$group_properties['name'],
];
//they are allowed to upload
$group_member_with_upload_rights = true;
$groupMemberWithUploadRights = true;
} else {
$groupId = 0;
}
@ -195,10 +195,10 @@ if (!empty($groupId)) {
GroupManager::is_tutor_of_group($userId, $group_properties, $courseId)
) {
// Only course admin or group members can upload
$group_member_with_upload_rights = true;
$groupMemberWithUploadRights = true;
}
}
Session::write('group_member_with_upload_rights', $group_member_with_upload_rights);
Session::write('group_member_with_upload_rights', $groupMemberWithUploadRights);
} else {
Session::write('group_member_with_upload_rights', false);
}
@ -211,7 +211,7 @@ $curdirpath = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpat
switch ($action) {
case 'delete_item':
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId) ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $moveTo, $sessionId)
) {
@ -316,7 +316,7 @@ switch ($action) {
// Launch event
Event::event_download($document_data['url']);
// Check visibility of document and paths
if (!($isAllowedToEdit || $group_member_with_upload_rights) &&
if (!($isAllowedToEdit || $groupMemberWithUploadRights) &&
!DocumentManager::is_visible_by_id($document_id, $courseInfo, $sessionId, api_get_user_id())
) {
api_not_allowed(true);
@ -874,7 +874,7 @@ $documentAndFolders = DocumentManager::getAllDocumentData(
$curdirpath,
$groupIid,
null,
$isAllowedToEdit || $group_member_with_upload_rights,
$isAllowedToEdit || $groupMemberWithUploadRights,
false
);
@ -946,7 +946,7 @@ if ($groupId != 0) { // Add group name after for group documents
$moveForm = '';
/* MOVE FILE OR DIRECTORY */
//Only teacher and all users into their group and each user into his/her shared folder
if ($isAllowedToEdit || $group_member_with_upload_rights ||
if ($isAllowedToEdit || $groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId) ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $moveTo, $sessionId)
) {
@ -978,7 +978,7 @@ if ($isAllowedToEdit || $group_member_with_upload_rights ||
$folders = DocumentManager::get_all_document_folders(
$courseInfo,
$groupIid,
$isAllowedToEdit || $group_member_with_upload_rights,
$isAllowedToEdit || $groupMemberWithUploadRights,
false,
$curdirpath
);
@ -1156,7 +1156,7 @@ if ($isAllowedToEdit || $group_member_with_upload_rights ||
/* DELETE FILE OR DIRECTORY */
//Only teacher and all users into their group
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId)
) {
if (isset($_POST['action']) && isset($_POST['ids'])) {
@ -1293,7 +1293,7 @@ $dirForm = '';
/* CREATE DIRECTORY */
//Only teacher and all users into their group and any user into his/her shared folder
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId)
) {
// Create directory with $_POST data
@ -1421,7 +1421,7 @@ $templateForm = '';
/* TEMPLATE ACTION */
//Only teacher and all users into their group
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId)
) {
if (isset($_GET['add_as_template']) && !isset($_POST['create_template'])) {
@ -1548,7 +1548,7 @@ if (isset($_GET['keyword']) && !empty($_GET['keyword'])) {
$curdirpath,
$groupIid,
null,
$isAllowedToEdit || $group_member_with_upload_rights,
$isAllowedToEdit || $groupMemberWithUploadRights,
true
);
} else {
@ -1557,7 +1557,7 @@ if (isset($_GET['keyword']) && !empty($_GET['keyword'])) {
$curdirpath,
$groupIid,
null,
$isAllowedToEdit || $group_member_with_upload_rights,
$isAllowedToEdit || $groupMemberWithUploadRights,
false
);
}
@ -1572,7 +1572,7 @@ if ($groupId != 0) {
$folders = DocumentManager::get_all_document_folders(
$courseInfo,
$groupIid,
$isAllowedToEdit || $group_member_with_upload_rights,
$isAllowedToEdit || $groupMemberWithUploadRights,
false,
$curdirpath
);
@ -1581,7 +1581,7 @@ if ($groupId != 0) {
$folders = DocumentManager::get_all_document_folders(
$courseInfo,
0,
$isAllowedToEdit || $group_member_with_upload_rights,
$isAllowedToEdit || $groupMemberWithUploadRights,
false,
$curdirpath
);
@ -1612,7 +1612,7 @@ if ($is_certificate_mode && $curdirpath != '/certificates') {
$column_show = [];
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId)
) {
// TODO:check enable more options for shared folders
@ -1812,7 +1812,7 @@ if (!empty($documentAndFolders)) {
}
$row['name'] = $document_name;
// Data for checkbox
if (($isAllowedToEdit || $group_member_with_upload_rights) && count($documentAndFolders) > 1) {
if (($isAllowedToEdit || $groupMemberWithUploadRights) && count($documentAndFolders) > 1) {
$row[] = $document_data['id'];
}
@ -2010,7 +2010,7 @@ if (!$is_certificate_mode && !isset($_GET['move'])) {
);
}
if (($isAllowedToEdit || $group_member_with_upload_rights) && count($documentAndFolders) > 1) {
if (($isAllowedToEdit || $groupMemberWithUploadRights) && count($documentAndFolders) > 1) {
$column_show[] = 1;
}
@ -2020,7 +2020,7 @@ $column_show[] = 1;
$column_show[] = 1;
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId)
) {
$column_show[] = 1;
@ -2071,7 +2071,7 @@ $queryVars['id'] = $document_id;
$table->set_additional_parameters($queryVars);
$column = 0;
if (($isAllowedToEdit || $group_member_with_upload_rights) &&
if (($isAllowedToEdit || $groupMemberWithUploadRights) &&
count($documentAndFolders) > 1
) {
$table->set_header($column++, '', false, ['style' => 'width:12px;']);
@ -2082,7 +2082,7 @@ $table->set_header($column++, get_lang('Size'), true, ['style' => 'width:50px;']
$table->set_header($column++, get_lang('Date'), true, ['style' => 'width:150px;']);
// Admins get an edit column
if ($isAllowedToEdit ||
$group_member_with_upload_rights ||
$groupMemberWithUploadRights ||
DocumentManager::is_my_shared_folder(api_get_user_id(), $curdirpath, $sessionId)
) {
$table->set_header($column++, get_lang('Actions'), false, ['class' => 'td_actions']);
@ -2124,7 +2124,7 @@ $table->display();
$ajaxURL = api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=get_document_quota&'.api_get_cidreq();
if (count($documentAndFolders) > 1) {
if ($isAllowedToEdit || $group_member_with_upload_rights) {
if ($isAllowedToEdit || $groupMemberWithUploadRights) {
echo '<script>
$(document).ready(function() {
$.ajax({

2
main/exercise/exercise.class.php
Unescape View File

@ -5779,7 +5779,7 @@ class Exercise
}
$user_info = api_get_user_info(api_get_user_id());
$url = api_get_path(WEB_CODE_PATH).'exercise/exercise_show.php?'.api_get_cidreq().'&id_session='.$sessionId.'&id='.$exe_id.'&action=qualify';
$url = api_get_path(WEB_CODE_PATH).'exercise/exercise_show.php?'.api_get_cidreq().'&id='.$exe_id.'&action=qualify';
if (!empty($sessionId)) {
$addGeneralCoach = true;

2
main/exercise/exercise_show.php
Unescape View File

@ -20,7 +20,7 @@ $debug = false;
$origin = api_get_origin();
$currentUserId = api_get_user_id();
$printHeaders = $origin == 'learnpath';
$id = intval($_REQUEST['id']); //exe id
$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; //exe id
if (empty($id)) {
api_not_allowed(true);

8
main/inc/ajax/lp.ajax.php
Unescape View File

@ -291,10 +291,8 @@ switch ($action) {
$lpItemId = isset($_GET['lp_item']) ? intval($_GET['lp_item']) : 0;
if ($lp) {
$position = $lp->isFirstOrLastItem($lpItemId);
echo json_encode($position);
}
echo json_encode($position);
break;
case 'get_parent_names':
$newItemId = isset($_GET['new_item']) ? intval($_GET['new_item']) : 0;
@ -325,9 +323,9 @@ switch ($action) {
echo '1';
} else {
if (!empty($lp->error)) {
echo $lp->error;
echo addslashes($lp->error);
} else {
echo get_lang('LearnpathPrereqNotCompleted');
echo addslashes(get_lang('LearnpathPrereqNotCompleted'));
}
}
$lp->error = '';

114
main/inc/lib/CourseChatUtils.php
Unescape View File

@ -133,7 +133,20 @@ class CourseChatUtils
$absoluteFilePath = $chat_path.$fileTitle;
if (!file_exists($absoluteFilePath)) {
$doc_id = add_document($courseInfo, $filePath, 'file', 0, $fileTitle);
$doc_id = add_document(
$courseInfo,
$filePath,
'file',
0,
$fileTitle,
null,
0,
true,
0,
0,
0,
false
);
$documentLogTypes = ['DocumentAdded', 'invisible'];
foreach ($documentLogTypes as $logType) {
@ -187,10 +200,8 @@ class CourseChatUtils
fputs($fp, $fileContent);
fclose($fp);
$chat_size = filesize($absoluteFilePath);
update_existing_document($courseInfo, $doc_id, $chat_size);
$size = filesize($absoluteFilePath);
update_existing_document($courseInfo, $doc_id, $size);
item_property_update_on_folder($courseInfo, $basepath_chat, $this->userId);
return true;
@ -471,7 +482,20 @@ class CourseChatUtils
@mkdir($chat_path, api_get_permissions_for_new_directories());
// Save chat files document for group into item property
if ($this->groupId) {
$doc_id = add_document($courseInfo, $basepath_chat, 'folder', 0, 'chat_files');
$doc_id = add_document(
$courseInfo,
$basepath_chat,
'folder',
0,
'chat_files',
null,
0,
true,
0,
0,
0,
false
);
api_item_property_update(
$courseInfo,
TOOL_DOCUMENT,
@ -504,32 +528,47 @@ class CourseChatUtils
if (!file_exists($chat_path.$filename_chat)) {
@fclose(fopen($chat_path.$filename_chat, 'w'));
if (!api_is_anonymous()) {
$doc_id = add_document($courseInfo, $basepath_chat.'/'.$filename_chat, 'file', 0, $filename_chat);
api_item_property_update(
$courseInfo,
TOOL_DOCUMENT,
$doc_id,
'DocumentAdded',
$this->userId,
$group_info,
null,
null,
null,
$this->sessionId
);
api_item_property_update(
$doc_id = add_document(
$courseInfo,
TOOL_DOCUMENT,
$doc_id,
'invisible',
$this->userId,
$group_info,
$basepath_chat.'/'.$filename_chat,
'file',
0,
$filename_chat,
null,
null,
null,
$this->sessionId
0,
true,
0,
0,
0,
false
);
item_property_update_on_folder($courseInfo, $basepath_chat, $this->userId);
if ($doc_id) {
api_item_property_update(
$courseInfo,
TOOL_DOCUMENT,
$doc_id,
'DocumentAdded',
$this->userId,
$group_info,
null,
null,
null,
$this->sessionId
);
api_item_property_update(
$courseInfo,
TOOL_DOCUMENT,
$doc_id,
'invisible',
$this->userId,
$group_info,
null,
null,
null,
$this->sessionId
);
item_property_update_on_folder($courseInfo, $basepath_chat, $this->userId);
}
}
}
@ -560,7 +599,14 @@ class CourseChatUtils
$basepath_chat.'/'.$basename_chat.'-'.$i.'.log.html',
'file',
filesize($chat_path.$basename_chat.'-'.$i.'.log.html'),
$basename_chat.'-'.$i.'.log.html'
$basename_chat.'-'.$i.'.log.html',
null,
0,
true,
0,
0,
0,
false
);
api_item_property_update(
@ -637,7 +683,7 @@ class CourseChatUtils
/**
* Get the number of users connected in chat.
*
* @return mixed
* @return int
*/
public function countUsersOnline()
{
@ -663,13 +709,13 @@ class CourseChatUtils
])
->getSingleScalarResult();
return intval($number);
return (int) $number;
}
/**
* Get the users online data.
*
* @return string
* @return array
*/
public function listUsersOnline()
{
@ -771,6 +817,6 @@ class CourseChatUtils
])
->getSingleScalarResult();
return intval($number);
return (int) $number;
}
}

22
main/inc/lib/document.lib.php
Unescape View File

@ -1992,6 +1992,7 @@ class DocumentManager
$dir_name,
$post_dir_name,
null,
false,
false
);
@ -2007,7 +2008,10 @@ class DocumentManager
null,
0,
true,
$to_group_id
$to_group_id,
0,
0,
false
);
}
@ -5749,7 +5753,9 @@ class DocumentManager
$documentDirectory,
'/shared_folder',
get_lang('UserFolders'),
0
0,
false,
false
);
}
// Create dynamic user shared folder
@ -5763,7 +5769,9 @@ class DocumentManager
$documentDirectory,
'/shared_folder/sf_user_'.$userId,
$userInfo['complete_name'],
1
1,
false,
false
);
}
@ -5781,7 +5789,9 @@ class DocumentManager
$documentDirectory,
'/shared_folder_session_'.$sessionId,
get_lang('UserFolders').' ('.api_get_session_name($sessionId).')',
0
0,
false,
false
);
}
//Create dynamic user shared folder into a shared folder session
@ -5795,7 +5805,9 @@ class DocumentManager
$documentDirectory,
'/shared_folder_session_'.$sessionId.'/sf_user_'.$userId,
$userInfo['complete_name'].'('.api_get_session_name($sessionId).')',
1
1,
false,
false
);
}
}

38
main/inc/lib/exercise.lib.php
Unescape View File

@ -1344,35 +1344,35 @@ HOTSPOT;
}
/**
* @param int $exe_id
* @param int $exeId
*
* @return array
*/
public static function get_exercise_track_exercise_info($exe_id)
public static function get_exercise_track_exercise_info($exeId)
{
$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
$TBL_TRACK_EXERCICES = Database::get_main_table(
TABLE_STATISTIC_TRACK_E_EXERCISES
);
$TBL_COURSE = Database::get_main_table(TABLE_MAIN_COURSE);
$exe_id = intval($exe_id);
$quizTable = Database::get_course_table(TABLE_QUIZ_TEST);
$trackExerciseTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
$exeId = (int) $exeId;
$result = [];
if (!empty($exe_id)) {
if (!empty($exeId)) {
$sql = " SELECT q.*, tee.*
FROM $TBL_EXERCICES as q
INNER JOIN $TBL_TRACK_EXERCICES as tee
FROM $quizTable as q
INNER JOIN $trackExerciseTable as tee
ON q.id = tee.exe_exo_id
INNER JOIN $TBL_COURSE c
INNER JOIN $courseTable c
ON c.id = tee.c_id
WHERE tee.exe_id = $exe_id
WHERE tee.exe_id = $exeId
AND q.c_id = c.id";
$res_fb_type = Database::query($sql);
$result = Database::fetch_array($res_fb_type, 'ASSOC');
$result['duration_formatted'] = '';
if (!empty($result['exe_duration'])) {
$time = api_format_time($result['exe_duration'], 'js');
$result['duration_formatted'] = $time;
$sqlResult = Database::query($sql);
if (Database::num_rows($sqlResult)) {
$result = Database::fetch_array($sqlResult, 'ASSOC');
$result['duration_formatted'] = '';
if (!empty($result['exe_duration'])) {
$time = api_format_time($result['exe_duration'], 'js');
$result['duration_formatted'] = $time;
}
}
}

20
main/inc/lib/fileUpload.lib.php
Unescape View File

@ -1312,9 +1312,10 @@ function filter_extension(&$filename)
* @param string $comment
* @param int $readonly
* @param bool $saveVisibility
* @param int $group_id group.id
* @param int $sessionId Session ID, if any
* @param int $userId creator user id
* @param int $group_id group.id
* @param int $sessionId Session ID, if any
* @param int $userId creator user id
* @param bool $sendNotification
*
* @return int id if inserted document
*/
@ -1329,7 +1330,8 @@ function add_document(
$saveVisibility = true,
$group_id = 0,
$sessionId = 0,
$userId = 0
$userId = 0,
$sendNotification = true
) {
$sessionId = empty($sessionId) ? api_get_session_id() : $sessionId;
$userId = empty($userId) ? api_get_user_id() : $userId;
@ -1364,7 +1366,7 @@ function add_document(
}
$allowNotification = api_get_configuration_value('send_notification_when_document_added');
if ($allowNotification) {
if ($sendNotification && $allowNotification) {
$courseTitle = $courseInfo['title'];
if (!empty($sessionId)) {
$sessionInfo = api_get_session_info($sessionId);
@ -1596,7 +1598,7 @@ function search_img_from_html($html_file)
* @param string $title "folder2"
* @param int $visibility (0 for invisible, 1 for visible, 2 for deleted)
* @param bool $generateNewNameIfExists
*
* @param bool $sendNotification depends in conf setting "send_notification_when_document_added"
* @return string actual directory name if it succeeds,
* boolean false otherwise
*/
@ -1610,7 +1612,8 @@ function create_unexisting_directory(
$desired_dir_name,
$title = '',
$visibility = '',
$generateNewNameIfExists = false
$generateNewNameIfExists = false,
$sendNotification = true
) {
$course_id = $_course['real_id'];
$session_id = intval($session_id);
@ -1695,7 +1698,8 @@ function create_unexisting_directory(
true,
$to_group_id,
$session_id,
$user_id
$user_id,
$sendNotification
);
if ($document_id) {

19
main/inc/lib/userportal.lib.php
Unescape View File

@ -2529,14 +2529,17 @@ class IndexManager
*/
private static function filterByCategory($courseList, $categoryCode)
{
return array_filter($courseList, function ($courseInfo) use ($categoryCode) {
if (isset($courseInfo['category_code']) &&
$courseInfo['category_code'] === $categoryCode
) {
return true;
}
return array_filter(
$courseList,
function ($courseInfo) use ($categoryCode) {
if (isset($courseInfo['category_code']) &&
$courseInfo['category_code'] === $categoryCode
) {
return true;
}
return false;
});
return false;
}
);
}
}

2
main/inc/lib/webservices/Rest.php
Unescape View File

@ -427,7 +427,7 @@ class Rest extends WebService
$announcement['item_property']->getInsertDate(),
DATE_TIME_FORMAT_LONG_24H
),
'content' => AnnouncementManager::parse_content(
'content' => AnnouncementManager::parseContent(
$this->user->getId(),
$announcement['announcement']->getContent(),
$this->course->getCode(),

25
main/lp/blank.php
Unescape View File

@ -23,28 +23,21 @@ $message = '';
if (isset($_GET['error'])) {
switch ($_GET['error']) {
case 'document_deleted':
$message = Display::return_message(
get_lang('DocumentHasBeenDeleted'),
'error'
);
$message = Display::return_message(get_lang('DocumentHasBeenDeleted'), 'error');
break;
case 'prerequisites':
$message = Display::return_message(
get_lang('LearnpathPrereqNotCompleted'),
'warning'
);
$prerequisiteMessage = isset($_GET['prerequisite_message']) ? $_GET['prerequisite_message'] : '';
$message = Display::return_message(get_lang('LearnpathPrereqNotCompleted'), 'warning');
if (!empty($prerequisiteMessage)) {
$message = Display::return_message(Security::remove_XSS($prerequisiteMessage), 'warning');
}
break;
case 'document_not_found':
$message = Display::return_message(
get_lang('FileNotFound'),
'warning'
);
$message = Display::return_message(get_lang('FileNotFound'), 'warning');
break;
case 'reached_one_attempt':
$message = Display::return_message(
get_lang('ReachedOneAttempt'),
'warning'
);
$message = Display::return_message(get_lang('ReachedOneAttempt'), 'warning');
break;
case 'x_frames_options':
$src = Session::read('x_frame_source');

5
main/lp/learnpath.class.php
Unescape View File

@ -2793,7 +2793,10 @@ class learnpath
if (empty($prereq)) {
return '';
}
if (preg_match('/^\d+$/', $prereq) && is_object($this->items[$prereq])) {
if (preg_match('/^\d+$/', $prereq) &&
isset($this->items[$prereq]) &&
is_object($this->items[$prereq])
) {
// If the prerequisite is a simple integer ID and this ID exists as an item ID,
// then simply return it (with the ITEM_ prefix).
//return 'ITEM_' . $prereq;

36
main/lp/lp_content.php
Unescape View File

@ -27,8 +27,8 @@ if (empty($lp_controller_touched)) {
/** @var learnpath $learnPath */
$learnPath = Session::read('oLP');
$learnPath->error = '';
$lp_type = $learnPath->get_type();
$lp_item_id = $learnPath->get_current_item_id();
$lpType = $learnPath->get_type();
$lpItemId = $learnPath->get_current_item_id();
/**
* Get a link to the corresponding document.
@ -36,15 +36,15 @@ $lp_item_id = $learnPath->get_current_item_id();
$src = '';
if ($debug > 0) {
error_log('New lp - In lp_content.php - Looking for file url');
error_log("lp_type $lp_type");
error_log("lp_item_id $lp_item_id");
error_log("lp_type $lpType");
error_log("lp_item_id $lpItemId");
}
$list = $learnPath->get_toc();
$dir = false;
foreach ($list as $toc) {
if ($toc['id'] == $lp_item_id && $toc['type'] == 'dir') {
if ($toc['id'] == $lpItemId && $toc['type'] == 'dir') {
$dir = true;
}
}
@ -52,38 +52,38 @@ foreach ($list as $toc) {
if ($dir) {
$src = 'blank.php';
} else {
switch ($lp_type) {
switch ($lpType) {
case 1:
$learnPath->stop_previous_item();
$prereq_check = $learnPath->prerequisites_match($lp_item_id);
$prerequisiteCheck = $learnPath->prerequisites_match($lpItemId);
if ($prereq_check === true) {
$src = $learnPath->get_link('http', $lp_item_id);
if ($prerequisiteCheck === true) {
$src = $learnPath->get_link('http', $lpItemId);
$learnPath->start_current_item(); // starts time counter manually if asset
$src = $learnPath->fixBlockedLinks($src);
break;
}
$src = 'blank.php?error=prerequisites';
$src = 'blank.php?error=prerequisites&prerequisite_message='.$learnPath->error;
break;
case 2:
$learnPath->stop_previous_item();
$prereq_check = $learnPath->prerequisites_match($lp_item_id);
$prerequisiteCheck = $learnPath->prerequisites_match($lpItemId);
if ($prereq_check === true) {
$src = $learnPath->get_link('http', $lp_item_id);
if ($prerequisiteCheck === true) {
$src = $learnPath->get_link('http', $lpItemId);
$learnPath->start_current_item(); // starts time counter manually if asset
} else {
$src = 'blank.php?error=prerequisites';
$src = 'blank.php?error=prerequisites&prerequisite_message='.$learnPath->error;
}
break;
case 3:
// save old if asset
$learnPath->stop_previous_item(); // save status manually if asset
$prereq_check = $learnPath->prerequisites_match($lp_item_id);
if ($prereq_check === true) {
$src = $learnPath->get_link('http', $lp_item_id);
$prerequisiteCheck = $learnPath->prerequisites_match($lpItemId);
if ($prerequisiteCheck === true) {
$src = $learnPath->get_link('http', $lpItemId);
$learnPath->start_current_item(); // starts time counter manually if asset
} else {
$src = 'blank.php';
@ -97,7 +97,7 @@ if ($dir) {
if ($debug > 0) {
error_log('New lp - In lp_content.php - File url is '.$src);
}
$learnPath->set_previous_item($lp_item_id);
$learnPath->set_previous_item($lpItemId);
if (api_is_in_gradebook()) {
$interbreadcrumb[] = [

2
main/lp/lp_edit.php
Unescape View File

@ -8,7 +8,7 @@ use ChamiloSession as Session;
*
* @package chamilo.learnpath
*
* @author Yannick Warnier <ywarnier@beeznest.org>
* @author Yannick Warnier <ywarnier@beeznest.org>
*/
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';

4
main/work/work.lib.php
Unescape View File

@ -5197,10 +5197,10 @@ function getFileContents($id, $course_info, $sessionId = 0, $correction = false)
*/
$work_is_visible = $item_info['visibility'] == 1 && $row['accepted'] == 1;
$doc_visible_for_all = $course_info['show_score'] == 1;
$doc_visible_for_all = (int) $course_info['show_score'] === 0;
$is_editor = api_is_allowed_to_edit(true, true, true);
$student_is_owner_of_work = user_is_author($row['id'], $row['user_id']);
$student_is_owner_of_work = user_is_author($row['id'], api_get_user_id());
if ($is_editor ||
$student_is_owner_of_work ||

1
src/CoreBundle/Controller/LegacyController.php
Unescape View File

@ -28,6 +28,7 @@ class LegacyController extends ToolBaseController
*
* @param string $name
* @param Request $request
* @param string $folder
*
* @return Response
*/

1
src/CoreBundle/Menu/NavBuilder.php
Unescape View File

@ -69,7 +69,6 @@ class NavBuilder implements ContainerAwareInterface
'route' => 'legacy_index',
]
);
if ($checker->isGranted('IS_AUTHENTICATED_FULLY')) {
$menu->addChild(
$translator->trans('MyCourses'),

Write Preview
Loading…
Cancel
Save