Add logs when deleting work folder and files

main/inc/lib/api.lib.php

@@ -248,6 +248,10 @@ define('LOG_EXERCISE_AND_USER_ID', 'exercise_and_user_id');
 define('LOG_LP_ID', 'lp_id');
 define('LOG_EXERCISE_ATTEMPT_QUESTION_ID', 'exercise_a_q_id');
 
+define('LOG_WORK_DIR_DELETE', 'work_dir_delete');
+define('LOG_WORK_FILE_DELETE', 'work_file_delete');
+define('LOG_WORK_DATA', 'work_data_array');
+
 define('LOG_MY_FOLDER_PATH', 'path');
 define('LOG_MY_FOLDER_NEW_PATH', 'new_path');
 

main/inc/lib/events.lib.php

@@ -701,6 +701,11 @@ class Event
                 $event_value = serialize($event_value);
             }
         }
+        // If event is an array then the $event_value_type should finish with
+        // the suffix _array for example LOG_WORK_DATA = work_data_array
+        if (is_array($event_value)) {
+            $event_value = serialize($event_value);
+        }
 
         $event_value = Database::escape_string($event_value);
         $sessionId = empty($sessionId) ? api_get_session_id() : intval($sessionId);

main/inc/lib/statistics.lib.php

@@ -249,7 +249,7 @@ class Statistics
                     WHERE
                         track_default.default_user_id = user.user_id AND
                         url.user_id = user.user_id AND
-                        access_url_id='".$current_url_id."'";
+                        access_url_id= $current_url_id ";
         } else {
             $sql = "SELECT
                    default_event_type  as col0,
@@ -282,7 +282,6 @@ class Statistics
         $res = Database::query($sql);
         $activities = array ();
         while ($row = Database::fetch_row($res)) {
-
             if (strpos($row[1], '_object') === false && strpos($row[1], '_array') === false) {
                 $row[2] = $row[2];
             } else {

main/work/work.lib.php

@@ -802,6 +802,20 @@ function deleteDirWork($id)
                     WHERE c_id = $course_id AND publication_id = $id";
             Database::query($sql);
 
+            Event::addEvent(
+                LOG_WORK_DIR_DELETE,
+                LOG_WORK_DATA,
+                [
+                    'id' => $work_data['id'],
+                    'url' => $work_data['url'],
+                    'title' => $work_data['title']
+                ],
+                null,
+                api_get_user_id(),
+                api_get_course_int_id(),
+                api_get_session_id()
+            );
+
             $link_info = GradebookUtils::isResourceInCourseGradebook(
                 api_get_course_id(),
                 3,
@@ -4123,6 +4137,21 @@ function deleteWorkItem($item_id, $courseInfo)
                 'DocumentDeleted',
                 api_get_user_id()
             );
+
+            Event::addEvent(
+                LOG_WORK_FILE_DELETE,
+                LOG_WORK_DATA,
+                [
+                    'id' => $work_data['id'],
+                    'url' => $work_data['url'],
+                    'title' => $work_data['title']
+                ],
+                null,
+                api_get_user_id(),
+                api_get_course_int_id(),
+                api_get_session_id()
+            );
+
             $work = $row['url'];
 
             if ($row['contains_file'] == 1) {