--- loncom/publisher/loncfile.pm 2003/03/10 18:34:14 1.29 +++ loncom/publisher/loncfile.pm 2008/05/27 17:33:28 1.89 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.29 2003/03/10 18:34:14 albertel Exp $ +# $Id: loncfile.pm,v 1.89 2008/05/27 17:33:28 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,27 +33,6 @@ # # 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. -# 05/28/02 Ron Fox: -# - Started putting in pod in standard format. =pod =head1 NAME @@ -90,8 +69,11 @@ 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. @@ -120,18 +102,22 @@ my $r; # Needs to be global for some =cut sub Debug { - - # Marshall the parameters. - - 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); - } + # Put out the indicated message butonly if DEBUG is true. + if ($DEBUG) { + my ($r,$message) = @_; + $r->log_reason($message); + } +} + +sub done { + my ($url)=@_; + my $done=&mt("Done"); + return(<$done + +ENDDONE } =pod @@ -170,122 +156,79 @@ Global References =cut sub URLToPath { - my $Url = shift; - &Debug($r, "UrlToPath got: $Url"); - $Url=~ s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; - $Url=~ s/^http\:\/\/[^\/]+//; - &Debug($r, "Returning $Url \n"); - return $Url; -} - -=pod - -=item PublicationPath($domain, $user, $dir, $file) - - Determines the filesystem path corresponding to a published resource - specification. The returned value is the path. -Parameters: - -=over 4 - -=item $domain - string [in] Name of the domain within which the resource is - stored. - -=item $user - string [in] Name of the user asking about the resource. - -=item $dir - Directory path relative to the top of the resource space. - -=item $file - name of the resource file itself without path info. - -=back - -=over 4 - -Returns: - -=item string - full path to the file if it exists in publication space. - -=back - -=cut - -sub PublicationPath -{ - my ($domain, $user, $dir, $file)=@_; - - return '/home/httpd/html/res/'.$domain.'/'.$user.'/'.$dir.'/'. - $file; + my $Url = shift; + &Debug($r, "UrlToPath got: $Url"); + $Url=~ s/\/+/\//g; + $Url=~ s/^http\:\/\/[^\/]+//; + $Url=~ s/^\///; + $Url=~ s/(\~|priv\/)($match_username)\//\/home\/$2\/public_html\//; + &Debug($r, "Returning $Url \n"); + return $Url; +} + +sub url { + my $fn=shift; + $fn=~s/^\/home\/($match_username)\/public\_html/\/priv\/$1/; + $fn=&HTML::Entities::encode($fn,'<>"&'); + return $fn; +} + +sub display { + my $fn=shift; + $fn=~s-^/home/($match_username)/public_html-/priv/$1-; + return ''.$fn.''; } -=pod - -=item ConstructionPath($domain, $user, $dir, $file) - - Determines the filesystem path corresponding to a construction space - resource specification. The returned value is the path -Parameters: - -=over 4 - -=item $user - string [in] Name of the user asking about the resource. - -=item $dir - Directory path relative to the top of the resource space. - -=item $file - name of the resource file itself without path info. - -Returns: - -=item string - full path to the file if it exists in Construction space. - -=back - -=cut - -sub ConstructionPath { - my ($user, $dir, $file) = @_; - - return '/home/'.$user.'/public_html/'.$dir.'/'.$file; +# see if the file is +# a) published (return 0 if not) +# b) if, so obsolete (return 0 if not) + +sub obsolete_unpub { + my ($user,$domain,$construct)=@_; + my $published=$construct; + $published=~ + s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; + if (-e $published) { + if (&Apache::lonnet::metadata($published,'obsolete')) { + return 1; + } + return 0; + } else { + return 1; + } } -=pod - -=item ConstructionPathFromRelative($user, $relname) - - Determines the path to a construction space file given -the username and the path relative to the root of construction space. - -Parameters: - -=over 4 - -=item $user - string [in] Name of the user in whose construction space the - file [will] live. - -=item $relname - string[in] Path to the file relative to the root of the - construction space. - -=back - -Returns: - -=over 4 - -=item string - Full path to the file. - -=back - -=cut - -sub ConstructionPathFromRelative { - - my ($user, $relname) = @_; - return '/home/'.$user.'/public_html'.$relname; +# see if directory is empty +# ignores any .meta, .save, .bak, and .log files created for a previously +# published file, which has since been marked obsolete and deleted. +sub empty_directory { + my ($dirname,$phase) = @_; + if (opendir DIR, $dirname) { + my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and .. + if (@files) { + my @orphans = grep(/\.(meta|save|log|bak)$/,@files); + if (scalar(@files) - scalar(@orphans) > 0) { + return 0; + } else { + if (($phase eq 'Delete2') && (@orphans > 0)) { + foreach my $file (@orphans) { + if ($file =~ /\.(meta|save|log|bak)$/) { + unlink($dirname.$file); + } + } + } + } + } + closedir(DIR); + return 1; + } + return 0; } =pod -=item exists($user, $domain, $directory, $file) +=item exists($user, $domain, $file) Determine if a resource file name has been published or exists in the construction space. @@ -294,15 +237,16 @@ sub ConstructionPathFromRelative { =over 4 -=item $user - string [in] - Name of the user for which to check. +=item $user - string [in] - Name of the user for which to check. -=item $domain - string [in] - Name of the domain in which the resource +=item $domain - string [in] - Name of the domain in which the resource might have been published. -=item $dir - string [in] - Path relative to construction or resource space - in which the resource might live. +=item $file - string [in] - Name of the file. -=item $file - string [in] - Name of the file. +=item $creating - string [in] - optional, type of object being created, + either 'directory' or 'file'. Defaults to + 'file' if unspecified. =back @@ -310,6 +254,9 @@ Returns: =over 4 +=item string - Either undef, 'warning' or 'error' depending on the + type of problem + =item string - Either where the resource exists as an html string that can be embedded in a dialog or an empty string if the resource does not exist. @@ -319,30 +266,39 @@ Returns: =cut sub exists { - my ($user, $domain, $dir, $file) = @_; + my ($user, $domain, $construct, $creating) = @_; + $creating ||= 'file'; + + my $published=$construct; + $published=~ + s{^/home/$user/public_html/}{/home/httpd/html/res/$domain/$user/}; + my ($type,$result); + if ( -d $construct ) { + return ('error','

