loncom/auth/lonacc.pm - diff

Return to lonacc.pm CVS log

Up to [LON-CAPA] / loncom / auth

version 1.142, 2013/01/30 16:23:47	version 1.144, 2013/05/10 17:49:17
Line 275 sub sso_login {	Line 275 sub sso_login {
my ($r,$handle) = @_;	my ($r,$handle) = @_;

my $lonidsdir=$r->dir_config('lonIDsDir');	my $lonidsdir=$r->dir_config('lonIDsDir');
if (!($r->user	if (($r->user eq '') \|\|
&& (!defined($env{'user.name'}) && !defined($env{'user.domain'}))	(defined($env{'user.name'}) && (defined($env{'user.domain'}))
&& ($handle eq ''))) {	&& ($handle ne ''))) {
# not an SSO case or already logged in	# not an SSO case or already logged in
return undef;	return undef;
}	}
Line 629 sub handler {	Line 629 sub handler {
$env{'request.state'} = 'edit';	$env{'request.state'} = 'edit';
}	}
}	}
	}
	} elsif ($requrl =~ m{^/+uploaded/\Q$cdom\E/\Q$cnum\E/portfolio/syllabus/.+\.html?$}) {
	if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
	if ($query) {
	&Apache::loncommon::get_unprocessed_cgi($query,['forceedit','editmode']);
	if (($env{'form.forceedit'}) \|\| ($env{'form.editmode'})) {
	$env{'request.state'} = 'edit';
	}
	}
}	}
}	}
}	}