loncom/auth/lonroles.pm - diff

Return to lonroles.pm CVS log

Up to [LON-CAPA] / loncom / auth

version 1.339, 2018/07/01 00:03:42	version 1.342, 2018/12/27 20:10:44
Line 721 ENDENTERKEY	Line 721 ENDENTERKEY
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) {
my $hostname = $r->hostname();	unless (&Apache::lonnet::uses_sts()) {
if ($hostname ne '') {	my $hostname = $r->hostname();
$dest = 'http://'.$hostname.$dest;	if ($hostname ne '') {
	$dest = 'http://'.$hostname.$dest;
	}
}	}
}	}
}	}
Line 1366 sub gather_roles {	Line 1368 sub gather_roles {
if (!$allowed) {	if (!$allowed) {
$button=0;	$button=0;
unless ($trustchecked{$tdom}) {	unless ($trustchecked{$tdom}) {
if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&	if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$tdom)) &&
(&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {	(&Apache::lonnet::will_trust('coaurem',$tdom,$env{'user.domain'}))) {
$willtrust{$tdom} = 1;	$willtrust{$tdom} = 1;
$trustchecked{$tdom} = 1;	$trustchecked{$tdom} = 1;
}	}