--- loncom/interface/lonaboutme.pm 2006/08/04 19:42:55 1.48
+++ loncom/interface/lonaboutme.pm 2006/08/16 19:40:46 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "About Me" Personal Information
#
-# $Id: lonaboutme.pm,v 1.48 2006/08/04 19:42:55 albertel Exp $
+# $Id: lonaboutme.pm,v 1.52 2006/08/16 19:40:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,7 @@ use Apache::lonfeedback;
use Apache::lonrss();
use Apache::lonlocal;
use Apache::lonmsgdisplay();
+use HTML::Entities();
sub handler {
my $r = shift;
@@ -206,7 +207,7 @@ sub handler {
}
if ($allowed) {
$r->print('
');
}
@@ -447,7 +448,7 @@ sub portfolio_files {
my $output;
if (keys(%allfileshash) > 0) {
$output = &portfolio_table_start();
- $output .= &parse_directory($r,0,\%allfileshash);
+ $output .= &parse_directory($r,0,\%allfileshash,'');
$output .= '';
} else {
my $access_text;
@@ -476,10 +477,15 @@ sub portfolio_files {
}
sub parse_directory {
- my ($r,$depth,$currhash) = @_;
+ my ($r,$depth,$currhash,$path) = @_;
my ($cdom,$cnum,$name) = &aboutme_info($r);
$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);
foreach my $item (sort(keys(%{$currhash}))) {
$output .= &portfolio_row_start();
$output .= '