--- loncom/publisher/loncfile.pm 2003/12/15 20:44:06 1.47 +++ loncom/publisher/loncfile.pm 2006/11/23 01:50:57 1.79 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.47 2003/12/15 20:44:06 sakharuk Exp $ +# $Id: loncfile.pm,v 1.79 2006/11/23 01:50:57 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,10 +69,12 @@ 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 lib '/home/httpd/lib/perl/'; +use LONCAPA; + my $DEBUG=0; my $r; # Needs to be global for some stuff RF. @@ -101,18 +103,11 @@ 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) { - $r->log_reason($message); - } + # Put out the indicated message butonly if DEBUG is true. + if ($DEBUG) { + my ($r,$message) = @_; + $r->log_reason($message); + } } =pod @@ -151,19 +146,20 @@ Global References =cut sub URLToPath { - my $Url = shift; - &Debug($r, "UrlToPath got: $Url"); - $Url=~ s/\/+/\//g; - $Url=~ s/^http\:\/\/[^\/]+//; - $Url=~ s/^\///; - $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//; - &Debug($r, "Returning $Url \n"); - return $Url; + my $Url = shift; + &Debug($r, "UrlToPath got: $Url"); + $Url=~ s/\/+/\//g; + $Url=~ s/^http\:\/\/[^\/]+//; + $Url=~ s/^\///; + $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//; + &Debug($r, "Returning $Url \n"); + return $Url; } sub url { my $fn=shift; $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/; + $fn=&HTML::Entities::encode($fn,'<>"&'); return $fn; } @@ -173,6 +169,53 @@ sub display { return ''.$fn.''; } + +# 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; + } +} + +# 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, $file) @@ -206,21 +249,20 @@ Returns: =cut sub exists { - my ($user, $domain, $construct) = @_; - my $published=$construct; - $published=~ -s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; - my $result=''; - if ( -d $construct ) { - return &mt('Error: destination for operation is an existing directory.'); - } - if ( -e $published) { - $result.='

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

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

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

'; - } - return $result; - + my ($user, $domain, $construct) = @_; + my $published=$construct; + $published=~ + s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; + my $result=''; + if ( -d $construct ) { + return &mt('Error: destination for operation is an existing directory.'); + } + if ( -e $published) { + $result.='

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

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

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

'; + } + return $result; } =pod @@ -267,11 +309,27 @@ sub checksuffix { } sub cleanDest { - my ($request,$dest)=@_; + my ($request,$dest,$subdir,$fn,$uname)=@_; #remove bad characters - if ($dest=~/[\#\?&]/) { + my $foundbad=0; + if ($subdir && $dest =~/\./) { + $foundbad=1; + $dest=~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.','"'.$newpath.'"')."

"); + $dest=~s|.*/||; + } + } + if ($foundbad) { $request->print("

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

"); - $dest=~s/[\#\?&]//g; } return $dest; } @@ -312,10 +370,10 @@ Parameters: =cut sub CloseForm1 { - my ($request, $fn) = @_; - $request->print('

'); - $request->print('

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

'); + $request->print('

'); } @@ -344,8 +402,8 @@ Parameters: =cut sub CloseForm2 { - my ($request, $user, $fn) = @_; - $request->print('

'.&mt('Done').'

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

'.&mt('Done').'

'); } =pod @@ -384,13 +442,15 @@ new filename relative to the current dir =cut sub Rename1 { - my ($request, $user, $domain, $fn, $newfilename) = @_; + my ($request, $user, $domain, $fn, $newfilename, $style) = @_; if(-e $fn) { if($newfilename) { # is dest a dir - if (-d $newfilename) { - if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; } + if ($style eq 'move') { + if (-d $newfilename) { + if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; } + } } if ($newfilename =~ m|/[^\.]+$|) { #no extension add on original extension @@ -402,6 +462,14 @@ sub Rename1 { #renaming a dir, delete the trailing / #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/; } $newfilename=~s://+:/:g; # remove duplicate / @@ -414,9 +482,20 @@ sub Rename1 { $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 $action; + if ($style eq 'rename') { + $action=&mt('Rename'); + } else { + $action=&mt('Move'); + } $request->print('

'.&mt('Rename').' '.&display($fn). + '" />

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

'); &CloseForm1($request, $fn); } else { @@ -429,6 +508,7 @@ sub Rename1 { } } + =pod =item Delete1 @@ -454,16 +534,30 @@ Parameters: =cut sub Delete1 { - my ($request, $user, $domain, $fn) = @_; + my ($request, $user, $domain, $fn) = @_; - if( -e $fn) { - $request->print(''); - $request->print('

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

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

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

