--- loncom/interface/lonaboutme.pm 2006/08/16 19:40:46 1.52 +++ loncom/interface/lonaboutme.pm 2012/12/06 21:43:27 1.152 @@ -1,7 +1,7 @@ # The LearningOnline Network -# "About Me" Personal Information +# Personal Information Page # -# $Id: lonaboutme.pm,v 1.52 2006/08/16 19:40:46 albertel Exp $ +# $Id: lonaboutme.pm,v 1.152 2012/12/06 21:43:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,51 @@ # http://www.lon-capa.org/ # +=pod + +=head1 NAME + +pache::lonaboutme + +=head1 SYNOPSIS + +(empty) + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 OVERVIEW + +(empty) + + +=head1 SUBROUTINES + +=over + +=item handler() + +=item aboutme_info() + +=item print_portfiles_link() + +=item build_query_string() + +=item display_portfolio_header() + +=item display_portfolio_files() + +=item portfolio_files() + +=item build_hierarchy() + +=item parse_directory() + +=back + +=cut + + package Apache::lonaboutme; use strict; @@ -37,7 +82,9 @@ use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); +use Apache::lontemplate; use HTML::Entities(); +use Image::Magick; sub handler { my $r = shift; @@ -47,245 +94,383 @@ sub handler { my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen if ($target eq 'tex') { - $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri); + my $is_course; # Is this even a user? if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { - &Apache::loncommon::simple_error_page($r,'No info', - 'No user information available'); + &Apache::loncommon::simple_error_page($r,'No info', + 'No user information available'); return OK; + } else { + $is_course = &Apache::lonnet::is_course($cdom,$cnum); } + + my $candisplay = 1; + if (!$is_course) { + if ($action ne 'portfolio') { + $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme'); + if ((!$candisplay) && ($env{'request.course.id'})) { + $candisplay = &aboutme_access($cnum,$cdom); + } + if (!$candisplay) { + if ($target eq 'tex') { + $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\'); + } else { + $r->print(&Apache::loncommon::start_page("Personal Information Page")); + $r->print('

'.&mt('No user personal information page available') .'

'. + &mt('This is a result of one of the following:').''); + $r->print(&Apache::loncommon::end_page()); + } + return OK; + } + } + } + # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', - 'bbb_aboutme' => 'About Me', + 'bbb_aboutme' => 'Personal Information', 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['forceedit','forcestudent', - 'register']); + ['forceedit','forcestudent', + 'register','popup','folderpath','title']); -# ----------------------------------------------- Available Portfolio file display +# ----------------------------------------------- Available Portfolio file display if (($target ne 'tex') && ($action eq 'portfolio')) { - &display_portfolio_header($r); - &display_portfolio_files($r); + &display_portfolio_header($r,$is_course); + if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) { + $r->print('

'.&mt('No user portfolio available') .'

'. + &mt('This is a result of one of the following:').''); + } else { + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('port',$cnum,$cdom); + if (!$blocked) { + &display_portfolio_files($r,$is_course); + } else { + $r->print($blocktext); + } + } $r->print(&Apache::loncommon::end_page()); return OK; } -# --------------------------------------------------------------- Force Student - my $forcestudent=''; - if ($env{'form.forcestudent'}) { $forcestudent='student'; }; - - my $forceregister = ''; - if ($forcestudent eq '') { - $forceregister = $env{'form.register'}; + if ($is_course) { + if ($target ne 'tex') { + my $args = {'function' => undef, + 'domain' => $cdom}; + if ($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", + text=>&mt('Course Information - [_1]',$cdescr), + no_mt=>1} + ]; + $args->{'bread_crumbs'} = $brcrum; + } + my $start_page = &Apache::loncommon::start_page( + "Course Information",undef,$args); + $r->print($start_page); + $r->print('

'.&mt('Group Portfolio').'

