From 553d64d96f657e44641253c5352292cd2eeb5a23 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 23 Mar 2012 14:59:23 +0100 Subject: [PATCH] Minor - cosmetic changes --- main/admin/statistics/index.php | 1 + main/admin/statistics/statistics.lib.php | 9 ++++----- main/inc/lib/events.lib.inc.php | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) mode change 100755 => 100644 main/admin/statistics/index.php diff --git a/main/admin/statistics/index.php b/main/admin/statistics/index.php old mode 100755 new mode 100644 index a0809600dc..19a2b93a78 --- a/main/admin/statistics/index.php +++ b/main/admin/statistics/index.php @@ -82,6 +82,7 @@ switch ($_GET['action']) { get_lang('Students') => statistics::count_users(5,null,$_GET['count_invisible_courses']) ) ); + $teachers = $students = array(); foreach ($course_categories as $code => $name) { $name = str_replace(get_lang('Department'),"",$name); $teachers[$name] = statistics::count_users(1,$code,$_GET['count_invisible_courses']); diff --git a/main/admin/statistics/statistics.lib.php b/main/admin/statistics/statistics.lib.php index 8fc46f588d..c537815213 100644 --- a/main/admin/statistics/statistics.lib.php +++ b/main/admin/statistics/statistics.lib.php @@ -115,8 +115,7 @@ 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); + $table_user = Database::get_main_table(TABLE_MAIN_USER); $access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $current_url_id = api_get_current_access_url_id(); @@ -172,10 +171,10 @@ class Statistics { } } } - if (!empty($row[4]) && $row[4] != '0000-00-00 00:00:00') { - $row[4] = api_get_local_time($row[4]); + if (!empty($row['default_date']) && $row['default_date'] != '0000-00-00 00:00:00') { + $row['default_date'] = api_get_local_time($row['default_date']); } else { - $row[4] = '-'; + $row['default_date'] = '-'; } $activities[] = $row; } diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.inc.php index 1414ca4f08..c69bd4cf73 100644 --- a/main/inc/lib/events.lib.inc.php +++ b/main/inc/lib/events.lib.inc.php @@ -567,14 +567,15 @@ function event_system($event_type, $event_value_type, $event_value, $datetime = $event_value = serialize($event_value); } } - $event_value = Database::escape_string($event_value); - $datetime = Database::escape_string($datetime); + $event_value = Database::escape_string($event_value); $user_id = Database::escape_string($user_id); $course_code = Database::escape_string($course_code); - if(!isset($datetime)) { + if (!isset($datetime)) { $datetime = api_get_utc_datetime(); } + $datetime = Database::escape_string($datetime); + if(!isset($user_id)) { $user_id = 0; }