From 8bac80a5672a075909a984879980ff33ec917b98 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 30 Jul 2019 10:40:19 +0200 Subject: [PATCH] Minor - Format code, fix typo --- main/inc/lib/events.lib.php | 2 +- main/inc/lib/tracking.lib.php | 10 +++++----- main/lp/learnpath.class.php | 2 +- main/lp/learnpathItem.class.php | 2 +- main/lp/lp_ajax_switch_item.php | 2 +- main/lp/lp_edit.php | 2 +- main/lp/lp_list.php | 2 +- main/lp/lp_view.php | 2 +- main/messages/inbox.php | 3 --- main/messages/outbox.php | 3 --- main/messages/view_message.php | 2 -- main/mySpace/myStudents.php | 2 +- 12 files changed, 13 insertions(+), 21 deletions(-) diff --git a/main/inc/lib/events.lib.php b/main/inc/lib/events.lib.php index abd7559629..bd3e20a136 100644 --- a/main/inc/lib/events.lib.php +++ b/main/inc/lib/events.lib.php @@ -2356,7 +2356,7 @@ class Event */ public static function registerLog($logInfo) { - if (!Tracking::minimunTimeAvailable(api_get_session_id(), api_get_course_int_id())) { + if (!Tracking::minimumTimeAvailable(api_get_session_id(), api_get_course_int_id())) { return false; } diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 2cfb242438..d9f95eb814 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -288,7 +288,7 @@ class Tracking $chapterTypes = learnpath::getChapterTypes(); $accessToPdfExport = api_is_allowed_to_edit(false, false, true); - $minimunAvailable = self::minimunTimeAvailable($session_id, $course_id); + $minimunAvailable = self::minimumTimeAvailable($session_id, $course_id); $timeCourse = []; if ($minimunAvailable) { $timeCourse = self::getCalculateTime($user_id, $course_id, $session_id); @@ -1679,7 +1679,7 @@ class Tracking * * @return bool */ - public static function minimunTimeAvailable($sessionId, $courseId) + public static function minimumTimeAvailable($sessionId, $courseId) { if (!api_get_configuration_value('lp_minimum_time')) { return false; @@ -1725,7 +1725,7 @@ class Tracking return 0; } - if (self::minimunTimeAvailable($session_id, $courseId)) { + if (self::minimumTimeAvailable($session_id, $courseId)) { $courseTime = self::getCalculateTime($user_id, $courseId, $session_id); $time = isset($courseTime['total_time']) ? $courseTime['total_time'] : 0; @@ -1902,7 +1902,7 @@ class Tracking $courseId = (int) $courseId; $session_id = (int) $session_id; - if (self::minimunTimeAvailable($session_id, $courseId)) { + if (self::minimumTimeAvailable($session_id, $courseId)) { $tbl_track_e_access = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); $sql = 'SELECT access_date FROM '.$tbl_track_e_access.' @@ -1974,7 +1974,7 @@ class Tracking $session_id = (int) $session_id; $courseId = $courseInfo['real_id']; - if (self::minimunTimeAvailable($session_id, $courseId)) { + if (self::minimumTimeAvailable($session_id, $courseId)) { // Show the last date on which the user acceed the session when it was active $where_condition = ''; $userInfo = api_get_user_info($student_id); diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php index 788da3582c..d7190eee91 100755 --- a/main/lp/learnpath.class.php +++ b/main/lp/learnpath.class.php @@ -2423,7 +2423,7 @@ class learnpath $isBlocked = true; } - if (Tracking::minimunTimeAvailable($sessionId, $courseId)) { + if (Tracking::minimumTimeAvailable($sessionId, $courseId)) { // Block if it does not exceed minimum time // Minimum time (in minutes) to pass the learning path $accumulateWorkTime = self::getAccumulateWorkTimePrerequisite($prerequisite, $courseId); diff --git a/main/lp/learnpathItem.class.php b/main/lp/learnpathItem.class.php index 4422ef83de..80915d9db3 100755 --- a/main/lp/learnpathItem.class.php +++ b/main/lp/learnpathItem.class.php @@ -1786,7 +1786,7 @@ class learnpathItem $sessionLifetime = 3600; } - if (!Tracking::minimunTimeAvailable(api_get_session_id(), api_get_course_int_id())) { + if (!Tracking::minimumTimeAvailable(api_get_session_id(), api_get_course_int_id())) { $fixedAddedMinute = 5 * 60; // Add only 5 minutes if ($time > $sessionLifetime) { error_log("fixAbusiveTime: Total time is too big: $time replaced with: $fixedAddedMinute"); diff --git a/main/lp/lp_ajax_switch_item.php b/main/lp/lp_ajax_switch_item.php index 4ac07d7143..828b5b1bca 100755 --- a/main/lp/lp_ajax_switch_item.php +++ b/main/lp/lp_ajax_switch_item.php @@ -218,7 +218,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it "olms.asset_timer = 0;"; $updateMinTime = ''; - if (Tracking::minimunTimeAvailable(api_get_session_id(), api_get_course_int_id())) { + if (Tracking::minimumTimeAvailable(api_get_session_id(), api_get_course_int_id())) { $timeLp = $mylp->getAccumulateWorkTime(); $timeTotalCourse = $mylp->getAccumulateWorkTimeTotalCourse(); // Minimum connection percentage diff --git a/main/lp/lp_edit.php b/main/lp/lp_edit.php index 19a95fcafb..746f63b46e 100755 --- a/main/lp/lp_edit.php +++ b/main/lp/lp_edit.php @@ -159,7 +159,7 @@ $form->addElement('html', ''); $form->addElement('html', '
'); $form->addElement('html', ''); // Time Control -if (Tracking::minimunTimeAvailable(api_get_session_id(), api_get_course_int_id())) { +if (Tracking::minimumTimeAvailable(api_get_session_id(), api_get_course_int_id())) { $accumulateTime = $_SESSION['oLP']->getAccumulateWorkTime(); $form->addText('accumulate_work_time', [get_lang('LpMinTime'), get_lang('LpMinTimeDescription')]); $defaults['accumulate_work_time'] = $accumulateTime; diff --git a/main/lp/lp_list.php b/main/lp/lp_list.php index c0f0f5e291..5990c50ff3 100755 --- a/main/lp/lp_list.php +++ b/main/lp/lp_list.php @@ -151,7 +151,7 @@ if ($filteredCategoryId) { $test_mode = api_get_setting('server_type'); $showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked'); $allowLpChamiloExport = api_get_configuration_value('allow_lp_chamilo_export'); -$allowMinTime = Tracking::minimunTimeAvailable($sessionId, $courseId); +$allowMinTime = Tracking::minimumTimeAvailable($sessionId, $courseId); $accumulateWorkTimeTotal = 0; if ($allowMinTime) { $accumulateWorkTimeTotal = learnpath::getAccumulateWorkTimeTotal($courseId); diff --git a/main/lp/lp_view.php b/main/lp/lp_view.php index 53f2f97aa2..7d1492d5e3 100755 --- a/main/lp/lp_view.php +++ b/main/lp/lp_view.php @@ -554,7 +554,7 @@ if ($gamificationMode == 1) { $template->assign('lp_author', $lp->get_author()); $lpMinTime = ''; -if (Tracking::minimunTimeAvailable(api_get_session_id(), api_get_course_int_id())) { +if (Tracking::minimumTimeAvailable(api_get_session_id(), api_get_course_int_id())) { // Calulate minimum and accumulated time $timeLp = $_SESSION['oLP']->getAccumulateWorkTime(); $timeTotalCourse = $_SESSION['oLP']->getAccumulateWorkTimeTotalCourse(); diff --git a/main/messages/inbox.php b/main/messages/inbox.php index afe50b251c..b44f3a5a92 100755 --- a/main/messages/inbox.php +++ b/main/messages/inbox.php @@ -16,10 +16,7 @@ if (api_get_setting('allow_message_tool') != 'true') { $logInfo = [ 'tool' => 'Messages', - 'tool_id' => 0, - 'tool_id_detail' => 0, 'action' => isset($_GET['action']) ? $_GET['action'] : 'inbox', - 'action_details' => '', ]; Event::registerLog($logInfo); diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 5ac29f2878..6d2f60bb7d 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -15,10 +15,7 @@ if (api_get_setting('allow_message_tool') != 'true') { $logInfo = [ 'tool' => 'Messages', - 'tool_id' => 0, - 'tool_id_detail' => 0, 'action' => isset($_GET['action']) ? $_GET['action'] : 'outbox', - 'action_details' => '', ]; Event::registerLog($logInfo); diff --git a/main/messages/view_message.php b/main/messages/view_message.php index 80737b4cf1..3cf060ed98 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -49,8 +49,6 @@ $message = ''; $logInfo = [ 'tool' => 'Messages', - 'tool_id' => 0, - 'tool_id_detail' => 0, 'action' => $source, 'action_details' => 'view-message', ]; diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 4ec537e126..1e6cb6499e 100755 --- a/main/mySpace/myStudents.php +++ b/main/mySpace/myStudents.php @@ -1337,7 +1337,7 @@ if (empty($details)) { ]; $timeCourse = null; - if (Tracking::minimunTimeAvailable($sessionId, $courseInfo['real_id'])) { + if (Tracking::minimumTimeAvailable($sessionId, $courseInfo['real_id'])) { $timeCourse = Tracking::getCalculateTime($student_id, $courseInfo['real_id'], $sessionId); }