--- loncom/publisher/lonpubdir.pm 2008/12/17 13:04:08 1.117 +++ loncom/publisher/lonpubdir.pm 2024/02/28 04:58:02 1.160.2.5.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Construction Space Directory Lister +# Authoring Space Directory Lister # -# $Id: lonpubdir.pm,v 1.117 2008/12/17 13:04:08 harmsja Exp $ +# $Id: lonpubdir.pm,v 1.160.2.5.2.3 2024/02/28 04:58:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,6 @@ use strict; use Apache::File; use File::Copy; use Apache::Constants qw(:common :http :methods); -use Apache::loncacc; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::londiff(); @@ -41,193 +40,336 @@ use Apache::lonlocal; use Apache::lonmsg; use Apache::lonmenu; use Apache::lonnet; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub handler { - my $r=shift; - - my $fn; + my $r=shift; + # Validate access to the construction space and get username:domain. + my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); + unless (($uname) && ($udom)) { + return HTTP_NOT_ACCEPTABLE; + } - $fn = getEffectiveUrl($r); +# ----------------------------------------------------------- Start page output - # Validate access to the construction space and get username@domain. + my $fn=$r->filename; + $fn=~s/\/$//; + my $thisdisfn=$fn; + + my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root. + if ($thisdisfn eq "$docroot/priv/$udom") { + if ((-d "/home/$uname/public_html/") && (!-e "$docroot/priv/$udom/$uname")) { + my ($version) = ($r->dir_config('lonVersion') =~ /^\'?(\d+\.\d+)\./); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + &Apache::lonhtmlcommon::clear_breadcrumbs(); + $r->print(&Apache::loncommon::start_page('Authoring Space'). + '
'. + '

'. + &mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'

'. + '

'. + &mt('Please ask your Domain Coordinator to move your Authoring Space to the new location.'). + '

'. + '
'. + &Apache::loncommon::end_page()); + return OK; + } + } + $thisdisfn=~s/^\Q$docroot\E\/priv//; - my $uname; - my $udom; + 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); + + my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; + my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname, + "$londocroot/priv/$udom/$uname"); # expressed in kB + my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, + 'author'); # expressed in MB + + # Put out the start of page. + &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); + + if (!-d $fn) { + if (-e $fn) { + $r->print('

'.&mt('Requested item is a file not a directory.').'

'); + } else { + $r->print('

'.&mt('The requested subdirectory does not exist.').'

'); + } + $r->print(&Apache::loncommon::end_page()); + return OK; + } + my @files; + if (opendir(DIR,$fn)) { + @files = grep(!/^\.+$/,readdir(DIR)); + closedir(DIR); + } else { + $r->print('

'.&mt('Could not open directory.').'

'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } - ($uname,$udom)= - &Apache::loncacc::constructaccess( - $fn,$r->dir_config('lonDefDomain')); - 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; - } + # Put out actions for directory, browse/upload + new file page. + &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota); + &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc. - # Remove trailing / from directory name. + my $numdir = 0; + my $numres = 0; + + if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) { + if ($thisdisfn =~ m{^/$match_domain/$match_username$}) { + $r->print('

'.&mt('This Authoring Space is currently empty.').'

'); + } else { + $r->print('

'.&mt('This subdirectory is currently empty.').'

