--- loncom/interface/lonaboutme.pm	2006/08/02 20:23:33	1.46
+++ loncom/interface/lonaboutme.pm	2008/01/16 12:19:39	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.46 2006/08/02 20:23:33 albertel Exp $
+# $Id: lonaboutme.pm,v 1.66 2008/01/16 12:19:39 bisitz 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;
@@ -48,13 +49,17 @@ sub handler {
     if ($target eq 'tex') {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     }
-    my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
+    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');
         return OK;
+    } else {
+        $is_course = &Apache::lonnet::is_course($cdom,$cnum);
     }
+
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_contactinfo'   => 'Contact Information',
@@ -62,22 +67,41 @@ sub handler {
        'ccc_webreferences' => 'Web References');
 
 # ------------------------------------------------------------ Get Query String
-    &Apache::loncommon::get_unprocessed_cgi
-        ($ENV{'QUERY_STRING'},['forceedit','forcestudent','register','action']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['forceedit','forcestudent',
+					     'register']);
 
 # ----------------------------------------------- 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);
+    if (($target ne 'tex') && ($action eq 'portfolio')) {
+        &display_portfolio_header($r,$is_course);
+        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;
     }
 
+    if ($is_course) {
+        if ($target ne 'tex') {
+            my $start_page =
+                &Apache::loncommon::start_page(
+                    "Course Information",
+                     undef,
+                     {'function' => $env{'forcestudent'},
+                      'domain'   => $cdom,
+                      'force_register' => $env{'forceregister'},});
+            $r->print($start_page);
+            $r->print('<h2>'.&mt('Group files').'</h2>');
+            &print_portfiles_link($r,$is_course);
+            $r->print(&Apache::loncommon::end_page());
+        }
+        return OK;
+    }
+
 # --------------------------------------------------------------- Force Student
     my $forcestudent='';
     if ($env{'form.forcestudent'}) { $forcestudent='student'; };
