diff --git a/main/admin/inactive_user_list.php b/main/admin/inactive_user_list.php index 370a10fe4b..d802fd55ae 100755 --- a/main/admin/inactive_user_list.php +++ b/main/admin/inactive_user_list.php @@ -14,7 +14,6 @@ $language_file = array ('registration','admin'); $cidReset = true; require_once '../inc/global.inc.php'; -$tbl_stats_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(true); diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 403c9f8613..b23c1ebef0 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -6180,9 +6180,9 @@ class TrackingUserLog $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) FROM $track_access_table - WHERE access_user_id = '$user_id' - AND c_id = '$course_id' - AND access_session_id = '$session_id' + WHERE access_user_id = $user_id + AND c_id = $course_id + AND access_session_id = $session_id GROUP BY YEAR(access_date),MONTH(access_date) ORDER BY YEAR(access_date),MONTH(access_date) ASC"; @@ -6584,9 +6584,9 @@ class TrackingUserLogCSV $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails'); $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) FROM $track_access_table - WHERE access_user_id = '$user_id' - AND c_id = '".$course_id."' - AND access_session_id = '$session_id' + WHERE access_user_id = $user_id + AND c_id = $course_id + AND access_session_id = $session_id GROUP BY YEAR(access_date),MONTH(access_date) ORDER BY YEAR(access_date),MONTH(access_date) ASC"; //$results = getManyResults2Col($sql); diff --git a/main/install/db_stats.sql b/main/install/db_stats.sql index 731927fdc9..30be35ca80 100755 --- a/main/install/db_stats.sql +++ b/main/install/db_stats.sql @@ -54,15 +54,13 @@ CREATE TABLE track_e_access ( access_id int NOT NULL auto_increment, access_user_id int unsigned default NULL, access_date datetime NOT NULL default '0000-00-00 00:00:00', - access_cours_code varchar(40) NOT NULL default '', c_id int not null, access_tool varchar(30) default NULL, access_session_id int NOT NULL default 0, user_ip varchar(39) NOT NULL default '', PRIMARY KEY (access_id), KEY access_user_id (access_user_id), - KEY access_c_id (c_id), - KEY access_cours_code (access_cours_code) + KEY access_c_id (c_id) ); DROP TABLE IF EXISTS track_e_lastaccess; @@ -70,13 +68,11 @@ CREATE TABLE track_e_lastaccess ( access_id bigint NOT NULL auto_increment, access_user_id int unsigned default NULL, access_date datetime NOT NULL default '0000-00-00 00:00:00', - access_cours_code varchar(40) NOT NULL, c_id int not null, access_tool varchar(30) default NULL, access_session_id int unsigned default NULL, PRIMARY KEY (access_id), KEY access_user_id (access_user_id), - KEY access_cours_code (access_cours_code), KEY access_c_id (c_id), KEY access_session_id (access_session_id) ); diff --git a/main/tracking/course_access_details.php b/main/tracking/course_access_details.php index 6f7a9a5baf..89f72f260c 100755 --- a/main/tracking/course_access_details.php +++ b/main/tracking/course_access_details.php @@ -149,7 +149,7 @@ $is_allowedToTrack = $is_courseAdmin; $sql = "SELECT UNIX_TIMESTAMP( access_date ) FROM $TABLETRACK_ACCESS WHERE YEAR( access_date ) = YEAR( FROM_UNIXTIME( '$reqdate' ) ) - AND c_id = '$courseId' + AND c_id = $courseId AND access_tool IS NULL "; if ($displayType == "month") { $sql .= "ORDER BY UNIX_TIMESTAMP( access_date)"; @@ -172,7 +172,7 @@ $is_allowedToTrack = $is_courseAdmin; FROM $TABLETRACK_ACCESS WHERE MONTH(access_date) = MONTH (FROM_UNIXTIME( '$reqdate' ) ) AND YEAR( access_date ) = YEAR( FROM_UNIXTIME( '$reqdate' ) ) - AND c_id = '$courseId' + AND c_id = $courseId AND access_tool IS NULL "; if($displayType == "day") { @@ -194,7 +194,7 @@ $is_allowedToTrack = $is_courseAdmin; WHERE DAYOFMONTH(access_date) = DAYOFMONTH(FROM_UNIXTIME( '$reqdate' ) ) AND MONTH(access_date) = MONTH (FROM_UNIXTIME( '$reqdate' ) ) AND YEAR( access_date ) = YEAR( FROM_UNIXTIME( '$reqdate' ) ) - AND c_id = '$courseId' + AND c_id = $courseId AND access_tool IS NULL ORDER BY HOUR( access_date )"; $hours_array = StatsUtils::hoursTab($sql,$reqdate); diff --git a/main/tracking/logins_details.php b/main/tracking/logins_details.php index 520d8cb8cb..586d62d0fc 100755 --- a/main/tracking/logins_details.php +++ b/main/tracking/logins_details.php @@ -145,8 +145,8 @@ $is_allowedToTrackEverybodyInCourse = $is_courseAdmin; // allowed to track all s case "month" : $sql = "SELECT access_date FROM $TABLETRACK_ACCESS - WHERE access_user_id = '$uInfo' - AND c_id = '" . $courseId . "' + WHERE access_user_id = $uInfo + AND c_id = $courseId AND MONTH(access_date) = MONTH( FROM_UNIXTIME('$reqdate') ) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate')) GROUP BY DAYOFMONTH(access_date) @@ -156,8 +156,8 @@ $is_allowedToTrackEverybodyInCourse = $is_courseAdmin; // allowed to track all s case "week" : $sql = "SELECT access_date FROM $TABLETRACK_ACCESS - WHERE access_user_id = '$uInfo' - AND c_id = '" . $courseId . "' + WHERE access_user_id = $uInfo + AND c_id = $courseId AND WEEK(access_date) = WEEK( FROM_UNIXTIME('$reqdate') ) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate')) GROUP BY DAYOFMONTH(access_date) @@ -188,11 +188,11 @@ $is_allowedToTrackEverybodyInCourse = $is_courseAdmin; // allowed to track all s // displayed date is the last login date $sql = "SELECT access_tool, count(access_tool) FROM $TABLETRACK_ACCESS - WHERE access_user_id = '$uInfo' + WHERE access_user_id = $uInfo AND access_tool IS NOT NULL AND access_date > '" . $results[$j] . "' AND access_date < '" . $limit . "' - AND c_id = '" . $courseId . "' + AND c_id = $courseId GROUP BY access_tool ORDER BY access_tool ASC"; $results2 = StatsUtils::getManyResults2Col($sql); diff --git a/main/tracking/personnalLog.php b/main/tracking/personnalLog.php index f7b975c4ed..479ea71487 100755 --- a/main/tracking/personnalLog.php +++ b/main/tracking/personnalLog.php @@ -123,7 +123,7 @@ api_display_tool_title($nameTools); $sql = "SELECT access_tool, count(access_tool), c_id FROM $TABLETRACK_ACCESS WHERE - access_user_id = '".$_user['user_id']."' AND + access_user_id = " . $_user['user_id'] . " AND access_date > '".$value."' AND access_date < '".$previousDate."' GROUP BY access_tool, c_id diff --git a/plugin/ticket/src/report.php b/plugin/ticket/src/report.php index 9e991d01a8..103ee2e15d 100755 --- a/plugin/ticket/src/report.php +++ b/plugin/ticket/src/report.php @@ -279,7 +279,7 @@ if (isset($_POST['report'])) { FROM " . Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS) . " access LEFT JOIN " . Database::get_main_table(TABLE_MAIN_USER) . " u ON access.access_user_id = u.user_id LEFT JOIN " . Database::get_main_table(TABLE_MAIN_COURSE) . " c ON access.c_id = c.id - WHERE access.c_id = '" . $course_info['real_id'] . "' AND u.user_id = '$user_id' "; + WHERE access.c_id = " . $course_info['real_id'] . " AND u.user_id = $user_id "; if ($tool != '') { $sql.="AND access.access_tool = '$tool' "; }