'.&mt('Group Portfolio').'
'); &print_portfiles_link($r,$is_course); @@ -186,39 +189,60 @@ sub handler { return OK; } -# --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; }; - - my $forceregister = ''; - if ($forcestudent eq '') { - $forceregister = $env{'form.register'}; - } - #------------Get rights my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); - my $allowed=0; - my $privleged=$allowed=(($env{'user.name'} eq $cnum) && - ($env{'user.domain'} eq $cdom)); - if ($forcestudent or $target eq 'tex') { $allowed=0; } + my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); + my ($allowed,$coursedomain,$coursenum); + if ($env{'request.course.id'}) { + $coursedomain = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $coursenum = $env{'course.'.$env{'request.course.id'}.'.num'}; + } + my ($cfile) = + &Apache::lonnet::can_edit_resource($env{'request.noversionuri'}, + $coursenum,$coursedomain, + $env{'request.noversionuri'}, + $env{'request.symb'}); + if ($cfile ne '') { + $allowed = 1; + } + if (!$env{'form.forceedit'} or $target eq 'tex') { $allowed=0; } # --------------------------------------- There is such a user, get environment if ($target ne 'tex') { my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); - my $args = {'function' => $forcestudent, + my $args = {'function' => undef, 'domain' => $cdom, - 'force_register' => $forceregister}; - if ($env{'form.popup'}) { + 'force_register' => $env{'form.register'}, + }; + if ($env{'form.popup'}) { # Don't show breadcrumbs in popup window $args->{'no_nav_bar'} = 1; - } else { # Don't show breadcrumbs in popup window - $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}]; + } elsif (!$env{'form.register'}) { #Don't show breadcrumbs twice, when this page is part of course content and you call it + if (($env{'request.course.id'}) && + ($env{'form.folderpath'} =~ /^supplemental/)) { + my $crstype = &Apache::loncommon::course_type(); + my $title = $env{'form.title'}; + if ($title eq '') { + $title = &mt('Personal Information Page'); + } + my $brcrum = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; + } + } else { + $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme", + text=>"Personal Information Page"}]; + } } my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args); $r->print($start_page); + } + +#----------------Print Privacy note (edit mode) or last modified date. + if ($target ne 'tex') { #Print Privacy Note if ($allowed) { $r->print(''
@@ -226,66 +250,36 @@ sub handler {
.&mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.')
.'
'
);
- }
-
-#Print last modified
-
- my $lastmod;
- if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- $lastmod=$syllabus{'uploaded.lastmodified'};
+ } elsif ($syllabus{'uploaded.lastmodified'}) {
+ #Print last modified
+ my $lastmod=$syllabus{'uploaded.lastmodified'};
$lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
$r->print('');
- $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 Functions
- if ($target ne 'tex') {
- $r->print(&Apache::lontemplate::start_functionslist());
+#------Print Headtitle
+ if ($target ne 'tex') {
+ $r->print(''.
+ '
'); + } else { + if ($courseenv{'nickname'}) { + $r->print('
'.&Apache::loncommon::plainname($cnum,$cdom).'
'); if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); - $r->print(&Apache::lontemplate::item_functionslist( - ''.&mt('Show Public View').'' - .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); - } elsif ($privleged) { - my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); - $r->print(&Apache::lontemplate::item_functionslist( - ''. &mt('Edit').'')); - } - $r->print(&Apache::lontemplate::item_functionslist( - &Apache::lontemplate::send_message($r,$cnum,$cdom))); - - if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) { - if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) { - $r->print(&Apache::lontemplate::item_functionslist( - &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom))); + $r->print('');
+ if ($courseenv{'nickname'}) {
+ $r->print('
');
+ #Print Help Text
+ $r->print('"'.$courseenv{'nickname'}.'"
'); } - if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || - &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) { - $r->print(&Apache::lontemplate::item_functionslist( - &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom))); + $r->print(''.&Apache::lonnet::domain($cdom,'description').'
'.
+ &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::lontemplate::item_functionslist( - &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom))); + $r->print(''.&Apache::lonnet::domain($cdom,'description').'
'); } - $r->print(&Apache::lontemplate::end_functionslist()); - } -#------Print Headtitle - if ($target ne 'tex') { - $r->print('');
- $r->print('
');
if ($env{'form.popup'}) {
- $r->print(''.&Apache::loncommon::plainname($cnum,$cdom).'
'); - $r->print('' );
- if ($courseenv{'nickname'}) {
- $r->print('
};
+ $image=qq||;
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
-
}
if ($allowed) {
$r->print(
- '');
if ($syllabus{'uploaded.photourl'}) {
- $r->print('')
+ $r->print('')
}
- $r->print('
');
- $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').'}\\\\'); @@ -302,7 +296,8 @@ sub handler { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userphotoupload('uploaddoc','aboutme'); + &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme', + undef,undef,undef,undef,undef,undef,undef,'400','500'); } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -317,8 +312,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; @@ -331,40 +327,35 @@ sub handler { if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'}); - #This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line. - &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'})); - #---End Resize--- - - $image=qq{'); + $r->print('
'); } if($allowed) { - $r->print(''.&mt('Close window').''); + $r->print('
'); } $r->print(&Apache::loncommon::end_page()); } else { @@ -429,33 +418,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 %roles = &Apache::lonnet::dump('roles',$udom,$uname); - my @course_roles = grep(m{^/\Q$cdom\E/\Q$cnum\E[/_]}, keys(%roles)); - return 0 if (!@course_roles); - return 1 if ($type eq 'any'); - my $now = time(); - foreach my $role (@course_roles) { - my (undef,$role_end,$role_start)=split(/\_/,$roles{$role}); - my $status = 'active'; - if ($role_start > 0 && $now < $role_start) { - $status = 'future'; - } - if ($role_end > 0 && $now > $role_end) { - $status = 'previous'; - } - return 1 if ($status eq $type); - } - return 0; -} - sub aboutme_info { my ($r,$is_course) = @_; my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); @@ -479,8 +441,8 @@ sub print_portfiles_link { 'difl' => 'Display file listing', ); if ($filecounts->{'both'} > 0) { - $output = ''; - $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
';
+ $output = '';
}
$r->print($output);
return;
@@ -547,34 +510,47 @@ sub display_portfolio_header {
my ($r,$is_course) = @_;
my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
my $query_string = &build_query_string();
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- my $forcestudent='';
- if ($env{'form.forcestudent'}) { $forcestudent='student'; };
-
+ my $args = {'domain' => $cdom};
+ if ($env{'form.forcestudent'}) {
+ $args->{'function'} = 'student';
+ }
my $output;
if ($is_course) {
- $output =
- &Apache::loncommon::start_page('Viewable group portfolio files',undef,
- {'function' => $forcestudent,
- 'domain' => $cdom,});
- $output .= '
'; + $output .= ''."\n"; + if ($env{'form.register'}) { + $output .= ''."\n"; + } + $output .= ''. + '
'; $r->print($output); my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course, $cdom,$cnum,$name); if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { - my $query_string = &build_query_string(); - $r->print('
'); - if ($is_course) { - $r->print(&mt('Course Information page')); - } else { - $r->print(&mt('Information about [_1]',$name)); + if ($env{'request.course.id'} && $env{'form.register'}) { + my $query_string = &build_query_string(); + $r->print('
'); + if ($is_course) { + $r->print(&mt('Course Information page')); + } else { + $r->print(&mt('Information about [_1]',$name)); + } + $r->print(''); } - $r->print(''); } return; } @@ -745,9 +726,12 @@ sub parse_directory { my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum, $group); my $getpropath = 1; - my %dirlist = map { - ((split('&',$_,2))[0],1) - } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); + my ($listref,$listerror) = + &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); + my %dirlist; + if (ref($listref) eq 'ARRAY') { + %dirlist = map { ((split('&',$_,2))[0],1) } @{$listref}; + } foreach my $item (sort(keys(%{$currhash}))) { $output .= &Apache::loncommon::start_data_table_row(); $output .= '';
@@ -790,7 +774,7 @@ sub parse_directory {
$output.=' ';
if ($have_meta) {
$output.= '.
+ &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').
')
';
}
$output .= ' '
@@ -811,13 +795,13 @@ sub aboutme_access {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if (($cdom eq '') || ($cnum eq '')) {
- my %coursehash = &coursedescription($env{'request.course.id'});
+ my %coursehash = &Apache::lonnet::coursedescription($env{'request.course.id'});
$cdom = $coursehash{'domain'};
$cnum = $coursehash{'cnum'};
}
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;
}
}
'; + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; #$output = ''.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; $output .= ''.&mt('There are currently no publicly accessible or password protected group portfolio files.').''.&mt('Group Portfolio files').'
'; - } else { - $output = - &Apache::loncommon::start_page('Viewable portfolio files',undef, - {'function' => $forcestudent, - 'domain' => $cdom,}); - if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, - text=>&mt('Personal Information Page - [_1]',$name), - title=>&mt('Go to personal information page for [_1]', $name)}, - {href=>"/adm/$cdom/$cnum/aboutme/portfolio", - text=>&mt('Viewable files - [_1]', $name), - title=>&mt('Viewable portfolio files for [_1]', $name)} - ); - $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); + if (($env{'request.course.id'} eq $cdom.'_'.$cnum) && + ($env{'form.register'})) { + $args->{force_register} = $env{'form.register'}; + } else { + my %coursedescription = &Apache::lonnet::coursedescription($cdom.'_'.$cnum); + my $cdescr = $coursedescription{'description'}; + my $brcrum = [{href=>"/adm/$cdom/$cnum/aboutme".$query_string, + text=>&mt('Course Information - [_1]',$cdescr), + no_mt=>1}, + {href=>"/adm/$cdom/$cnum/aboutme/portfolio".$query_string, + text=>'Viewable group portfolio files'} + ]; + $args->{bread_crumbs} = $brcrum; } - $output .= ''.&mt('Portfolio files for [_1]',$name).'
'; + $output = &Apache::loncommon::start_page('Viewable group portfolio files',undef,$args). + ''.&mt('Group Portfolio files').'
'; + } else { + if ($env{'request.course.id'} && $env{'form.register'}) { + $args->{force_register} = $env{'form.register'}; + } else { + my $brcrum = [{href => "/adm/$cdom/$cnum/aboutme".$query_string, + text => &mt('Personal Information Page - [_1]',$name), + title => &mt('Go to personal information page for [_1]',$name), + no_mt => 1}, + {href => "/adm/$cdom/$cnum/aboutme/portfolio".$query_string, + text => &mt('Viewable files'), + title => &mt('Viewable portfolio files for [_1]',$name), + no_mt => 1} + ]; + $args->{bread_crumbs} = $brcrum; + } + $output = + &Apache::loncommon::start_page('Viewable portfolio files', + undef,$args). + ''.&mt('Portfolio files for [_1]',$name).'
'; } $r->print($output); return; @@ -604,23 +580,28 @@ sub display_portfolio_files { } $output .= '>'.$lt{$type}.''; } - $output .= ''."\n". - ''; - $output .= ''; + $output .= ''."\n"; + if ($env{'form.register'}) { + $output .= ''."\n"; + } + $output .= ''. + '
'; $r->print($output); my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course, $cdom,$cnum,$name); if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { - my $query_string = &build_query_string(); - $r->print('
'); - if ($is_course) { - $r->print(&mt('Course Information page')); - } else { - $r->print(&mt('Information about [_1]',$name)); + if ($env{'request.course.id'} && $env{'form.register'}) { + my $query_string = &build_query_string(); + $r->print('
'); + if ($is_course) { + $r->print(&mt('Course Information page')); + } else { + $r->print(&mt('Information about [_1]',$name)); + } + $r->print(''); } - $r->print(''); } return; } @@ -745,9 +726,12 @@ sub parse_directory { my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum, $group); my $getpropath = 1; - my %dirlist = map { - ((split('&',$_,2))[0],1) - } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); + my ($listref,$listerror) = + &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath); + my %dirlist; + if (ref($listref) eq 'ARRAY') { + %dirlist = map { ((split('&',$_,2))[0],1) } @{$listref}; + } foreach my $item (sort(keys(%{$currhash}))) { $output .= &Apache::loncommon::start_data_table_row(); $output .= '
';
}
$output .= '