chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Event::addEvent() and corresponding calls to use course ID instead of course code ~ refs #7202

Browse Source
1.10.x
Yannick Warnier 11 years ago
parent fb7b9a25d8
commit 7977580a86
11 changed files with 141 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      index.php
  2. 16
      main/admin/configure_homepage.php
  3. 16
      main/admin/settings.lib.php
  4. 2
      main/exercice/exercise.class.php
  5. 16
      main/inc/lib/career.lib.php
  6. 2
      main/inc/lib/course.lib.php
  7. 68
      main/inc/lib/events.lib.inc.php
  8. 24
      main/inc/lib/sessionmanager.lib.php
  9. 6
      main/inc/lib/sub_language.class.php
  10. 30
      main/inc/lib/usermanager.lib.php
  11. 8
      tests/main/inc/lib/events.lib.inc.test.php

8
index.php
Unescape View File

@ -50,7 +50,13 @@ $_setting['display_courses_to_anonymous_users'] = 'true';
*/
if (isset($_GET['submitAuth']) && $_GET['submitAuth'] == 1) {
$i = api_get_anonymous_id();
Event::addEvent(LOG_ATTEMPTED_FORCED_LOGIN, 'tried_hacking_get', $_SERVER['REMOTE_ADDR'].(empty($_POST['login'])?'':'/'.$_POST['login']),null,$i);
Event::addEvent(
LOG_ATTEMPTED_FORCED_LOGIN,
'tried_hacking_get',
$_SERVER['REMOTE_ADDR'].(empty($_POST['login'])?'':'/'.$_POST['login']),
null,
$i
);
echo 'Attempted breakin - sysadmins notified.';
session_destroy();
die();

16
main/admin/configure_homepage.php
Unescape View File

@ -323,7 +323,13 @@ if (!empty($action)) {
fputs($fp, "<b>$notice_title</b><br />\n$notice_text");
fclose($fp);
}
Event::addEvent(LOG_HOMEPAGE_CHANGED, 'edit_notice', cut(strip_tags($notice_title), 254), api_get_utc_datetime(), api_get_user_id());
Event::addEvent(
LOG_HOMEPAGE_CHANGED,
'edit_notice',
cut(strip_tags($notice_title), 254),
api_get_utc_datetime(),
api_get_user_id()
);
break;
case 'edit_news':
//Filter
@ -365,7 +371,13 @@ if (!empty($action)) {
}
}
}
Event::addEvent(LOG_HOMEPAGE_CHANGED, 'edit_news', strip_tags(cut($home_news, 254)), api_get_utc_datetime(), api_get_user_id());
Event::addEvent(
LOG_HOMEPAGE_CHANGED,
'edit_news',
strip_tags(cut($home_news, 254)),
api_get_utc_datetime(),
api_get_user_id()
);
break;
case 'insert_tabs':
case 'edit_tabs':

16
main/admin/settings.lib.php
Unescape View File

