--- loncom/auth/lonacc.pm 2013/01/30 16:23:47 1.142 +++ loncom/auth/lonacc.pm 2013/05/10 17:49:17 1.144 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.142 2013/01/30 16:23:47 raeburn Exp $ +# $Id: lonacc.pm,v 1.144 2013/05/10 17:49:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -275,9 +275,9 @@ sub sso_login { my ($r,$handle) = @_; my $lonidsdir=$r->dir_config('lonIDsDir'); - if (!($r->user - && (!defined($env{'user.name'}) && !defined($env{'user.domain'})) - && ($handle eq ''))) { + if (($r->user eq '') || + (defined($env{'user.name'}) && (defined($env{'user.domain'})) + && ($handle ne ''))) { # not an SSO case or already logged in return undef; } @@ -629,6 +629,15 @@ sub handler { $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'; + } + } } } }