chamilo / chamilo-lms

main/inc/lib/message.lib.php

Spacing +20 added lines, -20 removed lines

@@ -682,7 +682,7 @@ 
      * @param string $type
      * @return bool
      */
-    public static function update_message_status($user_id, $message_id,$type)
+    public static function update_message_status($user_id, $message_id, $type)
     {
         $type = intval($type);
         if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
@@ -996,7 +996,7 @@ 
 
         $receiverUserInfo = api_get_user_info($row['user_receiver_id']);
 
-        $message_content .='<tr>';
+        $message_content .= '<tr>';
         if (api_get_setting('allow_social_tool') == 'true') {
             if ($source == 'outbox') {
                 $message_content .= get_lang('From').': <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
@@ -1012,7 +1012,7 @@ 
                 $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b>';
             }
         }
-        $message_content .=' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
+        $message_content .= ' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
 		        <br />
 		        <hr style="color:#ddd" />
 		        <table height="209px" width="100%">
@@ -1038,7 +1038,7 @@ 
         $message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.
             Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>&nbsp';
 
-        $message_content .='</div></td>
+        $message_content .= '</div></td>
 		      <td width=10></td>
 		    </tr>
 		</table>';
@@ -1115,7 +1115,7 @@ 
 
                 $items = $topic['count'];
                 $reply_label = ($items == 1) ? get_lang('GroupReply') : get_lang('GroupReplies');
-                $label =  Display::label($items.' '.$reply_label);
+                $label = Display::label($items.' '.$reply_label);
                 $topic['title'] = trim($topic['title']);
 
                 if (empty($topic['title'])) {
@@ -1225,7 +1225,7 @@ 
         $name = $user_sender_info['complete_name'];
 
         $topic_page_nr = isset($_GET['topics_page_nr']) ? intval($_GET['topics_page_nr']) : null;
-        $links.= '<div id="message-reply-link">';
+        $links .= '<div id="message-reply-link">';
         if (($my_group_role == GROUP_USER_PERMISSION_ADMIN ||
             $my_group_role == GROUP_USER_PERMISSION_MODERATOR) ||
             $main_message['user_sender_id'] == $current_user_id
@@ -1237,7 +1237,7 @@ 
                 'group_id' => $group_id,
                 'message_id' => $main_message['id'],
                 'action' => 'edit_message_group',
-                'anchor_topic' => 'topic_' . $main_message['id'],
+                'anchor_topic' => 'topic_'.$main_message['id'],
                 'topics_page_nr' => $topic_page_nr,
                 'items_page_nr' => $items_page_nr,
                 'topic_id' => $main_message['id']
@@ -1267,7 +1267,7 @@ 
             'group_id' => $group_id,
             'message_id' => $main_message['id'],
             'action' => 'reply_message_group',
-            'anchor_topic' => 'topic_' . $main_message['id'],
+            'anchor_topic' => 'topic_'.$main_message['id'],
             'topics_page_nr' => $topic_page_nr,
             'topic_id' => $main_message['id']
         ]);
@@ -1283,10 +1283,10 @@ 
             ]
         );
 
-        $links.= '</div>';
+        $links .= '</div>';
 
         $userPicture = $user_sender_info['avatar'];
-        $main_content.= '<div class="message-group-author">
+        $main_content .= '<div class="message-group-author">
                          <img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
         $user_link = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$main_message['user_sender_id'].'">'.$name.'&nbsp;</a>';
 
@@ -1299,7 +1299,7 @@ 
             $date = '<div class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($main_message['send_date']).'</div>';
         }
         $attachment = '<div class="message-attach">'.(!empty($files_attachments) ? implode('<br />', $files_attachments) : '').'</div>';
-        $main_content.= '<div class="message-group-content">'.$links.$user_link.' '.$date.$main_message['content'].$attachment.'</div>';
+        $main_content .= '<div class="message-group-content">'.$links.$user_link.' '.$date.$main_message['content'].$attachment.'</div>';
         $main_content = Security::remove_XSS($main_content, STUDENT, true);
 
         $html .= Display::div(Display::div(Display::div($main_content, array('class' => 'group_social_sub_item', 'style' => 'background-color:#fff;')), array('class' => 'group_social_item')), array('class' => 'group_social_grid'));
@@ -1320,18 +1320,18 @@ 
                 $files_attachments = self::get_links_message_attachment_files($topic['id']);
                 $name = $user_sender_info['complete_name'];
 
-                $links.= '<div id="message-reply-link">';
+                $links .= '<div id="message-reply-link">';
                 if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
-                    $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&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='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
+                    $links .= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&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='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
                         Display :: return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
                 }
-                $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
-                $links.= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
-                $links.= '</div>';
+                $links .= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
+                $links .= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
+                $links .= '</div>';
 
                 $userPicture = $user_sender_info['avatar'];
 