'); - } + 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 @@ -565,32 +659,37 @@ causes the newdir operation to transitio =cut -sub NewDir1 -{ - my ($request, $username, $domain, $fn, $newfilename) = @_; - - my $result=&exists($username,$domain,$newfilename); - if ($result) { - $request->print(''.$result.''); - } else { - $request->print('

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

'); - &CloseForm1($request, $fn); - } +sub NewDir1 { + my ($request, $username, $domain, $fn, $newfilename, $mode) = @_; + + my $result=&exists($username,$domain,$newfilename); + if ($result) { + $request->print(''.$result.''); + } 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) { + 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).'

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

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

'); + } } + =pod =item NewFile1 @@ -631,17 +730,22 @@ button which returns you to the driector =cut - sub NewFile1 { 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('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; } @@ -695,43 +799,53 @@ performed and reported to the user. =cut sub phaseone { - my ($r,$fn,$uname,$udom)=@_; + my ($r,$fn,$uname,$udom)=@_; - my $newfilename=&cleanDest($r,$ENV{'form.newfilename'}); - $newfilename=&relativeDest($fn,$newfilename,$uname); - $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') { - &Rename1($r, $uname, $udom, $fn, $newfilename); - } 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') { - &NewDir1($r, $uname, $udom, $fn, $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' || - $ENV{'form.action'} eq 'newrightsfile' || - $ENV{'form.action'} eq 'newstyfile' || - $ENV{'form.action'} eq 'Select Action') { - if ($newfilename) { - &NewFile1($r, $uname, $udom, $fn, $newfilename); - } else { - $r->print('

'.&mt('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 '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 @@ -770,57 +884,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 $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; + &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) @@ -851,42 +966,34 @@ Returns: =cut sub Delete2 { - my ($request, $user, $filename) = @_; - if(opendir DIR, $filename) { - my @files=readdir(DIR); - shift @files; shift @files; # takes off . and .. - if(@files) { - $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').'.

print(''.&mt('Error').': '.$!.''); - return 0; - } - } - else { - $request->print('

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

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; + } } - return 1; + } 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 @@ -913,7 +1020,7 @@ sub Delete2 { =back -Returns 0 failure, and 0 successs. +Returns 0 failure, and 1 successs. =cut @@ -921,14 +1028,23 @@ 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; + } 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 { - unless (chmod(0660, $newfile)) { - $request->print(' '.&mt('chmod error').': '.$!.''); - return 0; - } return 1; } } else { @@ -937,6 +1053,7 @@ sub Copy2 { } return 1; } + =pod =item NewDir2($request, $user, $newdirectory) @@ -960,28 +1077,30 @@ Returns 0 - failure 1 - success. =cut sub NewDir2 { - my ($request, $user, $newdirectory) = @_; + my ($request, $user, $newdirectory) = @_; - unless(mkdir($newdirectory, 02770)) { - $request->print(''.&mt('Error').': '.$!.''); - return 0; - } - unless(chmod(02770, ($newdirectory))) { - $request->print(' '.&mt('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; + 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 =item phasetwo($r, $fn, $uname, $udom) @@ -1019,7 +1138,7 @@ 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. @@ -1027,190 +1146,214 @@ sub phasetwo { if ($fn=~m:(.*)/([^/]+):) { $dir=$1; # Directory path $main=$2; # Filename. - } - if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions - $main=$`; - $suffix=$1; - } - 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 'decompress') { - $main .= '.'; - $main .= $suffix; - if(!&decompress2($r, $uname, $dir, $main)) { - return ; - } - $dest = $dir."/."; - - - } elsif ($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; } - $dest = &url($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'})) { + } 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 { + } + $dest = $env{'form.newfilename'}; + } else { $r->print('

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

'); return; } - } elsif ($ENV{'form.action'} eq 'newdir') { - my $newdir= $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('

'.&mt('Done').'

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

'.&mt('Done').'

'); } sub handler { - $r=shift; + $r=shift; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']); - &Debug($r, "loncfile.pm - handler entered"); - &Debug($r, " filename: ".$ENV{'form.filename'}); - &Debug($r, " newfilename: ".$ENV{'form.newfilename'}); + &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; + my $fn; - if ($ENV{'form.filename'}) { - - &Debug($r, "test: $ENV{'form.filename'}"); - $fn=&Apache::lonnet::unescape($ENV{'form.filename'}); - $fn=&URLToPath($fn); - } - #Just hijack the script only the first time around to inject the correct information for further processing - elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') { - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress']); - $fn=&Apache::lonnet::unescape($ENV{'form.decompress'}); + 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"; - } + $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; + } - 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; - } - - 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; - - ($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; - } + 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; + } - $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(&Apache::loncommon::bodytag('Construction Space File Operation')); + 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('

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

'); + $r->print('

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

'); - 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 '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 'Select Action' ) { - $r->print('

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

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

'.&mt('Unknown Action').' '.$ENV{'form.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 '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;