--- loncom/interface/lonaboutme.pm	2006/08/04 20:41:32	1.49
+++ loncom/interface/lonaboutme.pm	2014/01/28 16:22:30	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network
-# "About Me" Personal Information
+# Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.49 2006/08/04 20:41:32 albertel Exp $
+# $Id: lonaboutme.pm,v 1.156 2014/01/28 16:22:30 bisitz 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;
@@ -33,10 +78,13 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lontexconvert;
-use Apache::lonfeedback;
+use Apache::lonhtmlgateway;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
+use Apache::lontemplate;
+use HTML::Entities();
+use Image::Magick;
 
 sub handler {
     my $r = shift;
@@ -46,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('<p class="_LC_info">'.&mt('No user personal information page available') .'</p>'.
+                        &mt('This is a result of one of the following:').'<ul>'.
+                        '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.
+                        '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.
+                        '</ul>');
+                    $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']);
-
-# ----------------------------------------------- Available Portfolio file display 
+                        ['forceedit','forcestudent','todocs',
+                         'register','popup','folderpath','title']);
+# ----------------------------------------------- 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('<h2>'.&mt('No user portfolio available') .'</h2>'.
+                &mt('This is a result of one of the following:').'<ul>'.
+                '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+                '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+                '</ul>');
+        } 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('<h2>'.&mt('Group Portfolio').'</h2>');
+            &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('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
-    } 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(
-         '<h2>&quot;'.$courseenv{'nickname'}.
-         '&quot;</h2>');
+    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('<h3>'.$Apache::lonnet::domaindescription{$cdom}.'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).'</p>'.&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('<div class="LC_info">'
+                .'<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.')
+                .'</div>'
+            );
+        } elsif ($syllabus{'uploaded.lastmodified'}) {
+        #Print last modified
+            my $lastmod=$syllabus{'uploaded.lastmodified'};
+            $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
+            $r->print('<div class="LC_info">');
+            $r->print(&mt('Last updated').': '.$lastmod . '');
+            $r->print('</div>');
+        }
     }
-    my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
-    my $allowed=0;
 
+#------Print Headtitle
+     if ($target ne 'tex') {
+         $r->print('<div class="LC_Box">'.
+                   '<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
+         if ($allowed) {
+             $r->print('<div style="margin: 0; float:left;">');
+             if ($courseenv{'nickname'}) {
+                 $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
+             }
+             $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3></div>');
+             #Print Help Text
+             $r->print('<div style="margin: 0; float:right;">'.
+                       &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+                       '</div><br clear="all" />');
+         } else {
+             if ($courseenv{'nickname'}) {
+                 $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
+             }
+             $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
+         }
+     } 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('<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_PublicView').'</p>');
-       } elsif ($privleged && $target ne 'tex') {
-           my $query_string = &build_query_string({'forceedit' => '1',});
-	   $r->print('<p><a href="'.$r->uri.$query_string.'"><font size="+1">'.
-		     &mt('Edit').'</font></a></p>');
-       }
-      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};
+            chomp($field);
+            my $gateway = Apache::lonhtmlgateway->new();
+            $field = $gateway->process_incoming_html($field,1);
+            $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{<img src="$syllabus{'uploaded.photourl'}" align="right" />};
-	   if ($target eq 'tex') {
-	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
-	   }
-	   $r->print($image);
-       }
-       if ($allowed) {
-           $r->print(
-	 '<form method="post">
-               <input type="submit" name="delupl" value="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">'.
-	 '</form><form method="post">');
-
-       }
-       foreach (sort keys %syllabusfields) {
-          if (($syllabus{$_}) || ($allowed)) {
-              my $message=$syllabus{$_};
-	      &Apache::lonfeedback::newline_to_br(\$message);
-              $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
-	      if ($allowed) {
-		  $message=&Apache::lonspeller::markeduptext($message);
-	      }
-	      $message=&Apache::lontexconvert::msgtexconverted($message);
-	      if ($target ne 'tex') {
-		  $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
-                            $message.'</blockquote>');
-	      } else {
-		     $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
-			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
-	      }
-              if ($allowed) {
-                 $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
-			   $syllabus{$_}.
-           '</textarea><input type="submit" name="storesyl" value="'.
-			   &mt('Store').'" />');
-	      }
-	  }
-       }
-       if ($allowed) {
-	   $r->print('</form>');
-       }
-       if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
+        if ($syllabus{'uploaded.photourl'}) {
+            &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'});
+
+            $image=qq|<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" alt="Photo of the user" />|;
+
+            if ($target eq 'tex') {
+                $image=&Apache::lonxml::xmlparse($r,'tex',$image);
+            }
+        }
+
+        if ($allowed) {
+            $r->print(
+                '<form name="UploadPhoto" method="post" enctype="multipart/form-data" action="">'.
+                '<h3>'.&mt('Upload a Photo').'</h3>'.
+                '<p class="LC_info">'.
+                &mt('LON-CAPA will automatically scale your uploaded file so the image will not exceed a width of 400px and a height of 500px.').'</p>'.
+                '<input type="file" name="uploaddoc" size="50" />'.
+                '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+                '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
+                '</form>');
+            if ($syllabus{'uploaded.photourl'}) {
+                $r->print('<form name="delPhoto" method="post" action="" ><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
+            }
+            $r->print('<p></p>');
+        }
+
+        if($allowed) {
+            $r->print('<form name="lonaboutmeFields" method="post" action="" >');
+        }
+
+        if ($target ne 'tex') { #print Image
+            $r->print($image.'<div class="LC_clear_float_footer"></div>');
+
+        } #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('<input type="hidden" name="popup" value="'.
+                    $env{'form.popup'}.'" />');
+            }
+            $r->print('</form>');
+        }
+        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {
-       $r->print('<p>'.&mt('No personal information provided').'.</p>');
+        $r->print('<p class="LC_info">'.&mt('No personal information provided').'.</p>');
     }
 
