version 1.347, 2021/04/19 23:07:33
|
version 1.350, 2021/06/12 23:14:56
|
Line 728 ENDCLOSE
|
Line 728 ENDCLOSE
|
$furl .= '&orgurl='.&HTML::Entities::encode($env{'form.orgurl'},'<>&"'); |
$furl .= '&orgurl='.&HTML::Entities::encode($env{'form.orgurl'},'<>&"'); |
} |
} |
if ($env{'form.symb'}) { |
if ($env{'form.symb'}) { |
$furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'}; |
$furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'},'<>&"'); |
} |
} |
} |
} |
if (($ferr) && ($tadv)) { |
if (($ferr) && ($tadv)) { |
Line 736 ENDCLOSE
|
Line 736 ENDCLOSE
|
} else { |
} else { |
if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { |
if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { |
if (($env{'form.orgurl'} ne '') && ($env{'form.symb'} ne '')) { |
if (($env{'form.orgurl'} ne '') && ($env{'form.symb'} ne '')) { |
unless (&Apache::lonnet::symbverify($env{'form.symb'},$env{'form.orgurl'}) { |
unless (&Apache::lonnet::symbverify($env{'form.symb'},$env{'form.orgurl'})) { |
$dest=$env{'form.orgurl'}; |
$dest=$env{'form.orgurl'}; |
} |
} |
} |
} |
Line 831 ENDCLOSE
|
Line 831 ENDCLOSE
|
if (($dest =~ m{^\Q/public/$cdom/$cnum/syllabus\E.*(\?|\&)usehttp=1}) || |
if (($dest =~ m{^\Q/public/$cdom/$cnum/syllabus\E.*(\?|\&)usehttp=1}) || |
($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) { |
($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) { |
if ($ENV{'SERVER_PORT'} == 443) { |
if ($ENV{'SERVER_PORT'} == 443) { |
unless (&Apache::lonnet::uses_sts()) { |
my $hostname = $r->hostname(); |
my $hostname = $r->hostname(); |
unless ((&Apache::lonnet::uses_sts()) || |
|
(&Apache::lonnet::waf_allssl($hostname))) { |
if ($hostname ne '') { |
if ($hostname ne '') { |
$dest = 'http://'.$hostname.$dest; |
$dest = 'http://'.$hostname.$dest; |
} |
} |
Line 914 ENDCLOSE
|
Line 915 ENDCLOSE
|
} else { |
} else { |
$access = &Apache::lonnet::allowed('bre',$furl); |
$access = &Apache::lonnet::allowed('bre',$furl); |
} |
} |
if (!$access) { |
if ((!$access) || ($access eq 'D')) { |
$furl = &Apache::lonpageflip::first_accessible_resource(); |
$furl = &Apache::lonpageflip::first_accessible_resource(); |
} elsif ($access eq 'B') { |
} elsif ($access eq 'B') { |
$furl = '/adm/navmaps?showOnlyHomework=1'; |
$furl = '/adm/navmaps?showOnlyHomework=1'; |