--- loncom/interface/lonrequestcourse.pm 2009/08/22 18:12:37 1.21 +++ loncom/interface/lonrequestcourse.pm 2009/08/22 21:08:39 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.21 2009/08/22 18:12:37 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.23 2009/08/22 21:08:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1873,8 +1873,8 @@ sub print_request_outcome { } } } - $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}; - $crosslistings{$i}{'inst'} = $xlistinfo; + $crosslistings{$i}{'instcode'} = $xlistinfo; + $crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'}; $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'}; } } @@ -2044,6 +2044,8 @@ sub print_request_outcome { if ($validation =~ /^error(.*)$/) { $disposition = 'approval'; $validationerror = $1; + } else { + $disposition = $validation; } } else { $disposition = 'approval'; @@ -2207,7 +2209,7 @@ sub get_processtype { if (ref($domconfig->{'requestcourses'}) eq 'HASH') { %settings = %{$domconfig->{'requestcourses'}}; if (ref($settings{$crstype}) eq 'HASH') { - if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) { + if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) { $val = $settings{$crstype}{'_LC_adv'}; @{$inststatuses} = ('_LC_adv_'); } else { @@ -2366,7 +2368,7 @@ sub retrieve_settings { my %crscode = ( $i => $reqinfo{'crosslistings'}{$i}{'instcode'}, ); - &extract_instcode($dom,'crosslist',\%crscode,$1,$xlistsec); + &extract_instcode($dom,'crosslist',\%crscode,$i,$xlistsec); } } }