--- loncom/auth/lonacc.pm 2010/03/25 17:38:35 1.133 +++ loncom/auth/lonacc.pm 2011/06/13 02:44:36 1.136 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.133 2010/03/25 17:38:35 raeburn Exp $ +# $Id: lonacc.pm,v 1.136 2011/06/13 02:44:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -156,7 +156,7 @@ sub get_posted_cgi { for ($i=0;$i<=$#lines;$i++) { if ($lines[$i]=~/^--\Q$contentsep\E/) { if ($name) { - chomp($value); + $value=~s/[\r\n]+$//; if (ref($fields) eq 'ARRAY') { next if (!grep(/^\Q$name\E$/,@{$fields})); } @@ -290,12 +290,15 @@ sub sso_login { } } - my $domain = $r->dir_config('lonDefDomain'); + my $domain = $r->dir_config('lonSSOUserDomain'); + if ($domain eq '') { + $domain = $r->dir_config('lonDefDomain'); + } my $home=&Apache::lonnet::homeserver($user,$domain); if ($home !~ /(con_lost|no_host|no_such_host)/) { &Apache::lonnet::logthis(" SSO authorized user $user "); if ($r->dir_config("lonBalancer") eq 'yes') { - # login but immeaditly go to switch server to find us a new + # login but immediately go to switch server to find us a new # machine &Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); $env{'request.sso.login'} = 1; @@ -506,7 +509,8 @@ sub handler { ($requrl=~m|^/adm/coursedocs/showdoc/|) || ($requrl=~m|\.problem/smpedit$|) || ($requrl=~/^\/public\/.*\/syllabus$/) || - ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/)) { + ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || + ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { # ------------------------------------- This is serious stuff, get symb and log my $symb; if ($query) { @@ -521,7 +525,9 @@ sub handler { 'last_known' =>[$murl,$mid]); } elsif ((&Apache::lonnet::symbverify($symb,$requrl)) || (($requrl=~m|(.*)/smpedit$|) && - &Apache::lonnet::symbverify($symb,$1))) { + &Apache::lonnet::symbverify($symb,$1)) || + (($requrl=~m|(.*/aboutme)/portfolio$|) && + &Apache::lonnet::symbverify($symb,$1))) { my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb); &Apache::lonnet::symblist($map,$murl => [$murl,$mid], 'last_known' =>[$murl,$mid]); @@ -533,6 +539,9 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } } else { + if ($requrl=~m{^(/adm/.*/aboutme)/portfolio$}) { + $requrl = $1; + } $symb=&Apache::lonnet::symbread($requrl); if (&Apache::lonnet::is_on_map($requrl) && $symb && !&Apache::lonnet::symbverify($symb,$requrl)) {