Diff for /loncom/interface/lonaboutme.pm between versions 1.62 and 1.67

version 1.62, 2007/05/02 01:33:48 version 1.67, 2008/01/16 12:24:01
Line 114  sub handler { Line 114  sub handler {
 # --------------------------------------- There is such a user, get environment  # --------------------------------------- There is such a user, get environment
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);      my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     if ($target ne 'tex') {      if ($target ne 'tex') {
    my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page("Personal Information",undef,      &Apache::loncommon::start_page("Personal Information", $rss_link,
    {'function'       => $forcestudent,     {'function'       => $forcestudent,
      'domain'         => $cdom,       'domain'         => $cdom,
     'force_register' =>      'force_register' =>
Line 132  sub handler { Line 133  sub handler {
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</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));    '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
     } else {      } else {
  $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');   $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }      }
Line 150  sub handler { Line 151  sub handler {
    $r->print('<p><b>'.&mt('Privacy Note').':</b> '.     $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.').       &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>'.       '</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>');       &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
        } elsif ($privleged && $target ne 'tex') {         } elsif ($privleged && $target ne 'tex') {
            my $query_string = &build_query_string({'forceedit' => '1',});             my $query_string = &build_query_string({'forceedit' => '1',});
Line 206  sub handler { Line 207  sub handler {
        if ($allowed) {         if ($allowed) {
            $r->print(             $r->print(
  '<form method="post">   '<form method="post">
                <input type="submit" name="delupl" value="Delete Photo" />                 <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />
           </form>'.            </form>'.
  '<form method="post" enctype="multipart/form-data">'.   '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.           '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50">'.           '<input type="file" name="uploaddoc" size="50">'.
          '<input type="submit" name="storeupl" value="Upload">'.           '<input type="submit" name="storeupl" value="'.&mt('Upload').'">'.
  '</form><form method="post">');   '</form><form method="post">');
   
        }         }
Line 252  sub handler { Line 253  sub handler {
         &print_portfiles_link($r,$is_course);          &print_portfiles_link($r,$is_course);
     }      }
   
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}
  if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {   && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
     if ($target ne 'tex') {   && &in_course($cdom,$cnum)) {
  $r->print('<a name="coursecomment" />');   if ($target ne 'tex') {
  $r->print('<hr /><h3>'.      $r->print('<a name="coursecomment" />');
                           &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.      $r->print('<hr /><h3>'.
                           &mt('Shared by course faculty and staff').        &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.
                           &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").        &mt('Shared by course faculty and staff').
 '<br />');        &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
                 &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);        '<br />');
                 $r->print('<hr />');      &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
                 if (&Apache::lonnet::allowed('vsa',      $r->print('<hr />');
                                              $env{'request.course.id'}) ||      if (&Apache::lonnet::allowed('vsa',
                     &Apache::lonnet::allowed('vsa',   $env{'request.course.id'}) ||
                                              $env{'request.course.id'}.'/'.   &Apache::lonnet::allowed('vsa',
                                              $env{'request.course.sec'})) {   $env{'request.course.id'}.'/'.
                     $r->print(&Apache::loncommon::track_student_link   $env{'request.course.sec'})) {
                               ('View recent activity by this student',   $r->print(&Apache::loncommon::track_student_link
                                $cnum,$cdom).('&nbsp;'x2));    ('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);  
     }      }
         }      $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') {      if ($target ne 'tex') {
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());
Line 287  sub handler { Line 288  sub handler {
     return OK;      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 {  sub aboutme_info {
     my ($r,$is_course) = @_;      my ($r,$is_course) = @_;
     my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);      my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
Line 300  sub aboutme_info { Line 328  sub aboutme_info {
 sub print_portfiles_link {  sub print_portfiles_link {
     my ($r,$is_course) = @_;      my ($r,$is_course) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($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 $query_string = &build_query_string();
     my $output;      my $output;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
Line 432  sub display_portfolio_files { Line 461  sub display_portfolio_files {
                &mt('Update display').'" />';                 &mt('Update display').'" />';
     $output .= '</form><br /><br />';      $output .= '</form><br /><br />';
     $r->print($output);      $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')) {      if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
         my $query_string = &build_query_string();          my $query_string = &build_query_string();
         $r->print('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.          $r->print('<br /><br /><a href="/adm/'.$cdom.'/'.$cnum.
Line 448  sub display_portfolio_files { Line 478  sub display_portfolio_files {
 }  }
   
 sub portfolio_files {  sub portfolio_files {
     my ($r,$mode,$lt,$is_course) = @_;      my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);  
     my $filecounts = {      my $filecounts = {
                        withpass    => 0,                         withpass    => 0,
                        withoutpass => 0,                         withoutpass => 0,

Removed from v.1.62  
changed lines
  Added in v.1.67


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>