-                $html_items.= '<div class="message-group-author"><img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
+                $html_items .= '<div class="message-group-author"><img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
                 $user_link = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
 
                 $date = '';
@@ -1343,7 +1343,7 @@ 
                     $date = '<div class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</div>';
                 }
                 $attachment = '<div class="message-attach">'.(!empty($files_attachments) ? implode('<br />', $files_attachments) : '').'</div>';
-                $html_items.= '<div class="message-group-content">'.$links.$user_link.' '.$date.Security::remove_XSS($topic['content'], STUDENT, true).$attachment.'</div>';
+                $html_items .= '<div class="message-group-content">'.$links.$user_link.' '.$date.Security::remove_XSS($topic['content'], STUDENT, true).$attachment.'</div>';
 
                 $base_padding = 20;
 
@@ -1618,7 +1618,7 @@ 
                     break;
                 case 'deleteone' :
                     MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
-                    $html .=Display::return_message(api_xml_http_response_encode($success), 'normal', false);
+                    $html .= Display::return_message(api_xml_http_response_encode($success), 'normal', false);
                     $html .= '<br/>';
                     break;
             }
@@ -1710,7 +1710,7 @@ 
                 ON m.user_sender_id = u.user_id
                 WHERE
                     m.user_receiver_id = $userId AND
-                    m.msg_status = " . MESSAGE_STATUS_UNREAD . "
+                    m.msg_status = ".MESSAGE_STATUS_UNREAD."
                     AND m.id > $lastId
                 ORDER BY m.send_date DESC";
 

main/exercice/exercise_report.php

Spacing +3 added lines, -3 removed lines

@@ -248,7 +248,7 @@ 
             Display::addFlash(
                 Display::return_message(get_lang('MessageSent'))
             );
-            header('Location: ' . api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId);
+            header('Location: '.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId);
             exit;
         }
     }
@@ -278,8 +278,8 @@ 
         api_is_course_tutor() || api_is_course_coach()
     ) {
         $actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">'.Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
-        $actions .='<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';
-        $actions .='<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>';
 
         $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&exerciseId='.intval($_GET['exerciseId']).'" >'.
         Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';

main/exercice/exercise_show.php

Indentation +140 added lines, -140 removed lines

@@ -92,7 +92,7 @@ 
 $locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
 
 if (empty($objExercise)) {
-	$objExercise = new Exercise();
+    $objExercise = new Exercise();
     $objExercise->read($exercise_id);
 }
 $feedback_type = $objExercise->feedback_type;
@@ -100,16 +100,16 @@ 
 //Only users can see their own results
 if (!$is_allowedToEdit) {
     if ($student_id != $current_user_id) {
-    	api_not_allowed(true);
+        api_not_allowed(true);
     }
 }
 
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	Security::remove_XSS($_SESSION['gradebook']);
+    $gradebook=	Security::remove_XSS($_SESSION['gradebook']);
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
 }
 
 $fromlink = '';
