version 1.269.2.2, 2012/08/27 11:48:24
|
version 1.269.2.14, 2013/09/21 23:42:59
|
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; |
Line 315 sub handler {
|
Line 317 sub handler {
|
my $trolecode = 'au./'.$domain.'/'; |
my $trolecode = 'au./'.$domain.'/'; |
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; |
last; |
} |
} |
Line 326 sub handler {
|
Line 329 sub handler {
|
my $trolecode = 'ca./'.$domain.'/'.$user; |
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; |
last; |
} |
} |
Line 347 sub handler {
|
Line 351 sub handler {
|
my $switchserver = '/adm/switchserver?' |
my $switchserver = '/adm/switchserver?' |
.'otherserver='.$home.'&role='.$trolecode; |
.'otherserver='.$home.'&role='.$trolecode; |
$r->internal_redirect($switchserver); |
$r->internal_redirect($switchserver); |
|
return OK; |
} |
} |
} else { |
} else { |
delete($env{$envkey}); |
delete($env{$envkey}); |
Line 521 ENDENTERKEY
|
Line 526 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) || ($env{'form.switchrole'}) || |
unless ($ferr) { |
($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { |
unless (($env{'form.switchrole'}) || |
&Apache::lonnet::put('nohist_crslastlogin', |
($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) { |
{$env{'user.name'}.':'.$env{'user.domain'}. |
&Apache::lonnet::put('nohist_crslastlogin', |
':'.$csec.':'.$role => $now},$cdom,$cnum); |
{$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'}) && |
if (($env{'form.orgurl'}) && |
($env{'form.orgurl'}!~/^\/adm\/flip/)) { |
($env{'form.orgurl'}!~/^\/adm\/flip/)) { |
Line 585 ENDENTERKEY
|
Line 606 ENDENTERKEY
|
$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'}) { |
if ($env{'form.destinationurl'}) { |
my ($dest,$destsymb,$checkenc); |
my $dest = $env{'form.destinationurl'}; |
$dest = $env{'form.destinationurl'}; |
if ($env{'form.destsymb'} ne '') { |
$destsymb = $env{'form.destsymb'}; |
my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&'); |
if ($dest ne '') { |
$dest .= '?symb='.$esc_symb; |
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; |
|
} |
} |
} |
&redirect_user($r, &mt('Entering [_1]', |
&redirect_user($r, &mt('Entering [_1]', |
$env{'course.'.$courseid.'.description'}), |
$env{'course.'.$courseid.'.description'}), |
Line 636 ENDENTERKEY
|
Line 698 ENDENTERKEY
|
$redirect_url .= $where; |
$redirect_url .= $where; |
} |
} |
$redirect_url .= '/'; |
$redirect_url .= '/'; |
&redirect_user($r,&mt('Entering Construction Space'), |
&redirect_user($r,&mt('Entering Authoring Space'), |
$redirect_url); |
$redirect_url); |
return OK; |
return OK; |
} |
} |
Line 668 ENDENTERKEY
|
Line 730 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 682 ENDENTERKEY
|
Line 746 ENDENTERKEY
|
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $swinfo=&Apache::lonmenu::rawconfig(); |
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum}); |
my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum}); |
my $funcs = &get_roles_functions($showcount); |
my $funcs = &get_roles_functions($showcount); |
my $standby=&mt('Role selected. Please stand by.'); |
|
$standby=~s/\n/\\n/g; |
$standby=~s/\n/\\n/g; |
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 />'; |
|
|
Line 1100 sub gather_roles {
|
Line 1163 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='Construction Space'; |
$ttype='Authoring 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 1119 sub gather_roles {
|
Line 1182 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='Construction Space'; |
$ttype='Authoring 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 1292 sub roletable_headers {
|
Line 1355 sub roletable_headers {
|
} |
} |
|
|
sub roletypes { |
sub roletypes { |
my @types = ('Domain','Construction Space','Course','Community','Unavailable','System'); |
my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System'); |
return @types; |
return @types; |
} |
} |
|
|
Line 1431 sub privileges_info {
|
Line 1494 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='Construction Space'; |
$ttype='Authoring 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 1621 sub adhoc_course_role {
|
Line 1684 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)([\w/]*)\./\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; |
Line 1648 sub adhoc_course_role {
|
Line 1716 sub adhoc_course_role {
|
$spec .= '/'.$usec; |
$spec .= '/'.$usec; |
$area .= '/'.$usec; |
$area .= '/'.$usec; |
} |
} |
&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); |
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::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 2107 sub update_session_roles {
|
Line 2179 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 2132 sub update_session_roles {
|
Line 2203 sub update_session_roles {
|
} |
} |
} |
} |
} |
} |
$currpriv{sys} = $env{"user.priv.$rolekey./"}; |
my $status_in_env = |
$currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; |
&curr_role_status($currstart,$currend,$refresh,$update); |
$currpriv{crs} = $env{"user.priv.$rolekey.$where"}; |
if ($status_in_env eq 'active') { |
if (keys(%crprivs)) { |
$currpriv{sys} = $env{"user.priv.$rolekey./"}; |
if (($crprivs{$rest}{sys} ne $currpriv{sys}) || |
$currpriv{dom} = $env{"user.priv.$rolekey./$udom/"}; |
($crprivs{$rest}{dom} ne $currpriv{dom}) |
$currpriv{crs} = $env{"user.priv.$rolekey.$where"}; |
|
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,\%userroles,$where,$role,$tstart,$tend,$status_in_db); |
&gather_roleprivs(\%allroles,\%allgroups, |
unless (grep(/^\Q$role\E$/,@changed_roles)) { |
\%userroles,$where,$role, |
push(@changed_roles,$role); |
$tstart,$tend,$status_in_db); |
} |
unless (grep(/^\Q$role\E$/,@changed_roles)) { |
my $status_in_env = |
push(@changed_roles,$role); |
&curr_role_status($currstart,$currend,$refresh,$update); |
} |
if ($status_in_env eq 'active') { |
|
$customprivchg{$rolekey} = $status_in_env; |
$customprivchg{$rolekey} = $status_in_env; |
} |
} |
} |
} |
Line 2228 sub update_session_roles {
|
Line 2301 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 2260 sub update_session_roles {
|
Line 2420 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)) { |
$groupmsg .= '<li>'. |
if ($item =~ m{^gr\./($match_domain/$match_courseid)/(\w+)$}) { |
&mt('[_1] with status: [_2].', |
my ($cdom,$cnum) = split(/\//,$1); |
$item,$newgroup{$item}).'</li>'; |
my $group = $2; |
|
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 2274 sub update_session_roles {
|
Line 2466 sub update_session_roles {
|
} |
} |
} |
} |
if (keys(%newrole) > 0) { |
if (keys(%newrole) > 0) { |
$changemsg .= '<li>'.&mt('New roles'). |
my $newmsg; |
'<ul>'; |
|
foreach my $item (sort(keys(%newrole))) { |
foreach my $item (sort(keys(%newrole))) { |
$changemsg .= '<li>'. |
my $desc = &role_desc($item,$update,$refresh,$now); |
&mt('[_1] with status: [_2].', |
if ($desc) { |
$item,$newrole{$item}).'</li>'; |
$newmsg .= '<li>'. |
|
&mt('[_1] with status: [_2].', |
|
$desc,$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) { |
$changemsg .= '<li>'. |
my $privmsg; |
&mt('Custom roles with privilege changes'). |
|
'<ul>'; |
|
foreach my $item (sort(keys(%customprivchg))) { |
foreach my $item (sort(keys(%customprivchg))) { |
$changemsg .= '<li>'.$item.'</li>'; |
my $desc = &role_desc($item,$update,$refresh,$now); |
|
if ($desc) { |
|
$privmsg .= '<li>'.$desc.'</li>'; |
|
} |
} |
} |
$changemsg .= '</ul></li>'; |
if ($privmsg) { |
|
$changemsg .= '<li>'. |
|
&mt('Custom roles with privilege changes'). |
|
'<ul>'.$privmsg.'</ul>'. |
|
'</li>'; |
|
} |
} |
} |
if (keys(%rolechange) > 0) { |
if (keys(%rolechange) > 0) { |
$changemsg .= '<li>'. |
my $rolemsg; |
&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('[_1] status now: [_2].',$item, |
&mt('Existing roles with status changes').'</li>'. |
$rolechange{$item}).'</li>'; |
'<ul>'.$rolemsg.'</ul>'. |
|
'</li>'; |
} |
} |
$changemsg .= '</ul></li>'; |
|
} |
} |
if (keys(%deletedroles) > 0) { |
if (keys(%deletedroles) > 0) { |
$changemsg .= '<li>'. |
my $delmsg; |
&mt('Existing roles now expired').'</li>'. |
|
'<ul>'; |
|
foreach my $item (sort(keys(%deletedroles))) { |
foreach my $item (sort(keys(%deletedroles))) { |
$changemsg .= '<li>'.$item.'</li>'; |
my $desc = &role_desc($item,$update,$refresh,$now); |
|
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 2340 sub update_session_roles {
|
Line 2556 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>'.$crs.'</b><ul>'); |
$groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>'); |
foreach my $group (sort(keys(%{$groupchange{$crs}}))) { |
foreach my $group (sort(keys(%{$groupchange{$crs}}))) { |
$groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$group.'</b>',$groupchange{$crs}{$group}).'</li>'; |
unless ($groupdesc{$group}) { |
|
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 2358 sub update_session_roles {
|
Line 2586 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'); |
|
} |
} |
} |
&Apache::lonnet::set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles); |
return $msg; |
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/) || |
sub role_desc { |
($env{'request.role'} =~/^aa/)) { |
my ($item,$update,$refresh,$now) = @_; |
$curr_role_author=1; |
my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$twhere, |
} |
$trole,$tremark); |
$curr_is_adv = $env{'user.adv'}; |
&Apache::lonnet::role_status('user.role.'.$item,$update,$refresh, |
$curr_role_adv = $env{'request.role.adv'}; |
$now,\$role,\$where,\$trolecode, |
if (keys(%userroles) > 0) { |
\$tstatus,\$tstart,\$tend); |
foreach my $role (@changed_roles) { |
return unless ($role); |
unless(grep(/^\Q$role\E$/,@rolecodes)) { |
if ($role =~ /^cr\//) { |
push(@rolecodes,$role); |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
|
$tremark = &mt('Customrole 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'); |
} |
} |
} |
} |
unless(grep(/^\Qcm\E$/,@rolecodes)) { |
if ($tsection) { |
push(@rolecodes,'cm'); |
$twhere.= ' '.&mt('Section').': '.$tsection; |
} |
} |
&Apache::lonnet::appenv(\%userroles,\@rolecodes); |
if ($role ne 'st') { |
} |
$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 ($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) { |
} elsif ($tdom) { |
&Apache::lonnet::delenv('user.author'); |
$twhere = &mt('Domain').': '.$tdom; |
} |
} |
if ($env{'request.course.id'}) { |
my $output; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
if ($trole) { |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$output = $trole; |
my (@activecrsgroups,$crsgroupschanged); |
if ($twhere) { |
if ($env{'request.course.groups'}) { |
$output .= " -- $twhere"; |
@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') || |
if ($tremark) { |
(ref($groupchange{"/$cdom/$cnum"}) eq 'HASH') || |
$output .= '<br />'.$tremark; |
($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)) { |
return $output; |
&Apache::lonnet::appenv(\%newenv); |
|
} |
|
return $msg; |
|
} |
} |
|
|
sub curr_role_status { |
sub curr_role_status { |
Line 2511 sub is_active_course {
|
Line 2720 sub is_active_course {
|
sub get_roles_functions { |
sub get_roles_functions { |
my ($rolescount) = @_; |
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 2532 sub get_roles_functions {
|
Line 2737 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 (($rolescount > 3) || ($env{'environment.recentroles'})) { |
if ($env{'user.adv'}) { |
push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]); |
if ($env{'form.display'} eq 'showall') { |
|
push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]); |
|
} else { |
|
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(); |
my $funcs = &Apache::lonhtmlcommon::start_funclist(); |
foreach my $link (@links) { |
foreach my $link (@links) { |
$funcs .= &Apache::lonhtmlcommon::add_item_funclist( |
$funcs .= &Apache::lonhtmlcommon::add_item_funclist( |