'); + &print_portfiles_link($r,$is_course); + $r->print(&Apache::loncommon::end_page()); + } + return OK; } - -# --------------------------------------- There is such a user, get environment + +#------------Get rights my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - if ($target ne 'tex') { - my $start_page = - &Apache::loncommon::start_page("Personal Information",undef, - {'function' => $forcestudent, - 'domain' => $cdom, - 'force_register' => - $forceregister,}); - $r->print($start_page); - $r->print('

'.&Apache::loncommon::plainname($cnum,$cdom).'

'); - } else { - $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); + 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'}; } - if ($courseenv{'nickname'}) { - $r->print( - '

"'.$courseenv{'nickname'}. - '"

'); + 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') { - $r->print('

'.$Apache::lonnet::domaindescription{$cdom}.'

'. - '

'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); - } else { - $r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\'); + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $args = {'function' => undef, + 'domain' => $cdom, + 'force_register' => $env{'form.register'}, + }; + if ($env{'form.popup'}) { # Don't show breadcrumbs in popup window + $args->{'no_nav_bar'} = 1; + } 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('
' + .''.&mt('Privacy Note:').' ' + .&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.') + .'
' + ); + } 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('
'); + } } - my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); - my $allowed=0; +#------Print Headtitle + if ($target ne 'tex') { + $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').'}\\\\'); + } # does this user have privileges to post, etc? - my $privleged=$allowed=(($env{'user.name'} eq $cnum) && - ($env{'user.domain'} eq $cdom)); - if ($forcestudent or $target eq 'tex') { $allowed=0; } - - if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1',}); - $r->print('

'.&mt('Privacy Note').': '. - &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.'). - '

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

Show Public View'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } elsif ($privleged && $target ne 'tex') { - my $query_string = &build_query_string({'forceedit' => '1',}); - $r->print('

'. - &mt('Edit').'

'); - } - if (($env{'form.uploaddoc.filename'}) && + + my $query_string; + + if (($env{'form.uploaddoc.filename'}) && ($env{'form.storeupl'}) && ($allowed)) { - if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - } - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme'); - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); - } + if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } + $syllabus{'uploaded.photourl'}= + &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); + } if ($allowed && $env{'form.delupl'}) { - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); - delete($syllabus{'uploaded.photourl'}); - &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum); - } - } - if (($allowed) && ($env{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$env{'form.'.$_}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field, - $env{'user.adv'}); - $syllabus{$_}=$field; - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); - } + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + delete($syllabus{'uploaded.photourl'}); + &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum); + } + } + 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'}); + $syllabus{$syl_field}=$field; + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); + } + my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print(&mt('Last updated').': '.$lastmod); - if ($syllabus{'uploaded.photourl'}) { - &Apache::lonnet::allowuploaded('/adm/aboutme', - $syllabus{'uploaded.photourl'}); - my $image= - qq{}; - if ($target eq 'tex') { - $image=&Apache::lonxml::xmlparse($r,'tex',$image); - } - $r->print($image); - } - if ($allowed) { - $r->print( - '
- -
'. - '
'. - '

'.&mt('Upload a Photo').'

'. - ''. - ''. - '
'); - - } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'. - $message.'
'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - if ($allowed) { - $r->print('
'); - } - } - } - if ($allowed) { - $r->print(''); - } - if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'}); + + $image=qq|Photo of the user|; + + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); + } + } + + if ($allowed) { + $r->print( + '
'. + '

'.&mt('Upload a Photo').'

'. + '

'. + &mt('LON-CAPA will automatically scale your uploaded file so the image will not exceed a width of 400px and a height of 500px.').'

'. + ''. + ''. + ''. + '
'); + if ($syllabus{'uploaded.photourl'}) { + $r->print('
') + } + $r->print('

'); + } + + if($allowed) { + $r->print('
'); + } + + if ($target ne 'tex') { #print Image + $r->print($image.''); + + } #End Print Image + + #Print Content eg. Contactinfo aboutme,... + &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus); + #End Print Content + + if ($target ne 'tex') { #Begin Print RSS and portfiles + &print_portfiles_link($r,$is_course); + if (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') { + &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); + $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom)); + &Apache::lontemplate::print_end_template($r); + } + + } #End Print RSS and portfiles + + + if ($allowed) { + if ($env{'form.popup'}) { + $r->print(''); + } + $r->print('
'); + } + if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} } else { - $r->print('

