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

Removing useless make_clickable see BT#7002

Browse Source
1.9.x
Julio Montoya 12 years ago
parent f227d91644
commit 71d17fe1ca
1 changed files with 18 additions and 15 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. 33
      main/inc/lib/exercise_show_functions.lib.php

33
main/inc/lib/exercise_show_functions.lib.php
Unescape View File

@ -15,7 +15,8 @@
* Class * Class
* @package chamilo.library * @package chamilo.library
*/ */
class ExerciseShowFunctions { class ExerciseShowFunctions
{
/** /**
* Shows the answer to a fill-in-the-blanks question, as HTML * Shows the answer to a fill-in-the-blanks question, as HTML
@ -57,7 +58,8 @@ class ExerciseShowFunctions {
* @param int Question ID * @param int Question ID
* @return void * @return void
*/ */
static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null) { static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null)
{
$comments = get_comments($exe_id, $questionId); $comments = get_comments($exe_id, $questionId);
if (!empty($answer)) { if (!empty($answer)) {
@ -76,7 +78,8 @@ class ExerciseShowFunctions {
} }
} }
static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null) { static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null)
{
if (isset($nano)) { if (isset($nano)) {
echo $nano->show_audio_file(); echo $nano->show_audio_file();
} }
@ -162,9 +165,9 @@ class ExerciseShowFunctions {
<td valign="top" align="left" > <td valign="top" align="left" >
<?php <?php
if ($studentChoice) { if ($studentChoice) {
echo '<span style="font-weight: bold; color: #008000;">'.nl2br(make_clickable($answerComment)).'</span>'; echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
} else { } else {
//echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
} }
?> ?>
@ -221,18 +224,18 @@ class ExerciseShowFunctions {
if ($studentChoice) { if ($studentChoice) {
if ($answerCorrect) { if ($answerCorrect) {
$color = 'green'; $color = 'green';
//echo '<span style="font-weight: bold; color: #008000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
} else { } else {
$color = 'black'; $color = 'black';
//echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
} }
echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br(make_clickable($answerComment)).'</span>'; echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
} else { } else {
if ($answerCorrect) { if ($answerCorrect) {
//echo '<span style="font-weight: bold; color: #000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
} else { } else {
//echo '<span style="font-weight: normal; color: #000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: normal; color: #000;">'.nl2br($answerComment).'</span>';
} }
} }
?> ?>
@ -311,7 +314,7 @@ class ExerciseShowFunctions {
if ($studentChoice == $answerCorrect) { if ($studentChoice == $answerCorrect) {
$color = "green"; $color = "green";
} }
echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br(make_clickable($answerComment)).'</span>'; echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
} }
?> ?>
</td> </td>
@ -389,15 +392,15 @@ class ExerciseShowFunctions {
if ($studentChoice == $answerCorrect) { if ($studentChoice == $answerCorrect) {
$color = "green"; $color = "green";
} }
echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br(make_clickable($answerComment)).'</span>'; echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
} }
if ($studentChoice == 2 || $studentChoice == '') { if ($studentChoice == 2 || $studentChoice == '') {
//echo '<span style="font-weight: bold; color: #000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
} else { } else {
if ($studentChoice == $answerCorrect) { if ($studentChoice == $answerCorrect) {
//echo '<span style="font-weight: bold; color: #008000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
} else { } else {
//echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br(make_clickable($answerComment)).'</span>'; //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
} }
} }
?> ?>

Write Preview
Loading…
Cancel
Save