'.&mt('Error: destination for operation is an existing directory.').'

'); + + } - # Create complete paths in publication and construction space. - my $relativedir=$dir; - $relativedir=s|/home/\Q$user\E/public_html||; - my $published = &PublicationPath($domain, $user, $relativedir, $file); - my $construct = &ConstructionPath($user, $relativedir, $file); - - # If the resource exists in either space indicate this fact. - # Note that the check for existence in resource space is stricter. - - my $result; - if ( -d $construct ) { - return 'Error: destination for operation is a directory.'; - } - if ( -e $published) { - $result.='

Warning: target file exists, and has been published!

'; - } - elsif ( -e $construct) { - $result.='

Warning: target file exists!

'; - } + if ( -e $published) { + if ( -e $construct ) { + $type = 'warning'; + $result.='

'.&mt('Warning: target file exists, and has been published!').'

'; + } else { + my $published_type = (-d $published) ? 'directory' : 'file'; - return $result; + if ($published_type eq $creating) { + $type = 'warning'; + $result.='

'.&mt("Warning: a published $published_type of this name exists.").'

'; + } else { + $type = 'error'; + $result.='

'.&mt("Error: a published $published_type of this name exists.").'

'; + } + } + } elsif ( -e $construct) { + $type = 'warning'; + $result.='

'.&mt('Warning: target file exists!').'

'; + } + return ($type,$result); } =pod @@ -381,12 +337,63 @@ sub checksuffix { my $newsuffix; if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; } if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; } - if ($oldsuffix ne $newsuffix) { + if (lc($oldsuffix) ne lc($newsuffix)) { $result.= - '

Warning: change of MIME type!

'; + '

'.&mt('Warning: change of MIME type!').'

'; } return $result; } + +sub cleanDest { + my ($request,$dest,$subdir,$fn,$uname)=@_; + #remove bad characters + my $foundbad=0; + if ($subdir && $dest =~/\./) { + $foundbad=1; + $dest=~s/\.//g; + } + $dest =~ s/(\s+$|^\s+)//g; + if ($dest=~/[\#\?&%\":]/) { + $foundbad=1; + $dest=~s/[\#\?&%\":]//g; + } + if ($dest=~m|/|) { + my ($newpath)=($dest=~m|(.*)/|); + $newpath=&relativeDest($fn,$newpath,$uname); + if (! -d "$newpath") { + $request->print("

".&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).'"')."

"); + $dest=~s|.*/||; + } + } + if ($dest =~ /\.(\d+)\.(\w+)$/){ + $request->print('' + .&mt('Bad filename [_1].
(name).(number).(extension) not allowed.
Removing the .number. from requested filename.',&display($dest)) + .'
'); + $dest =~ s/\.(\d+)(\.\w+)$/$2/; + } + if ($foundbad) { + $request->print("

".&mt('Invalid characters in requested name have been removed.')."

