From 95aea79d626f11002982bf873b88baf71fc69dfe Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Sun, 20 Jun 2021 09:22:33 +0200
Subject: [PATCH] Fix legacy PHP code, add more files to psalm.xml

---
 psalm.xml                                     |  7 ++--
 public/main/admin/user_add.php                |  3 +-
 public/main/admin/user_edit.php               |  3 +-
 public/main/admin/user_list_consent.php       |  3 +-
 public/main/course_progress/index.php         |  3 +-
 public/main/coursecopy/import_backup.php      |  6 ++--
 public/main/exercise/TestCategory.php         |  3 +-
 public/main/exercise/category.php             |  4 +--
 public/main/exercise/exercise.class.php       | 10 +++---
 .../exercise/export/exercise_import.inc.php   |  2 +-
 public/main/exercise/fill_blanks.class.php    | 10 ++++--
 public/main/exercise/question_create.php      |  3 +-
 public/main/exercise/tests_category.php       |  2 +-
 public/main/inc/lib/agenda.lib.php            |  3 +-
 public/main/inc/lib/api.lib.php               | 12 +++----
 .../main/inc/lib/course_description.lib.php   | 34 -------------------
 public/main/inc/lib/display.lib.php           | 10 +++---
 public/main/inc/lib/events.lib.php            |  2 +-
 public/main/inc/lib/exercise.lib.php          |  3 +-
 public/main/inc/lib/export.lib.inc.php        | 14 ++++----
 public/main/inc/lib/extra_field.lib.php       |  7 ++--
 .../lib/formvalidator/FormValidator.class.php |  2 +-
 public/main/inc/lib/gradebook.lib.php         |  3 +-
 .../inc/lib/pear/HTML/QuickForm/button.php    |  2 +-
 public/main/inc/lib/tracking.lib.php          |  6 ++--
 public/main/lp/learnpath.class.php            |  2 +-
 public/main/lp/lp_add_audio.php               |  2 +-
 public/main/lp/lp_edit_item_prereq.php        |  2 +-
 public/main/lp/lp_final_item.php              |  2 +-
 public/main/lp/lp_list_search.php             |  4 +--
 public/main/lp/lp_view.php                    |  4 +--
 public/main/mySpace/access_details.php        |  3 +-
 public/main/mySpace/users.php                 |  3 +-
 public/main/survey/survey.php                 |  4 +--
 public/main/ticket/new_ticket.php             |  9 ++---
 public/main/tracking/lp_results_by_user.php   |  3 +-
 .../main/tracking/question_course_report.php  |  6 ++--
 .../plugin/buycourses/src/buycourses.ajax.php |  3 +-
 public/plugin/customcertificate/src/index.php |  6 ++--
 39 files changed, 78 insertions(+), 132 deletions(-)

diff --git a/psalm.xml b/psalm.xml
index 711bdd361a..efc5574174 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -63,7 +63,7 @@
         <file name="public/main/inc/lib/agenda.lib.php"/>
         <file name="public/main/inc/lib/AnnouncementEmail.php"/>
         <file name="public/main/inc/lib/AnnouncementManager.php"/>
-<!--        <file name="public/main/inc/lib/api.lib.php"/>-->
+        <file name="public/main/inc/lib/api.lib.php"/>
         <file name="public/main/inc/lib/array.lib.php"/>
         <file name="public/main/inc/lib/attendance.lib.php"/>
         <file name="public/main/inc/lib/auth.lib.php"/>
@@ -86,7 +86,7 @@
 <!--        <file name="public/main/inc/lib/exercise.lib.php"/>-->
         <file name="public/main/inc/lib/exercise_show_functions.lib.php"/>
         <file name="public/main/inc/lib/ExerciseCategoryManager.php"/>
-<!--        <file name="public/main/inc/lib/export.lib.inc.php"/>-->
+        <file name="public/main/inc/lib/export.lib.inc.php"/>
 
         <file name="public/main/inc/lib/extra_field.lib.php"/>
         <file name="public/main/inc/lib/extra_field_option.lib.php"/>
@@ -165,6 +165,8 @@
             <directory name="public/main/inc/lib/search" />
             <directory name="public/main/inc/lib/svg-edit" />
             <directory name="public/main/inc/lib/zombie" />
+            <directory name="public/main/exercise/export/qti2" />
+
 
             <file name="public/main/lp/openoffice_presentation.class.php"/>
             <file name="public/main/lp/openoffice_document.class.php"/>
@@ -187,6 +189,7 @@
 
             <file name="public/main/admin/ldap_*"/>
             <file name="public/main/admin/special_exports.php"/>
