version 1.270, 2012/08/14 15:45:25
|
version 1.273, 2012/08/15 16:56:52
|
Line 225 sub handler {
|
Line 225 sub handler {
|
$updateresult .= &update_session_roles(); |
$updateresult .= &update_session_roles(); |
&Apache::lonnet::appenv({'user.update.time' => $now}); |
&Apache::lonnet::appenv({'user.update.time' => $now}); |
$update = $now; |
$update = $now; |
&reqauthor_check(); |
&Apache::loncoursequeueadmin::reqauthor_check(); |
} |
} |
|
|
# -------------------------------------------------- Check for author requests |
# -------------------------------------------------- Check for author requests |
|
|
my $reqauthor; |
my $reqauthor; |
if ($env{'form.requestauthor'}) { |
if ($env{'form.requestauthor'}) { |
if ($env{'environment.canrequest.author'}) { |
$reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update); |
unless (&is_active_author()) { |
|
my $queued = &reqauthor_check(); |
|
my $skipreq; |
|
if ($queued =~ /^approval:\d+$/) { |
|
my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'}); |
|
if ($status eq 'approval') { |
|
$reqauthor = '<span class="LC_info">'. |
|
&mt('A request for authoring space submitted on [_1] is awaiting approval', |
|
&Apache::lonlocal::locallocaltime($timestamp)). |
|
'</span>'; |
|
} |
|
$skipreq = 1; |
|
} elsif ($queued =~ /^approved:\d+$/) { |
|
my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', |
|
['active'],['au'],[$env{'user.domain'}]); |
|
if (keys(%roleshash) > 0) { |
|
$skipreq = 1; |
|
} |
|
} |
|
unless ($skipreq) { |
|
my (@inststatuses,%domconfig); |
|
%domconfig = |
|
&Apache::lonnet::get_dom('configuration', |
|
['requestauthor'],$env{'user.domain'}); |
|
my $val = &Apache::loncoursequeueadmin::get_processtype('requestauthor',$env{'user.name'}, |
|
$env{'user.domain'},$env{'user.adv'}, |
|
$env{'user.domain'},undef, |
|
\@inststatuses,\%domconfig); |
|
if ($val eq 'automatic') { |
|
if (&Apache::lonnet::assignrole($env{'user.domain'},$env{'user.name'},'/'.$env{'user.domain'}.'/', |
|
'au',undef,$now,undef,undef,'requestauthor') eq 'ok') { |
|
$reqauthor = '<span class="LC_info">'. |
|
&mt('Access to authoring space has been activated').'</span><br />'; |
|
&update_session_roles(); |
|
&Apache::lonnet::appenv({'user.update.time' => $now}); |
|
$update = $now; |
|
} else { |
|
$reqauthor = '<span class="LC_info">'. |
|
&mt('An error occurred while activating your access to authoring space'); |
|
} |
|
} elsif ($val eq 'approval') { |
|
my $domconfiguser = &Apache::lonnet::get_domainconfiguser($env{'user.domain'}); |
|
if (&Apache::lonnet::put('requestauthorqueue',{ $env{'user.name'}.'_'.$val => $now }, |
|
$env{'user.domain'},$domconfiguser) eq 'ok') { |
|
my %userrequest = ( |
|
author => { |
|
timestamp => $now, |
|
status => $val, |
|
}, |
|
author_status => $val, |
|
); |
|
my $req_notifylist; |
|
if (ref($domconfig{'requestauthor'}) eq 'HASH') { |
|
if (ref($domconfig{'requestauthor'}{'notify'}) eq 'HASH') { |
|
my $req_notifylist = $domconfig{'requestauthor'}{'notify'}{'approval'}; |
|
if ($req_notifylist) { |
|
my $fullname = &Apache::loncommon::plainname($env{'user.name'}, |
|
$env{'user.domain'}); |
|
my $sender = $env{'user.name'}.':'.$env{'user.domain'}; |
|
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
|
&Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist, |
|
"$fullname ($env{'user.name'}:$env{'user.domain'})",undef,$domdesc, |
|
$now,'authorreq',$sender); |
|
} |
|
} |
|
} |
|
my $userresult = |
|
&Apache::lonnet::put('requestauthor',\%userrequest,$env{'user.domain'},$env{'user.name'}); |
|
$reqauthor = '<span class="LC_info">'. |
|
&mt('Your request for authoring space has been submitted for approval.'). |
|
'</span>'; |
|
&Apache::lonnet::appenv({'environment.requestauthorqueued' => $val.':'.$now}); |
|
} else { |
|
$reqauthor = '<span class="LC_info">'. |
|
&mt('An error occurred saving your request for authoring space.'). |
|
'</span>'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
} |
|
|
my $envkey; |
my $envkey; |
Line 881 ENDHEADER
|
Line 799 ENDHEADER
|
my ($requestauthor,$requestcrs); |
my ($requestauthor,$requestcrs); |
unless ($reqauthor) { |
unless ($reqauthor) { |
if ($env{'environment.canrequest.author'}) { |
if ($env{'environment.canrequest.author'}) { |
unless (&is_active_author()) { |
unless (&Apache::loncoursequeueadmin::is_active_author()) { |
my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'}); |
my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'}); |
if ($status eq 'approval') { |
if ($status eq 'approval') { |
$requestauthor = &mt('A request for authoring space submitted on [_1] is awaiting approval',&Apache::lonlocal::locallocaltime($timestamp)); |
$requestauthor = &mt('A request for authoring space submitted on [_1] is awaiting approval',&Apache::lonlocal::locallocaltime($timestamp)); |
Line 1131 ENDHEADER
|
Line 1049 ENDHEADER
|
return OK; |
return OK; |
} |
} |
|
|
sub is_active_author { |
|
if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) { |
|
if ((!$1 || $1 < time) && |
|
(!$2 || $2 > time)) { |
|
return 1; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
sub reqauthor_check { |
|
my $queued = $env{'environment.requestauthorqueued'}; |
|
my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'], |
|
$env{'user.domain'},$env{'user.name'}); |
|
my $reqstatus = $reqauthor{'author_status'}; |
|
if (($reqstatus eq '' && $queued ne '') || |
|
($env{'environment.requestauthorqueued'} !~ /^\Q$reqstatus\E/)) { |
|
if (ref($reqauthor{'author'}) eq 'HASH') { |
|
$queued = $reqstatus.':'.$reqauthor{'author'}{'timestamp'}; |
|
} else { |
|
undef($queued); |
|
} |
|
&Apache::lonnet::appenv({'environment.requestauthorqueued' => $queued}); |
|
} |
|
return $queued; |
|
} |
|
|
|
sub gather_roles { |
sub gather_roles { |
my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_; |
my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_; |
my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,''); |
my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,''); |
Line 2071 sub update_session_roles {
|
Line 1962 sub update_session_roles {
|
} |
} |
if ($env{$envkey} eq '') { |
if ($env{$envkey} eq '') { |
my $status_in_db = |
my $status_in_db = |
&curr_role_status($tstart,$tend,$refresh,$now); |
&curr_role_status($tstart,$tend,$now,$now); |
&gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); |
&gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); |
if (($role eq 'st') && ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) { |
if (($role eq 'st') && ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) { |
if ($status_in_db eq 'active') { |
if ($status_in_db eq 'active') { |
Line 2115 sub update_session_roles {
|
Line 2006 sub update_session_roles {
|
my $status_in_env = |
my $status_in_env = |
&curr_role_status($currstart,$currend,$refresh,$update); |
&curr_role_status($currstart,$currend,$refresh,$update); |
my $status_in_db = |
my $status_in_db = |
&curr_role_status($tstart,$tend,$refresh,$now); |
&curr_role_status($tstart,$tend,$now,$now); |
if ($status_in_env ne $status_in_db) { |
if ($status_in_env ne $status_in_db) { |
if ($status_in_env eq 'active') { |
if ($status_in_env eq 'active') { |
if ($role eq 'st') { |
if ($role eq 'st') { |