[svn r20472] FS#306 - The tracking tool (obsolete?): Improvements for better encoding support.

main/tracking/courseLog.php

@@ -125,8 +125,8 @@ function count_student_in_course() {
 
 
 function sort_users($a,$b) {
-	$a = trim(strtolower($a[$_SESSION['tracking_column']]));
-	$b = trim(strtolower($b[$_SESSION['tracking_column']]));
+	$a = trim(api_strtolower($a[$_SESSION['tracking_column']]));
+	$b = trim(api_strtolower($b[$_SESSION['tracking_column']]));
 	if ($_SESSION['tracking_direction'] == 'DESC') {
 		return strcmp($b, $a);
     } else {

main/tracking/courseLogCSV.php

@@ -485,7 +485,7 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
 								while ($ar3['status'] != '') {
 									require_once('../newscorm/learnpathItem.class.php');
 									$time = learnpathItem::get_scorm_time('php',$ar3['total_time']);
-									$title = htmlentities($ar3['title'],ENT_QUOTES,$lp_charset);
+									$title = api_htmlentities($ar3['title'],ENT_QUOTES,$lp_charset);
 									$line .= $title.";".$ar3['status'].";".$ar3['score'].";".$time;
 									$ar3=Database::fetch_array($result3);
 								}
@@ -538,8 +538,8 @@ if($is_allowedToTrack && $_configuration['tracking_enabled'])
 	header('Content-Description: '.$filename);
 	header('Content-transfer-encoding: binary');
 				
-	echo html_entity_decode($title_line);
-	echo html_entity_decode($line);
+	echo api_html_entity_decode($title_line, ENT_COMPAT, $charset);
+	echo api_html_entity_decode($line, ENT_COMPAT, $charset);
 	exit;
   
 

main/tracking/personnalLog.php

@@ -309,4 +309,4 @@ else
 }
 
 Display::display_footer();
-?>
+?>

main/tracking/toolaccess_details.php

@@ -1,4 +1,4 @@
-<?php // $Id: toolaccess_details.php 12263 2007-05-03 13:34:40Z elixir_julian $
+<?php // $Id: toolaccess_details.php 20472 2009-05-11 10:02:06Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -122,7 +122,7 @@ $reqdate=$_REQUEST['reqdate'];
                     <td>
                     ";
             if(isset($_cid)) echo "<b>$_cid : </b>";
-            echo "		<b>$langToolList</b>
+            echo "		<b>".get_lang('ToolList')."</b>
 					</td>
                 </tr>
             ";
@@ -151,7 +151,7 @@ $reqdate=$_REQUEST['reqdate'];
             else
             {
                 echo "<tr>"; 
-                echo "<td colspan='2'><center>".$langNoResult."</center></td>";
+                echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
                 echo"</tr>";
             }
             echo "</table></td></tr>";
@@ -306,4 +306,4 @@ $reqdate=$_REQUEST['reqdate'];
 <?php
 // footer
 Display::display_footer();
-?>
+?>

main/tracking/userLog.php

@@ -1,4 +1,4 @@
-<?php // $Id: userLog.php 20202 2009-04-29 22:31:20Z juliomontoya $
+<?php // $Id: userLog.php 20472 2009-05-11 10:02:06Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -87,7 +87,7 @@ $interbreadcrumb[]= array ("url"=>"../group/group_space.php?gidReq=$_gid", "name
 */
 
 if(isset($uInfo)) {
-	$interbreadcrumb[]= array ('url'=>'../user/userInfo.php?uInfo='.Security::remove_XSS($uInfo), "name"=> ucfirst(get_lang('Users')));
+	$interbreadcrumb[]= array ('url'=>'../user/userInfo.php?uInfo='.Security::remove_XSS($uInfo), "name"=> api_ucfirst(get_lang('Users')));
 }
 
 $nameTools = get_lang('ToolName');
@@ -188,7 +188,7 @@ $is_allowedToTrackEverybodyInCourse = $is_allowedToTrack; // allowed to track al
  */
 function myEnc($isostring,$supposed_encoding='ISO-8859-15')
 {
-	return htmlentities($isostring,ENT_QUOTES,$supposed_encoding);
+	return api_htmlentities($isostring,ENT_QUOTES,$supposed_encoding);
 }
 
 /**
@@ -781,7 +781,7 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
        							while ($ar3['status'] != '') {
 									require_once('../newscorm/learnpathItem.class.php');
 									$time = learnpathItem::get_scorm_time('php',$ar3['total_time']);
-									$title = htmlentities($ar3['title'],ENT_QUOTES,$lp_charset);
+									$title = api_htmlentities($ar3['title'],ENT_QUOTES,$lp_charset);
        								echo "<tr><td>&nbsp;&nbsp;&nbsp;</td><td>";
        								echo "$title</td><td align=right>{$ar3['status']}</td><td     align=right>{$ar3['score']}</td><td align=right>$time</td>";
        								echo "</tr>";
@@ -831,4 +831,4 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
 </table>
 <?php
 Display::display_footer();
-?>
+?>

main/tracking/userlogCSV.php

@@ -179,7 +179,7 @@ $is_allowedToTrackEverybodyInCourse = $is_allowedToTrack; // allowed to track al
  */
 function myEnc($isostring,$supposed_encoding='ISO-8859-15')
 {
-	return htmlentities($isostring,ENT_QUOTES,$supposed_encoding);
+	return api_htmlentities($isostring,ENT_QUOTES,$supposed_encoding);
 }
 
 /**
@@ -686,8 +686,8 @@ if( ( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse ) && $_configura
 	header('Content-Description: '.$filename);
 	header('Content-transfer-encoding: binary');
 				
-	echo html_entity_decode($title_line);
-	echo html_entity_decode($line);
+	echo api_html_entity_decode($title_line, ENT_QUOTES, $charset);
+	echo api_html_entity_decode($line, ENT_QUOTES, $charset);
 	exit;