--- loncom/auth/lonroles.pm 2012/12/27 22:48:01 1.269.2.5 +++ loncom/auth/lonroles.pm 2012/08/16 17:02:46 1.274 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.269.2.5 2012/12/27 22:48:01 raeburn Exp $ +# $Id: lonroles.pm,v 1.274 2012/08/16 17:02:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -149,7 +149,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, @@ -164,11 +163,6 @@ sub redirect_user { $url=~s/ /\%20/g; $r->print(< -// -

$msg

$end_page ENDREDIR @@ -219,7 +213,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); @@ -297,10 +291,8 @@ sub handler { if (my ($ccrole,$domain,$coursenum) = ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) { if ($dcroles{$domain}) { - if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum, - $update,$refresh,$now,$ccrole)) { - &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time}); - } + &Apache::lonnet::check_adhoc_privs($domain,$coursenum, + $update,$refresh,$now,$ccrole); } last; } @@ -523,12 +515,6 @@ 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); - } if (($env{'form.orgurl'}) && ($env{'form.orgurl'}!~/^\/adm\/flip/)) { my $dest=$env{'form.orgurl'}; @@ -585,52 +571,11 @@ ENDENTERKEY $furl = "/adm/helper/course.initialization.helper"; # Send the user to the course they selected } elsif ($env{'request.course.id'}) { - my ($dest,$destsymb,$checkenc); - $dest = $env{'form.destinationurl'}; - $destsymb = $env{'form.destsymb'}; - if ($dest ne '') { - if ($env{'form.switchrole'}) { - if ($destsymb ne '') { - if ($destsymb !~ m{^/enc/}) { - unless ($env{'request.role.adv'}) { - $checkenc = 1; - } - } - } - if ($dest =~ m{^/enc/}) { - if ($env{'request.role.adv'}) { - $dest = &Apache::lonenc::unencrypted($dest); - if ($destsymb eq '') { - ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); - $destsymb = &unescape($destsymb); - } - } - } else { - if ($destsymb eq '') { - ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]+)/); - $destsymb = &unescape($destsymb); - } - unless ($env{'request.role.adv'}) { - $checkenc = 1; - } - } - if (($checkenc) && ($destsymb ne '')) { - my ($encstate,$unencsymb,$res); - my $unencsymb = &Apache::lonnet::symbclean($destsymb); - (undef,undef,$res) = &Apache::lonnet::decode_symb($unencsymb); - &Apache::lonnet::symbverify($unencsymb,$res,\$encstate); - if ($encstate) { - if (($dest ne '') && ($dest !~ m{^/enc/})) { - $dest=&Apache::lonenc::encrypted($dest); - } - } - } - } - unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { - if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { - my $esc_symb = &escape($destsymb); - $dest .= '?symb='.$esc_symb; - } + if ($env{'form.destinationurl'}) { + my $dest = $env{'form.destinationurl'}; + if ($env{'form.destsymb'} ne '') { + my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&'); + $dest .= '?symb='.$esc_symb; } &redirect_user($r, &mt('Entering [_1]', $env{'course.'.$courseid.'.description'}), @@ -757,7 +702,7 @@ function rolesView (caller) { document.rolechoice.display.value = caller; } else { if ((caller == 'doupdate') || (caller == 'requestauthor') || - (caller == 'queued')) { + (caller == 'queued')) { document.rolechoice.state.value = caller; } } @@ -841,7 +786,7 @@ ENDHEADER } if ($hotlist) { $showresult .= $hotlist; - } + } $showresult .= ''; $r->print($showresult); } elsif ($env{'form.state'} eq 'queued') { @@ -866,7 +811,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'},'"<>&'); @@ -1662,11 +1607,6 @@ sub adhoc_course_role { $setprivs = 1; } } - unless ($setprivs) { - if (!exists($env{'user.priv.'.$env{'form.switchrole'}.'./'})) { - $setprivs = 1; - } - } if ($setprivs) { if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { my $role = $1; @@ -1694,11 +1634,7 @@ sub adhoc_course_role { $spec .= '/'.$usec; $area .= '/'.$usec; } - if ($role =~ /^cr/) { - &Apache::lonnet::custom_roleprivs(\%newrole,$role,$cdom,$cnum,$spec,$area); - } else { - &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); - } + &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups); my $adhocstart = $refresh-1; $userroles{'user.role.'.$spec} = $adhocstart.'.'; @@ -2585,7 +2521,7 @@ sub get_roles_functions { if (($rolescount > 3) || ($env{'environment.recentroles'})) { push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]); } - + my $funcs = &Apache::lonhtmlcommon::start_funclist(); foreach my $link (@links) { $funcs .= &Apache::lonhtmlcommon::add_item_funclist( @@ -2620,7 +2556,7 @@ sub get_queued { if (ref($history{'details'}) eq 'HASH') { $description = $history{details}{'cdescr'}; } - @{$reqcrs{$reqtime}} = ($description,$showtype); + @{$reqcrs{$reqtime}} = ($description,$showtype); } } my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));