@ -765,7 +765,13 @@ function handle_templates() {
// Add event to the system log.
$user_id = api_get_user_id();
$category = $_GET['category'];
Event::addEvent(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
Event::addEvent(
LOG_CONFIGURATION_SETTINGS_CHANGE,
LOG_CONFIGURATION_SETTINGS_CATEGORY,
$category,
api_get_utc_datetime(),
$user_id
);
} else {
if ($action == 'delete' && is_numeric($_GET['id'])) {
delete_template($_GET['id']);
@ -773,7 +779,13 @@ function handle_templates() {
// Add event to the system log
$user_id = api_get_user_id();
$category = $_GET['category'];
Event::addEvent(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
Event::addEvent(
LOG_CONFIGURATION_SETTINGS_CHANGE,
LOG_CONFIGURATION_SETTINGS_CATEGORY,
$category,
api_get_utc_datetime(),
$user_id
);
}
display_templates();
}

2
main/exercice/exercise.class.php
Unescape View File

@ -1621,7 +1621,7 @@ class Exercise
$this->id,
null,
null,
api_get_course_id(),
api_get_course_int_id(),
$session_id
);

16
main/inc/lib/career.lib.php
Unescape View File

@ -213,7 +213,13 @@ class Career extends Model
{
$id = parent::save($params);
if (!empty($id)) {
Event::addEvent(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
Event::addEvent(
LOG_CAREER_CREATE,
LOG_CAREER_ID,
$id,
api_get_utc_datetime(),
api_get_user_id()
);
}
return $id;
@ -226,6 +232,12 @@ class Career extends Model
public function delete($id)
{
parent::delete($id);
Event::addEvent(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
Event::addEvent(
LOG_CAREER_DELETE,
LOG_CAREER_ID,
$id,
api_get_utc_datetime(),
api_get_user_id()
);
}
}

2
main/inc/lib/course.lib.php
Unescape View File

@ -2261,7 +2261,7 @@ class CourseManager
$code,
api_get_utc_datetime(),
$user_id,
$code
$courseId
);
}
}

68
main/inc/lib/events.lib.inc.php
Unescape View File

@ -629,12 +629,14 @@ class Event
/**
* Records information for common (or admin) events (in the track_e_default table)
* @author Yannick Warnier <yannick.warnier@beeznest.com>
* @param string Type of event
* @param string Type of value
* @param string Value
* @param string Timestamp (defaults to null)
* @param integer User ID (defaults to null)
* @param string Course code (defaults to null)
* @param string $event_type Type of event
* @param string $event_value_type Type of value
* @param string $event_value Value
* @param string $datetime Datetime (UTC) (defaults to null)
* @param int $user_id User ID (defaults to null)
* @param int $course_id Course ID (defaults to null)
* @param int $sessionId Session ID
* @return bool
* @assert ('','','') === false
*/
public static function addEvent(
@ -643,7 +645,7 @@ class Event
$event_value,
$datetime = null,
$user_id = null,
$course_code = null,
$course_id = null,
$sessionId = 0
) {
$TABLETRACK_DEFAULT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
@ -653,6 +655,16 @@ class Event
}
$event_type = Database::escape_string($event_type);
$event_value_type = Database::escape_string($event_value_type);
if (empty($course_id)) {
$course_id = intval($course_id);
} else {
$course_id = api_get_course_int_id();
}
if (empty($sessionId)) {
$sessionId = intval($sessionId);
} else {
$sessionId = api_get_session_id();
}
//Clean the user_info
if ($event_value_type == LOG_USER_OBJECT) {
@ -673,16 +685,8 @@ class Event
}
$event_value = Database::escape_string($event_value);
$course_info = api_get_course_info($course_code);
$sessionId = empty($sessionId) ? api_get_session_id() : intval($sessionId);
if (!empty($course_info)) {
$course_id = $course_info['real_id'];
} else {
$course_id = null;
$course_code = null;
}
if (!isset($datetime)) {
$datetime = api_get_utc_datetime();
}
@ -1060,22 +1064,16 @@ class Event
}
if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) {
$sql = "DELETE FROM $track_e_exercises WHERE exe_id IN (" . implode(
',',
$exe_list
) . ")";
$sql = "DELETE FROM $track_e_exercises
WHERE exe_id IN (" . implode(',', $exe_list) . ")";
Database::query($sql);
$sql = "DELETE FROM $track_attempts WHERE exe_id IN (" . implode(
',',
$exe_list
) . ")";
$sql = "DELETE FROM $track_attempts
WHERE exe_id IN (" . implode(',', $exe_list) . ")";
Database::query($sql);
$sql = "DELETE FROM $recording_table WHERE exe_id IN (" . implode(
',',
$exe_list
) . ")";
$sql = "DELETE FROM $recording_table
WHERE exe_id IN (" . implode(',', $exe_list) . ")";
Database::query($sql);
}
@ -1085,7 +1083,7 @@ class Event
$lp_id,
null,
null,
$course['code'],
$course_id,
$session_id
);
}
@ -1120,7 +1118,7 @@ class Event
$exercise_id . '-' . $user_id,
null,
null,
$course_code,
$course_id,
$session_id
);
}
@ -1684,7 +1682,7 @@ class Event
$exe_id . '-' . $question_id,
null,
null,
$courseInfo['code'],
$courseId,
$session_id
);
}
@ -1694,8 +1692,9 @@ class Event
* @param $user_id
* @param int $courseId
* @param $question_id
* @param int $sessionId
*/
public static function delete_attempt_hotspot($exe_id, $user_id, $courseId, $question_id)
public static function delete_attempt_hotspot($exe_id, $user_id, $courseId, $question_id, $sessionId = null)
{
$table_track_attempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
@ -1703,6 +1702,9 @@ class Event
$user_id = intval($user_id);
$courseId = intval($courseId);
$question_id = intval($question_id);
if (!isset($sessionId)) {
$sessionId = api_get_session_id();
}
$sql = "DELETE FROM $table_track_attempt
WHERE hotspot_exe_id = $exe_id AND
@ -1716,8 +1718,8 @@ class Event
$exe_id . '-' . $question_id,
null,
null,
$course_code,
$session_id
$courseId,
$sessionId
);
}

