From 5d573f6289502208779d41da918e7c0da83b6fc4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 29 Dec 2020 10:08:37 +0100
Subject: [PATCH] Update from 1.11.x, fix php warnings

---
 public/main/exercise/exercise.class.php               | 6 +++---
 public/main/exercise/result.php                       | 1 +
 public/main/gradebook/exercise_jump.php               | 8 ++++----
 public/main/gradebook/lib/fe/gradebooktable.class.php | 7 +++++--
 public/main/gradebook/personal_stats.php              | 1 +
 public/main/inc/lib/AnnouncementManager.php           | 2 ++
 public/main/inc/lib/agenda.lib.php                    | 6 +++---
 public/main/inc/lib/fileDisplay.lib.php               | 2 +-
 8 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
index 07215454da..30b3cb255f 100644
--- a/public/main/exercise/exercise.class.php
+++ b/public/main/exercise/exercise.class.php
@@ -9450,11 +9450,11 @@ class Exercise
                         )
                         ) {
                             if ($num > 0) {
-                                $row_track = Database:: fetch_array($qryres);
+                                $row_track = Database::fetch_array($qryres);
                                 $attempt_text = get_lang('LatestAttempt').' : ';
                                 $attempt_text .= ExerciseLib::show_score(
-                                    $row_track['exe_result'],
-                                    $row_track['exe_weighting']
+                                    $row_track['score'],
+                                    $row_track['max_score']
                                 );
                             } else {
                                 $attempt_text = get_lang('Not attempted');
diff --git a/public/main/exercise/result.php b/public/main/exercise/result.php
index b410a1770a..8b42e4ad3d 100644
--- a/public/main/exercise/result.php
+++ b/public/main/exercise/result.php
@@ -16,6 +16,7 @@ $id = isset($_REQUEST['id']) ? (int) $_GET['id'] : 0; // exe id
 $show_headers = isset($_REQUEST['show_headers']) ? (int) $_REQUEST['show_headers'] : null;
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 $origin = api_get_origin();
+$is_courseTutor = api_is_course_tutor();
 
 if (in_array($origin, ['learnpath', 'embeddable', 'mobileapp'])) {
     $show_headers = false;
diff --git a/public/main/gradebook/exercise_jump.php b/public/main/gradebook/exercise_jump.php
index a38ef1f9ba..8d9983c1e4 100644
--- a/public/main/gradebook/exercise_jump.php
+++ b/public/main/gradebook/exercise_jump.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -16,8 +17,7 @@ $this_section = SECTION_COURSES;
 
 $gradebook = Security::remove_XSS($_GET['gradebook']);
 $session_id = api_get_session_id();
-$courseId = api_get_course_int_id();
-$cidReq = Security::remove_XSS($_GET['cidReq']);
+$courseId = Security::remove_XSS($_GET['cid']);
 $type = Security::remove_XSS($_GET['type']);
 $doExerciseUrl = '';
 
@@ -70,8 +70,8 @@ if (!empty($doExerciseUrl)) {
             } else {
                 $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.http_build_query(
                     [
-                        'session_id' => $session_id,
-                        'cidReq' => $cidReq,
+                        'sid' => $session_id,
+                        'cid' => $courseId,
                         'gradebook' => $gradebook,
                         'origin' => '',
                         'learnpath_id' => '',
diff --git a/public/main/gradebook/lib/fe/gradebooktable.class.php b/public/main/gradebook/lib/fe/gradebooktable.class.php
index d32b004325..f75b58dcb1 100644
--- a/public/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/public/main/gradebook/lib/fe/gradebooktable.class.php
@@ -790,8 +790,11 @@ class GradebookTable extends SortableTable
                 $global = null;
                 $average = null;
                 $myTotal = 0;
-                foreach ($this->dataForGraph['my_result_no_float'] as $result) {
-                    $myTotal += $result;
+
+                if (isset($this->dataForGraph['my_result_no_float'])) {
+                    foreach ($this->dataForGraph['my_result_no_float'] as $result) {
+                        $myTotal += $result;
+                    }
                 }
 
                 $totalResult[0] = $myTotal;
diff --git a/public/main/gradebook/personal_stats.php b/public/main/gradebook/personal_stats.php
index fc10e954d8..10f93edfda 100644
--- a/public/main/gradebook/personal_stats.php
+++ b/public/main/gradebook/personal_stats.php
@@ -1,4 +1,5 @@
 <?php
+
 /* See license terms in /license.txt */
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/public/main/inc/lib/AnnouncementManager.php b/public/main/inc/lib/AnnouncementManager.php
index 06c64345b5..f9c7267b11 100644
--- a/public/main/inc/lib/AnnouncementManager.php
+++ b/public/main/inc/lib/AnnouncementManager.php
@@ -898,9 +898,11 @@ class AnnouncementManager
 
             // Send to everyone
             if (isset($to[0]) && 'everyone' === $to[0]) {
+                $announcement->setParent($course);
                 $announcement->addCourseLink($course, $session, $group);
             }
         } else {
+            $announcement->setParent($course);
             $announcement->addCourseLink($course, $session);
         }
 
diff --git a/public/main/inc/lib/agenda.lib.php b/public/main/inc/lib/agenda.lib.php
index db94243995..4655420104 100644
--- a/public/main/inc/lib/agenda.lib.php
+++ b/public/main/inc/lib/agenda.lib.php
@@ -489,7 +489,7 @@ class Agenda
 
         $sql = "SELECT title, content, start_date, end_date, all_day
                 FROM $t_agenda
-                WHERE c_id = $courseId AND id = $eventId";
+                WHERE iid = $eventId";
         $res = Database::query($sql);
 
         if (1 !== Database::num_rows($res)) {
@@ -526,8 +526,8 @@ class Agenda
         $type = Database::escape_string($type);
         $end = Database::escape_string($end);
         $endTimeStamp = api_strtotime($end, 'UTC');
-        $sql = "INSERT INTO $t_agenda_r (c_id, cal_id, cal_type, cal_end)
-                VALUES ($courseId, '$eventId', '$type', '$endTimeStamp')";
+        $sql = "INSERT INTO $t_agenda_r (cal_id, cal_type, cal_end)
+                VALUES ('$eventId', '$type', '$endTimeStamp')";
         Database::query($sql);
 
         $generatedDates = $this->generateDatesByType($type, $row['start_date'], $row['end_date'], $end);
diff --git a/public/main/inc/lib/fileDisplay.lib.php b/public/main/inc/lib/fileDisplay.lib.php
index c8370f111f..3f475efc25 100644
--- a/public/main/inc/lib/fileDisplay.lib.php
+++ b/public/main/inc/lib/fileDisplay.lib.php
@@ -167,7 +167,7 @@ function choose_image($file_name)
         }
     }
 
-    return 'defaut.gif';
+    return 'defaut_small.gif';
 }
 
 /**