');
- $r->print(&mt('Last updated').': '.$lastmod . '');
+ $r->print(&mt('Last updated').': '.$lastmod . '');
$r->print('
');
}
}
-#Print Help Text
- if ($target ne 'tex') {
- if($allowed){
- $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
- }
- }
#------Print Headtitle
if ($target ne 'tex') {
- $r->print('');
- $r->print('
'.&Apache::loncommon::plainname($cnum,$cdom).'
');
- if ($courseenv{'nickname'}) {
- $r->print('
"'.$courseenv{'nickname'}.'"
');
- }
- $r->print('
'.&Apache::lonnet::domain($cdom,'description').'
');
+ $r->print('
'.
+ '
'.&Apache::loncommon::plainname($cnum,$cdom).'
');
+ if ($allowed) {
+ $r->print('
');
+ if ($courseenv{'nickname'}) {
+ $r->print('
"'.$courseenv{'nickname'}.'"
');
+ }
+ $r->print(''.&Apache::lonnet::domain($cdom,'description').'
');
+ #Print Help Text
+ $r->print('
'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+ '
');
+ } else {
+ if ($courseenv{'nickname'}) {
+ $r->print('
"'.$courseenv{'nickname'}.'"
');
+ }
+ $r->print('
'.&Apache::lonnet::domain($cdom,'description').'
');
+ }
} else {
$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
@@ -339,8 +313,9 @@ sub handler {
if (($allowed) && ($env{'form.storesyl'})) {
foreach my $syl_field (keys(%syllabusfields)) {
my $field=$env{'form.'.$syl_field};
- $field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,$env{'user.adv'});
+ chomp($field);
+ my $gateway = Apache::lonhtmlgateway->new();
+ $field = $gateway->process_incoming_html($field,1);
$syllabus{$syl_field}=$field;
}
$syllabus{'uploaded.lastmodified'}=time;
@@ -414,7 +389,7 @@ sub handler {
if ($env{'request.course.id'}
&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
- && &in_course($cdom,$cnum)) {
+ && &Apache::lonnet::in_course($cdom,$cnum,$coursedomain,$coursenum,undef,1)) {
if ($target ne 'tex') {
$r->print('
');
&Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_Box');
@@ -432,7 +407,7 @@ sub handler {
if ($target ne 'tex') {
$r->print('
');
if ($env{'form.popup'}) {
- $r->print('
'.&mt('Close window').'');
+ $r->print('
'.&mt('Close window').'
');
}
$r->print(&Apache::loncommon::end_page());
} else {
@@ -444,31 +419,6 @@ sub handler {
return OK;
}
-sub in_course {
- my ($udom,$uname,$cdom,$cnum,$type) = @_;
- $type ||= 'any';
- if (!defined($cdom) || !defined($cnum)) {
- my $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
- }
- my $typesref;
- if ($type eq 'all') {
- $typesref = ['active','previous','future'];
- } elsif ($type eq 'previous' || $type eq 'future') {
- $typesref = [$type];
- }
- my %roles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
- $typesref,undef,[$cdom]);
- my ($tmp) = keys(%roles);
- return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i);
- my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles));
- if (@course_roles > 0) {
- return 1;
- }
- return 0;
-}
-
sub aboutme_info {
my ($r,$is_course) = @_;
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
@@ -592,7 +542,7 @@ sub display_portfolio_header {
title => &mt('Go to personal information page for [_1]',$name),
no_mt => 1},
{href => "/adm/$cdom/$cnum/aboutme/portfolio".$query_string,
- text => 'Viewable files',
+ text => &mt('Viewable files'),
title => &mt('Viewable portfolio files for [_1]',$name),
no_mt => 1}
];
@@ -681,9 +631,12 @@ sub portfolio_files {
my $diroutput;
if ($is_course) {
my %files_by_group;
+ my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
foreach my $filename (sort(keys(%access_controls))) {
my ($group,$path) = split('/',$filename,2);
- $files_by_group{$group}{$path} = $access_controls{$filename};
+ if (exists($curr_groups{$group})) {
+ $files_by_group{$group}{$path} = $access_controls{$filename};
+ }
}
foreach my $group (sort(keys(%files_by_group))) {
my %fileshash;
@@ -852,7 +805,7 @@ sub aboutme_access {
}
if ((&Apache::lonnet::allowed('srm',$privcheck)) ||
(&Apache::lonnet::allowed('dff',$privcheck))) {
- if (&in_course($uname,$udom,$cnum,$cdom)) {
+ if (&Apache::lonnet::in_course($uname,$udom,$cnum,$cdom,undef,1)) {
return 1;
}
}