--- loncom/interface/lonaboutme.pm	2007/07/27 00:17:17	1.65
+++ loncom/interface/lonaboutme.pm	2010/11/01 13:35:42	1.70.4.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.65 2007/07/27 00:17:17 albertel Exp $
+# $Id: lonaboutme.pm,v 1.70.4.4 2010/11/01 13:35:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,52 @@
 # http://www.lon-capa.org/
 #
 
+=pod
+
+=head1 NAME
+
+Apache::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 in_course()
+
+=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;
@@ -60,42 +106,77 @@ sub handler {
         $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 home page available').'}}\\\\\\\\');
+                } else {
+                    $r->print(&Apache::loncommon::start_page("Personal Information Page"));
+                    $r->print('<h2>'.&mt('No personal information page available') .'</h2>'.
+                              &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']);
+					     'register','popup']);
 
 # ----------------------------------------------- Available Portfolio file display 
     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);
+        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 {
-            $r->print($blocktext);
+            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;
         }
-        $r->print(&Apache::loncommon::end_page());
-        return OK;
     }
 
     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'},});
+                      'force_register' => $env{'forceregister'},
+                      'bread_crumbs' => $brcrum});
             $r->print($start_page);
-            $r->print('<h2>'.&mt('Group files').'</h2>');
+            $r->print('<h2>'.&mt('Group Portfolio').'</h2>');
             &print_portfiles_link($r,$is_course);
             $r->print(&Apache::loncommon::end_page());
         }
@@ -115,12 +196,16 @@ sub handler {
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     if ($target ne 'tex') {
 	my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+        my $args = {'function' => $forcestudent,
+                    'domain'   => $cdom,
+                    'force_register' => $forceregister};
+        if ($env{'form.popup'}) {
+            $args->{'no_nav_bar'} = 1;
+        } else {
+	    $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];
+        }
 	my $start_page = 
-	    &Apache::loncommon::start_page("Personal Information", $rss_link,
-					   {'function'       => $forcestudent,
- 					    'domain'         => $cdom,
-					    'force_register' =>
-						            $forceregister,});
+	    &Apache::loncommon::start_page("Personal Information Page",$rss_link,$args);
 	$r->print($start_page);
 	$r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
     } else {
@@ -133,7 +218,7 @@ sub handler {
     }
     if ($target ne 'tex') {
 	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+		  '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -147,14 +232,14 @@ sub handler {
        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> '.
+           my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
+	   $r->print('<p 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.').
 		     '</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',&mt('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',});
+           my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
 	   $r->print('<p><a href="'.$r->uri.$query_string.'"><font size="+1">'.
 		     &mt('Edit').'</font></a></p>');
        }
@@ -207,12 +292,13 @@ 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="file" name="uploaddoc" size="50" />'.
+         '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+         '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
 	 '</form><form method="post">');
 
        }
@@ -242,6 +328,10 @@ sub handler {
 	  }
        }
        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('\\\\');}
@@ -259,10 +349,10 @@ sub handler {
 	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('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3><span class="LC_info">'.
 		      &mt('Shared by course faculty and staff').
 		      &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
-		      '<br />');
+		      '</span><br />');
 	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
 	    $r->print('<hr />');
 	    if (&Apache::lonnet::allowed('vsa',
@@ -274,13 +364,23 @@ sub handler {
 			  ('View recent activity by this student',
 			   $cnum,$cdom).('&nbsp;'x2));
 	    }
-	    $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+	    $r->print(&Apache::loncommon::noteswrapper(&mt('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') {
+        if ($env{'request.course.id'}) {
+            if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) || 
+                &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.
+                                         $env{'request.course.sec'})) {
+                $r->print('<hr />'.&Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom));
+            }
+        }
+        if ($env{'form.popup'}) {
+            $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
+        }
 	$r->print(&Apache::loncommon::end_page());
     } else {
 	$r->print('\end{document}');
@@ -296,21 +396,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;
 }
@@ -333,10 +431,10 @@ sub print_portfiles_link {
     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',
-             );                     
+        vpfi => 'Viewable portfolio files',
+        vgpf => 'Viewable group portfolio files',
+        difl => 'Display file listing',
+    );                     
     if ($filecounts->{'both'} > 0) {
         $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
@@ -419,11 +517,11 @@ sub display_portfolio_header {
                                              '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"}
+                ({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.'));
         }
@@ -436,10 +534,11 @@ sub display_portfolio_header {
 sub display_portfolio_files {
     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 %lt = &Apache::lonlocal::texthash(
+         withoutpass => 'passphrase not required',
+	 withpass    => 'passphrase protected',
+	 both        => 'all access types ',
+    );
 
     my $portaccess = 'withoutpass';
     if (exists($env{'form.portaccess'})) {
@@ -610,9 +709,10 @@ 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($path,$cdom,$cnum,$portfolio_root);
+	} &Apache::lonnet::dirlist($portfolio_root.$path,$cdom,$cnum,$getpropath);
     foreach my $item (sort(keys(%{$currhash}))) {
         $output .= &portfolio_row_start();
         $output .= '<td style="padding-left: '.($depth*25).'px">';
@@ -654,7 +754,7 @@ sub parse_directory {
 		'&nbsp;'.$showname.'</a>';
 	    $output.='</td><td>';
 	    if ($have_meta) {
-		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.
+		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
 		&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
 		'" class="LC_icon" /></a>';
 	    }
@@ -664,5 +764,29 @@ sub parse_directory {
     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 (&in_course($uname,$udom,$cnum,$cdom)) {
+            return 1;
+        }
+    }
+    return;
+}
+
 1;
 __END__