From 0ae4812e17c0d959a3384331e07080b08a69a445 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 5 Jan 2016 13:28:24 +0100
Subject: [PATCH] Update from 19x

---
 main/admin/course_intro_pdf_import.php |  2 +-
 main/inc/lib/api.lib.php               | 21 ++++++++++++---------
 main/inc/lib/fileUpload.lib.php        | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/main/admin/course_intro_pdf_import.php b/main/admin/course_intro_pdf_import.php
index 5773ca54b6..f9c7084ca7 100755
--- a/main/admin/course_intro_pdf_import.php
+++ b/main/admin/course_intro_pdf_import.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);
                 api_item_property_update($course, TOOL_DOCUMENT, $docId, 'DocumentAdded', api_get_user_id());
                 // 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']);
                 // 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>';
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 3bebe64e3e..f83613f3b5 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -6877,11 +6877,12 @@ function api_is_global_chat_enabled()
  * @param int $group_id
  * @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;
     $courseId = $courseInfo['real_id'];
     $courseCode = $courseInfo['code'];
+    $sessionId = empty($sessionId) ? api_get_session_id() : $sessionId;
 
     $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) {
             case TOOL_QUIZ:
-                $objExerciseTmp = new Exercise($courseId);
-                $objExerciseTmp->read($item_id);
-                if ($visibility == 'visible') {
-                    $objExerciseTmp->enable();
-                    $objExerciseTmp->save();
-                } else {
-                    $objExerciseTmp->disable();
-                    $objExerciseTmp->save();
+                if (empty($sessionId)) {
+                    $objExerciseTmp = new Exercise($courseId);
+                    $objExerciseTmp->read($item_id);
+                    if ($visibility == 'visible') {
+                        $objExerciseTmp->enable();
+                        $objExerciseTmp->save();
+                    } else {
+                        $objExerciseTmp->disable();
+                        $objExerciseTmp->save();
+                    }
                 }
                 break;
         }
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 56b197ac53..60eb80110d 100755
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -412,7 +412,12 @@ function handle_uploaded_document(
                                 );
 
                                 // Redo visibility
-                                api_set_default_visibility(TOOL_DOCUMENT, $documentId, null, $courseInfo);
+                                api_set_default_visibility(
+                                    $documentId,
+                                    TOOL_DOCUMENT,
+                                    null,
+                                    $courseInfo
+                                );
                             } else {
                                 // 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
@@ -445,7 +450,7 @@ function handle_uploaded_document(
                                     );
 
                                     // 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
-                                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
                             item_property_update_on_folder($courseInfo, $uploadPath, $userId);
@@ -569,7 +574,7 @@ function handle_uploaded_document(
                             );
 
                             // 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
@@ -631,7 +636,7 @@ function handle_uploaded_document(
                                     $sessionId
                                 );
                                 // 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