--- loncom/publisher/loncfile.pm 2003/12/13 19:54:16 1.46 +++ loncom/publisher/loncfile.pm 2004/08/20 16:29:15 1.60 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.46 2003/12/13 19:54:16 taceyjo1 Exp $ +# $Id: loncfile.pm,v 1.60 2004/08/20 16:29:15 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,6 +72,7 @@ use Apache::loncacc; use Apache::Log (); use Apache::lonnet; use Apache::loncommon(); +use Apache::lonlocal; my $DEBUG=0; my $r; # Needs to be global for some stuff RF. @@ -101,17 +102,17 @@ my $r; # Needs to be global for some sub Debug { - # Marshall the parameters. + # Marshall the parameters. - my $r = shift; - my $log = $r->log; - my $message = shift; + my $r = shift; + my $log = $r->log; + my $message = shift; - # Put out the indicated message butonly if DEBUG is true. + # Put out the indicated message butonly if DEBUG is true. - if ($DEBUG) { - $r->log_reason($message); - } + if ($DEBUG) { + $r->log_reason($message); + } } =pod @@ -150,19 +151,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; } @@ -172,6 +174,28 @@ 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; + } +} + + + =pod =item exists($user, $domain, $file) @@ -205,21 +229,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 'Error: destination for operation is an existing directory.'; - } - if ( -e $published) { - $result.='
Warning: target file exists, and has been published!
'; - } elsif ( -e $construct) { - $result.='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 @@ -260,17 +283,25 @@ sub checksuffix { if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; } if ($oldsuffix ne $newsuffix) { $result.= - 'Warning: change of MIME type!
'; + ''.&mt('Warning: change of MIME type!').'
'; } return $result; } sub cleanDest { - my ($request,$dest)=@_; + my ($request,$dest,$subdir)=@_; #remove bad characters - if ($dest=~/[\#\?&]/) { - $request->print("Invalid characters in requested name have been removed.
"); - $dest=~s/[\#\?&]//g; + my $foundbad=0; + if ($subdir && $dest =~/\./) { + $foundbad=1; + $dest=~s/\.//g; + } + if ($dest=~/[\#\?&%\"]/) { + $foundbad=1; + $dest=~s/[\#\?&%\"]//g; + } + if ($foundbad) { + $request->print("".&mt('Invalid characters in requested name have been removed.')."
"); } return $dest; } @@ -311,10 +342,10 @@ Parameters: =cut sub CloseForm1 { - my ($request, $fn) = @_; - $request->print(''); - $request->print(''); + my ($request, $fn) = @_; + $request->print(''); + $request->print(''); } @@ -343,8 +374,8 @@ Parameters: =cut sub CloseForm2 { - my ($request, $user, $fn) = @_; - $request->print('Rename '.&display($fn). + '" />
'.$action.' '.&display($fn).
'
to '.&display($newfilename).'?
No new filename specified.
'); + $request->print(''.&mt('No new filename specified.').'
'); return; } } else { - $request->print('No such file: '.&display($fn).'
'); + $request->print(''.&mt('No such file').': '.&display($fn).'
'); return; } } + =pod =item Delete1 @@ -453,16 +506,21 @@ Parameters: =cut sub Delete1 { - my ($request, $user, $domain, $fn) = @_; + my ($request, $user, $domain, $fn) = @_; - if( -e $fn) { - $request->print(''); - $request->print('Delete '.&display($fn).'?
'); - &CloseForm1($request, $fn); - } else { - $request->print('No such file: '.&display($fn).'
'); - } + if( -e $fn) { + $request->print(''); + unless (&obsolete_unpub($user,$domain,$fn)) { + $request->print(''.&mt('Delete').' '.&display($fn).'?
'); + &CloseForm1($request, $fn); + } else { + $request->print(''.&mt('No such file').': '.&display($fn).'
'); + } } =pod @@ -512,16 +570,16 @@ sub Copy1 { my $return=&exists($user, $domain, $newfilename); $request->print($return); if ($return =~/^Error:/) { - $request->print('Copy '.&display($fn).'
to '.
+ '" />
'.&mt('Copy').' '.&display($fn).'
to '.
&display($newfilename).'?
No such file: '.&display($fn).'
'); + $request->print(''.&mt('No such file').': '.&display($fn).'
'); } } @@ -564,32 +622,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('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('Decompress '.&display($fn).'?
'); + $request->print(''.&mt('Decompress').' '.&display($fn).'?
'); &CloseForm1($request, $fn); - } else { - $request->print('No such file: '.&display($fn).'
'); - } + } else { + $request->print(''.&mt('No such file').': '.&display($fn).'
'); + } } + =pod =item NewFile1 @@ -630,7 +693,6 @@ button which returns you to the driector =cut - sub NewFile1 { my ($request, $user, $domain, $fn, $newfilename) = @_; @@ -640,8 +702,8 @@ sub NewFile1 { ##Informs User (name).(number).(extension) not allowed if($newfilename =~ /\.(\d+)\.(\w+)$/){ $r->print(''.$newfilename. - ' - Bad FilenameMake new file '.&display($newfilename).'?
'); + $request->print(''.&mt('Make new file').' '.&display($newfilename).'?
'); $request->print(''); $request->print(''); + '" method="POST">'); $request->print(''); + '" method="POST">'); } } @@ -694,43 +756,51 @@ 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(''); - } - } 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('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 'Select Action') { + if ($newfilename) { + &NewFile1($r, $uname, $udom, $fn, $newfilename); + } else { + $r->print(''.&mt('No new filename specified.').'
'); + } + } } =pod @@ -769,57 +839,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('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("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) @@ -850,42 +921,36 @@ 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(' Error: Directory Non Empty'); - return 0; - } - else { - if(-e $filename) { - unless(rmdir($filename)) { - $request->print('Error: '.$!.''); - return 0; - } - } - else { - $request->print('No such file.
print('Error: '.$!.''); - return 0; - } - } - else { - $request->print('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 @@ -921,21 +986,22 @@ sub Copy2 { &Debug($request ,"Will try to copy $oldfile to $newfile"); if(-e $oldfile) { unless (copy($oldfile, $newfile)) { - $request->print(' copy Error: '.$!.''); + $request->print(' '.&mt('copy Error').': '.$!.''); return 0; } else { unless (chmod(0660, $newfile)) { - $request->print(' chmod error: '.$!.''); + $request->print(' '.&mt('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) @@ -959,28 +1025,30 @@ 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; + 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) @@ -1026,46 +1094,40 @@ 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; - } + } + if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions + $main=$`; #This is what is before the match (.) so it's just the main filename, yea it's nasty + $suffix=$1; #This is the actually filename extension if it exists + } 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'}); + &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."/."; - - + if(!&decompress2($r, $uname, $dir, $main)) { + return ; + } + $dest = $dir."/."; } elsif ($ENV{'form.action'} eq 'rename') { # Rename. if($ENV{'form.newfilename'}) { if (!defined($dir)) { $fn=~m:^(.*)/:; - $dir=$1; + $dir=$1; } if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) { return; } - $dest = &url($ENV{'form.newfilename'}); + $dest = $ENV{'form.newfilename'}; } } elsif ($ENV{'form.action'} eq 'delete') { if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) { @@ -1079,11 +1141,10 @@ sub phasetwo { 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
'); + } else { + $r->print(''.&mt('No New filename specified').'
'); return; } @@ -1092,124 +1153,141 @@ sub phasetwo { 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('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('Unknown Action').' '.$ENV{'form.action'}.'