MDL-19815 Converted calls to popup_form()

diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php
index 804f756742e3dc50d06e07db41e0863087c15c25..728abd9bcc294f32d3a09d8c2a008d8901a9cd88 100644 (file)
--- a/mod/scorm/datamodels/aicclib.php
+++ b/mod/scorm/datamodels/aicclib.php
@@ -539,8 +539,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
         $result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap();
     }
 
-    $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr.'&scoid=';
-    $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true);
+    $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr;
+    $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id);
+    $select->nothinglabel = false;
+    $result->tocmenu = $OUTPUT->select($select);
 
     return $result;
 }

diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php
index 637f3b47bde86603e8a11743e25d340ed8fc85bc..116a2b6b12ccc9c7006b5afe0d2fb381e27b882d 100644 (file)
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@ -323,8 +323,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
 
-    $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr.'&scoid=';
-    $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true);
+    $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr;
+    $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id);
+    $select->nothinglabel = false;
+    $result->tocmenu = $OUTPUT->select($select);
 
     return $result;
 }

diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php
index 95b3aed640c716d64608430c14b51f21f01f1355..f7fa4d50a7998719a150830f41f1c91ac696ea4b 100644 (file)
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@ -214,8 +214,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
         $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
 
-    $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr.'&scoid=';
-    $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true);
+    $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr;
+    $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id);
+    $select->nothinglabel = false;
+    $result->tocmenu = $OUTPUT->select($select);
 
     return $result;
 }