"); + } + return $dest; +} + +sub relativeDest { + my ($fn,$newfilename,$uname)=@_; + if ($newfilename=~/^\//) { +# absolute, simply add path + $newfilename='/home/'.$uname.'/public_html/'; + } else { + my $dir=$fn; + $dir=~s/\/[^\/]+$//; + $newfilename=$dir.'/'.$newfilename; + } + $newfilename=~s://+:/:g; # remove duplicate / + while ($newfilename=~m:/\.\./:) { + $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. + } + return $newfilename; +} + =pod =item CloseForm1($request, $user, $file) @@ -406,14 +413,10 @@ Parameters: =cut sub CloseForm1 { - my ($request, $cancelurl) = @_; - - - &Debug($request, "Cancel url is: ".$cancelurl); - $request->print('

'); - $request->print('

'); - + my ($request, $fn) = @_; + $request->print('

'); + $request->print('

'); } @@ -442,9 +445,8 @@ Parameters: =cut sub CloseForm2 { - my ($request, $user, $directory) = @_; - - $request->print('

Done

'); + my ($request, $user, $fn) = @_; + $request->print(&done(&url($fn))); } =pod @@ -483,53 +485,73 @@ new filename relative to the current dir =cut sub Rename1 { - my ($request, $filename, $user, $domain, $dir) = @_; - &Debug($request, "Username - ".$user." filename: ".$filename."\n"); - my $conspace = $filename; - - my $cancelurl = "/priv/".$filename; - $cancelurl =~ s/\/home\///; - $cancelurl =~ s/\/public_html//; - - if(-e $conspace) { - if($ENV{'form.newfilename'}) { - my $newfilename = $ENV{'form.newfilename'}; + my ($request, $user, $domain, $fn, $newfilename, $style) = @_; + + if(-e $fn) { + if($newfilename) { + # is dest a dir + if ($style eq 'move') { + if (-d $newfilename) { + if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; } + } + } if ($newfilename =~ m|/[^\.]+$|) { - #no extension add on orignal extension - if ($filename =~ m|/[^\.]*\.([^\.]+)$|) { + #no extension add on original extension + if ($fn =~ m|/[^\.]*\.([^\.]+)$|) { $newfilename.='.'.$1; } } - $request->print(&checksuffix($filename, $newfilename)); + $request->print(&checksuffix($fn, $newfilename)); #renaming a dir, delete the trailing / - #remove last element for current dir - if ($filename =~ m|/$|) { - $filename =~ s|/$||; - $dir =~ s|/[^/]*$||; + #remove second to last element for current dir + if (-d $fn) { + $newfilename=~/\.(\w+)$/; + if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { + $request->print('
'. + &mt('Cannot change MIME type of a directory'). + ''. + '
'.&mt('Cancel').''); + return; + } + $newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/; } - my $return=&exists($user, $domain, $dir, $newfilename); + $newfilename=~s://+:/:g; # remove duplicate / + while ($newfilename=~m:/\.\./:) { + $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. + } + my ($type, $return)=&exists($user, $domain, $newfilename); $request->print($return); - if ($return =~/^Error:/) { - $request->print('
Cancel'); + if ($type eq 'error') { + $request->print('
'.&mt('Cancel').''); + return; + } + unless (&obsolete_unpub($user,$domain,$fn)) { + $request->print('

'.&mt('Cannot rename or move non-obsolete published file').'

'. + '
'.&mt('Cancel').''); return; } - my $dest=&SimplifyDir($dir,$newfilename); + my $action; + if ($style eq 'rename') { + $action=&mt('Rename'); + } else { + $action=&mt('Move'); + } $request->print('

Rename '.$filename. - '
to '. - $dest.'?

'); - &CloseForm1($request, $cancelurl); + '" />

'.$action.' '.&display($fn). + '


to '.&display($newfilename).'?

'); + &CloseForm1($request, $fn); } else { - $request->print('

No new filename specified

'); + $request->print('

'.&mt('No new filename specified.').'

'); return; } } else { - $request->print('

No such File

'); + $request->print('

'.&mt('No such file').': '.&display($fn).'

'); return; } } + =pod =item Delete1 @@ -541,35 +563,44 @@ Parameters: =over 4 -=item $request - Apache Request Object [in] request object for the current +=item $request - Apache Request Object [in] request object for the current request. -=item $user - string [in] Name of session user. +=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] Name fo the file to be deleted: - Filename is the full filesystem path to the file. +=item $filename - string [in] Source filename. =back =cut sub Delete1 { - my ($request, $user, $filename) = @_; - - my $cancelurl = '/priv/'.$filename; - $cancelurl =~ s/\/home\///; - $cancelurl =~ s/\/public_html//; - + my ($request, $user, $domain, $fn) = @_; - if( -e $filename) { - $request->print(''); - $request->print('

Delete '.$filename.'?

'); - &CloseForm1($request, $cancelurl); - } else { - $request->print('

No Such file: '.$filename.'

