--- loncom/interface/lonaboutme.pm	2009/06/08 18:04:45	1.137
+++ loncom/interface/lonaboutme.pm	2012/10/04 13:41:10	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Personal Information Page
 #
-# $Id: lonaboutme.pm,v 1.137 2009/06/08 18:04:45 bisitz Exp $
+# $Id: lonaboutme.pm,v 1.149 2012/10/04 13:41:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@ sub handler {
                     $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\');
                 } else {
                     $r->print(&Apache::loncommon::start_page("Personal Information Page"));
-                    $r->print('<h2>'.&mt('No user personal information page available') .'</h2>'.
+                    $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>'.
@@ -168,16 +168,22 @@ sub handler {
 
     if ($is_course) {
         if ($target ne 'tex') {
-            my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
-              {href=>"/adm/aboutme",text=>"Course Information"}];
-            my $start_page =
-                &Apache::loncommon::start_page(
-                    "Course Information",
-                     undef,
-                     {'function' => $env{'forcestudent'},
-                      'domain'   => $cdom,
-                      'force_register' => $env{'forceregister'},
-                      'bread_crumbs' => $brcrum});
+            my $args = {'function'       => $env{'forcestudent'},
+                        '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);
@@ -190,11 +196,6 @@ sub handler {
     my $forcestudent='';
     if ($env{'form.forcestudent'}) { $forcestudent='student'; };
 
-    my $forceregister = '';
-    if ($forcestudent eq '') {
-        $forceregister = $env{'form.register'};
-    }
-
 #------------Get rights
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
      my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
@@ -203,22 +204,72 @@ sub handler {
                    ($env{'user.domain'} eq $cdom));
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
 
-
 # --------------------------------------- There is such a user, get environment
 
     if ($target ne 'tex') {
         my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
-        my $args = {'function' => $forcestudent,
+        my $args = {'function' => undef,
                     'domain'   => $cdom,
-                    'force_register' => $forceregister};
-        if ($env{'form.popup'}) {
+                    'force_register' => $env{'form.register'},
+                   };
+        if ($env{'form.popup'}) { # Don't show breadcrumbs in popup window 
             $args->{'no_nav_bar'} = 1;
-        } else { # Don't show breadcrumbs in popup window
-            $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];
+        } elsif (!$env{'form.register'}) { #Don't show breadcrumbs twice, when this page is part of course content and you call it
+            $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 Functions
+    if ($target ne 'tex') {
+        my $functions=&Apache::lonhtmlcommon::start_funclist();
+        if ($allowed) {
+            my $query_string = &build_query_string(
+                                   {'forcestudent' => '1',
+                                    'popup' => $env{'form.popup'}});
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<a href="'.$r->uri.$query_string.'">'
+                           .&mt('Show Public View').'</a>'
+                           .&Apache::loncommon::help_open_topic(
+                                'Uploaded_Templates_PublicView'));
+        } elsif ($privleged) {
+            my $query_string = &build_query_string(
+                                   {'forceedit' => '1',
+                                    'popup' => $env{'form.popup'}});
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                            '<a href="'.$r->uri.$query_string.'">'
+                            .&mt('Edit').'</a>');
+        }
+        $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                        &Apache::lontemplate::send_message($r,$cnum,$cdom));
+
+        if ($env{'request.course.id'} &&
+            &Apache::lonnet::allowed('srm',$env{'request.course.id'}) &&
+            &in_course($cdom,$cnum)) {
+            if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) ||
+                &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                     &Apache::loncommon::track_student_link(
+                         'View recent activity by this student',$cnum,$cdom));
+            }
+            if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
+                &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                    &Apache::loncommon::slot_reservations_link(
+                        'Slot reservation history',$cnum,$cdom));
+            }
+            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                           &Apache::loncommon::noteswrapper(
+                               &mt('Add Records'),$cnum,$cdom));
+        }
+        $functions.=&Apache::lonhtmlcommon::end_funclist();
+        $r->print(&Apache::loncommon::head_subbox($functions));
+    }
 
