--- loncom/interface/lonaboutme.pm	2006/10/23 18:48:46	1.57
+++ loncom/interface/lonaboutme.pm	2007/07/27 00:17:17	1.65
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.57 2006/10/23 18:48:46 albertel Exp $
+# $Id: lonaboutme.pm,v 1.65 2007/07/27 00:17:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,7 @@ sub handler {
 					      'No user information available');
         return OK;
     } else {
-        $is_course = &check_for_course($cdom,$cnum);
+        $is_course = &Apache::lonnet::is_course($cdom,$cnum);
     }
 
 # --------------------------------------------------------- The syllabus fields
@@ -74,7 +74,13 @@ sub handler {
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
-        &display_portfolio_files($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;
     }
@@ -108,8 +114,9 @@ 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,
 					    'force_register' =>
@@ -125,10 +132,10 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.$Apache::lonnet::domaindescription{$cdom}.'</h3>'.
+	$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));
     } 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;
@@ -230,7 +237,7 @@ sub handler {
                  $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').'" />');
 	      }
 	  }
        }
@@ -246,32 +253,32 @@ sub handler {
         &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());
@@ -281,6 +288,33 @@ 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,$is_course) = @_;
     my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
@@ -294,7 +328,8 @@ sub aboutme_info {
 sub print_portfiles_link {
     my ($r,$is_course) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
-    my $filecounts = &portfolio_files($r,'showlink',undef,$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(
@@ -426,7 +461,8 @@ sub display_portfolio_files {
                &mt('Update display').'" />';
     $output .= '</form><br /><br />';
     $r->print($output);
-    my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course);
+    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.
@@ -442,8 +478,7 @@ sub display_portfolio_files {
 }
 
 sub portfolio_files {
-    my ($r,$mode,$lt,$is_course) = @_;
-    my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
+    my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_;
     my $filecounts = {
                        withpass    => 0,
                        withoutpass => 0,
@@ -629,15 +664,5 @@ sub parse_directory {
     return $output;
 }
 
-sub check_for_course {
-    my ($cdom,$cnum) = @_;
-    my %courses = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,
-                                                undef,'.');
-    if (exists($courses{$cdom.'_'.$cnum})) {
-        return 1;
-    }
-    return 0;
-}
-
 1;
 __END__