@@ -90,10 +114,11 @@ sub handler {
 # --------------------------------------- There is such a user, get environment
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     if ($target ne 'tex') {
+	my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
 	my $start_page = 
-	    &Apache::loncommon::start_page("Personal Information",undef,
+	    &Apache::loncommon::start_page("Personal Information", $rss_link,
 					   {'function'       => $forcestudent,
-					    'domain'         => $cdom,
+ 					    'domain'         => $cdom,
 					    'force_register' =>
 						            $forceregister,});
 	$r->print($start_page);
@@ -107,10 +132,10 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.$Apache::lonnet::domaindescription{$cdom}.'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
+		  '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
     } else {
-	$r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\');
+	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
     my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
     my $allowed=0;
@@ -126,7 +151,7 @@ sub handler {
 	   $r->print('<p><b>'.&mt('Privacy Note').':</b> '.
 		     &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.').
 		     '</p>'.
-		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p><a href="'.$r->uri.$query_string.'">Show Public View</a>'.
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
 		     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
        } elsif ($privleged && $target ne 'tex') {
            my $query_string = &build_query_string({'forceedit' => '1',});
@@ -153,12 +178,12 @@ sub handler {
 	}
     }
        if (($allowed) && ($env{'form.storesyl'})) {
-	   foreach (keys %syllabusfields) {
-               my $field=$env{'form.'.$_};
+	   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{$_}=$field;
+	       $syllabus{$syl_field}=$field;
            }
            $syllabus{'uploaded.lastmodified'}=time;
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
@@ -182,18 +207,18 @@ sub handler {
        if ($allowed) {
            $r->print(
 	 '<form method="post">
-               <input type="submit" name="delupl" value="Delete Photo" />
+               <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />
           </form>'.
 	 '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50">'.
-         '<input type="submit" name="storeupl" value="Upload">'.
+         '<input type="submit" name="storeupl" value="'.&mt('Upload').'">'.
 	 '</form><form method="post">');
 
        }
-       foreach (sort keys %syllabusfields) {
-          if (($syllabus{$_}) || ($allowed)) {
-              my $message=$syllabus{$_};
+       foreach my $field (sort(keys(%syllabusfields))) {
+          if (($syllabus{$field}) || ($allowed)) {
+              my $message=$syllabus{$field};
 	      &Apache::lonfeedback::newline_to_br(\$message);
               $message
              =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
@@ -202,17 +227,17 @@ sub handler {
 	      }
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
 	      if ($target ne 'tex') {
-		  $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
+		  $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
                             $message.'</blockquote>');
 	      } else {
-		     $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
+		     $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
 	      }
               if ($allowed) {
-                 $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
-			   $syllabus{$_}.
+                 $r->print('<br /><textarea cols="80" rows="6" name="'.$field.'">'.
+			   &HTML::Entities::encode($syllabus{$field},'"&<>').
            '</textarea><input type="submit" name="storesyl" value="'.
-			   &mt('Store').'" />');
+			   &mt('Save').'" />');
 	      }
 	  }
        }
@@ -225,35 +250,35 @@ sub handler {
     }
 
     if ($target ne 'tex') {
-        &print_portfiles_link($r);
+        &print_portfiles_link($r,$is_course);
     }
 
-    if ($env{'request.course.id'}) {
-	if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
-	    if ($target ne 'tex') {
-		$r->print('<a name="coursecomment" />');
-		$r->print('<hr /><h3>'.
-                          &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.
-                          &mt('Shared by course faculty and staff').
-                          &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
-'<br />');
-                &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
-                $r->print('<hr />');
-                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).('&nbsp;'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);
+    if ($env{'request.course.id'}
+	&& &Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	&& &in_course($cdom,$cnum)) {
+	if ($target ne 'tex') {
+	    $r->print('<a name="coursecomment" />');
+	    $r->print('<hr /><h3>'.
+		      &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.
+		      &mt('Shared by course faculty and staff').
+		      &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
+		      '<br />');
+	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
+	    $r->print('<hr />');
+	    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).('&nbsp;'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);
+	}
     }
     if ($target ne 'tex') {
 	$r->print(&Apache::loncommon::end_page());
@@ -263,30 +288,78 @@ 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) = @_;
+    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 $query_string = &build_query_string({'action' => 'portfolio',});
+    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('<h3>Viewable portfolio files</h3>');
-        $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme'.
-                   $query_string.'">'.&mt('Display file listing').
+        $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
+        $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
+                   $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';
-        $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'<ul>';
+        if ($filecounts->{'both'} == 1) {
+            if ($is_course) {
+                $output .= &mt('One group portfolio file is available.').'<ul>';
+            } else {
+                $output .= &mt('One portfolio file owned by [_1] is available.',$name).'<ul>';
+            }
+        } else {
+            if ($is_course) {
+                $output .= &mt('A total of [_1] group portfolio files are available.',$filecounts->{'both'}).'<ul>';
+            } else {
+                $output .= &mt('A total of [_1] portfolio files owned by [_2] are available.',$filecounts->{'both'},$name).'<ul>';
+            }
+        }
         if ($filecounts->{'withoutpass'}) {
-            $output .= '<li>'.&mt('[quant,_1,file] are publicly accessible.',$filecounts->{'withoutpass'}).'</li>';   
+	    $output .= '<li>'.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).'</li>';
         }
         if ($filecounts->{'withpass'}) {
-            $output .= '<li>'.&mt('[quant,_1,file] require a passphrase for access.',$filecounts->{'withpass'}).'</li>';
+	    $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
     }
@@ -298,9 +371,9 @@ sub build_query_string {
     my ($new_items) = @_;
     my $query_string;
     my @formelements = ('register'); 
-    my $nonew = 1;
+    my $new = 0;
     if (ref($new_items) eq 'HASH') {
-        $nonew = 0;
+        $new = 1;
         if (!defined($new_items->{'forceedit'}) && 
             !defined($new_items->{'forcestudent'})) {
             push(@formelements,('forceedit','forcestudent'));
@@ -310,12 +383,12 @@ sub build_query_string {
     }
     foreach my $element (@formelements) {
         if (exists($env{'form.'.$element})) {
-            if (($nonew) || (!defined($new_items->{$element}))) {
+            if ((!$new) || (!defined($new_items->{$element}))) {
                 $query_string .= '&amp;'.$element.'='.$env{'form.'.$element};
             }
         }
     }
-    if (!$nonew) {
+    if ($new) {
         foreach my $key (keys(%{$new_items})) {
             $query_string .= '&amp;'.$key.'='.$new_items->{$key};
         }
@@ -325,37 +398,54 @@ 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, 
+
+    my $output;
+    if ($is_course) {
+        $output = 
+            &Apache::loncommon::start_page('Viewable group 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 .= '<h3>'.&mt('Portfolio files for [_1]',$name).'</h3>';
+        $output .= '<h3>'.&mt('Group Portfolio files').'</h3>';
+    } 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=>"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 .= '<h3>'.&mt('Portfolio files for [_1]',$name).'</h3>';
+    }
     $r->print($output);
     return;
 }
 
 sub display_portfolio_files {
-    my ($r,$lt) = @_;
-    my ($cdom,$cnum,$name) = &aboutme_info($r);
+    my ($r,$is_course) = @_;
+    my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
+    my %lt = ( withoutpass => 'passphrase not required',
+	       withpass    => 'passphrase protected',
+	       both        => 'all access types ',);
+    %lt = &Apache::lonlocal::texthash(%lt);
+
     my $portaccess = 'withoutpass';
     if (exists($env{'form.portaccess'})) {
         $portaccess = $env{'form.portaccess'};
     }
+
     my $output = '<form action="'.&HTML::Entities::encode($r->uri,'<>&"')
 	.'" name="displaystatus" method="post">'.
 	&mt('File access type: ').'<select name="portaccess">';
@@ -364,26 +454,31 @@ sub display_portfolio_files {
         if ($portaccess eq $type) {
             $output .= 'selected="selected"';
         }
-        $output .= '>'.$lt->{$type}.'</option>';
+        $output .= '>'.$lt{$type}.'</option>';
     }
     $output .= '</select>'."\n".
                '<input type="submit" name="portaccessbutton" value="'.
-               &mt('Update display').'" />'.
-               '<input type="hidden" name="action" value="'.
-               $env{'form.action'}.'" />';
+               &mt('Update display').'" />';
     $output .= '</form><br /><br />';
     $r->print($output);
-    my $filecounts = &portfolio_files($r,'listfiles',$lt);
-    my $query_string = &build_query_string();
-    $r->print('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.
-               '/aboutme'.$query_string.'">'.
-               &mt('Information about [_1]',$name).'</a>');
+    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('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.
+                  '/aboutme'.$query_string.'">');
+        if ($is_course) {
+            $r->print(&mt('Course Information page'));
+        } else {
+            $r->print(&mt('Information about [_1]',$name));
+        }
+        $r->print('</a>');
+    }
     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,
@@ -393,7 +488,6 @@ sub portfolio_files {
 	&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';
@@ -404,10 +498,63 @@ 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 .= '<h3>'.$group.'</h3>'.$grpout.'<br />';
+            }
+        }
+    } 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;
+}
+
+{ 
+    my $count=0;
+    sub portfolio_table_start {
+	$count=0;
+	return '<table class="LC_aboutme_port">';
+    }
+    sub portfolio_row_start {
+	$count++;
+	my $class = ($count%2)?'LC_odd_row'
+	                      :'LC_even_row';
+	return '<tr class="'.$class.'">';
+    }
+}
+
+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_/)) {
@@ -425,7 +572,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})) {
@@ -443,60 +590,74 @@ sub portfolio_files {
     }
     $filecounts->{'both'} =  $filecounts->{'withoutpass'} +
                               $filecounts->{'withpass'};
+    my $output;
     if ($mode eq 'listfiles') {
-        my $output;
-        if (keys(%allfileshash) > 0) {
+        if ($filecounts->{'both'} > 0) {
             $output = &portfolio_table_start();
-            $output .= &parse_directory($r,0,\%allfileshash);
+            $output .= &parse_directory($r,0,$allfileshash,'',$is_course,
+                                        $group);
             $output .= '</table>';
-        } 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 '<table class="LC_aboutme_port">';
-    }
-    sub portfolio_row_start {
-	$count++;
-	my $class = ($count%2)?'LC_odd_row'
-	                      :'LC_even_row';
-	return '<tr class="'.$class.'">';
     }
+    return $output;
 }
 
 sub parse_directory {
-    my ($r,$depth,$currhash) = @_;
-    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,
+                                                                $group);
+    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 .= '<td style="padding-left: '.($depth*25).'px">';
         if (ref($currhash->{$item}) eq 'HASH') {
             my $title=&HTML::Entities::encode($item,'<>&"');
             $output .= '<img src="'.&Apache::loncommon::lonhttpdurl("/adm/lonIcons/navmap.folder.open.gif").'" alt="'.&mt('Folder').' '.$title.'" class="LC_icon" />&nbsp;'.$title;
-	    $output .= '</td></tr>';
-            $output .= &parse_directory($r,$depth,$currhash->{$item});
+	    $output .= '</td><td></td></tr>';
+            $output .= &parse_directory($r,$depth,$currhash->{$item},
+					$path.'/'.$item,$is_course,$group);
         } else {
-            my $showname;
-            if ($currhash->{$item} =~ m|/([^/]+)$|) {
-                $showname = $1;
-            } else {
-                $showname = $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.')';
+	    }
+
             $showname=&HTML::Entities::encode($showname,'<>&"');
-            $output .= '<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />&nbsp;<a href="/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.$currhash->{$item}.'">'.$showname.'</a>';
+            $output .= '<a href="'.$url.'">'.
+		'<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />'.
+		'&nbsp;'.$showname.'</a>';
+	    $output.='</td><td>';
+	    if ($have_meta) {
+		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.
+		&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
+		'" class="LC_icon" /></a>';
+	    }
 	    $output .= '</td></tr>';
         }
     }