--- loncom/auth/lonroles.pm 2013/01/01 03:06:27 1.279 +++ loncom/auth/lonroles.pm 2013/05/10 15:02:45 1.285 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.279 2013/01/01 03:06:27 raeburn Exp $ +# $Id: lonroles.pm,v 1.285 2013/05/10 15:02:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -139,6 +139,7 @@ use Apache::lonpageflip(); use Apache::lonnavdisplay(); use Apache::loncoursequeueadmin; use Apache::longroup; +use Apache::lonrss; use GDBM_File; use LONCAPA qw(:DEFAULT :match); use HTML::Entities; @@ -310,6 +311,7 @@ sub handler { my $trolecode = 'au./'.$domain.'/'; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); + return OK; } last; } @@ -321,6 +323,7 @@ sub handler { my $trolecode = 'ca./'.$domain.'/'.$user; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); + return OK; } last; } @@ -342,6 +345,7 @@ sub handler { my $switchserver = '/adm/switchserver?' .'otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); + return OK; } } else { delete($env{$envkey}); @@ -518,11 +522,26 @@ ENDENTERKEY my $msg; my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - unless (($ferr) || ($env{'form.switchrole'}) || - ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { - &Apache::lonnet::put('nohist_crslastlogin', - {$env{'user.name'}.':'.$env{'user.domain'}. - ':'.$csec.':'.$role => $now},$cdom,$cnum); + unless ($ferr) { + unless (($env{'form.switchrole'}) || + ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { + &Apache::lonnet::put('nohist_crslastlogin', + {$env{'user.name'}.':'.$env{'user.domain'}. + ':'.$csec.':'.$role => $now},$cdom,$cnum); + } + my ($feeds,$syllabus_time); + &Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds); + &Apache::lonnet::appenv({'request.course.feeds' => $feeds}); + unless ($env{'course.'.$cdom.'_'.$cnum.'.updatedsyllabus'}) { + unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) || + ($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) { + my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); + $syllabus_time = $syllabus{'uploaded.lastmodified'}; + if ($syllabus_time) { + &Apache::lonnet::appenv({'request.course.syllabustime' => $syllabus_time}); + } + } + } } if (($env{'form.orgurl'}) && ($env{'form.orgurl'}!~/^\/adm\/flip/)) { @@ -602,7 +621,7 @@ ENDENTERKEY } } else { if ($destsymb eq '') { - ($destsymb) = ($dest =~ /(:\?|\&)symb=([^\&]+)/); + ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]+)/); $destsymb = &unescape($destsymb); } unless ($env{'request.role.adv'}) { @@ -611,7 +630,7 @@ ENDENTERKEY } if (($checkenc) && ($destsymb ne '')) { my ($encstate,$unencsymb,$res); - my $unencsymb = &Apache::lonnet::symbclean($destsymb); + $unencsymb = &Apache::lonnet::symbclean($destsymb); (undef,undef,$res) = &Apache::lonnet::decode_symb($unencsymb); &Apache::lonnet::symbverify($unencsymb,$res,\$encstate); if ($encstate) { @@ -2152,7 +2171,6 @@ sub update_session_roles { my $status_in_db = &curr_role_status($tstart,$tend,$refresh,$now); my ($rdummy,$rest) = split(/\//,$role,2); - my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); my %currpriv; unless (exists($crprivs{$rest})) { my ($rdomain,$rauthor,$rrole)=split(/\//,$rest); @@ -2406,9 +2424,8 @@ sub update_session_roles { } $groupmsg .= '
  • '. $env{'course.'.$cdom.'_'.$cnum.'.description'}.'