MDL-19795 Converted calls to popup_form()

diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 866cdfbbec5435d7367bcd801cf0df7951a81bb9..d00f9b9551a720e1a7661f267bf4c5853bed437a 100644 (file)
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -50,7 +50,7 @@ function authorize_print_orders($courseid, $userid) {
     if (($popupcrs = $DB->get_records_sql_menu($sql, $params))) {
         $popupcrs = array($SITE->id => $SITE->fullname) + $popupcrs;
     }
-    $popupmenu = empty($popupcrs) ? '' : popup_form($baseurl.'&status='.$status.'&course=',$popupcrs,'coursesmenu',$courseid,'','','',true);
+    $popupmenu = empty($popupcrs) ? '' : $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&status='.$status, 'course', $popupcrs, 'coursesmenu', $courseid));
     $popupmenu .= '<br />';
     $statusmenu = array(
         AN_STATUS_NONE => $strs->all,
@@ -65,7 +65,8 @@ function authorize_print_orders($courseid, $userid) {
         AN_STATUS_REVIEWFAILED => $authstrs->reviewfailed,
         AN_STATUS_TEST => $authstrs->tested
     );
-    $popupmenu .= popup_form($baseurl.'&amp;course='.$courseid.'&amp;status=',$statusmenu,'statusmenu',$status,'','','',true);
+    
+    $popupmenu .= $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&course='.$courseid, 'status', $statusmenu, 'statusmenu', $status));
     if ($canmanagepayments) {
         $popupmenu .= '<br />';
         $checkbox = html_select_option::make_checkbox(1, $userid == $USER->id, get_string('mypaymentsonly', 'enrol_authorize'));
@@ -91,7 +92,7 @@ function authorize_print_orders($courseid, $userid) {
 
     if ($perpage > 100) { $perpage = 100; }
     $perpagemenus = array(5 => 5, 10 => 10, 20 => 20, 50 => 50, 100 => 100);
-    $perpagemenu = popup_form($baseurl.'&amp;status='.$status.'&amp;course='.$courseid.'&amp;perpage=',$perpagemenus,'perpagemenu',$perpage,'','','',true);
+    $perpagemenu = $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&status='.$status.'&course='.$courseid, 'perpage',$perpagemenus,'perpagemenu',$perpage));
     $table->define_columns(array('id', 'userid', 'timecreated', 'status', 'action'));
     $table->define_headers(array($authstrs->orderid, $authstrs->shopper, $strs->time, $strs->status, $perpagemenu));
     $table->define_baseurl($baseurl."&amp;status=$status&amp;course=$courseid&amp;perpage=$perpage");