@@ -124,14 +124,14 @@ 
 $htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
 
 if ($origin != 'learnpath') {
-	Display::display_header('');
+    Display::display_header('');
 } else {
     $htmlHeadXtra[] = "
     <style>
     body { background: none;}
     </style>
     ";
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 ?>
 <script>
@@ -210,12 +210,12 @@ 
         }
     }
 } else {
-	Display::display_warning_message(get_lang('CantViewResults'));
-	$show_results = false;
+    Display::display_warning_message(get_lang('CantViewResults'));
+    $show_results = false;
 }
 
 if ($origin == 'learnpath' && !isset($_GET['fb_type']) ) {
-	$show_results = false;
+    $show_results = false;
 }
 
 if ($show_results || $show_only_total_score) {
@@ -263,13 +263,13 @@ 
 $exerciseResult = array();
 
 while ($row = Database::fetch_array($result)) {
-	$question_list_from_database[] = $row['question_id'];
-	$exerciseResult[$row['question_id']] = $row['answer'];
+    $question_list_from_database[] = $row['question_id'];
+    $exerciseResult[$row['question_id']] = $row['answer'];
 }
 
 //Fixing #2073 Fixing order of questions
 if (!empty($track_exercise_info['data_tracking'])) {
-	$temp_question_list = explode(',', $track_exercise_info['data_tracking']);
+    $temp_question_list = explode(',', $track_exercise_info['data_tracking']);
 
     // Getting question list from data_tracking
     if (!empty($temp_question_list)) {
@@ -309,23 +309,23 @@ 
 
 foreach ($questionList as $questionId) {
 
-	$choice = $exerciseResult[$questionId];
-	// destruction of the Question object
-	unset($objQuestionTmp);
+    $choice = $exerciseResult[$questionId];
+    // destruction of the Question object
+    unset($objQuestionTmp);
 
-	// creates a temporary Question object
-	$objQuestionTmp 	= Question::read($questionId);
-	$questionWeighting	= $objQuestionTmp->selectWeighting();
-	$answerType			= $objQuestionTmp->selectType();
+    // creates a temporary Question object
+    $objQuestionTmp 	= Question::read($questionId);
+    $questionWeighting	= $objQuestionTmp->selectWeighting();
+    $answerType			= $objQuestionTmp->selectType();
 
-	// Start buffer
+    // Start buffer
     ob_start();
 
     /* Use switch
     switch ($answerType) {
     }*/
 
-	if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
+    if ($answerType == MULTIPLE_ANSWER || $answerType == MULTIPLE_ANSWER_TRUE_FALSE) {
         $question_result = $objExercise->manage_answer(
             $id,
             $questionId,
@@ -441,12 +441,12 @@ 
         );
         $questionScore = $question_result['score'];
         $totalScore += $question_result['score'];
-	} elseif ($answerType == HOT_SPOT) {
-	    if ($show_results) {
-		    echo '<table width="500" border="0"><tr>
+    } elseif ($answerType == HOT_SPOT) {
+        if ($show_results) {
+            echo '<table width="500" border="0"><tr>
                     <td valign="top" align="center" style="padding-left:0px;" >
                         <table border="1" bordercolor="#A4A4A4" style="border-collapse: collapse;" width="552">';
-		}
+        }
         $question_result = $objExercise->manage_answer(
             $id,
             $questionId,
@@ -485,7 +485,7 @@ 
                 <br>
             ";
         }
-	} else if($answerType == HOT_SPOT_DELINEATION) {
+    } else if($answerType == HOT_SPOT_DELINEATION) {
 
         $question_result = $objExercise->manage_answer(
             $id,
@@ -639,15 +639,15 @@ 
                 </table>
             ";
         }
-	}
+    }
 
-	if ($show_results) {
-	    if ($answerType != HOT_SPOT) {
-	        echo '</table>';
-	    }
-	}
+    if ($show_results) {
+        if ($answerType != HOT_SPOT) {
+            echo '</table>';
+        }
+    }
 
-	$comnt = null;
+    $comnt = null;
 
     if ($show_results) {
         if (
@@ -664,40 +664,40 @@ 
 
         $marksname = '';
 
-		if ($isFeedbackAllowed) {
-			$name = "fckdiv".$questionId;
-			$marksname = "marksName".$questionId;
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$url_name = get_lang('EditCommentsAndMarks');
-			} else {
-				if ($action=='edit') {
-					$url_name = get_lang('EditIndividualComment');
-				} else {
-					$url_name = get_lang('AddComments');
-				}
-			}
+        if ($isFeedbackAllowed) {
+            $name = "fckdiv".$questionId;
+            $marksname = "marksName".$questionId;
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $url_name = get_lang('EditCommentsAndMarks');
+            } else {
+                if ($action=='edit') {
+                    $url_name = get_lang('EditIndividualComment');
+                } else {
+                    $url_name = get_lang('AddComments');
+                }
+            }
             echo '<br />';
             echo Display::url($url_name, 'javascript://', array('class' => 'btn', 'onclick'=>"showfck('".$name."', '".$marksname."');"));
-			echo '<br />';
+            echo '<br />';
 
             echo '<div id="feedback_'.$name.'" style="width:100%">';
-			$comnt = trim(Event::get_comments($id, $questionId));
-			if (empty($comnt)) {
-				echo '<br />';
-			} else {
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-			echo '</div>';
+            $comnt = trim(Event::get_comments($id, $questionId));
+            if (empty($comnt)) {
+                echo '<br />';
+            } else {
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+            echo '</div>';
 
             echo '<div id="'.$name.'" style="display:none">';
-			$arrid[] = $questionId;
-			$feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
-			$feedback_form->addElement('html','<br>');
-			$renderer =& $feedback_form->defaultRenderer();
-			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
-			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
-			$comnt = Event::get_comments($id, $questionId);
-			$default = array('comments_'.$questionId =>  $comnt);
+            $arrid[] = $questionId;
+            $feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
+            $feedback_form->addElement('html','<br>');
+            $renderer =& $feedback_form->defaultRenderer();
+            $renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
+            $renderer->setCustomElementTemplate('<div align="left">{element}</div>');
+            $comnt = Event::get_comments($id, $questionId);
+            $default = array('comments_'.$questionId =>  $comnt);
 
             if ($useAdvancedEditor) {
                 $feedback_form->addElement(
@@ -714,52 +714,52 @@ 
             } else {
                 $feedback_form->addElement('textarea', 'comments_' . $questionId);
             }
-			$feedback_form->addElement('html','<br>');
-			$feedback_form->setDefaults($default);
-			$feedback_form->display();
-			echo '</div>';
-
-		} else {
-			$comnt = Event::get_comments($id, $questionId);
-			echo '<br />';
-			if (!empty($comnt)) {
-				echo '<b>'.get_lang('Feedback').'</b>';
-				echo '<div id="question_feedback">'.$comnt.'</div>';
-			}
-		}
-
-		if ($is_allowedToEdit && $isFeedbackAllowed) {
-			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
-				$marksname = "marksName".$questionId;
+            $feedback_form->addElement('html','<br>');
+            $feedback_form->setDefaults($default);
+            $feedback_form->display();
+            echo '</div>';
+
+        } else {
+            $comnt = Event::get_comments($id, $questionId);
+            echo '<br />';
+            if (!empty($comnt)) {
+                echo '<b>'.get_lang('Feedback').'</b>';
+                echo '<div id="question_feedback">'.$comnt.'</div>';
+            }
+        }
+
+        if ($is_allowedToEdit && $isFeedbackAllowed) {
+            if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
+                $marksname = "marksName".$questionId;
                 echo '<div id="'.$marksname.'" style="display:none">';
                 echo '<form name="marksform_'.$questionId.'" method="post" action="">';
-				$arrmarks[] = $questionId;
-				echo get_lang("AssignMarks");
-				echo "&nbsp;<select name='marks' id='marks'>";
-				for ($i=0;$i<=$questionWeighting;$i++) {
-					echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
-				}
-				echo '</select>';
-				echo '</form><br /></div>';
-
-				if ($questionScore == -1 ) {
-					$questionScore = 0;
-				  	echo Display::return_message(get_lang('notCorrectedYet'));
-				}
-			} else {
-				$arrmarks[] = $questionId;
-				echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
+                $arrmarks[] = $questionId;
+                echo get_lang("AssignMarks");
+                echo "&nbsp;<select name='marks' id='marks'>";
+                for ($i=0;$i<=$questionWeighting;$i++) {
+                    echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
+                }
+                echo '</select>';
+                echo '</form><br /></div>';
+
+                if ($questionScore == -1 ) {
+                    $questionScore = 0;
+                        echo Display::return_message(get_lang('notCorrectedYet'));
+                }
+            } else {
+                $arrmarks[] = $questionId;
+                echo '<div id="'.$marksname.'" style="display:none"><form name="marksform_'.$questionId.'" method="post" action="">
 					  <select name="marks" id="marks" style="display:none;"><option>'.$questionScore.'</option></select></form><br/ ></div>';
-			}
-		} else {
-			if ($questionScore == -1) {
-				 $questionScore = 0;
-			}
-		}
-	}
+            }
+        } else {
+            if ($questionScore == -1) {
+                    $questionScore = 0;
+            }
+        }
+    }
 
     $my_total_score  = $questionScore;
-	$my_total_weight = $questionWeighting;
+    $my_total_weight = $questionWeighting;
     $totalWeighting += $questionWeighting;
     $category_was_added_for_this_test = false;
 
@@ -805,7 +805,7 @@ 
 
     $score = array();
     if ($show_results) {
-		$score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
+        $score['result'] = get_lang('Score')." : ".ExerciseLib::show_score($my_total_score, $my_total_weight, false, false);
         $score['pass']   = $my_total_score >= $my_total_weight ? true : false;
         $score['type']   = $answerType;
         $score['score']  = $my_total_score;
@@ -813,18 +813,18 @@ 
         $score['comments'] = isset($comnt) ? $comnt : null;
     }
 
-	unset($objAnswerTmp);
-	$i++;
+    unset($objAnswerTmp);
+    $i++;
 
     $contents = ob_get_clean();
 
     $question_content = '<div class="question_row">';
 
- 	if ($show_results) {
+        if ($show_results) {
         //Shows question title an description
-	    $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
-	}
-	$counter++;
+        $question_content .= $objQuestionTmp->return_header(null, $counter, $score);
+    }
+    $counter++;
     $question_content .= $contents;
     $question_content .= '</div>';
     $exercise_content .= $question_content;
@@ -834,12 +834,12 @@ 
 
 //Total score
 if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
-	if ($show_results || $show_only_total_score) {
+    if ($show_results || $show_only_total_score) {
         $total_score_text .= '<div class="question_row">';
         $my_total_score_temp = $totalScore;
-	    if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
-	        $my_total_score_temp = 0;
-	    }
+        if ($objExercise->selectPropagateNeg() == 0 && $my_total_score_temp < 0) {
+            $my_total_score_temp = 0;
+        }
         $total_score_text .= ExerciseLib::get_question_ribbon(
             $objExercise,
             $my_total_score_temp,
@@ -847,7 +847,7 @@ 
             true
         );
         $total_score_text .= '</div>';
-	}
+    }
 }
 
 if (!empty($category_list) && ($show_results || $show_only_total_score)) {
@@ -871,26 +871,26 @@ 
 }
 
 if ($isFeedbackAllowed) {
-	if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
-		echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
-		echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
-		echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
-		echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
-		echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
-		echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
-	} else {
-		echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
-	}
-	if ($origin !='learnpath' && $origin!='student_progress') {
+    if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
+        echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
+        echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
+        echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
+        echo '<input type = "hidden" name="student_id"       value="'.$student_id.'">';
+        echo '<input type = "hidden" name="total_score"      value="'.$totalScore.'"> ';
+        echo '<input type = "hidden" name="my_exe_exo_id"    value="'.$exercise_id.'"> ';
+    } else {
+        echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
+    }
+    if ($origin !='learnpath' && $origin!='student_progress') {
         echo '<label><input type= "checkbox" name="send_notification"> '.get_lang('SendEmail').'</label>';
-		?>
+        ?>
         <br />
         <button type="submit" class="btn btn-primary" value="<?php echo get_lang('Ok'); ?>" onclick="getFCK('<?php echo $strids; ?>','<?php echo $marksid; ?>');">
             <?php echo get_lang('CorrectTest'); ?>
         </button>
 		</form>
 		<?php
-	}
+    }
 }
 
 //Came from lpstats in a lp
