--- loncom/interface/lonaboutme.pm 2006/04/08 06:59:34 1.41 +++ loncom/interface/lonaboutme.pm 2006/08/02 20:18:10 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.41 2006/04/08 06:59:34 albertel Exp $ +# $Id: lonaboutme.pm,v 1.45 2006/08/02 20:18:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -63,17 +63,29 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register']); -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); + ($ENV{'QUERY_STRING'},['forceedit','forcestudent','register','action']); + +# ----------------------------------------------- Available Portfolio file display + if (($target ne 'tex') && ($env{'form.action'} eq 'portfolio')) { + my %lt = &Apache::lonlocal::texthash ( + withoutpass => 'passphrase not required', + withpass => 'passphrase protected', + both => 'all access types ', + ); + &display_portfolio_header($r); + &display_portfolio_files($r,\%lt); + $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'}; + } # --------------------------------------- There is such a user, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); @@ -81,10 +93,9 @@ sub handler { my $start_page = &Apache::loncommon::start_page("Personal Information",undef, {'function' => $forcestudent, - 'add_entries' => $addentries, 'domain' => $cdom, 'force_register' => - $env{'form.register'},}); + $forceregister,}); $r->print($start_page); $r->print('

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

'); } else { @@ -111,13 +122,15 @@ sub handler { 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_TextBoxes','Help with filling in text boxes').'

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

'); } elsif ($privleged && $target ne 'tex') { - $r->print('

'. + my $query_string = &build_query_string({'forceedit' => '1',}); + $r->print('

'. &mt('Edit').'

'); } if (($env{'form.uploaddoc.filename'}) && @@ -210,6 +223,11 @@ sub handler { } else { $r->print('

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

'); } + + if ($target ne 'tex') { + &print_portfiles_link($r); + } + if ($env{'request.course.id'}) { if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { if ($target ne 'tex') { @@ -243,7 +261,247 @@ sub handler { $r->print('\end{document}'); } return OK; -} +} + +sub aboutme_info { + my ($r) = @_; + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my $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 $query_string = &build_query_string({'action' => 'portfolio',}); + my $output; + if ($filecounts->{'both'} > 0) { + $output = &mt('

Viewable portfolio files

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

'; + $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).''; + } + $r->print($output); + return; +} + +sub build_query_string { + my ($new_items) = @_; + my $query_string; + my @formelements = ('register'); + my $nonew = 1; + if (ref($new_items) eq 'HASH') { + $nonew = 0; + if (!defined($new_items->{'forceedit'}) && + !defined($new_items->{'forcestudent'})) { + push(@formelements,('forceedit','forcestudent')); + } + } else { + push(@formelements,('forceedit','forcestudent')); + } + foreach my $element (@formelements) { + if (exists($env{'form.'.$element})) { + if (($nonew) || (!defined($new_items->{$element}))) { + $query_string .= '&'.$element.'='.$env{'form.'.$element}; + } + } + } + if (!$nonew) { + foreach my $key (keys(%{$new_items})) { + $query_string .= '&'.$key.'='.$new_items->{$key}; + } + } + $query_string =~ s/^\&/\?/; + return $query_string; +} + +sub display_portfolio_header { + my ($r) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r); + 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?action=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).'

'; + $r->print($output); + return; +} + +sub display_portfolio_files { + my ($r,$lt) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r); + my $portaccess = 'withoutpass'; + if (exists($env{'form.portaccess'})) { + $portaccess = $env{'form.portaccess'}; + } + my $output = '
'. + &mt('File access type: ').''."\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).''); + return; +} + +sub portfolio_files { + my ($r,$mode,$lt) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r); + 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; + my $portaccess; + if ($mode eq 'showlink') { + $portaccess = 'both'; + } else { + $portaccess = 'withoutpass'; + if (exists($env{'form.portaccess'})) { + $portaccess = $env{'form.portaccess'}; + } + } + + foreach my $filename (keys(%access_controls)) { + my $access_status = + &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,undef, + $access_controls{$filename}); + if ($portaccess eq 'both') { + if (($access_status ne 'ok') && + ($access_status !~ /^[^:]+:guest_/)) { + next; + } + } elsif ($portaccess eq 'withoutpass') { + if ($access_status ne 'ok') { + next; + } + } elsif ($portaccess eq 'withpass') { + if ($access_status !~ /^[^:]+:guest_/) { + next; + } + } + if ($mode eq 'listfiles') { + $filename =~ s/^\///; + my @pathitems = split('/',$filename); + my $lasthash = \%allfileshash; + while (@pathitems > 1) { + my $newlevel = shift(@pathitems); + if (!exists($lasthash->{$newlevel})) { + $lasthash->{$newlevel} = {}; + } + $lasthash = $lasthash->{$newlevel}; + } + $lasthash->{$pathitems[0]} = $filename; + } + if ($access_status eq 'ok') { + $filecounts->{'withoutpass'} ++; + } elsif ($access_status =~ /^[^:]+:guest_/) { + $filecounts->{'withpass'} ++; + } + } + $filecounts->{'both'} = $filecounts->{'withoutpass'} + + $filecounts->{'withpass'}; + 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); + } + $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 ''; + } +} + +sub parse_directory { + my ($r,$depth,$currhash) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r); + $depth++; + my $output; + foreach my $item (sort(keys(%{$currhash}))) { + $output .= &portfolio_row_start(); + $output .= ''; + $output .= &parse_directory($r,$depth,$currhash->{$item}); + } else { + my $showname; + if ($currhash->{$item} =~ m|/([^/]+)$|) { + $showname = $1; + } else { + $showname = $currhash->{$item}; + } + $showname=&HTML::Entities::encode($showname,'<>&"'); + $output .= ' '.$showname.''; + $output .= ''; + } + } + return $output; +} 1; __END__
'; + if (ref($currhash->{$item}) eq 'HASH') { + my $title=&HTML::Entities::encode($item,'<>&"'); + $output .= ''.&mt('Folder').' '.$title.' '.$title; + $output .= '