Update from 19x

1.10.x
Julio Montoya 10 years ago
parent f72306e9bd
commit 0ae4812e17
  1. 2
      main/admin/course_intro_pdf_import.php
  2. 21
      main/inc/lib/api.lib.php
  3. 15
      main/inc/lib/fileUpload.lib.php

@ -124,7 +124,7 @@ function import_pdfs($file, $subDir = '/')
$move = rename($baseDir.$uploadPath.$file, api_get_path(SYS_COURSE_PATH).$course['path'].'/document'.$subDir.'/'.$file); $move = rename($baseDir.$uploadPath.$file, api_get_path(SYS_COURSE_PATH).$course['path'].'/document'.$subDir.'/'.$file);
api_item_property_update($course, TOOL_DOCUMENT, $docId, 'DocumentAdded', api_get_user_id()); api_item_property_update($course, TOOL_DOCUMENT, $docId, 'DocumentAdded', api_get_user_id());
// Redo visibility // Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $docId); api_set_default_visibility($docId, TOOL_DOCUMENT);
$errors[] = array('Line' => 0, 'Code' => $course['code'], 'Title' => $course['title']); $errors[] = array('Line' => 0, 'Code' => $course['code'], 'Title' => $course['title']);
// Now add a link to the file from the Course description tool // Now add a link to the file from the Course description tool
$link = '<p>Sílabo de la asignatura <a href="'.api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.$course['code'].'&id_session=0&gidReq=0&action=download&id='.$docId.'" target="_blank"><img src="'.api_get_path(WEB_IMG_PATH).'icons/32/pdf.png"></a></p>'; $link = '<p>Sílabo de la asignatura <a href="'.api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.$course['code'].'&id_session=0&gidReq=0&action=download&id='.$docId.'" target="_blank"><img src="'.api_get_path(WEB_IMG_PATH).'icons/32/pdf.png"></a></p>';

@ -6877,11 +6877,12 @@ function api_is_global_chat_enabled()
* @param int $group_id * @param int $group_id
* @param array $courseInfo * @param array $courseInfo
*/ */
function api_set_default_visibility($item_id, $tool_id, $group_id = 0, $courseInfo = array()) function api_set_default_visibility($item_id, $tool_id, $group_id = 0, $courseInfo = array(), $sessionId = null)
{ {
$courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo; $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
$courseId = $courseInfo['real_id']; $courseId = $courseInfo['real_id'];
$courseCode = $courseInfo['code']; $courseCode = $courseInfo['code'];
$sessionId = empty($sessionId) ? api_get_session_id() : $sessionId;
$original_tool_id = $tool_id; $original_tool_id = $tool_id;
@ -6942,14 +6943,16 @@ function api_set_default_visibility($item_id, $tool_id, $group_id = 0, $courseIn
switch ($original_tool_id) { switch ($original_tool_id) {
case TOOL_QUIZ: case TOOL_QUIZ:
$objExerciseTmp = new Exercise($courseId); if (empty($sessionId)) {
$objExerciseTmp->read($item_id); $objExerciseTmp = new Exercise($courseId);
if ($visibility == 'visible') { $objExerciseTmp->read($item_id);
$objExerciseTmp->enable(); if ($visibility == 'visible') {
$objExerciseTmp->save(); $objExerciseTmp->enable();
} else { $objExerciseTmp->save();
$objExerciseTmp->disable(); } else {
$objExerciseTmp->save(); $objExerciseTmp->disable();
$objExerciseTmp->save();
}
} }
break; break;
} }

@ -412,7 +412,12 @@ function handle_uploaded_document(
); );
// Redo visibility // Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $documentId, null, $courseInfo); api_set_default_visibility(
$documentId,
TOOL_DOCUMENT,
null,
$courseInfo
);
} else { } else {
// There might be cases where the file exists on disk but there is no registration of that in the database // There might be cases where the file exists on disk but there is no registration of that in the database
// In this case, and if we are in overwrite mode, overwrite and create the db record // In this case, and if we are in overwrite mode, overwrite and create the db record
@ -445,7 +450,7 @@ function handle_uploaded_document(
); );
// Redo visibility // Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $documentId, null, $courseInfo); api_set_default_visibility($documentId, TOOL_DOCUMENT, null, $courseInfo);
} }
} }
@ -492,7 +497,7 @@ function handle_uploaded_document(
); );
// Redo visibility // Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $documentId, null, $courseInfo); api_set_default_visibility($documentId, TOOL_DOCUMENT, null, $courseInfo);
} }
// If the file is in a folder, we need to update all parent folders // If the file is in a folder, we need to update all parent folders
item_property_update_on_folder($courseInfo, $uploadPath, $userId); item_property_update_on_folder($courseInfo, $uploadPath, $userId);
@ -569,7 +574,7 @@ function handle_uploaded_document(
); );
// Redo visibility // Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $documentId, null, $courseInfo); api_set_default_visibility($documentId, TOOL_DOCUMENT, null, $courseInfo);
} }
// If the file is in a folder, we need to update all parent folders // If the file is in a folder, we need to update all parent folders
@ -631,7 +636,7 @@ function handle_uploaded_document(
$sessionId $sessionId
); );
// Redo visibility // Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $documentId, null, $courseInfo); api_set_default_visibility($documentId, TOOL_DOCUMENT, null, $courseInfo);
} }
// If the file is in a folder, we need to update all parent folders // If the file is in a folder, we need to update all parent folders

Loading…
Cancel
Save