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

merge

Browse Source
skala
cvargas 15 years ago
parent ac8ad456d8 bdef64955e
commit 338a10ad69
8 changed files with 25 additions and 19 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/css/blue_lagoon/default.css
  2. 15
      main/exercice/exercise.lib.php
  3. BIN
      main/img/talk.png
  4. 9
      main/inc/footer.inc.php
  5. 2
      main/inc/lib/fckeditor/toolbars/extended/glossary.php
  6. 4
      main/inc/lib/message.lib.php
  7. 6
      main/inc/lib/tracking.lib.php
  8. 4
      main/wiki/wiki.inc.php

4
main/css/blue_lagoon/default.css
Unescape View File

@ -388,6 +388,10 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
padding-top:20px;
margin-left:10px;
}
#footer #coursemanager {
float: left;
margin-left: 10px;
}
#footer a {
color:#fff;
}

15
main/exercice/exercise.lib.php
Unescape View File

@ -105,7 +105,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
// construction of the Answer object
$objAnswerTmp=new Answer($questionId);
$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
// only used for the answer type "Matching"
if($answerType == MATCHING)
@ -232,7 +232,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
<p style='float:left; padding-right:4px;'>
<span><input class='checkbox' type='radio' name='choice[".$questionId."]' value='".$numAnswer."'></p></span>";
$answer=api_parse_tex($answer);
$s.=strip_tags($answer);
$s.=Security::remove_XSS($answer, STUDENT);
$s.="</div></td></tr>";
} elseif($answerType == MULTIPLE_ANSWER) {
@ -244,7 +244,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
<p style='float:left; padding-right:4px;'>
<span><input class='checkbox' type='checkbox' name='choice[".$questionId."][".$numAnswer."]' value='1'></p></span>";
$answer = api_parse_tex($answer);
$s.=strip_tags($answer);
$s.=Security::remove_XSS($answer, STUDENT);
$s.="</div></td></tr>";
} elseif($answerType == MULTIPLE_ANSWER_COMBINATION) {
@ -256,20 +256,17 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
<p style='float:left; padding-right:4px;'>
<span><input class='checkbox' type='checkbox' name='choice[".$questionId."][".$numAnswer."]' value='1'></p></span>";
$answer = api_parse_tex($answer);
$s.=strip_tags($answer);
$s.=Security::remove_XSS($answer, STUDENT);
$s.="</div></td></tr>";
}
// fill in blanks
elseif($answerType == FILL_IN_BLANKS)
{
elseif($answerType == FILL_IN_BLANKS) {
$s.="<tr><td colspan='2'>$answer</td></tr>";
}
// free answer
// matching // TODO: replace $answerId by $numAnswer
else {
else {
if ($answerCorrect) {
$s.="
<tr>

BIN
main/img/talk.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

9
main/inc/footer.inc.php
Unescape View File

@ -94,11 +94,16 @@ if (api_get_setting('show_tutor_data')=='true') {
echo '<br>';
}
if (api_get_setting('show_teacher_data')=='true') {
if (api_get_setting('show_teacher_data')=='true') {
if (api_get_setting('show_tutor_data')=='false'){
$class='platformmanager';
} else {
$class='coursemanager';
}
// course manager
$id_course=api_get_course_id();
if (isset($id_course) && $id_course!=-1) {
echo '<span id="coursemanager">';
echo '<span id="'.$class.'">';
$mail=CourseManager::get_emails_of_tutors_to_course($id_course);
if (!empty($mail)) {
if (count($mail)>1){

2
main/inc/lib/fckeditor/toolbars/extended/glossary.php
Unescape View File

@ -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'),
'/',

4
main/inc/lib/message.lib.php
Unescape View File

@ -904,7 +904,7 @@ class MessageManager
$html .= '<a name="topic_'.$topic['id'].'"></a>';
$html.= '<div style="margin-bottom:10px">';
$html.= '<div id="message-reply-link" style="margin-right:10px">
<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';
<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
$html.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
@ -934,7 +934,7 @@ class MessageManager
$html_items .= '<div class="social-box-content3">';
$html_items.= '<div id="message-reply-link">';
$html_items.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$item['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';
$html_items.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$item['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $item['user_sender_id'] == $current_user_id) {
$html_items.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$item['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';

6
main/inc/lib/tracking.lib.php
Unescape View File

@ -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";

4
main/wiki/wiki.inc.php
Unescape View File

@ -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).'">';

Write Preview
Loading…
Cancel
Save