+            <file name="public/main/exercise/admin.php"/>
 
             <file name="src/CoreBundle/Controller/EditorController.php"/>
             <file name="src/CoreBundle/Controller/ResourceController.php"/>
diff --git a/public/main/admin/user_add.php b/public/main/admin/user_add.php
index e3446edd58..11fd87ce56 100644
--- a/public/main/admin/user_add.php
+++ b/public/main/admin/user_add.php
@@ -235,8 +235,7 @@ $status[SESSIONADMIN] = get_lang('Sessions administrator');
 $status[STUDENT_BOSS] = get_lang('Student\'s superior');
 $status[INVITEE] = get_lang('Invitee');
 
-$form->addElement(
-    'select',
+$form->addSelect(
     'status',
     get_lang('Profile'),
     $status,
diff --git a/public/main/admin/user_edit.php b/public/main/admin/user_edit.php
index a0611bb3e6..630ce216d5 100644
--- a/public/main/admin/user_edit.php
+++ b/public/main/admin/user_edit.php
@@ -241,8 +241,7 @@ $status[SESSIONADMIN] = get_lang('Sessions administrator');
 $status[STUDENT_BOSS] = get_lang('Student\'s superior');
 $status[INVITEE] = get_lang('Invitee');
 
-$form->addElement(
-    'select',
+$form->addSelect(
     'status',
     get_lang('Profile'),
     $status,
diff --git a/public/main/admin/user_list_consent.php b/public/main/admin/user_list_consent.php
index ca7a22a33b..2b6c8f354d 100644
--- a/public/main/admin/user_list_consent.php
+++ b/public/main/admin/user_list_consent.php
@@ -574,8 +574,7 @@ $status_options[DRH] = get_lang('Human Resources Manager');
 $status_options[SESSIONADMIN] = get_lang('Sessions administrator');
 $status_options[PLATFORM_ADMIN] = get_lang('Administrator');
 
-$form->addElement(
-    'select',
+$form->addSelect(
     'keyword_status',
     get_lang('Profile'),
     $status_options
diff --git a/public/main/course_progress/index.php b/public/main/course_progress/index.php
index 56bc3e33e5..4f9ab114b5 100644
--- a/public/main/course_progress/index.php
+++ b/public/main/course_progress/index.php
@@ -1071,8 +1071,7 @@ switch ($action) {
         }
 
         if (count($attendance_select) > 1) {
-            $form->addElement(
-                'select',
+            $form->addSelect(
                 'attendance_select',
                 get_lang('Attendances'),
                 $attendance_select,
diff --git a/public/main/coursecopy/import_backup.php b/public/main/coursecopy/import_backup.php
index 5ade16b67c..3aa3c07a98 100644
--- a/public/main/coursecopy/import_backup.php
+++ b/public/main/coursecopy/import_backup.php
@@ -180,12 +180,10 @@ if (Security::check_token('post') && ('course_select_form' === $action || 'full_
         foreach ($backups as $index => $backup) {
             $options[$backup['file']] = $backup['course_code'].' ('.$backup['date'].')';
         }
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'backup_server',
             '',
-            $options,
-            'style="margin-left: 50px;"'
+            $options
         );
         $form->addElement(
             'html',
diff --git a/public/main/exercise/TestCategory.php b/public/main/exercise/TestCategory.php
index 4ba1b13a7f..1a32d154d2 100644
--- a/public/main/exercise/TestCategory.php
+++ b/public/main/exercise/TestCategory.php
@@ -923,8 +923,7 @@ class TestCategory
             '1' => get_lang('Visible'),
             '0' => get_lang('Hidden'),
         ];
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'visibility',
             get_lang('Visibility'),
             $options
diff --git a/public/main/exercise/category.php b/public/main/exercise/category.php
index fdd2be5c9c..0226ff2fe7 100644
--- a/public/main/exercise/category.php
+++ b/public/main/exercise/category.php
@@ -99,7 +99,7 @@ switch ($action) {
         } else {
             $actions = '<a href="'.$url.'">'.
                 Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
-            $content .= Display::toolbarAction('toolbar', [$actions]);
+            $content = Display::toolbarAction('toolbar', [$actions]);
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(['sec_token' => $token]);
             $content .= $form->returnForm();
@@ -123,7 +123,7 @@ switch ($action) {
         } else {
             $actions = '<a href="'.$url.'">'.
                 Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
-            $content .= Display::toolbarAction('toolbar', [$actions]);
+            $content = Display::toolbarAction('toolbar', [$actions]);
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(['sec_token' => $token]);
             $content .= $form->returnForm();
diff --git a/public/main/exercise/exercise.class.php b/public/main/exercise/exercise.class.php
index 88c75e5a6f..c4087c11de 100644
--- a/public/main/exercise/exercise.class.php
+++ b/public/main/exercise/exercise.class.php
@@ -2036,8 +2036,7 @@ class Exercise
                 //EX_Q_SELECTION_CATEGORIES_ORDERED_BY_PARENT_QUESTIONS_RANDOM => get_lang('OrderedCategoriesByParentWithQuestionsRandom'),
             ];
 
-            $form->addElement(
-                'select',
+            $form->addSelect(
                 'question_selection_type',
                 [get_lang('Question selection type')],
                 $option,
@@ -2107,8 +2106,7 @@ class Exercise
             $option = range(0, $max);
             $option[0] = get_lang('No');
             $option[-1] = get_lang('All');
-            $form->addElement(
-                'select',
+            $form->addSelect(
                 'randomQuestions',
                 [
                     get_lang('Random questions'),
@@ -3911,7 +3909,7 @@ class Exercise
                             }
                         }
                     } else {
-                        $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
+                        $studentChoice = $choice[$answerAutoId] ?? null;
                         if (1 == $answerCorrect) {
                             $real_answers[$answerId] = false;
                             if ($studentChoice) {
@@ -5729,7 +5727,7 @@ class Exercise
                     // Save the score attempts
                     if (1) {
                         //getting the answer 1 or 0 comes from exercise_submit_modal.php
-                        $final_answer = isset($hotspot_delineation_result[1]) ? $hotspot_delineation_result[1] : '';
+                        $final_answer = $hotspot_delineation_result[1] ?? '';
                         if (0 == $final_answer) {
                             $questionScore = 0;
                         }
diff --git a/public/main/exercise/export/exercise_import.inc.php b/public/main/exercise/export/exercise_import.inc.php
index 1f43e2f1ff..033c0aa811 100644
--- a/public/main/exercise/export/exercise_import.inc.php
+++ b/public/main/exercise/export/exercise_import.inc.php
@@ -536,7 +536,7 @@ function parseQti2($xmlData)
                     }
 
                     if ('inlineChoiceInteraction' === $childNode->nodeName) {
-                        $currentQuestionItemBody .= '**claroline_start**'.$childNode->attr('responseIdentifier')
+                        $currentQuestionItemBody .= '**claroline_start**'.$childNode->getAttribute('responseIdentifier')
                             .'**claroline_end**';
 
                         continue;
diff --git a/public/main/exercise/fill_blanks.class.php b/public/main/exercise/fill_blanks.class.php
index cfe0a9222c..03b0ecb79b 100644
--- a/public/main/exercise/fill_blanks.class.php
+++ b/public/main/exercise/fill_blanks.class.php
@@ -339,12 +339,16 @@ class FillBlanks extends Question
 
         //added multiple answers
         $form->addCheckBox('multiple_answer', '', get_lang('Allow answers order switches'));
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'select_separator',
             get_lang('Select a blanks marker'),
             self::getAllowedSeparatorForSelect(),
-            ' id="select_separator" style="width:150px" class="form-control" onchange="changeBlankSeparator()" '
+            [
+                'id' => 'select_separator',
+                'style' => 'width:150px',
+                'class' => 'form-control',
+                'onchange' => 'changeBlankSeparator()',
+            ]
         );
         $form->addLabel(
             null,
diff --git a/public/main/exercise/question_create.php b/public/main/exercise/question_create.php
index 1f82905f26..ab19730073 100644
--- a/public/main/exercise/question_create.php
+++ b/public/main/exercise/question_create.php
@@ -32,8 +32,7 @@ $question_list_options = [];
 foreach ($question_list as $key => $value) {
     $question_list_options[$key] = addslashes(get_lang($value[1]));
 }
-$form->addElement(
-    'select',
+$form->addSelect(
     'question_type_hidden',
     get_lang('Question type'),
     $question_list_options,
diff --git a/public/main/exercise/tests_category.php b/public/main/exercise/tests_category.php
index 477d69dc37..3607c96fbd 100644
--- a/public/main/exercise/tests_category.php
+++ b/public/main/exercise/tests_category.php
@@ -64,7 +64,7 @@ switch ($action) {
 
         if (!empty($categories)) {
             foreach ($categories as $category) {
-                $export[] = [$category['title'], $category['description']];
+                $export[] = [$category->getTitle(), $category->getDescription()];
             }
         }
 
diff --git a/public/main/inc/lib/agenda.lib.php b/public/main/inc/lib/agenda.lib.php
index ec889e3aee..fcf4e48f5b 100644
--- a/public/main/inc/lib/agenda.lib.php
+++ b/public/main/inc/lib/agenda.lib.php
@@ -2134,8 +2134,7 @@ class Agenda
                 'html',
                 '<div id="options2" style="display:none">'
             );
-            $form->addElement(
-                'select',
+            $form->addSelect(
                 'repeat_type',
                 get_lang('Repeat type'),
                 self::getRepeatTypes()
diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php
index 53948f653c..0814da07b0 100644
--- a/public/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@@ -853,7 +853,7 @@ function api_get_path($path = '', $configuration = [])
     global $virtualChamilo;
     if (!empty($virtualChamilo)) {
         $paths[SYS_ARCHIVE_PATH] = api_add_trailing_slash($virtualChamilo[SYS_ARCHIVE_PATH]);
-        $paths[SYS_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[SYS_UPLOAD_PATH]);
+        //$paths[SYS_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[SYS_UPLOAD_PATH]);
         //$paths[$root_web][WEB_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[WEB_UPLOAD_PATH]);
         $paths[WEB_ARCHIVE_PATH] = api_add_trailing_slash($virtualChamilo[WEB_ARCHIVE_PATH]);
         //$paths[$root_web][WEB_COURSE_PATH] = api_add_trailing_slash($virtualChamilo[WEB_COURSE_PATH]);
@@ -3767,14 +3767,14 @@ function api_is_allowed($tool, $action, $task_id = 0)
 
         // Getting the permissions of this user.
         if (0 == $task_id) {
-            $user_permissions = get_permissions('user', $_user['user_id']);
-            $_SESSION['total_permissions'][$_course['code']] = $user_permissions;
+            //$user_permissions = get_permissions('user', $_user['user_id']);
+            //$_SESSION['total_permissions'][$_course['code']] = $user_permissions;
         }
 
         // Getting the permissions of the task.
         if (0 != $task_id) {
-            $task_permissions = get_permissions('task', $task_id);
-            /* !!! */ $_SESSION['total_permissions'][$_course['code']] = $task_permissions;
+            //$task_permissions = get_permissions('task', $task_id);
+            //$_SESSION['total_permissions'][$_course['code']] = $task_permissions;
         }
     }
 
@@ -7965,7 +7965,7 @@ function api_unserialize_content($type, $serialized, $ignoreErrors = false)
                 scormOrganization::class,
                 scormResource::class,
                 Link::class,
-                LpItem::class,
+                //LpItem::class,
             ];
             break;
         case 'course':
diff --git a/public/main/inc/lib/course_description.lib.php b/public/main/inc/lib/course_description.lib.php
index 906e84c7cf..b69599b2ff 100644
--- a/public/main/inc/lib/course_description.lib.php
+++ b/public/main/inc/lib/course_description.lib.php
@@ -79,28 +79,6 @@ class CourseDescription
         $qb = $repo->getResourcesByCourse($course, $session);
 
         return $qb->getQuery()->getResult();
-
-        /*$table = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
-        $condition_session = api_get_session_condition(
-            $this->session_id,
-            true,
-            true
-        );
-
-
-        if (empty($course_id)) {
-            return [];
-        }
-
-        $sql = "SELECT * FROM $table
-                ORDER BY iid ";
-        $rs = Database::query($sql);
-        $data = [];
-        while ($description = Database::fetch_array($rs)) {
-            $data['descriptions'][$description['iid']] = $description;
-        }
-
-        return $data;*/
     }
 
     /**
@@ -192,7 +170,6 @@ class CourseDescription
     public function get_max_description_type()
     {
         $table = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
-        $course_id = api_get_course_int_id();
 
         $sql = "SELECT MAX(description_type) as MAX
                 FROM $table
@@ -274,17 +251,6 @@ class CourseDescription
             ]
         );
 
-        if ($this->id > 0) {
-            // Insert into item_property
-            api_item_property_update(
-                api_get_course_info(),
-                TOOL_COURSE_DESCRIPTION,
-                $this->id,
-                'CourseDescriptionUpdated',
-                api_get_user_id()
-            );
-        }
-
         return 1;
     }
 
diff --git a/public/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php
index bcedfd97d7..a7bb72de89 100644
--- a/public/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@@ -251,13 +251,13 @@ class Display
         $tableName = 'tablename',
         $tableId = ''
     ) {
-        $column = isset($sorting_options['column']) ? $sorting_options['column'] : 0;
-        $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20;
+        $column = $sorting_options['column'] ?? 0;
+        $default_items_per_page = $paging_options['per_page'] ?? 20;
         $table = new SortableTableFromArray($content, $column, $default_items_per_page, $tableName, null, $tableId);
         if (is_array($query_vars)) {
             $table->set_additional_parameters($query_vars);
         }
-        if ('table' == $style) {
+        if ('table' === $style) {
             if (is_array($header) && count($header) > 0) {
                 foreach ($header as $index => $header_item) {
                     $table->set_header(
@@ -389,9 +389,9 @@ class Display
         $elementCount = 0
     ) {
         $column = 0;
-        $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20;
+        $default_items_per_page = $paging_options['per_page'] ?? 20;
         $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);
-        $table->total_number_of_items = intval($elementCount);
+        $table->total_number_of_items = (int) $elementCount;
         if (is_array($query_vars)) {
             $table->set_additional_parameters($query_vars);
         }
diff --git a/public/main/inc/lib/events.lib.php b/public/main/inc/lib/events.lib.php
index ad6941e5ac..3fe8f8d24d 100644
--- a/public/main/inc/lib/events.lib.php
+++ b/public/main/inc/lib/events.lib.php
@@ -1,4 +1,5 @@
 <?php
+
 /* See license terms in /license.txt */
 
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
@@ -2343,7 +2344,6 @@ class Event
         }
 
         if (Tracking::minimumTimeAvailable($sessionId, $courseId)) {
-            $workId = (int) $workId;
             $sql = "SELECT id FROM track_e_access_complete
                     WHERE
                         tool = '".TOOL_STUDENTPUBLICATION."' AND
diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php
index 95a3af31c8..c48dad92dc 100644
--- a/public/main/inc/lib/exercise.lib.php
+++ b/public/main/inc/lib/exercise.lib.php
@@ -1651,6 +1651,8 @@ HOTSPOT;
     public static function showTestsWhereQuestionIsUsed(int $questionId, int $excludeTestId = 0)
     {
         $questionId = (int) $questionId;
+        $excludeTestId = (int) $excludeTestId;
+
         $sql = "SELECT qz.title quiz_title,
                         c.title course_title,
                         s.name session_name,
@@ -1665,7 +1667,6 @@ HOTSPOT;
                     (qz.session_id = s.id OR qz.session_id = 0) AND
                     qq.quiz_id = qz.iid AND ";
         if (!empty($excludeTestId)) {
-            $excludeTestId = (int) $excludeTestId;
             $sql .= " qz.iid != $excludeTestId AND ";
         }
         $sql .= "     qq.question_id = $questionId
diff --git a/public/main/inc/lib/export.lib.inc.php b/public/main/inc/lib/export.lib.inc.php
index 41724b846f..dd52a19631 100644
--- a/public/main/inc/lib/export.lib.inc.php
+++ b/public/main/inc/lib/export.lib.inc.php
@@ -1,9 +1,10 @@
 <?php
+
 /* See license terms in /license.txt */
 
-use Chamilo\CoreBundle\Component\Editor\Connector;
-use MediaAlchemyst\Alchemyst;
-use MediaAlchemyst\DriversContainer;
+//use Chamilo\CoreBundle\Component\Editor\Connector;
+//use MediaAlchemyst\Alchemyst;
+//use MediaAlchemyst\DriversContainer;
 use Neutron\TemporaryFilesystem\Manager;
 use Neutron\TemporaryFilesystem\TemporaryFilesystem;
 use Sonata\Exporter\Handler;
@@ -213,9 +214,8 @@ class Export
             $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
             $row++;
         }
-        $table_tp_html = $table->toHtml();
 
-        return $table_tp_html;
+        return $table->toHtml();
     }
 
     /**
@@ -236,7 +236,7 @@ class Export
         }
 
         if (!empty($html)) {
-            $fs = new Filesystem();
+            /*$fs = new Filesystem();
             $paths = [
                 'root_sys' => api_get_path(SYS_PATH),
                 'path.temp' => api_get_path(SYS_ARCHIVE_PATH),
@@ -279,7 +279,7 @@ class Export
                 } catch (Exception $e) {
                     // error_log($e->getMessage());
                 }
-            }
+            }*/
         }
     }
 }
diff --git a/public/main/inc/lib/extra_field.lib.php b/public/main/inc/lib/extra_field.lib.php
index 4768912902..20550a4b9d 100644
--- a/public/main/inc/lib/extra_field.lib.php
+++ b/public/main/inc/lib/extra_field.lib.php
@@ -1193,8 +1193,7 @@ class ExtraField extends Model
                                 $options[$optionDetails['option_value']] = $optionDetails['display_text'];
                             }
                         }
-                        $form->addElement(
-                            'select',
+                        $form->addSelect(
                             'extra_'.$variable,
                             $field_details['display_text'],
                             $options,
@@ -1436,12 +1435,10 @@ class ExtraField extends Model
 
                         break;
                     case self::FIELD_TYPE_TIMEZONE:
-                        $form->addElement(
-                            'select',
+                        $form->addSelect(
                             'extra_'.$variable,
                             $field_details['display_text'],
                             api_get_timezones(),
-                            ''
                         );
                         if ($freezeElement) {
                             $form->freeze('extra_'.$variable);
diff --git a/public/main/inc/lib/formvalidator/FormValidator.class.php b/public/main/inc/lib/formvalidator/FormValidator.class.php
index da2542a9fe..8086f08bae 100644
--- a/public/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/public/main/inc/lib/formvalidator/FormValidator.class.php
@@ -892,7 +892,7 @@ EOT;
      *
      * @return HTML_QuickForm_select
      */
-    public function addSelect($name, $label, $options = [], $attributes = [])
+    public function addSelect(string $name, $label, array $options = [], array $attributes = [])
     {
         return $this->addElement('select', $name, $label, $options, $attributes);
     }
diff --git a/public/main/inc/lib/gradebook.lib.php b/public/main/inc/lib/gradebook.lib.php
index 7a5cb27f35..9a2d5f4a41 100644
--- a/public/main/inc/lib/gradebook.lib.php
+++ b/public/main/inc/lib/gradebook.lib.php
@@ -178,8 +178,7 @@ class Gradebook extends Model
         foreach ($skills as $skill) {
             $clean_skill_list[$skill['id']] = $skill['name'];
         }
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'skill',
             get_lang('Skills'),
             $clean_skill_list,
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/button.php b/public/main/inc/lib/pear/HTML/QuickForm/button.php
index 6f4f8570b9..cfe4066960 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/button.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/button.php
@@ -91,7 +91,7 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
 
             $icon = $this->getIcon();
             if (!empty($icon)) {
-                $icon = '<em class="mr-1 ' . $this->getIcon() . '"></em> ';
+                $icon = '<em class="'.$this->getIcon().'"></em> ';
             }
             $class = $this->getClass().' '.$this->getStyle().' '.$this->getSize();
 
diff --git a/public/main/inc/lib/tracking.lib.php b/public/main/inc/lib/tracking.lib.php
index c0d39cc7ed..e0fc8b3bc4 100644
--- a/public/main/inc/lib/tracking.lib.php
+++ b/public/main/inc/lib/tracking.lib.php
@@ -6272,15 +6272,13 @@ class Tracking
     public static function setUserSearchForm($form)
     {
         $form->addElement('text', 'keyword', get_lang('Keyword'));
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'active',
             get_lang('Status'),
             [1 => get_lang('active'), 0 => get_lang('inactive')]
         );
 
-        $form->addElement(
-            'select',
+        $form->addSelect(
             'sleeping_days',
             get_lang('Inactive days'),
             [
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
index 72562ab0ab..851af1f5b9 100644
--- a/public/main/lp/learnpath.class.php
+++ b/public/main/lp/learnpath.class.php
@@ -8496,7 +8496,7 @@ class learnpath
         if (!empty($itemList['thread'])) {
             $threadList = [];
             $em = Database::getManager();
-            $repo = $em->getRepository('ChamiloCourseBundle:CForumThread');
+            $repo = Container::getForumThreadRepository();
             foreach ($itemList['thread'] as $threadId) {
                 /** @var CForumThread $thread */
                 $thread = $repo->find($threadId);
diff --git a/public/main/lp/lp_add_audio.php b/public/main/lp/lp_add_audio.php
index 39c4c88734..32b3210bcd 100644
--- a/public/main/lp/lp_add_audio.php
+++ b/public/main/lp/lp_add_audio.php
@@ -136,7 +136,7 @@ $tpl->assign('filename', $lp_item->get_title().'_nano.wav');
 $tpl->assign('enable_record_audio', 'true' === api_get_setting('enable_record_audio'));
 $tpl->assign('cur_dir_path', '/audio');
 $tpl->assign('lp_item_id', $lp_item_id);
-$tpl->assign('lp_dir', api_remove_trailing_slash($lpPathInfo['dir']));
+//$tpl->assign('lp_dir', api_remove_trailing_slash($lpPathInfo['dir']));
 $recordVoiceForm .= $tpl->fetch('@ChamiloCore/LearnPath/record_voice.html.twig');
 $form->addElement('header', '<small class="text-muted">'.get_lang('Or').'</small> '.get_lang('AudioFile'));
 
diff --git a/public/main/lp/lp_edit_item_prereq.php b/public/main/lp/lp_edit_item_prereq.php
index e3535836ae..ec99f31363 100644
--- a/public/main/lp/lp_edit_item_prereq.php
+++ b/public/main/lp/lp_edit_item_prereq.php
@@ -21,7 +21,7 @@ $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
 $isStudentView = isset($_REQUEST['isStudentView']) ? (int) $_REQUEST['isStudentView'] : null;
 $learnpath_id = isset($_REQUEST['lp_id']) ? (int) $_REQUEST['lp_id'] : null;
-$submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
+$submit = $_POST['submit_button'] ?? null;
 
 /* MAIN CODE */
 if (!$is_allowed_to_edit || $isStudentView) {
diff --git a/public/main/lp/lp_final_item.php b/public/main/lp/lp_final_item.php
index 735567553a..168c66d307 100644
--- a/public/main/lp/lp_final_item.php
+++ b/public/main/lp/lp_final_item.php
@@ -230,7 +230,7 @@ function generateLPFinalItemTemplate(
 function generateLPFinalItemTemplateBadgeLinks($userId, $courseId, $sessionId = 0)
 {
     $em = Database::getManager();
-    $skillRelUser = new SkillRelUser();
+    $skillRelUser = new SkillRelUserModel();
     $userSkills = $skillRelUser->getUserSkills($userId, $courseId, $sessionId);
     $skillList = '';
     $badgeLink = '';
diff --git a/public/main/lp/lp_list_search.php b/public/main/lp/lp_list_search.php
index 9b100e75e8..f2d5e65aa0 100644
--- a/public/main/lp/lp_list_search.php
+++ b/public/main/lp/lp_list_search.php
@@ -111,8 +111,8 @@ if (count($term_array)) {
 }
 
 if ($query) {
-    list($count, $results) = chamilo_query_query(
-        api_convert_encoding($query, 'UTF-8', $charset),
+    [$count, $results] = chamilo_query_query(
+        $query,
         0,
         1000,
         $fixed_queries
diff --git a/public/main/lp/lp_view.php b/public/main/lp/lp_view.php
index 098f78885d..90a222e041 100644
--- a/public/main/lp/lp_view.php
+++ b/public/main/lp/lp_view.php
@@ -333,7 +333,7 @@ $lp_theme_css = $lp->getTheme();
 
 // Setting up the CSS theme if exists.
 if (!empty($lp_theme_css) && !empty($mycourselptheme) && -1 != $mycourselptheme && 1 == $mycourselptheme) {
-    global $lp_theme_css;
+    //global $lp_theme_css;
 } else {
     $lp_theme_css = $my_style;
 }
@@ -364,7 +364,7 @@ if (Database::num_rows($res_media) > 0) {
 
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true, true, false);
 
-global $interbreadcrumb;
+//global $interbreadcrumb;
 if ($is_allowed_to_edit) {
     $interbreadcrumb[] = [
         'url' => api_get_self().'?action=list&isStudentView=false&'.api_get_cidreq(true, true, 'course'),
diff --git a/public/main/mySpace/access_details.php b/public/main/mySpace/access_details.php
index 74d5be316d..889c22c3e7 100644
--- a/public/main/mySpace/access_details.php
+++ b/public/main/mySpace/access_details.php
@@ -46,8 +46,7 @@ $form = new FormValidator(
 );
 $form->addElement('text', 'from', get_lang('From'), ['id' => 'date_from']);
 $form->addElement('text', 'to', get_lang('Until'), ['id' => 'date_to']);
-$form->addElement(
-    'select',
+$form->addSelect(
     'type',
     get_lang('Type'),
     ['day' => get_lang('Day'), 'month' => get_lang('Month')],
diff --git a/public/main/mySpace/users.php b/public/main/mySpace/users.php
index a535eadcb9..3c709e679a 100644
--- a/public/main/mySpace/users.php
+++ b/public/main/mySpace/users.php
@@ -334,8 +334,7 @@ $form = new FormValidator(
     'get',
     $webCodePath.'mySpace/users.php'
 );
-$form->addElement(
-    'select',
+$form->addSelect(
     'status',
     get_lang('Status'),
     [
diff --git a/public/main/survey/survey.php b/public/main/survey/survey.php
index bc4284ebd9..e25b9c89c7 100644
--- a/public/main/survey/survey.php
+++ b/public/main/survey/survey.php
@@ -370,10 +370,10 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
     echo '	</td>';
     $question_counter++;
 
-    if ($is_survey_type_1) {
+    /*if ($is_survey_type_1) {
         echo '<td>'.((0 == $row['survey_group_pri']) ? get_lang('Secondary') : get_lang('Primary')).'</td>';
         echo '<td>'.((0 == $row['survey_group_pri']) ? $groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']] : $groups[$row['survey_group_pri']]).'</td>';
-    }
+    }*/
     echo '</tr>';
 }
 
diff --git a/public/main/ticket/new_ticket.php b/public/main/ticket/new_ticket.php
index 5ef61c11c7..f5e6d761e8 100644
--- a/public/main/ticket/new_ticket.php
+++ b/public/main/ticket/new_ticket.php
@@ -317,16 +317,14 @@ $form->addLabel(
     )
 );
 
-$form->addElement(
-    'select',
+$form->addSelect(
     'status_id',
     get_lang('Status'),
     $statusList,
     $statusAttributes
 );
 
-$form->addElement(
-    'select',
+$form->addSelect(
     'priority_id',
     get_lang('Priority'),
     $priorityList,
@@ -336,8 +334,7 @@ $form->addElement(
     ]
 );
 
-$form->addElement(
-    'select',
+$form->addSelect(
     'source_id',
     get_lang('Source'),
     $sourceList,
diff --git a/public/main/tracking/lp_results_by_user.php b/public/main/tracking/lp_results_by_user.php
index 4d58ae5e8b..789b83a442 100644
--- a/public/main/tracking/lp_results_by_user.php
+++ b/public/main/tracking/lp_results_by_user.php
@@ -47,8 +47,7 @@ foreach ($course_list as $data) {
 }
 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
-$form->addElement(
-    'select',
+$form->addSelect(
     'course_code',
     get_lang('Course'),
     $new_course_select
diff --git a/public/main/tracking/question_course_report.php b/public/main/tracking/question_course_report.php
index 9af5bea6fa..c7f96d9401 100644
--- a/public/main/tracking/question_course_report.php
+++ b/public/main/tracking/question_course_report.php
@@ -59,15 +59,13 @@ foreach ($session_list as $sesion_item) {
 }
 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
-$form->addElement(
-    'select',
+$form->addSelect(
     'session_id',
     get_lang('Course sessions'),
     $my_session_list,
     ['id' => 'session_id', 'onchange' => 'load_courses();']
 );
-$form->addElement(
-    'select',
+$form->addSelect(
     'course_code',
     get_lang('Courses'),
     $course_select_list
diff --git a/public/plugin/buycourses/src/buycourses.ajax.php b/public/plugin/buycourses/src/buycourses.ajax.php
index 6555bf5b76..51e6e89156 100644
--- a/public/plugin/buycourses/src/buycourses.ajax.php
+++ b/public/plugin/buycourses/src/buycourses.ajax.php
@@ -472,8 +472,7 @@ switch ($action) {
             } else {
                 if (BuyCoursesPlugin::SERVICE_TYPE_SESSION == $nodeType) {
                     $nodeType = get_lang('Session');
-                    /** @var Session $session */
-                    $session = $em->find('ChamiloCoreBundle:Session', $serviceSale['node_id']);
+                    $session = api_get_session_entity($serviceSale['node_id']);
                     $nodeName = $session ? $session->getName() : null;
                 } else {
                     if (BuyCoursesPlugin::SERVICE_TYPE_LP_FINAL_ITEM == $nodeType) {
diff --git a/public/plugin/customcertificate/src/index.php b/public/plugin/customcertificate/src/index.php
index 8b772c2c4a..f866bbfb30 100644
--- a/public/plugin/customcertificate/src/index.php
+++ b/public/plugin/customcertificate/src/index.php
@@ -897,15 +897,13 @@ while ($i < 298) {
     $marginOptions[$i] = $i.' mm';
     $i++;
 }
-$form->addElement(
-    'select',
+$form->addSelect(
     'margin_left',
     get_lang('MarginLeft'),
     $marginOptions,
     ['cols-size' => [4, 8, 0]]
 );
-$form->addElement(
-    'select',
+$form->addSelect(
     'margin_right',
     get_lang('MarginRight'),
     $marginOptions,