From 9d40a6c5bf090ec85b1a6d676d2ea4b4fb9e9b99 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Sun, 20 Jun 2021 10:52:37 +0200 Subject: [PATCH] Fix PHP errors --- .codeclimate.yml | 1 - .scrutinizer.yml | 5 ----- public/main/inc/lib/agenda.lib.php | 6 +++--- public/main/inc/lib/document.lib.php | 2 +- public/main/inc/lib/myspace.lib.php | 11 +++++------ public/main/lp/scorm.class.php | 5 ++--- public/main/survey/create_new_survey.php | 5 ++--- src/CourseBundle/Component/CourseCopy/Course.php | 4 ++-- 8 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 60c781bef5..83a60d0e3a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -76,7 +76,6 @@ exclude_patterns: - public/main/fonts/ - public/main/inc/ajax/Wami.swf - public/main/inc/lib/browser/ - - public/main/inc/lib/internationalization_database/ - public/main/inc/lib/javascript/ - public/main/inc/lib/kses-0.2.2/ - public/main/inc/lib/mimetex/ diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 52b71c7440..a85d69353f 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -24,10 +24,6 @@ filter: - 'public/main/admin/db.php' - 'public/main/admin/ldap_synchro.php' - 'public/main/chat/emoji_strategy.php' - - 'public/main/document/Wami.swf' - - 'public/main/fonts/*' - - 'public/main/inc/ajax/Wami.swf' - - 'public/main/inc/lib/internationalization_database/*' - 'public/main/inc/lib/javascript/*' - 'public/main/inc/lib/kses-0.2.2/*' - 'public/main/inc/lib/mimetex/*' @@ -38,7 +34,6 @@ filter: - 'public/main/inc/lib/pear/*' - 'public/main/inc/lib/svg-edit/*' - 'public/main/inc/lib/swfobject/*' - - 'public/main/inc/lib/wami-recorder/*' - 'public/main/inc/lib/xajax/*' - 'public/main/lp/packaging/*' - 'public/main/template/*' diff --git a/public/main/inc/lib/agenda.lib.php b/public/main/inc/lib/agenda.lib.php index 158b3a67df..1c5ef7f8fa 100644 --- a/public/main/inc/lib/agenda.lib.php +++ b/public/main/inc/lib/agenda.lib.php @@ -1899,13 +1899,13 @@ class Agenda } } - $sendToGroups = isset($sendTo['groups']) ? $sendTo['groups'] : []; - $sendToUsers = isset($sendTo['users']) ? $sendTo['users'] : []; + $sendToGroups = $sendTo['groups'] ?? []; + $sendToUsers = $sendTo['users'] ?? []; $select = $form->addSelect( 'users_to_send', get_lang('To'), - null, + [], $params ); diff --git a/public/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php index 789fb9e5c9..54820cbf8f 100644 --- a/public/main/inc/lib/document.lib.php +++ b/public/main/inc/lib/document.lib.php @@ -4591,7 +4591,7 @@ class DocumentManager $parent_select = $form->addSelect( $selectName, get_lang('Current folder'), - '', + [], $attributes ); diff --git a/public/main/inc/lib/myspace.lib.php b/public/main/inc/lib/myspace.lib.php index 85b2c4b6d2..fd5317df58 100644 --- a/public/main/inc/lib/myspace.lib.php +++ b/public/main/inc/lib/myspace.lib.php @@ -354,7 +354,7 @@ class MySpace 'student_exercises' => $resultToString, 'questions_answered' => $exercisesResults['questions_answered'], 'last_connection' => Tracking::get_last_connection_date_on_the_course( - $user_id, + $userId, ['real_id' => $courseId] ), ]; @@ -653,7 +653,7 @@ class MySpace } if (3 != $tracking_column) { - if ('DESC' == $tracking_direction) { + if ('DESC' === $tracking_direction) { usort($all_datas, ['MySpace', 'rsort_users']); } else { usort($all_datas, ['MySpace', 'sort_users']); @@ -1426,7 +1426,7 @@ class MySpace $csv_row[] = $studenRegister; $facturar = ($studenRegister * $price); $csv_row[] = $facturar; - $totalSudent += $studenRegister; + $totalStudent += $studenRegister; if (0 != $studenRegister) { $studentsName = ''; for ($i = 0; $i < $studenRegister; $i++) { @@ -1782,10 +1782,9 @@ class MySpace null, false ); + if (false != $last_login_date_tmp && false == $last_login_date) { - // TODO: To be cleaned. $last_login_date = $last_login_date_tmp; - } elseif (false != $last_login_date_tmp && false == $last_login_date) { // TODO: Repeated previous condition. To be cleaned. // Find the max and assign it to first_login_date if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { @@ -2035,7 +2034,7 @@ class MySpace } } - $exercise_results_tmp = self::exercises_results($row_user->user_id, $row->code, $session_id); + $exercise_results_tmp = self::exercises_results($row_user->user_id, $courseCode, $session_id); $total_score_obtained += $exercise_results_tmp['score_obtained']; $total_score_possible += $exercise_results_tmp['score_possible']; $total_questions_answered += $exercise_results_tmp['questions_answered']; diff --git a/public/main/lp/scorm.class.php b/public/main/lp/scorm.class.php index f89cb8aa3d..782b059a09 100644 --- a/public/main/lp/scorm.class.php +++ b/public/main/lp/scorm.class.php @@ -976,13 +976,12 @@ class scorm extends learnpath return 'UTF-8'; } + $declared_encoding = ''; if (preg_match(_PCRE_XML_ENCODING, $xml, $matches)) { $declared_encoding = api_refine_encoding_id($matches[1]); - } else { - $declared_encoding = ''; } - if (!empty($declared_encoding) && !api_is_utf8($declared_encoding)) { + if (!empty($declared_encoding)) { return $declared_encoding; } diff --git a/public/main/survey/create_new_survey.php b/public/main/survey/create_new_survey.php index afad5206c5..2ede9dc034 100644 --- a/public/main/survey/create_new_survey.php +++ b/public/main/survey/create_new_survey.php @@ -264,12 +264,11 @@ $input_name_list = null; if ('edit' === $action && !empty($survey_id)) { if (0 == $survey_data['anonymous']) { - $form->addElement( - 'checkbox', + $form->addCheckBox( 'show_form_profile', null, get_lang('Show profile form'), - 'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"' + ['onclick' => "javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"] ); if (1 == $survey_data['show_form_profile']) { diff --git a/src/CourseBundle/Component/CourseCopy/Course.php b/src/CourseBundle/Component/CourseCopy/Course.php index 60fad0766e..01754a9392 100644 --- a/src/CourseBundle/Component/CourseCopy/Course.php +++ b/src/CourseBundle/Component/CourseCopy/Course.php @@ -205,9 +205,9 @@ class Course */ public function to_system_encoding() { - if (api_equal_encodings($this->encoding, api_get_system_encoding())) { + /*if (api_equal_encodings($this->encoding, api_get_system_encoding())) { return; - } + }*/ foreach ($this->resources as $type => &$resources) { if (count($resources) > 0) {