--- loncom/interface/lonindexer.pm 2010/08/13 13:32:36 1.208 +++ loncom/interface/lonindexer.pm 2025/03/18 19:36:59 1.232 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.208 2010/08/13 13:32:36 wenzelju Exp $ +# $Id: lonindexer.pm,v 1.232 2025/03/18 19:36:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,9 +34,8 @@ ## 1. Description of functions ## ## 2. Modules used by this module ## ## 3. Choices for different output views (detailed, summary, xml, etc) ## -## 4. BEGIN block (to be run once after compilation) ## -## 5. Handling routine called via Apache and mod_perl ## -## 6. Other subroutines ## +## 4. Handling routine called via Apache and mod_perl ## +## 5. Other subroutines ## ## ## ############################################################################### @@ -60,7 +59,6 @@ use LONCAPA qw(:match); # ---------------------------------------- variables used throughout the module my %hash; # global user-specific gdbm file my %dirs; # keys are directories, values are the open/close status -my %language; # has the reference information present in language.tab my %dynhash; # hash of hashes for dynamic metadata my %dynread; # hash of directories already read for dynamic metadata my %fieldnames; # Metadata fieldnames @@ -94,15 +92,9 @@ sub handler { undef (@Omit); %fieldnames=&Apache::lonmeta::fieldnames(); -# ------------------------------------- read in machine configuration variables +# --------------------------------------------------------------- get icon path my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my $domain = $r->dir_config('lonDefDomain'); - my $role = $r->dir_config('lonRole'); - my $loadlim = $r->dir_config('lonLoadLim'); - my $servadm = $r->dir_config('lonAdmEMail'); - my $sysadm = $r->dir_config('lonSysEMail'); - my $lonhost = $r->dir_config('lonHostID'); - my $tabdir = $r->dir_config('lonTabDir'); + my $defdom = &Apache::lonnet::default_login_domain(); #SB my $fileclr='#ffffe6'; my $line; @@ -120,8 +112,8 @@ sub handler { my $colspan=''; $extrafield=''; - my $diropendb = - "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db"; + my $diropendb = LONCAPA::tempdir() . + "$env{'user.domain'}_$env{'user.name'}_sel_res.db"; %hash = (); { my %dbfile; @@ -165,6 +157,8 @@ sub handler { ENDSUBM $r->print(&Apache::loncommon::start_page(undef,$js, {'only_body' =>1, + 'add_modal' => 1, + 'add_wishlist' => 1, 'add_entries' => {'onload' => "load();"},} ). @@ -390,6 +384,7 @@ function uncheckAll() { } } } + function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) { var xpos = (screen.width-w)/2; xpos = (xpos < 0) ? '0' : xpos; @@ -401,6 +396,7 @@ function openWindow(url, wdwName, w, h, var newWin = window.open(url, wdwName, options); newWin.focus(); } + function gothere(val) { window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu; } @@ -413,14 +409,14 @@ ENDHEADER if ($env{'form.catalogmode'}) { # "Popup mode" $r->print(&Apache::loncommon::start_page('Browse published resources',$js, - {'only_body' => 1, + {'only_body' => 1, 'add_wishlist'=>1, 'add_modal' =>1, 'domain' => $headerdom,})); } else { # Only display page header and breadcrumbs in non-popup mode &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({ 'text' => 'Browse published resources', - 'href' => '/res/fhwfdev/?launch=1', + 'href' => '/res/'.$headerdom.'/?launch=1', }); $r->print(&Apache::loncommon::start_page('Browse published resources',$js, {'domain' => $headerdom,}) @@ -570,7 +566,7 @@ END } else { $r->print($reshome); } - $r->print("'>".&mt('Home').''); + $r->print("'>".&mt('Home directory').''); } $r->print(''); # ------------------------------------------------------ Remember where we were @@ -588,7 +584,7 @@ END $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes") .&Apache::loncommon::start_data_table_header_row()); $r->print("
" . &mt("Directory does not exist."). "
"); + } elsif ($listerror eq 'con_lost') { + $r->print("" . &mt("Directory temporarily not accessible."). "
"); + } + return @list=&match_ext($r,@list); } @@ -864,7 +885,7 @@ sub match_ext { # ------------------------------- displays one line in appropriate table format sub display_line { - my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; + my ($r,$defdom,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; my (@pathfn, $fndir); # there could be relative paths (files actually belonging into this directory) # or absolute paths (for example, from sequences) @@ -930,6 +951,15 @@ sub display_line { # 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[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 #SB if ($absolute) { $fileclr='#ccdd99'; } @@ -964,7 +994,17 @@ $r->print ('$extrafield"); my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; @@ -982,6 +1022,9 @@ $r->print (''. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); + my $quotable_startdir = &Apache::loncommon::escape_single($startdir); + my $quotable_listname = &Apache::loncommon::escape_single($listname); + $r->print ('