'); - } + if( -e $fn) { + $request->print(''); + if (-d $fn) { + unless (&empty_directory($fn,'Delete1')) { + $request->print('

'.&mt('Only empty directories may be deleted.').'

'. + 'You must delete the contents of the directory first.
'. + '
'.&mt('Cancel').''); + return; + } + } else { + unless (&obsolete_unpub($user,$domain,$fn)) { + $request->print('

'.&mt('Cannot delete non-obsolete published file').'

'. + '
'.&mt('Cancel').''); + return; + } + } + $request->print('

'.&mt('Delete').' '.&display($fn).'?

'); + &CloseForm1($request, $fn); + } else { + $request->print('

'.&mt('No such file').': '.&display($fn).'

'); + } } =pod @@ -591,9 +622,7 @@ Parameters: =item $domain - string [in] Domain the initiating user is logged in as -=item $dir - string [in] Directory path. - -=item $filename - string [in] Source filename. +=item $fn - string [in] Source filename. =item $newfilename-string [in] Destination filename. @@ -602,58 +631,36 @@ Parameters: =cut sub Copy1 { - my ($request, $user, $domain, $dir, $filename, $newfilename) = @_; + my ($request, $user, $domain, $fn, $newfilename) = @_; - my $cancelurl = "/priv/".$filename; - $cancelurl =~ s/\/home\///; - $cancelurl =~ s/\/public_html//; - - - if(-e $filename) { - $request->print(&checksuffix($filename,$newfilename)); - my $return=&exists($user, $domain, $dir, $newfilename); - $request->print($return); - if ($return =~/^Error:/) { - $request->print('
Cancel'); - return; + 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('Cancel').''); + return; + } + $request->print('

'.&mt('Copy').' '.&display($fn).'
to '. + &display($newfilename).'?

'); + &CloseForm1($request, $fn); + } else { + $request->print('

'.&mt('No such file').': '.&display($fn).'

'); } - my $dest=&SimplifyDir($dir,$newfilename); - $request->print('

Copy '.$filename.'
to '. - ''.$dest.'?

'); - &CloseForm1($request, $cancelurl); - } else { - $request->print('

No such file '.$filename.'

'); - } -} - -=pod - -=item SimplifyDir - - Removes all extra / and all .. references - -Parameters: - -=over 4 - -=item $dir - string [in] a directory name - -=item $file - string [in] a file reference relative to $dir - -=back - -Results: the concatenated path. - -=cut - -sub SimplifyDir { - my ($dir,$file) = @_; - my $location = $dir. '/'.$file; - $location=~s://+:/:g; # remove duplicate / - while ($location=~m:/\.\./:) {$location=~s:/[^/]+/\.\./:/:g;}#remove dir/.. - return $location; } =pod @@ -673,7 +680,9 @@ Parameters: =item $username - Name of the user that is requesting the directory creation. -=item $path - current directory relative to construction space. +=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. @@ -693,27 +702,36 @@ causes the newdir operation to transitio =cut -sub NewDir1 -{ - my ($request, $username, $path, $newdir) = @_; - - my $fullpath = '/home/'.$username.'/public_html/'. - $path.'/'.$newdir; - - my $cancelurl = '/priv/'.$username.'/'.$path; - - &Debug($request, "Full path is : ".$fullpath); - - if(-e $fullpath) { - $request->print('

Directory exists.

'); - } - else { - $request->print('

Make new directory '. - $path."/".$newdir.'?

'); - &CloseForm1($request, $cancelurl); +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 @@ -737,7 +755,7 @@ Parameters: =item $domain - Name of the domain of the user -=item $dir - current absolute diretory +=item $fn - Source file name =item $newfilename - Name of the file to be created; no path information @@ -749,52 +767,52 @@ Side Effects: =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 Cancle +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, $dir, $newfilename) = @_; - - &Debug($request, "Dir is : ".$dir); - &Debug($request, "Newfile is : ".$newfilename); - - my $cancelurl = "/priv/".$dir; - $cancelurl =~ s/\/home\///; - $cancelurl =~ s/\/public_html//; + my ($request, $user, $domain, $fn, $newfilename) = @_; - if ($ENV{'form.action'} =~ /new(.+)file/) { + if ($env{'form.action'} =~ /new(.+)file/) { my $extension=$1; + + ##Informs User (name).(number).(extension) not allowed + if($newfilename =~ /\.(\d+)\.(\w+)$/){ + $r->print(''.$newfilename. + ' - '.&mt('Bad Filename').'
('.&mt('name').').('.&mt('number').').('.&mt('extension').') '. + ' '.&mt('Not Allowed').'
'); + return; + } + if($newfilename =~ /(\:\:\:|\&\&\&|\_\_\_)/){ + $r->print(''.$newfilename. + ' - '.&mt('Bad Filename').'
('.&mt('Must not include').' '.$1.') '. + ' '.&mt('Not Allowed').'
'); + return; + } if ($newfilename !~ /\Q.$extension\E$/) { - if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) { + if ($newfilename =~ m|/[^/.]*\.(?:[^/.]+)$|) { #already has an extension strip it and add in expected one - $newfilename =~ s|.([^\.]+)$||; + $newfilename =~ s|(/[^./])\.(?:[^.]+)$|$1|; } $newfilename.=".$extension"; } } - - my $fullpath = $dir.'/'.$newfilename; - - &Debug($request, "Full path is : ".$fullpath); - - if(-e $fullpath) { - $request->print('

