Adding more info when sub/unsub users from a course LOG_USER_OBJECT

main/inc/lib/course.lib.php

@@ -309,6 +309,8 @@ class CourseManager {
         	$session_id = intval($_SESSION['id_session']);
         }
         
+        $user_list = array();
+
         //Cleaning the $user_id variable
         if (is_array($user_id)) {
             $new_user_id_list = array();
@@ -316,9 +318,11 @@ class CourseManager {
                 $new_user_id_list[]= intval($my_user_id);
             }
             $new_user_id_list = array_filter($new_user_id_list);
+            $user_list = $new_user_id_list;
             $user_ids = implode(',', $new_user_id_list);
         } else {
             $user_ids = intval($user_id);
+            $user_list[] = $user_id;
         }
 
         
@@ -392,6 +396,11 @@ class CourseManager {
             // add event to system log            
             $user_id = api_get_user_id();
             event_system(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), $user_id);
+            
+            foreach ($user_list as $user_id_to_delete) {
+                $user_info = api_get_user_info($user_id_to_delete);
+                event_system(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id);
+            }
         }
     }
 
@@ -490,8 +499,10 @@ class CourseManager {
                         sort        = '". ($course_sort)."'");
 
             // Add event to the system log                        
-            $user_id = api_get_user_id();
+            event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), api_get_user_id());
-            event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), $user_id);
+            
+            $user_info = api_get_user_info($user_id);
+            event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), api_get_user_id());
         }
         return (bool)$result;
     }

main/inc/lib/main_api.lib.php

@@ -123,22 +123,22 @@ define('PLATFORM_AUTH_SOURCE', 'platform');
 define('DIR_HOTPOTATOES','/HotPotatoes_files');
 
 // event logs types
-define('LOG_COURSE_DELETE', 				'course_deleted');
+define('LOG_COURSE_DELETE',                     'course_deleted');
-define('LOG_COURSE_CREATE', 				'course_created');
+define('LOG_COURSE_CREATE',                     'course_created');
-define('LOG_USER_DELETE', 					'user_deleted');
+define('LOG_USER_DELETE',                       'user_deleted');
-define('LOG_USER_CREATE', 					'user_created');
+define('LOG_USER_CREATE',                       'user_created');
-define('LOG_SESSION_CREATE', 				'session_created');
+define('LOG_SESSION_CREATE',                    'session_created');
-define('LOG_SESSION_DELETE', 				'session_deleted');
+define('LOG_SESSION_DELETE',                    'session_deleted');
-define('LOG_SESSION_CATEGORY_CREATE', 		'session_category_created');
+define('LOG_SESSION_CATEGORY_CREATE',           'session_category_created');
-define('LOG_SESSION_CATEGORY_DELETE', 		'session_category_deleted');
+define('LOG_SESSION_CATEGORY_DELETE',           'session_category_deleted');
-define('LOG_CONFIGURATION_SETTINGS_CHANGE', 'settings_changed');
+define('LOG_CONFIGURATION_SETTINGS_CHANGE',     'settings_changed');
-define('LOG_SUBSCRIBE_USER_TO_COURSE', 		'user_subscribed');
+define('LOG_SUBSCRIBE_USER_TO_COURSE',          'user_subscribed');
-define('LOG_UNSUBSCRIBE_USER_FROM_COURSE', 	'user_unsubscribed');
+define('LOG_UNSUBSCRIBE_USER_FROM_COURSE',      'user_unsubscribed');
-
+
-define('LOG_PROMOTION_CREATE', 	'promotion_created');
+define('LOG_PROMOTION_CREATE',                  'promotion_created');
-define('LOG_PROMOTION_DELETE', 	'promotion_deleted');
+define('LOG_PROMOTION_DELETE',                  'promotion_deleted');
-define('LOG_CAREER_CREATE', 	'career_created');
+define('LOG_CAREER_CREATE',                     'career_created');
-define('LOG_CAREER_DELETE', 	'career_deleted');
+define('LOG_CAREER_DELETE',                     'career_deleted');
 
 // event logs data types
 define('LOG_COURSE_CODE',                       'course_code');

main/inc/lib/usermanager.lib.php

@@ -303,15 +303,7 @@ class UserManager {
 		// Add event to system log		
 		$user_id_manager = api_get_user_id();
 		event_system(LOG_USER_DELETE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager, null, $user_info);
-        
+        event_system(LOG_USER_DELETE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id_manager, null, $user_info);
-        unset($user_info['password']);
-        unset($user_info['complete_name']);
-        unset($user_info['firstName']);
-        unset($user_info['lastName']);
-        unset($user_info['lastLogin']);
-        unset($user_info['avatar']);
-        unset($user_info['avatar_small']);        
-        event_system(LOG_USER_DELETE, LOG_USER_OBJECT, serialize($user_info), api_get_utc_datetime(), $user_id_manager, null, $user_info);
 		return true;
 	}