--- loncom/publisher/loncfile.pm 2002/06/07 01:35:48 1.11
+++ loncom/publisher/loncfile.pm 2009/05/26 16:29:56 1.99
@@ -8,9 +8,8 @@
# and requests confirmation. The second phase commits the action
# and displays a page showing the results of the action.
#
-
#
-# $Id: loncfile.pm,v 1.11 2002/06/07 01:35:48 albertel Exp $
+# $Id: loncfile.pm,v 1.99 2009/05/26 16:29:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,90 +33,303 @@
#
# http://www.lon-capa.org/
#
-#
-# (Handler to retrieve an old version of a file
-#
-# (Publication Handler
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-#
-# 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)
-#
-# 06/23 Gerd Kortemeyer
-# 05/07/02 Ron Fox:
-# - Added Debug log output so that I can trace what the heck this
-# undocumented thingy does.
+=pod
+
+=head1 NAME
+
+Apache::loncfile - Construction space file management.
+
+=head1 SYNOPSIS
+
+ Content handler for buttons on the top frame of the construction space
+directory.
+
+=head1 INTRODUCTION
+
+ loncfile is invoked when buttons in the top frame of the construction
+space directory listing are clicked. All operations proceed in two phases.
+The first phase describes to the user exactly what will be done. If the user
+confirms the operation, the second phase commits the operation and indicates
+completion. When the user dismisses the output of phase2, they are returned to
+an "appropriate" directory listing in general.
+
+ This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head2 Subroutines
+
+=cut
package Apache::loncfile;
use strict;
use Apache::File;
+use File::Basename;
use File::Copy;
+use HTML::Entities();
use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;
-use Apache::Log ();
+use Apache::lonnet;
+use Apache::loncommon();
+use Apache::lonlocal;
+use LONCAPA qw(:DEFAULT :match);
+
my $DEBUG=0;
my $r; # Needs to be global for some stuff RF.
-#
-# Debug
-# If debugging is enabled puts out a debuggin message determined by the
-# caller. The debug message goes to the Apache error log file.
-#
-# Parameters:
-# r - Apache request [in]
-# message - String [in]
-# Returns:
-# nothing.
+
+=pod
+
+=item Debug($request, $message)
+
+ If debugging is enabled puts out a debugging message determined by the
+ caller. The debug message goes to the Apache error log file. Debugging
+ is enabled by setting the module global DEBUG variable to nonzero (TRUE).
+
+ Parameters:
+
+=over 4
+
+=item $request - The current request operation.
+
+=item $message - The message to put in the log file.
+
+=back
+
+ Returns:
+ nothing.
+
+=cut
+
sub Debug {
- my $r = shift;
- my $log = $r->log;
- my $message = shift;
+ # Put out the indicated message butonly if DEBUG is true.
if ($DEBUG) {
- $log->debug($message);
+ my ($r,$message) = @_;
+ $r->log_reason($message);
}
}
-#
-# URLToPath
-# Convert a URL to a file system path.
-#
-# In order to manipulate the construction space objects, it's necessary
-# to access url identified objects a filespace objects. This function
-# translates a construction space URL to a file system path.
-# Parameters:
-# Url - string [in] The url to convert.
-# Returns:
-# The corresponing file system path.
-sub URLToPath
-{
+
+sub done {
+ my ($url)=@_;
+ my $done=&mt("Done");
+ return(< Warning: target file exists, and has been published! Warning: target file exists! '.&mt('Error: destination for operation is an existing directory.').' '.&mt('Warning: target file exists, and has been published!').' '.&mt("Warning: a published $published_type of this name exists.").' '.&mt("Error: a published $published_type of this name exists.").' '.&mt('Warning: target file exists!').' Warning: change of MIME type! '.&mt('Warning: change of MIME type!').' '
+ .&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name."
+ ,'"'.&display($newpath).'"')
+ .' ".&mt('Invalid characters in requested name have been removed.')." '.$action.' '.&display($fn).
+ '
'
+ .&mt('[_1](name).(number).(extension)[_2] not allowed.','','')
+ .'
'
+ .&mt('Removing the [_1].number.[_2] from requested filename.','','')
+ .'');
+ $dest =~ s/\.(\d+)(\.\w+)$/$2/;
+ }
+ if ($foundbad) {
+ $request->print("
to '.&display($newfilename).'?
'.&mt('No new filename specified.').'
'); + return; + } + } else { + $request->print(''.&mt('No such file').': '.&display($fn).'
'); + return; + } + +} + +=pod + +=item Delete1 + + Performs phase 1 processing of the delete operation. In phase one + we just check to be sure the file exists. + +Parameters: + +=over 4 + +=item $request - Apache Request Object [in] request object for the current + request. + +=item $user - string [in] Name of the user initiating the request. + +=item $domain - string [in] Domain the initiating user is logged in as + +=item $filename - string [in] Source filename. + +=back + +=cut + +sub Delete1 { + my ($request, $user, $domain, $fn) = @_; + + if( -e $fn) { + $request->print(''); + if (-d $fn) { + unless (&empty_directory($fn,'Delete1')) { + $request->print('No such file.
'); - return; - } - } elsif ($ENV{'form.action'} eq 'delete') { - if (-e $conspace) { - $r->print('Delete '.$fn.'?
'); - } else { - $r->print('No such file.
'); - return; } - } elsif ($ENV{'form.action'} eq 'copy') { - if (-e $conspace) { - if ($ENV{'form.newfilename'}) { - $r->print(&checksuffix($fn,$ENV{'form.newfilename'})); - $r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'})); - $r->print('Copy '.$fn.' to '. - $dir.'/'.$ENV{'form.newfilename'}.'?
'); - } else { - $r->print('No new filename specified.
'); - return; + $request->print(''.&mt('Delete').' '.&display($fn).'?
'); + &CloseForm1($request, $fn); + } else { + $request->print(''.&mt('No such file').': '.&display($fn).'
'); + } +} + +=pod + +=item Copy1($request, $user, $domain, $filename, $newfilename) + + Performs phase 1 processing of the construction space copy command. + Ensure that the source file exists. Ensure that a destination exists, + also warn if the destination already exists. + +Parameters: + +=over 4 + +=item $request - Apache Request Object [in] request object for the current + request. + +=item $user - string [in] Name of the user initiating the request. + +=item $domain - string [in] Domain the initiating user is logged in as + +=item $fn - string [in] Source filename. + +=item $newfilename-string [in] Destination filename. + +=back + +=cut + +sub Copy1 { + my ($request, $user, $domain, $fn, $newfilename) = @_; + + if(-e $fn) { + # is dest a dir + if (-d $newfilename) { + if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; } + } + if ($newfilename =~ m|/[^\.]+$|) { + #no extension add on original extension + if ($fn =~ m|/[^\.]*\.([^\.]+)$|) { $newfilename.='.'.$1; } + } + $newfilename=~s://+:/:g; # remove duplicate / + while ($newfilename=~m:/\.\./:) { + $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. + } + $request->print(&checksuffix($fn,$newfilename)); + my ($type,$return)=&exists($user, $domain, $newfilename); + $request->print($return); + if ($type eq 'error') { + $request->print(''.&mt('Copy').' '.&display($fn).'
to '.
+ &display($newfilename).'?
'.&mt('No such file').': '.&display($fn).'
'); + } +} + +=pod + +=item NewDir1 + + Does all phase 1 processing of directory creation: + Ensures that the user provides a new directory name, + and that the directory does not already exist. + +Parameters: + +=over 4 + +=item $request - Apache Request Object [in] - Server request object for the + current url. + +=item $username - Name of the user that is requesting the directory creation. + +=item $domain - Domain user is in + +=item $fn - source file. + +=item $newdir - Name of the directory to be created; path relative to the + top level of construction space. +=back + +Side Effects: + +=over 4 + +=item A new form is displayed. Clicking on the confirmation button +causes the newdir operation to transition into phase 2. The hidden field +"newfilename" is set with the construction space path to the new directory. + + +=back + +=cut + + +sub NewDir1 { + my ($request, $username, $domain, $fn, $newfilename, $mode) = @_; + + my ($type, $result)=&exists($username,$domain,$newfilename,'directory'); + $request->print($result); + if ($type eq 'error') { + $request->print(''); + } else { + if ($mode eq 'testbank') { + $request->print(''); + } elsif ($mode eq 'imsimport') { + $request->print(''); + } + $request->print(''.&mt('Make new directory').' '. + &display($newfilename).'?
'); + &CloseForm1($request, $fn); + } +} + + +sub Decompress1 { + my ($request, $user, $domain, $fn) = @_; + if( -e $fn) { + $request->print(''); + $request->print(''.&mt('Decompress').' '.&display($fn).'?
'); + &CloseForm1($request, $fn); + } else { + $request->print(''.&mt('No such file').': '.&display($fn).'
'); + } +} + +=pod + +=item NewFile1 + + Does all phase 1 processing of file creation: + Ensures that the user provides a new filename, adds proper extension + if needed and that the file does not already exist, if it is a html, + problem, page, or sequence, it then creates a form link to hand the + actual creation off to the proper handler. + +Parameters: + +=over 4 + +=item $request - Apache Request Object [in] - Server request object for the + current url. + +=item $username - Name of the user that is requesting the directory creation. + +=item $domain - Name of the domain of the user + +=item $fn - Source file name + +=item $newfilename + - Name of the file to be created; no path information +=back + +Side Effects: + +=over 4 + +=item 2 new forms are displayed. Clicking on the confirmation button +causes the browser to attempt to load the specfied URL, allowing the +proper handler to take care of file creation. There is also a Cancel +button which returns you to the driectory listing you came from + +=back + +=cut + +sub NewFile1 { + my ($request, $user, $domain, $fn, $newfilename) = @_; + return if (&filename_check($newfilename) ne 'ok'); + + if ($env{'form.action'} =~ /new(.+)file/) { + my $extension=$1; + if ($newfilename !~ /\Q.$extension\E$/) { + if ($newfilename =~ m|/[^/.]*\.(?:[^/.]+)$|) { + #already has an extension strip it and add in expected one + $newfilename =~ s|(/[^./])\.(?:[^.]+)$|$1|; } - } else { - $r->print('No such file.
'); - return; + $newfilename.=".$extension"; + } + } + my ($type, $result)=&exists($user,$domain,$newfilename); + $request->print($result); + if ($type eq 'error') { + $request->print(''); + } else { + my $extension; + + if ($newfilename =~ m{[^/.]+\.([^/.]+)$}) { + $extension = $1; } - } elsif ($ENV{'form.action'} eq 'newdir') { - my $newdir='/home/'.$uname.'/public_html/'. - $fn.$ENV{'form.newfilename'}; - if (-e $newdir) { - $r->print('Directory exists.
'); + + my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty library js css txt); + if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) { + my $validexts = '.'.join(', .',@okexts); + $request->print(''. + &mt('Invalid filename: ').&display($newfilename).'
'.
+ &mt('The name of the new file needs to end with an appropriate file extension to indicate the type of file to create.').'
'.
+ &mt('The following are valid extensions: [_1].',$validexts).
+ '
'. + '
'. + ''); return; } - $r->print('Make new directory '. - $fn.$ENV{'form.newfilename'}.'?
'); - - } - $r->print(''); - $r->print(''); + $request->print(''.&mt('Make new file').' '.&display($newfilename).'?
'); + $request->print(''); + + $request->print(''); + $request->print(''); + } + return; } -sub phasetwo { +sub filename_check { + my ($newfilename) = @_; + ##Informs User (name).(number).(extension) not allowed + if($newfilename =~ /\.(\d+)\.(\w+)$/){ + $r->print(''.$newfilename. + ' - '.&mt('Bad Filename').''.&mt('No new filename specified.').'
'); + } + } +} - &Debug($r, "loncfile - Entering phase 2 for $fn"); +=pod - $fn=~/(.*)\/([^\/]+)\.(\w+)$/; - my $dir=$1; - my $main=$2; - my $suffix=$3; - $dir =~ s-^/[^/]*/[^/]*/[^/]*--; - - - &Debug($r, "loncfile::phase2 dir = $dir main = $main suffix = $suffix"); +=item Rename2($request, $user, $directory, $oldfile, $newfile) - my $conspace=$fn; +Performs phase 2 processing of a rename reequest. This is where the +actual rename is performed. - &Debug($r, "loncfile::phase2 Full construction space name: $conspace"); +Parameters - &Debug($r, "loncfie::phase2 action is $ENV{'form.action'}"); +=over 4 + +=item $request - Apache request object [in] The request being processed. + +=item $user - string [in] The name of the user initiating the request. + +=item $directory - string [in] The name of the directory relative to the + construction space top level of the renamed file. + +=item $oldfile - Name of the file. + +=item $newfile - Name of the new file. + +=back + +Returns: + +=over 4 + +=item 1 Success. + +=item 0 Failure. + +=cut + +sub Rename2 { + + my ($request, $user, $directory, $oldfile, $newfile) = @_; + + &Debug($request, "Rename2 directory: ".$directory." old file: ".$oldfile. + " new file ".$newfile."\n"); + &Debug($request, "Target is: ".$directory.'/'. + $newfile); + if (-e $oldfile) { + + my $oRN=$oldfile; + my $nRN=$newfile; + unless (rename($oldfile,$newfile)) { + $request->print(''.&mt('Error').': '.$!.''); + return 0; + } + ## If old name.(extension) exits, move under new name. + ## If it doesn't exist and a new.(extension) exists + ## delete it (only concern when renaming over files) + my $tmp1=$oRN.'.meta'; + my $tmp2=$nRN.'.meta'; + if(-e $tmp1){ + unless(rename($tmp1,$tmp2)){ } + } elsif(-e $tmp2){ + unlink $tmp2; + } + $tmp1=$oRN.'.save'; + $tmp2=$nRN.'.save'; + if(-e $tmp1){ + unless(rename($tmp1,$tmp2)){ } + } elsif(-e $tmp2){ + unlink $tmp2; + } + $tmp1=$oRN.'.log'; + $tmp2=$nRN.'.log'; + if(-e $tmp1){ + unless(rename($tmp1,$tmp2)){ } + } elsif(-e $tmp2){ + unlink $tmp2; + } + $tmp1=$oRN.'.bak'; + $tmp2=$nRN.'.bak'; + if(-e $tmp1){ + unless(rename($tmp1,$tmp2)){ } + } elsif(-e $tmp2){ + unlink $tmp2; + } + } else { + $request->print("".&mt('No such file').": ".&display($oldfile).'
'); + return 0; + } + return 1; +} - if ($ENV{'form.action'} eq 'rename') { - if (-e $conspace) { - if ($ENV{'form.newfilename'}) { - unless (rename($fn, - '/home/'.$uname.'/public_html'.$dir.'/'.$ENV{'form.newfilename'})) { - $r->print('Error: '.$!.''); - } - } - } else { - $r->print('No such file.'); - return; - } - } elsif ($ENV{'form.action'} eq 'delete') { - if (-e $conspace) { - unless (unlink($fn)) { - $r->print('Error: '.$!.''); - } - } else { - $r->print('
No such file.'); - return; - } - } elsif ($ENV{'form.action'} eq 'copy') { - if (-e $conspace) { - if ($ENV{'form.newfilename'}) { - unless (copy($fn, - '/home/'.$uname.'/public_html'.$dir.'/'.$ENV{'form.newfilename'})) { - $r->print('Error: '.$!.''); - } +=pod + +=item Delete2($request, $user, $filename) + + Performs phase two of a delete. The user has confirmed that they want +to delete the selected file. The file is deleted and the results of the +delete attempt are indicated. + +Parameters: + +=over 4 + +=item $request - Apache Request object [in] the request object for the current + delete operation. + +=item $user - string [in] The name of the user initiating the delete + request. + +=item $filename - string [in] The name of the file, relative to construction + space, to delete. + +=back + +Returns: + 1 - success. + 0 - Failure. + +=cut + +sub Delete2 { + my ($request, $user, $filename) = @_; + if (-d $filename) { + unless (&empty_directory($filename,'Delete2')) { + $request->print(''.&mt('Error: Directory Non Empty').''); + return 0; + } else { + if(-e $filename) { + unless(rmdir($filename)) { + $request->print(''.&mt('Error').': '.$!.''); + return 0; + } } else { - $r->print('
No new filename specified.'); - return; + $request->print('
'.&mt('No such file').'.
'); + return 0; } - } else { - $r->print('No such file.'); - return; - } - } elsif ($ENV{'form.action'} eq 'newdir') { - my $newdir= $fn.$ENV{'form.newfilename'}; + } + } else { + if(-e $filename) { + unless(unlink($filename)) { + $request->print(''.&mt('Error').': '.$!.''); + return 0; + } + } else { + $request->print('
'.&mt('No such file').'.
'); + return 0; + } + } + return 1; +} + +=pod + +=item Copy2($request, $username, $dir, $oldfile, $newfile) + + Performs phase 2 of a copy. The file is copied and the status + of that copy is reported back to the user. + +=over 4 + +=item $request - Apache request object [in]; the apache request currently + being executed. + +=item $username - string [in] Name of the user who is requesting the copy. + +=item $dir - string [in] Directory path relative to the construction space + of the destination file. - &Debug($r, "loncfile::phasetwo - new directory name: $newdir"); +=item $oldfile - string [in] Name of the source file. - unless (mkdir($newdir,0770)) { - $r->print('Error: '.$!.''); - &Debug($r, "loncfile::phasetwo - mkdir failed $!"); +=item $newfile - string [in] Name of the destination file. + + +=back + +Returns 0 failure, and 1 successs. + +=cut + +sub Copy2 { + my ($request, $username, $dir, $oldfile, $newfile) = @_; + &Debug($request ,"Will try to copy $oldfile to $newfile"); + if(-e $oldfile) { + if ($oldfile eq $newfile) { + $request->print(''.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.'); + return 1; } - &Debug($r, "Done button: uname = $uname, dir = $dir, fn = $fn"); - my $url = '/priv/'.$uname.$newdir.'/'; - &Debug($r, "URL[1] = ".$url); - $url =~ s/\/home\/$uname\/public_html//o; - &Debug($r, "URL = ".$url); + unless (copy($oldfile, $newfile)) { + $request->print(''.&mt('copy Error').': '.$!.''); + return 0; + } elsif (!chmod(0660, $newfile)) { + $request->print(''.&mt('chmod error').': '.$!.''); + return 0; + } elsif (-e $oldfile.'.meta' && + !copy($oldfile.'.meta', $newfile.'.meta') && + !chmod(0660, $newfile.'.meta')) { + $request->print(''.&mt('copy metadata error'). + ': '.$!.''); + return 0; + } else { + return 1; + } + } else { + $request->print(''.&mt('No such file').'
'); + return 0; + } + return 1; +} - $r->print(''.&mt('No New filename specified').'
'); + return; + } + + } elsif ($env{'form.action'} eq 'newdir') { + my $newdir= $env{'form.newfilename'}; + if(!&NewDir2($r, $uname, $newdir)) { + return; + } + $dest = $newdir."/"; + } + if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { + $r->print('Unknown Action'); - return OK; - } - if ($ENV{'form.phase'} eq 'two') { - &Debug($r, "loncfile::handler entering phase2"); - &phasetwo($r,$fn,$uname,$udom); - } else { - &Debug($r, "loncfile::handler entering phase1"); - &phaseone($r,$fn,$uname,$udom); - } + if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { + $r->print('
' + .&mt('Co-Author [_1]',$uname.':'.$udom) + .'
' + ); + } + + + &Debug($r, "loncfile::handler Form action is $env{'form.action'} "); + if ($env{'form.action'} eq 'delete') { + $r->print(''.&mt('Unknown Action').' '.$env{'form.action'}.'
'. + &Apache::loncommon::end_page()); + return OK; + } + if ($env{'form.phase'} eq 'two') { + &Debug($r, "loncfile::handler entering phase2"); + &phasetwo($r,$fn,$uname,$udom); + } else { + &Debug($r, "loncfile::handler entering phase1"); + &phaseone($r,$fn,$uname,$udom); + } - $r->print('