File exists.

'); - } - else { - $request->print('

Make new file '.$dir.'/'.$newfilename.'?

'); - my $dest=&MakeFinalUrl($request,$fullpath); - &Debug($request, "Cancel url is: ".$cancelurl); - &Debug($request, "Dest url is: ".$dest); + my ($type, $result)=&exists($user,$domain,$newfilename); + $request->print($result); + if ($type eq 'error') { $request->print(''); - $request->print('

'); - $request->print('

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

'.&mt('Make new file').' '.&display($newfilename).'?

'); + $request->print(''); + $request->print('

'); + $request->print('

'); } } @@ -827,56 +845,54 @@ performed and reported to the user. =cut sub phaseone { - my ($r,$fn,$uname,$udom)=@_; - - $fn=~m:(.*)/([^/]+)\.(\w+)$:; - my $dir=$1; - my $main=$2; - my $suffix=$3; - - # my $conspace=ConstructionPathFromRelative($uname, $fn); - + my ($r,$fn,$uname,$udom)=@_; - $r->print('
'. - ''. - ''. - ''); + my $doingdir=0; + if ($env{'form.action'} eq 'newdir') { $doingdir=1; } + my $newfilename=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname); + $newfilename=&relativeDest($fn,$newfilename,$uname); + $r->print(''. + ''. + ''. + ''); - if ($ENV{'form.action'} eq 'rename') { - if (!defined($dir)) { - $fn=~m:(.*)/:; - $dir=$1; - } - &Rename1($r, $fn, $uname, $udom, $dir); - } elsif ($ENV{'form.action'} eq 'delete') { - - &Delete1($r, $uname, $fn); - - } elsif ($ENV{'form.action'} eq 'copy') { - if($ENV{'form.newfilename'}) { - my $newfilename = $ENV{'form.newfilename'}; - &Copy1($r, $uname, $udom, $dir, $fn, $newfilename); - }else { - $r->print('

No new filename specified.

