version 1.242, 2010/01/18 16:41:57
|
version 1.251, 2010/06/02 16:26:21
|
Line 57 course they should act on, etc. Both in
|
Line 57 course they should act on, etc. Both in
|
handler determines via C<lonnet>'s C<&allowed> function that a certain |
handler determines via C<lonnet>'s C<&allowed> function that a certain |
action is not allowed, C<lonroles> is used as error handler. This |
action is not allowed, C<lonroles> is used as error handler. This |
allows the user to select another role which may have permission to do |
allows the user to select another role which may have permission to do |
what they were trying to do. C<lonroles> can also be accessed via the |
what they were trying to do. |
B<CRS> button in the Remote Control. |
|
|
|
=begin latex |
=begin latex |
|
|
Line 145 use HTML::Entities;
|
Line 144 use HTML::Entities;
|
|
|
|
|
sub redirect_user { |
sub redirect_user { |
my ($r,$title,$url,$msg,$launch_nav) = @_; |
my ($r,$title,$url,$msg) = @_; |
$msg = $title if (! defined($msg)); |
$msg = $title if (! defined($msg)); |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::no_cache($r); |
&Apache::loncommon::no_cache($r); |
$r->send_http_header; |
$r->send_http_header; |
my $swinfo=&Apache::lonmenu::rawconfig(); |
|
my $navwindow; |
|
if ($launch_nav eq 'on') { |
|
$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef, |
|
($url =~ m-^/adm/whatsnew-)); |
|
} else { |
|
$navwindow.=&Apache::lonnavmaps::close(); |
|
} |
|
|
|
# Breadcrumbs |
# Breadcrumbs |
my $brcrum = [{'href' => $url, |
my $brcrum = [{'href' => $url, |
Line 172 sub redirect_user {
|
Line 163 sub redirect_user {
|
$url=~s/ /\%20/g; |
$url=~s/ /\%20/g; |
$r->print(<<ENDREDIR); |
$r->print(<<ENDREDIR); |
$start_page |
$start_page |
<script type="text/javascript"> |
|
// <![CDATA[ |
|
$swinfo |
|
// ]]> |
|
</script> |
|
$navwindow |
|
<p>$msg</p> |
<p>$msg</p> |
$end_page |
$end_page |
ENDREDIR |
ENDREDIR |
Line 274 sub handler {
|
Line 259 sub handler {
|
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
if ($server_status eq 'switchserver') { |
if ($server_status eq 'switchserver') { |
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); |
} |
} |
last; |
last; |
Line 285 sub handler {
|
Line 270 sub handler {
|
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
my ($server_status,$home) = &check_author_homeserver($user,$domain); |
if ($server_status eq 'switchserver') { |
if ($server_status eq 'switchserver') { |
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); |
} |
} |
last; |
last; |
Line 306 sub handler {
|
Line 291 sub handler {
|
if ($server_status eq 'switchserver') { |
if ($server_status eq 'switchserver') { |
my $trolecode = 'ca./'.$domain.'/'.$user; |
my $trolecode = 'ca./'.$domain.'/'.$user; |
my $switchserver = '/adm/switchserver?' |
my $switchserver = '/adm/switchserver?' |
.'otherserver='.$home.'&role='.$trolecode; |
.'otherserver='.$home.'&role='.$trolecode; |
$r->internal_redirect($switchserver); |
$r->internal_redirect($switchserver); |
} |
} |
} else { |
} else { |
Line 503 ENDENTERKEY
|
Line 488 ENDENTERKEY
|
my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&'); |
my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&'); |
$dest .= '?symb='.$esc_symb; |
$dest .= '?symb='.$esc_symb; |
} |
} |
&redirect_user($r,&mt('Entering [_1]', |
&redirect_user($r, &mt('Entering [_1]', |
$env{'course.'.$courseid.'.description'}), |
$env{'course.'.$courseid.'.description'}), |
$dest,$msg, |
$dest, $msg); |
$env{'environment.remotenavmap'}); |
|
return OK; |
return OK; |
} |
} |
if (&Apache::lonnet::allowed('whn', |
if (&Apache::lonnet::allowed('whn', |
Line 519 ENDENTERKEY
|
Line 503 ENDENTERKEY
|
unless ($startpage eq 'firstres') { |
unless ($startpage eq 'firstres') { |
$msg = &mt('Entering [_1] ...', |
$msg = &mt('Entering [_1] ...', |
$env{'course.'.$courseid.'.description'}); |
$env{'course.'.$courseid.'.description'}); |
&redirect_user($r,&mt('New in course'), |
&redirect_user($r, &mt('New in course'), |
'/adm/whatsnew?refpage=start',$msg, |
'/adm/whatsnew?refpage=start', $msg); |
$env{'environment.remotenavmap'}); |
|
return OK; |
return OK; |
} |
} |
} |
} |
Line 533 ENDENTERKEY
|
Line 516 ENDENTERKEY
|
} |
} |
$msg = &mt('Entering [_1] ...', |
$msg = &mt('Entering [_1] ...', |
$env{'course.'.$courseid.'.description'}); |
$env{'course.'.$courseid.'.description'}); |
&redirect_user($r,&mt('Entering [_1]', |
&redirect_user($r, &mt('Entering [_1]', |
$env{'course.'.$courseid.'.description'}), |
$env{'course.'.$courseid.'.description'}), |
$furl,$msg, |
$furl, $msg); |
$env{'environment.remotenavmap'}); |
|
} |
} |
return OK; |
return OK; |
} |
} |
Line 770 ENDHEADER
|
Line 752 ENDHEADER
|
return OK; |
return OK; |
} |
} |
# ----------------------------------------------------------------------- Table |
# ----------------------------------------------------------------------- Table |
|
|
|
if ($numdc > 0) { |
|
$r->print(&coursepick_jscript()); |
|
$r->print(&Apache::loncommon::coursebrowser_javascript(). |
|
&Apache::loncommon::authorbrowser_javascript()); |
|
} |
|
|
unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) { |
unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) { |
$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n"); |
$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n"); |
} |
} |
Line 781 ENDHEADER
|
Line 770 ENDHEADER
|
$env{'form.destsymb'}.'" />'); |
$env{'form.destsymb'}.'" />'); |
} |
} |
} |
} |
|
|
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose); |
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose); |
if ($env{'environment.recentroles'}) { |
if ($env{'environment.recentroles'}) { |
my %recent_roles = |
my %recent_roles = |
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); |
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); |
my $output=''; |
my $output=''; |
foreach (sort(keys(%recent_roles))) { |
foreach my $role (sort(keys(%recent_roles))) { |
if (ref($roletext{'user.role.'.$_}) eq 'ARRAY') { |
if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') { |
$output.= &Apache::loncommon::start_data_table_row(). |
$output.= &Apache::loncommon::start_data_table_row(). |
$roletext{'user.role.'.$_}->[0]. |
$roletext{'user.role.'.$role}->[0]. |
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::continue_data_table_row(). |
|
$roletext{'user.role.'.$_}->[1]. |
|
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
if ($_ =~ m-dc\./($match_domain)/- |
if ($roletext{'user.role.'.$role}->[1] ne '') { |
|
$output .= &Apache::loncommon::continue_data_table_row(). |
|
$roletext{'user.role.'.$role}->[1]. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
|
if ($role =~ m{dc\./($match_domain)/} |
&& $dcroles{$1}) { |
&& $dcroles{$1}) { |
$output .= &adhoc_roles_row($1,'recent'); |
$output .= &adhoc_roles_row($1,'recent'); |
} |
} |
} elsif ($numdc > 0) { |
} elsif ($numdc > 0) { |
unless ($_ =~/^error\:/) { |
unless ($role =~/^error\:/) { |
$output.=&display_cc_role('user.role.'.$_); |
my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role); |
|
$output.= &Apache::loncommon::start_data_table_row(). |
|
$roletext. |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::continue_data_table_row(). |
|
$role_text_end. |
|
&Apache::loncommon::end_data_table_row(); |
} |
} |
} |
} |
} |
} |
if ($output) { |
if ($output) { |
$r->print(&Apache::loncommon::start_data_table_empty_row() |
$r->print(&Apache::loncommon::start_data_table_empty_row() |
Line 815 ENDHEADER
|
Line 813 ENDHEADER
|
$doheaders ++; |
$doheaders ++; |
} |
} |
} |
} |
|
|
if ($numdc > 0) { |
|
$r->print(&coursepick_jscript()); |
|
$r->print(&Apache::loncommon::coursebrowser_javascript(). |
|
&Apache::loncommon::authorbrowser_javascript()); |
|
} |
|
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext); |
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext); |
if ($countactive > 1) { |
if ($countactive > 1) { |
my $tremark=''; |
my $tremark=''; |
Line 943 sub gather_roles {
|
Line 935 sub gather_roles {
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$button=0; |
$button=0; |
$switchserver='otherserver='.$home.'&role='.$trolecode; |
$switchserver='otherserver='.$home.'&role='.$trolecode; |
} |
} |
#next if ($home eq 'no_host'); |
#next if ($home eq 'no_host'); |
$home = &Apache::lonnet::hostname($home); |
$home = &Apache::lonnet::hostname($home); |
Line 963 sub gather_roles {
|
Line 955 sub gather_roles {
|
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$button=0; |
$button=0; |
$switchserver='otherserver='.$home.'&role='.$trolecode; |
$switchserver='otherserver='.$home.'&role='.$trolecode; |
} |
} |
#next if ($home eq 'no_host'); |
#next if ($home eq 'no_host'); |
$home = &Apache::lonnet::hostname($home); |
$home = &Apache::lonnet::hostname($home); |
Line 980 sub gather_roles {
|
Line 972 sub gather_roles {
|
if ($env{'course.'.$tcourseid.'.description'}) { |
if ($env{'course.'.$tcourseid.'.description'}) { |
$twhere=$env{'course.'.$tcourseid.'.description'}; |
$twhere=$env{'course.'.$tcourseid.'.description'}; |
$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; |
$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; |
|
$twhere = &HTML::Entities::encode($twhere,'"<>&'); |
unless ($twhere eq &mt('Currently not available')) { |
unless ($twhere eq &mt('Currently not available')) { |
$twhere.=' <span class="LC_fontsize_small">'. |
$twhere.=' <span class="LC_fontsize_small">'. |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). |
Line 990 sub gather_roles {
|
Line 983 sub gather_roles {
|
if (%newhash) { |
if (%newhash) { |
$sortkey=$role."\0".$tdom."\0".$newhash{'description'}. |
$sortkey=$role."\0".$tdom."\0".$newhash{'description'}. |
"\0".$envkey; |
"\0".$envkey; |
$twhere=$newhash{'description'}. |
$twhere=&HTML::Entities::encode($newhash{'description'},'"<>&'). |
' <span class="LC_fontsize_small">'. |
' <span class="LC_fontsize_small">'. |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). |
'</span>'; |
'</span>'; |
$ttype = $newhash{'type'}; |
$ttype = $newhash{'type'}; |
$trole = &Apache::lonnet::plaintext($role,$ttype); |
$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); |
} else { |
} else { |
$twhere=&mt('Currently not available'); |
$twhere=&mt('Currently not available'); |
$env{'course.'.$tcourseid.'.description'}=$twhere; |
$env{'course.'.$tcourseid.'.description'}=$twhere; |
Line 1127 sub print_rolerows {
|
Line 1120 sub print_rolerows {
|
if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') { |
if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') { |
$output.= &Apache::loncommon::start_data_table_row(). |
$output.= &Apache::loncommon::start_data_table_row(). |
$roletext->{$sortrole->{$which}}->[0]. |
$roletext->{$sortrole->{$which}}->[0]. |
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::continue_data_table_row(). |
|
$roletext->{$sortrole->{$which}}->[1]. |
|
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
|
if ($roletext->{$sortrole->{$which}}->[1] ne '') { |
|
$output .= &Apache::loncommon::continue_data_table_row(). |
|
$roletext->{$sortrole->{$which}}->[1]. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
} |
} |
if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) { |
if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) { |
if (ref($dcroles) eq 'HASH') { |
if (ref($dcroles) eq 'HASH') { |
Line 1233 sub requestcourse_advice {
|
Line 1228 sub requestcourse_advice {
|
return; |
return; |
} |
} |
|
|
sub queued_selfenrollment { |
|
my ($r) = @_; |
|
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests'); |
|
my %reqs_by_date; |
|
foreach my $item (keys(%selfenrollrequests)) { |
|
if (ref($selfenrollrequests{$item}) eq 'HASH') { |
|
if ($selfenrollrequests{$item}{'status'} eq 'request') { |
|
if ($selfenrollrequests{$item}{'timestamp'}) { |
|
push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item); |
|
} |
|
} |
|
} |
|
} |
|
if (keys(%reqs_by_date)) { |
|
my $rolename = &Apache::lonnet::plaintext('st'); |
|
$r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'. |
|
&Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_header_row(). |
|
'<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'. |
|
'<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row()); |
|
my @sorted = sort { $a <=> $b } (keys(%reqs_by_date)); |
|
foreach my $item (@sorted) { |
|
if (ref($reqs_by_date{$item}) eq 'ARRAY') { |
|
foreach my $crs (@{$reqs_by_date{$item}}) { |
|
my %courseinfo = &Apache::lonnet::coursedescription($crs); |
|
my $usec = $selfenrollrequests{$crs}{'section'}; |
|
if ($usec eq '') { |
|
$usec = &mt('No section'); |
|
} |
|
$r->print(&Apache::loncommon::start_data_table_row(). |
|
'<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'. |
|
'<td>'.$courseinfo{'description'}.'</td>'. |
|
'<td>'.$rolename.'</td><td>'.$usec.'</td>'. |
|
&Apache::loncommon::end_data_table_row()); |
|
} |
|
} |
|
} |
|
$r->print(&Apache::loncommon::end_data_table()); |
|
} |
|
return; |
|
} |
|
|
|
sub privileges_info { |
sub privileges_info { |
my ($which) = @_; |
my ($which) = @_; |
my $output; |
my $output; |
Line 1600 sub display_cc_role {
|
Line 1552 sub display_cc_role {
|
unless ($rolekey =~/^error\:/) { |
unless ($rolekey =~/^error\:/) { |
if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) { |
if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) { |
my $ccrole = $1; |
my $ccrole = $1; |
my $tcourseid = $2.'_'.$3; |
my $tdom = $2; |
my $trolecode = $1.'./'.$2.'/'.$3; |
my $trest = $3; |
|
my $tcourseid = $tdom.'_'.$trest; |
|
my $trolecode = $ccrole.'./'.$tdom.'/'.$trest; |
my $twhere; |
my $twhere; |
my $ttype; |
my $ttype; |
my $tbg='LC_roles_is'; |
my $tbg='LC_roles_is'; |
Line 1609 sub display_cc_role {
|
Line 1563 sub display_cc_role {
|
if (%newhash) { |
if (%newhash) { |
$twhere=$newhash{'description'}. |
$twhere=$newhash{'description'}. |
' <span style="LC_fontsize_small">'. |
' <span style="LC_fontsize_small">'. |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1). |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom). |
'</span>'; |
'</span>'; |
$ttype = $newhash{'type'}; |
$ttype = $newhash{'type'}; |
} else { |
} else { |
Line 1618 sub display_cc_role {
|
Line 1572 sub display_cc_role {
|
} |
} |
my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid); |
my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid); |
$twhere.="<br />".&mt('Domain').":".$1; |
$twhere.="<br />".&mt('Domain').":".$1; |
($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,''); |
($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,''); |
} |
} |
} |
} |
return ($roletext,$roletext_end); |
return ($roletext,$roletext_end); |
Line 1636 sub adhoc_roles_row {
|
Line 1590 sub adhoc_roles_row {
|
my $carole = &Apache::lonnet::plaintext('ca'); |
my $carole = &Apache::lonnet::plaintext('ca'); |
my $selectcalink = &coauthorlink($dcdom,$rowtype); |
my $selectcalink = &coauthorlink($dcdom,$rowtype); |
$output.=$ccrole.': '.$selectcclink |
$output.=$ccrole.': '.$selectcclink |
.' | '.$carole.': '.$selectcalink |
.' | '.$carole.': '.$selectcalink.'</td>' |
.&Apache::loncommon::end_data_table_row(); |
.&Apache::loncommon::end_data_table_row(); |
return $output; |
return $output; |
} |
} |
Line 1694 course they should act on, etc. Both in
|
Line 1648 course they should act on, etc. Both in
|
handler determines via C<lonnet>'s C<&allowed> function that a certain |
handler determines via C<lonnet>'s C<&allowed> function that a certain |
action is not allowed, C<lonroles> is used as error handler. This |
action is not allowed, C<lonroles> is used as error handler. This |
allows the user to select another role which may have permission to do |
allows the user to select another role which may have permission to do |
what they were trying to do. C<lonroles> can also be accessed via the |
what they were trying to do. |
B<CRS> button in the Remote Control. |
|
|
|
=begin latex |
=begin latex |
|
|