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

Fixing function get_activities_data, bug when reporting activities date see #3734

Browse Source
skala
Julio Montoya 14 years ago
parent 33ac79e368
commit 6fa115e2f6
9 changed files with 54 additions and 68 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. 16
      main/admin/settings.lib.php
  2. 12
      main/admin/settings.php
  3. 2
      main/admin/statistics/index.php
  4. 28
      main/admin/statistics/statistics.lib.php
  5. 5
      main/inc/lib/add_course.lib.inc.php
  6. 15
      main/inc/lib/course.lib.php
  7. 10
      main/inc/lib/events.lib.inc.php
  8. 23
      main/inc/lib/sessionmanager.lib.php
  9. 11
      main/inc/lib/usermanager.lib.php

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

@ -38,11 +38,10 @@ function handle_plugins() {
if (isset($_POST['submit_plugins'])) {
store_plugins();
// Add event to the system log.
$time = time();
// Add event to the system log.
$user_id = api_get_user_id();
$category = $_GET['category'];
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
Display :: display_confirmation_message(get_lang('SettingsStored'));
}
@ -207,10 +206,9 @@ function handle_stylesheets() {
upload_stylesheet($values, $picture);
// Add event to the system log.
$time = time();
$user_id = api_get_user_id();
$category = $_GET['category'];
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
Display::display_confirmation_message(get_lang('StylesheetAdded'));
} else {
@ -689,20 +687,18 @@ function handle_templates() {
add_edit_template();
// Add event to the system log.
$time = time();
$user_id = api_get_user_id();
$category = $_GET['category'];
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
} else {
if ($_GET['action'] == 'delete' && is_numeric($_GET['id'])) {
delete_template($_GET['id']);
// Add event to the system log
$time = time();
// Add event to the system log
$user_id = api_get_user_id();
$category = $_GET['category'];
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
}
display_templates();
}

12
main/admin/settings.php
Unescape View File

@ -506,17 +506,16 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
}
*/
// Add event configuration settings category to the system log.
$time = time();
// Add event configuration settings category to the system log.
$user_id = api_get_user_id();
$category = $_GET['category'];
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
// Add event configuration settings variable to the system log.
if (is_array($keys) && count($keys) > 0) {
foreach ($keys as $variable) {
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_VARIABLE, $variable, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_VARIABLE, $variable, api_get_utc_datetime(), $user_id);
}
}
//header('Location: settings.php?action=stored&category='.Security::remove_XSS($_GET['category']).'&message='.$message);
@ -591,11 +590,10 @@ if (!empty($_GET['category'])) {
if (isset($_POST['submit_dashboard_plugins'])) {
$affected_rows = DashboardManager::store_dashboard_plugins($_POST);
if ($affected_rows) {
// add event to system log
$time = time();
// add event to system log
$user_id = api_get_user_id();
$category = $_GET['category'];
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, api_get_utc_datetime(), $user_id);
Display :: display_confirmation_message(get_lang('DashboardPluginsHaveBeenUpdatedSucesslly'));
}
}

2
main/admin/statistics/index.php
Unescape View File

@ -131,4 +131,4 @@ switch ($_GET['action']) {
break;
}
Display::display_footer();
Display::display_footer();

28
main/admin/statistics/statistics.lib.php
Unescape View File

@ -114,18 +114,18 @@ class Statistics {
*/
function get_activities_data($from, $number_of_items, $column, $direction) {
global $dateTimeFormatLong, $_configuration;
$track_e_default = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
$track_e_default = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
$column = intval($column);
$from = intval($from);
$from = intval($from);
$number_of_items = intval($number_of_items);
if (!in_array($direction, array('ASC','DESC'))) {
$direction = 'DESC';
$direction = 'DESC';
}
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT ".
@ -153,16 +153,20 @@ class Statistics {
}
if (!empty($column) && !empty($direction)) {
$sql .= " ORDER BY col$column $direction";
$sql .= " ORDER BY col$column $direction";
} else {
$sql .= " ORDER BY col4 DESC ";
$sql .= " ORDER BY col4 DESC ";
}
$sql .= " LIMIT $from,$number_of_items ";
$res = Database::query($sql);
$activities = array ();
while ($row = Database::fetch_row($res)) {
$row[4] = api_get_local_time($row[4], null, date_default_timezone_get());
while ($row = Database::fetch_row($res)) {
if (!empty($row[4]) && $row[4] != '0000-00-00 00:00:00') {
$row[4] = api_get_local_time($row[4]);
} else {
$row[4] = '-';
}
$activities[] = $row;
}
return $activities;
@ -449,7 +453,7 @@ class Statistics {
$form->addElement('hidden','activities_direction','DESC');
$form->addElement('hidden','activities_column','4');
$form->addElement('text','keyword',get_lang('keyword'));
$form->addElement('style_submit_button', 'submit', get_lang('SearchActivities'),'class="search"');
$form->addElement('style_submit_button', 'submit', get_lang('Search'),'class="search"');
echo '<div class="actions">';
$form->display();
echo '</div>';

5
main/inc/lib/add_course.lib.inc.php
Unescape View File

@ -2586,10 +2586,9 @@ function register_course($course_sys_code, $course_screen_code, $course_reposito
UrlManager::add_course_to_url($course_sys_code, 1);
}
// Add event to the system log.
$time = time();
// Add event to the system log.
$user_id = api_get_user_id();
event_system(LOG_COURSE_CREATE, LOG_COURSE_CODE, $course_sys_code, $time, $user_id, $course_sys_code);
event_system(LOG_COURSE_CREATE, LOG_COURSE_CODE, $course_sys_code, api_get_utc_datetime(), $user_id, $course_sys_code);
$send_mail_to_admin = api_get_setting('send_email_to_admin_when_create_course');

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

@ -335,10 +335,9 @@ class CourseManager {
Database::query("DELETE FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
WHERE user_id IN (".$user_ids.") AND relation_type<>".COURSE_RELATION_TYPE_RRHH." AND course_code = '".$course_code."'");
// add event to system log
$time = time();
// add event to system log
$user_id = api_get_user_id();
event_system(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_COURSE_CODE, $course_code, $time, $user_id);
event_system(LOG_UNSUBSCRIBE_USER_FROM_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), $user_id);
}
}
@ -436,10 +435,9 @@ class CourseManager {
status = '".$status."',
sort = '". ($course_sort)."'");
// Add event to the system log.
$time = time();
// Add event to the system log
$user_id = api_get_user_id();
event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $course_code, $time, $user_id);
event_system(LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $course_code, api_get_utc_datetime(), $user_id);
}
return (bool)$result;
}
@ -1613,10 +1611,9 @@ class CourseManager {
}
}
// add event to system log
$time = time();
// Add event to system log
$user_id = api_get_user_id();
event_system(LOG_COURSE_DELETE, LOG_COURSE_CODE, $code, $time, $user_id, $code);
event_system(LOG_COURSE_DELETE, LOG_COURSE_CODE, $code, api_get_utc_datetime(), $user_id, $code);
}

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