'.&mt('No personal information provided').'.

'); + $r->print('

'.&mt('No personal information provided').'.

'); } - if ($target ne 'tex') { - &print_portfiles_link($r); - } + if ($env{'request.course.id'} + && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) + && &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'); + $r->print(''); + $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message")); + $r->print(''); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + &Apache::lontemplate::print_end_template($r); - if ($env{'request.course.id'}) { - if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { - if ($target ne 'tex') { - $r->print(''); - $r->print('

'. - &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'

'. - &mt('Shared by course faculty and staff'). - &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). -'
'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - $r->print('
'); - if (&Apache::lonnet::allowed('vsa', - $env{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', - $env{'request.course.id'}.'/'. - $env{'request.course.sec'})) { - $r->print(&Apache::loncommon::track_student_link - ('View recent activity by this student', - $cnum,$cdom).(' 'x2)); - } - $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); - } else { - $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - } + } else { + $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom, 'tex'); } } if ($target ne 'tex') { - $r->print(&Apache::loncommon::end_page()); + $r->print('
'); + if ($env{'form.popup'}) { + $r->print('

'.&mt('Close window').''); + } + $r->print(&Apache::loncommon::end_page()); } else { - $r->print('\end{document}'); + $r->print('\end{document}'); } + + + return OK; } sub aboutme_info { - my ($r) = @_; + my ($r,$is_course) = @_; my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); - my $name = &Apache::loncommon::plainname($cnum,$cdom); + my $name; + if (!$is_course) { + $name = &Apache::loncommon::plainname($cnum,$cdom); + } return ($cdom,$cnum,$name); } sub print_portfiles_link { - my ($r) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); - my $filecounts = &portfolio_files($r,'showlink'); + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my $filecounts = &portfolio_files($r,'showlink',undef,$is_course, + $cdom,$cnum,$name); my $query_string = &build_query_string(); my $output; + my %lt = &Apache::lonlocal::texthash( + 'vpfi' => 'Viewable portfolio files', + 'vgpf' => 'Viewable group portfolio files', + 'difl' => 'Display file listing', + ); if ($filecounts->{'both'} > 0) { - $output = &mt('

Viewable portfolio files

'); + $output = '

'; + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; + + #$output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; $output .= ''.&mt('Display file listing'). - '

'; - $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'
'; + } elsif ($is_course) { + $output .= '
'.&mt('There are currently no publicly accessible or password protected group portfolio files.').'
'; } $r->print($output); return; @@ -294,11 +479,11 @@ sub print_portfiles_link { sub build_query_string { my ($new_items) = @_; my $query_string; - my @formelements = ('register'); + my @formelements = ('register'); my $new = 0; if (ref($new_items) eq 'HASH') { $new = 1; - if (!defined($new_items->{'forceedit'}) && + if (!defined($new_items->{'forceedit'}) && !defined($new_items->{'forcestudent'})) { push(@formelements,('forceedit','forcestudent')); } @@ -322,37 +507,63 @@ sub build_query_string { } sub display_portfolio_header { - my ($r) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); + 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 $output = - &Apache::loncommon::start_page('Viewable portfolio files',undef, - {'function' => $forcestudent, - 'domain' => $cdom,}); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, - text=>"Personal information - $name", - title=>"Go to personal information page for $name"}, - {href=>"/adm/$cdom/$cnum/aboutme/portfolio", - text=>"Viewable files - $name", - title=>"Viewable portfolio files for $name"} -); - $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); - $output .= '

'.&mt('Portfolio files for [_1]',$name).'

'; + my $args = {'domain' => $cdom}; + if ($env{'form.forcestudent'}) { + $args->{'function'} = 'student'; + } + my $output; + if ($is_course) { + 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 = &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 => '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; } sub display_portfolio_files { - my ($r) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); - my %lt = ( withoutpass => 'passphrase not required', - withpass => 'passphrase protected', - both => 'all access types ',); - %lt = &Apache::lonlocal::texthash(%lt); + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my %lt = &Apache::lonlocal::texthash( + 'withoutpass' => 'passphrase not required', + 'withpass' => 'passphrase protected', + 'both' => 'all access types ', + ); my $portaccess = 'withoutpass'; if (exists($env{'form.portaccess'})) { @@ -360,41 +571,52 @@ sub display_portfolio_files { } my $output = '
'. - &mt('File access type: ').''; foreach my $type ('withoutpass','withpass','both') { $output .= ''; } - $output .= ''."\n". - ''; - $output .= '


'; + $output .= ''."\n"; + if ($env{'form.register'}) { + $output .= ''."\n"; + } + $output .= ''. + '

'; $r->print($output); - my $filecounts = &portfolio_files($r,'listfiles',\%lt); - my $query_string = &build_query_string(); - $r->print('

'. - &mt('Information about [_1]',$name).''); + my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course, + $cdom,$cnum,$name); + if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { + 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(''); + } + } return; } sub portfolio_files { - my ($r,$mode,$lt) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); + my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_; my $filecounts = { withpass => 0, withoutpass => 0, both => 0, }; my $current_permissions = - &Apache::lonnet::get_portfile_permissions($cdom,$cnum); - my %access_controls = - &Apache::lonnet::get_access_controls($current_permissions); - my %allfileshash; + &Apache::lonnet::get_portfile_permissions($cdom,$cnum); + my %access_controls = + &Apache::lonnet::get_access_controls($current_permissions); my $portaccess; if ($mode eq 'showlink') { $portaccess = 'both'; @@ -405,10 +627,49 @@ sub portfolio_files { } } - foreach my $filename (keys(%access_controls)) { - my $access_status = - &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,undef, - $access_controls{$filename}); + my $diroutput; + if ($is_course) { + my %files_by_group; + foreach my $filename (sort(keys(%access_controls))) { + my ($group,$path) = split('/',$filename,2); + $files_by_group{$group}{$path} = $access_controls{$filename}; + } + foreach my $group (sort(keys(%files_by_group))) { + my %fileshash; + my $grpout .= &build_hierarchy($r,$cdom,$cnum,$portaccess, + $is_course,$filecounts,$mode, + $files_by_group{$group}, + \%fileshash,$group); + if ($grpout) { + $diroutput .= '

'.$group.'

'.$grpout.'
'; + } + } + } else { + my %allfileshash; + $diroutput = &build_hierarchy($r,$cdom,$cnum,$portaccess,$is_course, + $filecounts,$mode,\%access_controls, + \%allfileshash); + } + if ($mode eq 'listfiles') { + if ($filecounts->{'both'}) { + $r->print($diroutput); + } else { + my $access_text; + if (ref($lt) eq 'HASH') { + $access_text = $lt->{$portaccess}; + } + $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text)); + } + } + return $filecounts; +} + +sub build_hierarchy { + my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info, + $allfileshash,$group) = @_; + foreach my $filename (sort(keys(%{$access_info}))) { + my $access_status = + &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$$access_info{$filename}); if ($portaccess eq 'both') { if (($access_status ne 'ok') && ($access_status !~ /^[^:]+:guest_/)) { @@ -426,7 +687,7 @@ sub portfolio_files { if ($mode eq 'listfiles') { $filename =~ s/^\///; my @pathitems = split('/',$filename); - my $lasthash = \%allfileshash; + my $lasthash = $allfileshash; while (@pathitems > 1) { my $newlevel = shift(@pathitems); if (!exists($lasthash->{$newlevel})) { @@ -444,95 +705,108 @@ sub portfolio_files { } $filecounts->{'both'} = $filecounts->{'withoutpass'} + $filecounts->{'withpass'}; + my $output; if ($mode eq 'listfiles') { - my $output; - if (keys(%allfileshash) > 0) { - $output = &portfolio_table_start(); - $output .= &parse_directory($r,0,\%allfileshash,''); - $output .= ''; - } else { - my $access_text; - if (ref($lt) eq 'HASH') { - $access_text = $lt->{$portaccess}; - } - $output .= &mt('There are no available files of the specified access type: [_1]',$access_text); + if ($filecounts->{'both'} > 0) { + $output = &Apache::loncommon::start_data_table(); + $output .= &parse_directory($r,0,$allfileshash,'',$is_course, + $group); + $output .= &Apache::loncommon::end_data_table(); } - $r->print($output); - } - return $filecounts; -} - -{ - my $count=0; - sub portfolio_table_start { - $count=0; - return ''; - } - sub portfolio_row_start { - $count++; - my $class = ($count%2)?'LC_odd_row' - :'LC_even_row'; - return ''; } + return $output; } sub parse_directory { - my ($r,$depth,$currhash,$path) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); + my ($r,$depth,$currhash,$path,$is_course,$group) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); $depth++; my $output; - my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum); - my %dirlist = map { - ((split('&',$_,2))[0],1) - } &Apache::lonnet::dirlist($path,$cdom,$cnum,$portfolio_root); + my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum, + $group); + my $getpropath = 1; + 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 .= &portfolio_row_start(); + $output .= &Apache::loncommon::start_data_table_row(); $output .= ''; + $output .= '' + .&Apache::loncommon::end_data_table_row(); $output .= &parse_directory($r,$depth,$currhash->{$item}, - $path.'/'.$item); + $path.'/'.$item,$is_course,$group); } else { - - - my $file_name; - if ($currhash->{$item} =~ m|/([^/]+)$|) { - $file_name = $1; - } else { - $file_name = $currhash->{$item}; - } - my $have_meta = exists($dirlist{$file_name.'.meta'}); - my $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'. - $currhash->{$item}; - + my $file_name; + if ($currhash->{$item} =~ m|/([^/]+)$|) { + $file_name = $1; + } else { + $file_name = $currhash->{$item}; + } + my $have_meta = exists($dirlist{$file_name.'.meta'}); + my $url; + if ($is_course) { + $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group. + '/portfolio/'.$currhash->{$item}; + } else { + $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.$currhash->{$item}; + } my $showname; - if ($have_meta) { - $showname = &Apache::lonnet::metadata($url,'title'); - } - if ($showname eq '') { - $showname = $file_name; - } else { - $showname = $file_name.' ('.$showname.')'; - } + if ($have_meta) { + $showname = &Apache::lonnet::metadata($url,'title'); + } + if ($showname eq '') { + $showname = $file_name; + } else { + $showname = $file_name.' ('.$showname.')'; + } $showname=&HTML::Entities::encode($showname,'<>&"'); $output .= ''. - ''. - ' '.$showname.''; - $output.=''; + ''. + ' '.$showname.''; + $output.='' + .&Apache::loncommon::end_data_table_row(); } - } + } return $output; } +sub aboutme_access { + my ($uname,$udom) = @_; + my $privcheck = $env{'request.course.id'}; + my $sec; + if ($env{'request.course.sec'} ne '') { + $sec = $env{'request.course.sec'}; + $privcheck .= '/'.$sec; + } + 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 = &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 (&Apache::lonnet::in_course($uname,$udom,$cnum,$cdom,undef,1)) { + return 1; + } + } + return; +} + 1; __END__
'; if (ref($currhash->{$item}) eq 'HASH') { my $title=&HTML::Entities::encode($item,'<>&"'); $output .= ''.&mt('Folder').' '.$title.' '.$title; - $output .= '
 '; - if ($have_meta) { - $output.= ''.&mt('Catalog Information').''; - } - $output .= '
'; + if ($have_meta) { + $output.= ''.&mt('Metadata').''; + } + $output .= '