Merge

main/inc/lib/fckeditor/toolbars/extended/glossary.php

@@ -11,7 +11,7 @@
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','FitWindow','PasteWord','-','Undo','Redo'),
 	array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
+    array('Image','mimetex'),
     array('Table','SpecialChar'),
     array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'),
     '/',

main/inc/lib/tracking.lib.php

@@ -91,15 +91,15 @@ class Tracking {
 	 */
 	public static function get_time_spent_on_the_course($user_id, $course_code) {
 		// protect datas
-		$user_id = intval($user_id);
-		$course_code = addslashes($course_code);		
+		$course_code = Database::escape_string($course_code);		
 		$tbl_track_course = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 		$condition_user = "";
 		if (is_array($user_id)) {
 			$condition_user = " AND user_id IN (".implode(',',$user_id).") ";
 		} else {
+			$user_id = intval($user_id);
 			$condition_user = " AND user_id = '$user_id' ";
-		}				
+		}			
 		$sql = " SELECT SUM(UNIX_TIMESTAMP(logout_course_date)-UNIX_TIMESTAMP(login_course_date)) as nb_seconds 
 				FROM $tbl_track_course
 				WHERE course_code='$course_code' $condition_user";

main/wiki/wiki.inc.php

@@ -910,7 +910,7 @@ function display_wiki_entry($newtitle)
 		echo '</span>';
 
 		//page action: export to pdf
-		echo '<span style="float:right;padding:0px;">';
+		echo '<span style="float:right;padding-top:5px;">';
 		echo '<form name="form_export2PDF" method="post" action="export_html2pdf.php" target="_blank, fullscreen">'; // also with  export_tcpdf.php
 		echo '<input type=hidden name="titlePDF" value="'.api_htmlentities($title, ENT_QUOTES, $charset).'">';
 		echo '<input type=hidden name="contentPDF" value="'.api_htmlentities(trim(preg_replace("/\[\[|\]\]/", " ", $content)), ENT_QUOTES, $charset).'">';
@@ -921,7 +921,7 @@ function display_wiki_entry($newtitle)
 		//page action: copy last version to doc area
 		if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 		{
-			echo '<span style="float:right;padding:0px;">';
+			echo '<span style="float:right;padding-top:5px;">';
 			echo '<form name="form_export2DOC" method="post" action="index.php" >';
 			echo '<input type=hidden name="export2DOC" value="export2doc">';
 			echo '<input type=hidden name="titleDOC" value="'.api_htmlentities($title, ENT_QUOTES, $charset).'">';