Browse Source

[svn r21361] FS#306 - Various fixes for better character encoding support.

Ivan Tcholakov 15 years ago
parent
commit
0977566070

+ 2 - 2
main/admin/configure_homepage.php

@@ -1,4 +1,4 @@
-<?php // $Id: configure_homepage.php 20709 2009-05-15 19:12:37Z ivantcholakov $
+<?php // $Id: configure_homepage.php 21361 2009-06-11 04:08:58Z ivantcholakov $
 /*
 ===== =========================================================================
 	Dokeos - elearning and course management software
@@ -935,7 +935,7 @@ switch($action){
 			<a href="<?php echo api_get_self(); ?>?action=insert_link"/><?php echo get_lang('InsertLink'); ?></a>
 			
 			<div class="menusection">
-				<span class="menusectioncaption"><?php echo ucfirst(get_lang('General')); ?></span>
+				<span class="menusectioncaption"><?php echo api_ucfirst(get_lang('General')); ?></span>
 				<ul class="menulist">
 
 				<?php

+ 2 - 2
main/admin/settings.php

@@ -1,4 +1,4 @@
-<?php // $Id: settings.php 20509 2009-05-11 22:20:34Z juliomontoya $
+<?php // $Id: settings.php 21361 2009-06-11 04:08:58Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -642,7 +642,7 @@ function handle_stylesheets()
 					{
 						$selected = '';
 					}
-					$show_name=get_lang(str_replace(' ','', ucwords(str_replace('_',' ', $style_dir))));
+					$show_name=get_lang(str_replace(' ','', ucwords(str_replace('_',' ', $style_dir))), '');
 					
 					if ($is_style_changeable)
 					{					

+ 1 - 1
main/calendar/myagenda.inc.php

@@ -631,7 +631,7 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
 		if ($type !== "day_view") // This is the array construction for the WEEK or MONTH view
 		{
 			//Display events in agenda
-			$agendaitems[$day] .= "<div><i>$hour:$minute</i> $course_link  <a href=\"myagenda.php?action=view&amp;view=personal&amp;day=$day&amp;month=$month&amp;year=$year&amp;id=".$item['id']."#".$item['id']."\" class=\"personal_agenda\">".$item['title']."</a></div><br>";
+			$agendaitems[$day] .= "<div><i>$hour:$minute</i> $course_link  <a href=\"myagenda.php?action=view&amp;view=personal&amp;day=$day&amp;month=$month&amp;year=$year&amp;id=".$item['id']."#".$item['id']."\" class=\"personal_agenda\">".$item['title']."</a></div><br />";
 		}
 		else // this is the array construction for the DAY view
 			{

+ 2 - 2
main/exercice/answer_admin.inc.php

@@ -22,7 +22,7 @@
 *	This script allows to manage answers. It is included from the script admin.php
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: answer_admin.inc.php 20776 2009-05-18 12:43:44Z pcool $
+* 	@version $Id: answer_admin.inc.php 21361 2009-06-11 04:08:58Z ivantcholakov $
 */
 
 
@@ -956,7 +956,7 @@ if($modifyAnswers)
   <td colspan="5"><?php echo get_lang('Answers'); ?> :</td>
 </tr>
 <tr bgcolor="#E6E6E6">
-  <td>N</td>
+  <td>N&#176;</td>
   <td><?php echo get_lang('True'); ?></td>
   <td><?php echo get_lang('Answer'); ?></td>
   <td><?php echo get_lang('Comment'); ?></td>

+ 3 - 3
main/mySpace/index.php

@@ -609,7 +609,7 @@ if(api_is_allowed_to_create_course() && $view=='teacher')
 			$table_row[] = '<center><a href="../tracking/courseLog.php?cidReq='.$course_code.'&studentlist=true"><img src="'.api_get_path(WEB_IMG_PATH).'2rightarrow.gif" border="0" /></a></center>';
 			
 			$csv_content[] = array(
-								html_entity_decode($course['title'], ENT_QUOTES, $charset),
+								api_html_entity_decode($course['title'], ENT_QUOTES, $charset),
 								$nb_students_in_course,
 								$avg_time_spent_in_course,
 								$avg_progress_in_course,
@@ -752,8 +752,8 @@ if(api_is_platform_admin() && $view=='admin')
 		$all_datas[] = $table_row;
 		
 		$csv_content[] = array(
-								html_entity_decode($a_coachs['firstname'], ENT_QUOTES, $charset),
-								html_entity_decode($a_coachs['lastname'], ENT_QUOTES, $charset),
+								api_html_entity_decode($a_coachs['firstname'], ENT_QUOTES, $charset),
+								api_html_entity_decode($a_coachs['lastname'], ENT_QUOTES, $charset),
 								$time_on_platform,
 								$last_connection,
 								$nb_courses,