--- loncom/auth/lonroles.pm 2012/12/27 18:31:09 1.278 +++ loncom/auth/lonroles.pm 2013/01/01 03:06:27 1.279 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.278 2012/12/27 18:31:09 raeburn Exp $ +# $Id: lonroles.pm,v 1.279 2013/01/01 03:06:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -138,6 +138,7 @@ use Apache::lonlocal; use Apache::lonpageflip(); use Apache::lonnavdisplay(); use Apache::loncoursequeueadmin; +use Apache::longroup; use GDBM_File; use LONCAPA qw(:DEFAULT :match); use HTML::Entities; @@ -2176,21 +2177,23 @@ sub update_session_roles { } } } - $currpriv{sys} = $env{"user.priv.$rolekey./"}; - $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; - $currpriv{crs} = $env{"user.priv.$rolekey.$where"}; - if (keys(%crprivs)) { - if (($crprivs{$rest}{sys} ne $currpriv{sys}) || - ($crprivs{$rest}{dom} ne $currpriv{dom}) + my $status_in_env = + &curr_role_status($currstart,$currend,$refresh,$update); + if ($status_in_env eq 'active') { + $currpriv{sys} = $env{"user.priv.$rolekey./"}; + $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; + $currpriv{crs} = $env{"user.priv.$rolekey.$where"}; + if (keys(%crprivs)) { + if (($crprivs{$rest}{sys} ne $currpriv{sys}) || + ($crprivs{$rest}{dom} ne $currpriv{dom}) || - ($crprivs{$rest}{crs} ne $currpriv{crs})) { - &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); - unless (grep(/^\Q$role\E$/,@changed_roles)) { - push(@changed_roles,$role); - } - my $status_in_env = - &curr_role_status($currstart,$currend,$refresh,$update); - if ($status_in_env eq 'active') { + ($crprivs{$rest}{crs} ne $currpriv{crs})) { + &gather_roleprivs(\%allroles,\%allgroups, + \%userroles,$where,$role, + $tstart,$tend,$status_in_db); + unless (grep(/^\Q$role\E$/,@changed_roles)) { + push(@changed_roles,$role); + } $customprivchg{$rolekey} = $status_in_env; } } @@ -2272,6 +2275,93 @@ sub update_session_roles { } $msg .= '
'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'

'; } + &Apache::lonnet::set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles); + my ($curr_is_adv,$curr_role_adv,$curr_author,$curr_role_author); + $curr_author = $env{'user.author'}; + if (($env{'request.role'} =~/^au/) || ($env{'request.role'} =~/^ca/) || + ($env{'request.role'} =~/^aa/)) { + $curr_role_author=1; + } + $curr_is_adv = $env{'user.adv'}; + $curr_role_adv = $env{'request.role.adv'}; + if (keys(%userroles) > 0) { + foreach my $role (@changed_roles) { + unless(grep(/^\Q$role\E$/,@rolecodes)) { + push(@rolecodes,$role); + } + } + unless(grep(/^\Qcm\E$/,@rolecodes)) { + push(@rolecodes,'cm'); + } + &Apache::lonnet::appenv(\%userroles,\@rolecodes); + } + my %newenv; + if (&Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'})) { + unless ($curr_is_adv) { + $newenv{'user.adv'} = 1; + } + } elsif ($curr_is_adv && !$curr_role_adv) { + &Apache::lonnet::delenv('user.adv'); + } + my %authorroleshash = + &Apache::lonnet::get_my_roles('','','userroles',['active'],['au','ca','aa']); + if (keys(%authorroleshash)) { + unless ($curr_author) { + $newenv{'user.author'} = 1; + } + } elsif ($curr_author && !$curr_role_author) { + &Apache::lonnet::delenv('user.author'); + } + if ($env{'request.course.id'}) { + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my (@activecrsgroups,$crsgroupschanged); + if ($env{'request.course.groups'}) { + @activecrsgroups = split(/:/,$env{'request.course.groups'}); + foreach my $item (keys(%deletedroles)) { + if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) { + if (grep(/^\Q$1\E$/,@activecrsgroups)) { + $crsgroupschanged = 1; + last; + } + } + } + } + unless ($crsgroupschanged) { + foreach my $item (keys(%newgroup)) { + if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) { + if ($newgroup{$item} eq 'active') { + $crsgroupschanged = 1; + last; + } + } + } + } + if ((ref($changed_groups{$env{'request.course.id'}}) eq 'HASH') || + (ref($groupchange{"/$cdom/$cnum"}) eq 'HASH') || + ($crsgroupschanged)) { + my %grouproles = &Apache::lonnet::get_my_roles('','','userroles', + ['active'],['gr'],[$cdom],1); + my @activegroups; + foreach my $item (keys(%grouproles)) { + next unless($item =~ /^\Q$cnum\E:\Q$cdom\E/); + my $group; + my ($crsn,$crsd,$role,$remainder) = split(/:/,$item,4); + if ($remainder =~ /:/) { + (my $other,$group) = ($remainder =~ /^([\w:]+):([^:]+)$/); + } else { + $group = $remainder; + } + if ($group ne '') { + push(@activegroups,$group); + } + } + $newenv{'request.course.groups'} = join(':',@activegroups); + } + } + if (keys(%newenv)) { + &Apache::lonnet::appenv(\%newenv); + } if (!@changed_roles || !(keys(%changed_groups))) { my ($rolesmsg,$groupsmsg); if (!@changed_roles) { @@ -2304,11 +2394,42 @@ sub update_session_roles { if (@changed_roles > 0) { if (keys(%newgroup) > 0) { my $groupmsg; + my (%curr_groups,%groupdescs,$currcrs); foreach my $item (sort(keys(%newgroup))) { if (&is_active_course($item,$refresh,$update,\%roleshash)) { - $groupmsg .= '
  • '. - &mt('[_1] with status: [_2].', - $item,$newgroup{$item}).'
    • '; + if ($item =~ m{^gr\./($match_domain/$match_courseid)/(\w+)$}) { + my ($cdom,$cnum) = split(/\//,$1); + my $group = $2; + if ($currcrs ne $cdom.'_'.$cnum) { + if ($currcrs) { + $groupmsg .= '
  • '; + } + $groupmsg .= '
  • '. + $env{'course.'.$cdom.'_'.$cnum.'.description'}.'
    • '; } } if ($groupmsg) { @@ -2321,9 +2442,10 @@ sub update_session_roles { $changemsg .= '
  • '.&mt('New roles'). '
    • '; } @@ -2332,7 +2454,8 @@ sub update_session_roles { &mt('Custom roles with privilege changes'). ''; } @@ -2341,8 +2464,9 @@ sub update_session_roles { &mt('Existing roles with status changes').''. ''; @@ -2352,7 +2476,8 @@ sub update_session_roles { &mt('Existing roles now expired').''. ''; } @@ -2384,10 +2509,22 @@ sub update_session_roles { &mt('Existing course/community groups with status changes').''. '