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

Removed useless backticks

Browse Source
skala
ywarnier 15 years ago
parent 26d1fb5c5a
commit a998f1786e
8 changed files with 139 additions and 139 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. 4
      main/search/NOTES
  2. 28
      main/tracking/courseLogCSV.php
  3. 50
      main/tracking/course_access_details.php
  4. 60
      main/tracking/logins_details.php
  5. 34
      main/tracking/personnalLog.php
  6. 48
      main/tracking/toolaccess_details.php
  7. 14
      main/tracking/userLog.php
  8. 40
      main/tracking/userlogCSV.php

4
main/search/NOTES
Unescape View File

@ -8,8 +8,8 @@ Development information
Display::display_normal_message(print_r($arrLP,1)); Display::display_normal_message(print_r($arrLP,1));
DB modifications: DB modifications:
ALTER TABLE `lp_item` ADD `terms` TEXT NULL ; ALTER TABLE lp_item ADD terms TEXT NULL ;
ALTER TABLE `lp_item` ADD `search_did` INT(10) NULL ALTER TABLE lp_item ADD search_did INT(10) NULL
-- on every course, so it's pending(TODO): -- on every course, so it's pending(TODO):
-- script to generate it for all courses depending of the type of dokeos intalation(one db or many) -- script to generate it for all courses depending of the type of dokeos intalation(one db or many)
-- create it when a course is created -- create it when a course is created

28
main/tracking/courseLogCSV.php
Unescape View File

@ -211,7 +211,7 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
// last 31 days // last 31 days
$sql = "SELECT count(*) $sql = "SELECT count(*)
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_cours_code` = '$_cid' WHERE access_cours_code = '$_cid'
AND (access_date > DATE_ADD(CURDATE(), INTERVAL -31 DAY)) AND (access_date > DATE_ADD(CURDATE(), INTERVAL -31 DAY))
AND access_tool IS NULL"; AND access_tool IS NULL";
$count = getOneResult($sql); $count = getOneResult($sql);
@ -221,7 +221,7 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
// last 7 days // last 7 days
$sql = "SELECT count(*) $sql = "SELECT count(*)
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_cours_code` = '$_cid' WHERE access_cours_code = '$_cid'
AND (access_date > DATE_ADD(CURDATE(), INTERVAL -7 DAY)) AND (access_date > DATE_ADD(CURDATE(), INTERVAL -7 DAY))
AND access_tool IS NULL"; AND access_tool IS NULL";
$count = getOneResult($sql); $count = getOneResult($sql);
@ -231,7 +231,7 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
// today // today
$sql = "SELECT count(*) $sql = "SELECT count(*)
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_cours_code` = '$_cid' WHERE access_cours_code = '$_cid'
AND ( access_date > CURDATE() ) AND ( access_date > CURDATE() )
AND access_tool IS NULL"; AND access_tool IS NULL";
$count = getOneResult($sql); $count = getOneResult($sql);
@ -252,11 +252,11 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
$title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n"; $title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n";
$sql = "SELECT `access_tool`, COUNT(DISTINCT `access_user_id`),count( `access_tool` ) $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool )
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_tool` IS NOT NULL WHERE access_tool IS NOT NULL
AND `access_cours_code` = '$_cid' AND access_cours_code = '$_cid'
GROUP BY `access_tool`"; GROUP BY access_tool";
$results = getManyResults3Col($sql); $results = getManyResults3Col($sql);
@ -283,11 +283,11 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
$tempView[3] = '0'; $tempView[3] = '0';
$sql = "SELECT `cl`.`title`, `cl`.`url`,count(DISTINCT `sl`.`links_user_id`), count(`cl`.`title`) $sql = "SELECT cl.title, cl.url,count(DISTINCT sl.links_user_id), count(cl.title)
FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
WHERE `sl`.`links_link_id` = `cl`.`id` WHERE sl.links_link_id = cl.id
AND `sl`.`links_cours_id` = '$_cid' AND sl.links_cours_id = '$_cid'
GROUP BY `cl`.`title`, `cl`.`url`"; GROUP BY cl.title, cl.url";
$results = getManyResultsXCol($sql,4); $results = getManyResultsXCol($sql,4);
@ -318,10 +318,10 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
$tempView[4] = '0'; $tempView[4] = '0';
$sql = "SELECT `down_doc_path`, COUNT(DISTINCT `down_user_id`), COUNT(`down_doc_path`) $sql = "SELECT down_doc_path, COUNT(DISTINCT down_user_id), COUNT(down_doc_path)
FROM $TABLETRACK_DOWNLOADS FROM $TABLETRACK_DOWNLOADS
WHERE `down_cours_id` = '$_cid' WHERE down_cours_id = '$_cid'
GROUP BY `down_doc_path`"; GROUP BY down_doc_path";
$results = getManyResults3Col($sql); $results = getManyResults3Col($sql);