@@ -907,21 +907,21 @@ 
 }
 
 if ($origin != 'learnpath') {
-	//we are not in learnpath tool
-	Display::display_footer();
+    //we are not in learnpath tool
+    Display::display_footer();
 } else {
-	if (!isset($_GET['fb_type'])) {
-		$lp_mode =  $_SESSION['lp_mode'];
-		$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
-		$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
-		echo '<script type="text/javascript">'.$href.'</script>';
-		// Record the results in the learning path, using the SCORM interface (API)
-		echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
-		echo '</body></html>';
-	} else {
-		Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
+    if (!isset($_GET['fb_type'])) {
+        $lp_mode =  $_SESSION['lp_mode'];
+        $url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
+        $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
+        echo '<script type="text/javascript">'.$href.'</script>';
+        // Record the results in the learning path, using the SCORM interface (API)
+        echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";
+        echo '</body></html>';
+    } else {
+        Display::display_normal_message(get_lang('ExerciseFinished').' '.get_lang('ToContinueUseMenu'));
         echo '<br />';
-	}
+    }
 }
 
 // Destroying the session

Spacing +76 added lines, -76 removed lines

@@ -16,7 +16,7 @@ 
 
 require_once '../inc/global.inc.php';
 $debug = false;
-if (empty($origin) ) {
+if (empty($origin)) {
     $origin = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null;
 }
 
@@ -30,21 +30,21 @@ 
 $TBL_EXERCISE_QUESTION 	= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
 $TBL_QUESTIONS         	= Database::get_course_table(TABLE_QUIZ_QUESTION);
 $TBL_TRACK_EXERCISES    = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-$TBL_TRACK_ATTEMPT		= Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+$TBL_TRACK_ATTEMPT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 
 // General parameters passed via POST/GET
-if ($debug) { error_log('Entered exercise_result.php: '.print_r($_POST,1)); }
+if ($debug) { error_log('Entered exercise_result.php: '.print_r($_POST, 1)); }
 
 if (empty($formSent)) {            $formSent       = isset($_REQUEST['formSent']) ? $_REQUEST['formSent'] : null; }
 if (empty($exerciseResult)) {      $exerciseResult = isset($_SESSION['exerciseResult']) ? $_SESSION['exerciseResult'] : null; }
-if (empty($questionId)) {          $questionId     = isset($_REQUEST['questionId']) ? $_REQUEST['questionId'] : null;}
-if (empty($choice)) {              $choice         = isset($_REQUEST['choice']) ? $_REQUEST['choice'] : null;}
-if (empty($questionNum)) {         $questionNum    = isset($_REQUEST['num']) ? $_REQUEST['num'] : null;}
-if (empty($nbrQuestions)) {        $nbrQuestions   = isset($_REQUEST['nbrQuestions']) ? $_REQUEST['nbrQuestions'] : null;}
-if (empty($questionList)) {        $questionList   = isset($_SESSION['questionList']) ? $_SESSION['questionList'] : null;}
-if (empty($objExercise)) {         $objExercise    = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null;}
-if (empty($exeId)) {               $exeId          = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;}
-if (empty($action)) {              $action         = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;}
+if (empty($questionId)) {          $questionId     = isset($_REQUEST['questionId']) ? $_REQUEST['questionId'] : null; }
+if (empty($choice)) {              $choice         = isset($_REQUEST['choice']) ? $_REQUEST['choice'] : null; }
+if (empty($questionNum)) {         $questionNum    = isset($_REQUEST['num']) ? $_REQUEST['num'] : null; }
+if (empty($nbrQuestions)) {        $nbrQuestions   = isset($_REQUEST['nbrQuestions']) ? $_REQUEST['nbrQuestions'] : null; }
+if (empty($questionList)) {        $questionList   = isset($_SESSION['questionList']) ? $_SESSION['questionList'] : null; }
+if (empty($objExercise)) {         $objExercise    = isset($_SESSION['objExercise']) ? $_SESSION['objExercise'] : null; }
+if (empty($exeId)) {               $exeId          = isset($_REQUEST['id']) ? $_REQUEST['id'] : null; }
+if (empty($action)) {              $action         = isset($_REQUEST['action']) ? $_REQUEST['action'] : null; }
 
 $id = intval($_REQUEST['id']); //exe id
 
@@ -105,23 +105,23 @@ 
 }
 
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	Security::remove_XSS($_SESSION['gradebook']);
+	$gradebook = Security::remove_XSS($_SESSION['gradebook']);
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+if (!empty($gradebook) && $gradebook == 'view') {
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('ToolGradebook'));
 }
 
 $fromlink = '';
 
