--- loncom/publisher/loncfile.pm 2002/11/27 17:05:50 1.20 +++ loncom/publisher/loncfile.pm 2005/04/07 04:46:36 1.66 @@ -7,10 +7,9 @@ # presents a page that describes the proposed action to the user # and requests confirmation. The second phase commits the action # and displays a page showing the results of the action. -# - # -# $Id: loncfile.pm,v 1.20 2002/11/27 17:05:50 albertel Exp $ +# +# $Id: loncfile.pm,v 1.66 2005/04/07 04:46:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,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 @@ -93,6 +71,8 @@ use Apache::Constants qw(:common :http : 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. @@ -122,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 false. + # Put out the indicated message butonly if DEBUG is true. - if ($DEBUG) { - $log->debug($message); - } + if ($DEBUG) { + $r->log_reason($message); + } } =pod @@ -171,122 +151,54 @@ 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; + 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; +} + +sub display { + my $fn=shift; + $fn=~s-^/home/(\w+)/public_html-/priv/$1-; + return ''.$fn.''; } -=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; +# 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 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; - -} =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; - -} - -=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. @@ -300,9 +212,6 @@ sub ConstructionPathFromRelative { =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. =back @@ -320,26 +229,20 @@ Returns: =cut sub exists { - my ($user, $domain, $dir, $file) = @_; - - # Create complete paths in publication and construction space. - - my $published = &PublicationPath($domain, $user, $dir, $file); - my $construct = &ConstructionPath($user, $dir, $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 ( -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 @@ -380,10 +283,54 @@ 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,$subdir,$fn,$uname)=@_; + #remove bad characters + 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.')."

"); + } + 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) @@ -403,14 +350,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('

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

Done

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

'.&mt('Done').'

'); } =pod @@ -480,35 +422,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'}; - $request->print(&checksuffix($filename, $newfilename)); - $request->print(&exists($user, $domain, $dir, $newfilename)); - my $dest=&SimplifyDir($dir,$newfilename); - $request->print(''. + &mt('Cannot change MIME type of a directory'). + ''. + '
'.&mt('Cancel').''); + return; + } + $newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/; + } + $newfilename=~s://+:/:g; # remove duplicate / + while ($newfilename=~m:/\.\./:) { + $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. + } + my $return=&exists($user, $domain, $newfilename); + $request->print($return); + if ($return =~/^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 $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 @@ -520,35 +500,35 @@ 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(''); + 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 @@ -570,9 +550,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. @@ -581,62 +559,117 @@ 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)); - $request->print(&exists($user, $domain, $dir, $newfilename)); - my $dest=&SimplifyDir($dir,$newfilename); - $request->print('

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

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

No such file '.$filename.'

'); - } + 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 $return=&exists($user, $domain, $newfilename); + $request->print($return); + if ($return =~/^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).'

'); + } } =pod -=item SimplifyDir - - Removes all extra / and all .. references +=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 $dir - string [in] a directory name +=item $request - Apache Request Object [in] - Server request object for the + current url. -=item $file - string [in] a file reference relative to $dir +=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 -Results: the concatenated path. +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 SimplifyDir { - my ($dir,$file) = @_; - my $location = $dir. '/'.$file; - $location=~s://+:/:g; # remove duplicate / - while ($location=~m:/\.\./:) {$location=~s:/[^/]+/\.\./:/:g;}#remove dir/.. - return $location; + +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) { + $request->print(''); + $request->print('

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

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

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

'); + } } =pod -=item NewDir1 +=item NewFile1 - 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. + 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: @@ -647,47 +680,59 @@ Parameters: =item $username - Name of the user that is requesting the directory creation. -=item $path - current directory relative to construction space. +=item $domain - Name of the domain of the user -=item $newdir - Name of the directory to be created; path relative to the - top level of construction space. +=item $fn - Source file name + +=item $newfilename + - Name of the file to be created; no path information =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. - +=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) = @_; -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); + 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 !~ /\Q.$extension\E$/) { + if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) { + #already has an extension strip it and add in expected one + $newfilename =~ s|.([^\.]+)$||; + } + $newfilename.=".$extension"; + } + } + my $result=&exists($user,$domain,$newfilename); + if($result) { + $request->print(''.$result.''); + } else { + $request->print('

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

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

'); + $request->print('

'); + } } =pod @@ -719,40 +764,53 @@ 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('
'. - ''. - ''. - ''); - - if ($ENV{'form.action'} eq 'rename') { - - &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'}); - } + 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, '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 @@ -791,26 +849,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) { - unless(rename($oldfile, - $directory.'/'.$newfile)) { - $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) @@ -841,18 +931,36 @@ Returns: =cut sub Delete2 { - my ($request, $user, $filename) = @_; - - if(-e $filename) { - unless(unlink($filename)) { - $request->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; + } + } + } 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 @@ -888,21 +996,27 @@ 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; + } 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) @@ -926,17 +1040,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 @@ -978,37 +1103,46 @@ sub phasetwo { # Break down the file into it's component pieces. - $fn=~/(.*)\/([^\/]+)\.(\w+)$/; - my $dir=$1; # Directory path - my $main=$2; # Filename. - my $suffix=$3; # Extension. - + my $dir; # Directory path + my $main; # Filename. + my $suffix; # Extension. + if ($fn=~m:(.*)/([^/]+):) { + $dir=$1; # Directory path + $main=$2; # Filename. + } + if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions + $main=~s/\.\w+$//; #strip the extension + $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 'rename') { # Rename. + 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; + } 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. - # - $dest = $dir."/".$ENV{'form.newfilename'}; + $dest = $ENV{'form.newfilename'}; } } elsif ($ENV{'form.action'} eq 'delete') { if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) { @@ -1021,138 +1155,155 @@ sub phasetwo { } elsif ($ENV{'form.action'} eq 'copy') { if($ENV{'form.newfilename'}) { if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) { - return - } + return ; + } $dest = $ENV{'form.newfilename'}; - - } else { - $r->print('

No New filename specified'); + } 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'}; + 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 { + $r->print('

'.&mt('Done').'

'); } - # - # Substitute for priv for the first home in $dir to get our - # construction space path. - # - &Debug($r, "Final url is: $dest"); - $dest =~ s|/home/|/priv/|; - $dest =~ s|/public_html||; - - my $base = &File::Basename::basename($dest); - my $dpath= &File::Basename::dirname($dest); - if ($base eq '.') { $base=''; } - $dest = &HTML::Entities::encode($dpath.'/'.$base); - - - &Debug($r, "Final url after rewrite: $dest"); - - $r->print('

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'}); - - my $fn; - - if ($ENV{'form.filename'}) { - $fn=$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; - } + &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=&Apache::lonnet::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=&Apache::lonnet::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; + } + + 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( - ''); + 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'}; + $r->print('LON-CAPA Construction Space + |); + my $loaditem = 'onLoad="writeDone()"'; + $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem)); + } else { + $r->print('LON-CAPA Construction Space'); + $r->print(&Apache::loncommon::bodytag('Construction Space File Operation')); + } - $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

'); - } 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 'newlibraryfile' || + $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); + } - $r->print(''); - return OK; + $r->print(''); + return OK; } 1;