--- loncom/auth/lonroles.pm 2017/03/14 03:49:42 1.269.2.33
+++ loncom/auth/lonroles.pm 2020/02/04 01:55:50 1.269.2.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.269.2.33 2017/03/14 03:49:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.37 2020/02/04 01:55:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -590,6 +590,25 @@ ENDENTERKEY
{$env{'user.name'}.':'.$env{'user.domain'}.
':'.$csec.':'.$role => $now},$cdom,$cnum);
}
+ if (($env{"environment.internal.$cdom.$cnum.$role.adhoc"}) &&
+ (&Apache::lonnet::allowed('vxc',$cdom.'_'.$cnum))) {
+ my $owner = $env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'};
+ my @coowners = split(/,/,$env{'course.'.$env{'request.course.id'}.'.internal.co-owners'});
+ my %auaccess;
+ foreach my $user ($owner,@coowners) {
+ my ($cpname,$cpdom) = split(/:/,$user);
+ my %auroles = &Apache::lonnet::get_my_roles($cpname,$cpdom,'userroles',undef,['au','ca','aa'],[$cdom]);
+ foreach my $key (keys(%auroles)) {
+ my ($auname,$audom,$aurole) = split(/:/,$key);
+ if ($aurole eq 'au') {
+ $auaccess{$cpname} = 1;
+ } else {
+ $auaccess{$auname} = 1;
+ }
+ }
+ }
+ &Apache::lonnet::appenv({'request.course.adhocsrcaccess' => join(',',sort(keys(%auaccess))) });
+ }
my ($feeds,$syllabus_time);
&Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds);
&Apache::lonnet::appenv({'request.course.feeds' => $feeds});
@@ -669,6 +688,17 @@ ENDENTERKEY
}
}
}
+ if (($dest =~ m{^\Q/public/$cdom/$cnum/syllabus\E.*(\?|\&)usehttp=1}) ||
+ ($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
+ if ($ENV{'SERVER_PORT'} == 443) {
+ unless (&Apache::lonnet::uses_sts()) {
+ my $hostname = $r->hostname();
+ if ($hostname ne '') {
+ $dest = 'http://'.$hostname.$dest;
+ }
+ }
+ }
+ }
if ($dest =~ m{^/enc/}) {
if ($env{'request.role.adv'}) {
$dest = &Apache::lonenc::unencrypted($dest);
@@ -701,7 +731,7 @@ ENDENTERKEY
unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) {
if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) {
my $esc_symb = &escape($destsymb);
- $dest .= '?symb='.$esc_symb;
+ $dest .= (($dest =~/\?/)? '&':'?').'symb='.$esc_symb;
}
}
&redirect_user($r, &mt('Entering [_1]',
@@ -1000,7 +1030,11 @@ ENDHEADER
# No active roles
if ($countactive==0) {
- &requestcourse_advice($r,$cattype,$inrole);
+ my $elapsed = 0;
+ if ($now && $update) {
+ $elapsed = $now - $update;
+ }
+ &requestcourse_advice($r,$cattype,$inrole,$elapsed);
$r->print('');
if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1518,20 +1552,26 @@ sub print_rolerows {
}
sub findcourse_advice {
- my ($r,$cattype) = @_;
+ my ($r,$cattype,$elapsed) = @_;
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'})) {
- $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
+ $r->print(''.&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
- '.&mt('The course has yet to be created.').'
- '.&mt('Automatic enrollment of registered students has not been enabled for the course.').'
- '.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'
- '.&mt('The start date for automated enrollment has yet to be reached.').'
- '.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'
-
');
+ '.&mt('Automated enrollment added you to the course in the time since you last logged-in.').' '.&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.').'
+ ');
} 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.').'
');
+ $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 ($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.').
+ '
'.
+ &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.').'
');
+ }
}
if (($cattype eq 'std') || ($cattype eq 'domonly')) {
$r->print(''.&mt('Self-Enrollment').'
'.
@@ -1543,7 +1583,7 @@ sub findcourse_advice {
}
sub requestcourse_advice {
- my ($r,$cattype,$inrole) = @_;
+ my ($r,$cattype,$inrole,$elapsed) = @_;
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
my (%can_request,%request_doms,$output);
@@ -1604,7 +1644,7 @@ sub requestcourse_advice {
} else {
$r->print(''.&mt('Currently no active roles, courses or communities').'
');
}
- &findcourse_advice($r,$cattype);
+ &findcourse_advice($r,$cattype,$elapsed);
}
return;
}
@@ -1993,9 +2033,9 @@ sub adhoc_roles_row {
my ($dcdom,$rowtype) = @_;
my $output = &Apache::loncommon::continue_data_table_row()
.' '
- .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
+ .&mt('[_1]Ad hoc[_2] roles in domain [_3]'
,'','',$dcdom)
- .' ';
+ .' -- ';
my $role = 'cc';
my $selectcclink = &courselink($dcdom,$rowtype,$role);
my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
@@ -2023,9 +2063,9 @@ sub adhoc_customroles_row {
if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) {
return &Apache::loncommon::continue_data_table_row()
.' | '
- .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --',
+ .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3]',
'','',$dhdom)
- .' '.&courselink($dhdom,$rowtype,$role);
+ .' -- '.&courselink($dhdom,$rowtype,$role);
}
}
return;
|