From: nicolasconnault Date: Mon, 10 Aug 2009 03:38:45 +0000 (+0000) Subject: MDL-19795 Converted calls to popup_form() X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7e97f14939f3f4407d5987816f37fa7c5f47de02;p=moodle.git MDL-19795 Converted calls to popup_form() --- diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 866cdfbbec..d00f9b9551 100644 --- 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 .= '
'; $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.'&course='.$courseid.'&status=',$statusmenu,'statusmenu',$status,'','','',true); + + $popupmenu .= $OUTPUT->select(moodle_select::make_popup_form($baseurl.'&course='.$courseid, 'status', $statusmenu, 'statusmenu', $status)); if ($canmanagepayments) { $popupmenu .= '
'; $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.'&status='.$status.'&course='.$courseid.'&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."&status=$status&course=$courseid&perpage=$perpage");