Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle

diff --combined mod/scorm/datamodels/scorm_12lib.php
index a2bb032,a0a03c0..b8ac6f2
--- 1/mod/scorm/datamodels/scorm_12lib.php
--- 2/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@@ -109,14 -109,12 +109,12 @@@ function scorm_eval_prerequisites($prer
  function scorm_get_toc($user,$scorm,$toclink=TOCJSLINK,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false, $tocheader=false) {
      global $CFG, $DB, $PAGE, $OUTPUT;
  
-     $strexpand = get_string('expcoll','scorm');
      $modestr = '';
      if ($mode == 'browse') {
          $modestr = '&mode='.$mode;
      }
  
      $result = new stdClass();
-     //$result->toc = "<ul id='s0' class='$liststyle'>\n";
      if ($tocheader) {
          $result->toc = '<div id="scorm_layout">';
          $result->toc .= '<div id="scorm_toc">';
@@@ -193,15 -191,7 +191,7 @@@
                          $i--;
                      }
                      if (($i == 0) && ($sco->parent != $currentorg)) {
-                         $style = '';
-                         if (isset($_COOKIE['hide:SCORMitem'.$sco->id])) {
-                             $style = ' style="display: none;"';
-                         }
-                         //$result->toc .= "\t\t<li><ul id='s$sublist' class='$liststyle'$style>\n";
                          $result->toc .= "\t\t<ul>\n";
- 
- 
- 
                          $level++;
                      } else {
                          $result->toc .= $closelist;
@@@ -224,21 -214,12 +214,12 @@@
              }
              if ($nextisvisible && ($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                  $sublist++;
-                 $icon = 'minus';
-                 if (isset($_COOKIE['hide:SCORMitem'.$nextsco->id])) {
-                     $icon = 'plus';
-                 }
-                 //$result->toc .= '<a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');"><img id="img'.$sublist.'" src="'.$OUTPUT->pix_url($icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
-             } else if ($isvisible) {
-                 //$result->toc .= '<img src="'.$OUTPUT->pix_url('spacer', 'scorm').'" alt="" />';
              }
              if (empty($sco->title)) {
                  $sco->title = $sco->identifier;
              }
              if (!empty($sco->launch)) {
                  if ($isvisible) {
-                     $startbold = '';
-                     $endbold = '';
                      $score = '';
                      if (empty($scoid) && ($mode != 'normal')) {
                          $scoid = $sco->id;
@@@ -277,11 -258,7 +258,7 @@@
                          }
                      }
                      if ($sco->id == $scoid) {
-                         $startbold = '<b>';
-                         $endbold = '</b>';
                          $findnext = true;
-                         $shownext = isset($sco->next) ? $sco->next : 0;
-                         $showprev = isset($sco->previous) ? $sco->previous : 0;
                      }
  
                      if (($nextid == 0) && (scorm_count_launchable($scorm->id,$currentorg) > 1) && ($nextsco!==false) && (!$findnext)) {
@@@ -314,8 -291,7 +291,7 @@@
                          if ($play) {
                              // should be disabled
                              $result->toc .= '<span>'.$statusicon.'&nbsp;'.format_string($sco->title).'</span>';
-                         }
-                         else {
+                         } else {
                              $result->toc .= $statusicon.'&nbsp;'.format_string($sco->title)."\n";
                          }
                      }
@@@ -358,7 -334,6 +334,6 @@@
      }
  
  
- 
      if ($scorm->hidetoc == 0) {
          $PAGE->requires->data_for_js('scormdata', array(
                  'plusicon' => $OUTPUT->pix_url('plus', 'scorm'),
@@@ -371,6 -346,4 +346,4 @@@
      $result->tocmenu = $OUTPUT->single_select($url, 'scoid', $tocmenus, $sco->id, null, "tocmenu");
  
      return $result;
 -}
 +}
- 
- 

diff --combined mod/scorm/datamodels/scorm_13lib.php
index cff809d,874123a..496d541
--- 1/mod/scorm/datamodels/scorm_13lib.php
--- 2/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@@ -3,7 -3,6 +3,6 @@@
  function scorm_get_toc($user,$scorm,$toclink=TOCJSLINK,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false, $tocheader=false) {
      global $CFG, $DB, $PAGE, $OUTPUT;
  
-     $strexpand = get_string('expcoll','scorm');
      $modestr = '';
      if ($mode == 'browse') {
          $modestr = '&mode='.$mode;
@@@ -84,11 -83,6 +83,6 @@@
                          $i--;
                      }
                      if (($i == 0) && ($sco->parent != $currentorg)) {
-                         $style = '';
-                         if (isset($_COOKIE['hide:SCORMitem'.$sco->id])) {
-                             $style = ' style="display: none;"';
-                         }
-                         //$result->toc .= "\t\t<li><ul id='s$sublist' class='$liststyle'$style>\n";
                          $result->toc .= "\t\t><ul>\n";
                          $level++;
                      } else {
@@@ -113,22 -107,12 +107,12 @@@
              if ($nextisvisible && ($nextsco !== false) && ($sco->parent != $nextsco->parent) &&
                 (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                  $sublist++;
-                 $icon = 'minus';
-                 if (isset($_COOKIE['hide:SCORMitem'.$nextsco->id])) {
-                     $icon = 'plus';
-                 }
- //                $result->toc .= "\t\t".'<li><a href="javascript:expandCollide(\'img'.$sublist.'\',\'s'.$sublist.'\','.$nextsco->id.');">'.
- //                                '<img id="img'.$sublist.'" src="'.$OUTPUT->pix_url($icon, 'scorm').'" alt="'.$strexpand.'" title="'.$strexpand.'"/></a>';
-             } else if ($isvisible) {
- //                $result->toc .= "\t\t".'<li><img src="'.$OUTPUT->pix_url('spacer', 'scorm').'" alt="" />';
              }
              if (empty($sco->title)) {
                  $sco->title = $sco->identifier;
              }
              if (!empty($sco->launch)) {
                  if ($isvisible) {
-                     $startbold = '';
-                     $endbold = '';
                      $score = '';
                      if (empty($scoid) && ($mode != 'normal')) {
                          $scoid = $sco->id;
@@@ -168,11 -152,7 +152,7 @@@
                      }
  
                      if ($sco->id == $scoid) {
-                         $startbold = '<b>';
-                         $endbold = '</b>';
                          $findnext = true;
-                         $shownext = isset($sco->next) ? $sco->next : 0;
-                         $showprev = isset($sco->prev) ? $sco->prev : 0;
                      }
  
                      if (($nextid == 0) && (scorm_count_launchable($scorm->id,$currentorg) > 1) && ($nextsco!==false) && (!$findnext)) {
@@@ -202,12 -182,10 +182,10 @@@
                          if ($sco->id == $scoid) {
                              $result->prerequisites = false;
                          }
-                         //$result->toc .= $statusicon.'&nbsp;'.format_string($sco->title)."\n";
                          if ($play) {
                              // should be disabled
                              $result->toc .= '<span>'.$statusicon.'&nbsp;'.format_string($sco->title).'</span>';
-                         }
-                         else {
+                         } else {
                              $result->toc .= $statusicon.'&nbsp;'.format_string($sco->title)."\n";
                          }
                      }
@@@ -260,6 -238,4 +238,4 @@@
      $result->tocmenu = $OUTPUT->single_select($url, 'scoid', $tocmenus, $sco->id, null, "tocmenu");
  
      return $result;
 -}
 +}
- 
-