version 1.92, 2004/02/17 02:43:40
|
version 1.107, 2004/05/11 23:27:35
|
Line 47 use strict;
|
Line 47 use strict;
|
use Apache::lonnet(); |
use Apache::lonnet(); |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
|
use Apache::lonsequence(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::lonmeta; |
use Apache::lonmeta; |
use Apache::File; |
use Apache::File; |
Line 126 sub handler {
|
Line 127 sub handler {
|
{ |
{ |
if ($ENV{'form.launch'} eq '1') { |
if ($ENV{'form.launch'} eq '1') { |
&start_fresh_session(); |
&start_fresh_session(); |
} |
} |
|
#Hijack lonindexer to verify a title and be close down. |
|
if ($ENV{'form.launch'} eq '2') { |
|
#$r->content_type('text/html'); |
|
my $verify_title = &Apache::lonnet::gettitle($ENV{'form.acts'}); |
|
$r->print(<<ENDSUBM); |
|
<html> |
|
<script type="text/javascript"> |
|
function load() { |
|
window.opener.document.forms["$ENV{'form.form'}"].elements["$ENV{'form.element'}"].value='$ENV{'form.acts'}'; |
|
window.opener.document.forms["$ENV{'form.form'}"].elements["$ENV{'form.titleelement'}"].value='$verify_title'; |
|
window.close(); |
|
} |
|
</script> |
|
<body onLoad=load();> |
|
</body> |
|
</html> |
|
ENDSUBM |
|
return OK; |
|
} |
|
|
# -------------------- refresh environment with user database values (in %hash) |
# -------------------- refresh environment with user database values (in %hash) |
&setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode' ); |
&setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode' ); |
|
|
Line 235 END
|
Line 256 END
|
$catalogmodefunctions=<<END; |
$catalogmodefunctions=<<END; |
// mode = $mode |
// mode = $mode |
function select_data(title,url) { |
function select_data(title,url) { |
changeURL(url); |
var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url; |
changeTitle(title); |
window.location=location; |
self.close(); |
|
} |
} |
|
|
function select_group() { |
function select_group() { |
window.location="$location"+document.forms.fileattr.acts.value; |
window.location="$location"+document.forms.fileattr.acts.value; |
} |
} |
Line 442 $r->print(&Apache::loncommon::bodytag('B
|
Line 461 $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>'); |
# -------------------------------------------------------- Resource Home Button |
|
my $reshome=$ENV{'course.'.$ENV{'request.course.id'}.'.reshome'}; |
|
if ($reshome) { |
|
$r->print("<font size='+2'><a href='"); |
|
if ($ENV{'form.catalogmode'} eq 'groupimport') { |
|
$r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();'); |
|
} else { |
|
$r->print($reshome); |
|
} |
|
$r->print("'>".&mt('Home').'</a></font>'); |
|
} |
|
$r->print('</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 572 sub scanDir {
|
Line 606 sub scanDir {
|
next if($strip =~ /.*\.meta$/ | $obs eq '1'); |
next if($strip =~ /.*\.meta$/ | $obs eq '1'); |
my (@fileparts) = split(/\./,$strip); |
my (@fileparts) = split(/\./,$strip); |
if ($hash{'display_attrs_9'} != 1) { |
if ($hash{'display_attrs_9'} != 1) { |
|
# if not all versions to be shown |
if (scalar(@fileparts) >= 3) { |
if (scalar(@fileparts) >= 3) { |
my $fext = pop @fileparts; |
my $fext = pop @fileparts; |
my $ov = pop @fileparts; |
my $ov = pop @fileparts; |
Line 590 sub scanDir {
|
Line 625 sub scanDir {
|
$curdir = $startdir; |
$curdir = $startdir; |
} |
} |
my $diropen = 'closed'; |
my $diropen = 'closed'; |
if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) { |
if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/) or ($compuri=~/\.(sequence|page)\/$/)) { |
while (my ($key,$val)= each %dupdirs) { |
while (my ($key,$val)= each %dupdirs) { |
if ($key eq $compuri and $val eq "open") { |
if ($key eq $compuri and $val eq "open") { |
$diropen = "opened"; |
$diropen = "opened"; |
Line 608 sub scanDir {
|
Line 643 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 618 sub get_list {
|
Line 653 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)\/$/) { |
|
# is a page or a sequence |
|
$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); |
} else { |
} else { |
|
# is really a directory |
@list = &Apache::lonnet::dirlist($uri); |
@list = &Apache::lonnet::dirlist($uri); |
$hash{'dirlist_files_'.$luri} = join("\n",@list); |
$hash{'dirlist_files_'.$luri} = join("\n",@list); |
} |
} |
Line 664 sub match_ext {
|
Line 710 sub match_ext {
|
next if ($unpackline[0] eq '..'); |
next if ($unpackline[0] eq '..'); |
my @filecom = split (/\./,$unpackline[0]); |
my @filecom = split (/\./,$unpackline[0]); |
my $fext = pop(@filecom); |
my $fext = pop(@filecom); |
my $fnptr = $unpackline[3]&$dirptr; |
my $fnptr = ($unpackline[3]&$dirptr) || ($fext=~/\.(page|sequence)$/); |
if ($fnptr == 0 and $unpackline[3] ne "") { |
if ($fnptr == 0 and $unpackline[3] ne "") { |
my $embstyle = &Apache::loncommon::fileembstyle($fext); |
my $embstyle = &Apache::loncommon::fileembstyle($fext); |
push @trimlist,$line if (defined($embstyle) && |
push @trimlist,$line if (defined($embstyle) && |
Line 681 sub match_ext {
|
Line 727 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=~m|^/res/| && $startdir ne '') { |
|
$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 704 sub display_line {
|
Line 761 sub display_line {
|
|
|
# display uplink arrow |
# display uplink arrow |
if ($filecom[1] eq 'viewOneUp') { |
if ($filecom[1] eq 'viewOneUp') { |
|
my $updir=$startdir; |
|
# -------------- Filter out sequence containment in crumbs and "recent folders" |
|
$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1]; |
|
$updir=~s/\/+/\//g; |
|
|
$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield"); |
$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield"); |
$r->print("<td>\n"); |
$r->print("<td>\n"); |
$r->print ('<form method="post" name="dirpathUP" action="'.$startdir. |
$r->print ('<form method="post" name="dirpathUP" action="'.$updir. |
'/" '. |
'/" '. |
'onSubmit="return rep_dirpath(\'UP\','. |
'onSubmit="return rep_dirpath(\'UP\','. |
'document.forms.fileattr.acts.value)" '. |
'document.forms.fileattr.acts.value)" '. |
Line 721 sub display_line {
|
Line 783 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 778 sub display_line {
|
Line 844 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) { |
Line 793 sub display_line {
|
Line 859 sub display_line {
|
# Set the icon for the file |
# Set the icon for the file |
my $iconname = &Apache::loncommon::icon($listname); |
my $iconname = &Apache::loncommon::icon($listname); |
$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>"); |
$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>"); |
my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; |
|
|
my $metafile = $Apache::lonnet::perlvar{'lonDocRoot'}.$pathprefix. |
|
$filecom[0].'.meta'; |
|
if (-e $metafile) { |
|
$metafile=1; |
|
} else { |
|
$metafile=0; |
|
} |
my $title; |
my $title; |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
if ($ENV{'form.catalogmode'} eq 'interactive') { |
$title=$listname; |
$title=$listname; |
$title = &Apache::lonnet::metadata($filelink,'title') |
$title = &Apache::lonnet::metadata($filelink,'title') |
if ($metafile == 1); |
if ($metafile == 1); |
$title=$listname unless $title; |
$title=$listname unless $title; |
my $titleesc=HTML::Entities::encode($title); |
my $titleesc=HTML::Entities::encode($title,'<>&"'); |
$titleesc=~s/\'/\\'/; #' (clean up this spare quote) |
$titleesc=~s/\'/\\'/; #' (clean up this spare quote) |
$r->print("<a href=\"javascript:select_data(\'", |
$r->print("<a href=\"javascript:select_data(\'", |
$titleesc,"','",$filelink,"')\">"); |
$titleesc,"','",$filelink,"')\">"); |
$r->print("<img src='",$iconpath,"select.gif' border='0' /></a>". |
$r->print("<img src='",$iconpath,"select.gif' border='0' /></a>". |
"\n"); |
"\n"); |
$r->print("</td><td nowrap>"); |
$r->print("</td><td nowrap>"); |
} |
} elsif ($ENV{'form.catalogmode'} eq 'groupimport') { |
elsif ($ENV{'form.catalogmode'} eq 'groupimport') { |
|
$title=$listname; |
$title=$listname; |
#$title = &Apache::lonnet::metadata($filelink,'title') |
$title = &Apache::lonnet::metadata($filelink,'title') |
#if ($metafile == 1); |
if ($metafile == 1); |
$title=$listname unless $title; |
$title=$listname unless $title; |
my $titleesc=&HTML::Entities::encode($title); |
my $titleesc=&HTML::Entities::encode($title,'<>&"'); |
$r->print("<form name='form$fnum'>\n"); |
$r->print("<form name='form$fnum'>\n"); |
$r->print("<input type='checkbox' name='filelink"."' ". |
$r->print("<input type='checkbox' name='filelink"."' ". |
"value='$filelink' onClick='". |
"value='$filelink' onClick='". |
Line 830 sub display_line {
|
Line 902 sub display_line {
|
$hash{"pre_${fnum}_title"}=$titleesc; |
$hash{"pre_${fnum}_title"}=$titleesc; |
$fnum++; |
$fnum++; |
} |
} |
|
# Form to open or close sequences |
|
if ($filelink=~/\.(page|sequence)$/) { |
|
my $curdir = $startdir.$filecom[0].'/'; |
|
my $anchor = $curdir; |
|
$anchor =~ s/\///g; |
|
&begin_form($r,$curdir); |
|
$indent--; |
|
} |
|
# General indentation |
if ($indent > 0 and $indent < 11) { |
if ($indent > 0 and $indent < 11) { |
$r->print("<img src=",$iconpath,"whitespace",$indent, |
$r->print("<img src=",$iconpath,"whitespace",$indent, |
".gif border='0' />\n"); |
".gif border='0' />\n"); |
Line 846 sub display_line {
|
Line 926 sub display_line {
|
$r->print("<img src=",$iconpath,"whitespace",$rem, |
$r->print("<img src=",$iconpath,"whitespace",$rem, |
".gif border='0' />\n") if $rem > 0; |
".gif border='0' />\n") if $rem > 0; |
} |
} |
|
# Sequence open/close icon |
|
if ($filelink=~/\.(page|sequence)$/) { |
|
my $curdir = $startdir.$filecom[0].'/'; |
|
my $anchor = $curdir; |
|
$anchor =~ s/\///g; |
|
$r->print ('<input type="hidden" name="acts" value="">'); |
|
$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath. |
|
'folder_pointer_'.$diropen.'.gif"'); |
|
$r->print (' name="'.$msg.'" height="22" type="image" border="0">'. |
|
"\n"); |
|
} |
|
# Filetype icons |
$r->print("<img src='$iconname' border='0' />\n"); |
$r->print("<img src='$iconname' border='0' />\n"); |
|
# Close form to open/close sequence |
|
if ($filelink=~/\.(page|sequence)$/) { |
|
$r->print('</form>'); |
|
} |
$r->print (" <a href=\"javascript:openWindow('".$filelink. |
$r->print (" <a href=\"javascript:openWindow('".$filelink. |
"', 'previewfile', '450', '500', 'no', 'yes','yes')\";". |
"', 'previewfile', '450', '500', 'no', 'yes','yes')\";". |
" TARGET=_self>$listname</a> "); |
" TARGET=_self>$listname</a> "); |
|
|
$r->print (" (<a href=\"javascript:openWindow('".$filelink. |
$r->print (" (<a href=\"javascript:openWindow('".$filelink. |
".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ". |
".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ". |
"TARGET=_self>metadata</a>) ") if ($metafile == 1); |
"TARGET=_self>metadata</a>) "); |
|
|
$r->print("</td>\n"); |
$r->print("</td>\n"); |
if ($hash{'display_attrs_0'} == 1) { |
if ($hash{'display_attrs_0'} == 1) { |
my $title = &Apache::lonnet::gettitle($filelink,'title') |
my $title = &Apache::lonnet::gettitle($filelink,'title'); |
if ($metafile == 1); |
|
$r->print('<td> '.($title eq '' ? ' ' : $title). |
$r->print('<td> '.($title eq '' ? ' ' : $title). |
' </td>'."\n"); |
' </td>'."\n"); |
} |
} |
Line 874 sub display_line {
|
Line 967 sub display_line {
|
if $hash{'display_attrs_3'} == 1; |
if $hash{'display_attrs_3'} == 1; |
|
|
if ($hash{'display_attrs_4'} == 1) { |
if ($hash{'display_attrs_4'} == 1) { |
my $author = &Apache::lonnet::metadata($filelink,'author') |
my $author = &Apache::lonnet::metadata($filelink,'author'); |
if ($metafile == 1); |
|
$r->print('<td> '.($author eq '' ? ' ' : $author). |
$r->print('<td> '.($author eq '' ? ' ' : $author). |
" </td>\n"); |
" </td>\n"); |
} |
} |
if ($hash{'display_attrs_5'} == 1) { |
if ($hash{'display_attrs_5'} == 1) { |
my $keywords = &Apache::lonnet::metadata($filelink,'keywords') |
my $keywords = &Apache::lonnet::metadata($filelink,'keywords'); |
if ($metafile == 1); |
|
# $keywords = ' ' if (!$keywords); |
# $keywords = ' ' if (!$keywords); |
$r->print('<td> '.($keywords eq '' ? ' ' : $keywords). |
$r->print('<td> '.($keywords eq '' ? ' ' : $keywords). |
" </td>\n"); |
" </td>\n"); |
} |
} |
if ($hash{'display_attrs_6'} == 1) { |
if ($hash{'display_attrs_6'} == 1) { |
my $lang = &Apache::lonnet::metadata($filelink,'language') |
my $lang = &Apache::lonnet::metadata($filelink,'language'); |
if ($metafile == 1); |
|
$lang = &Apache::loncommon::languagedescription($lang); |
$lang = &Apache::loncommon::languagedescription($lang); |
$r->print('<td> '.($lang eq '' ? ' ' : $lang). |
$r->print('<td> '.($lang eq '' ? ' ' : $lang). |
" </td>\n"); |
" </td>\n"); |
Line 922 sub display_line {
|
Line 1012 sub display_line {
|
" </td>\n"); |
" </td>\n"); |
} |
} |
if ($hash{'display_attrs_8'} == 1) { |
if ($hash{'display_attrs_8'} == 1) { |
my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1); |
my (%stat) = &Apache::lonmeta::dynamicmeta($filelink); |
my $stat = (exists($stat{'course'}) ? $stat{'course'} : ''). |
my $stat = (exists($stat{'course'}) ? $stat{'course'} : ''). |
((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : ''). |
((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : ''). |
(exists($stat{'count'}) ? $stat{'count'} : ''); |
(exists($stat{'count'}) ? $stat{'count'} : ''); |