--- loncom/auth/lonroles.pm 2013/01/04 04:08:34 1.269.2.7
+++ loncom/auth/lonroles.pm 2014/01/13 03:56:42 1.269.2.15
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.269.2.7 2013/01/04 04:08:34 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.15 2014/01/13 03:56:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -139,6 +139,7 @@ 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;
@@ -316,6 +317,7 @@ sub handler {
my $trolecode = 'au./'.$domain.'/';
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
$r->internal_redirect($switchserver);
+ return OK;
}
last;
}
@@ -327,6 +329,7 @@ sub handler {
my $trolecode = 'ca./'.$domain.'/'.$user;
my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
$r->internal_redirect($switchserver);
+ return OK;
}
last;
}
@@ -348,6 +351,7 @@ sub handler {
my $switchserver = '/adm/switchserver?'
.'otherserver='.$home.'&role='.$trolecode;
$r->internal_redirect($switchserver);
+ return OK;
}
} else {
delete($env{$envkey});
@@ -522,22 +526,39 @@ ENDENTERKEY
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
my $msg;
- my ($furl,$ferr)=
- &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
- unless (($ferr) || ($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 ($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});
+ }
+ }
+ }
}
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'};
if ($env{'form.symb'}) {
if ($dest =~ /\?/) {
$dest .= '&';
} else {
- $dest .= '?'
+ $dest .= '?';
}
$dest .= 'symb='.$env{'form.symb'};
}
@@ -678,7 +699,7 @@ ENDENTERKEY
$redirect_url .= $where;
}
$redirect_url .= '/';
- &redirect_user($r,&mt('Entering Construction Space'),
+ &redirect_user($r,&mt('Entering Authoring Space'),
$redirect_url);
return OK;
}
@@ -710,11 +731,13 @@ 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}];
@@ -724,7 +747,6 @@ ENDENTERKEY
my $swinfo=&Apache::lonmenu::rawconfig();
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
my $funcs = &get_roles_functions($showcount);
- 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.').'
';
@@ -1142,7 +1164,7 @@ sub gather_roles {
}
#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);
- $ttype='Construction Space';
+ $ttype='Authoring Space';
$twhere=&mt('User').': '.$trest.'
'.&mt('Domain').
': '.$tdom.'
'.
' '.&mt('Server').': '.$home;
@@ -1161,7 +1183,7 @@ sub gather_roles {
}
#next if ($home eq 'no_host');
$home = &Apache::lonnet::hostname($home);
- $ttype='Construction Space';
+ $ttype='Authoring Space';
$twhere=&mt('Domain').': '.$tdom.'
'.&mt('Server').
': '.$home;
$env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
@@ -1334,7 +1356,7 @@ sub roletable_headers {
}
sub roletypes {
- my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
+ my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
return @types;
}
@@ -1473,7 +1495,7 @@ sub privileges_info {
my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
if ($trest) {
if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
- $ttype='Construction Space';
+ $ttype='Authoring Space';
$twhere='User: '.$trest.', Domain: '.$tdom;
} else {
$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
@@ -2427,9 +2449,11 @@ sub update_session_roles {
&unescape($groupinfo{'description'});
}
$groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};
- $groupmsg .= ''.
- &mt('[_1] with status: [_2].',
- ''.$groupdesc.'',$newgroup{$item}).'';
+ if ($groupdesc) {
+ $groupmsg .= ''.
+ &mt('[_1] with status: [_2].',
+ ''.$groupdesc.'',$newgroup{$item}).'';
+ }
}
}
if ($groupmsg) {
@@ -2443,47 +2467,67 @@ sub update_session_roles {
}
}
if (keys(%newrole) > 0) {
- $changemsg .= ''.&mt('New roles').
- '';
+ my $newmsg;
foreach my $item (sort(keys(%newrole))) {
my $desc = &role_desc($item,$update,$refresh,$now);
- $changemsg .= '- '.
- &mt('[_1] with status: [_2].',
- $desc,$newrole{$item}).'
';
+ if ($desc) {
+ $newmsg .= '- '.
+ &mt('[_1] with status: [_2].',
+ $desc,$newrole{$item}).'
';
+ }
+ }
+ if ($newmsg) {
+ $changemsg .= '- '.&mt('New roles').
+ ''.
+ '
';
}
- $changemsg .= '
';
}
if (keys(%customprivchg) > 0) {
- $changemsg .= ''.
- &mt('Custom roles with privilege changes').
- '';
+ my $privmsg;
foreach my $item (sort(keys(%customprivchg))) {
my $desc = &role_desc($item,$update,$refresh,$now);
- $changemsg .= '- '.$desc.'
';
+ if ($desc) {
+ $privmsg .= '- '.$desc.'
';
+ }
}
- $changemsg .= '
';
+ if ($privmsg) {
+ $changemsg .= ''.
+ &mt('Custom roles with privilege changes').
+ ''.
+ '';
+ }
}
if (keys(%rolechange) > 0) {
- $changemsg .= ''.
- &mt('Existing roles with status changes').''.
- '';
+ my $rolemsg;
foreach my $item (sort(keys(%rolechange))) {
- my $desc = &role_desc($item,$update,$refresh,$now);
+ my $desc = &role_desc($item,$update,$refresh,$now);
+ if ($desc) {
+ $rolemsg .= '- '.
+ &mt('[_1] status now: [_2].',$desc,
+ $rolechange{$item}).'
';
+ }
+ }
+ if ($rolemsg) {
$changemsg .= '- '.
- &mt('[_1] status now: [_2].',$desc,
- $rolechange{$item}).'
';
+ &mt('Existing roles with status changes').''.
+ ''.
+ '';
}
- $changemsg .= '
';
}
if (keys(%deletedroles) > 0) {
- $changemsg .= ''.
- &mt('Existing roles now expired').''.
- '';
+ my $delmsg;
foreach my $item (sort(keys(%deletedroles))) {
my $desc = &role_desc($item,$update,$refresh,$now);
- $changemsg .= '- '.$desc.'
';
+ if ($desc) {
+ $delmsg .= '- '.$desc.'
';
+ }
+ }
+ if ($delmsg) {
+ $changemsg .= '- '.
+ &mt('Existing roles now expired').'
'.
+ ''.
+ '';
}
- $changemsg .= '
';
}
}
if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) {
@@ -2543,6 +2587,12 @@ sub update_session_roles {
}
if ($changemsg) {
$msg .= '';
+ } else {
+ if (&Apache::loncommon::show_course()) {
+ $msg = &mt('No new courses or communities');
+ } else {
+ $msg = &mt('No role changes');
+ }
}
return $msg;
}
@@ -2551,8 +2601,10 @@ sub role_desc {
my ($item,$update,$refresh,$now) = @_;
my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$twhere,
$trole,$tremark);
- &Apache::lonnet::role_status('user.role.'.$item,$update,$refresh, $now,\$role,\$where, \$trolecode,
+ &Apache::lonnet::role_status('user.role.'.$item,$update,$refresh,
+ $now,\$role,\$where,\$trolecode,
\$tstatus,\$tstart,\$tend);
+ return unless ($role);
if ($role =~ /^cr\//) {
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
$tremark = &mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
@@ -2594,9 +2646,15 @@ sub role_desc {
} elsif ($tdom) {
$twhere = &mt('Domain').': '.$tdom;
}
- my $output = "$trole -- $twhere";
- if ($tremark) {
- $output .= '
'.$tremark;
+ my $output;
+ if ($trole) {
+ $output = $trole;
+ if ($twhere) {
+ $output .= " -- $twhere";
+ }
+ if ($tremark) {
+ $output .= '
'.$tremark;
+ }
}
return $output;
}
@@ -2682,11 +2740,14 @@ sub get_roles_functions {
}
if ($env{'user.adv'}) {
if ($env{'form.display'} eq 'showall') {
- push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
+ push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]);
} else {
- push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
+ push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]);
}
}
+ if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
+ push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
+ }
my $funcs = &Apache::lonhtmlcommon::start_funclist();
foreach my $link (@links) {
$funcs .= &Apache::lonhtmlcommon::add_item_funclist(