-    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('<a name="coursecomment" />');
+            &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_Box');
+            $r->print('<span class="LC_info">');
+            $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
+            $r->print('</span>');
+            &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('<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);
-	    }
+        } 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('</div>');
+        if ($env{'form.popup'}) {
+            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>');
+        }
+        $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('<h3>Viewable portfolio files</h3>');
+        $output = '<div class="LC_Box"><h4 class="LC_hcell">';
+        $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
+
+       #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
-                   $query_string.'">'.&mt('Display file listing').
-                   '</a><br /><br />';
-        $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'<ul>';
+            $query_string.'">'.$lt{'difl'}.
+            '</a><br /><br />';
+        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>';
+        $output .= '</div>';
+    } elsif ($is_course) {
+        $output .= '<div class="LC_info">'.&mt('There are currently no publicly accessible or password protected group portfolio files.').'</div>'; 
     }
     $r->print($output);
     return;
@@ -293,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'));
         }
@@ -321,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 .= '<h3>'.&mt('Portfolio files for [_1]',$name).'</h3>';
+    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).
+                  '<h3>'.&mt('Group Portfolio files').'</h3>';
+    } 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).
+            '<h3>'.&mt('Portfolio files for [_1]',$name).'</h3>';
+    }
     $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'})) {
@@ -359,41 +571,52 @@ sub display_portfolio_files {
     }
 
     my $output = '<form action="'.&HTML::Entities::encode($r->uri,'<>&"')
-	.'" name="displaystatus" method="post">'.
-	&mt('File access type: ').'<select name="portaccess">';
+        .'" name="displaystatus" method="post">'.
+        &mt('File access type: ').'<select name="portaccess">';
     foreach my $type ('withoutpass','withpass','both') {
         $output .= '<option value="'.$type.'" ';
         if ($portaccess eq $type) {
             $output .= 'selected="selected"';
         }
-        $output .= '>'.&mt($type).'</option>';
+        $output .= '>'.$lt{$type}.'</option>';
     }
-    $output .= '</select>'."\n".
-               '<input type="submit" name="portaccessbutton" value="'.
-               &mt('Update display').'" />';
-    $output .= '</form><br /><br />';
+    $output .= '</select>'."\n";
+    if ($env{'form.register'}) {
+        $output .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />'."\n";
+    }
+    $output .= '<input type="submit" name="portaccessbutton" value="'.
+               &mt('Update display').'" />'.
+               '</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')) {
+        if ($env{'request.course.id'} && $env{'form.register'}) {
+            my $query_string = &build_query_string();
+            $r->print('<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,
                        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';
@@ -404,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 .= '<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;
+}
+
+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 +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})) {
@@ -443,83 +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 .= '</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);
+        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 '<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,$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);
-    &Apache::lonnet::logthis("$path -- $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 .= '<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><td></td></tr>';
+            $output .= '</td><td>&nbsp;</td>'
+                      .&Apache::loncommon::end_data_table_row();
             $output .= &parse_directory($r,$depth,$currhash->{$item},
-					$path.'/'.$item);
+                    $path.'/'.$item,$is_course,$group);
         } else {
-            my $showname;
+            my $file_name;
             if ($currhash->{$item} =~ m|/([^/]+)$|) {
-                $showname = $1;
+                $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 = $currhash->{$item};
+                $showname = $file_name.' ('.$showname.')';
             }
+
             $showname=&HTML::Entities::encode($showname,'<>&"');
-	    my $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.
-		$currhash->{$item};
             $output .= '<a href="'.$url.'">'.
-		'<img alt="" src="'.&Apache::loncommon::icon($currhash->{$item}).'" class="LC_icon" />'.
-		'&nbsp;'.$showname.'</a>';
-	    $output.='</td><td>';
-	    &Apache::lonnet::logthis("sh $showname");
-	    if (exists($dirlist{$showname.'.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>';
+                '<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('Metadata').'" src="'.
+                    &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').
+                    '" class="LC_icon" /></a>';
+            }
+            $output .= '</td>'
+                .&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__