version 1.102, 2019/07/23 13:58:53
|
version 1.103, 2021/04/29 17:45:22
|
Line 59 sub handler {
|
Line 59 sub handler {
|
|
|
my $serverdefdom = &Apache::lonnet::default_login_domain(); |
my $serverdefdom = &Apache::lonnet::default_login_domain(); |
my $codedom = $serverdefdom; |
my $codedom = $serverdefdom; |
|
my $hostname = $r->hostname(); |
|
|
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { |
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { |
$codedom = $env{'user.domain'}; |
$codedom = $env{'user.domain'}; |
Line 138 sub handler {
|
Line 139 sub handler {
|
} |
} |
my $js = '<script type="text/javascript">'."\n". |
my $js = '<script type="text/javascript">'."\n". |
'// <![CDATA['."\n". |
'// <![CDATA['."\n". |
&courselink_javascript($r)."\n". |
&courselink_javascript($hostname)."\n". |
'// ]]>'."\n". |
'// ]]>'."\n". |
'</script>'."\n"; |
'</script>'."\n"; |
$r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js)); |
$r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js)); |
Line 191 sub handler {
|
Line 192 sub handler {
|
if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { |
if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) { |
my $usehttp = 0; |
my $usehttp = 0; |
if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { |
if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) { |
unless (&Apache::lonnet::uses_sts()) { |
unless ((&Apache::lonnet::uses_sts()) || |
|
(&Apache::lonnet::waf_allssl($hostname))) { |
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} |
} |
Line 253 sub handler {
|
Line 255 sub handler {
|
&validate_input($codedom,\@cats,\%maxd,$cathash); |
&validate_input($codedom,\@cats,\%maxd,$cathash); |
my ($numtitles,@codetitles); |
my ($numtitles,@codetitles); |
if (($env{'form.coursenum'} ne '') && ($knownuser)) { |
if (($env{'form.coursenum'} ne '') && ($knownuser)) { |
&course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles); |
&course_details($r,$codedom,$formname,$domdesc,$hostname,\@trails, |
|
\%allitems,\@codetitles); |
} else { |
} else { |
my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); |
my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats); |
my $wasacctext = &get_wasactive_text(); |
my $wasacctext = &get_wasactive_text(); |
Line 299 function setCourseId(caller) {
|
Line 302 function setCourseId(caller) {
|
} |
} |
|
|
ENDSCRIPT |
ENDSCRIPT |
$catjs .= &courselink_javascript($r); |
$catjs .= &courselink_javascript($hostname); |
if (&user_is_dc($codedom) || $canviewall) { |
if (&user_is_dc($codedom) || $canviewall) { |
$catjs .= <<ENDTOGGJS |
$catjs .= <<ENDTOGGJS |
|
|
Line 659 sub get_instcode_allowable {
|
Line 662 sub get_instcode_allowable {
|
} |
} |
|
|
sub course_details { |
sub course_details { |
my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_; |
my ($r,$codedom,$formname,$domdesc,$hostname,$trails,$allitems,$codetitles) = @_; |
my $output; |
my $output; |
my %add_entries = (topmargin => "0", |
my %add_entries = (topmargin => "0", |
marginheight => "0",); |
marginheight => "0",); |
my $js = '<script type="text/javascript">'."\n". |
my $js = '<script type="text/javascript">'."\n". |
&courselink_javascript($r).'</script>'."\n"; |
&courselink_javascript($hostname).'</script>'."\n"; |
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page('Course/Community Catalog',$js, |
&Apache::loncommon::start_page('Course/Community Catalog',$js, |
{'add_entries' => \%add_entries, }); |
{'add_entries' => \%add_entries, }); |
Line 728 END
|
Line 731 END
|
} |
} |
|
|
sub courselink_javascript { |
sub courselink_javascript { |
my ($r) = @_; |
my ($hostname) = @_; |
my $hostname = $r->hostname(); |
|
return <<"END"; |
return <<"END"; |
|
|
function ToSyllabus(cdom,cnum,usehttp) { |
function ToSyllabus(cdom,cnum,usehttp) { |
Line 1512 sub construct_data_table {
|
Line 1514 sub construct_data_table {
|
foreach my $course (@{$Sortby{$item}}) { |
foreach my $course (@{$Sortby{$item}}) { |
$output.=&Apache::loncommon::start_data_table_row(); |
$output.=&Apache::loncommon::start_data_table_row(); |
$output.=&courseinfo_row($courseinfo{$course},$knownuser,$details, |
$output.=&courseinfo_row($courseinfo{$course},$knownuser,$details, |
\$count,$now,$course,$trails,$allitems,\%numbers,$canviewall); |
\$count,$now,$course,$trails,$allitems, |
|
\%numbers,$canviewall,$hostname); |
$output.=&Apache::loncommon::end_data_table_row(); |
$output.=&Apache::loncommon::end_data_table_row(); |
} |
} |
} |
} |
Line 1834 sub count_students {
|
Line 1837 sub count_students {
|
} |
} |
|
|
sub courseinfo_row { |
sub courseinfo_row { |
my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_; |
my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems, |
|
$numbers,$canviewall,$hostname) = @_; |
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, |
my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items, |
$accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories, |
$accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories, |
$extsyllplain); |
$extsyllplain); |
Line 1881 sub courseinfo_row {
|
Line 1885 sub courseinfo_row {
|
if ($showsyllabus) { |
if ($showsyllabus) { |
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))) { |
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} |
} |