-$interbreadcrumb[]= array("url" => "exercise.php?".api_get_cidreq(),"name" => get_lang('Exercises'));
-$interbreadcrumb[]= array("url" => "overview.php?exerciseId=".$exercise_id.'&'.api_get_cidreq(),"name" => $objExercise->name);
-$interbreadcrumb[]= array("url" => "#","name" => get_lang('Result'));
+$interbreadcrumb[] = array("url" => "exercise.php?".api_get_cidreq(), "name" => get_lang('Exercises'));
+$interbreadcrumb[] = array("url" => "overview.php?exerciseId=".$exercise_id.'&'.api_get_cidreq(), "name" => $objExercise->name);
+$interbreadcrumb[] = array("url" => "#", "name" => get_lang('Result'));
 
 $this_section = SECTION_COURSES;
 
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
 
 if ($origin != 'learnpath') {
 	Display::display_header('');
@@ -178,9 +178,9 @@ 
 // Avoiding the "Score 0/0" message  when the exe_id is not set
 if (!empty($track_exercise_info)) {
     // if the results_disabled of the Quiz is 1 when block the script
-    $result_disabled		= $track_exercise_info['results_disabled'];
+    $result_disabled = $track_exercise_info['results_disabled'];
 
-    if (!(api_is_platform_admin() || api_is_course_admin() || api_is_course_coach()) ) {
+    if (!(api_is_platform_admin() || api_is_course_admin() || api_is_course_coach())) {
         if ($result_disabled == 1) {
             $show_results = false;
             if ($origin != 'learnpath') {
@@ -214,7 +214,7 @@ 
 	$show_results = false;
 }
 
-if ($origin == 'learnpath' && !isset($_GET['fb_type']) ) {
+if ($origin == 'learnpath' && !isset($_GET['fb_type'])) {
 	$show_results = false;
 }
 
@@ -239,7 +239,7 @@ 
 $arrques = array();
 $arrans  = array();
 
-$user_restriction = $is_allowedToEdit ? '' :  "AND user_id=".intval($student_id)." ";
+$user_restriction = $is_allowedToEdit ? '' : "AND user_id=".intval($student_id)." ";
 $sql = "SELECT attempts.question_id, answer
         FROM $TBL_TRACK_ATTEMPT as attempts
         INNER JOIN ".$TBL_TRACK_EXERCISES." AS stats_exercises
@@ -294,7 +294,7 @@ 
 $total_weighting = 0;
 foreach ($questionList as $questionId) {
     $objQuestionTmp = Question::read($questionId);
-    $total_weighting +=$objQuestionTmp->selectWeighting();
+    $total_weighting += $objQuestionTmp->selectWeighting();
 }
 
 $counter = 1;
@@ -314,9 +314,9 @@ 
 	unset($objQuestionTmp);
 
 	// creates a temporary Question object
-	$objQuestionTmp 	= Question::read($questionId);
-	$questionWeighting	= $objQuestionTmp->selectWeighting();
-	$answerType			= $objQuestionTmp->selectType();
+	$objQuestionTmp = Question::read($questionId);
+	$questionWeighting = $objQuestionTmp->selectWeighting();
+	$answerType = $objQuestionTmp->selectType();
 
 	// Start buffer
     ob_start();
@@ -485,7 +485,7 @@ 
                 <br>
             ";
         }
-	} else if($answerType == HOT_SPOT_DELINEATION) {
+	} else if ($answerType == HOT_SPOT_DELINEATION) {
 
         $question_result = $objExercise->manage_answer(
             $id,
@@ -518,20 +518,20 @@ 
         if ($show_results) {
 
             if ($overlap_color) {
-                $overlap_color='green';
+                $overlap_color = 'green';
             } else {
-                $overlap_color='red';
+                $overlap_color = 'red';
             }
 
             if ($missing_color) {
-                $missing_color='green';
+                $missing_color = 'green';
             } else {
-                $missing_color='red';
+                $missing_color = 'red';
             }
             if ($excess_color) {
-                $excess_color='green';
+                $excess_color = 'green';
             } else {
-                $excess_color='red';
+                $excess_color = 'red';
             }
 
             if (!is_numeric($final_overlap)) {
@@ -545,11 +545,11 @@ 
                 $final_excess = 0;
             }
 
-            if ($final_excess>100) {
+            if ($final_excess > 100) {
                 $final_excess = 100;
             }
 
-            $table_resume='<table class="data_table">
+            $table_resume = '<table class="data_table">
             <tr class="row_odd" >
             <td></td>
             <td ><b>'.get_lang('Requirements').'</b></td>
@@ -559,38 +559,38 @@ 
             <tr class="row_even">
             <td><b>'.get_lang('Overlap').'</b></td>
             <td>'.get_lang('Min').' '.$threadhold1.'</td>
-                <td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0)?0:intval($final_overlap)).'</div></td>
+                <td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
             </tr>
 
             <tr>
                 <td><b>'.get_lang('Excess').'</b></td>
                 <td>'.get_lang('Max').' '.$threadhold2.'</td>
-                <td><div style="color:'.$excess_color.'">'.(($final_excess < 0)?0:intval($final_excess)).'</div></td>
+                <td><div style="color:'.$excess_color.'">'.(($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
             </tr>
 
             <tr class="row_even">
                 <td><b>'.get_lang('Missing').'</b></td>
                 <td>'.get_lang('Max').' '.$threadhold3.'</td>
-                <td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
+                <td><div style="color:'.$missing_color.'">'.(($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
             </tr></table>';
 
-            if ($answerType!= HOT_SPOT_DELINEATION) {
-                $item_list = explode('@@',$destination);
+            if ($answerType != HOT_SPOT_DELINEATION) {
+                $item_list = explode('@@', $destination);
 
                 $try = $item_list[0];
                 $lp = $item_list[1];
                 $destinationid = $item_list[2];
                 $url = $item_list[3];
-                $table_resume='';
+                $table_resume = '';
             } else {
-                if ($next==0) {
+                if ($next == 0) {
                     $try = $try_hotspot;
                     $lp = $lp_hotspot;
-                    $destinationid= $select_question_hotspot;
-                    $url=$url_hotspot;
+                    $destinationid = $select_question_hotspot;
+                    $url = $url_hotspot;
                 } else {
                     //show if no error
-                    $comment=$answerComment = $objAnswerTmp->selectComment($nbrAnswers);
+                    $comment = $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
                     $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
                 }
             }
@@ -598,14 +598,14 @@ 
             echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
             if ($answerType == HOT_SPOT_DELINEATION) {
                 if ($organs_at_risk_hit > 0) {
-                    $message='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
-                    $message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
+                    $message = '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+                    $message .= '<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
                 } else {
-                    $message='<p>'.get_lang('YourDelineation').'</p>';
-                    $message.=$table_resume;
-                    $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
+                    $message = '<p>'.get_lang('YourDelineation').'</p>';
+                    $message .= $table_resume;
+                    $message .= '<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
                 }
-                $message.='<p>'.$comment.'</p>';
+                $message .= '<p>'.$comment.'</p>';
                 echo $message;
             } else {
                 echo '<p>'.$comment.'</p>';
@@ -614,8 +614,8 @@ 
             //showing the score
             $queryfree = "select marks from ".$TBL_TRACK_ATTEMPT." WHERE exe_id = ".intval($id)." and question_id= ".intval($questionId)."";
             $resfree = Database::query($queryfree);
-            $questionScore= Database::result($resfree,0,"marks");
-            $totalScore+=$questionScore;
+            $questionScore = Database::result($resfree, 0, "marks");
+            $totalScore += $questionScore;
             $relPath = api_get_path(REL_PATH);
             echo '</table></td></tr>';
 
@@ -670,7 +670,7 @@ 
 			if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
 				$url_name = get_lang('EditCommentsAndMarks');
 			} else {
-				if ($action=='edit') {
+				if ($action == 'edit') {
 					$url_name = get_lang('EditIndividualComment');
 				} else {
 					$url_name = get_lang('AddComments');
@@ -691,9 +691,9 @@ 
 
             echo '<div id="'.$name.'" style="display:none">';
 			$arrid[] = $questionId;
-			$feedback_form = new FormValidator('frmcomments'.$questionId,'post','');
-			$feedback_form->addElement('html','<br>');
-			$renderer =& $feedback_form->defaultRenderer();
+			$feedback_form = new FormValidator('frmcomments'.$questionId, 'post', '');
+			$feedback_form->addElement('html', '<br>');
+			$renderer = & $feedback_form->defaultRenderer();
 			$renderer->setFormTemplate('<form{attributes}><div align="left">{content}</div></form>');
 			$renderer->setCustomElementTemplate('<div align="left">{element}</div>');
 			$comnt = Event::get_comments($id, $questionId);
@@ -702,7 +702,7 @@ 
             if ($useAdvancedEditor) {
                 $feedback_form->addElement(
                     'html_editor',
-                    'comments_' . $questionId,
+                    'comments_'.$questionId,
                     null,
                     null,
                     array(
@@ -712,9 +712,9 @@ 
                     )
                 );
             } else {
-                $feedback_form->addElement('textarea', 'comments_' . $questionId);
+                $feedback_form->addElement('textarea', 'comments_'.$questionId);
             }
-			$feedback_form->addElement('html','<br>');
+			$feedback_form->addElement('html', '<br>');
 			$feedback_form->setDefaults($default);
 			$feedback_form->display();
 			echo '</div>';
@@ -736,13 +736,13 @@ 
 				$arrmarks[] = $questionId;
 				echo get_lang("AssignMarks");
 				echo "&nbsp;<select name='marks' id='marks'>";
-				for ($i=0;$i<=$questionWeighting;$i++) {
-					echo '<option '.(($i==$questionScore)?"selected='selected'":'').'>'.$i.'</option>';
+				for ($i = 0; $i <= $questionWeighting; $i++) {
+					echo '<option '.(($i == $questionScore) ? "selected='selected'" : '').'>'.$i.'</option>';
 				}
 				echo '</select>';
 				echo '</form><br /></div>';
 
-				if ($questionScore == -1 ) {
+				if ($questionScore == -1) {
 					$questionScore = 0;
 				  	echo Display::return_message(get_lang('notCorrectedYet'));
 				}
@@ -778,7 +778,7 @@ 
     }
 
     if (isset($objQuestionTmp->category_list) && !empty($objQuestionTmp->category_list)) {
-        foreach($objQuestionTmp->category_list as $category_id) {
+        foreach ($objQuestionTmp->category_list as $category_id) {
             $category_list[$category_id]['score'] += $my_total_score;
             $category_list[$category_id]['total'] += $my_total_weight;
             $category_was_added_for_this_test = true;
@@ -833,7 +833,7 @@ 
 $total_score_text = null;
 
 //Total score
-if ($origin!='learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
+if ($origin != 'learnpath' || ($origin == 'learnpath' && isset($_GET['fb_type']))) {
 	if ($show_results || $show_only_total_score) {
         $total_score_text .= '<div class="question_row">';
         $my_total_score_temp = $totalScore;
@@ -865,13 +865,13 @@ 
 
 if ($isFeedbackAllowed) {
     if (is_array($arrid) && is_array($arrmarks)) {
-        $strids = implode(",",$arrid);
-        $marksid = implode(",",$arrmarks);
+        $strids = implode(",", $arrid);
+        $marksid = implode(",", $arrmarks);
     }
 }
 
 if ($isFeedbackAllowed) {
-	if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
+	if (in_array($origin, array('tracking_course', 'user_course', 'correct_exercise_in_lp'))) {
 		echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
 		echo '<input type = "hidden" name="lp_item_id"       value="'.$learnpath_id.'">';
 		echo '<input type = "hidden" name="lp_item_view_id"  value="'.$lp_item_view_id.'">';
@@ -881,7 +881,7 @@ 
 	} else {
 		echo ' <form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=1&comments=update&exeid='.$id.'" method="post">';
 	}
-	if ($origin !='learnpath' && $origin!='student_progress') {
+	if ($origin != 'learnpath' && $origin != 'student_progress') {
         echo '<label><input type= "checkbox" name="send_notification"> '.get_lang('SendEmail').'</label>';
 		?>
         <br />
@@ -894,14 +894,14 @@ 
 }
 
 //Came from lpstats in a lp
-if ($origin =='student_progress') { ?>
+if ($origin == 'student_progress') { ?>
 	<button type="button" class="back" onclick="window.history.go(-1);" value="<?php echo get_lang('Back'); ?>" >
-	<?php echo get_lang('Back');?></button>
+	<?php echo get_lang('Back'); ?></button>
 <?php
-} else if($origin=='myprogress') {
+} else if ($origin == 'myprogress') {
 ?>
 	<button type="button" class="save" onclick="top.location.href='../auth/my_progress.php?course=<?php echo api_get_course_id()?>'" value="<?php echo get_lang('Finish'); ?>" >
-        <?php echo get_lang('Finish');?>
+        <?php echo get_lang('Finish'); ?>
     </button>
 <?php
 }
@@ -911,9 +911,9 @@ 
 	Display::display_footer();
 } else {
 	if (!isset($_GET['fb_type'])) {
-		$lp_mode =  $_SESSION['lp_mode'];
+		$lp_mode = $_SESSION['lp_mode'];
 		$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exeId.'&fb_type='.$feedback_type;
-		$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'" ';
+		$href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'" ';
 		echo '<script type="text/javascript">'.$href.'</script>';
 		// Record the results in the learning path, using the SCORM interface (API)
 		echo "<script>window.parent.API.void_save_asset('$totalScore', '$totalWeighting', 0, 'completed'); </script>";