--- loncom/auth/lonroles.pm 2024/09/07 01:49:32 1.269.2.39.2.10
+++ loncom/auth/lonroles.pm 2021/04/19 20:09:07 1.346
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.269.2.39.2.10 2024/09/07 01:49:32 raeburn Exp $
+# $Id: lonroles.pm,v 1.346 2021/04/19 20:09:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -140,97 +140,13 @@ use Apache::lonnavdisplay();
use Apache::loncoursequeueadmin;
use Apache::longroup;
use Apache::lonrss;
+use Apache::lonplacementtest;
use GDBM_File;
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities;
-
-sub start_loading_course {
- my ($r,$title,$only_body) = @_;
- &Apache::loncommon::content_type($r,'text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- if ($only_body) {
- $r->print(&Apache::loncommon::start_page($title,undef,{'only_body' => 1,
- 'add_progressbar' => 1}));
- } else {
- my $swinfo=&Apache::lonmenu::rawconfig();
- # Breadcrumbs
- my $brcrum = [{'href' => '',
- 'text' => $title},];
- my $start_page = &Apache::loncommon::start_page($title,undef,
- {'bread_crumbs' => $brcrum,
- 'bread_crumbs_nomenu' => 1,
- 'links_disabled' => 1});
- $r->print(< $msg $msg $lt{'tfp'}
- '.&mt('The following problems occurred:').
+ ' '.
- &mt('Could not initialize [_1] at this time.',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}).
- ' '.
- &mt('Please try again.').' '.&mt('Entering [_1] ...',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}).
- ' '
+ .&mt('Could not initialize [_1] at this time.',
+ $env{'course.'.$cdom.'_'.$cnum.'.description'})
+ .' '.&mt('Please try again.').' '.$ferr.' '.
- &mt('Could not initialize [_1] at this time.',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}).
- ' '.&mt('Entering [_1] ...',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}).
- ' '.&mt('Entering [_1] ...',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}).
- ' '.&mt('Entering [_1] ...',
- $env{'course.'.$cdom.'_'.$cnum.'.description'}).
- '
-$error
-
$lt{'con'}
-$end_page
-END
- return;
+ $r->print(
+ ''.
+ '
'.
+ $error.
+ '
'.&mt('Continue').''
+ );
+ $r->print(&Apache::loncommon::end_page());
}
sub handler {
@@ -307,130 +230,11 @@ sub handler {
$update = $then;
}
- my ($norolelist,$blocked_by_ip,$blocked_type,$clientip);
- $clientip = &Apache::lonnet::get_requestor_ip($r);
- if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) {
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
- my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
- if ($deeplink_symb) {
- my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect();
- if (ref($menuref) eq 'HASH') {
- unless (($menuref->{'role'}) || ($env{'request.role.adv'})) {
- foreach my $envkey (keys(%env)) {
- next unless ($envkey =~ /^form\./);
- if ($envkey =~ m{\./($match_domain)/($match_courseid)(?:/(\w+)|$)}) {
- unless (($1 eq $cdom) && ($2 eq $cnum)) {
- delete($env{$envkey});
- }
- }
- }
- if ($env{'form.selectrole'}) {
- if ($env{'form.switchrole'} =~ m{\./($match_domain)/($match_courseid)(?:/(\w+)|$)}) {
- unless (($1 eq $cdom) && ($2 eq $cnum)) {
- delete($env{'form.selectrole'});
- delete($env{'form.switchrole'});
- }
- } elsif ($env{'form.newrole'} =~ m{\./($match_domain)/($match_courseid)(?:/(\w+)|$)}) {
- unless (($1 eq $cdom) && ($2 eq $cnum)) {
- delete($env{'form.selectrole'});
- delete($env{'form.newrole'});
- }
- }
- }
- $norolelist = 1;
- }
- }
- }
- }
-
- if ($env{'form.selectrole'}) {
- my ($role,$cdom,$cnum,$rest);
- if ($env{'form.switchrole'} =~ m{^(co|cc|in|ta|ep|ad|st|cr).*?\./($match_domain)/($match_courseid)(/(\w+)|$)}) {
- ($role,$cdom,$cnum,$rest) = ($1,$2,$3,$4);
- } elsif ($env{'form.newrole'} =~ m{^(co|cc|in|ta|ep|ad|st|cr).*?\./($match_domain)/($match_courseid)(/(\w+)|$)}) {
- ($role,$cdom,$cnum,$rest) = ($1,$2,$3,$4);
- }
- if ($cdom ne '') {
- my ($has_evb,$check_ipaccess,$showrole);
- $showrole = 1;
- my $checkrole = "cm./$cdom/$cnum";
- if ($rest ne '') {
- $checkrole .= "/$rest";
- }
- if ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
- ($role ne 'st')) {
- $has_evb = 1;
- }
- unless ($has_evb) {
- my @machinedoms = &Apache::lonnet::current_machine_domains();
- my $udom = $env{'user.domain'};
- if ($udom eq $cdom) {
- $check_ipaccess = 1;
- } elsif (($udom ne '') && (grep(/^\Q$udom\E$/,@machinedoms))) {
- $check_ipaccess = 1;
- } else {
- my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
- my $internet_names = &Apache::lonnet::get_internet_names($lonhost);
- my $cprim = &Apache::lonnet::domain($cdom,'primary');
- my $cintdom = &Apache::lonnet::internet_dom($cprim);
- if (($cintdom ne '') && (ref($internet_names) eq 'ARRAY')) {
- if (grep(/^\Q$cintdom\E$/,@{$internet_names})) {
- $check_ipaccess = 1;
- }
- }
- }
- if ($check_ipaccess) {
- my ($ipaccessref,$cached)=&Apache::lonnet::is_cached_new('ipaccess',$cdom);
- unless (defined($cached)) {
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['ipaccess'],$cdom);
- $ipaccessref = &Apache::lonnet::do_cache_new('ipaccess',$cdom,$domconfig{'ipaccess'},1800);
- }
- if (ref($ipaccessref) eq 'HASH') {
- foreach my $id (keys(%{$ipaccessref})) {
- if (ref($ipaccessref->{$id}) eq 'HASH') {
- my $range = $ipaccessref->{$id}->{'ip'};
- if ($range) {
- my $type = 'exclude';
- if (&Apache::lonnet::ip_match($clientip,$range)) {
- $type = 'include';
- }
- if (ref($ipaccessref->{$id}->{'courses'}) eq 'HASH') {
- if ($ipaccessref->{$id}->{'courses'}{$cdom.'_'.$cnum}) {
- if ($type eq 'include') {
- $showrole = 1;
- last;
- } else {
- $showrole = 0;
- }
- } else {
- if ($type eq 'include') {
- $showrole = 0;
- } else {
- $showrole = 1;
- }
- }
- }
- }
- }
- }
- }
- }
- }
- unless ($showrole) {
- $blocked_by_ip = 1;
- $blocked_type = &Apache::loncommon::course_type($cdom.'_'.$cnum);
- delete($env{'form.selectrole'});
- delete($env{'form.newrole'});
- }
- }
- }
-
+ $registered_cleanup=0;
+ @{$rosterupdates}=();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-# -------------------------------------------------- Check if setting hot list
+# -------------------------------------------------- Check if setting hot list
my $hotlist;
if ($env{'form.action'} eq 'verify_and_change_rolespref') {
$hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);
@@ -461,13 +265,19 @@ sub handler {
my $envkey;
my %dcroles = ();
- my %helpdeskroles = ();
- my ($numdc,$numhelpdesk,$numadhoc) =
+ my %helpdeskroles = ();
+ my ($numdc,$numhelpdesk,$numadhoc) =
&check_for_adhoc(\%dcroles,\%helpdeskroles,$update,$then);
my $loncaparev = $r->dir_config('lonVersion');
# ================================================================== Roles Init
if ($env{'form.selectrole'}) {
+ if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq '')) {
+ if ($env{'form.ltitarget'} eq 'iframe') {
+ &Apache::lonnet::appenv({'request.lti.target' => 'iframe'});
+ delete($env{'form.ltitarget'});
+ }
+ }
my $locknum=&Apache::lonnet::get_locks();
if ($locknum) { return 409; }
@@ -508,7 +318,6 @@ sub handler {
"request.course.sec" => '',
"request.course.tied" => '',
"request.course.timechecked" => '',
- "request.course.suppupdated" => '',
"request.role" => 'cm',
"request.role.adv" => $env{'user.adv'},
"request.role.domain" => $env{'user.domain'}});
@@ -521,7 +330,7 @@ sub handler {
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 (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});
@@ -533,8 +342,8 @@ sub handler {
# 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) {
# Is this an ad-hoc Coordinator role?
+ if ($numdc) {
if (my ($ccrole,$domain,$coursenum) =
($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
if ($dcroles{$domain}) {
@@ -625,10 +434,9 @@ sub handler {
}
last;
}
- }
+ }
}
}
-
foreach $envkey (keys(%env)) {
next if ($envkey!~/^user\.role\./);
my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
@@ -707,7 +515,7 @@ sub handler {
$env{'user.name'},
&mt('Assigned from [_1] at [_2] for [_3]'
,$ip
- ,&Apache::lonlocal::locallocaltime($now)
+ ,&Apache::lonlocal::locallocaltime()
,$trolecode)
);
unless ($assignresult eq 'ok') {
@@ -783,60 +591,24 @@ ENDENTERKEY
}
}
}
- my $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
- $crstype = lc($crstype);
- my ($msg,$critmsg_check,$title,$loadmsg,$only_body);
+ my ($msg,$blockcrit,$critmsg_check);
$critmsg_check = 1;
- $title = &mt("Loading $crstype");
- $loadmsg = &mt("Please be patient while your $crstype loads");
- if (($env{'request.deeplink.login'}) && ($env{'request.linkprot'})) {
- if ($env{'request.linkprot'} =~ /^\d+(c|d):\Q$env{'form.destinationurl'}\E$/) {
- $title = &mt('Loading LON-CAPA session');
- $loadmsg = &mt('Please be patient while LON-CAPA loads');
- $only_body = 1;
- $critmsg_check = 0;
+ $blockcrit = &Apache::loncommon::blocking_status('alert',$cnum,$cdom,undef,1);
+ if ($blockcrit) {
+ my $checkrole = "cm./$cdom/$cnum";
+ if ($csec ne '') {
+ $checkrole .= "/$csec";
}
- }
- my $preamble = '
'.
- $loadmsg.
- '
'.&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.').'
';
@@ -1233,7 +981,7 @@ function rolesView (caller) {
document.rolechoice.display.value = caller;
} else {
if ((caller == 'doupdate') || (caller == 'requestauthor') ||
- (caller == 'queued')) {
+ (caller == 'queued')) {
document.rolechoice.state.value = caller;
}
}
@@ -1303,16 +1051,8 @@ ENDHEADER
}
if ($nochoose) {
$r->print("".&mt('Sorry ...')."
\n".
- &mt('This action is currently not authorized.').'');
- if ($error && $norolelist) {
- $r->print(''.
- &mt('As your session was launched from a web page external to LON-CAPA some course content may be unavailable, including the resource you were trying to access.').
- '
'.
- ''.
- &mt('You may need to login to LON-CAPA directly, or re-launch from a different external system.').
- '
');
- }
- $r->print(&Apache::loncommon::end_page());
+ &mt('This action is currently not authorized.').''.
+ &Apache::loncommon::end_page());
return OK;
} else {
if ($updateresult || $reqauthor || $hotlist) {
@@ -1325,7 +1065,7 @@ ENDHEADER
}
if ($hotlist) {
$showresult .= $hotlist;
- }
+ }
$showresult .= '';
$r->print($showresult);
} elsif ($env{'form.state'} eq 'queued') {
@@ -1341,16 +1081,6 @@ ENDHEADER
$r->print('');
$r->print('');
$r->print('');
- if ($blocked_by_ip) {
- my $blocked_role = 'student';
- if ($blocked_type eq 'Community') {
- $blocked_role = 'member';
- }
- $r->print(''.
- &mt('The [_1] you selected is not available for access with a [_2] role from your current IP address: [_3].',
- lc($blocked_type),$blocked_role,$clientip).
- '
');
- }
}
$r->rflush();
@@ -1360,7 +1090,21 @@ ENDHEADER
\%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
$refresh = $now;
&Apache::lonnet::appenv({'user.refresh.time' => $refresh});
- if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) {
+ if ($countactive == 1) {
+ if ($env{'request.course.id'}) {
+ if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
+ $placementonly = 1;
+ }
+ } elsif ($possiblerole) {
+ if ($possiblerole =~ m{^st\./($match_domain)/($match_courseid)(?:/|$)}) {
+ if ($env{'course.'.$1.'_'.$2.'.type'} eq 'Placement') {
+ $placementonly = 1;
+ }
+ }
+ }
+ }
+ if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'}) &&
+ (!$placementonly)) {
if ($countactive > 0) {
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
@@ -1382,26 +1126,6 @@ ENDHEADER
}
}
- if ($norolelist) {
- if ($env{'request.role'}) {
- my ($roletext,$role_text_end) = &display_curr_role($env{'request.role'});
- if ($roletext) {
- $r->print(&Apache::loncommon::start_data_table('LC_textsize_mobile').
- &Apache::loncommon::start_data_table_row().
- $roletext.
- &Apache::loncommon::end_data_table_row());
- if ($role_text_end) {
- $r->print(&Apache::loncommon::continue_data_table_row().
- $role_text_end.
- &Apache::loncommon::end_data_table_row());
- }
- $r->print(&Apache::loncommon::end_data_table());
- }
- }
- $r->print(&Apache::loncommon::end_page());
- return OK;
- }
-
# No active roles
if ($countactive==0) {
my $elapsed = 0;
@@ -1437,6 +1161,16 @@ ENDHEADER
}
$r->print(&Apache::loncommon::end_page());
return OK;
+ } elsif (($placementonly) && ($env{'request.role'} eq 'cm')) {
+ $r->print(''.&mt('Please stand by.').'
+
+ ');
+ $r->rflush();
+ $r->print('');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
}
# ----------------------------------------------------------------------- Table
@@ -1584,6 +1318,7 @@ sub gather_roles {
my $advanced = $env{'user.adv'};
my $tryagain = $env{'form.tryagain'};
my @ids = &Apache::lonnet::current_machine_ids();
+ my (%willtrust,%trustchecked);
if (ref($roles_in_env) eq 'HASH') {
my %adhocdesc;
foreach my $envkey (sort(keys(%{$roles_in_env}))) {
@@ -1652,10 +1387,23 @@ sub gather_roles {
if (($role eq 'ca') || ($role eq 'aa')) {
my $home = &Apache::lonnet::homeserver($trest,$tdom);
my $allowed=0;
+ my $prohibited;
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {
$button=0;
- $switchserver='otherserver='.$home.'&role='.$trolecode;
+ unless ($trustchecked{$tdom}) {
+ if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$tdom)) &&
+ (&Apache::lonnet::will_trust('coaurem',$tdom,$env{'user.domain'}))) {
+ $willtrust{$tdom} = 1;
+ $trustchecked{$tdom} = 1;
+ }
+ }
+ if ($willtrust{$tdom}) {
+ $switchserver='otherserver='.$home.'&role='.$trolecode;
+ } else {
+ $prohibited = 1;
+ $tremark .= &mt('Session switch required but prohibited.');
+ }
}
#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);
@@ -1664,7 +1412,9 @@ sub gather_roles {
': '.$tdom.'
'.
' '.&mt('Server').': '.$home;
$env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
- $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+ unless ($prohibited) {
+ $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+ }
$sortkey=$role."$trest:$tdom";
} elsif ($role eq 'au') {
# Authors
@@ -1700,9 +1450,9 @@ sub gather_roles {
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};
}
}
- $desc = $adhocdesc{$tdom}{$rolename};
}
}
if ($desc ne '') {
@@ -1763,6 +1513,9 @@ sub gather_roles {
$skipcal = 1;
}
}
+ if ($ttype eq 'Placement') {
+ $ttype = 'Placement Test';
+ }
if ($tsection) {
$twhere.='
'.&mt('Section').': '.$tsection;
}
@@ -1878,7 +1631,7 @@ sub roletable_headers {
}
sub roletypes {
- my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
+ my @types = ('Domain','Authoring Space','Course','Placement Test','Community','Unavailable','System');
return @types;
}
@@ -1940,15 +1693,15 @@ sub findcourse_advice {
'.&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'
'); if ($elapsed > 600) { - $r->print(''.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes.'). + $r->print('
'.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes').
'
'.
&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'