'); + } + $r->print(&Apache::loncommon::end_page()); + return OK; + } - $fn=~s/\/$//; + # Retrieving value for "sortby" and "sortorder" from QUERY_STRING + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['sortby','sortorder']); + + # Sort by name as default, not reversed + if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'filename' } + if (! exists($env{'form.sortorder'})) { $env{'form.sortorder'} = '' } + my $sortby = $env{'form.sortby'}; + my $sortorder = $env{'form.sortorder'}; + + # Order in which columns are displayed from left to right + my @order = ('filetype','actions','filename','title', + 'pubstatus','cmtime','size'); + + # Up and down arrows to indicate sort order + my @arrows = (' ▲',' ▼',''); + + # Default sort order and column title + my %columns = ( + filetype => { + order => 'ascending', + text => &mt('Type'), + }, + actions => { + # Not sortable + text => &mt('Actions'), + }, + filename => { + order => 'ascending', + text => &mt('Name'), + }, + title => { + order => 'ascending', + text => &mt('Title'), + }, + pubstatus => { + order => 'ascending', + text => &mt('Status'), + colspan => '2', + }, + cmtime => { + order => 'descending', + text => &mt('Last Modified'), + }, + size => { + order => 'ascending', + text => &mt('Size').' (kB)', + }, + ); + + # Print column headers + my $output = ''; + foreach my $key (@order) { + my $idx; + # Append an up or down arrow to sorted column + if ($sortby eq $key) { + $idx = ($columns{$key}{order} eq 'ascending') ? 0:1; + if ($sortorder eq 'rev') { $idx ++; } + $idx = $idx%2; + } else { $idx = 2; } # No arrow if column is not sorted + $output .= (($columns{$key}{order}) ? + '' + .$columns{$key}{text}.$arrows[$idx].'' : + ''.$columns{$key}{text}.''); + } + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() . $output + .&Apache::loncommon::end_data_table_header_row() + ); - unless ($fn) { - $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. - ' trying to list empty directory', $r->filename); - return HTTP_NOT_FOUND; - } + my $dirptr=16384; # Mask indicating a directory in stat.cmode. + my $filehash = {}; + foreach my $filename (@files) { + # Skip .DS_Store, .DAV and hidden files + my ($extension) = ($filename=~/\.(\w+)$/); + next if (($filename eq '.DS_Store') + || ($filename eq '.DAV') + || (&Apache::loncommon::fileembstyle($extension) eq 'hdn') + || ($filename =~ /^\._/)); + + my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9]; + my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); + # Identify type of file according to icon used + my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$}); + my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; + my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename); + + # Store size, title, and status for files but not directories + my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0; + my ($status, $pubstatus, $title, $fulltitle); + if (!($cmode&$dirptr)) { + ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, + $filename, $linkfilename, $cmtime, $meta_same); + ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, + $linkfilename, $meta_same, \%bombs); + } else { + ($status, $pubstatus) = ('',''); + ($fulltitle, $title) = ('',''); + } -# ----------------------------------------------------------- Start page output + # This hash will allow sorting + $filehash->{ $filename } = { + "cmtime" => $cmtime, + "size" => $size, + "cmode" => $cmode, + "filetype" => $filetype, + "title" => $title, + "fulltitle" => $fulltitle, + "status" => $status, + "pubstatus" => $pubstatus, + "linkfilename" => $linkfilename, + } + } + + my @sorted_files; + # Sorting by something other than "Name". Name is the secondary key. + if ($sortby =~ m{cmtime|size}) { # Numeric fields + # First check if order should be reversed + if ($sortorder eq "rev") { + @sorted_files = sort { + $filehash->{$a}->{$sortby} <=> $filehash->{$b}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } else { + @sorted_files = sort { + $filehash->{$b}->{$sortby} <=> $filehash->{$a}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } + } elsif ($sortby =~ m{filetype|title|status}) { # String fields + if ($sortorder eq "rev") { + @sorted_files = sort { + $filehash->{$b}->{$sortby} cmp $filehash->{$a}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } else { + @sorted_files = sort { + $filehash->{$a}->{$sortby} cmp $filehash->{$b}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } - my $thisdisfn=$fn; - $thisdisfn=~s/^\/home\/$uname\/public_html//; # subdirectory part of - # construction space. - my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root. - - 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 %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, - # browse/upload + new file page. - } else { - &pubbuttons($r,$uname,$thisdisfn); - } - &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc. + # Sort by "Name" is the default + } else { + if ($sortorder eq "rev") { + @sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash})); + } else { + @sorted_files = sort {uc($a) cmp uc($b)} (keys(%{$filehash})); + } + } - my $numdir = 0; - my $numres = 0; - - # Start off the directory table. - $r->print(&Apache::loncommon::start_data_table() - .&Apache::loncommon::start_data_table_header_row() - .''.&mt('Type').'' - .''.&mt('Actions').'' - .''.&mt('Name').'' - .''.&mt('Title').'' - .''.&mt('Status').'' - .''.&mt('Last Modified').'' - .&Apache::loncommon::end_data_table_header_row() - ); - - my $filename; - my $dirptr=16384; # Mask indicating a directory in stat.cmode. - - opendir(DIR,$fn); - my @files=sort {uc($a) cmp uc($b)} (readdir(DIR)); - foreach my $filename (@files) { - my ($cdev,$cino,$cmode,$cnlink, - $cuid,$cgid,$crdev,$csize, - $catime,$cmtime,$cctime, - $cblksize,$cblocks)=stat($fn.'/'.$filename); - - my $extension=''; - if ($filename=~/\.(\w+)$/) { $extension=$1; } - if ($cmode&$dirptr) { - putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir); - } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') { - putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, - $targetdir, $linkdir, $cmtime,\%bombs,\$numres); - } else { - # "hidden" extension and not a directory, so hide it away. - } - } - closedir(DIR); - - $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{~($LONCAPA::username_re)}{/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{^/~($LONCAPA::username_re)}{/home/$1/public_html}; - } + # Print the sorted resources + my %editors = &Apache::loncommon::permitted_editors(); + foreach my $filename (@sorted_files) { + if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories + &putdirectory($r, $thisdisfn, $linkdir, $filename, + $filehash->{$filename}->{"cmtime"}, + $targetdir, \%bombs, \$numdir); + } else { # Files + &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, + $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"}, + $filehash->{$filename}->{"size"}, \$numres, + $filehash->{$filename}->{"linkfilename"}, + $filehash->{$filename}->{"fulltitle"}, + $filehash->{$filename}->{"status"}, + $filehash->{$filename}->{"pubstatus"}, + \%editors); + } } - $fn=~s/\/+/\//g; - return $fn; + + $r->print( &Apache::loncommon::end_data_table() + .&Apache::loncommon::end_page() ); + + return OK; } -# + + + # Output the header of the page. This includes: # - The HTML header # - The H1/H3 stuff which includes the directory. # -# startpage($r, $uame, $udom, $thisdisfn); +# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota); # $r - The apache request object. # $uname - User name. # $udom - Domain name the user is logged in under. # $thisdisfn - Displayable version of the filename. +# $current_disk_usage - User's current disk usage (in kB). +# $disk_quota - Disk quota for user's authoring space (in MB). +# $crstype - Course type, if this is for "course author" sub startpage { - my ($r, $uname, $udom, $thisdisfn) = @_; - my $currdir = '/priv/'.$uname.$thisdisfn; + my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $formaction='/priv/'.$uname.$thisdisfn.'/'; + my $formaction='/priv'.$thisdisfn.'/'; $formaction=~s|/+|/|g; - my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring'). - ''.&mt('Construction Space').': '. - '
'. - &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."
". - &Apache::lonhtmlcommon::select_recent('construct','recent', - 'this.form.action=this.form.recent.value;this.form.submit()'). - '
'; &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); - if ($env{'environment.remote'} eq 'off') { - $env{'request.noversionuri'}=$currdir.'/'; - $r->print(&Apache::loncommon::start_page('Construction Space',undef, - {'body_title' => - $pagetitle,})); - } else { - $r->print(&Apache::loncommon::start_page('Construction Space',undef, - { 'only_body' => 1,})); - $r->print($pagetitle); - } + + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Authoring Space', + 'href' => &Apache::loncommon::authorspace($formaction), + }); + # breadcrumbs (and tools) will be created + # in start_page->bodytag->innerregister + + $env{'request.noversionuri'}=$formaction; + $r->print(&Apache::loncommon::start_page('Authoring Space')); + + my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; + my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname"); + my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB + $disk_quota = 1024 * $disk_quota; # convert from MB to kB + + $r->print(&Apache::loncommon::head_subbox( + '
' + .&Apache::lonhtmlcommon::display_usage($current_disk_usage, + $disk_quota,'authoring') + .'
' + .&Apache::loncommon::CSTR_pageheader())); my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn); - my $doctitle = 'LON-CAPA '.&mt('Construction Space'); + my $doctitle = 'LON-CAPA '.&mt('Authoring Space'); my $newname = &mt('New Name'); my $pubdirscript=(< top.document.title = '$esc_thisdisfn/ - $doctitle'; // Store directory location for menu bar to find -parent.lastknownpriv='/~$uname$esc_thisdisfn/'; +parent.lastknownpriv='/priv$esc_thisdisfn/'; // Confirmation dialogues @@ -330,16 +472,10 @@ parent.lastknownpriv='/~$uname$esc_thisd ENDPUBDIRSCRIPT $r->print($pubdirscript); - - if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) && - $env{'environment.remote'} ne 'off') { - $r->print('

'.&mt('Co-Author').': '.$uname.' at '.$udom. - '

'); - } } sub dircontrols { - my ($r,$uname,$udom,$thisdisfn) = @_; + my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_; my %lt=&Apache::lonlocal::texthash( cnpd => 'Cannot publish directory', cnrd => 'Cannot retrieve directory', @@ -375,6 +511,9 @@ sub dircontrols { pick => 'Please select an action to perform using the new filename', ); my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript + # Calculate free space in bytes. + # $disk_quota is in MB and $current_disk_usage is in kB + my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage); $r->print(<
@@ -388,35 +527,36 @@ sub dircontrols { - + -
+
-
+
-
-
+
+
$lt{'updc'} - - + + +
-
+
$lt{'crea'} - +
@@ -448,40 +625,29 @@ sub dircontrols { END } -sub pubbuttons { - my ($r,$uname,$thisdisfn) = @_; - $r->print('
'. - '
'. - ''. -'
'); -} - sub resourceactions { my ($r,$uname,$udom,$thisdisfn) = @_; $r->print(< +
-
+
-
+
-
+
-
+
-
+
END @@ -517,42 +683,49 @@ sub getSourceRightString { } # # 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. -# +# putdirectory(r, base, here, dirname, modtime, targetdir, bombs, numdir) +# 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. +# targetdir - Publication target directory. +# bombs - Reference to hash of URLs with runtime error messages. +# numdir - Reference to scalar used to track number of sub-directories +# in directory (used in form name for each "actions" dropdown). +# sub putdirectory { - my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_; - # construct the display filename: the directory name unless ..: - + my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_; + +# construct the display filename: the directory name unless ..: + + my $actionitem; + my $disfilename = $dirname; - if ($dirname eq '..') { - $disfilename = ''.&mt('Parent Directory').''; - } - unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { - my $kaputt=0; - foreach (keys %{$bombs}) { - if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; } - } +# Don't display directory itself, and there is no way up from root directory + unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { + my $kaputt=0; + if (ref($bombs) eq 'HASH') { + foreach my $key (keys(%{$bombs})) { + my $currentdir = &Apache::lonnet::declutter("$targetdir/$disfilename"); + if (($key) =~ m{^\Q$currentdir\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/($LONCAPA::username_re)$}{/home/$1/public_html}; - my $dirpath = $here; - $dirpath=~s{^/priv/}{/~}; - &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( - $construct.'/'.$dirname.'/default.meta' - )); - my $actionitem = ''; + &Apache::lonpublisher::metaeval( + &Apache::lonnet::getfile($r->dir_config('lonDocRoot').$here.'/'.$dirname.'/default.meta') + ); if ($dirname eq '..') { $actionitem = &mt('Go to ...'); + $disfilename = ''.&mt('Parent Directory').''; } else { $actionitem = '
'. + '" action="/adm/publish">'. ''. - ''. + ''. ''. ''. '
'; @@ -569,11 +742,11 @@ sub putdirectory { } $r->print(''. 'folder'. + $Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" />'. ''.$actionitem.''. - ''. + ''. $disfilename.''. - ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}); + ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}); if ($Apache::lonpublisher::metadatafields{'subject'} ne '') { $r->print(' '. $Apache::lonpublisher::metadatafields{'subject'}. @@ -581,59 +754,82 @@ sub putdirectory { } $r->print($Apache::lonpublisher::metadatafields{'keywords'}.''. ''.&Apache::lonlocal::locallocaltime($modtime).''. + ''. "\n"); } - return OK; + return; } -# -# Put a table row for a file resource. -# -sub putresource { - my ($r, $udom, $uname, $filename, $thisdisfn, - $resdir, $targetdir, $linkdir, - $cmtime,$bombs,$numres) = @_; - &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); + +sub getTitle { + my ($resdir, $targetdir, $filename, $linkfilename, $meta_same, $bombs) = @_; + my $title=''; + my $titleString = &getTitleString($targetdir.'/'.$filename); + if (-e $resdir.'/'.$filename) { + $title = ''.$titleString.''; + if (!$meta_same) { + $title = &mt('Metadata Modified').'
'.$title. + '
'. + &Apache::loncommon::modal_link( + '/adm/diff?filename='.$linkfilename.'.meta'.'&versiontwo=priv', + &mt('Metadata Diffs'),600,500); + $title.="\n".'
'. + &Apache::loncommon::modal_link( + '/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes', + &mt('Retrieve Metadata'),600,500); + } + } + # Allow editing metadata of published and unpublished resources + $title .= "\n".'
' if ($title); + $title .= ''. + ($$bombs{&Apache::lonnet::declutter($targetdir.'/'.$filename)}? + ''.&mt('bomb').'': + &mt('Edit Metadata')). + ''; + + return ($title, $titleString); +} + + +sub isMetaSame { + my ($cstr_dir, $resdir, $filename) = @_; + my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9]; + my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; + return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta', + $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime) + ? 0 : 1; +} + + +sub getStatus { + my ($resdir, $targetdir, $cstr_dir, $filename, + $linkfilename, $cmtime, $meta_same) = @_; my $pubstatus = 'unpublished'; - my $status=&mt('Unpublished'); - my $css_class='LC_browser_file'; - my $title=' '; - my $publish_button=&mt('Publish'); - my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/'; -# my $action_buttons= -# '
'. -# &mt('Delete').''; + my $status = &mt('Unpublished'); + 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; + my $same = 0; + if ((stat($resdir.'/'.$filename))[9] >= $cmtime) { + $same = 1; } else { if (&Apache::londiff::are_different_files($resdir.'/'.$filename, $cstr_dir.'/'.$filename)) { - $same=0; + $same = 0; } else { - $same=1; + $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'); - my $rights_status = - &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. - &mt(&getSourceRightString($targetdir.'/'.$filename)); - $title = ''. - &getTitleString($targetdir.'/'.$filename).''; + + 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)}; + if ($same) { if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { $pubstatus = 'obsolete'; @@ -647,52 +843,63 @@ sub putresource { $status=&mt('Published'). '
'. $rights_status; } -# } else { -# $action_buttons=''; -# } } else { $pubstatus = 'modified'; $status=&mt('Modified'). '
'. $rights_status; -# $action_buttons=''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { - $status.='
'.&mt('Diffs').''; + $status.='
'. + &Apache::loncommon::modal_link( + '/adm/diff?filename='.$linkfilename.'&versiontwo=priv', + &mt('Diffs'),600,500); } } - $title.="\n".'
'. - ($$bombs{$targetdir.'/'.$filename}?''.&mt('bomb').'':&mt('Edit Metadata')).''; - - if (!$meta_same) { - $title = &mt('Metadata Modified').'
'.$title. - '
'.&mt('Metadata Diffs').''; - $title.="\n".'
'.&mt('Retrieve Metadata').''; - } - $status.="\n".'
'.&mt('Retrieve').''; + $status.="\n".'
'. + &Apache::loncommon::modal_link( + '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500); } + + return ($status, $pubstatus); +} + + +# +# Put a table row for a file resource. +# +sub putresource { + my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, + $linkdir, $cmtime, $size, $numres, $linkfilename, $title, + $status, $pubstatus, $editors) = @_; + &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); + my $editlink=''; my $editlink2=''; - if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink='
('.&mt('Edit').')'; + if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty|txt|css|js)$/) { + $editlink='
('.&mt('Edit').')'; } - if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { - $editlink=' ('.&mt('EditXML').')'; - $editlink2='
('.&mt('Edit').')'; + if ($filename=~/$LONCAPA::assess_re/) { + if ($editors->{'xml'}) { + $editlink=' ('.&mt('EditXML').')'; + } + if ($editors->{'edit'}) { + $editlink2='
('.&mt('Edit').')'; + } + } + if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) { + if (($editors->{'daxe'}) && + ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) { + my $daxeurl = '/daxepage'.$linkdir.'/'.$filename; + $editlink .= ' (Daxe)'; + } } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink.=' ('.&mt('Clean Up').')'; + $editlink.=' ('.&mt('Clean Up').')'; } if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { - $editlink=' ('.&mt('Decompress').')'; + $editlink=' ('.&mt('Decompress').')'; } + my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish'); my $pub_select = ''; &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres); $r->print(&Apache::loncommon::start_data_table_row(). @@ -700,16 +907,17 @@ sub putresource { '').''. ''.$pub_select.''. ''. - ''. + ''. $filename.''.$editlink2.$editlink. ''. ''.$title.''. '  '. # Display publication status ''.$status.''. ''.&Apache::lonlocal::locallocaltime($cmtime).''. + ''.sprintf("%.1f",$size).''. &Apache::loncommon::end_data_table_row() ); - return OK; + return; } sub create_pubselect { @@ -739,8 +947,8 @@ sub create_pubselect { ''. ''. ' - + '; $$numres ++; @@ -762,48 +970,23 @@ sub check_for_versions { $versions ++; } } + closedir(DIR); 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 +Apache::lonpubdir - Authoring space directory lister =head1 SYNOPSIS Invoked (for various locations) by /etc/httpd/conf/srm.conf: - + PerlAccessHandler Apache::loncacc SetHandler perl-script PerlHandler Apache::lonpubdir @@ -876,38 +1059,21 @@ Output the header of the page. This inc $str = getTitleString($fullname); $fullname - Fully qualified filename to check. -=item putdirectory(r, base, here, dirname, modtime) +=item putdirectory($r, $base, $here, $dirname, $modtime, $targetdir, $bombs, + $numdir) 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. - -=item CategorizeFiles($location, $files) - - 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. + $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. + targetdir - Publication target directory. + bombs - Reference to hash of URLs with runtime error messages. + numdir - Reference to scalar used to track number of sub-directories + in directory (used in form name for each "actions" dropdown). =back =cut -