--- loncom/auth/lonroles.pm 2013/05/23 14:56:40 1.269.2.9 +++ loncom/auth/lonroles.pm 2013/05/09 05:24:42 1.284 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.269.2.9 2013/05/23 14:56:40 raeburn Exp $ +# $Id: lonroles.pm,v 1.284 2013/05/09 05:24:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -143,7 +143,7 @@ use Apache::lonrss; use GDBM_File; use LONCAPA qw(:DEFAULT :match); use HTML::Entities; - + sub redirect_user { my ($r,$title,$url,$msg) = @_; @@ -151,7 +151,6 @@ sub redirect_user { &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; - my $swinfo=&Apache::lonmenu::rawconfig(); # Breadcrumbs my $brcrum = [{'href' => $url, @@ -166,11 +165,6 @@ sub redirect_user { $url=~s/ /\%20/g; $r->print(< -// -

$msg

$end_page ENDREDIR @@ -221,7 +215,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); -# -------------------------------------------------- Check if setting hot list +# -------------------------------------------------- Check if setting hot list my $hotlist; if ($env{'form.action'} eq 'verify_and_change_rolespref') { $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r); @@ -317,7 +311,6 @@ sub handler { my $trolecode = 'au./'.$domain.'/'; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); - return OK; } last; } @@ -329,7 +322,6 @@ sub handler { my $trolecode = 'ca./'.$domain.'/'.$user; my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); - return OK; } last; } @@ -351,7 +343,6 @@ sub handler { my $switchserver = '/adm/switchserver?' .'otherserver='.$home.'&role='.$trolecode; $r->internal_redirect($switchserver); - return OK; } } else { delete($env{$envkey}); @@ -526,10 +517,10 @@ ENDENTERKEY if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { my $msg; - my ($furl,$ferr)= - &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + my ($furl,$ferr)= + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); unless ($ferr) { - unless (($env{'form.switchrole'}) || + unless (($env{'form.switchrole'}) || ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { &Apache::lonnet::put('nohist_crslastlogin', {$env{'user.name'}.':'.$env{'user.domain'}. @@ -621,7 +612,7 @@ ENDENTERKEY if ($env{'request.role.adv'}) { $dest = &Apache::lonenc::unencrypted($dest); if ($destsymb eq '') { - ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); + ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); $destsymb = &unescape($destsymb); } } @@ -646,7 +637,7 @@ ENDENTERKEY } } } - unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { + unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { my $esc_symb = &escape($destsymb); $dest .= '?symb='.$esc_symb; @@ -777,7 +768,7 @@ function rolesView (caller) { document.rolechoice.display.value = caller; } else { if ((caller == 'doupdate') || (caller == 'requestauthor') || - (caller == 'queued')) { + (caller == 'queued')) { document.rolechoice.state.value = caller; } } @@ -861,7 +852,7 @@ ENDHEADER } if ($hotlist) { $showresult .= $hotlist; - } + } $showresult .= ''; $r->print($showresult); } elsif ($env{'form.state'} eq 'queued') { @@ -886,7 +877,7 @@ ENDHEADER \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev); $refresh = $now; &Apache::lonnet::appenv({'user.refresh.time' => $refresh}); - unless ($env{'user.adv'}) { + unless ($env{'user.adv'}) { if ($countactive > 0) { my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); @@ -2434,23 +2425,21 @@ sub update_session_roles { } my $groupdesc; unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') { - %{$curr_groups{$cdom.'_'.$cnum}} = + %{$curr_groups{$cdom.'_'.$cnum}} = &Apache::longroup::coursegroups($cdom,$cnum); } unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') && ($groupdescs{$cdom.'_'.$cnum}{$group})) { - my %groupinfo = + my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group}); - $groupdescs{$cdom.'_'.$cnum}{$group} = + $groupdescs{$cdom.'_'.$cnum}{$group} = &unescape($groupinfo{'description'}); } $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group}; - if ($groupdesc) { - $groupmsg .= '
  • '. - &mt('[_1] with status: [_2].', - ''.$groupdesc.'',$newgroup{$item}).'
    • '; - } + $groupmsg .= '
  • '. + &mt('[_1] with status: [_2].', + ''.$groupdesc.'',$newgroup{$item}).'
    • '; } } if ($groupmsg) { @@ -2464,67 +2453,47 @@ sub update_session_roles { } } if (keys(%newrole) > 0) { - my $newmsg; + $changemsg .= '
  • '.&mt('New roles'). + '
    • '; } if (keys(%customprivchg) > 0) { - my $privmsg; + $changemsg .= '
  • '. + &mt('Custom roles with privilege changes'). + '
    • '; } if (keys(%rolechange) > 0) { - my $rolemsg; + $changemsg .= '
  • '. + &mt('Existing roles with status changes').'
    • '. + ''; } if (keys(%deletedroles) > 0) { - my $delmsg; + $changemsg .= '
  • '. + &mt('Existing roles now expired').'
    • '. + ''; } } if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) { @@ -2561,7 +2530,7 @@ sub update_session_roles { my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); - my %groupdesc; + my %groupdesc; if (ref($groupchange{$crs}) eq 'HASH') { $groupchgmsg .= '
  • '.&mt('Course/Community: [_1]',''.$crsdesc.'