Diff for /loncom/interface/lonaboutme.pm between versions 1.156 and 1.160

version 1.156, 2014/01/28 16:22:30 version 1.160, 2021/01/02 21:07:36
Line 83  use Apache::lonrss(); Line 83  use Apache::lonrss();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsgdisplay();  use Apache::lonmsgdisplay();
 use Apache::lontemplate;  use Apache::lontemplate;
   use Apache::longroup;
 use HTML::Entities();  use HTML::Entities();
 use Image::Magick;  use Image::Magick;
   
Line 239  sub handler { Line 240  sub handler {
         my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);          my $start_page = &Apache::loncommon::start_page('Personal Information Page',$rss_link,$args);
         $r->print($start_page);          $r->print($start_page);
    }     }
      my ($blocked,$blocktext) =
          &Apache::loncommon::blocking_status('about',$cnum,$cdom);
      if ($blocked) {
          if ($target eq 'tex') {
              $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\');
          } else {
              $r->print($blocktext);
          }
          $r->print(&Apache::loncommon::end_page());
          return OK;
      }
   
 #----------------Print Privacy note (edit mode) or last modified date.   #----------------Print Privacy note (edit mode) or last modified date. 
   
Line 400  sub handler { Line 412  sub handler {
   
         } else {          } 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').'\\\\\\\\');              $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');              &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom,$target);
         }          }
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex') {
Line 630  sub portfolio_files { Line 642  sub portfolio_files {
     my $diroutput;      my $diroutput;
     if ($is_course) {      if ($is_course) {
         my %files_by_group;          my %files_by_group;
           my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
         foreach my $filename (sort(keys(%access_controls))) {          foreach my $filename (sort(keys(%access_controls))) {
             my ($group,$path) = split('/',$filename,2);              my ($group,$path) = split('/',$filename,2);
             $files_by_group{$group}{$path} = $access_controls{$filename};              if (exists($curr_groups{$group})) {
                   $files_by_group{$group}{$path} = $access_controls{$filename};
               }
         }          }
         foreach my $group (sort(keys(%files_by_group))) {          foreach my $group (sort(keys(%files_by_group))) {
             my %fileshash;              my %fileshash;
Line 667  sub portfolio_files { Line 682  sub portfolio_files {
 sub build_hierarchy {  sub build_hierarchy {
     my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info,      my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info,
         $allfileshash,$group) = @_;          $allfileshash,$group) = @_;
       my $clientip = &Apache::lonnet::get_requestor_ip($r);
     foreach my $filename (sort(keys(%{$access_info}))) {      foreach my $filename (sort(keys(%{$access_info}))) {
         my $access_status =          my $access_status =
            &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$$access_info{$filename});             &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group,$clientip,
                                                    $access_info->{$filename});
         if ($portaccess eq 'both') {          if ($portaccess eq 'both') {
             if (($access_status ne 'ok') &&              if (($access_status ne 'ok') &&
                 ($access_status !~  /^[^:]+:guest_/)) {                  ($access_status !~  /^[^:]+:guest_/)) {

Removed from v.1.156  
changed lines
  Added in v.1.160


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