Minor - Format code, fix typo

pull/2970/head
Julio Montoya 6 years ago
parent f826d556b9
commit 8bac80a567
  1. 2
      main/inc/lib/events.lib.php
  2. 10
      main/inc/lib/tracking.lib.php
  3. 2
      main/lp/learnpath.class.php
  4. 2
      main/lp/learnpathItem.class.php
  5. 2
      main/lp/lp_ajax_switch_item.php
  6. 2
      main/lp/lp_edit.php
  7. 2
      main/lp/lp_list.php
  8. 2
      main/lp/lp_view.php
  9. 3
      main/messages/inbox.php
  10. 3
      main/messages/outbox.php
  11. 2
      main/messages/view_message.php
  12. 2
      main/mySpace/myStudents.php

@ -2356,7 +2356,7 @@ class Event
*/ */
public static function registerLog($logInfo) 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; return false;
} }

@ -288,7 +288,7 @@ class Tracking
$chapterTypes = learnpath::getChapterTypes(); $chapterTypes = learnpath::getChapterTypes();
$accessToPdfExport = api_is_allowed_to_edit(false, false, true); $accessToPdfExport = api_is_allowed_to_edit(false, false, true);
$minimunAvailable = self::minimunTimeAvailable($session_id, $course_id); $minimunAvailable = self::minimumTimeAvailable($session_id, $course_id);
$timeCourse = []; $timeCourse = [];
if ($minimunAvailable) { if ($minimunAvailable) {
$timeCourse = self::getCalculateTime($user_id, $course_id, $session_id); $timeCourse = self::getCalculateTime($user_id, $course_id, $session_id);
@ -1679,7 +1679,7 @@ class Tracking
* *
* @return bool * @return bool
*/ */
public static function minimunTimeAvailable($sessionId, $courseId) public static function minimumTimeAvailable($sessionId, $courseId)
{ {
if (!api_get_configuration_value('lp_minimum_time')) { if (!api_get_configuration_value('lp_minimum_time')) {
return false; return false;
@ -1725,7 +1725,7 @@ class Tracking
return 0; return 0;
} }
if (self::minimunTimeAvailable($session_id, $courseId)) { if (self::minimumTimeAvailable($session_id, $courseId)) {
$courseTime = self::getCalculateTime($user_id, $courseId, $session_id); $courseTime = self::getCalculateTime($user_id, $courseId, $session_id);
$time = isset($courseTime['total_time']) ? $courseTime['total_time'] : 0; $time = isset($courseTime['total_time']) ? $courseTime['total_time'] : 0;
@ -1902,7 +1902,7 @@ class Tracking
$courseId = (int) $courseId; $courseId = (int) $courseId;
$session_id = (int) $session_id; $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); $tbl_track_e_access = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
$sql = 'SELECT access_date $sql = 'SELECT access_date
FROM '.$tbl_track_e_access.' FROM '.$tbl_track_e_access.'
@ -1974,7 +1974,7 @@ class Tracking
$session_id = (int) $session_id; $session_id = (int) $session_id;
$courseId = $courseInfo['real_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 // Show the last date on which the user acceed the session when it was active
$where_condition = ''; $where_condition = '';
$userInfo = api_get_user_info($student_id); $userInfo = api_get_user_info($student_id);

@ -2423,7 +2423,7 @@ class learnpath
$isBlocked = true; $isBlocked = true;
} }
if (Tracking::minimunTimeAvailable($sessionId, $courseId)) { if (Tracking::minimumTimeAvailable($sessionId, $courseId)) {
// Block if it does not exceed minimum time // Block if it does not exceed minimum time
// Minimum time (in minutes) to pass the learning path // Minimum time (in minutes) to pass the learning path
$accumulateWorkTime = self::getAccumulateWorkTimePrerequisite($prerequisite, $courseId); $accumulateWorkTime = self::getAccumulateWorkTimePrerequisite($prerequisite, $courseId);

@ -1786,7 +1786,7 @@ class learnpathItem
$sessionLifetime = 3600; $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 $fixedAddedMinute = 5 * 60; // Add only 5 minutes
if ($time > $sessionLifetime) { if ($time > $sessionLifetime) {
error_log("fixAbusiveTime: Total time is too big: $time replaced with: $fixedAddedMinute"); error_log("fixAbusiveTime: Total time is too big: $time replaced with: $fixedAddedMinute");

@ -218,7 +218,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
"olms.asset_timer = 0;"; "olms.asset_timer = 0;";
$updateMinTime = ''; $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(); $timeLp = $mylp->getAccumulateWorkTime();
$timeTotalCourse = $mylp->getAccumulateWorkTimeTotalCourse(); $timeTotalCourse = $mylp->getAccumulateWorkTimeTotalCourse();
// Minimum connection percentage // Minimum connection percentage

@ -159,7 +159,7 @@ $form->addElement('html', '</div>');
$form->addElement('html', '<div class="col-md-2"></div>'); $form->addElement('html', '<div class="col-md-2"></div>');
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');
// Time Control // 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(); $accumulateTime = $_SESSION['oLP']->getAccumulateWorkTime();
$form->addText('accumulate_work_time', [get_lang('LpMinTime'), get_lang('LpMinTimeDescription')]); $form->addText('accumulate_work_time', [get_lang('LpMinTime'), get_lang('LpMinTimeDescription')]);
$defaults['accumulate_work_time'] = $accumulateTime; $defaults['accumulate_work_time'] = $accumulateTime;

@ -151,7 +151,7 @@ if ($filteredCategoryId) {
$test_mode = api_get_setting('server_type'); $test_mode = api_get_setting('server_type');
$showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked'); $showBlockedPrerequisite = api_get_configuration_value('show_prerequisite_as_blocked');
$allowLpChamiloExport = api_get_configuration_value('allow_lp_chamilo_export'); $allowLpChamiloExport = api_get_configuration_value('allow_lp_chamilo_export');
$allowMinTime = Tracking::minimunTimeAvailable($sessionId, $courseId); $allowMinTime = Tracking::minimumTimeAvailable($sessionId, $courseId);
$accumulateWorkTimeTotal = 0; $accumulateWorkTimeTotal = 0;
if ($allowMinTime) { if ($allowMinTime) {
$accumulateWorkTimeTotal = learnpath::getAccumulateWorkTimeTotal($courseId); $accumulateWorkTimeTotal = learnpath::getAccumulateWorkTimeTotal($courseId);

@ -554,7 +554,7 @@ if ($gamificationMode == 1) {
$template->assign('lp_author', $lp->get_author()); $template->assign('lp_author', $lp->get_author());
$lpMinTime = ''; $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 // Calulate minimum and accumulated time
$timeLp = $_SESSION['oLP']->getAccumulateWorkTime(); $timeLp = $_SESSION['oLP']->getAccumulateWorkTime();
$timeTotalCourse = $_SESSION['oLP']->getAccumulateWorkTimeTotalCourse(); $timeTotalCourse = $_SESSION['oLP']->getAccumulateWorkTimeTotalCourse();

@ -16,10 +16,7 @@ if (api_get_setting('allow_message_tool') != 'true') {
$logInfo = [ $logInfo = [
'tool' => 'Messages', 'tool' => 'Messages',
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => isset($_GET['action']) ? $_GET['action'] : 'inbox', 'action' => isset($_GET['action']) ? $_GET['action'] : 'inbox',
'action_details' => '',
]; ];
Event::registerLog($logInfo); Event::registerLog($logInfo);

@ -15,10 +15,7 @@ if (api_get_setting('allow_message_tool') != 'true') {
$logInfo = [ $logInfo = [
'tool' => 'Messages', 'tool' => 'Messages',
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => isset($_GET['action']) ? $_GET['action'] : 'outbox', 'action' => isset($_GET['action']) ? $_GET['action'] : 'outbox',
'action_details' => '',
]; ];
Event::registerLog($logInfo); Event::registerLog($logInfo);

@ -49,8 +49,6 @@ $message = '';
$logInfo = [ $logInfo = [
'tool' => 'Messages', 'tool' => 'Messages',
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => $source, 'action' => $source,
'action_details' => 'view-message', 'action_details' => 'view-message',
]; ];

@ -1337,7 +1337,7 @@ if (empty($details)) {
]; ];
$timeCourse = null; $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); $timeCourse = Tracking::getCalculateTime($student_id, $courseInfo['real_id'], $sessionId);
} }

Loading…
Cancel
Save