[BACK]Return to lonindexer.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonindexer.pm between versions 1.226 and 1.227

version 1.226, 2017/05/22 19:18:40 version 1.227, 2017/08/09 20:36:39
Line 94  sub handler { Line 94  sub handler {
   
 # --------------------------------------------------------------- get icon path  # --------------------------------------------------------------- get icon path
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
       my $defdom = &Apache::lonnet::default_login_domain();
   
 #SB my $fileclr='#ffffe6';  #SB my $fileclr='#ffffe6';
     my $line;      my $line;
Line 664  END Line 665  END
     pop @uri_com;      pop @uri_com;
     my $upone = join('/',@uri_com);      my $upone = join('/',@uri_com);
     my @list = qw (0);      my @list = qw (0);
     &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list);      &display_line ($r,$defdom,'opened',$upone.'&viewOneUp',0,$upone,@list);
     $indent = 1;      $indent = 1;
  }   }
   
 # -------- recursively go through all the directories and output as appropriate  # -------- recursively go through all the directories and output as appropriate
  &scanDir ($r,$toplevel,$indent,\%hash);   &scanDir ($r,$toplevel,$indent,\%hash,$defdom);
   
 # -------------------------------------------------------------- end the tables  # -------------------------------------------------------------- end the tables
         $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
Line 697  END Line 698  END
   
 # ----------------------------------------------- recursive scan of a directory  # ----------------------------------------------- recursive scan of a directory
 sub scanDir {  sub scanDir {
     my ($r,$startdir,$indent,$hashref)=@_;      my ($r,$startdir,$indent,$hashref,$defdom)=@_;
     my $c = $r->connection();      my $c = $r->connection();
     my ($compuri,$curdir);      my ($compuri,$curdir);
     my $dirptr=16384;      my $dirptr=16384;
Line 753  sub scanDir { Line 754  sub scanDir {
  }   }
     }      }
  }   }
  &display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list);   &display_line($r,$defdom,$diropen,$line,$indent,$curdir,$hashref,@list);
  &scanDir ($r,$compuri,$indent) if $diropen eq 'opened';   &scanDir ($r,$compuri,$indent,undef,$defdom) if $diropen eq 'opened';
     }      }
     $indent--;      $indent--;
 }  }
Line 884  sub match_ext { Line 885  sub match_ext {
   
 # ------------------------------- displays one line in appropriate table format  # ------------------------------- displays one line in appropriate table format
 sub display_line {  sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;      my ($r,$defdom,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     my (@pathfn, $fndir);      my (@pathfn, $fndir);
 # there could be relative paths (files actually belonging into this directory)  # there could be relative paths (files actually belonging into this directory)
 # or absolute paths (for example, from sequences)  # or absolute paths (for example, from sequences)
Line 950  sub display_line { Line 951  sub display_line {
 # Do we have permission to look at this?  # Do we have permission to look at this?
     if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); }      if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); }
   
       if (($filecom[1] eq 'domain') && ($defdom ne $listname)) {
           unless (&Apache::lonnet::will_trust('shared',$listname,$defdom)) {
               return OK;   
           }
           unless (&Apache::lonnet::will_trust('content',$defdom,$listname)) {
               return OK;
           }
       }
   
 # make absolute links appear on different background  # make absolute links appear on different background
 #SB    if ($absolute) { $fileclr='#ccdd99'; }  #SB    if ($absolute) { $fileclr='#ccdd99'; }
   
Line 984  $r->print ('<input type="hidden" name="a Line 994  $r->print ('<input type="hidden" name="a
   
 # display user directory  # display user directory
     }      }
   
     if ($filecom[1] eq 'user') {      if ($filecom[1] eq 'user') {
           my $domain=(split(m|/|,$startdir))[2];
           if ($defdom ne $domain) {
               unless (&Apache::lonnet::will_trust('shared',$domain,$defdom)) {
                   return OK;
               }
               unless (&Apache::lonnet::will_trust('content',$defdom,$domain)) {
                   return OK;
               }
           }
  # $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");   # $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");
  my $curdir = $startdir.$filecom[0].'/';   my $curdir = $startdir.$filecom[0].'/';
  my $anchor = $curdir;   my $anchor = $curdir;
Removed from v.1.226  
changed lines
  Added in v.1.227

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