--- loncom/interface/lonnavmaps.pm 2020/01/16 22:00:10 1.509.2.11.2.1 +++ loncom/interface/lonnavmaps.pm 2022/03/25 22:12:52 1.509.2.14.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.509.2.11.2.1 2020/01/16 22:00:10 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.509.2.14.4.1 2022/03/25 22:12:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees @@ -577,7 +577,11 @@ sub getLinkForResource { my $anchor; if ($res->is_page()) { foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; } } - $anchor=&escape($anchor->shown_symb()); + if ($anchor->encrypted() && !&advancedUser()) { + $anchor='LC_'.$anchor->id(); + } else { + $anchor=&escape($anchor->shown_symb()); + } return ($res->link(),$res->shown_symb(),$anchor); } # in case folder was skipped over as "only sequence" @@ -1885,7 +1889,7 @@ END if ($env{'request.course.id'}) { if (($is_ssl) && ($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { - unless (&Apache::lonnet::uses_sts()) { + unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { if ($hostname ne '') { $src = 'http://'.$hostname.$src; } @@ -1893,7 +1897,7 @@ END $srcHasQuestion = 1; } } elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) { - unless (&Apache::lonnet::uses_sts()) { + unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { if ($hostname ne '') { $src = 'http://'.$hostname.$src; } @@ -1937,7 +1941,7 @@ END $currentJumpDelta) { # Jam the anchor after the