version 1.103, 2021/04/29 17:45:22
|
version 1.104, 2021/04/30 18:19:41
|
Line 337 ENDTOGGJS
|
Line 337 ENDTOGGJS
|
$catlinks,$catjs,\@codetitles,$cattype,$canviewall); |
$catlinks,$catjs,\@codetitles,$cattype,$canviewall); |
if ($env{'form.state'} eq 'listing') { |
if ($env{'form.state'} eq 'listing') { |
$r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, |
$r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef, |
\@codetitles,$canviewall)); |
\@codetitles,$canviewall,$hostname)); |
} |
} |
} else { |
} else { |
my (%add_entries); |
my (%add_entries); |
Line 386 ENDJS
|
Line 386 ENDJS
|
} |
} |
if ($env{'form.state'} eq 'listing') { |
if ($env{'form.state'} eq 'listing') { |
$r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles, |
$r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles, |
$canviewall)); |
$canviewall,$hostname)); |
} |
} |
} |
} |
} |
} |
Line 699 sub course_details {
|
Line 699 sub course_details {
|
$r->print( |
$r->print( |
&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'). |
&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'). |
'<h2>'.$textthree.'</h2>'. |
'<h2>'.$textthree.'</h2>'. |
&print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles). |
&print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles,undef,$hostname). |
'<br />'. |
'<br />'. |
'<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'. |
'<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'. |
&Apache::lonhtmlcommon::actionbox([ |
&Apache::lonhtmlcommon::actionbox([ |
Line 1322 sub search_courselist {
|
Line 1322 sub search_courselist {
|
} |
} |
|
|
sub print_course_listing { |
sub print_course_listing { |
my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_; |
my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_; |
my $output; |
my $output; |
my %courses; |
my %courses; |
my $knownuser = &user_is_known(); |
my $knownuser = &user_is_known(); |
Line 1375 sub print_course_listing {
|
Line 1375 sub print_course_listing {
|
} |
} |
my $now = time; |
my $now = time; |
$output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef, |
$output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef, |
$now,$trails,$allitems,$canviewall); |
$now,$trails,$allitems,$canviewall,$hostname); |
$output .= "\n".'<form name="linklaunch" method="post" action="">'. |
$output .= "\n".'<form name="linklaunch" method="post" action="">'. |
'<input type="hidden" name="backto" value="coursecatalog" />'. |
'<input type="hidden" name="backto" value="coursecatalog" />'. |
'<input type="hidden" name="courseid" value="" />'. |
'<input type="hidden" name="courseid" value="" />'. |
Line 1384 sub print_course_listing {
|
Line 1384 sub print_course_listing {
|
} |
} |
|
|
sub construct_data_table { |
sub construct_data_table { |
my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_; |
my ($knownuser,$domain,$courses,$details,$usersections,$now, |
|
$trails,$allitems,$canviewall,$hostname) = @_; |
my %sortname; |
my %sortname; |
if (($details eq '') || ($env{'form.showdetails'})) { |
if (($details eq '') || ($env{'form.showdetails'})) { |
$sortname{'Code'} = 'code'; |
$sortname{'Code'} = 'code'; |
Line 1886 sub courseinfo_row {
|
Line 1887 sub courseinfo_row {
|
my $usehttp = 0; |
my $usehttp = 0; |
if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { |
if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) { |
unless ((&Apache::lonnet::uses_sts()) || |
unless ((&Apache::lonnet::uses_sts()) || |
(&Apache::lonnet::waf_allssl(hostname))) { |
(&Apache::lonnet::waf_allssl($hostname))) { |
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} |
} |