--- loncom/auth/lonroles.pm 2017/05/19 19:53:00 1.269.2.34
+++ loncom/auth/lonroles.pm 2012/08/14 17:35:04 1.271
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.269.2.34 2017/05/19 19:53:00 raeburn Exp $
+# $Id: lonroles.pm,v 1.271 2012/08/14 17:35:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,7 +128,7 @@ package Apache::lonroles;
use strict;
use Apache::lonnet;
use Apache::lonuserstate();
-use Apache::Constants qw(:common REDIRECT);
+use Apache::Constants qw(:common);
use Apache::File();
use Apache::lonmenu;
use Apache::loncommon;
@@ -138,8 +138,6 @@ use Apache::lonlocal;
use Apache::lonpageflip();
use Apache::lonnavdisplay();
use Apache::loncoursequeueadmin;
-use Apache::longroup;
-use Apache::lonrss;
use GDBM_File;
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities;
@@ -151,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,
@@ -166,11 +163,6 @@ sub redirect_user {
$url=~s/ /\%20/g;
$r->print(<
-//
-
$msg
$end_page
ENDREDIR
@@ -208,14 +200,6 @@ sub handler {
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 $then=$env{'user.login.time'};
my $refresh=$env{'user.refresh.time'};
@@ -227,17 +211,9 @@ sub handler {
$update = $then;
}
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-
-# -------------------------------------------------- Check if setting hot list
- my $hotlist;
- if ($env{'form.action'} eq 'verify_and_change_rolespref') {
- $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);
- }
-
# -------------------------------------------------------- Check for new roles
my $updateresult;
- if ($env{'form.state'} eq 'doupdate') {
+ if ($env{'form.doupdate'}) {
my $show_course=&Apache::loncommon::show_course();
my $checkingtxt;
if ($show_course) {
@@ -245,25 +221,107 @@ sub handler {
} else {
$checkingtxt = &mt('Checking for new roles ...');
}
- $updateresult = $checkingtxt;
+ $updateresult = ''.$checkingtxt.' ';
$updateresult .= &update_session_roles();
&Apache::lonnet::appenv({'user.update.time' => $now});
$update = $now;
- &Apache::loncoursequeueadmin::reqauthor_check();
+ &reqauthor_check();
}
# -------------------------------------------------- Check for author requests
+
my $reqauthor;
- if ($env{'form.state'} eq 'requestauthor') {
- $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update);
+ if ($env{'form.requestauthor'}) {
+ if ($env{'environment.canrequest.author'}) {
+ 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 = ''.
+ &mt('A request for authoring space submitted on [_1] is awaiting approval',
+ &Apache::lonlocal::locallocaltime($timestamp)).
+ ' ';
+ }
+ $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') {
+ my $start = $now-1;
+ if (&Apache::lonnet::assignrole($env{'user.domain'},$env{'user.name'},'/'.$env{'user.domain'}.'/',
+ 'au',undef,$start,undef,undef,'requestauthor') eq 'ok') {
+ $reqauthor = ''.
+ &mt('Access to authoring space has been activated').' ';
+ &update_session_roles();
+ &Apache::lonnet::appenv({'user.update.time' => $now});
+ $update = $now;
+ } else {
+ $reqauthor = ''.
+ &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 = ''.
+ &mt('Your request for authoring space has been submitted for approval.').
+ ' ';
+ &Apache::lonnet::appenv({'environment.requestauthorqueued' => $val.':'.$now});
+ } else {
+ $reqauthor = ''.
+ &mt('An error occurred saving your request for authoring space.').
+ ' ';
+ }
+ }
+ }
+ }
+ }
}
my $envkey;
my %dcroles = ();
- my %helpdeskroles = ();
- my ($numdc,$numhelpdesk,$numadhoc) =
- &check_for_adhoc(\%dcroles,\%helpdeskroles,$update,$then);
- my $loncaparev = $r->dir_config('lonVersion');
+ my $numdc = &check_fordc(\%dcroles,$update,$then);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+ my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
# ================================================================== Roles Init
if ($env{'form.selectrole'}) {
@@ -271,15 +329,8 @@ sub handler {
my $locknum=&Apache::lonnet::get_locks();
if ($locknum) { return 409; }
- my $custom_adhoc;
if ($env{'form.newrole'}) {
$env{'form.'.$env{'form.newrole'}}=1;
-# Check if this is a Domain Helpdesk or Domain Helpdesk Assistant role trying to enter a course
- if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/\w+\./\1/$match_courseid$}) {
- if ($helpdeskroles{$1}) {
- $custom_adhoc = 1;
- }
- }
}
if ($env{'request.course.id'}) {
# Check if user is CC trying to select a course role
@@ -301,133 +352,82 @@ sub handler {
&Apache::lonnet::put('email_status',\%temp);
&Apache::lonnet::delenv('user.state.'.$env{'request.course.id'});
}
- &Apache::lonnet::appenv({"request.course.id" => '',
- "request.course.fn" => '',
- "request.course.uri" => '',
- "request.course.sec" => '',
- "request.course.tied" => '',
- "request.course.timechecked" => '',
- "request.role" => 'cm',
- "request.role.adv" => $env{'user.adv'},
- "request.role.domain" => $env{'user.domain'}});
-# Check if Domain Helpdesk role trying to enter a course needs privs to be created
- if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)}) {
- my $cdom = $1;
- my $rolename = $2;
- my $cnum = $3;
- my $sec = $4;
- if ($custom_adhoc) {
- my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum,1);
- if (ref($possroles) eq 'ARRAY') {
- if (grep(/^\Q$rolename\E$/,@{$possroles})) {
- 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});
- }
- }
- }
- }
- } elsif (($numdc > 0) || ($numhelpdesk > 0)) {
+ &Apache::lonnet::appenv({"request.course.id" => '',
+ "request.course.fn" => '',
+ "request.course.uri" => '',
+ "request.course.sec" => '',
+ "request.course.tied" => '',
+ "request.role" => 'cm',
+ "request.role.adv" => $env{'user.adv'},
+ "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 user is a DH or DA trying to enter a course and needs privs to be created
- foreach my $envkey (keys(%env)) {
- if ($numdc) {
+ if ($numdc > 0) {
+ foreach my $envkey (keys %env) {
# Is this an ad-hoc Coordinator role?
- 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});
- }
+ if (my ($ccrole,$domain,$coursenum) =
+ ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
+ if ($dcroles{$domain}) {
+ &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+ $update,$refresh,$now,$ccrole);
+ }
+ last;
+ }
+# Is this an ad-hoc CA-role?
+ if (my ($domain,$user) =
+ ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
+ 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);
+ if ($server_status eq 'switchserver') {
+ my $trolecode = 'au./'.$domain.'/';
+ my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
+ $r->internal_redirect($switchserver);
}
last;
}
-# Is this an ad-hoc CA-role?
- if (my ($domain,$user) =
- ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
- if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
- delete($env{$envkey});
- $env{'form.au./'.$domain.'/'} = 1;
+ 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 = 'au./'.$domain.'/';
+ my $trolecode = 'ca./'.$domain.'/'.$user;
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
$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;
- }
- if ($dcroles{$domain}) {
- my ($server_status,$home) = &check_author_homeserver($user,$domain);
- if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
- &Apache::lonnet::check_adhoc_privs($domain,$user,$update,
- $refresh,$now,'ca');
- if ($server_status eq 'switchserver') {
- 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});
- }
+ }
+ # 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;
}
- }
- if ($numhelpdesk) {
-# Is this an ad hoc custom role in a course/community?
- if (my ($domain,$rolename,$coursenum,$sec) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)})) {
- if ($helpdeskroles{$domain}) {
- my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($domain.'_'.$coursenum,1);
- if (ref($possroles) eq 'ARRAY') {
- if (grep(/^\Q$rolename\E$/,@{$possroles})) {
- 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});
+ if ($dcroles{$domain}) {
+ my ($server_status,$home) = &check_author_homeserver($user,$domain);
+ if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
+ &Apache::lonnet::check_adhoc_privs($domain,$user,$update,
+ $refresh,$now,'ca');
+ if ($server_status eq 'switchserver') {
+ my $trolecode = 'ca./'.$domain.'/'.$user;
+ my $switchserver = '/adm/switchserver?'
+ .'otherserver='.$home.'&role='.$trolecode;
+ $r->internal_redirect($switchserver);
}
} else {
delete($env{$envkey});
}
- last;
+ } else {
+ delete($env{$envkey});
}
- }
+ last;
+ }
}
}
- foreach $envkey (keys(%env)) {
+ foreach $envkey (keys %env) {
next if ($envkey!~/^user\.role\./);
my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
&Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
@@ -443,13 +443,30 @@ sub handler {
my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
my ($switchserver,$switchwarning) =
- &Apache::loncommon::check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode,
- $curr_reqd_hash{'internal.releaserequired'});
+ &check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode,$curr_reqd_hash{'internal.releaserequired'});
if ($switchwarning ne '' || $switchserver ne '') {
&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$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').
+ '');
+ if ($switchwarning) {
+ $r->print($switchwarning.'');
+ if (&Apache::loncommon::show_course()) {
+ $r->print(&mt('Display courses'));
+ } else {
+ $r->print(&mt('Display roles'));
+ }
+ $r->print(' ');
+ } elsif ($switchserver) {
+ $r->print(&mt('This course requires a newer version of LON-CAPA than is installed on this server.').
+ ' '.
+ ''.
+ &mt('Switch Server').
+ ' ');
+ }
+ $r->print('
'.&Apache::loncommon::end_page());
return OK;
}
}
@@ -562,7 +579,7 @@ ENDENTERKEY
$env{'user.name'},
$env{'user.home'},
"Role ".$trolecode);
-
+
&Apache::lonnet::appenv(
{'request.role' => $trolecode,
'request.role.domain' => $cdom,
@@ -571,49 +588,17 @@ ENDENTERKEY
my $tadv=0;
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
- if ($role =~ m{^\Qcr/$cdom/$cdom\E\-domainconfig/(\w+)$}) {
- my $rolename = $1;
- my %domdef = &Apache::lonnet::get_domain_defaults($cdom);
- if (ref($domdef{'adhocroles'}) eq 'HASH') {
- if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') {
- &Apache::lonnet::appenv({'request.role.desc' => $domdef{'adhocroles'}{$rolename}{'desc'}});
- }
- }
- }
my $msg;
- my ($furl,$ferr)=
- &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
- unless ($ferr) {
- unless (($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);
- }
- 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});
- }
- }
- }
- }
+ my ($furl,$ferr)=
+ &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
if (($env{'form.orgurl'}) &&
- ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
- ($env{'form.orgurl'} ne '/adm/roles')) {
+ ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
my $dest=$env{'form.orgurl'};
if ($env{'form.symb'}) {
if ($dest =~ /\?/) {
$dest .= '&';
} else {
- $dest .= '?';
+ $dest .= '?'
}
$dest .= 'symb='.$env{'form.symb'};
}
@@ -652,60 +637,24 @@ ENDENTERKEY
} else {
# Check to see if the user is a CC entering a course
# 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'))
- && ($env{'course.'.$cdom.'_'.$cnum.'.course.helper.not.run'})) {
+ && ($env{'course.' . $courseid .'.course.helper.not.run'})) {
$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);
- $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.'.$cdom.'_'.$cnum.'.description'}),
+ $env{'course.'.$courseid.'.description'}),
$dest, $msg);
return OK;
}
@@ -715,39 +664,25 @@ ENDENTERKEY
$env{'request.course.id'}.'/'
.$env{'request.course.sec'})
) {
- my $startpage = &courseloadpage($env{'request.course.id'});
+ my $startpage = &courseloadpage($courseid);
unless ($startpage eq 'firstres') {
$msg = &mt('Entering [_1] ...',
- $env{'course.'.$env{'request.course.id'}.'.description'});
+ $env{'course.'.$courseid.'.description'});
&redirect_user($r, &mt('New in course'),
'/adm/whatsnew?refpage=start', $msg);
return OK;
}
}
}
- # Are we allowed to look at the first resource?
- my $access;
- if ($furl =~ m{^(/adm/wrapper|)/ext/}) {
- # If it's an external 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';
- }
+# Are we allowed to look at the first resource?
+ if ($furl !~ m|^/adm/|) {
+# Guess not ...
+ $furl=&Apache::lonpageflip::first_accessible_resource();
+ }
$msg = &mt('Entering [_1] ...',
- $env{'course.'.$cdom.'_'.$cnum.'.description'});
+ $env{'course.'.$courseid.'.description'});
&redirect_user($r, &mt('Entering [_1]',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}),
+ $env{'course.'.$courseid.'.description'}),
$furl, $msg);
}
return OK;
@@ -763,7 +698,7 @@ ENDENTERKEY
$redirect_url .= $where;
}
$redirect_url .= '/';
- &redirect_user($r,&mt('Entering Authoring Space'),
+ &redirect_user($r,&mt('Entering Construction Space'),
$redirect_url);
return OK;
}
@@ -773,18 +708,6 @@ ENDENTERKEY
$redirect_url);
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 'da') {
- my $redirect_url = '/adm/menu/';
- &redirect_user($r,&mt('Loading Domain Helpdesk Assistant Menu'),
- $redirect_url);
- return OK;
- }
if ($role eq 'sc') {
my $redirect_url = '/adm/grades?command=scantronupload';
&redirect_user($r,&mt('Loading Data Upload Page'),
@@ -807,39 +730,22 @@ ENDENTERKEY
my $crumbtext = 'User Roles';
my $pagetitle = 'My Roles';
my $recent = &mt('Recent Roles');
- my $standby = &mt('Role selected. Please stand by.');
my $show_course=&Apache::loncommon::show_course();
if ($show_course) {
$crumbtext = 'Courses';
$pagetitle = 'My Courses';
$recent = &mt('Recent Courses');
- $standby = &mt('Course selected. Please stand by.');
}
my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
-
- my %roles_in_env;
- my $showcount = &roles_from_env(\%roles_in_env,$update);
-
my $swinfo=&Apache::lonmenu::rawconfig();
- my %domdefs=&Apache::lonnet::get_domain_defaults($env{'user.domain'});
- my $cattype = 'std';
- if ($domdefs{'catauth'}) {
- $cattype = $domdefs{'catauth'};
- }
- 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=''.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').' '.&mt('As this is not the case, most functionality in the system will be unavailable.').' ';
+ my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
+ my $standby=&mt('Role selected. Please stand by.');
+ $standby=~s/\n/\\n/g;
+ my $noscript=''.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').' '.&mt('As this is not the case, most functionality in the system will be unavailable.').' ';
$r->print(<
$noscript
@@ -862,17 +768,16 @@ function enterrole (thisform,rolecode,bu
}
}
-function rolesView (caller) {
- if ((caller == 'showall') || (caller == 'noshowall')) {
- document.rolechoice.display.value = caller;
- } else {
- if ((caller == 'doupdate') || (caller == 'requestauthor') ||
- (caller == 'queued')) {
- document.rolechoice.state.value = caller;
- }
- }
- document.rolechoice.selectrole.value='';
- document.rolechoice.submit();
+function setToUpdate(thisform) {
+ thisform.doupdate.value='1';
+ thisform.selectrole.value='';
+ thisform.submit();
+}
+
+function setToRequestAuthor(thisform) {
+ thisform.requestauthor.value='1';
+ thisform.selectrole.value='';
+ thisform.submit();
}
// ]]>
@@ -941,54 +846,124 @@ ENDHEADER
&Apache::loncommon::end_page());
return OK;
} else {
- if ($updateresult || $reqauthor || $hotlist) {
- my $showresult = '';
- if ($updateresult) {
- $showresult .= &Apache::lonhtmlcommon::confirm_success($updateresult);
- }
- if ($reqauthor) {
- $showresult .= &Apache::lonhtmlcommon::confirm_success($reqauthor);
- }
- if ($hotlist) {
- $showresult .= $hotlist;
- }
- $showresult .= '
';
- $r->print($showresult);
- } elsif ($env{'form.state'} eq 'queued') {
- $r->print(&get_queued());
+ if ($updateresult || $reqauthor) {
+ $r->print(''.
+ $updateresult.
+ $reqauthor.
+ '
');
}
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
}
- my $display = ($env{'form.display'} =~ /^(showall)$/);
$r->print('');
if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
$nochoose);
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
- \%roletext,$update,$then);
+ \%roletext);
my $tremark='';
my $tbg;
if ($env{'request.role'} eq 'cm') {
@@ -1032,12 +1013,10 @@ ENDHEADER
}
# ----------------------------------------------------------------------- Table
- if (($numdc > 0) || (($numhelpdesk > 0) && ($numadhoc > 0))) {
- $r->print(&coursepick_jscript().
- &Apache::loncommon::coursebrowser_javascript());
- }
if ($numdc > 0) {
- $r->print(&Apache::loncommon::authorbrowser_javascript());
+ $r->print(&coursepick_jscript());
+ $r->print(&Apache::loncommon::coursebrowser_javascript().
+ &Apache::loncommon::authorbrowser_javascript());
}
unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
@@ -1067,11 +1046,9 @@ ENDHEADER
$roletext{'user.role.'.$role}->[1].
&Apache::loncommon::end_data_table_row();
}
- if ($role =~ m{^dc\./($match_domain)/$}
+ if ($role =~ m{dc\./($match_domain)/}
&& $dcroles{$1}) {
$output .= &adhoc_roles_row($1,'recent');
- } elsif ($role =~ m{^(dh|da)\./($match_domain)/$}) {
- $output .= &adhoc_customroles_row($1,$2,'recent',$update,$then);
}
} elsif ($numdc > 0) {
unless ($role =~/^error\:/) {
@@ -1100,7 +1077,7 @@ ENDHEADER
$doheaders ++;
}
}
- &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext,$update,$then);
+ &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
if ($countactive > 1) {
my $tremark='';
my $tbg;
@@ -1145,45 +1122,56 @@ ENDHEADER
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
$r->print(''
.&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
- .'
');
+ .' '
+ .''.&mt('Logout').' '
+ .''
+ .&mt('Course/Community Catalog')
+ .'
');
}
$r->print(&Apache::loncommon::end_page());
return OK;
}
-sub roles_from_env {
- my ($roleshash,$update) = @_;
- my $count = 0;
- if (ref($roleshash) eq 'HASH') {
- foreach my $envkey (keys(%env)) {
- if ($envkey =~ m{^user\.role\.(\w+)[./]}) {
- next if ($1 eq 'gr');
- $roleshash->{$envkey} = $env{$envkey};
- my ($start,$end) = split(/\./,$env{$envkey});
- unless ($end && $end<$update) {
- $count ++;
- }
- }
+sub is_active_author {
+ if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) {
+ if ((!$1 || $1 < time) &&
+ (!$2 || $2 > time)) {
+ return 1;
}
}
- return $count;
+ 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 {
- my ($update,$refresh,$now,$reinit,$nochoose,$roles_in_env,$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 $advanced = $env{'user.adv'};
my $tryagain = $env{'form.tryagain'};
my @ids = &Apache::lonnet::current_machine_ids();
- if (ref($roles_in_env) eq 'HASH') {
- my %adhocdesc;
- foreach my $envkey (sort(keys(%{$roles_in_env}))) {
- my $button = 1;
- my $switchserver='';
- my $switchwarning;
- my ($role_text,$role_text_end,$sortkey,$role,$where,$trolecode,$tstart,
- $tend,$tremark,$tstatus,$tpstart,$tpend);
+ foreach my $envkey (sort(keys(%env))) {
+ my $button = 1;
+ my $switchserver='';
+ my $switchwarning;
+ my ($role_text,$role_text_end,$sortkey);
+ if ($envkey=~/^user\.role\./) {
+ my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
&Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
\$trolecode,\$tstatus,\$tstart,\$tend);
next if (!defined($role) || $role eq '' || $role =~ /^gr/);
@@ -1197,7 +1185,7 @@ sub gather_roles {
if (($tstatus eq 'is')
|| ($tstatus eq 'selected')
|| ($tstatus eq 'future')
- || ($env{'form.display'} eq 'showall')) {
+ || ($env{'form.showall'})) {
my $timezone = &role_timezone($where,$timezones);
if ($tstart) {
$tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
@@ -1229,10 +1217,8 @@ sub gather_roles {
my $trole;
if ($role =~ /^cr\//) {
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
- unless ($rauthor eq $rdomain.'-domainconfig') {
- if ($tremark) { $tremark.=' '; }
- $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
- }
+ if ($tremark) { $tremark.=' '; }
+ $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
}
$trole=Apache::lonnet::plaintext($role);
my $ttype;
@@ -1250,7 +1236,7 @@ sub gather_roles {
}
#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);
- $ttype='Authoring Space';
+ $ttype='Construction Space';
$twhere=&mt('User').': '.$trest.' '.&mt('Domain').
': '.$tdom.' '.
' '.&mt('Server').': '.$home;
@@ -1269,7 +1255,7 @@ sub gather_roles {
}
#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);
- $ttype='Authoring Space';
+ $ttype='Construction Space';
$twhere=&mt('Domain').': '.$tdom.' '.&mt('Server').
': '.$home;
$env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
@@ -1278,32 +1264,7 @@ sub gather_roles {
} elsif ($trest) {
my $tcourseid=$tdom.'_'.$trest;
$ttype = &Apache::loncommon::course_type($tcourseid);
- if ($role !~ /^cr/) {
- $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
- } elsif ($role =~ m{^\Qcr/$tdom/$tdom\E\-domainconfig/(\w+)$}) {
- my $rolename = $1;
- my $desc;
- if (ref($adhocdesc{$tdom}) eq 'HASH') {
- $desc = $adhocdesc{$tdom}{$rolename};
- } else {
- my %domdef = &Apache::lonnet::get_domain_defaults($tdom);
- if (ref($domdef{'adhocroles'}) eq 'HASH') {
- foreach my $rolename (sort(keys(%{$domdef{'adhocroles'}}))) {
- if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') {
- $adhocdesc{$tdom}{$rolename} = $domdef{'adhocroles'}{$rolename}{'desc'};
- $desc = $adhocdesc{$tdom}{$rolename};
- }
- }
- }
- }
- if ($desc ne '') {
- $trole = $desc;
- } else {
- $trole = &mt('Helpdesk[_1]',' '.$rolename);
- }
- } else {
- $trole = (split(/\//,$role,4))[-1];
- }
+ $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
if ($env{'course.'.$tcourseid.'.description'}) {
my $home=$env{'course.'.$tcourseid.'.home'};
$twhere=$env{'course.'.$tcourseid.'.description'};
@@ -1317,7 +1278,7 @@ sub gather_roles {
my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'};
if ($required ne '') {
($switchserver,$switchwarning) =
- &Apache::loncommon::check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+ &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
if ($switchserver || $switchwarning) {
$button = 0;
}
@@ -1340,7 +1301,7 @@ sub gather_roles {
my $required = $newhash{'internal.releaserequired'};
if ($required ne '') {
($switchserver,$switchwarning) =
- &Apache::loncommon::check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+ &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
if ($switchserver || $switchwarning) {
$button = 0;
}
@@ -1441,7 +1402,7 @@ sub roletable_headers {
my $doheaders;
if ((ref($sortrole) eq 'HASH') && (ref($roleclass) eq 'HASH')) {
$r->print(' '
- .&Apache::loncommon::start_data_table('LC_textsize_mobile')
+ .&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()
);
if (!$nochoose) { $r->print(' '); }
@@ -1467,12 +1428,12 @@ sub roletable_headers {
}
sub roletypes {
- my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
+ my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
return @types;
}
sub print_rolerows {
- my ($r,$doheaders,$roleclass,$sortrole,$dcroles,$roletext,$update,$then) = @_;
+ my ($r,$doheaders,$roleclass,$sortrole,$dcroles,$roletext) = @_;
if ((ref($roleclass) eq 'HASH') && (ref($sortrole) eq 'HASH')) {
my @types = &roletypes();
foreach my $type (@types) {
@@ -1490,14 +1451,12 @@ sub print_rolerows {
&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 ($dcroles->{$1}) {
$output .= &adhoc_roles_row($1,'');
}
}
- } elsif ($sortrole->{$which} =~ m{^user\.role\.(dh|da)\./($match_domain)/}) {
- $output .= &adhoc_customroles_row($1,$2,'',$update,$then);
}
}
}
@@ -1518,7 +1477,7 @@ sub print_rolerows {
}
sub findcourse_advice {
- my ($r,$cattype) = @_;
+ my ($r) = @_;
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
@@ -1533,36 +1492,37 @@ sub findcourse_advice {
} 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.').' ');
}
- if (($cattype eq 'std') || ($cattype eq 'domonly')) {
- $r->print(''.&mt('Self-Enrollment').' '.
- ''.&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.','',' ',$domdesc).' ');
- $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'
'.
- &Apache::loncoursequeueadmin::queued_selfenrollment());
- }
+ $r->print(''.&mt('Self-Enrollment').' '.
+ ''.&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.','',' ',$domdesc).' ');
+ $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'
'.
+ &Apache::loncoursequeueadmin::queued_selfenrollment());
return;
}
sub requestcourse_advice {
- my ($r,$cattype,$inrole) = @_;
+ my ($r) = @_;
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
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);
if (keys(%request_doms) > 0) {
my ($types,$typename) = &Apache::loncommon::course_types();
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+ $r->print(''.&mt('Request creation of a course or community').' '.
+ ''.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'
');
my (@reqdoms,@reqtypes);
foreach my $type (sort(keys(%request_doms))) {
push(@reqtypes,$type);
if (ref($request_doms{$type}) eq 'ARRAY') {
my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
- $output .=
+ $r->print(
''
.&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
'',
' ',
''.$domstr.' ')
- .' ';
+ .''
+ );
foreach my $dom (@{$request_doms{$type}}) {
unless (grep(/^\Q$dom\E/,@reqdoms)) {
push(@reqdoms,$dom);
@@ -1585,26 +1545,9 @@ sub requestcourse_advice {
}
if (@reqdoms == 1 || @showtypes > 0) {
$requrl .= '&state=crstype&action=new';
- }
- if ($output) {
- $r->print(''.&mt('Request creation of a course or community').' '.
- ''.
- &mt('You have rights to request the creation of courses and/or communities in the following domain(s):').
- '
'.
- &mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.',
- '',' ').
- '');
- }
- }
- } elsif (!$env{'user.adv'}) {
- if ($inrole) {
- $r->print(''.&mt('Currently no additional roles, courses or communities').' ');
- } else {
- $r->print(''.&mt('Currently no active roles, courses or communities').' ');
+ }
+ $r->print(' '.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','',' ').'');
}
- &findcourse_advice($r,$cattype);
}
return;
}
@@ -1624,7 +1567,7 @@ sub privileges_info {
my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
if ($trest) {
if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
- $ttype='Authoring Space';
+ $ttype='Construction Space';
$twhere='User: '.$trest.', Domain: '.$tdom;
} else {
$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
@@ -1665,13 +1608,10 @@ sub privileges_info {
}
sub build_roletext {
- my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,
- $tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_;
- my ($roletext,$roletext_end,$poss_adhoc);
- if ($trolecode =~ m/^d(c|h|a)\./) {
- $poss_adhoc = 1;
- }
- my $rowspan=($poss_adhoc) ? ''
+ my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_;
+ my ($roletext,$roletext_end);
+ my $is_dc=($trolecode =~ m/^dc\./);
+ my $rowspan=($is_dc) ? ''
: ' rowspan="2" ';
unless ($nochoose) {
@@ -1732,7 +1672,7 @@ sub build_roletext {
.''.$twhere.' '
.''.$tpstart.' '
.''.$tpend.' ';
- unless ($poss_adhoc) {
+ if (!$is_dc) {
$roletext_end = ''.
$tremark.' '.
' ';
@@ -1740,6 +1680,24 @@ sub build_roletext {
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 {
my ($uname,$udom)=@_;
if (($uname eq '') || ($udom eq '')) {
@@ -1757,44 +1715,29 @@ sub check_author_homeserver {
}
}
-sub check_for_adhoc {
- my ($dcroles,$helpdeskroles,$update,$then) = @_;
+sub check_fordc {
+ my ($dcroles,$update,$then) = @_;
my $numdc = 0;
- my $numhelpdesk = 0;
- my $numadhoc = 0;
- my $num_custom_adhoc = 0;
- if (($env{'user.adv'}) || ($env{'user.rar'})) {
- foreach my $envkey (sort(keys(%env))) {
- if ($envkey=~/^user\.role\.(dc|dh|da)\.\/($match_domain)\/$/) {
- my $role = $1;
- my $roledom = $2;
- my $liverole = 1;
+ if ($env{'user.adv'}) {
+ foreach my $envkey (sort keys %env) {
+ if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) {
+ my $dcdom = $1;
+ my $livedc = 1;
my ($tstart,$tend)=split(/\./,$env{$envkey});
my $limit = $update;
- if ($env{'request.role'} eq "$role./$roledom/") {
+ if ($env{'request.role'} eq 'dc./'.$dcdom.'/') {
$limit = $then;
}
- if ($tstart && $tstart>$limit) { $liverole = 0; }
- if ($tend && $tend <$limit) { $liverole = 0; }
- if ($liverole) {
- if ($role eq 'dc') {
- $dcroles->{$roledom} = $envkey;
- $numdc++;
- } else {
- $helpdeskroles->{$roledom} = $envkey;
- my %domdefaults = &Apache::lonnet::get_domain_defaults($roledom);
- if (ref($domdefaults{'adhocroles'}) eq 'HASH') {
- if (keys(%{$domdefaults{'adhocroles'}})) {
- $numadhoc ++;
- }
- }
- $numhelpdesk++;
- }
+ if ($tstart && $tstart>$limit) { $livedc = 0; }
+ if ($tend && $tend <$limit) { $livedc = 0; }
+ if ($livedc) {
+ $$dcroles{$dcdom} = $envkey;
+ $numdc++;
}
}
}
}
- return ($numdc,$numhelpdesk,$numadhoc);
+ return $numdc;
}
sub adhoc_course_role {
@@ -1814,13 +1757,8 @@ 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)(.*?)\./\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 $custom_role = $2;
my $usec = $3;
@@ -1835,15 +1773,9 @@ sub adhoc_course_role {
my %cgroups =
&Apache::lonnet::get_active_groups($env{'user.domain'},
$env{'user.name'},$cdom,$cnum);
- my $ccrole;
- if ($crstype eq 'Community') {
- $ccrole = 'co';
- } else {
- $ccrole = 'cc';
- }
foreach my $group (keys(%cgroups)) {
$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;
my $area = '/'.$cdom.'/'.$cnum;
@@ -1852,11 +1784,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.'.';
@@ -1891,26 +1819,76 @@ sub check_forcc {
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'}).' '. &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'}).' '.&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 {
- my ($roledom,$rowtype,$role) = @_;
+ my ($dcdom,$rowtype) = @_;
my $courseform=&Apache::loncommon::selectcourse_link
- ('rolechoice','course'.$rowtype.'_'.$roledom.'_'.$role,
- 'domain'.$rowtype.'_'.$roledom.'_'.$role,
- 'coursedesc'.$rowtype.'_'.$roledom.'_'.$role,
- $roledom.':'.$role,undef,'Course/Community');
- my $hiddenitems = ' '.
- ' '.
- ' '.
- ' ';
+ ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
+ 'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
+ $dcdom,$dcdom,undef,'Course/Community');
+ my $hiddenitems = ' '.
+ ' '.
+ ' '.
+ ' ';
return $courseform.$hiddenitems;
}
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.",
youc => 'You can only use this screen to select courses and communities in the current domain.',
);
- &js_escape(\%js_lt);
my $verify_script = <<"END";