50
main/tracking/course_access_details.php
Unescape View File

@ -38,7 +38,7 @@ td {border-bottom: thin dashed gray;}
/*]]>*/ /*]]>*/
</style>"; </style>";
//@todo use Database library //@todo use Database library
$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access"; $TABLETRACK_ACCESS = $_configuration['statistics_database'].".track_e_access";
Display::display_header($nameTools,"Tracking"); Display::display_header($nameTools,"Tracking");
include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php"); include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php");
@ -148,61 +148,61 @@ $is_allowedToTrack = $is_courseAdmin;
{ {
// all days // all days
case "year" : case "year" :
$sql = "SELECT UNIX_TIMESTAMP( `access_date` ) $sql = "SELECT UNIX_TIMESTAMP( access_date )
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE YEAR( `access_date` ) = YEAR( FROM_UNIXTIME( '$reqdate' ) ) WHERE YEAR( access_date ) = YEAR( FROM_UNIXTIME( '$reqdate' ) )
AND `access_cours_code` = '$_cid' AND access_cours_code = '$_cid'
AND `access_tool` IS NULL "; AND access_tool IS NULL ";
if($displayType == "month") if($displayType == "month")
{ {
$sql .= "ORDER BY UNIX_TIMESTAMP( `access_date`)"; $sql .= "ORDER BY UNIX_TIMESTAMP( access_date)";
$month_array = monthTab($sql); $month_array = monthTab($sql);
makeHitsTable($month_array,get_lang('PeriodMonth')); makeHitsTable($month_array,get_lang('PeriodMonth'));
} }
elseif($displayType == "day") elseif($displayType == "day")
{ {
$sql .= "ORDER BY DAYOFYEAR( `access_date`)"; $sql .= "ORDER BY DAYOFYEAR( access_date)";
$days_array = daysTab($sql); $days_array = daysTab($sql);
makeHitsTable($days_array,get_lang('PeriodDay')); makeHitsTable($days_array,get_lang('PeriodDay'));
} }
else // by hours by default else // by hours by default
{ {
$sql .= "ORDER BY HOUR( `access_date`)"; $sql .= "ORDER BY HOUR( access_date)";
$hours_array = hoursTab($sql); $hours_array = hoursTab($sql);
makeHitsTable($hours_array,get_lang('PeriodHour')); makeHitsTable($hours_array,get_lang('PeriodHour'));
} }
break; break;
// all days // all days
case "month" : case "month" :
$sql = "SELECT UNIX_TIMESTAMP( `access_date` ) $sql = "SELECT UNIX_TIMESTAMP( access_date )
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE MONTH(`access_date`) = MONTH (FROM_UNIXTIME( '$reqdate' ) ) WHERE MONTH(access_date) = MONTH (FROM_UNIXTIME( '$reqdate' ) )
AND YEAR( `access_date` ) = YEAR( FROM_UNIXTIME( '$reqdate' ) ) AND YEAR( access_date ) = YEAR( FROM_UNIXTIME( '$reqdate' ) )
AND `access_cours_code` = '$_cid' AND access_cours_code = '$_cid'
AND `access_tool` IS NULL "; AND access_tool IS NULL ";
if($displayType == "day") if($displayType == "day")
{ {
$sql .= "ORDER BY DAYOFYEAR( `access_date`)"; $sql .= "ORDER BY DAYOFYEAR( access_date)";
$days_array = daysTab($sql); $days_array = daysTab($sql);
makeHitsTable($days_array,get_lang('PeriodDay')); makeHitsTable($days_array,get_lang('PeriodDay'));
} }
else // by hours by default else // by hours by default
{ {
$sql .= "ORDER BY HOUR( `access_date`)"; $sql .= "ORDER BY HOUR( access_date)";
$hours_array = hoursTab($sql); $hours_array = hoursTab($sql);
makeHitsTable($hours_array,get_lang('PeriodHour')); makeHitsTable($hours_array,get_lang('PeriodHour'));
} }
break; break;
// all hours // all hours
case "day" : case "day" :
$sql = "SELECT UNIX_TIMESTAMP( `access_date` ) $sql = "SELECT UNIX_TIMESTAMP( access_date )
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE DAYOFMONTH(`access_date`) = DAYOFMONTH(FROM_UNIXTIME( '$reqdate' ) ) WHERE DAYOFMONTH(access_date) = DAYOFMONTH(FROM_UNIXTIME( '$reqdate' ) )
AND MONTH(`access_date`) = MONTH (FROM_UNIXTIME( '$reqdate' ) ) AND MONTH(access_date) = MONTH (FROM_UNIXTIME( '$reqdate' ) )
AND YEAR( `access_date` ) = YEAR( FROM_UNIXTIME( '$reqdate' ) ) AND YEAR( access_date ) = YEAR( FROM_UNIXTIME( '$reqdate' ) )
AND `access_cours_code` = '$_cid' AND access_cours_code = '$_cid'
AND `access_tool` IS NULL AND access_tool IS NULL
ORDER BY HOUR( `access_date` )"; ORDER BY HOUR( access_date )";
$hours_array = hoursTab($sql,$reqdate); $hours_array = hoursTab($sql,$reqdate);
makeHitsTable($hours_array,get_lang('PeriodHour')); makeHitsTable($hours_array,get_lang('PeriodHour'));
break; break;

60
main/tracking/logins_details.php
Unescape View File

@ -80,19 +80,19 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
{ {
if( $is_allowedToTrackEverybodyInCourse ) if( $is_allowedToTrackEverybodyInCourse )
{ {
$sql = "SELECT `u`.`firstname`,`u`.`lastname`, `u`.`email` $sql = "SELECT u.firstname,u.lastname, u.email
FROM $TABLECOURSUSER cu , $TABLEUSER u FROM $TABLECOURSUSER cu , $TABLEUSER u
WHERE `cu`.`user_id` = `u`.`user_id` AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." WHERE cu.user_id = u.user_id AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
AND `cu`.`course_code` = '$_cid' AND cu.course_code = '$_cid'
AND `u`.`user_id` = '$uInfo'"; AND u.user_id = '$uInfo'";
} }
else else
{ {
$sql = "SELECT `u`.`firstname`,`u`.`lastname`, `u`.`email` $sql = "SELECT u.firstname,u.lastname, u.email
FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u
WHERE `gu`.`user_id` = `u`.`user_id` WHERE gu.user_id = u.user_id
AND `gu`.`group_id` = '$_gid' AND gu.group_id = '$_gid'
AND `u`.`user_id` = '$uInfo'"; AND u.user_id = '$uInfo'";
} }
$query = Database::query($sql); $query = Database::query($sql);
$res = @Database::fetch_array($query); $res = @Database::fetch_array($query);
@ -153,25 +153,25 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
switch($period) switch($period)
{ {
case "month" : case "month" :
$sql = "SELECT `access_date` $sql = "SELECT access_date
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_user_id` = '$uInfo' WHERE access_user_id = '$uInfo'
AND `access_cours_code` = '".$_cid."' AND access_cours_code = '".$_cid."'
AND MONTH(`access_date`) = MONTH( FROM_UNIXTIME('$reqdate') ) AND MONTH(access_date) = MONTH( FROM_UNIXTIME('$reqdate') )
AND YEAR(`access_date`) = YEAR(FROM_UNIXTIME('$reqdate')) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
GROUP BY DAYOFMONTH(`access_date`) GROUP BY DAYOFMONTH(access_date)
ORDER BY `access_date` ASC"; ORDER BY access_date ASC";
$displayedDate = $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate); $displayedDate = $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate);
break; break;
case "week" : case "week" :
$sql = "SELECT `access_date` $sql = "SELECT access_date
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_user_id` = '$uInfo' WHERE access_user_id = '$uInfo'
AND `access_cours_code` = '".$_cid."' AND access_cours_code = '".$_cid."'
AND WEEK(`access_date`) = WEEK( FROM_UNIXTIME('$reqdate') ) AND WEEK(access_date) = WEEK( FROM_UNIXTIME('$reqdate') )
AND YEAR(`access_date`) = YEAR(FROM_UNIXTIME('$reqdate')) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
GROUP BY DAYOFMONTH(`access_date`) GROUP BY DAYOFMONTH(access_date)
ORDER BY `access_date` ASC"; ORDER BY access_date ASC";
$weeklowreqdate = ($reqdate-(86400*date("w" , $reqdate))); $weeklowreqdate = ($reqdate-(86400*date("w" , $reqdate)));
$weekhighreqdate = ($reqdate+(86400*(6-date("w" , $reqdate)) )); $weekhighreqdate = ($reqdate+(86400*(6-date("w" , $reqdate)) ));
$displayedDate = get_lang('From')." ".date("d " , $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate)-1].date(" Y" , $weeklowreqdate) $displayedDate = get_lang('From')." ".date("d " , $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate)-1].date(" Y" , $weeklowreqdate)
@ -198,15 +198,15 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
$limit = $results[$j+1]; $limit = $results[$j+1];
// select all access to tool between displayed date and next displayed date or now() if // select all access to tool between displayed date and next displayed date or now() if
// displayed date is the last login date // displayed date is the last login date
$sql = "SELECT `access_tool`, count(`access_tool`) $sql = "SELECT access_tool, count(access_tool)
FROM $TABLETRACK_ACCESS FROM $TABLETRACK_ACCESS
WHERE `access_user_id` = '$uInfo' WHERE access_user_id = '$uInfo'
AND `access_tool` IS NOT NULL AND access_tool IS NOT NULL
AND `access_date` > '".$results[$j]."' AND access_date > '".$results[$j]."'
AND `access_date` < '".$limit."' AND access_date < '".$limit."'
AND `access_cours_code` = '".$_cid."' AND access_cours_code = '".$_cid."'
GROUP BY `access_tool` GROUP BY access_tool
ORDER BY `access_tool` ASC"; ORDER BY access_tool ASC";
$results2 = getManyResults2Col($sql); $results2 = getManyResults2Col($sql);
if (is_array($results2)) if (is_array($results2))

34
main/tracking/personnalLog.php
Unescape View File

@ -46,11 +46,11 @@ td {border-bottom: thin dashed gray;}
$view = preg_replace('/[^01]/','',$_REQUEST['view']); $view = preg_replace('/[^01]/','',$_REQUEST['view']);
$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER); $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access"; $TABLETRACK_ACCESS = $_configuration['statistics_database'].".track_e_access";
$TABLETRACK_LINKS = $_configuration['statistics_database']."`.`track_e_links"; $TABLETRACK_LINKS = $_configuration['statistics_database'].".track_e_links";
$TABLETRACK_DOWNLOADS = $_configuration['statistics_database']."`.`track_e_downloads"; $TABLETRACK_DOWNLOADS = $_configuration['statistics_database'].".track_e_downloads";
$TABLETRACK_LOGIN = $_configuration['statistics_database']."`.`track_e_login"; $TABLETRACK_LOGIN = $_configuration['statistics_database'].".track_e_login";
$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices"; $TABLETRACK_EXERCICES = $_configuration['statistics_database'].".track_e_exercices";
$limitOfDisplayedLogins = 25; // number of logins to display $limitOfDisplayedLogins = 25; // number of logins to display
@ -99,10 +99,10 @@ if ( $_configuration['tracking_enabled'] )
[<a href='".api_get_self()."?view=".$tempView."'>".get_lang('Close')."</a>] [<a href='".api_get_self()."?view=".$tempView."'>".get_lang('Close')."</a>]
</td> </td>
</tr>"; </tr>";
$sql = "SELECT `login_date` $sql = "SELECT login_date
FROM `".$TABLETRACK_LOGIN."` FROM ".$TABLETRACK_LOGIN."
WHERE `login_user_id` = '".$_user['user_id']."' WHERE login_user_id = '".$_user['user_id']."'
ORDER BY `login_date` DESC ORDER BY login_date DESC
LIMIT ".$limitOfDisplayedLogins.""; LIMIT ".$limitOfDisplayedLogins."";
echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsExplaination')."<br/>"; echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsExplaination')."<br/>";
$results = getManyResults1Col($sql); $results = getManyResults1Col($sql);
@ -129,9 +129,9 @@ if ( $_configuration['tracking_enabled'] )
$sql = "SELECT `access_tool`, count(access_tool), `access_cours_code` $sql = "SELECT access_tool, count(access_tool), access_cours_code
FROM `".$TABLETRACK_ACCESS."` FROM $TABLETRACK_ACCESS
WHERE `access_user_id` = '".$_user['user_id']."'". WHERE access_user_id = '".$_user['user_id']."'".
//AND access_tool IS NOT NULL //AND access_tool IS NOT NULL
"AND access_date > '".$value."' "AND access_date > '".$value."'
AND access_date < '".$previousDate."' AND access_date < '".$previousDate."'
@ -217,11 +217,11 @@ if ( $_configuration['tracking_enabled'] )
</tr> </tr>
"; ";
echo " Ceci est amen etre dplac vers la page de garde des exercices "; echo " Ceci est amen etre dplac vers la page de garde des exercices ";
$sql = "SELECT `ce`.`title`, `te`.`exe_result` , `te`.`exe_weighting`, `te`.`exe_date` $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, te.exe_date
FROM `$TABLECOURSE_EXERCICES` AS ce , `$TABLETRACK_EXERCICES` AS te FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
WHERE `te`.`exe_user_id` = '".$_user['user_id']."' WHERE te.exe_user_id = '".$_user['user_id']."'
AND `te`.`exe_exo_id` = `ce`.`id` AND te.exe_exo_id = ce.id
ORDER BY `te`.`exe_cours_id` ASC, `ce`.`title` ASC, `te`.`exe_date`ASC"; ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
$results = getManyResultsXCol($sql,4); $results = getManyResultsXCol($sql,4);

48
main/tracking/toolaccess_details.php
Unescape View File

@ -74,13 +74,13 @@ $reqdate=$_REQUEST['reqdate'];
<?php <?php
$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access"; $TABLETRACK_ACCESS = $_configuration['statistics_database'].".track_e_access";
if(isset($_cid)) //stats for the current course if(isset($_cid)) //stats for the current course
{ {
// to see stats of one course user must be courseAdmin of this course // to see stats of one course user must be courseAdmin of this course
$is_allowedToTrack = $is_courseAdmin; $is_allowedToTrack = $is_courseAdmin;
$courseCodeEqualcidIfNeeded = "AND `access_cours_code` = '$_cid'"; $courseCodeEqualcidIfNeeded = "AND access_cours_code = '$_cid'";
} }
else // stats for all courses else // stats for all courses
{ {
@ -93,11 +93,11 @@ $reqdate=$_REQUEST['reqdate'];
// list of all tools // list of all tools
if (!isset($tool)) if (!isset($tool))
{ {
$sql = "SELECT `access_tool`, count( access_tool ) $sql = "SELECT access_tool, count( access_tool )
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE `access_tool` IS NOT NULL WHERE access_tool IS NOT NULL
".$courseCodeEqualcidIfNeeded." ".$courseCodeEqualcidIfNeeded."
GROUP BY `access_tool`"; GROUP BY access_tool";
echo "<tr><td>"; echo "<tr><td>";
echo "<tr> echo "<tr>
<td> <td>
@ -229,39 +229,39 @@ $reqdate=$_REQUEST['reqdate'];
{ {
// all days // all days
case "month" : case "month" :
$sql = "SELECT UNIX_TIMESTAMP(`access_date`) $sql = "SELECT UNIX_TIMESTAMP(access_date)
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE `access_tool` = '$tool' WHERE access_tool = '$tool'
".$courseCodeEqualcidIfNeeded." ".$courseCodeEqualcidIfNeeded."
AND MONTH(`access_date`) = MONTH(FROM_UNIXTIME('$reqdate')) AND MONTH(access_date) = MONTH(FROM_UNIXTIME('$reqdate'))
AND YEAR(`access_date`) = YEAR(FROM_UNIXTIME('$reqdate')) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
ORDER BY `access_date` ASC"; ORDER BY access_date ASC";
$days_array = daysTab($sql); $days_array = daysTab($sql);
makeHitsTable($days_array,$langDay); makeHitsTable($days_array,$langDay);
break; break;
// all days // all days
case "week" : case "week" :
$sql = "SELECT UNIX_TIMESTAMP(`access_date`) $sql = "SELECT UNIX_TIMESTAMP(access_date)
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE `access_tool` = '$tool' WHERE access_tool = '$tool'
".$courseCodeEqualcidIfNeeded." ".$courseCodeEqualcidIfNeeded."
AND WEEK(`access_date`) = WEEK(FROM_UNIXTIME('$reqdate')) AND WEEK(access_date) = WEEK(FROM_UNIXTIME('$reqdate'))
AND YEAR(`access_date`) = YEAR(FROM_UNIXTIME('$reqdate')) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
ORDER BY `access_date` ASC"; ORDER BY access_date ASC";
$days_array = daysTab($sql); $days_array = daysTab($sql);
makeHitsTable($days_array,$langDay); makeHitsTable($days_array,$langDay);
break; break;
// all hours // all hours
case "day" : case "day" :
$sql = "SELECT UNIX_TIMESTAMP(`access_date`) $sql = "SELECT UNIX_TIMESTAMP(access_date)
FROM `$TABLETRACK_ACCESS` FROM $TABLETRACK_ACCESS
WHERE `access_tool` = '$tool' WHERE access_tool = '$tool'
".$courseCodeEqualcidIfNeeded." ".$courseCodeEqualcidIfNeeded."
AND DAYOFYEAR(`access_date`) = DAYOFYEAR(FROM_UNIXTIME('$reqdate')) AND DAYOFYEAR(access_date) = DAYOFYEAR(FROM_UNIXTIME('$reqdate'))
AND YEAR(`access_date`) = YEAR(FROM_UNIXTIME('$reqdate')) AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
ORDER BY `access_date` ASC"; ORDER BY access_date ASC";
$hours_array = hoursTab($sql,$reqdate); $hours_array = hoursTab($sql,$reqdate);
makeHitsTable($hours_array,$langHour); makeHitsTable($hours_array,$langHour);

14
main/tracking/userLog.php
Unescape View File

@ -75,12 +75,12 @@ $TABLEUSER = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access"; $TABLETRACK_ACCESS = $_configuration['statistics_database'].".track_e_access";
$TABLETRACK_LINKS = $_configuration['statistics_database']."`.`track_e_links"; $TABLETRACK_LINKS = $_configuration['statistics_database'].".track_e_links";
$TABLETRACK_LOGIN = $_configuration['statistics_database']."`.`track_e_login"; $TABLETRACK_LOGIN = $_configuration['statistics_database'].".track_e_login";
$TABLETRACK_DOWNLOADS = $_configuration['statistics_database']."`.`track_e_downloads"; $TABLETRACK_DOWNLOADS = $_configuration['statistics_database'].".track_e_downloads";
$TABLETRACK_UPLOADS = $_configuration['statistics_database']."`.`track_e_uploads"; $TABLETRACK_UPLOADS = $_configuration['statistics_database'].".track_e_uploads";
$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices"; $TABLETRACK_EXERCICES = $_configuration['statistics_database'].".track_e_exercices";
$TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK); $TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK);
$TABLECOURSE_WORK = Database::get_course_table(TABLE_STUDENT_PUBLICATION); $TABLECOURSE_WORK = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
@ -242,7 +242,7 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
// check if user is in the group of this tutor // check if user is in the group of this tutor
$sql = "SELECT u.firstname,u.lastname, u.email $sql = "SELECT u.firstname,u.lastname, u.email
FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u
WHERE gu.user_id = u.user_id` WHERE gu.user_id = u.user_id
AND gu.group_id = '".Database::escape_string($_gid)."' AND gu.group_id = '".Database::escape_string($_gid)."'
AND u.user_id = '".Database::escape_string($uInfo)."'"; AND u.user_id = '".Database::escape_string($uInfo)."'";
$query = Database::query($sql); $query = Database::query($sql);

40
main/tracking/userlogCSV.php
Unescape View File

@ -64,13 +64,13 @@ $TABLEUSER = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$TABLETRACK_ACCESS = $_configuration['statistics_database']."`.`track_e_access"; $TABLETRACK_ACCESS = $_configuration['statistics_database'].".track_e_access";
$TABLETRACK_LINKS = $_configuration['statistics_database']."`.`track_e_links"; $TABLETRACK_LINKS = $_configuration['statistics_database'].".track_e_links";
$TABLETRACK_LOGIN = $_configuration['statistics_database']."`.`track_e_login"; $TABLETRACK_LOGIN = $_configuration['statistics_database'].".track_e_login";
$TABLETRACK_DOWNLOADS = $_configuration['statistics_database']."`.`track_e_downloads"; $TABLETRACK_DOWNLOADS = $_configuration['statistics_database'].".track_e_downloads";
$TABLETRACK_UPLOADS = $_configuration['statistics_database']."`.`track_e_uploads"; $TABLETRACK_UPLOADS = $_configuration['statistics_database'].".track_e_uploads";
$TABLETRACK_EXERCICES = $_configuration['statistics_database']."`.`track_e_exercices"; $TABLETRACK_EXERCICES = $_configuration['statistics_database'].".track_e_exercices";
$TABLETRACK_HOTPOTATOES = $_configuration['statistics_database']."`.`track_e_hotpotatoes"; $TABLETRACK_HOTPOTATOES = $_configuration['statistics_database'].".track_e_hotpotatoes";
$TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK); $TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK);
$TABLECOURSE_WORK = Database::get_course_table(TABLE_STUDENT_PUBLICATION); $TABLECOURSE_WORK = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
@ -136,12 +136,12 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
if(api_get_setting('use_session_mode')) { if(api_get_setting('use_session_mode')) {
$sql = "SELECT count(user_id) $sql = "SELECT count(user_id)
FROM $TABLECOURSUSER FROM $TABLECOURSUSER
WHERE `course_code` = '$_cid' AND relation_type<>".COURSE_RELATION_TYPE_RRHH.""; WHERE course_code = '$_cid' AND relation_type<>".COURSE_RELATION_TYPE_RRHH."";
} }
else { else {
$sql = "SELECT count(id_user) $sql = "SELECT count(id_user)
FROM $tbl_session_course_user FROM $tbl_session_course_user
WHERE `course_code` = '$_cid'"; WHERE course_code = '$_cid'";
} }
} }
else else
@ -149,7 +149,7 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
// if user can only track one group : list users of this group // if user can only track one group : list users of this group
$sql = "SELECT count(user) $sql = "SELECT count(user)
FROM $TABLECOURSE_GROUPSUSER FROM $TABLECOURSE_GROUPSUSER
WHERE `group_id` = '$_gid'"; WHERE group_id = '$_gid'";
} }
$userGroupNb = getOneResult($sql); $userGroupNb = getOneResult($sql);
$step = 25; // number of student per page $step = 25; // number of student per page
@ -186,19 +186,19 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
if( $is_allowedToTrackEverybodyInCourse ) if( $is_allowedToTrackEverybodyInCourse )
{ {
// list of users in this course // list of users in this course
$sql = "SELECT `u`.`user_id`, `u`.`firstname`,`u`.`lastname` $sql = "SELECT u.user_id, u.firstname,u.lastname
FROM $TABLECOURSUSER cu , $TABLEUSER u FROM $TABLECOURSUSER cu , $TABLEUSER u
WHERE `cu`.`user_id` = `u`.`user_id` AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." WHERE cu.user_id = u.user_id AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
AND `cu`.`course_code` = '$_cid' AND cu.course_code = '$_cid'
LIMIT $offset,$step"; LIMIT $offset,$step";
} }
else else
{ {
// list of users of this group // list of users of this group
$sql = "SELECT `u`.`user_id`, `u`.`firstname`,`u`.`lastname` $sql = "SELECT u.user_id, u.firstname,u.lastname
FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u
WHERE `gu`.`user_id` = `u`.`user_id` WHERE gu.user_id = u.user_id
AND `gu`.`group_id` = '$_gid' AND gu.group_id = '$_gid'
LIMIT $offset,$step"; LIMIT $offset,$step";
} }
$list_users = getManyResults3Col($sql); $list_users = getManyResults3Col($sql);
@ -224,11 +224,11 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
else else
{ {
// check if user is in the group of this tutor // check if user is in the group of this tutor
$sql = "SELECT `u`.`firstname`,`u`.`lastname`, `u`.`email` $sql = "SELECT u.firstname,u.lastname, u.email
FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u
WHERE `gu`.`user_id` = `u`.`user_id` WHERE gu.user_id = u.user_id
AND `gu`.`group_id` = '$_gid' AND gu.group_id = '$_gid'
AND `u`.`user_id` = '$uInfo'"; AND u.user_id = '$uInfo'";
$query = Database::query($sql); $query = Database::query($sql);
$tracked_user_info = @Database::fetch_assoc($query); $tracked_user_info = @Database::fetch_assoc($query);
if(is_array($tracked_user_info)) $tracking_is_accepted = true; if(is_array($tracked_user_info)) $tracking_is_accepted = true;

Write Preview
Loading…
Cancel
Save