@ -500,19 +500,19 @@ function exercise_attempt_hotspot($exe_id, $question_id, $answer_id, $correct, $
* @param integer User ID (defaults to null)
* @param string Course code (defaults to null)
*/
function event_system($event_type, $event_value_type, $event_value, $timestamp = null, $user_id=null, $course_code=null) {
function event_system($event_type, $event_value_type, $event_value, $datetime = null, $user_id=null, $course_code=null) {
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);
$timestamp = Database::escape_string($timestamp);
$datetime = Database::escape_string($datetime);
$user_id = Database::escape_string($user_id);
$course_code = Database::escape_string($course_code);
if(!isset($timestamp)) {
$timestamp = api_get_utc_datetime();
if(!isset($datetime)) {
$datetime = api_get_utc_datetime();
}
if(!isset($user_id)) {
$user_id = 0;
@ -531,7 +531,7 @@ function event_system($event_type, $event_value_type, $event_value, $timestamp =
VALUES
('$user_id.',
'$course_code',
'$timestamp',
'$datetime',
'$event_type',
'$event_value_type',
'$event_value')";

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

@ -142,10 +142,9 @@ class SessionManager {
$access_url_id = api_get_current_access_url_id();
UrlManager::add_session_to_url($session_id,$access_url_id);
// add event to system log
$time = time();
// add event to system log
$user_id = api_get_user_id();
event_system(LOG_SESSION_CREATE, LOG_SESSION_ID, $session_id, $time, $user_id);
event_system(LOG_SESSION_CREATE, LOG_SESSION_ID, $session_id, api_get_utc_datetime(), $user_id);
return $session_id;
}
@ -385,11 +384,9 @@ class SessionManager {
}
}
*/
// add event to system log
$time = time();
// Add event to system log
$user_id = api_get_user_id();
event_system(LOG_SESSION_DELETE, LOG_SESSION_ID, $id_checked, $time, $user_id);
event_system(LOG_SESSION_DELETE, LOG_SESSION_ID, $id_checked, api_get_utc_datetime(), $user_id);
}
@ -908,11 +905,10 @@ class SessionManager {
$sql = "INSERT INTO $tbl_session_category (name, date_start, date_end, access_url_id)
VALUES('".Database::escape_string($name)."','$date_start','$date_end', '$access_url_id')";
Database::query($sql);
$id_session=Database::insert_id();
// add event to system log
$time = time();
$id_session = Database::insert_id();
// Add event to system log
$user_id = api_get_user_id();
event_system(LOG_SESSION_CATEGORY_CREATE, LOG_SESSION_CATEGORY_ID, $id_session, $time, $user_id);
event_system(LOG_SESSION_CATEGORY_CREATE, LOG_SESSION_CATEGORY_ID, $id_session, api_get_utc_datetime(), $user_id);
return $id_session;
}
@ -1003,10 +999,9 @@ class SessionManager {
$rs = @Database::query($sql);
$result = Database::affected_rows();
// add event to system log
$time = time();
// Add event to system log
$user_id = api_get_user_id();
event_system(LOG_SESSION_CATEGORY_DELETE, LOG_SESSION_CATEGORY_ID, $id_checked, $time, $user_id);
event_system(LOG_SESSION_CATEGORY_DELETE, LOG_SESSION_CATEGORY_ID, $id_checked, api_get_utc_datetime(), $user_id);
// delete extra session fields where field variable is "PERIODO"

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

@ -142,10 +142,9 @@ class UserManager
UrlManager::add_user_to_url($return, 1);
}
// add event to system log
$time = time();
// Add event to system log
$user_id_manager = api_get_user_id();
event_system(LOG_USER_CREATE, LOG_USER_ID, $return, $time, $user_id_manager);
event_system(LOG_USER_CREATE, LOG_USER_ID, $return, api_get_utc_datetime(), $user_id_manager);
} else {
//echo "false - failed" ;
@ -295,11 +294,9 @@ class UserManager
//Delete user from friend lists
SocialManager::remove_user_rel_user($user_id, true);
}
// add event to system log
$time = time();
// Add event to system log
$user_id_manager = api_get_user_id();
event_system(LOG_USER_DELETE, LOG_USER_ID, $user_id, $time, $user_id_manager);
event_system(LOG_USER_DELETE, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager);
return true;
}

Write Preview
Loading…
Cancel
Save