From 009a965863127fd476e060d7d4c64cbc89d72142 Mon Sep 17 00:00:00 2001 From: ethem Date: Thu, 26 Oct 2006 08:41:02 +0000 Subject: [PATCH] get_courses() is only getting visible courses. This is a problem when an user wants to view old payments. --- enrol/authorize/locallib.php | 56 +++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 43ff0675396..ca7aea1ac3f 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -44,37 +44,41 @@ function authorize_print_orders($courseid, $userid) AN_STATUS_TEST => $authstrs->tested ); - if ($courses = get_courses('all', 'c.sortorder ASC', 'c.id,c.fullname,c.enrol')) { + $sql = "SELECT id, fullname FROM {$CFG->prefix}course "; + if ($CFG->enrol == 'authorize') { // default enrolment plugin + $sql .= "WHERE (enrol IS NULL) OR (enrol='') OR (enrol = 'authorize') "; + } + else { + $sql .= "WHERE (enrol = 'authorize') "; + } + $sql .= "ORDER BY sortorder, fullname"; + if ($courses = get_records_sql($sql)) { $popupcrs = array(); foreach ($courses as $crs) { - if ($crs->enrol == 'authorize' || (empty($crs->enrol) && $CFG->enrol == 'authorize')) { - $popupcrs[intval($crs->id)] = $crs->fullname; - } + $popupcrs[$crs->id] = $crs->fullname; } - if (!empty($popupcrs)) { - echo ""; - echo ""; - echo "\n"; - echo "\n"; - if (has_capability('enrol/authorize:uploadcsv', get_context_instance(CONTEXT_USER, $USER->id))) { - echo ""; - echo ""; - echo ""; - } - else { - echo ""; - } - echo "\n"; - - echo ""; $searchmenu = array('id' => $authstrs->orderid, 'transid' => $authstrs->transid); - echo ""; - echo ""; + echo "
$strs->status: ";popup_form($baseurl.'&course='.$courseid.'&status=',$statusmenu,'statusmenu',$status,'','','',false);echo"$strs->course: ";popup_form($baseurl.'&status='.$status.'&course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"
 
$strs->search:
"; choose_from_menu($searchmenu, 'searchtype', $searchtype, ''); - echo " = "; - echo "
"; + echo ""; + echo "\n"; + echo "\n"; + if (has_capability('enrol/authorize:uploadcsv', get_context_instance(CONTEXT_USER, $USER->id))) { + echo ""; + echo ""; echo ""; - echo ""; - echo "
$strs->status: ";popup_form($baseurl.'&course='.$courseid.'&status=',$statusmenu,'statusmenu',$status,'','','',false);echo"$strs->course: ";popup_form($baseurl.'&status='.$status.'&course=',$popupcrs,'coursesmenu',$courseid,'','','',false);echo"
"; } + else { + echo " "; + } + echo "\n"; + + echo "$strs->search: "; $searchmenu = array('id' => $authstrs->orderid, 'transid' => $authstrs->transid); + echo "
"; + echo ""; choose_from_menu($searchmenu, 'searchtype', $searchtype, ''); + echo " = "; + echo ""; + echo "
"; + echo ""; + echo ""; } $table = new flexible_table('enrol-authorize');