+# Print Privacy Note
+    if ($target ne 'tex') {
         #Print Privacy Note
         if ($allowed) {
             $r->print('<div class="LC_info">'
@@ -227,9 +278,11 @@ sub handler {
                 .'</div>'
             );
         }
+    }
 
 #Print last modified
 
+    if ($target ne 'tex') {
         my $lastmod;
         if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
             $lastmod=$syllabus{'uploaded.lastmodified'};
@@ -246,37 +299,6 @@ sub handler {
         }
     }
 
-#----------------Print Functions
-    if ($target ne 'tex') {
-         $r->print(&Apache::lontemplate::start_functionslist());
-         if ($allowed) {
-             my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
-             $r->print(&Apache::lontemplate::item_functionslist(
-                 '<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
-                 .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
-         } elsif ($privleged) {
-             my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
-             $r->print(&Apache::lontemplate::item_functionslist(
-                 '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
-         }
-         $r->print(&Apache::lontemplate::item_functionslist(
-             &Apache::lontemplate::send_message($r,$cnum,$cdom)));
-
-         if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) {
-             if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-                     $r->print(&Apache::lontemplate::item_functionslist(
-                         &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
-             }
-             if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
-                 &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-                 $r->print(&Apache::lontemplate::item_functionslist(
-                     &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)));
-             }
-             $r->print(&Apache::lontemplate::item_functionslist(
-                            &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)));
-         }
-         $r->print(&Apache::lontemplate::end_functionslist());
-    }
 #------Print Headtitle
      if ($target ne 'tex') {
         $r->print('<div class="LC_Box">');
@@ -301,7 +323,8 @@ sub handler {
                 &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
             }
             $syllabus{'uploaded.photourl'}=
-                &Apache::lonnet::userphotoupload('uploaddoc','aboutme');
+                &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);
@@ -330,38 +353,35 @@ sub handler {
         if ($syllabus{'uploaded.photourl'}) {
             &Apache::lonnet::allowuploaded('/adm/aboutme',$syllabus{'uploaded.photourl'});
 
-           #This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line.
-            &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
-           #---End Resize---
-
-            $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
+            $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 method="post" enctype="multipart/form-data">'.
+                '<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 method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
+                $r->print('<form name="delPhoto" method="post" action="" ><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
             }
-            $r->print('<p>');
+            $r->print('<p></p>');
         }
 
         if($allowed) {
-            $r->print('<form method="post">');
+            $r->print('<form name="lonaboutmeFields" method="post" action="" >');
         }
 
         if ($target ne 'tex') { #print Image
-            $r->print($image);
+            $r->print($image.'<div class="LC_clear_float_footer"></div>');
 
         } #End Print Image
 
@@ -389,7 +409,7 @@ sub handler {
         }
         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 ($env{'request.course.id'}
@@ -400,14 +420,13 @@ sub handler {
             &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> <p>');
+            $r->print('</span>');
             &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
-            $r->print('</p>');
             &Apache::lontemplate::print_end_template($r);
 
         } 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);
+            &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom, 'tex');
         }
     }
     if ($target ne 'tex') {
@@ -433,21 +452,19 @@ sub in_course {
         $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);
+    my $typesref;
+    if ($type eq 'all') {
+        $typesref = ['active','previous','future'];
+    } elsif ($type eq 'previous' || $type eq 'future') {
+        $typesref = [$type];
+    }
+    my %roles = &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+                                             $typesref,undef,[$cdom]);
+    my ($tmp) = keys(%roles);
+    return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+    my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles));
+    if (@course_roles > 0) {
+        return 1;
     }
     return 0;
 }
@@ -503,6 +520,8 @@ sub print_portfiles_link {
         }
         $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;
@@ -542,34 +561,47 @@ sub display_portfolio_header {
     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 $args = {'domain' => $cdom};
+    if ($env{'form.forcestudent'}) {
+        $args->{'function'} = 'student';
+    }
     my $output;
     if ($is_course) {
-        $output =
-            &Apache::loncommon::start_page('Viewable group portfolio files',undef,
-                                            {'function' => $forcestudent,
-                                             'domain'   => $cdom,});
-        $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=>&mt('Personal Information Page - [_1]',$name),
-                  title=>&mt('Go to personal information page for [_1]', $name)},
-         {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
-                  text=>&mt('Viewable files - [_1]', $name),
-                  title=>&mt('Viewable portfolio files for [_1]', $name)}
-            );
-            $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));
+        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 .= '<h3>'.&mt('Portfolio files for [_1]',$name).'</h3>';
+        $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  => '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;
@@ -599,23 +631,28 @@ sub display_portfolio_files {
         }
         $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,$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));
+        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>');
         }
-        $r->print('</a>');
     }
     return;
 }
@@ -740,9 +777,12 @@ sub parse_directory {
     my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum,
                                                                 $group);
     my $getpropath = 1;
-    my %dirlist = map {
-        ((split('&',$_,2))[0],1)
-    } &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath);
+    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 .= &Apache::loncommon::start_data_table_row();
         $output .= '<td style="padding-left: '.($depth*25).'px">';
@@ -785,7 +825,7 @@ sub parse_directory {
             $output.='</td><td>';
             if ($have_meta) {
                 $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
-                    &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
+                    &Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').
                     '" class="LC_icon" /></a>';
             }
             $output .= '</td>'
@@ -806,7 +846,7 @@ sub aboutme_access {
     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 = &coursedescription($env{'request.course.id'});
+        my %coursehash = &Apache::lonnet::coursedescription($env{'request.course.id'});
         $cdom = $coursehash{'domain'};
         $cnum = $coursehash{'cnum'};
     }