Skip to content

Commit a5f06b8

Browse files
committed
Remove unused userlogCSV.php file, format code.
Remove unused classes TrackingUserLogCSV, TrackingUserLog classes move functions To Tracking.
1 parent 3a53120 commit a5f06b8

File tree

8 files changed

+224
-905
lines changed

8 files changed

+224
-905
lines changed

main/admin/user_information.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
$csvContent[] = array_map('strip_tags', $row);
329329
$data[] = $row;
330330

331-
$result = TrackingUserLogCSV::getToolInformation(
331+
$result = Tracking::getToolInformation(
332332
$userId,
333333
$courseInfo,
334334
$id_session
@@ -435,7 +435,7 @@
435435
$csvContent[] = array_map('strip_tags', $row);
436436
$data[] = $row;
437437

438-
$result = TrackingUserLogCSV::getToolInformation(
438+
$result = Tracking::getToolInformation(
439439
$userId,
440440
$courseInfo,
441441
0

main/inc/lib/exercise.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2141,7 +2141,7 @@ public static function get_exam_results_data(
21412141

21422142
//Admin can always delete the attempt
21432143
if (($locked == false || api_is_platform_admin()) && !api_is_student_boss()) {
2144-
$ip = TrackingUserLog::get_ip_from_user_event(
2144+
$ip = Tracking::get_ip_from_user_event(
21452145
$results[$i]['exe_user_id'],
21462146
api_get_utc_datetime(),
21472147
false

main/inc/lib/myspace.lib.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2689,8 +2689,12 @@ public static function getNumberOfTrackAccessOverview()
26892689
* @param $orderDirection
26902690
* @return array
26912691
*/
2692-
public static function getUserDataAccessTrackingOverview($from, $numberItems, $column, $orderDirection)
2693-
{
2692+
public static function getUserDataAccessTrackingOverview(
2693+
$from,
2694+
$numberItems,
2695+
$column,
2696+
$orderDirection
2697+
) {
26942698
$user = Database::get_main_table(TABLE_MAIN_USER);
26952699
$course = Database::get_main_table(TABLE_MAIN_COURSE);
26962700
$track_e_login = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
@@ -2733,7 +2737,6 @@ public static function getUserDataAccessTrackingOverview($from, $numberItems, $c
27332737
$sql .= " LIMIT $from,$numberItems";
27342738
$result = Database::query($sql);
27352739

2736-
//$clicks = Tracking::get_total_clicks_by_session();
27372740
$data = array();
27382741
while ($user = Database::fetch_assoc($result)) {
27392742
$data[] = $user;

main/inc/lib/statistics.lib.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,11 @@ public static function getActivitiesData($from, $numberOfItems, $column, $direct
333333
array('title' => get_lang('UserInfo'))
334334
);
335335

336-
$row[6] = TrackingUserLog::get_ip_from_user_event($row[6], $row[7], true);
336+
$row[6] = Tracking::get_ip_from_user_event(
337+
$row[6],
338+
$row[7],
339+
true
340+
);
337341
if (empty($row[6])) {
338342
$row[6] = get_lang('Unknown');
339343
}

main/inc/lib/tracking.lib.php

Lines changed: 203 additions & 556 deletions
Large diffs are not rendered by default.

main/mySpace/myStudents.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ function show_image(image,width,height) {
469469
$time_spent_on_the_course = 0;
470470
if (!empty($courseInfo)) {
471471
$time_spent_on_the_course = api_time_to_hms(
472-
Tracking:: get_time_spent_on_the_course(
472+
Tracking::get_time_spent_on_the_course(
473473
$user_info['user_id'],
474474
$courseInfo['real_id'],
475475
$sessionId
@@ -478,12 +478,15 @@ function show_image(image,width,height) {
478478
}
479479

480480
// get information about connections on the platform by student
481-
$first_connection_date = Tracking :: get_first_connection_date($user_info['user_id']);
481+
$first_connection_date = Tracking::get_first_connection_date($user_info['user_id']);
482482
if ($first_connection_date == '') {
483483
$first_connection_date = get_lang('NoConnexion');
484484
}
485485

486-
$last_connection_date = Tracking :: get_last_connection_date($user_info['user_id'], true);
486+
$last_connection_date = Tracking::get_last_connection_date(
487+
$user_info['user_id'],
488+
true
489+
);
487490
if ($last_connection_date == '') {
488491
$last_connection_date = get_lang('NoConnexion');
489492
}

main/tracking/courseLog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function(index) {
194194

195195
foreach ($_GET['additional_profile_field'] as $fieldId) {
196196
// Fetching only the user that are loaded NOT ALL user in the portal.
197-
$userProfileInfo[$fieldId] = TrackingCourseLog::get_addtional_profile_information_of_field_by_user(
197+
$userProfileInfo[$fieldId] = TrackingCourseLog::getAdditionalProfileInformationOfFieldByUser(
198198
$fieldId,
199199
$user_array
200200
);

0 commit comments

Comments
 (0)