version 1.96, 2004/03/29 21:18:00
|
version 1.97, 2004/03/30 02:50:27
|
Line 443 $r->print(&Apache::loncommon::bodytag('B
|
Line 443 $r->print(&Apache::loncommon::bodytag('B
|
<input type="hidden" name="acts" value="" /> |
<input type="hidden" name="acts" value="" /> |
$closebutton $groupimportbutton |
$closebutton $groupimportbutton |
END |
END |
|
# -------------- Filter out sequence containment in crumbs and "recent folders" |
|
my $storeuri=$uri; |
|
$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; |
|
$storeuri=~s/\/+/\//g; |
# ---------------------------------------------------------------- Bread crumbs |
# ---------------------------------------------------------------- Bread crumbs |
$r->print(&Apache::lonhtmlcommon::crumbs($uri,'','', |
$r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','', |
(($ENV{'form.catalogmode'} eq 'groupimport')? |
(($ENV{'form.catalogmode'} eq 'groupimport')? |
'document.forms.fileattr':'')). |
'document.forms.fileattr':'')). |
&Apache::lonhtmlcommon::select_recent('residx','resrecent', |
&Apache::lonhtmlcommon::select_recent('residx','resrecent', |
'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'). |
'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'). |
'</form>'); |
'</form>'); |
# ------------------------------------------------------ Remember where we were |
# ------------------------------------------------------ Remember where we were |
&Apache::loncommon::storeresurl($uri); |
&Apache::loncommon::storeresurl($storeuri); |
&Apache::lonhtmlcommon::store_recent('residx',$uri,$uri); |
&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); |
# ----------------- output starting row to the indexed file/directory hierarchy |
# ----------------- output starting row to the indexed file/directory hierarchy |
my $titleclr="#ddffff"; |
my $titleclr="#ddffff"; |
# $r->print(&initdebug()); |
# $r->print(&initdebug()); |
Line 610 sub scanDir {
|
Line 614 sub scanDir {
|
# --------------- get complete matched list based on the uri (returns an array) |
# --------------- get complete matched list based on the uri (returns an array) |
sub get_list { |
sub get_list { |
my ($r,$uri)=@_; |
my ($r,$uri)=@_; |
my @list; |
my @list=(); |
(my $luri = $uri) =~ s/\//_/g; |
(my $luri = $uri) =~ s/\//_/g; |
if ($ENV{'form.updatedisplay'}) { |
if ($ENV{'form.updatedisplay'}) { |
foreach (keys %hash) { |
foreach (keys %hash) { |
Line 620 sub get_list {
|
Line 624 sub get_list {
|
|
|
if ($hash{'dirlist_files_'.$luri}) { |
if ($hash{'dirlist_files_'.$luri}) { |
@list = split(/\n/,$hash{'dirlist_files_'.$luri}); |
@list = split(/\n/,$hash{'dirlist_files_'.$luri}); |
} elsif ($uri=~/\.(page|sequence)$/) { |
} elsif ($uri=~/\.(page|sequence)\/$/) { |
# is a page or a sequence |
# is a page or a sequence |
@list= &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri)); |
$uri=~s/\/$//; |
|
$uri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; |
|
$uri=~s/\/+/\//g; |
|
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) { |
|
my @ratpart=split(/\:/,$_); |
|
push @list,$ratpart[1]; |
|
} |
$hash{'dirlist_files_'.$luri} = join("\n",@list); |
$hash{'dirlist_files_'.$luri} = join("\n",@list); |
} else { |
} else { |
# is really a directory |
# is really a directory |
Line 688 sub match_ext {
|
Line 698 sub match_ext {
|
sub display_line { |
sub display_line { |
my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; |
my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; |
my (@pathfn, $fndir); |
my (@pathfn, $fndir); |
|
# there could be relative paths (files actually belonging into this directory) |
|
# or absolute paths (for example, from sequences) |
|
my $absolute; |
|
my $pathprefix; |
|
if ($line=~/^\/res\//) { |
|
$absolute=1; |
|
$pathprefix=''; |
|
} else { |
|
$absolute=0; |
|
$pathprefix=$startdir; |
|
} |
my $dirptr=16384; |
my $dirptr=16384; |
my $fileclr="#ffffe6"; |
my $fileclr="#ffffe6"; |
my $iconpath= $r->dir_config('lonIconsURL') . '/'; |
my $iconpath= $r->dir_config('lonIconsURL') . '/'; |
Line 728 sub display_line {
|
Line 749 sub display_line {
|
$r->print(&mt("Up")." $tabtag</tr></form>\n"); |
$r->print(&mt("Up")." $tabtag</tr></form>\n"); |
return OK; |
return OK; |
} |
} |
# 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',$startdir.$filecom[0])); } |
|
|
if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); } |
|
|
|
# make absolute links appear on different background |
|
if ($absolute) { $fileclr='#aaaa88'; } |
|
|
# display domain |
# display domain |
if ($filecom[1] eq 'domain') { |
if ($filecom[1] eq 'domain') { |
Line 785 sub display_line {
|
Line 810 sub display_line {
|
} |
} |
|
|
# display file |
# display file |
if ($fnptr == 0 and $filecom[3] ne '') { |
if (($fnptr == 0 and $filecom[3] ne '') or $absolute) { |
my $filelink = $startdir.$filecom[0]; |
my $filelink = $pathprefix.$filecom[0]; |
my @file_ext = split (/\./,$listname); |
my @file_ext = split (/\./,$listname); |
my $curfext = $file_ext[-1]; |
my $curfext = $file_ext[-1]; |
if (@Omit) { |
if (@Omit) { |