'); - } - } elsif ($ENV{'form.action'} eq 'newdir') { - &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'}); - } elsif ($ENV{'form.action'} eq 'newfile' || - $ENV{'form.action'} eq 'newhtmlfile' || - $ENV{'form.action'} eq 'newproblemfile' || - $ENV{'form.action'} eq 'newpagefile' || - $ENV{'form.action'} eq 'newsequencefile') { - if($ENV{'form.newfilename'}) { - my $newfilename = $ENV{'form.newfilename'}; - if (!defined($dir)) { - $fn=~m:(.*)/:; - $dir=$1; - } - &NewFile1($r, $uname, $udom, $dir, $newfilename); - } else { - $r->print('

No new filename specified.

'); - } - } + if ($env{'form.action'} eq 'rename') { + &Rename1($r, $uname, $udom, $fn, $newfilename, 'rename'); + } elsif ($env{'form.action'} eq 'move') { + &Rename1($r, $uname, $udom, $fn, $newfilename, 'move'); + } elsif ($env{'form.action'} eq 'delete') { + &Delete1($r, $uname, $udom, $fn); + } elsif ($env{'form.action'} eq 'decompress') { + &Decompress1($r, $uname, $udom, $fn); + } elsif ($env{'form.action'} eq 'copy') { + if($newfilename) { + &Copy1($r, $uname, $udom, $fn, $newfilename); + } else { + $r->print('

'.&mt('No new filename specified.').'

'); + } + } elsif ($env{'form.action'} eq 'newdir') { + my $mode = ''; + if (exists($env{'form.callingmode'}) ) { + $mode = $env{'form.callingmode'}; + } + &NewDir1($r, $uname, $udom, $fn, $newfilename, $mode); + } elsif ($env{'form.action'} eq 'newfile' || + $env{'form.action'} eq 'newhtmlfile' || + $env{'form.action'} eq 'newproblemfile' || + $env{'form.action'} eq 'newpagefile' || + $env{'form.action'} eq 'newsequencefile' || + $env{'form.action'} eq 'newrightsfile' || + $env{'form.action'} eq 'newstyfile' || + $env{'form.action'} eq 'newtaskfile' || + $env{'form.action'} eq 'newlibraryfile' || + $env{'form.action'} eq 'Select Action') { + my $empty=&mt('Type Name Here'); + if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) { + &NewFile1($r, $uname, $udom, $fn, $newfilename); + } else { + $r->print('

'.&mt('No new filename specified.').'

'); + } + } } =pod @@ -915,37 +931,58 @@ Returns: sub Rename2 { - my ($request, $user, $directory, $oldfile, $newfile) = @_; + 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 $dest; - - if ($oldfile =~ m|/$|) { - #renaming a dir - $oldfile =~ s|/$||; - $dest=$directory; - $dest=~s|(/)([^/]*)$|$1|; - $dest.='/'.$newfile; - } else { - $dest=$directory.'/'.$newfile; - } - - unless(rename($oldfile,$dest)) { - $request->print('Error: '.$!.''); - return 0; - } else {} - } else { - $request->print("

No such file: /home".$user.'/public_html'. - $oldfile.'

'); - return 0; - } - return 1; + &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; } + =pod =item Delete2($request, $user, $filename) @@ -976,18 +1013,34 @@ Returns: =cut sub Delete2 { - my ($request, $user, $filename) = @_; - - if(-e $filename) { - unless(unlink($filename)) { - $request->print('Error: '.$!.''); - return 0; + 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 { + $request->print('

'.&mt('No such file').'.

'); + return 0; + } + } + } else { + if(-e $filename) { + unless(unlink($filename)) { + $request->print(''.&mt('Error').': '.$!.''); + return 0; + } + } else { + $request->print('

'.&mt('No such file').'.

'); + return 0; + } } - } else { - $request->print('

No such file.

print(''.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.'); + return 1; + } unless (copy($oldfile, $newfile)) { - $request->print(' copy Error: '.$!.''); + $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 { - unless (chmod(0660, $newfile)) { - $request->print(' chmod error: '.$!.''); - return 0; - } return 1; } } else { - $request->print('

No such file

'); + $request->print('

'.&mt('No such file').'

'); return 0; } return 1; } + =pod =item NewDir2($request, $user, $newdirectory) @@ -1061,17 +1124,28 @@ Returns 0 - failure 1 - success. =cut sub NewDir2 { - my ($request, $user, $newdirectory) = @_; + my ($request, $user, $newdirectory) = @_; - unless(mkdir($newdirectory, 02770)) { - $request->print('Error: '.$!.''); - return 0; - } - unless(chmod(02770, ($newdirectory))) { - $request->print(' Error: '.$!.''); - return 0; - } - return 1; + unless(mkdir($newdirectory, 02770)) { + $request->print(''.&mt('Error').': '.$!.''); + return 0; + } + unless(chmod(02770, ($newdirectory))) { + $request->print(''.&mt('Error').': '.$!.''); + return 0; + } + return 1; +} + +sub decompress2 { + my ($r, $user, $dir, $file) = @_; + &Apache::lonnet::appenv({'cgi.file' => $file}); + &Apache::lonnet::appenv({'cgi.dir' => $dir}); + my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl'); + $r->print($result); + &Apache::lonnet::delenv('cgi.file'); + &Apache::lonnet::delenv('cgi.dir'); + return 1; } =pod @@ -1111,206 +1185,223 @@ sub phasetwo { &Debug($r, "loncfile - Entering phase 2 for $fn"); - # Break down the file into it's component pieces. + # Break down the file into its component pieces. my $dir; # Directory path my $main; # Filename. my $suffix; # Extension. - - if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) { + if ($fn=~m:(.*)/([^/]+):) { $dir=$1; # Directory path $main=$2; # Filename. - $suffix=$3; # Extension. } - - my $dest; # On success this is where we'll go. - - &Debug($r, - "loncfile::phase2 dir = $dir main = $main suffix = $suffix"); - &Debug($r, - " newfilename = ".$ENV{'form.newfilename'}); + if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions + $suffix=$1; #This is the actually filename extension if it exists + $main=~s/\.\w+$//; #strip the extension + } + my $dest; # + my $dest_dir; # On success this is where we'll go. + my $disp_newname; # + my $dest_newname; # + &Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix"); + &Debug($r," newfilename = ".$env{'form.newfilename'}); my $conspace=$fn; - &Debug($r, - "loncfile::phase2 Full construction space name: $conspace"); + &Debug($r,"loncfile::phase2 Full construction space name: $conspace"); - &Debug($r, - "loncfie::phase2 action is $ENV{'form.action'}"); + &Debug($r,"loncfie::phase2 action is $env{'form.action'}"); # Select the appropriate processing sub. - - if ($ENV{'form.action'} eq 'rename') { # Rename. - if($ENV{'form.newfilename'}) { + if ($env{'form.action'} eq 'decompress') { + $main .= '.'.$suffix; + if(!&decompress2($r, $uname, $dir, $main)) { + return ; + } + $dest = $dir."/."; + } elsif ($env{'form.action'} eq 'rename' || + $env{'form.action'} eq 'move') { + if($env{'form.newfilename'}) { if (!defined($dir)) { $fn=~m:^(.*)/:; - $dir=$1; + $dir=$1; } - if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) { + if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { return; } - # Prepend the directory to the new name to form the basis of the - # url of the new resource. - # - #renaming a dir - #remove last element for current dir - if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; } - $dest = $dir."/".$ENV{'form.newfilename'}; + $dest = $dir."/"; + $dest_newname = $env{'form.newfilename'}; + $env{'form.newfilename'} =~ /.+(\/.+$)/; + $disp_newname = $1; + $disp_newname =~ s/\///; } - } elsif ($ENV{'form.action'} eq 'delete') { - if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) { + } elsif ($env{'form.action'} eq 'delete') { + if(!&Delete2($r, $uname, $env{'form.newfilename'})) { return ; } # Once a resource is deleted, we just list the directory that # previously held it. # $dest = $dir."/."; # Parent dir. - } elsif ($ENV{'form.action'} eq 'copy') { - if($ENV{'form.newfilename'}) { - if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) { - return - } - $dest = $ENV{'form.newfilename'}; - - } else { - $r->print('

No New filename specified

'); + } elsif ($env{'form.action'} eq 'copy') { + if($env{'form.newfilename'}) { + if(!&Copy2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { + return ; + } + $dest = $env{'form.newfilename'}; + } else { + $r->print('

'.&mt('No New filename specified').'

'); return; } - } elsif ($ENV{'form.action'} eq 'newdir') { - # - # Since the newfilename form field is construction space - # relative, ew need to prepend the current path; now in $fn. - # - my $newdir= $fn.$ENV{'form.newfilename'}; + } elsif ($env{'form.action'} eq 'newdir') { + my $newdir= $env{'form.newfilename'}; if(!&NewDir2($r, $uname, $newdir)) { return; } - $dest = $newdir."/" + $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('

'.&mt('Done').'

'); + } else { + if ($env{'form.action'} eq 'rename') { + $r->print('

'.&mt('Return to Directory').'

'); + $r->print('

'.$disp_newname.'

'); + } else { + $r->print(&done(&url($dest))); + } } - # - # Substitute for priv for the first home in $dir to get our - # construction space path. - # - $dest=&MakeFinalUrl($r,$dest); - - $r->print('

Done

'); } -sub MakeFinalUrl { - my($r,$dest)=@_; - &Debug($r, "Final url is: $dest"); - $dest =~ s|/home/|/priv/|; - $dest =~ s|/public_html||; +sub handler { - my $base = &File::Basename::basename($dest); - my $dpath= &File::Basename::dirname($dest); - if ($base eq '.') { $base=''; } - $dest = &HTML::Entities::encode($dpath.'/'.$base); + $r=shift; - &Debug($r, "Final url after rewrite: $dest"); - return $dest; -} + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']); -sub handler { - - $r=shift; + &Debug($r, "loncfile.pm - handler entered"); + &Debug($r, " filename: ".$env{'form.filename'}); + &Debug($r, " newfilename: ".$env{'form.newfilename'}); +# +# Determine the root filename +# This could come in as "filename", which actually is a URL, or +# as "qualifiedfilename", which is indeed a real filename in filesystem +# + my $fn; + if ($env{'form.filename'}) { + &Debug($r, "test: $env{'form.filename'}"); + $fn=&unescape($env{'form.filename'}); + $fn=&URLToPath($fn); + } elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') { + #Just hijack the script only the first time around to inject the + #correct information for further processing + $fn=&unescape($env{'form.decompress'}); + $fn=&URLToPath($fn); + $env{'form.action'}="decompress"; + } elsif ($env{'form.qualifiedfilename'}) { + $fn=$env{'form.qualifiedfilename'}; + } else { + &Debug($r, "loncfile::handler - no form.filename"); + $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. + ' unspecified filename for cfile', $r->filename); + return HTTP_NOT_FOUND; + } - &Debug($r, "loncfile.pm - handler entered"); - &Debug($r, " filename: ".$ENV{'form.filename'}); - &Debug($r, " newfilename: ".$ENV{'form.newfilename'}); - - my $fn; - - if ($ENV{'form.filename'}) { - $fn=&Apache::lonnet::unescape($ENV{'form.filename'}); - &Debug($r, "loncfile::handler - raw url: $fn"); -# $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; -# $fn=~s/^http\:\/\/[^\/]+//; - $fn=URLToPath($fn); - &Debug($r, "loncfile::handler - doctored url: $fn"); - - } else { - &Debug($r, "loncfile::handler - no form.filename"); - $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. - ' unspecified filename for cfile', $r->filename); - return HTTP_NOT_FOUND; - } - - unless ($fn) { - &Debug($r, "loncfile::handler - doctored url is empty"); - $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. - ' trying to cfile non-existing file', $r->filename); - return HTTP_NOT_FOUND; - } + unless ($fn) { + &Debug($r, "loncfile::handler - doctored url is empty"); + $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. + ' trying to cfile non-existing file', $r->filename); + return HTTP_NOT_FOUND; + } # ----------------------------------------------------------- Start page output - my $uname; - my $udom; + my $uname; + my $udom; - ($uname,$udom)= - &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); - &Debug($r, - "loncfile::handler constructaccess uname = $uname domain = $udom"); - unless (($uname) && ($udom)) { - $r->log_reason($uname.' at '.$udom. - ' trying to manipulate file '.$ENV{'form.filename'}. - ' ('.$fn.') - not authorized', - $r->filename); - return HTTP_NOT_ACCEPTABLE; - } - - $fn=~s/\/\~(\w+)//; - &Debug($r, "loncfile::handler ~ removed filename: $fn"); + ($uname,$udom)= + &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); + &Debug($r, + "loncfile::handler constructaccess uname = $uname domain = $udom"); + unless (($uname) && ($udom)) { + $r->log_reason($uname.' at '.$udom. + ' trying to manipulate file '.$env{'form.filename'}. + ' ('.$fn.') - not authorized', + $r->filename); + return HTTP_NOT_ACCEPTABLE; + } - $r->content_type('text/html'); - $r->send_http_header; - $r->print('LON-CAPA Construction Space'); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; - $r->print( - ''); + my (%loaditem,$js); + if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { + my $newdirname = $env{'form.newfilename'}; + $js = qq| + +|; + $loaditem{'onload'} = "writeDone()"; + } + + $r->print(&Apache::loncommon::start_page('Construction Space File Operation', + $js, + {'add_entries' => \%loaditem,})); - $r->print('

Construction Space '.$fn.'

'); + $r->print('

'.&mt('Location').': '.&display($fn).'

'); - if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { - $r->print('

Co-Author: '.$uname.' at '.$udom. - '

'); - } - - - &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} "); - if ($ENV{'form.action'} eq 'delete') { - - $r->print('

Delete

'); - } elsif ($ENV{'form.action'} eq 'rename') { - $r->print('

Rename

'); - } elsif ($ENV{'form.action'} eq 'newdir') { - $r->print('

New Directory

'); - } elsif ($ENV{'form.action'} eq 'copy') { - $r->print('

Copy

'); - } elsif ($ENV{'form.action'} eq 'newfile' || - $ENV{'form.action'} eq 'newhtmlfile' || - $ENV{'form.action'} eq 'newproblemfile' || - $ENV{'form.action'} eq 'newpagefile' || - $ENV{'form.action'} eq 'newsequencefile' ) { - $r->print('

New Resource

'); - } else { - $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').': '.$uname.' at '.$udom. + '

'); + } + + + &Debug($r, "loncfile::handler Form action is $env{'form.action'} "); + if ($env{'form.action'} eq 'delete') { + $r->print('

'.&mt('Delete').'

'); + } elsif ($env{'form.action'} eq 'rename') { + $r->print('

'.&mt('Rename').'

'); + } elsif ($env{'form.action'} eq 'move') { + $r->print('

'.&mt('Move').'

'); + } elsif ($env{'form.action'} eq 'newdir') { + $r->print('

'.&mt('New Directory').'

'); + } elsif ($env{'form.action'} eq 'decompress') { + $r->print('

'.&mt('Decompress').'

'); + } elsif ($env{'form.action'} eq 'copy') { + $r->print('

'.&mt('Copy').'

'); + } elsif ($env{'form.action'} eq 'newfile' || + $env{'form.action'} eq 'newhtmlfile' || + $env{'form.action'} eq 'newproblemfile' || + $env{'form.action'} eq 'newpagefile' || + $env{'form.action'} eq 'newsequencefile' || + $env{'form.action'} eq 'newrightsfile' || + $env{'form.action'} eq 'newstyfile' || + $env{'form.action'} eq 'newtaskfile' || + $env{'form.action'} eq 'newlibraryfile' || + $env{'form.action'} eq 'Select Action' ) { + $r->print('

'.&mt('New Resource').'

'); + } else { + $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(''); - return OK; + $r->print(&Apache::loncommon::end_page()); + return OK; } 1;