--- loncom/publisher/lonpubdir.pm 2005/07/12 14:56:36 1.85
+++ loncom/publisher/lonpubdir.pm 2011/10/21 22:33:14 1.129
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.85 2005/07/12 14:56:36 albertel Exp $
+# $Id: lonpubdir.pm,v 1.129 2011/10/21 22:33:14 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,82 +36,61 @@ use Apache::Constants qw(:common :http :
use Apache::loncacc;
use Apache::loncommon();
use Apache::lonhtmlcommon();
+use Apache::londiff();
use Apache::lonlocal;
use Apache::lonmsg;
use Apache::lonmenu;
use Apache::lonnet;
+use LONCAPA;
sub handler {
my $r=shift;
- my $fn;
-
-
-
- $fn = getEffectiveUrl($r);
-
# Validate access to the construction space and get username@domain.
my $uname;
my $udom;
- ($uname,$udom)=
- &Apache::loncacc::constructaccess(
- $fn,$r->dir_config('lonDefDomain'));
+ ($uname,$udom)=&Apache::loncacc::constructaccess($r->uri);
unless (($uname) && ($udom)) {
- $r->log_reason($uname.' at '.$udom.
- ' trying to list directory '.$env{'form.filename'}.
- ' ('.$fn.') - not authorized',
- $r->filename);
return HTTP_NOT_ACCEPTABLE;
}
- # Remove trailing / from directory name.
+# ----------------------------------------------------------- Start page output
+ my $fn=$r->filename;
$fn=~s/\/$//;
- unless ($fn) {
- $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
- ' trying to list empty directory', $r->filename);
- return HTTP_NOT_FOUND;
- }
-
-# ----------------------------------------------------------- Start page output
-
my $thisdisfn=$fn;
- $thisdisfn=~s/^\/home\/$uname\/public_html//; # subdirectory part of
- # construction space.
my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root.
+ $thisdisfn=~s/^\Q$docroot\E\/priv//;
- my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn; # Resource directory
- my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
- my $linkdir='/priv/'.$uname.$thisdisfn; # Full URL name of constr space.
+ my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
+ my $targetdir='/res'.$thisdisfn; # Publication target directory.
+ my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space.
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
&startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
- if ($env{'environment.remote'} eq 'off') {
- &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
+ &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
# browse/upload + new file page.
- } else {
- &pubbuttons($r,$uname,$thisdisfn);
- }
&resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
my $numdir = 0;
my $numres = 0;
# Start off the directory table.
- $r->print('<h3>Directory Contents:</h3>');
- $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.
- '<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Name').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.
- '<th bgcolor="#DDDDDD">'.&mt('Last Modified').
- '</th></tr>'."\n");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Type').'</th>'
+ .'<th>'.&mt('Actions').'</th>'
+ .'<th>'.&mt('Name').'</th>'
+ .'<th>'.&mt('Title').'</th>'
+ .'<th colspan="2">'.&mt('Status').'</th>'
+ .'<th>'.&mt('Last Modified').'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ );
my $filename;
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
@@ -127,9 +106,9 @@ sub handler {
my $extension='';
if ($filename=~/\.(\w+)$/) { $extension=$1; }
if ($cmode&$dirptr) {
- putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
+ &putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
} elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
- putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+ &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
$targetdir, $linkdir, $cmtime,\%bombs,\$numres);
} else {
# "hidden" extension and not a directory, so hide it away.
@@ -137,44 +116,12 @@ sub handler {
}
closedir(DIR);
- $r->print('</table></body></html>');
+ $r->print(&Apache::loncommon::end_data_table()
+ .&Apache::loncommon::end_page()
+ );
return OK;
}
-#
-# Gets the effective URL of the request and returns it:
-# $effn = getEffectiveUrl($r);
-# $r - The Apache Request object.
-sub getEffectiveUrl {
- my $r = shift;
- my $fn;
-
- if ($env{'form.filename'}) { # If a form filename is defined.
- $fn=$env{'form.filename'};
- #
- # Replace the ~username of the URL with /home/username/public_html
- # so that we don't have to worry about ~ expansion internally.
- #
- $fn=~s/^http\:\/\/[^\/]+\///;
- $fn=~s/^\///;
- $fn=~s/\~(\w+)/\/home\/$1\/public_html/;
-
- # Remove trailing / strings (?)
-
- $fn=~s/\/[^\/]+$//;
- } else {
- # If no form is defined, use request filename.
- $fn = $r->filename();
- my $lonDocRoot=$r->dir_config('lonDocRoot');
- if ( $fn =~ /$lonDocRoot/ ) {
- #internal authentication, needs fixup.
- $fn = $r->uri(); # non users do not get the full path request
- # through SCRIPT_FILENAME
- $fn=~s|^/~(\w+)|/home/$1/public_html|;
- }
- }
- $fn=~s/\/+/\//g;
- return $fn;
-}
+
#
# Output the header of the page. This includes:
# - The HTML header
@@ -188,36 +135,36 @@ sub getEffectiveUrl {
sub startpage {
my ($r, $uname, $udom, $thisdisfn) = @_;
- my $currdir = '/priv/'.$uname.$thisdisfn;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');
- my $pagetitle;
my $formaction='/priv/'.$uname.$thisdisfn.'/';
- $formaction=~s/\/+/\//g;
- $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
- '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font> '.
- '<form name="dirs" method="post" action="'.$formaction.
- '" target="_parent"><tt><b>'.
- &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
- &Apache::lonhtmlcommon::select_recent('construct','recent',
- 'this.form.action=this.form.recent.value;this.form.submit()').
- '</form>';
+ $formaction=~s|/+|/|g;
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
- if ($env{'environment.remote'} eq 'off') {
- $env{'request.noversionuri'}=$currdir.'/';
- $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
- } else {
- $r->print($pagetitle);
- }
+
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Construction Space',
+ 'href' => &Apache::loncommon::authorspace(),
+ });
+ # breadcrumbs (and tools) will be created
+ # in start_page->bodytag->innerregister
+
+ $env{'request.noversionuri'}='/priv/'.$udom.'/'.$uname.$thisdisfn.'/';
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef));
+
+ $r->print(&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader(1)));
+
+ my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
+ my $doctitle = 'LON-CAPA '.&mt('Construction Space');
+ my $newname = &mt('New Name');
my $pubdirscript=(<<ENDPUBDIRSCRIPT);
<script type="text/javascript">
-top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
+top.document.title = '$esc_thisdisfn/ - $doctitle';
// Store directory location for menu bar to find
-parent.lastknownpriv='/~$uname$thisdisfn/';
+parent.lastknownpriv='/priv/$udom/$uname$esc_thisdisfn/';
// Confirmation dialogues
@@ -226,13 +173,18 @@ parent.lastknownpriv='/~$uname$thisdisfn
document.publishdir.filename.value = theform.filename.value;
document.publishdir.submit();
}
- if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editmeta') {
top.location=theform.filename.value+'default.meta'
}
if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
document.printdir.postdata.value=theform.filename.value
document.printdir.submit();
}
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
}
function checkUpload(theform) {
@@ -251,7 +203,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
theform.submit();
}
- if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "editmeta") {
top.location=theform.filename.value+'default.meta'
}
if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
@@ -259,6 +211,11 @@ parent.lastknownpriv='/~$uname$thisdisfn
theform.postdata.value = theform.filename.value
theform.submit()
}
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
return
}
function SetResChoice(theform) {
@@ -297,8 +254,9 @@ parent.lastknownpriv='/~$uname$thisdisfn
return
}
function changename(theform,activity) {
- var newname=prompt('New Name');
- if (newname == "" || !newname) {
+ var oldname=theform.dispfilename.value;
+ var newname=prompt('$newname',oldname);
+ if (newname == "" || !newname || newname == oldname) {
return
}
document.moveresource.newfilename.value = newname
@@ -309,12 +267,6 @@ parent.lastknownpriv='/~$uname$thisdisfn
</script>
ENDPUBDIRSCRIPT
$r->print($pubdirscript);
-
- if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
- $env{'environment.remote'} ne 'off') {
- $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
- '</h3>');
- }
}
sub dircontrols {
@@ -325,12 +277,12 @@ sub dircontrols {
mcdi => 'Must create new subdirectory inside a directory',
pubr => 'Publish this Resource',
pubd => 'Publish this Directory',
+ dedr => 'Delete Directory',
rtrv => 'Retrieve Old Version',
- pubs => 'Publish with Subdirectories',
list => 'List Directory',
uplo => 'Upload file',
dele => 'Delete',
- edit => 'Edit Catalog Information',
+ edit => 'Edit Metadata',
sela => 'Select Action',
nfil => 'New file',
nhtm => 'New HTML file',
@@ -340,85 +292,93 @@ sub dircontrols {
ncrf => 'New custom rights file',
nsty => 'New style file',
nlib => 'New library file',
+ nbt => 'New bridgetask file',
nsub => 'New subdirectory',
renm => 'Rename current file to',
move => 'Move current file to',
copy => 'Copy current file to',
type => 'Type Name Here',
- go => 'Go',
+ go => 'Go',
prnt => 'Print contents of directory',
crea => 'Create a new directory or LON-CAPA document',
acti => 'Actions for current directory',
- updc => 'Upload a new document'
+ updc => 'Upload a new document',
+ pick => 'Please select an action to perform using the new filename',
);
+ my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
$r->print(<<END);
- <table cellspacing="4" cellpadding="4" width="100%">
- <tr>
- <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'acti'}</b></font></td>
- <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'updc'}</b></font></td>
- <td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'crea'}</b></font></td>
- </tr>
- <tr>
- <td bgcolor="#ccddaa" valign="top" align="center">
- <form name="curractions" method="post" action="">
- <select name="dirtask" onchange="currdiract(this.form)">
+<div class="LC_columnSection">
+ <div>
+ <form name="curractions" method="post" action="">
+ <fieldset>
+ <legend>$lt{'acti'}</legend>
+ <select name="dirtask" onchange="currdiract(this.form)">
<option>$lt{'sela'}</option>
<option value="publish">$lt{'pubd'}</option>
- <option value="editcat">$lt{'edit'}</option>
+ <option value="editmeta">$lt{'edit'}</option>
<option value="printdir">$lt{'prnt'}</option>
- </select>
- <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
- </form>
- <form name="publishdir" method="post" action="/adm/publish" target="_parent">
- <input type="hidden" name="pubrec" value="" />
- <input type="hidden" name="filename" value="" />
- </form>
- <form name="printdir" method="post" action="/adm/printout" target="_parent">
- <input type="hidden" name="postdata" value="" />
- </form>
- </td>
- <td bgcolor="#ccddaa" valign="top" align="center">
- <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
- <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
- <input type="file" name="upfile" size="20" />
- <input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
- </form>
- </td>
- <td bgcolor="#ccddaa" align="center">
- <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
- <nobr>
- <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
- <select name="action">
- <option value="Select Action">$lt{'sela'}</option>
- <option value="newfile">$lt{'nfil'}:</option>
- <option value="newhtmlfile">$lt{'nhtm'}:</option>
- <option value="newproblemfile">$lt{'nprb'}:</option>
- <option value="newpagefile">$lt{'npag'}:</option>
- <option value="newsequencefile">$lt{'nseq'}:</option>
- <option value="newrightsfile">$lt{'ncrf'}:</option>
- <option value="newstyfile">$lt{'nsty'}:</option>
- <option value="newlibraryfile">$lt{'nlib'}:</option>
- <option value="newdir">$lt{'nsub'}:</option>
- </select> <input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" /> <input type="button" value="Go" onclick="document.fileaction.submit()" />
- </nobr>
- </form>
- </td>
- </tr>
- </table>
+ <option value="delete">$lt{'dedr'}</option>
+ </select>
+ <input type="hidden" name="filename" value="/priv/$udom/$uname$thisdisfn/" />
+ </fieldset>
+ </form>
+ <form name="publishdir" method="post" action="/adm/publish" target="_parent">
+ <input type="hidden" name="pubrec" value="" />
+ <input type="hidden" name="filename" value="" />
+ </form>
+ <form name="printdir" method="post" action="/adm/printout" target="_parent">
+ <input type="hidden" name="postdata" value="" />
+ </form>
+ </div>
+
+ <div>
+ <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
+ <fieldset>
+ <legend>$lt{'updc'}</legend>
+ <input type="hidden" name="filename" value="/priv/$udom/$uname$thisdisfn/" />
+ <input type="file" name="upfile" size="20" />
+ <input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
+ </fieldset>
+ </form>
+ </div>
+
+ <div>
+ <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
+ <fieldset>
+ <legend>$lt{'crea'}</legend>
+ <span class="LC_nobreak">
+ <input type="hidden" name="filename" value="/priv/$udom/$uname$thisdisfn/" />
+ <script type="text/javascript">
+ function validate_go() {
+ var selected = document.fileaction.action.selectedIndex;
+ if (selected == 0) {
+ alert('$lt{'pick'}');
+ } else {
+ document.fileaction.submit();
+ }
+ }
+ </script>
+ <select name="action">
+ <option value="none">$lt{'sela'}</option>
+ <option value="newfile">$lt{'nfil'}:</option>
+ <option value="newhtmlfile">$lt{'nhtm'}:</option>
+ <option value="newproblemfile">$lt{'nprb'}:</option>
+ <option value="newpagefile">$lt{'npag'}:</option>
+ <option value="newsequencefile">$lt{'nseq'}:</option>
+ <option value="newrightsfile">$lt{'ncrf'}:</option>
+ <option value="newstyfile">$lt{'nsty'}:</option>
+ <option value="newtaskfile">$lt{'nbt'}:</option>
+ <option value="newlibraryfile">$lt{'nlib'}:</option>
+ <option value="newdir">$lt{'nsub'}:</option>
+ </select> <input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" /> <input type="button" value="Go" onclick="validate_go();" />
+ </span>
+ </fieldset>
+ </form>
+ </div>
+</div>
END
}
-sub pubbuttons {
- my ($r,$uname,$thisdisfn) = @_;
- $r->print('<form method="post" action="/adm/publish" target="_parent">'.
- '<table><tr><td><input type="hidden" name="filename" value="/~'.
- $uname.$thisdisfn.'/" />'.
- '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
-'<input type="button" onclick="window.location='."'/~".
- $uname.$thisdisfn."/default.meta'".'" value="'.
-&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
-}
-
sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<<END);
@@ -486,7 +446,11 @@ sub getSourceRightString {
#
sub putdirectory {
my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;
- # construct the display filename: the directory name unless ..:
+
+#&Apache::lonnet::logthis("reqfile $reqfile here $here dirname $dirname resdir $resdir");
+
+
+# construct the display filename: the directory name unless ..:
my $disfilename = $dirname;
if ($dirname eq '..') {
@@ -497,18 +461,18 @@ sub putdirectory {
foreach (keys %{$bombs}) {
if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
}
+#
+# Get the metadata from that directory's default.meta to display titles
+#
%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();
- my $construct=$here;
- $construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
- my $dirpath = $here;
- $dirpath=~s:^/priv/:/~:;
- &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
- $construct.'/'.$dirname.'/default.meta'
- ));
+ &Apache::lonpublisher::metaeval(
+ &Apache::lonnet::getfile($r->dir_config('lonDocRoot').$here.'/'.$dirname.'/default.meta')
+ );
+#
my $actionitem = '';
- if ($dirname eq '..') {
- $actionitem = 'Go to ...';
+ if ($here eq '..') {
+ $actionitem = &mt('Go to ...');
} else {
$actionitem =
'<form name="dirselect_'.$$numdir.
@@ -517,25 +481,29 @@ sub putdirectory {
'<option selected="selected">'.&mt('Select action').'</option>'.
'<option value="open">'.&mt('Open').'</option>'.
'<option value="publish">'.&mt('Publish').'</option>'.
- '<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.
- '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
+ '<option value="editmeta">'.&mt('Edit Metadata').'</option>'.
'<option value="printdir">'.&mt('Print directory').'</option>'.
+ '<option value="delete">'.&mt('Delete directory').'</option>'.
'</select>'.
- '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
+ '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" />'.
'<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
'<input type="hidden" name="postdata" value="" />'.
'</form>';
$$numdir ++;
}
- $r->print('<tr bgcolor="#CCCCFF">'.
+ $r->print('<tr class="LC_browser_folder">'.
'<td><img src="'.
- $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
+ $Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.
'<td>'.$actionitem.'</td>'.
- '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.
- $disfilename.'</a></font></td>'.
- '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
- $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
- $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
+ '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
+ $disfilename.'</a></span></td>'.
+ '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
+ if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
+ $r->print(' <i>'.
+ $Apache::lonpublisher::metadatafields{'subject'}.
+ '</i> ');
+ }
+ $r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
"</tr>\n");
}
@@ -551,55 +519,84 @@ sub putresource {
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $pubstatus = 'unpublished';
my $status=&mt('Unpublished');
- my $bgcolor='#FFAA99';
+ my $css_class='LC_browser_file';
my $title=' ';
my $publish_button=&mt('Publish');
-# my $action_buttons=
-# '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
-# $uname.'/'.$thisdisfn.'/'.$filename.'">'.
-# &mt('Delete').'</a>';
+ my $cstr_dir = $r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.'/'.$thisdisfn.'/';
+ my $linkfilename='/priv'.$thisdisfn.'/'.$filename;
+
if (-e $resdir.'/'.$filename) {
+ my $same=0;
my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,
$ratime,$rmtime,$rctime,
$rblksize,$rblocks)=stat($resdir.'/'.$filename);
+ if ($rmtime>=$cmtime) {
+ $same=1;
+ } else {
+ if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
+ $cstr_dir.'/'.$filename)) {
+ $same=0;
+ } else {
+ $same=1;
+ }
+ }
+ my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
+ my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ my $meta_same = 1;
+ if ($meta_rmtime < $meta_cmtime
+ && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
+ $cstr_dir.'/'.$filename.'.meta')) {
+ $meta_same = 0;
+ }
$publish_button=&mt('Re-publish');
- if ($rmtime>=$cmtime) {
- $pubstatus = 'published';
- $status=&mt('Published').'<br />'.
- &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
- &mt(&getSourceRightString($targetdir.'/'.$filename));
- $bgcolor='#CCFF88';
+
+ my $rights_status =
+ &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';
+
+ my %lt_SourceRight = &Apache::lonlocal::texthash(
+ 'open' => 'Source: open',
+ 'closed' => 'Source: closed',
+ );
+ $rights_status .=
+ $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
+
+ $title = '<a href="/res/'.$targetdir.'/'.$filename.
+ '.meta" target="cat">'.
+ &getTitleString($targetdir.'/'.$filename).'</a>';
+ if ($same) {
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';
$status=&mt('Obsolete');
- $bgcolor='#AAAAAA';
- }
-# } else {
-# $action_buttons='';
-# }
- $title='<a href="/res/'.$targetdir.'/'.$filename.
- '.meta" target="cat">'.
- &getTitleString($targetdir.'/'.$filename).'</a>';
+ } else {
+ if (!$meta_same) {
+ $pubstatus = 'metamodified';
+ } else {
+ $pubstatus = 'published';
+ }
+ $status=&mt('Published').
+ '<br />'. $rights_status;
+ }
} else {
$pubstatus = 'modified';
- $status=&mt('Modified').'<br />'.
- &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
- &mt(&getSourceRightString($targetdir.'/'.$filename));
- $bgcolor='#FFFF77';
-# $action_buttons='';
- $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
- &getTitleString($targetdir.'/'.$filename).'</a>';
+ $status=&mt('Modified').
+ '<br />'. $rights_status;
if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
- $status.='<br /><a href="/adm/diff?filename=/~'.$uname.
- $thisdisfn.'/'.$filename.
+ $status.='<br /><a href="/adm/diff?filename='.$linkfilename.
'&versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
}
+ }
+
+ $title.="\n".'<br /><a href="'.$linkfilename.'.meta">'.
+ ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>';
+
+ if (!$meta_same) {
+ $title = &mt('Metadata Modified').'<br />'.$title.
+ '<br /><a href="/adm/diff?filename=/priv/'.$linkfilename.'.meta'.
+ '&versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
+ $title.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
}
- $title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.
- ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
- $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
- $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
+ $status.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'" target="_parent">'.&mt('Retrieve').'</a>';
}
my $editlink='';
my $editlink2='';
@@ -611,27 +608,27 @@ sub putresource {
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
}
if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
- $editlink.=' (<a href="/adm/cleanup?filename=/~'.$uname.
- $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</a>';
+ $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
}
if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
- $editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
- $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
+ $editlink=' (<a target="_parent" href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
}
my $pub_select = '';
&create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
- $r->print('<tr bgcolor="'.$bgcolor.'">'.
+ $r->print(&Apache::loncommon::start_data_table_row().
'<td>'.($filename=~/[\#\~]$/?' ':
- '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
+ '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.
- '<td><font face="arial">'.
+ '<td><span class="LC_filename">'.
'<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
- $filename.'</a></font>'.$editlink2.$editlink.
+ $filename.'</a></span>'.$editlink2.$editlink.
'</td>'.
'<td>'.$title.'</td>'.
- '<td>'.$status.'</td>'.
+ '<td class="LC_browser_file_'.$pubstatus.'"> </td>'. # Display publication status
+ '<td>'.$status.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
- "</tr>\n");
+ &Apache::loncommon::end_data_table_row()
+ );
return OK;
}
@@ -663,7 +660,9 @@ sub create_pubselect {
'<option value="print">'.&mt('Print').'</option>'.
'</select>
<input type="hidden" name="filename" value="/~'.
- $uname.$thisdisfn.'/'.$filename.'" /></form>';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
+ <input type="hidden" name="dispfilename" value="'.
+ &HTML::Entities::encode($filename).'" /></form>';
$$numres ++;
}
@@ -686,35 +685,10 @@ sub check_for_versions {
return $versions;
}
-#
-# Categorize files in the directory.
-# For each file in a list of files in a file directory,
-# the file categorized as one of:
-# - directory
-# - sequence
-# - problem
-# - Other resource.
-#
-# For each file the modification date is determined as well.
-# Returned is a list of sublists:
-# (directories, sequences, problems, other)
-# each of the sublists contains entries of the following form (sorted by
-# filename):
-# (filename, typecode, lastmodtime)
-#
-# $list = CategorizeFiles($location, $files)
-# $location - Directory in which the files live (relative to our
-# execution.
-# $files - list of files.
-#
-sub CategorizeFiles {
- my $location = shift;
- my $files = shift;
-}
-
1;
__END__
+
=head1 NAME
Apache::lonpubdir - Construction space directory lister
@@ -770,4 +744,44 @@ run through list of files and attempt to
=back
+=head1 SUBROUTINES:
+
+=over
+
+=item startpage($r, $uame, $udom, $thisdisfn)
+
+Output the header of the page. This includes:
+ - The HTML header
+ - The H1/H3 stuff which includes the directory.
+
+ startpage($r, $uame, $udom, $thisdisfn);
+ $r - The apache request object.
+ $uname - User name.
+ $udom - Domain name the user is logged in under.
+ $thisdisfn - Displayable version of the filename.
+
+=item getTitleString($fullname)
+
+ Get the title string or "[untitled]" if the file has no title metadata:
+ Without the latter substitution, it's impossible to examine metadata for
+ untitled resources. Resources may be legitimately untitled, to prevent
+ searches from locating them.
+
+ $str = getTitleString($fullname);
+ $fullname - Fully qualified filename to check.
+
+=item putdirectory(r, base, here, dirname, modtime)
+
+ Put out a directory table row:
+
+ putdirectory($r, $base, $here, $dirname, $modtime)
+ $r - Apache request object.
+ $reqfile - File in request.
+ $here - Where we are in directory tree.
+ $dirname - Name of directory special file.
+ $modtime - Encoded modification time.
+
+=back
+
=cut
+