version 1.269.2.29, 2016/11/09 17:48:38
|
version 1.276, 2012/09/04 20:47:46
|
Line 128 package Apache::lonroles;
|
Line 128 package Apache::lonroles;
|
use strict; |
use strict; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::lonuserstate(); |
use Apache::lonuserstate(); |
use Apache::Constants qw(:common REDIRECT); |
use Apache::Constants qw(:common); |
use Apache::File(); |
use Apache::File(); |
use Apache::lonmenu; |
use Apache::lonmenu; |
use Apache::loncommon; |
use Apache::loncommon; |
Line 138 use Apache::lonlocal;
|
Line 138 use Apache::lonlocal;
|
use Apache::lonpageflip(); |
use Apache::lonpageflip(); |
use Apache::lonnavdisplay(); |
use Apache::lonnavdisplay(); |
use Apache::loncoursequeueadmin; |
use Apache::loncoursequeueadmin; |
use Apache::longroup; |
|
use Apache::lonrss; |
|
use GDBM_File; |
use GDBM_File; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
use HTML::Entities; |
use HTML::Entities; |
|
|
|
|
sub redirect_user { |
sub redirect_user { |
my ($r,$title,$url,$msg) = @_; |
my ($r,$title,$url,$msg) = @_; |
Line 151 sub redirect_user {
|
Line 149 sub redirect_user {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::no_cache($r); |
&Apache::loncommon::no_cache($r); |
$r->send_http_header; |
$r->send_http_header; |
my $swinfo=&Apache::lonmenu::rawconfig(); |
|
|
|
# Breadcrumbs |
# Breadcrumbs |
my $brcrum = [{'href' => $url, |
my $brcrum = [{'href' => $url, |
Line 166 sub redirect_user {
|
Line 163 sub redirect_user {
|
$url=~s/ /\%20/g; |
$url=~s/ /\%20/g; |
$r->print(<<ENDREDIR); |
$r->print(<<ENDREDIR); |
$start_page |
$start_page |
<script type="text/javascript"> |
|
// <![CDATA[ |
|
$swinfo |
|
// ]]> |
|
</script> |
|
<p>$msg</p> |
<p>$msg</p> |
$end_page |
$end_page |
ENDREDIR |
ENDREDIR |
Line 208 sub handler {
|
Line 200 sub handler {
|
|
|
my $r = shift; |
my $r = shift; |
|
|
# Check for critical messages and redirect if present. |
|
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); |
|
if ($redirect) { |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->header_out(Location => $url); |
|
return REDIRECT; |
|
} |
|
|
|
my $now=time; |
my $now=time; |
my $then=$env{'user.login.time'}; |
my $then=$env{'user.login.time'}; |
my $refresh=$env{'user.refresh.time'}; |
my $refresh=$env{'user.refresh.time'}; |
Line 229 sub handler {
|
Line 213 sub handler {
|
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
|
|
# -------------------------------------------------- Check if setting hot list |
# -------------------------------------------------- Check if setting hot list |
my $hotlist; |
my $hotlist; |
if ($env{'form.action'} eq 'verify_and_change_rolespref') { |
if ($env{'form.action'} eq 'verify_and_change_rolespref') { |
$hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r); |
$hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r); |
Line 260 sub handler {
|
Line 244 sub handler {
|
|
|
my $envkey; |
my $envkey; |
my %dcroles = (); |
my %dcroles = (); |
my %dhroles = (); |
my $numdc = &check_fordc(\%dcroles,$update,$then); |
my ($numdc,$numdh,$numadhoc) = &check_for_adhoc(\%dcroles,\%dhroles,$update,$then); |
my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; |
my $loncaparev = $r->dir_config('lonVersion'); |
|
|
|
# ================================================================== Roles Init |
# ================================================================== Roles Init |
if ($env{'form.selectrole'}) { |
if ($env{'form.selectrole'}) { |
Line 270 sub handler {
|
Line 253 sub handler {
|
my $locknum=&Apache::lonnet::get_locks(); |
my $locknum=&Apache::lonnet::get_locks(); |
if ($locknum) { return 409; } |
if ($locknum) { return 409; } |
|
|
my $custom_adhoc; |
|
if ($env{'form.newrole'}) { |
if ($env{'form.newrole'}) { |
$env{'form.'.$env{'form.newrole'}}=1; |
$env{'form.'.$env{'form.newrole'}}=1; |
# Check if this is a Domain Helpdesk role trying to enter a course |
|
if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/\w+\./\1/$match_courseid$}) { |
|
if ($dhroles{$1}) { |
|
$custom_adhoc = 1; |
|
} |
|
} |
|
} |
} |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
# Check if user is CC trying to select a course role |
# Check if user is CC trying to select a course role |
Line 300 sub handler {
|
Line 276 sub handler {
|
&Apache::lonnet::put('email_status',\%temp); |
&Apache::lonnet::put('email_status',\%temp); |
&Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); |
&Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); |
} |
} |
&Apache::lonnet::appenv({"request.course.id" => '', |
&Apache::lonnet::appenv({"request.course.id" => '', |
"request.course.fn" => '', |
"request.course.fn" => '', |
"request.course.uri" => '', |
"request.course.uri" => '', |
"request.course.sec" => '', |
"request.course.sec" => '', |
"request.course.tied" => '', |
"request.course.tied" => '', |
"request.course.timechecked" => '', |
"request.role" => 'cm', |
"request.role" => 'cm', |
"request.role.adv" => $env{'user.adv'}, |
"request.role.adv" => $env{'user.adv'}, |
"request.role.domain" => $env{'user.domain'}}); |
"request.role.domain" => $env{'user.domain'}}); |
# Check if user is a DC trying to enter a course or author space and needs privs to be created |
# Check if Domain Helpdesk role trying to enter a course needs privs to be created |
if ($numdc > 0) { |
if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)}) { |
foreach my $envkey (keys %env) { |
my $cdom = $1; |
# Is this an ad-hoc Coordinator role? |
my $rolename = $2; |
if (my ($ccrole,$domain,$coursenum) = |
my $cnum = $3; |
($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) { |
my $sec = $4; |
if ($dcroles{$domain}) { |
if ($custom_adhoc) { |
if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum, |
my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, |
$update,$refresh,$now,$ccrole)) { |
'adhocroles.'.$cdom); |
&Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time}); |
if (keys(%adhocroles)) { |
|
my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom}); |
|
if (grep(/^\Q$rolename\E$/,@adhoc)) { |
|
if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now, |
|
"cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) { |
|
&Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time}); |
|
} |
} |
} |
} |
|
last; |
} |
} |
} |
# Is this an ad-hoc CA-role? |
} elsif (($numdc > 0) || ($numdh > 0)) { |
if (my ($domain,$user) = |
# Check if user is a DC trying to enter a course or author space and needs privs to be created |
($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) { |
# Check if user is a DH trying to enter a course and needs privs to be created |
if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) { |
foreach my $envkey (keys(%env)) { |
delete($env{$envkey}); |
if ($numdc) { |
$env{'form.au./'.$domain.'/'} = 1; |
# Is this an ad-hoc Coordinator role? |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
if (my ($ccrole,$domain,$coursenum) = |
if ($server_status eq 'switchserver') { |
($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) { |
my $trolecode = 'au./'.$domain.'/'; |
if ($dcroles{$domain}) { |
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; |
if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum, |
$r->internal_redirect($switchserver); |
$update,$refresh,$now,$ccrole)) { |
|
&Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time}); |
|
} |
|
} |
} |
last; |
last; |
} |
} |
# Is this an ad-hoc CA-role? |
if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) { |
if (my ($domain,$user) = |
if (((($castart) && ($castart < $now)) || !$castart) && |
($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) { |
((!$caend) || (($caend) && ($caend > $now)))) { |
if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) { |
|
delete($env{$envkey}); |
|
$env{'form.au./'.$domain.'/'} = 1; |
|
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
if ($server_status eq 'switchserver') { |
if ($server_status eq 'switchserver') { |
my $trolecode = 'au./'.$domain.'/'; |
my $trolecode = 'ca./'.$domain.'/'.$user; |
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; |
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; |
$r->internal_redirect($switchserver); |
$r->internal_redirect($switchserver); |
return OK; |
|
} |
|
last; |
|
} |
|
if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) { |
|
if (((($castart) && ($castart < $now)) || !$castart) && |
|
((!$caend) || (($caend) && ($caend > $now)))) { |
|
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
|
if ($server_status eq 'switchserver') { |
|
my $trolecode = 'ca./'.$domain.'/'.$user; |
|
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode; |
|
$r->internal_redirect($switchserver); |
|
return OK; |
|
} |
|
last; |
|
} |
} |
} |
|
# Check if author blocked ca-access |
|
my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); |
|
if ($blocked{'domcoord.author'} eq 'blocked') { |
|
delete($env{$envkey}); |
|
$env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; |
|
last; |
last; |
} |
} |
if ($dcroles{$domain}) { |
} |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
# Check if author blocked ca-access |
if (($server_status eq 'ok') || ($server_status eq 'switchserver')) { |
my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user); |
&Apache::lonnet::check_adhoc_privs($domain,$user,$update, |
if ($blocked{'domcoord.author'} eq 'blocked') { |
$refresh,$now,'ca'); |
delete($env{$envkey}); |
if ($server_status eq 'switchserver') { |
$env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access'; |
my $trolecode = 'ca./'.$domain.'/'.$user; |
|
my $switchserver = '/adm/switchserver?' |
|
.'otherserver='.$home.'&role='.$trolecode; |
|
$r->internal_redirect($switchserver); |
|
return OK; |
|
} |
|
} else { |
|
delete($env{$envkey}); |
|
} |
|
} else { |
|
delete($env{$envkey}); |
|
} |
|
last; |
last; |
} |
} |
} |
if ($dcroles{$domain}) { |
if ($numdh) { |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
# Is this an ad hoc custom role in a course/community? |
if (($server_status eq 'ok') || ($server_status eq 'switchserver')) { |
if (my ($domain,$rolename,$coursenum,$sec) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)})) { |
&Apache::lonnet::check_adhoc_privs($domain,$user,$update, |
if ($dhroles{$domain}) { |
$refresh,$now,'ca'); |
my @adhoc; |
if ($server_status eq 'switchserver') { |
if ($env{'environment.adhocroles.'.$domain}) { |
my $trolecode = 'ca./'.$domain.'/'.$user; |
@adhoc = split(',',$env{'environment.adhocroles.'.$domain}); |
my $switchserver = '/adm/switchserver?' |
} else { |
.'otherserver='.$home.'&role='.$trolecode; |
my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, |
$r->internal_redirect($switchserver); |
'adhocroles.'.$domain); |
|
if (keys(%adhocroles)) { |
|
@adhoc = split(',',$adhocroles{'adhocroles.'.$domain}); |
|
} |
|
} |
|
if ((@adhoc > 0) && ($rolename ne '')) { |
|
if (grep(/^\Q$rolename\E$/,@adhoc)) { |
|
if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now, |
|
"cr/$domain/$domain".'-domainconfig/'.$rolename, |
|
undef,$sec)) { |
|
&Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.cr/$domain/$domain". |
|
'-domainconfig/'."$rolename.adhoc" => time}); |
|
} |
|
} else { |
|
delete($env{$envkey}); |
|
} |
|
} else { |
|
delete($env{$envkey}); |
|
} |
} |
} else { |
} else { |
delete($env{$envkey}); |
delete($env{$envkey}); |
} |
} |
last; |
} else { |
|
delete($env{$envkey}); |
} |
} |
} |
last; |
|
} |
} |
} |
} |
} |
|
|
foreach $envkey (keys(%env)) { |
foreach $envkey (keys %env) { |
next if ($envkey!~/^user\.role\./); |
next if ($envkey!~/^user\.role\./); |
my ($where,$trolecode,$role,$tstatus,$tend,$tstart); |
my ($where,$trolecode,$role,$tstatus,$tend,$tstart); |
&Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, |
&Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, |
Line 453 sub handler {
|
Line 369 sub handler {
|
my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); |
my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired'); |
if ($curr_reqd_hash{'internal.releaserequired'} ne '') { |
if ($curr_reqd_hash{'internal.releaserequired'} ne '') { |
my ($switchserver,$switchwarning) = |
my ($switchserver,$switchwarning) = |
&Apache::loncommon::check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode, |
&check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode,$curr_reqd_hash{'internal.releaserequired'}); |
$curr_reqd_hash{'internal.releaserequired'}); |
|
if ($switchwarning ne '' || $switchserver ne '') { |
if ($switchwarning ne '' || $switchserver ne '') { |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::no_cache($r); |
&Apache::loncommon::no_cache($r); |
$r->send_http_header; |
$r->send_http_header; |
$r->print(&Apache::loncommon::check_release_result($switchwarning,$switchserver)); |
my $end_page=&Apache::loncommon::end_page(); |
|
$r->print(&Apache::loncommon::start_page('Selected course unavailable on this server'). |
|
'<p class="LC_warning">'); |
|
if ($switchwarning) { |
|
$r->print($switchwarning.'<br /><a href="/adm/roles">'); |
|
if (&Apache::loncommon::show_course()) { |
|
$r->print(&mt('Display courses')); |
|
} else { |
|
$r->print(&mt('Display roles')); |
|
} |
|
$r->print('</a>'); |
|
} elsif ($switchserver) { |
|
$r->print(&mt('This course requires a newer version of LON-CAPA than is installed on this server.'). |
|
'<br />'. |
|
'<a href="/adm/switchserver?'.$switchserver.'">'. |
|
&mt('Switch Server'). |
|
'</a>'); |
|
} |
|
$r->print('</p>'.&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
} |
} |
Line 582 ENDENTERKEY
|
Line 515 ENDENTERKEY
|
|
|
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { |
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { |
my $msg; |
my $msg; |
my ($furl,$ferr)= |
my ($furl,$ferr)= |
&Apache::lonuserstate::readmap($cdom.'/'.$cnum); |
&Apache::lonuserstate::readmap($cdom.'/'.$cnum); |
unless ($ferr) { |
unless (($ferr) || ($env{'form.switchrole'}) || |
unless (($env{'form.switchrole'}) || |
($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { |
($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { |
&Apache::lonnet::put('nohist_crslastlogin', |
&Apache::lonnet::put('nohist_crslastlogin', |
{$env{'user.name'}.':'.$env{'user.domain'}. |
{$env{'user.name'}.':'.$env{'user.domain'}. |
':'.$csec.':'.$role => $now},$cdom,$cnum); |
':'.$csec.':'.$role => $now},$cdom,$cnum); |
|
} |
|
my ($feeds,$syllabus_time); |
|
&Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds); |
|
&Apache::lonnet::appenv({'request.course.feeds' => $feeds}); |
|
&Apache::lonnet::get_numsuppfiles($cnum,$cdom,1); |
|
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'}) && |
if (($env{'form.orgurl'}) && |
($env{'form.orgurl'}!~/^\/adm\/flip/) && |
($env{'form.orgurl'}!~/^\/adm\/flip/)) { |
($env{'form.orgurl'} ne '/adm/roles')) { |
|
my $dest=$env{'form.orgurl'}; |
my $dest=$env{'form.orgurl'}; |
if ($env{'form.symb'}) { |
if ($env{'form.symb'}) { |
if ($dest =~ /\?/) { |
if ($dest =~ /\?/) { |
$dest .= '&'; |
$dest .= '&'; |
} else { |
} else { |
$dest .= '?'; |
$dest .= '?' |
} |
} |
$dest .= 'symb='.$env{'form.symb'}; |
$dest .= 'symb='.$env{'form.symb'}; |
} |
} |
Line 653 ENDENTERKEY
|
Line 569 ENDENTERKEY
|
} else { |
} else { |
# Check to see if the user is a CC entering a course |
# Check to see if the user is a CC entering a course |
# for the first time |
# for the first time |
|
my (undef, undef, $role, $courseid) = split(/\./, $envkey); |
|
if (substr($courseid, 0, 1) eq '/') { |
|
$courseid = substr($courseid, 1); |
|
} |
|
$courseid =~ s/\//_/; |
if ((($role eq 'cc') || ($role eq 'co')) |
if ((($role eq 'cc') || ($role eq 'co')) |
&& ($env{'course.'.$cdom.'_'.$cnum.'.course.helper.not.run'})) { |
&& ($env{'course.' . $courseid .'.course.helper.not.run'})) { |
$furl = "/adm/helper/course.initialization.helper"; |
$furl = "/adm/helper/course.initialization.helper"; |
# Send the user to the course they selected |
# Send the user to the course they selected |
} elsif ($env{'request.course.id'}) { |
} elsif ($env{'request.course.id'}) { |
Line 674 ENDENTERKEY
|
Line 595 ENDENTERKEY
|
if ($env{'request.role.adv'}) { |
if ($env{'request.role.adv'}) { |
$dest = &Apache::lonenc::unencrypted($dest); |
$dest = &Apache::lonenc::unencrypted($dest); |
if ($destsymb eq '') { |
if ($destsymb eq '') { |
($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); |
($destsymb) = ($dest =~ /\?symb=([^\&]*)/); |
$destsymb = &unescape($destsymb); |
$destsymb = &unescape($destsymb); |
} |
} |
} |
} |
} else { |
} else { |
if ($destsymb eq '') { |
if ($destsymb eq '') { |
($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]+)/); |
($destsymb) = ($dest =~ /\?symb=([^\&]+)/); |
$destsymb = &unescape($destsymb); |
$destsymb = &unescape($destsymb); |
} |
} |
unless ($env{'request.role.adv'}) { |
unless ($env{'request.role.adv'}) { |
Line 689 ENDENTERKEY
|
Line 610 ENDENTERKEY
|
} |
} |
if (($checkenc) && ($destsymb ne '')) { |
if (($checkenc) && ($destsymb ne '')) { |
my ($encstate,$unencsymb,$res); |
my ($encstate,$unencsymb,$res); |
$unencsymb = &Apache::lonnet::symbclean($destsymb); |
my $unencsymb = &Apache::lonnet::symbclean($destsymb); |
(undef,undef,$res) = &Apache::lonnet::decode_symb($unencsymb); |
(undef,undef,$res) = &Apache::lonnet::decode_symb($unencsymb); |
&Apache::lonnet::symbverify($unencsymb,$res,\$encstate); |
&Apache::lonnet::symbverify($unencsymb,$res,\$encstate); |
if ($encstate) { |
if ($encstate) { |
Line 699 ENDENTERKEY
|
Line 620 ENDENTERKEY
|
} |
} |
} |
} |
} |
} |
unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { |
unless (($dest =~ m{^/enc/}) || ($dest =~ /\?symb=.+___\d+___.+/)) { |
if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { |
if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) { |
my $esc_symb = &escape($destsymb); |
my $esc_symb = &escape($destsymb); |
$dest .= '?symb='.$esc_symb; |
$dest .= '?symb='.$esc_symb; |
} |
} |
} |
} |
&redirect_user($r, &mt('Entering [_1]', |
&redirect_user($r, &mt('Entering [_1]', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}), |
$env{'course.'.$courseid.'.description'}), |
$dest, $msg); |
$dest, $msg); |
return OK; |
return OK; |
} |
} |
Line 716 ENDENTERKEY
|
Line 637 ENDENTERKEY
|
$env{'request.course.id'}.'/' |
$env{'request.course.id'}.'/' |
.$env{'request.course.sec'}) |
.$env{'request.course.sec'}) |
) { |
) { |
my $startpage = &courseloadpage($env{'request.course.id'}); |
my $startpage = &courseloadpage($courseid); |
unless ($startpage eq 'firstres') { |
unless ($startpage eq 'firstres') { |
$msg = &mt('Entering [_1] ...', |
$msg = &mt('Entering [_1] ...', |
$env{'course.'.$env{'request.course.id'}.'.description'}); |
$env{'course.'.$courseid.'.description'}); |
&redirect_user($r, &mt('New in course'), |
&redirect_user($r, &mt('New in course'), |
'/adm/whatsnew?refpage=start', $msg); |
'/adm/whatsnew?refpage=start', $msg); |
return OK; |
return OK; |
} |
} |
} |
} |
} |
} |
# Are we allowed to look at the first resource? |
# Are we allowed to look at the first resource? |
my $access; |
if ($furl !~ m|^/adm/|) { |
if ($furl =~ m{^(/adm/wrapper|)/ext/}) { |
# Guess not ... |
# If it's an external resource, |
$furl=&Apache::lonpageflip::first_accessible_resource(); |
# strip off the symb argument and possible query |
} |
my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$}); |
|
# Unencode $symb |
|
$symb = &unescape($symb); |
|
# Then check for permission |
|
$access = &Apache::lonnet::allowed('bre',$exturl,$symb); |
|
# For other resources just check for permission |
|
} else { |
|
$access = &Apache::lonnet::allowed('bre',$furl); |
|
} |
|
if (!$access) { |
|
$furl = &Apache::lonpageflip::first_accessible_resource(); |
|
} elsif ($access eq 'B') { |
|
$furl = '/adm/navmaps?showOnlyHomework=1'; |
|
} |
|
$msg = &mt('Entering [_1] ...', |
$msg = &mt('Entering [_1] ...', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}); |
$env{'course.'.$courseid.'.description'}); |
&redirect_user($r, &mt('Entering [_1]', |
&redirect_user($r, &mt('Entering [_1]', |
$env{'course.'.$cdom.'_'.$cnum.'.description'}), |
$env{'course.'.$courseid.'.description'}), |
$furl, $msg); |
$furl, $msg); |
} |
} |
return OK; |
return OK; |
Line 764 ENDENTERKEY
|
Line 671 ENDENTERKEY
|
$redirect_url .= $where; |
$redirect_url .= $where; |
} |
} |
$redirect_url .= '/'; |
$redirect_url .= '/'; |
&redirect_user($r,&mt('Entering Authoring Space'), |
&redirect_user($r,&mt('Entering Construction Space'), |
$redirect_url); |
$redirect_url); |
return OK; |
return OK; |
} |
} |
Line 774 ENDENTERKEY
|
Line 681 ENDENTERKEY
|
$redirect_url); |
$redirect_url); |
return OK; |
return OK; |
} |
} |
if ($role eq 'dh') { |
|
my $redirect_url = '/adm/menu/'; |
|
&redirect_user($r,&mt('Loading Domain Helpdesk Menu'), |
|
$redirect_url); |
|
return OK; |
|
} |
|
if ($role eq 'sc') { |
if ($role eq 'sc') { |
my $redirect_url = '/adm/grades?command=scantronupload'; |
my $redirect_url = '/adm/grades?command=scantronupload'; |
&redirect_user($r,&mt('Loading Data Upload Page'), |
&redirect_user($r,&mt('Loading Data Upload Page'), |
Line 802 ENDENTERKEY
|
Line 703 ENDENTERKEY
|
my $crumbtext = 'User Roles'; |
my $crumbtext = 'User Roles'; |
my $pagetitle = 'My Roles'; |
my $pagetitle = 'My Roles'; |
my $recent = &mt('Recent Roles'); |
my $recent = &mt('Recent Roles'); |
my $standby = &mt('Role selected. Please stand by.'); |
|
my $show_course=&Apache::loncommon::show_course(); |
my $show_course=&Apache::loncommon::show_course(); |
if ($show_course) { |
if ($show_course) { |
$crumbtext = 'Courses'; |
$crumbtext = 'Courses'; |
$pagetitle = 'My Courses'; |
$pagetitle = 'My Courses'; |
$recent = &mt('Recent Courses'); |
$recent = &mt('Recent Courses'); |
$standby = &mt('Course selected. Please stand by.'); |
|
} |
} |
my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}]; |
my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}]; |
|
|
Line 816 ENDENTERKEY
|
Line 715 ENDENTERKEY
|
my $showcount = &roles_from_env(\%roles_in_env,$update); |
my $showcount = &roles_from_env(\%roles_in_env,$update); |
|
|
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $swinfo=&Apache::lonmenu::rawconfig(); |
my %domdefs=&Apache::lonnet::get_domain_defaults($env{'user.domain'}); |
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum}); |
my $cattype = 'std'; |
my $funcs = &get_roles_functions($showcount); |
if ($domdefs{'catauth'}) { |
my $standby=&mt('Role selected. Please stand by.'); |
$cattype = $domdefs{'catauth'}; |
$standby=~s/\n/\\n/g; |
} |
|
my $funcs = &get_roles_functions($showcount,$cattype); |
|
my $crumbsright; |
|
if ($env{'browser.mobile'}) { |
|
$crumbsright = $funcs; |
|
undef($funcs); |
|
} |
|
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum, |
|
bread_crumbs_component=>$crumbsright}); |
|
&js_escape(\$standby); |
|
my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />'; |
my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />'; |
|
|
$r->print(<<ENDHEADER); |
$r->print(<<ENDHEADER); |
Line 862 function rolesView (caller) {
|
Line 751 function rolesView (caller) {
|
document.rolechoice.display.value = caller; |
document.rolechoice.display.value = caller; |
} else { |
} else { |
if ((caller == 'doupdate') || (caller == 'requestauthor') || |
if ((caller == 'doupdate') || (caller == 'requestauthor') || |
(caller == 'queued')) { |
(caller == 'queued')) { |
document.rolechoice.state.value = caller; |
document.rolechoice.state.value = caller; |
} |
} |
} |
} |
Line 946 ENDHEADER
|
Line 835 ENDHEADER
|
} |
} |
if ($hotlist) { |
if ($hotlist) { |
$showresult .= $hotlist; |
$showresult .= $hotlist; |
} |
} |
$showresult .= '</div>'; |
$showresult .= '</div>'; |
$r->print($showresult); |
$r->print($showresult); |
} elsif ($env{'form.state'} eq 'queued') { |
} elsif ($env{'form.state'} eq 'queued') { |
Line 971 ENDHEADER
|
Line 860 ENDHEADER
|
\%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev); |
\%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev); |
$refresh = $now; |
$refresh = $now; |
&Apache::lonnet::appenv({'user.refresh.time' => $refresh}); |
&Apache::lonnet::appenv({'user.refresh.time' => $refresh}); |
if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) { |
unless ($env{'user.adv'}) { |
if ($countactive > 0) { |
if ($countactive > 0) { |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
$r->print( |
$r->print( |
'<p>' |
'<p>' |
.&mt('[_1]Visit the [_2]Course/Community Catalog[_3][_4]' |
.&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' |
.' to view all [_5] LON-CAPA courses and communities.' |
.' to view all [_4] LON-CAPA courses and communities.' |
,'<b>' |
,'<b>' |
,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">' |
,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">' |
,'</a>' |
,'</a></b>',$domdesc) |
,'</b>' |
|
,'"'.$domdesc.'"') |
|
.'<br />' |
.'<br />' |
.&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,' |
.&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,' |
.' you may be able to enroll if self-enrollment is permitted.' |
.' you may be able to enroll if self-enrollment is permitted.' |
Line 995 ENDHEADER
|
Line 882 ENDHEADER
|
|
|
# No active roles |
# No active roles |
if ($countactive==0) { |
if ($countactive==0) { |
&requestcourse_advice($r,$cattype,$inrole); |
if ($inrole) { |
|
$r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>'); |
|
} else { |
|
$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>'); |
|
} |
|
&findcourse_advice($r); |
|
&requestcourse_advice($r); |
$r->print('</form>'); |
$r->print('</form>'); |
if ($countfuture) { |
if ($countfuture) { |
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); |
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); |
Line 1027 ENDHEADER
|
Line 920 ENDHEADER
|
} |
} |
# ----------------------------------------------------------------------- Table |
# ----------------------------------------------------------------------- Table |
|
|
if (($numdc > 0) || (($numdh > 0) && ($numadhoc > 0))) { |
if ($numdc > 0) { |
$r->print(&coursepick_jscript()); |
$r->print(&coursepick_jscript()); |
$r->print(&Apache::loncommon::coursebrowser_javascript(). |
$r->print(&Apache::loncommon::coursebrowser_javascript(). |
&Apache::loncommon::authorbrowser_javascript()); |
&Apache::loncommon::authorbrowser_javascript()); |
Line 1060 ENDHEADER
|
Line 953 ENDHEADER
|
$roletext{'user.role.'.$role}->[1]. |
$roletext{'user.role.'.$role}->[1]. |
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
} |
} |
if ($role =~ m{^dc\./($match_domain)/$} |
if ($role =~ m{dc\./($match_domain)/} |
&& $dcroles{$1}) { |
&& $dcroles{$1}) { |
$output .= &adhoc_roles_row($1,'recent'); |
$output .= &adhoc_roles_row($1,'recent'); |
} elsif ($role =~ m{^dh\./($match_domain)/$} |
|
&& ($env{'environment.adhocroles.'.$1} ne '')) { |
|
$output .= &adhoc_customroles_row($1,'recent'); |
|
} |
} |
} elsif ($numdc > 0) { |
} elsif ($numdc > 0) { |
unless ($role =~/^error\:/) { |
unless ($role =~/^error\:/) { |
Line 1139 ENDHEADER
|
Line 1029 ENDHEADER
|
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
$r->print('<p><small><i>' |
$r->print('<p><small><i>' |
.&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion')) |
.&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion')) |
.'</i></small></p>'); |
.'</i><br />' |
|
.'<a href="/adm/logout">'.&mt('Logout').'</a> ' |
|
.'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">' |
|
.&mt('Course/Community Catalog') |
|
.'</a></small></p>'); |
} |
} |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
Line 1222 sub gather_roles {
|
Line 1116 sub gather_roles {
|
my $trole; |
my $trole; |
if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
unless ($rauthor eq $rdomain.'-domainconfig') { |
if ($tremark) { $tremark.='<br />'; } |
if ($tremark) { $tremark.='<br />'; } |
$tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain); |
$tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain); |
|
} |
|
} |
} |
$trole=Apache::lonnet::plaintext($role); |
$trole=Apache::lonnet::plaintext($role); |
my $ttype; |
my $ttype; |
Line 1243 sub gather_roles {
|
Line 1135 sub gather_roles {
|
} |
} |
#next if ($home eq 'no_host'); |
#next if ($home eq 'no_host'); |
$home = &Apache::lonnet::hostname($home); |
$home = &Apache::lonnet::hostname($home); |
$ttype='Authoring Space'; |
$ttype='Construction Space'; |
$twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain'). |
$twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain'). |
': '.$tdom.'<br />'. |
': '.$tdom.'<br />'. |
' '.&mt('Server').': '.$home; |
' '.&mt('Server').': '.$home; |
Line 1262 sub gather_roles {
|
Line 1154 sub gather_roles {
|
} |
} |
#next if ($home eq 'no_host'); |
#next if ($home eq 'no_host'); |
$home = &Apache::lonnet::hostname($home); |
$home = &Apache::lonnet::hostname($home); |
$ttype='Authoring Space'; |
$ttype='Construction Space'; |
$twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server'). |
$twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server'). |
': '.$home; |
': '.$home; |
$env{'course.'.$tdom.'_'.$trest.'.description'}='ca'; |
$env{'course.'.$tdom.'_'.$trest.'.description'}='ca'; |
Line 1271 sub gather_roles {
|
Line 1163 sub gather_roles {
|
} elsif ($trest) { |
} elsif ($trest) { |
my $tcourseid=$tdom.'_'.$trest; |
my $tcourseid=$tdom.'_'.$trest; |
$ttype = &Apache::loncommon::course_type($tcourseid); |
$ttype = &Apache::loncommon::course_type($tcourseid); |
if ($role !~ /^cr/) { |
$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); |
$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); |
|
} elsif ($role =~ m{^cr/($match_domain)/\1-domainconfig/(\w+)$}) { |
|
$trole = &mt('Helpdesk[_1]',' '.$2); |
|
} else { |
|
$trole = (split(/\//,$role,4))[-1]; |
|
} |
|
if ($env{'course.'.$tcourseid.'.description'}) { |
if ($env{'course.'.$tcourseid.'.description'}) { |
my $home=$env{'course.'.$tcourseid.'.home'}; |
my $home=$env{'course.'.$tcourseid.'.home'}; |
$twhere=$env{'course.'.$tcourseid.'.description'}; |
$twhere=$env{'course.'.$tcourseid.'.description'}; |
Line 1291 sub gather_roles {
|
Line 1177 sub gather_roles {
|
my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'}; |
my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'}; |
if ($required ne '') { |
if ($required ne '') { |
($switchserver,$switchwarning) = |
($switchserver,$switchwarning) = |
&Apache::loncommon::check_release_required($loncaparev,$tcourseid,$trolecode,$required); |
&check_release_required($loncaparev,$tcourseid,$trolecode,$required); |
if ($switchserver || $switchwarning) { |
if ($switchserver || $switchwarning) { |
$button = 0; |
$button = 0; |
} |
} |
Line 1314 sub gather_roles {
|
Line 1200 sub gather_roles {
|
my $required = $newhash{'internal.releaserequired'}; |
my $required = $newhash{'internal.releaserequired'}; |
if ($required ne '') { |
if ($required ne '') { |
($switchserver,$switchwarning) = |
($switchserver,$switchwarning) = |
&Apache::loncommon::check_release_required($loncaparev,$tcourseid,$trolecode,$required); |
&check_release_required($loncaparev,$tcourseid,$trolecode,$required); |
if ($switchserver || $switchwarning) { |
if ($switchserver || $switchwarning) { |
$button = 0; |
$button = 0; |
} |
} |
Line 1415 sub roletable_headers {
|
Line 1301 sub roletable_headers {
|
my $doheaders; |
my $doheaders; |
if ((ref($sortrole) eq 'HASH') && (ref($roleclass) eq 'HASH')) { |
if ((ref($sortrole) eq 'HASH') && (ref($roleclass) eq 'HASH')) { |
$r->print('<br />' |
$r->print('<br />' |
.&Apache::loncommon::start_data_table('LC_textsize_mobile') |
.&Apache::loncommon::start_data_table() |
.&Apache::loncommon::start_data_table_header_row() |
.&Apache::loncommon::start_data_table_header_row() |
); |
); |
if (!$nochoose) { $r->print('<th> </th>'); } |
if (!$nochoose) { $r->print('<th> </th>'); } |
Line 1441 sub roletable_headers {
|
Line 1327 sub roletable_headers {
|
} |
} |
|
|
sub roletypes { |
sub roletypes { |
my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System'); |
my @types = ('Domain','Construction Space','Course','Community','Unavailable','System'); |
return @types; |
return @types; |
} |
} |
|
|
Line 1464 sub print_rolerows {
|
Line 1350 sub print_rolerows {
|
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
} |
} |
} |
} |
if ($sortrole->{$which} =~ m{^user\.role\.dc\./($match_domain)/}) { |
if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) { |
if (ref($dcroles) eq 'HASH') { |
if (ref($dcroles) eq 'HASH') { |
if ($dcroles->{$1}) { |
if ($dcroles->{$1}) { |
$output .= &adhoc_roles_row($1,''); |
$output .= &adhoc_roles_row($1,''); |
} |
} |
} |
} |
} elsif (($sortrole->{$which} =~ m{^user\.role\.dh\./($match_domain)/}) && |
|
($env{'environment.adhocroles.'.$1} ne '')) { |
|
$output .= &adhoc_customroles_row($1,''); |
|
} |
} |
} |
} |
} |
} |
Line 1493 sub print_rolerows {
|
Line 1376 sub print_rolerows {
|
} |
} |
|
|
sub findcourse_advice { |
sub findcourse_advice { |
my ($r,$cattype) = @_; |
my ($r) = @_; |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) { |
if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) { |
Line 1508 sub findcourse_advice {
|
Line 1391 sub findcourse_advice {
|
} else { |
} else { |
$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />'); |
$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />'); |
} |
} |
if (($cattype eq 'std') || ($cattype eq 'domonly')) { |
$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'. |
$r->print('<h3>'.&mt('Self-Enrollment').'</h3>'. |
'<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />'); |
'<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />'); |
$r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'. |
$r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'. |
&Apache::loncoursequeueadmin::queued_selfenrollment()); |
&Apache::loncoursequeueadmin::queued_selfenrollment()); |
|
} |
|
return; |
return; |
} |
} |
|
|
sub requestcourse_advice { |
sub requestcourse_advice { |
my ($r,$cattype,$inrole) = @_; |
my ($r) = @_; |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my (%can_request,%request_doms,$output); |
my (%can_request,%request_doms); |
&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms); |
&Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms); |
if (keys(%request_doms) > 0) { |
if (keys(%request_doms) > 0) { |
my ($types,$typename) = &Apache::loncommon::course_types(); |
my ($types,$typename) = &Apache::loncommon::course_types(); |
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { |
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { |
|
$r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'. |
|
'<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>'); |
my (@reqdoms,@reqtypes); |
my (@reqdoms,@reqtypes); |
foreach my $type (sort(keys(%request_doms))) { |
foreach my $type (sort(keys(%request_doms))) { |
push(@reqtypes,$type); |
push(@reqtypes,$type); |
if (ref($request_doms{$type}) eq 'ARRAY') { |
if (ref($request_doms{$type}) eq 'ARRAY') { |
my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}})); |
my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}})); |
$output .= |
$r->print( |
'<li>' |
'<li>' |
.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]', |
.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]', |
'<i>', |
'<i>', |
'</i>', |
'</i>', |
'<b>'.$domstr.'</b>') |
'<b>'.$domstr.'</b>') |
.'</li>'; |
.'</li>' |
|
); |
foreach my $dom (@{$request_doms{$type}}) { |
foreach my $dom (@{$request_doms{$type}}) { |
unless (grep(/^\Q$dom\E/,@reqdoms)) { |
unless (grep(/^\Q$dom\E/,@reqdoms)) { |
push(@reqdoms,$dom); |
push(@reqdoms,$dom); |
Line 1560 sub requestcourse_advice {
|
Line 1444 sub requestcourse_advice {
|
} |
} |
if (@reqdoms == 1 || @showtypes > 0) { |
if (@reqdoms == 1 || @showtypes > 0) { |
$requrl .= '&state=crstype&action=new'; |
$requrl .= '&state=crstype&action=new'; |
} |
} |
if ($output) { |
$r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>'); |
$r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'. |
|
'<p>'. |
|
&mt('You have rights to request the creation of courses and/or communities in the following domain(s):'). |
|
'<ul>'. |
|
$output. |
|
'</ul>'. |
|
&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.', |
|
'<a href="'.$requrl.'">','</a>'). |
|
'</p>'); |
|
} |
|
} |
|
} elsif (!$env{'user.adv'}) { |
|
if ($inrole) { |
|
$r->print('<h3>'.&mt('Currently no additional roles, courses or communities').'</h3>'); |
|
} else { |
|
$r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>'); |
|
} |
} |
&findcourse_advice($r,$cattype); |
|
} |
} |
return; |
return; |
} |
} |
Line 1599 sub privileges_info {
|
Line 1466 sub privileges_info {
|
my (undef,$tdom,$trest,$tsec)=split(m{/},$where); |
my (undef,$tdom,$trest,$tsec)=split(m{/},$where); |
if ($trest) { |
if ($trest) { |
if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') { |
if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') { |
$ttype='Authoring Space'; |
$ttype='Construction Space'; |
$twhere='User: '.$trest.', Domain: '.$tdom; |
$twhere='User: '.$trest.', Domain: '.$tdom; |
} else { |
} else { |
$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest); |
$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest); |
Line 1640 sub privileges_info {
|
Line 1507 sub privileges_info {
|
} |
} |
|
|
sub build_roletext { |
sub build_roletext { |
my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere, |
my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_; |
$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_; |
|
my ($roletext,$roletext_end); |
my ($roletext,$roletext_end); |
my $is_dc=($trolecode =~ m/^dc\./); |
my $is_dc=($trolecode =~ m/^dc\./); |
my $rowspan=($is_dc) ? '' |
my $rowspan=($is_dc) ? '' |
Line 1713 sub build_roletext {
|
Line 1579 sub build_roletext {
|
return ($roletext,$roletext_end); |
return ($roletext,$roletext_end); |
} |
} |
|
|
|
sub check_needs_switchserver { |
|
my ($possiblerole) = @_; |
|
my $needs_switchserver; |
|
my ($role,$where) = split(/\./,$possiblerole,2); |
|
my (undef,$tdom,$twho) = split(/\//,$where); |
|
my ($server_status,$home); |
|
if (($role eq 'ca') || ($role eq 'aa')) { |
|
($server_status,$home) = &check_author_homeserver($twho,$tdom); |
|
} else { |
|
($server_status,$home) = &check_author_homeserver($env{'user.name'}, |
|
$env{'user.domain'}); |
|
} |
|
if ($server_status eq 'switchserver') { |
|
$needs_switchserver = 1; |
|
} |
|
return $needs_switchserver; |
|
} |
|
|
sub check_author_homeserver { |
sub check_author_homeserver { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
if (($uname eq '') || ($udom eq '')) { |
if (($uname eq '') || ($udom eq '')) { |
Line 1730 sub check_author_homeserver {
|
Line 1614 sub check_author_homeserver {
|
} |
} |
} |
} |
|
|
sub check_for_adhoc { |
sub check_fordc { |
my ($dcroles,$dhroles,$update,$then) = @_; |
my ($dcroles,$update,$then) = @_; |
my $numdc = 0; |
my $numdc = 0; |
my $numdh = 0; |
|
my $numadhoc = 0; |
|
my $num_custom_adhoc = 0; |
|
if ($env{'user.adv'}) { |
if ($env{'user.adv'}) { |
foreach my $envkey (sort(keys(%env))) { |
foreach my $envkey (sort keys %env) { |
if ($envkey=~/^user\.role\.(dc|dh)\.\/($match_domain)\/$/) { |
if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) { |
my $role = $1; |
my $dcdom = $1; |
my $roledom = $2; |
my $livedc = 1; |
my $liverole = 1; |
|
my ($tstart,$tend)=split(/\./,$env{$envkey}); |
my ($tstart,$tend)=split(/\./,$env{$envkey}); |
my $limit = $update; |
my $limit = $update; |
if ((($role eq 'dc') && ($env{'request.role'} eq 'dc./'.$roledom.'/')) || |
if ($env{'request.role'} eq 'dc./'.$dcdom.'/') { |
(($role eq 'dh') && ($env{'request.role'} eq 'dh./'.$roledom.'/'))) { |
|
$limit = $then; |
$limit = $then; |
} |
} |
if ($tstart && $tstart>$limit) { $liverole = 0; } |
if ($tstart && $tstart>$limit) { $livedc = 0; } |
if ($tend && $tend <$limit) { $liverole = 0; } |
if ($tend && $tend <$limit) { $livedc = 0; } |
if ($liverole) { |
if ($livedc) { |
if ($role eq 'dc') { |
$$dcroles{$dcdom} = $envkey; |
$dcroles->{$roledom} = $envkey; |
$numdc++; |
$numdc++; |
|
} else { |
|
$dhroles->{$roledom} = $envkey; |
|
if ($env{'environment.adhocroles.'.$roledom} ne '') { |
|
$numadhoc ++; |
|
} |
|
$numdh++; |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
} |
return ($numdc,$numdh,$numadhoc); |
return $numdc; |
} |
} |
|
|
sub adhoc_course_role { |
sub adhoc_course_role { |
Line 1785 sub adhoc_course_role {
|
Line 1656 sub adhoc_course_role {
|
$setprivs = 1; |
$setprivs = 1; |
} |
} |
} |
} |
unless ($setprivs) { |
|
if (!exists($env{'user.priv.'.$env{'form.switchrole'}.'./'})) { |
|
$setprivs = 1; |
|
} |
|
} |
|
if ($setprivs) { |
if ($setprivs) { |
if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)(.*?)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { |
if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) { |
my $role = $1; |
my $role = $1; |
my $custom_role = $2; |
my $custom_role = $2; |
my $usec = $3; |
my $usec = $3; |
Line 1806 sub adhoc_course_role {
|
Line 1672 sub adhoc_course_role {
|
my %cgroups = |
my %cgroups = |
&Apache::lonnet::get_active_groups($env{'user.domain'}, |
&Apache::lonnet::get_active_groups($env{'user.domain'}, |
$env{'user.name'},$cdom,$cnum); |
$env{'user.name'},$cdom,$cnum); |
my $ccrole; |
|
if ($crstype eq 'Community') { |
|
$ccrole = 'co'; |
|
} else { |
|
$ccrole = 'cc'; |
|
} |
|
foreach my $group (keys(%cgroups)) { |
foreach my $group (keys(%cgroups)) { |
$group_privs{$group} = |
$group_privs{$group} = |
$env{'user.priv.'.$ccrole.'./'.$cdom.'/'.$cnum.'./'.$cdom.'/'.$cnum.'/'.$group}; |
$env{'user.priv.cc./'.$cdom.'/'.$cnum.'./'.$cdom.'/'.$cnum.'/'.$group}; |
} |
} |
$newgroups{'/'.$cdom.'/'.$cnum} = \%group_privs; |
$newgroups{'/'.$cdom.'/'.$cnum} = \%group_privs; |
my $area = '/'.$cdom.'/'.$cnum; |
my $area = '/'.$cdom.'/'.$cnum; |
Line 1823 sub adhoc_course_role {
|
Line 1683 sub adhoc_course_role {
|
$spec .= '/'.$usec; |
$spec .= '/'.$usec; |
$area .= '/'.$usec; |
$area .= '/'.$usec; |
} |
} |
if ($role =~ /^cr/) { |
&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); |
&Apache::lonnet::custom_roleprivs(\%newrole,$role,$cdom,$cnum,$spec,$area); |
|
} else { |
|
&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); |
|
} |
|
&Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups); |
&Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups); |
my $adhocstart = $refresh-1; |
my $adhocstart = $refresh-1; |
$userroles{'user.role.'.$spec} = $adhocstart.'.'; |
$userroles{'user.role.'.$spec} = $adhocstart.'.'; |
Line 1862 sub check_forcc {
|
Line 1718 sub check_forcc {
|
return $is_cc; |
return $is_cc; |
} |
} |
|
|
|
sub check_release_required { |
|
my ($loncaparev,$tcourseid,$trolecode,$required) = @_; |
|
my ($switchserver,$warning); |
|
if ($required ne '') { |
|
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
|
my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
|
if ($reqdmajor ne '' && $reqdminor ne '') { |
|
my $otherserver; |
|
if (($major eq '' && $minor eq '') || |
|
(($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { |
|
my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'}); |
|
my $switchlcrev = |
|
&Apache::lonnet::get_server_loncaparev($env{'user.domain'}, |
|
$userdomserver); |
|
my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
|
if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || |
|
(($reqdmajor == $swmajor) && ($reqdminor > $swminor))) { |
|
my $cdom = $env{'course.'.$tcourseid.'.domain'}; |
|
if ($cdom ne $env{'user.domain'}) { |
|
my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom); |
|
my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname); |
|
my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); |
|
my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); |
|
my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'}); |
|
my $remoterev = &Apache::lonnet::get_server_loncaparev($serverhomedom,$coursedomserver); |
|
my $canhost = |
|
&Apache::lonnet::can_host_session($env{'user.domain'}, |
|
$coursedomserver, |
|
$remoterev, |
|
$udomdefaults{'remotesessions'}, |
|
$defdomdefaults{'hostedsessions'}); |
|
|
|
if ($canhost) { |
|
$otherserver = $coursedomserver; |
|
} else { |
|
$warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'. &mt("No suitable server could be found amongst servers in either your own domain or in the course's domain."); |
|
} |
|
} else { |
|
$warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain)."); |
|
} |
|
} else { |
|
$otherserver = $userdomserver; |
|
} |
|
} |
|
if ($otherserver ne '') { |
|
$switchserver = 'otherserver='.$otherserver.'&role='.$trolecode; |
|
} |
|
} |
|
} |
|
return ($switchserver,$warning); |
|
} |
|
|
sub courselink { |
sub courselink { |
my ($roledom,$rowtype,$role) = @_; |
my ($dcdom,$rowtype) = @_; |
my $courseform=&Apache::loncommon::selectcourse_link |
my $courseform=&Apache::loncommon::selectcourse_link |
('rolechoice','course'.$rowtype.'_'.$roledom.'_'.$role, |
('rolechoice','dccourse'.$rowtype.'_'.$dcdom, |
'domain'.$rowtype.'_'.$roledom.'_'.$role, |
'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'. |
'coursedesc'.$rowtype.'_'.$roledom.'_'.$role, |
$dcdom,$dcdom,undef,'Course/Community'); |
$roledom.':'.$role,undef,'Course/Community'); |
my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'. |
my $hiddenitems = '<input type="hidden" name="domain'.$rowtype.'_'.$roledom.'_'.$role.'" value="'.$roledom.'" />'. |
'<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'. |
'<input type="hidden" name="origdom'.$rowtype.'_'.$roledom.'_'.$role.'" value="'.$roledom.'" />'. |
'<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'. |
'<input type="hidden" name="course'.$rowtype.'_'.$roledom.'_'.$role.'" value="" />'. |
'<input type="hidden" name="coursedesc'.$rowtype.'_'.$dcdom.'" value="" />'; |
'<input type="hidden" name="coursedesc'.$rowtype.'_'.$roledom.'_'.$role.'" value="" />'; |
|
return $courseform.$hiddenitems; |
return $courseform.$hiddenitems; |
} |
} |
|
|
sub coursepick_jscript { |
sub coursepick_jscript { |
my %js_lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.", |
plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.", |
youc => 'You can only use this screen to select courses and communities in the current domain.', |
youc => 'You can only use this screen to select courses and communities in the current domain.', |
); |
); |
&js_escape(\%js_lt); |
|
my $verify_script = <<"END"; |
my $verify_script = <<"END"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 1898 function verifyCoursePick(caller) {
|
Line 1804 function verifyCoursePick(caller) {
|
} |
} |
} |
} |
else { |
else { |
alert("$js_lt{'plsu'}"); |
alert("$lt{'plsu'}"); |
} |
} |
} |
} |
else { |
else { |
alert("$js_lt{'youc'}") |
alert("$lt{'youc'}") |
} |
} |
} |
} |
function getIndex(caller) { |
function getIndex(caller) { |
Line 1963 sub display_cc_role {
|
Line 1869 sub display_cc_role {
|
sub adhoc_roles_row { |
sub adhoc_roles_row { |
my ($dcdom,$rowtype) = @_; |
my ($dcdom,$rowtype) = @_; |
my $output = &Apache::loncommon::continue_data_table_row() |
my $output = &Apache::loncommon::continue_data_table_row() |
.' <td colspan="5" class="LC_textsize_mobile">' |
.' <td colspan="5">' |
.&mt('[_1]Ad hoc[_2] roles in domain [_3] --' |
.&mt('[_1]Ad hoc[_2] roles in domain [_3] --' |
,'<span class="LC_cusr_emph">','</span>',$dcdom) |
,'<span class="LC_cusr_emph">','</span>',$dcdom) |
.' '; |
.' '; |
my $role = 'cc'; |
my $selectcclink = &courselink($dcdom,$rowtype); |
my $selectcclink = &courselink($dcdom,$rowtype,$role); |
|
my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1); |
my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1); |
my $carole = &Apache::lonnet::plaintext('ca'); |
my $carole = &Apache::lonnet::plaintext('ca'); |
my $selectcalink = &coauthorlink($dcdom,$rowtype); |
my $selectcalink = &coauthorlink($dcdom,$rowtype); |
Line 1978 sub adhoc_roles_row {
|
Line 1883 sub adhoc_roles_row {
|
return $output; |
return $output; |
} |
} |
|
|
sub adhoc_customroles_row { |
|
my ($dhdom,$rowtype) = @_; |
|
my $output = &Apache::loncommon::continue_data_table_row() |
|
.' <td colspan="5" class="LC_textsize_mobile">' |
|
.&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --', |
|
'<span class="LC_cusr_emph">','</span>',$dhdom); |
|
my @customroles = split(/,/,$env{'environment.adhocroles.'.$dhdom}); |
|
my $count = 0; |
|
foreach my $role (@customroles) { |
|
next if (($role eq '') || ($role =~ /\W/)); |
|
$output .= ' '.$role.': '.&courselink($dhdom,$rowtype,$role).' |'; |
|
$count ++; |
|
} |
|
if ($count) { |
|
return $output; |
|
} |
|
return; |
|
} |
|
|
|
sub recent_filename { |
sub recent_filename { |
my $area=shift; |
my $area=shift; |
return 'nohist_recent_'.&escape($area); |
return 'nohist_recent_'.&escape($area); |
Line 2256 sub update_session_roles {
|
Line 2142 sub update_session_roles {
|
my $status_in_db = |
my $status_in_db = |
&curr_role_status($tstart,$tend,$refresh,$now); |
&curr_role_status($tstart,$tend,$refresh,$now); |
my ($rdummy,$rest) = split(/\//,$role,2); |
my ($rdummy,$rest) = split(/\//,$role,2); |
|
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
my %currpriv; |
my %currpriv; |
unless (exists($crprivs{$rest})) { |
unless (exists($crprivs{$rest})) { |
my ($rdomain,$rauthor,$rrole)=split(/\//,$rest); |
my ($rdomain,$rauthor,$rrole)=split(/\//,$rest); |
Line 2280 sub update_session_roles {
|
Line 2167 sub update_session_roles {
|
} |
} |
} |
} |
} |
} |
my $status_in_env = |
$currpriv{sys} = $env{"user.priv.$rolekey./"}; |
&curr_role_status($currstart,$currend,$refresh,$update); |
$currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; |
if ($status_in_env eq 'active') { |
$currpriv{crs} = $env{"user.priv.$rolekey.$where"}; |
$currpriv{sys} = $env{"user.priv.$rolekey./"}; |
if (keys(%crprivs)) { |
$currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; |
if (($crprivs{$rest}{sys} ne $currpriv{sys}) || |
$currpriv{crs} = $env{"user.priv.$rolekey.$where"}; |
($crprivs{$rest}{dom} ne $currpriv{dom}) |
if (keys(%crprivs)) { |
|
if (($crprivs{$rest}{sys} ne $currpriv{sys}) || |
|
($crprivs{$rest}{dom} ne $currpriv{dom}) |
|
|| |
|| |
($crprivs{$rest}{crs} ne $currpriv{crs})) { |
($crprivs{$rest}{crs} ne $currpriv{crs})) { |
&gather_roleprivs(\%allroles,\%allgroups, |
&gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db); |
\%userroles,$where,$role, |
unless (grep(/^\Q$role\E$/,@changed_roles)) { |
$tstart,$tend,$status_in_db); |
push(@changed_roles,$role); |
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') { |
$customprivchg{$rolekey} = $status_in_env; |
$customprivchg{$rolekey} = $status_in_env; |
} |
} |
} |
} |
Line 2313 sub update_session_roles {
|
Line 2198 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 ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/); |
my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/); |
my ($role,$rest)=split(m{\./},$rolekey,2); |
my ($role,$rest)=split(/\./,$rolekey,2); |
$rest = '/'.$rest; |
|
if (&Apache::lonnet::delenv($envkey,undef,[$role])) { |
if (&Apache::lonnet::delenv($envkey,undef,[$role])) { |
if ($status_in_env eq 'active') { |
if ($status_in_env eq 'active') { |
if ($role eq 'gr') { |
if ($role eq 'gr') { |
Line 2379 sub update_session_roles {
|
Line 2263 sub update_session_roles {
|
} |
} |
$msg .= '<br />'.&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.').'</p>'; |
$msg .= '<br />'.&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.').'</p>'; |
} |
} |
&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))) { |
if (!@changed_roles || !(keys(%changed_groups))) { |
my ($rolesmsg,$groupsmsg); |
my ($rolesmsg,$groupsmsg); |
if (!@changed_roles) { |
if (!@changed_roles) { |
Line 2498 sub update_session_roles {
|
Line 2295 sub update_session_roles {
|
if (@changed_roles > 0) { |
if (@changed_roles > 0) { |
if (keys(%newgroup) > 0) { |
if (keys(%newgroup) > 0) { |
my $groupmsg; |
my $groupmsg; |
my (%curr_groups,%groupdescs,$currcrs); |
|
foreach my $item (sort(keys(%newgroup))) { |
foreach my $item (sort(keys(%newgroup))) { |
if (&is_active_course($item,$refresh,$update,\%roleshash)) { |
if (&is_active_course($item,$refresh,$update,\%roleshash)) { |
if ($item =~ m{^gr\./($match_domain/$match_courseid)/(\w+)$}) { |
$groupmsg .= '<li>'. |
my ($cdom,$cnum) = split(/\//,$1); |
&mt('[_1] with status: [_2].', |
my $group = $2; |
$item,$newgroup{$item}).'</li>'; |
if ($currcrs ne $cdom.'_'.$cnum) { |
|
if ($currcrs) { |
|
$groupmsg .= '</ul><li>'; |
|
} |
|
$groupmsg .= '<li><b>'. |
|
$env{'course.'.$cdom.'_'.$cnum.'.description'}.'</b><ul>'; |
|
$currcrs = $cdom.'_'.$cnum; |
|
} |
|
my $groupdesc; |
|
unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') { |
|
%{$curr_groups{$cdom.'_'.$cnum}} = |
|
&Apache::longroup::coursegroups($cdom,$cnum); |
|
} |
|
unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') && |
|
($groupdescs{$cdom.'_'.$cnum}{$group})) { |
|
|
|
my %groupinfo = |
|
&Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group}); |
|
$groupdescs{$cdom.'_'.$cnum}{$group} = |
|
&unescape($groupinfo{'description'}); |
|
} |
|
$groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group}; |
|
if ($groupdesc) { |
|
$groupmsg .= '<li>'. |
|
&mt('[_1] with status: [_2].', |
|
'<b>'.$groupdesc.'</b>',$newgroup{$item}).'</li>'; |
|
} |
|
} |
|
} |
|
if ($groupmsg) { |
|
$groupmsg .= '</ul></li>'; |
|
} |
} |
} |
} |
if ($groupmsg) { |
if ($groupmsg) { |
Line 2544 sub update_session_roles {
|
Line 2309 sub update_session_roles {
|
} |
} |
} |
} |
if (keys(%newrole) > 0) { |
if (keys(%newrole) > 0) { |
my $newmsg; |
$changemsg .= '<li>'.&mt('New roles'). |
|
'<ul>'; |
foreach my $item (sort(keys(%newrole))) { |
foreach my $item (sort(keys(%newrole))) { |
my $desc = &role_desc($item,$update,$refresh,$now); |
$changemsg .= '<li>'. |
if ($desc) { |
&mt('[_1] with status: [_2].', |
$newmsg .= '<li>'. |
$item,$newrole{$item}).'</li>'; |
&mt('[_1] with status: [_2].', |
|
$desc,&mt($newrole{$item})).'</li>'; |
|
} |
|
} |
|
if ($newmsg) { |
|
$changemsg .= '<li>'.&mt('New roles'). |
|
'<ul>'.$newmsg.'</ul>'. |
|
'</li>'; |
|
} |
} |
|
$changemsg .= '</ul></li>'; |
} |
} |
if (keys(%customprivchg) > 0) { |
if (keys(%customprivchg) > 0) { |
my $privmsg; |
$changemsg .= '<li>'. |
|
&mt('Custom roles with privilege changes'). |
|
'<ul>'; |
foreach my $item (sort(keys(%customprivchg))) { |
foreach my $item (sort(keys(%customprivchg))) { |
my $desc = &role_desc($item,$update,$refresh,$now); |
$changemsg .= '<li>'.$item.'</li>'; |
if ($desc) { |
|
$privmsg .= '<li>'.$desc.'</li>'; |
|
} |
|
} |
} |
if ($privmsg) { |
$changemsg .= '</ul></li>'; |
$changemsg .= '<li>'. |
|
&mt('Custom roles with privilege changes'). |
|
'<ul>'.$privmsg.'</ul>'. |
|
'</li>'; |
|
} |
|
} |
} |
if (keys(%rolechange) > 0) { |
if (keys(%rolechange) > 0) { |
my $rolemsg; |
$changemsg .= '<li>'. |
|
&mt('Existing roles with status changes').'</li>'. |
|
'<ul>'; |
foreach my $item (sort(keys(%rolechange))) { |
foreach my $item (sort(keys(%rolechange))) { |
my $desc = &role_desc($item,$update,$refresh,$now); |
|
if ($desc) { |
|
$rolemsg .= '<li>'. |
|
&mt('[_1] status now: [_2].',$desc, |
|
$rolechange{$item}).'</li>'; |
|
} |
|
} |
|
if ($rolemsg) { |
|
$changemsg .= '<li>'. |
$changemsg .= '<li>'. |
&mt('Existing roles with status changes').'</li>'. |
&mt('[_1] status now: [_2].',$item, |
'<ul>'.$rolemsg.'</ul>'. |
$rolechange{$item}).'</li>'; |
'</li>'; |
|
} |
} |
|
$changemsg .= '</ul></li>'; |
} |
} |
if (keys(%deletedroles) > 0) { |
if (keys(%deletedroles) > 0) { |
my $delmsg; |
$changemsg .= '<li>'. |
|
&mt('Existing roles now expired').'</li>'. |
|
'<ul>'; |
foreach my $item (sort(keys(%deletedroles))) { |
foreach my $item (sort(keys(%deletedroles))) { |
my $desc = &role_desc($item,$update,$refresh,$now); |
$changemsg .= '<li>'.$item.'</li>'; |
if ($desc) { |
|
$delmsg .= '<li>'.$desc.'</li>'; |
|
} |
|
} |
|
if ($delmsg) { |
|
$changemsg .= '<li>'. |
|
&mt('Existing roles now expired').'</li>'. |
|
'<ul>'.$delmsg.'</ul>'. |
|
'</li>'; |
|
} |
} |
|
$changemsg .= '</ul></li>'; |
} |
} |
} |
} |
if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) { |
if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) { |
Line 2634 sub update_session_roles {
|
Line 2375 sub update_session_roles {
|
&mt('Existing course/community groups with status changes').'</li>'. |
&mt('Existing course/community groups with status changes').'</li>'. |
'<ul>'; |
'<ul>'; |
foreach my $crs (sort(keys(%groupchange))) { |
foreach my $crs (sort(keys(%groupchange))) { |
my $cid = $crs; |
|
$cid=~s{^/}{}; |
|
$cid=~s{/}{_}; |
|
my $crsdesc = $env{'course.'.$cid.'.description'}; |
|
my $cdom = $env{'course.'.$cid.'.domain'}; |
|
my $cnum = $env{'course.'.$cid.'.num'}; |
|
my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); |
|
my %groupdesc; |
|
if (ref($groupchange{$crs}) eq 'HASH') { |
if (ref($groupchange{$crs}) eq 'HASH') { |
$groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>'); |
$groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crs.'</b><ul>'); |
foreach my $group (sort(keys(%{$groupchange{$crs}}))) { |
foreach my $group (sort(keys(%{$groupchange{$crs}}))) { |
unless ($groupdesc{$group}) { |
$groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$group.'</b>',$groupchange{$crs}{$group}).'</li>'; |
my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group}); |
|
$groupdesc{$group} = &unescape($groupinfo{'description'}); |
|
} |
|
$groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$groupdesc{$group}.'</b>',$groupchange{$crs}{$group}).'</li>'; |
|
} |
} |
$groupchgmsg .= '</ul></li>'; |
$groupchgmsg .= '</ul></li>'; |
} |
} |
Line 2664 sub update_session_roles {
|
Line 2393 sub update_session_roles {
|
} |
} |
if ($changemsg) { |
if ($changemsg) { |
$msg .= '<ul>'.$changemsg.'</ul>'; |
$msg .= '<ul>'.$changemsg.'</ul>'; |
} else { |
|
if (&Apache::loncommon::show_course()) { |
|
$msg = &mt('No new courses or communities'); |
|
} else { |
|
$msg = &mt('No role changes'); |
|
} |
|
} |
} |
return $msg; |
&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'}; |
sub role_desc { |
if (($env{'request.role'} =~/^au/) || ($env{'request.role'} =~/^ca/) || |
my ($item,$update,$refresh,$now) = @_; |
($env{'request.role'} =~/^aa/)) { |
my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$twhere, |
$curr_role_author=1; |
$trole,$tremark); |
} |
&Apache::lonnet::role_status('user.role.'.$item,$update,$refresh, |
$curr_is_adv = $env{'user.adv'}; |
$now,\$role,\$where,\$trolecode, |
$curr_role_adv = $env{'request.role.adv'}; |
\$tstatus,\$tstart,\$tend); |
if (keys(%userroles) > 0) { |
return unless ($role); |
foreach my $role (@changed_roles) { |
if ($role =~ /^cr\//) { |
unless(grep(/^\Q$role\E$/,@rolecodes)) { |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
push(@rolecodes,$role); |
$tremark = &mt('Custom role defined by [_1].',$rauthor.':'.$rdomain); |
|
} |
|
$trole=Apache::lonnet::plaintext($role); |
|
my ($tdom,$trest,$tsection)= |
|
split(/\//,Apache::lonnet::declutter($where)); |
|
if (($role eq 'ca') || ($role eq 'aa')) { |
|
my $home = &Apache::lonnet::homeserver($trest,$tdom); |
|
$home = &Apache::lonnet::hostname($home); |
|
$twhere=&mt('User').': '.$trest.' '.&mt('Domain'). |
|
': '.$tdom.' '.&mt('Server').': '.$home; |
|
} elsif ($role eq 'au') { |
|
my $home = &Apache::lonnet::homeserver |
|
($env{'user.name'},$env{'user.domain'}); |
|
$home = &Apache::lonnet::hostname($home); |
|
$twhere=&mt('Domain').': '.$tdom.' '.&mt('Server'). |
|
': '.$home; |
|
} elsif ($trest) { |
|
my $tcourseid=$tdom.'_'.$trest; |
|
my $crstype = &Apache::loncommon::course_type($tcourseid); |
|
$trole = &Apache::lonnet::plaintext($role,$crstype,$tcourseid); |
|
if ($env{'course.'.$tcourseid.'.description'}) { |
|
$twhere=$env{'course.'.$tcourseid.'.description'}; |
|
} else { |
|
my %newhash=&Apache::lonnet::coursedescription($tcourseid); |
|
if (%newhash) { |
|
$twhere=$newhash{'description'}; |
|
} else { |
|
$twhere=&mt('Currently not available'); |
|
} |
} |
} |
} |
if ($tsection) { |
unless(grep(/^\Qcm\E$/,@rolecodes)) { |
$twhere.= ' '.&mt('Section').': '.$tsection; |
push(@rolecodes,'cm'); |
} |
} |
if ($role ne 'st') { |
&Apache::lonnet::appenv(\%userroles,\@rolecodes); |
$twhere.= ' '.&mt('Domain').': '.$tdom; |
} |
|
my %newenv; |
|
if (&Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'})) { |
|
unless ($curr_is_adv) { |
|
$newenv{'user.adv'} = 1; |
} |
} |
} elsif ($tdom) { |
} elsif ($curr_is_adv && !$curr_role_adv) { |
$twhere = &mt('Domain').': '.$tdom; |
&Apache::lonnet::delenv('user.adv'); |
} |
} |
my $output; |
my %authorroleshash = |
if ($trole) { |
&Apache::lonnet::get_my_roles('','','userroles',['active'],['au','ca','aa']); |
$output = $trole; |
if (keys(%authorroleshash)) { |
if ($twhere) { |
unless ($curr_author) { |
$output .= " -- $twhere"; |
$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; |
|
} |
|
} |
|
} |
} |
} |
if ($tremark) { |
unless ($crsgroupschanged) { |
$output .= '<br />'.$tremark; |
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); |
} |
} |
} |
} |
return $output; |
if (keys(%newenv)) { |
|
&Apache::lonnet::appenv(\%newenv); |
|
} |
|
return $msg; |
} |
} |
|
|
sub curr_role_status { |
sub curr_role_status { |
Line 2796 sub is_active_course {
|
Line 2544 sub is_active_course {
|
} |
} |
|
|
sub get_roles_functions { |
sub get_roles_functions { |
my ($rolescount,$cattype) = @_; |
my ($rolescount) = @_; |
my @links; |
my @links; |
|
if ($env{'user.adv'}) { |
|
if ($env{'form.display'} eq 'showall') { |
|
push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]); |
|
} else { |
|
push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]); |
|
} |
|
} |
push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]); |
push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]); |
if ($env{'environment.canrequest.author'}) { |
if ($env{'environment.canrequest.author'}) { |
unless (&Apache::loncoursequeueadmin::is_active_author()) { |
unless (&Apache::loncoursequeueadmin::is_active_author()) { |
push(@links,["javascript:rolesView('requestauthor');",'list-add-22x22',&mt('Request author role')]); |
push(@links,["javascript:rolesView('requestauthor');",'list-add-22x22',&mt('Request author role')]); |
} |
} |
} |
} |
if (($rolescount > 3) || ($env{'environment.recentroles'})) { |
|
push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]); |
|
} |
|
if (&Apache::lonmenu::check_for_rcrs()) { |
if (&Apache::lonmenu::check_for_rcrs()) { |
push(@links,['/adm/requestcourse','rcrs-22x22',&mt('Request course')]); |
push(@links,['/adm/requestcourse','rcrs-22x22',&mt('Request course')]); |
} |
} |
Line 2815 sub get_roles_functions {
|
Line 2567 sub get_roles_functions {
|
} else { |
} else { |
push(@links,["javascript:rolesView('queued');",'selfenrl-queue-22x22',&mt('Show queued')]); |
push(@links,["javascript:rolesView('queued');",'selfenrl-queue-22x22',&mt('Show queued')]); |
} |
} |
if ($env{'user.adv'}) { |
if (($rolescount > 3) || ($env{'environment.recentroles'})) { |
if ($env{'form.display'} eq 'showall') { |
push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]); |
push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]); |
|
} else { |
|
push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]); |
|
} |
|
} |
|
unless ($cattype eq 'none') { |
|
push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]); |
|
} |
} |
my $funcs; |
|
if ($env{'browser.mobile'}) { |
my $funcs = &Apache::lonhtmlcommon::start_funclist(); |
my @functions; |
foreach my $link (@links) { |
foreach my $link (@links) { |
$funcs .= &Apache::lonhtmlcommon::add_item_funclist( |
push(@functions,[$link->[0],$link->[2]]); |
'<a href="'.$link->[0].'" class="LC_menubuttons_link">'. |
} |
'<img src="/res/adm/pages/'.$link->[1].'.png" class="LC_icon" alt="'.$link->[2].'" />'. |
my $title = 'Display options'; |
$link->[2].'</a>'); |
if ($env{'user.adv'}) { |
|
$title = 'Roles options'; |
|
} |
|
$funcs = &Apache::lonmenu::create_submenu('','',$title,\@functions,1,'LC_breadcrumbs_hoverable'); |
|
$funcs = '<ol class="LC_primary_menu LC_floatright">'.$funcs.'</ol>'; |
|
} else { |
|
$funcs = &Apache::lonhtmlcommon::start_funclist(); |
|
foreach my $link (@links) { |
|
$funcs .= &Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$link->[0].'" class="LC_menubuttons_link">'. |
|
'<img src="/res/adm/pages/'.$link->[1].'.png" class="LC_icon" alt="'.$link->[2].'" />'. |
|
$link->[2].'</a>'); |
|
} |
|
$funcs .= &Apache::lonhtmlcommon::end_funclist(); |
|
$funcs = &Apache::loncommon::head_subbox($funcs); |
|
} |
} |
return $funcs; |
$funcs .= &Apache::lonhtmlcommon::end_funclist(); |
|
return &Apache::loncommon::head_subbox($funcs); |
} |
} |
|
|
sub get_queued { |
sub get_queued { |
Line 2858 sub get_queued {
|
Line 2589 sub get_queued {
|
$env{'user.name'},'^status:'); |
$env{'user.name'},'^status:'); |
foreach my $key (keys(%statusinfo)) { |
foreach my $key (keys(%statusinfo)) { |
next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')); |
next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')); |
(undef,my($cdom,$cnum)) = split(/:/,$key); |
(undef,my($cdom,$cnum)) = split(':',$key); |
my $requestkey = $cdom.'_'.$cnum; |
my $requestkey = $cdom.'_'.$cnum; |
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { |
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) { |
my %history = &Apache::lonnet::restore($requestkey,'courserequests', |
my %history = &Apache::lonnet::restore($requestkey,'courserequests', |
Line 2874 sub get_queued {
|
Line 2605 sub get_queued {
|
if (ref($history{'details'}) eq 'HASH') { |
if (ref($history{'details'}) eq 'HASH') { |
$description = $history{details}{'cdescr'}; |
$description = $history{details}{'cdescr'}; |
} |
} |
@{$reqcrs{$reqtime}} = ($description,$showtype); |
@{$reqcrs{$reqtime}} = ($description,$showtype); |
} |
} |
} |
} |
my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs)); |
my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs)); |
Line 2908 sub get_queued {
|
Line 2639 sub get_queued {
|
if (($status eq 'approval') || ($status eq 'approved')) { |
if (($status eq 'approval') || ($status eq 'approved')) { |
$output .= '<p><b>'.&mt('Author role request').'</b><br />'; |
$output .= '<p><b>'.&mt('Author role request').'</b><br />'; |
if ($status eq 'approval') { |
if ($status eq 'approval') { |
$output .= &mt('A request for Authoring Space submitted on [_1] is awaiting approval', |
$output .= &mt('A request for authoring space submitted on [_1] is awaiting approval', |
&Apache::lonlocal::locallocaltime($timestamp)); |
&Apache::lonlocal::locallocaltime($timestamp)); |
} elsif ($status eq 'approved') { |
} elsif ($status eq 'approved') { |
my %roleshash = |
my %roleshash = |