diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 63c1582b83a..a4232483291 100755
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -5,11 +5,11 @@
     require_once("../../config.php");
     require_once("lib.php");
 
-    $id = optional_param('id', '', PARAM_INT);       // Course Module ID, or
-    $b = optional_param('b', '', PARAM_INT);         // sco ID
-    $user = optional_param('user', '', PARAM_INT);   // user ID
+    optional_variable($id);    // Course Module ID, or
+    optional_variable($b);     // SCO ID
+    optional_variable($user);  // User ID
 
-    if (!empty($id)) {
+    if ($id) {
         if (! $cm = get_record("course_modules", "id", $id)) {
             error("Course Module ID was incorrect");
         }
@@ -19,12 +19,12 @@
         if (! $scorm = get_record("scorm", "id", $cm->instance)) {
             error("Course module is incorrect");
         }
-    } else if (!empty($b)) {
+    } else if (isset($b)) {
         if (! $sco = get_record("scorm_scoes", "id", $b)) {
-            error("Course module is incorrect");
+            error("Scorm activity is incorrect");
         }
         if (! $scorm = get_record("scorm", "id", $sco->scorm)) {
-            error("Scorm activity is incorrect");
+            error("Course module is incorrect");
         }
         if (! $course = get_record("course", "id", $scorm->course)) {
             error("Course is misconfigured");
@@ -32,8 +32,6 @@
         if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
             error("Course Module ID was incorrect");
         }
-    } else {
-        error('A required parameter is missing');
     }
 
     require_login($course->id, false, $cm);
@@ -73,6 +71,7 @@
     if (!empty($id)) {
         if ($scoes = get_records_select("scorm_scoes","scorm='$scorm->id' ORDER BY id")) {
             if ($scousers=get_records_select("scorm_scoes_track", "scormid='$scorm->id' GROUP BY userid,scormid", "", "userid,scormid")) {
+                $table = new stdClass();
                 $table->head = array(' ', $strname);
                 $table->align = array('center', 'left');
                 $table->wrap = array('nowrap', 'nowrap');
@@ -80,7 +79,8 @@
                 $table->size = array(10, '*');
                 foreach ($scoes as $sco) {
                     if ($sco->launch!='') {
-                        $table->head[]=scorm_string_round($sco->title);
+                        $table->head[]=scorm_string_wrap($sco->title);
+                        //$table->head[]=$sco->title;
                         $table->align[] = 'center';
                         $table->wrap[] = 'nowrap';
                         $table->size[] = '*';
@@ -89,7 +89,7 @@
 
                 foreach ($scousers as $scouser) {
                     if ($userdata = scorm_get_user_data($scouser->userid)) {
-                        $row = '';
+                        $row = array();
                         $row[] = print_user_picture($scouser->userid, $course->id, $userdata->picture, false, true);
                         $row[] = "<a href=\"$CFG->wwwroot/user/view.php?id=$scouser->userid&course=$course->id\">".
                                  "$userdata->firstname $userdata->lastname</a>";
@@ -151,11 +151,154 @@
                 echo '<img src="pix/'.$trackdata->status.'.gif" alt="'.$strstatus.'" title="'.
                 $strstatus.'">&nbsp;'.$trackdata->total_time.'<br />'.$scoreview.'<br />';
                 echo '</div>'."\n";
-                foreach($trackdata as $element => $value) {
-                    if (substr($element,0,3) == 'cmi') {
-                        echo $element.' => '.$value.'<br />';
+                echo '<hr /><h2>'.get_string('details','scorm').'</h2>';
+                
+                // Print general score data
+                $table = new stdClass();
+                $table->head = array(get_string('element','scorm'), get_string('value','scorm'));
+                $table->align = array('left', 'left');
+                $table->wrap = array('nowrap', 'nowrap');
+                $table->width = '100%';
+                $table->size = array('*', '*');
+                
+                $existelements = false;
+                if ($scorm->version == 'SCORM_1.3') {
+                    $elements = array('raw' => 'cmi.score.raw',
+                                      'min' => 'cmi.score.min',
+                                      'max' => 'cmi.score.max',
+                                      'status' => 'cmi.completition_status',
+                                      'time' => 'cmi.total_time');
+                } else {
+                    $elements = array('raw' => 'cmi.core.score.raw',
+                                      'min' => 'cmi.core.score.min',
+                                      'max' => 'cmi.core.score.max',
+                                      'status' => 'cmi.core.lesson_status',
+                                      'time' => 'cmi.core.total_time');
+                }
+                foreach ($elements as $key => $element) {
+                    if (isset($trackdata->$element)) {
+                        $existelements = true;
+                        $printedelements[]=$element;
+                        $row = array();
+                        $row[] = get_string($key,'scorm');
+                        $row[] = $trackdata->$element;
+                        $table->data[] = $row;
                     }
                 }
+                if ($existelements) {
+                    echo '<h3>'.get_string('general','scorm').'</h3>';
+                    print_table($table);
+                }                
+                
+                // Print Interactions data
+                $table = new stdClass();
+                $table->head = array(get_string('identifier','scorm'),
+                                     get_string('type','scorm'),
+                                     get_string('result','scorm'),
+                                     get_string('student_response','scorm'));
+                $table->align = array('center', 'center', 'center', 'center');
+                $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap');
+                $table->width = '100%';
+                $table->size = array('*', '*', '*', '*', '*');
+                
+                $existinteraction = false;
+                
+                $i = 0;
+                $interactionid = 'cmi.interactions.'.$i.'.id';
+                
+                while (isset($trackdata->$interactionid)) {
+                    $existinteraction = true;
+                    $printedelements[]=$interactionid;
+                    $elements = array($interactionid,
+                                      'cmi.interactions.'.$i.'.type',
+                                      'cmi.interactions.'.$i.'.result',
+                                      'cmi.interactions.'.$i.'.student_response');
+                    $row = array();
+                    foreach ($elements as $element) {
+                        if (isset($trackdata->$element)) {
+                            $row[] = $trackdata->$element;
+                            $printedelements[]=$element;
+                        } else {
+                            $row[] = '&nbsp;';
+                        }
+                    }
+                    $table->data[] = $row;
+                    
+                    $i++;
+                    $interactionid = 'cmi.interactions.'.$i.'.id';
+                }
+                if ($existinteraction) {
+                    echo '<h3>'.get_string('interactions','scorm').'</h3>';
+                    print_table($table);
+                }
+                
+                // Print Objectives data
+                $table = new stdClass();
+                $table->head = array(get_string('identifier','scorm'),
+                                     get_string('status','scorm'),
+                                     get_string('raw','scorm'),
+                                     get_string('min','scorm'),
+                                     get_string('max','scorm'));
+                $table->align = array('center', 'center', 'center', 'center', 'center');
+                $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap');
+                $table->width = '100%';
+                $table->size = array('*', '*', '*', '*', '*');
+                
+                $existobjective = false;
+                
+                $i = 0;
+                $objectiveid = 'cmi.objectives.'.$i.'.id';
+                
+                while (isset($trackdata->$objectiveid)) {
+                    $existobjective = true;
+                    $printedelements[]=$objectiveid;
+                    $elements = array($objectiveid,
+                                      'cmi.objectives.'.$i.'.status',
+                                      'cmi.objectives.'.$i.'.score.raw',
+                                      'cmi.objectives.'.$i.'.score.min',
+                                      'cmi.objectives.'.$i.'.score.max');
+                    $row = array();
+                    foreach ($elements as $element) {
+                        if (isset($trackdata->$element)) {
+                            $row[] = $trackdata->$element;
+                            $printedelements[]=$element;
+                        } else {
+                            $row[] = '&nbsp;';
+                        }
+                    }
+                    $table->data[] = $row;
+                    
+                    $i++;
+                    $objectiveid = 'cmi.objectives.'.$i.'.id';
+                }
+                if ($existobjective) {
+                    echo '<h3>'.get_string('objectives','scorm').'</h3>';
+                    print_table($table);
+                }
+                $table = new stdClass();
+                $table->head = array(get_string('element','scorm'), get_string('value','scorm'));
+                $table->align = array('left', 'left');
+                $table->wrap = array('nowrap', 'wrap');
+                $table->width = '100%';
+                $table->size = array('*', '*');
+                
+                $existelements = false;
+                
+                foreach($trackdata as $element => $value) {
+                    if (substr($element,0,3) == 'cmi') { 
+                        if (!(in_array ($element, $printedelements))) {
+                            $existelements = true;
+                            $row = array();
+                            $row[] = get_string($element,'scorm') != '[['.$element.']]' ? get_string($element,'scorm') : $element;
+                            $row[] = $value;
+                            $table->data[] = $row;
+                        }
+                    }
+                }
+                if ($existelements) {
+                    echo '<h3>'.get_string('othertracks','scorm').'</h3>';
+                    print_table($table);
+                }                
                 print_simple_box_end();
             }
         } else {