24
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -228,7 +228,13 @@ class SessionManager
// add event to system log
$user_id = api_get_user_id();
Event::addEvent(LOG_SESSION_CREATE, LOG_SESSION_ID, $session_id, api_get_utc_datetime(), $user_id);
Event::addEvent(
LOG_SESSION_CREATE,
LOG_SESSION_ID,
$session_id,
api_get_utc_datetime(),
$user_id
);
}
return $session_id;
}
@ -1499,7 +1505,13 @@ class SessionManager
Database::query($sql_delete_sfv);
// Add event to system log
Event::addEvent(LOG_SESSION_DELETE, LOG_SESSION_ID, $id_checked, api_get_utc_datetime(), $userId);
Event::addEvent(
LOG_SESSION_DELETE,
LOG_SESSION_ID,
$id_checked,
api_get_utc_datetime(),
$userId
);
}
/**
@ -2336,7 +2348,13 @@ class SessionManager
$id_session = Database::insert_id();
// Add event to system log
$user_id = api_get_user_id();
Event::addEvent(LOG_SESSION_CATEGORY_CREATE, LOG_SESSION_CATEGORY_ID, $id_session, api_get_utc_datetime(), $user_id);
Event::addEvent(
LOG_SESSION_CATEGORY_CREATE,
LOG_SESSION_CATEGORY_ID,
$id_session,
api_get_utc_datetime(),
$user_id
);
return $id_session;
}

6
main/inc/lib/sub_language.class.php
Unescape View File

@ -355,7 +355,11 @@ class SubLanguageManager
$lang = Database::fetch_array($result);
$sql_update_2 = "UPDATE " . $tbl_settings_current . " SET selected_value='" . $lang['english_name'] . "' WHERE variable='platformLanguage'";
$result_2 = Database::query($sql_update_2);
Event::addEvent(LOG_PLATFORM_LANGUAGE_CHANGE, LOG_PLATFORM_LANGUAGE, $lang['english_name']);
Event::addEvent(
LOG_PLATFORM_LANGUAGE_CHANGE,
LOG_PLATFORM_LANGUAGE,
$lang['english_name']
);
return $result_2 !== false;
}

30
main/inc/lib/usermanager.lib.php
Unescape View File

@ -465,8 +465,20 @@ class UserManager
// Add event to system log
$user_id_manager = api_get_user_id();
Event::addEvent(LOG_USER_DELETE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager, null, $user_info);
Event::addEvent(LOG_USER_DELETE, LOG_USER_OBJECT, $user_info, api_get_utc_datetime(), $user_id_manager, null, $user_info);
Event::addEvent(
LOG_USER_DELETE,
LOG_USER_ID,
$user_id,
api_get_utc_datetime(),
$user_id_manager
);
Event::addEvent(
LOG_USER_DELETE,
LOG_USER_OBJECT,
$user_info,
api_get_utc_datetime(),
$user_id_manager
);
return true;
}
@ -521,7 +533,7 @@ class UserManager
$sql = "UPDATE $table_user SET active = 0 WHERE user_id IN ($ids)";
$r = Database::query($sql);
if ($r !== false) {
Event::addEvent(LOG_USER_DISABLE,LOG_USER_ID,$ids);
Event::addEvent(LOG_USER_DISABLE, LOG_USER_ID, $ids);
}
return $r;
}
@ -781,7 +793,7 @@ class UserManager
$ev = LOG_USER_ENABLE;
}
if ($r !== false) {
Event::addEvent($ev,LOG_USER_ID,$user_id);
Event::addEvent($ev, LOG_USER_ID, $user_id);
}
return $r;
}
@ -789,6 +801,7 @@ class UserManager
/**
* Disables a user
* @param int User id
* @return bool
* @uses UserManager::change_active_state() to actually disable the user
* @assert (0) === false
*/
@ -798,11 +811,13 @@ class UserManager
return false;
}
self::change_active_state($user_id, 0);
return true;
}
/**
* Enable a user
* @param int User id
* @return bool
* @uses UserManager::change_active_state() to actually disable the user
* @assert (0) === false
*/
@ -812,6 +827,7 @@ class UserManager
return false;
}
self::change_active_state($user_id, 1);
return true;
}
/**
@ -2000,7 +2016,11 @@ class UserManager
if ($result) {
//echo "id returned";
$return = Database::insert_id();
Event::addEvent(LOG_USER_FIELD_CREATE, LOG_USER_FIELD_VARIABLE, Database::escape_string($fieldvarname));
Event::addEvent(
LOG_USER_FIELD_CREATE,
LOG_USER_FIELD_VARIABLE,
$fieldvarname
);
} else {
//echo "false - failed" ;
return false;

8
tests/main/inc/lib/events.lib.inc.test.php
Unescape View File

@ -91,10 +91,10 @@ class TestEvents extends UnitTestCase {
global $_configuration;
global $_user;
global $TABLETRACK_DEFAULT;
$event_type = Database::escape_string($event_type);
$event_value_type = Database::escape_string($event_value_type);
$event_value = Database::escape_string($event_value);
$res=Event::addEvent($event_type, $event_value_type,$event_value);
$event_type = 'bla';
$event_value_type = 'blo';
$event_value = 'bli';
$res=Event::addEvent($event_type, $event_value_type, $event_value);
$this->assertTrue(is_bool($res));
//var_dump($res);
}

Write Preview
Loading…
Cancel
Save