version 1.67, 2005/04/07 06:56:24
|
version 1.127, 2023/07/14 23:20:15
|
Line 37
|
Line 37
|
|
|
=head1 NAME |
=head1 NAME |
|
|
Apache::loncfile - Construction space file management. |
Apache::loncfile - Authoring space file management. |
|
|
=head1 SYNOPSIS |
=head1 SYNOPSIS |
|
|
Content handler for buttons on the top frame of the construction space |
Content handler for buttons on the top frame of the construction space |
directory. |
directory. |
|
|
=head1 INTRODUCTION |
=head1 INTRODUCTION |
|
|
loncfile is invoked when buttons in the top frame of the construction |
loncfile is invoked when buttons in the top frame of the construction |
space directory listing are clicked. All operations proceed in two phases. |
space directory listing are clicked. All operations proceed in two phases. |
The first phase describes to the user exactly what will be done. If the user |
The first phase describes to the user exactly what will be done. If the user |
confirms the operation, the second phase commits the operation and indicates |
confirms the operation, the second phase commits the operation and indicates |
Line 68 use File::Basename;
|
Line 68 use File::Basename;
|
use File::Copy; |
use File::Copy; |
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::Constants qw(:common :http :methods); |
use Apache::Constants qw(:common :http :methods); |
use Apache::loncacc; |
|
use Apache::Log (); |
|
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use LONCAPA qw(:DEFAULT :match); |
|
|
|
|
my $DEBUG=0; |
my $DEBUG=0; |
my $r; # Needs to be global for some stuff RF. |
my $r; # Needs to be global for some stuff RF. |
Line 88 my $r; # Needs to be global for some
|
Line 88 my $r; # Needs to be global for some
|
Parameters: |
Parameters: |
|
|
=over 4 |
=over 4 |
|
|
=item $request - The current request operation. |
=item $request - The current request operation. |
|
|
=item $message - The message to put in the log file. |
=item $message - The message to put in the log file. |
|
|
=back |
=back |
|
|
Returns: |
Returns: |
nothing. |
nothing. |
|
|
=cut |
=cut |
|
|
sub Debug { |
sub Debug { |
|
# Put out the indicated message but only if DEBUG is true. |
# 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) { |
if ($DEBUG) { |
|
my ($r,$message) = @_; |
$r->log_reason($message); |
$r->log_reason($message); |
} |
} |
} |
} |
|
|
|
sub done { |
|
my ($destfn) = @_; |
|
return |
|
'<p>' |
|
.&Apache::lonhtmlcommon::confirm_success(&mt("Done")) |
|
.'<br /><a href="'.&url($destfn).'">'.&mt("Continue").'</a>' |
|
.'<script type="text/javascript">' |
|
.'location.href="'.&url($destfn,'js').'";' |
|
.'</script>' |
|
.'</p>'; |
|
} |
|
|
=pod |
=pod |
|
|
=item URLToPath($url) |
=item URLToPath($url) |
|
|
Convert a URL to a file system path. |
Convert a URL to a file system path. |
|
|
In order to manipulate the construction space objects, it is necessary |
In order to manipulate the construction space objects, it is necessary |
to access url identified objects a filespace objects. This function |
to access url identified objects a filespace objects. This function |
translates a construction space URL to a file system path. |
translates a construction space URL to a file system path. |
Line 129 sub Debug {
|
Line 134 sub Debug {
|
=over 4 |
=over 4 |
|
|
=item Url - string [in] The url to convert. |
=item Url - string [in] The url to convert. |
|
|
=back |
=back |
|
|
Returns: |
Returns: |
|
|
=over 4 |
=over 4 |
|
|
=item The corresponding file system path. |
=item The corresponding file system path. |
|
|
=back |
=back |
|
|
Line 153 Global References
|
Line 158 Global References
|
sub URLToPath { |
sub URLToPath { |
my $Url = shift; |
my $Url = shift; |
&Debug($r, "UrlToPath got: $Url"); |
&Debug($r, "UrlToPath got: $Url"); |
$Url=~ s/\/+/\//g; |
$Url=~ s{^https?\://[^/]+}{}; |
$Url=~ s/^http\:\/\/[^\/]+//; |
$Url=~ s{//+}{/}g; |
$Url=~ s/^\///; |
$Url=~ s{^/}{}; |
$Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//; |
$Url=$Apache::lonnet::perlvar{'lonDocRoot'}."/$Url"; |
&Debug($r, "Returning $Url \n"); |
&Debug($r, "Returning $Url \n"); |
return $Url; |
return $Url; |
} |
} |
|
|
sub url { |
sub url { |
my $fn=shift; |
my ($fn,$context) = @_; |
$fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
$fn=&HTML::Entities::encode($fn,'<>"&'); |
$fn=~ s/^\Q$londocroot\E//; |
|
$fn=~s{/\./}{/}g; |
|
if ($context eq 'js') { |
|
&js_escape(\$fn); |
|
} else { |
|
$fn=&HTML::Entities::encode($fn,'\'<>"&'); |
|
} |
return $fn; |
return $fn; |
} |
} |
|
|
sub display { |
sub display { |
my $fn=shift; |
my $fn=shift; |
$fn=~s-^/home/(\w+)/public_html-/priv/$1-; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
return '<tt>'.$fn.'</tt>'; |
$fn=~s/^\Q$londocroot\E//; |
|
$fn=~s{/\./}{/}g; |
|
return '<span class="LC_filename">'.$fn.'</span>'; |
} |
} |
|
|
|
|
Line 181 sub display {
|
Line 194 sub display {
|
|
|
sub obsolete_unpub { |
sub obsolete_unpub { |
my ($user,$domain,$construct)=@_; |
my ($user,$domain,$construct)=@_; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $published=$construct; |
my $published=$construct; |
$published=~ |
$published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/}; |
s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; |
|
if (-e $published) { |
if (-e $published) { |
if (&Apache::lonnet::metadata($published,'obsolete')) { |
if (&Apache::lonnet::metadata($published,'obsolete')) { |
return 1; |
return 1; |
Line 194 sub obsolete_unpub {
|
Line 207 sub obsolete_unpub {
|
} |
} |
} |
} |
|
|
|
# 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. |
|
# ignores a .DS_Store file put there when viewing directory via webDAV on MacOS. |
|
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|DS_Store)$/,@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 |
=pod |
|
|
=item exists($user, $domain, $file) |
=item exists($user, $domain, $file) |
|
|
Determine if a resource file name has been published or exists |
Determine if a resource filename has been published or exists |
in the construction space. |
in the construction space. |
|
|
Parameters: |
Parameters: |
|
|
=over 4 |
=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. |
might have been published. |
|
|
=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 |
=back |
|
|
Line 220 Returns:
|
Line 263 Returns:
|
|
|
=over 4 |
=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 |
=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 |
be embedded in a dialog or an empty string if the resource |
does not exist. |
does not exist. |
|
|
=back |
=back |
|
|
=cut |
=cut |
|
|
sub exists { |
sub exists { |
my ($user, $domain, $construct) = @_; |
my ($user, $domain, $construct, $creating) = @_; |
|
$creating ||= 'file'; |
|
|
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $published=$construct; |
my $published=$construct; |
$published=~ |
$published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/}; |
s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; |
my ($type,$result); |
my $result=''; |
|
if ( -d $construct ) { |
if ( -d $construct ) { |
return &mt('Error: destination for operation is an existing directory.'); |
return ('error','<p class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</p>'); |
|
|
} |
} |
|
|
if ( -e $published) { |
if ( -e $published) { |
$result.='<p><font color="red">'.&mt('Warning: target file exists, and has been published!').'</font></p>'; |
if ( -e $construct ) { |
|
$type = 'warning'; |
|
$result.='<p class="LC_warning">'.&mt('Warning: target file exists, and has been published!').'</p>'; |
|
} else { |
|
my $published_type = (-d $published) ? 'directory' : 'file'; |
|
|
|
if ($published_type eq $creating) { |
|
$type = 'warning'; |
|
$result.='<p class="LC_warning">'.&mt("Warning: a published $published_type of this name exists.").'</p>'; |
|
} else { |
|
$type = 'error'; |
|
$result.='<p class="LC_error">'.&mt("Error: a published $published_type of this name exists.").'</p>'; |
|
} |
|
} |
} elsif ( -e $construct) { |
} elsif ( -e $construct) { |
$result.='<p><font color="red">'.&mt('Warning: target file exists!').'</font></p>'; |
$type = 'warning'; |
|
$result.='<p class="LC_warning">'.&mt('Warning: target file exists!').'</p>'; |
} |
} |
return $result; |
|
|
return ($type,$result); |
} |
} |
|
|
=pod |
=pod |
|
|
=item checksuffix($old, $new) |
=item checksuffix($old, $new) |
|
|
Determine if a resource filename suffix (the stuff after the .) would change |
Determine if a resource filename suffix (the stuff after the .) would change |
as a result of this operation. |
as a result of this operation. |
|
|
Line 281 sub checksuffix {
|
Line 346 sub checksuffix {
|
my $newsuffix; |
my $newsuffix; |
if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; } |
if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; } |
if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; } |
if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; } |
if ($oldsuffix ne $newsuffix) { |
if (lc($oldsuffix) ne lc($newsuffix)) { |
$result.= |
$result.= |
'<p><font color="red">'.&mt('Warning: change of MIME type!').'</font></p>'; |
'<p class="LC_warning">'.&mt('Warning: change of MIME type!').'></p>'; |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub cleanDest { |
sub cleanDest { |
my ($request,$dest,$subdir,$fn,$uname)=@_; |
my ($dest,$subdir,$fn,$uname,$udom)=@_; |
#remove bad characters |
#remove bad characters |
my $foundbad=0; |
my $foundbad=0; |
|
my $warnings; |
|
my $error=''; |
if ($subdir && $dest =~/\./) { |
if ($subdir && $dest =~/\./) { |
$foundbad=1; |
$foundbad=1; |
$dest=~s/\.//g; |
$dest=~s/\.//g; |
} |
} |
if ($dest=~/[\#\?&%\"]/) { |
$dest =~ s/(\s+$|^\s+)//g; |
|
if ($dest=~/[\#\?&%\":]/) { |
$foundbad=1; |
$foundbad=1; |
$dest=~s/[\#\?&%\"]//g; |
$dest=~s/[\#\?&%\":]//g; |
} |
} |
if ($dest=~m|/|) { |
if ($dest=~m|/|) { |
my ($newpath)=($dest=~m|(.*)/|); |
my ($newpath)=($dest=~m|(.*)/|); |
$newpath=&relativeDest($fn,$newpath,$uname); |
($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom); |
if (! -d "$newpath") { |
if (! -d "$newpath") { |
$request->print("<p><font color=\"red\">".&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.','"<tt>'.$newpath.'</tt>"')."</font></p>"); |
$warnings = '<p class="LC_warning">' |
|
.&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested filename." |
|
,&display($newpath)) |
|
.'</p>'; |
$dest=~s|.*/||; |
$dest=~s|.*/||; |
} |
} |
} |
} |
|
if ($dest =~ /\.(\d+)\.(\w+)$/) { |
|
$warnings .= '<p class="LC_warning">' |
|
.&mt('Bad filename [_1]',&display($dest)) |
|
.'<br />' |
|
.&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>') |
|
.'<br />' |
|
.&mt('Removing the [_1].number.[_2] from requested filename.','<tt>','</tt>') |
|
.'</p>'; |
|
$dest =~ s/\.(\d+)(\.\w+)$/$2/; |
|
} |
if ($foundbad) { |
if ($foundbad) { |
$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>"); |
$warnings .= '<p class="LC_warning">' |
|
.&mt('Invalid characters in requested name have been removed.') |
|
.'</p>'; |
} |
} |
return $dest; |
return ($dest,$error,$warnings); |
} |
} |
|
|
sub relativeDest { |
sub relativeDest { |
my ($fn,$newfilename,$uname)=@_; |
my ($fn,$newfilename,$uname,$udom)=@_; |
|
my $error = ''; |
if ($newfilename=~/^\//) { |
if ($newfilename=~/^\//) { |
# absolute, simply add path |
# absolute, simply add path |
$newfilename='/home/'.$uname.'/public_html/'; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
|
$newfilename="$londocroot/res/$udom/$uname/"; |
} else { |
} else { |
my $dir=$fn; |
my $dir=$fn; |
$dir=~s/\/[^\/]+$//; |
$dir=~s{/[^/]+$}{}; |
$newfilename=$dir.'/'.$newfilename; |
$newfilename=$dir.'/'.$newfilename; |
} |
} |
$newfilename=~s://+:/:g; # remove duplicate / |
$newfilename=~s{//+}{/}g; # remove duplicate / |
while ($newfilename=~m:/\.\./:) { |
while ($newfilename=~m{/\.\./}) { |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
$newfilename=~ s{/[^/]+/\.\./}{/}g; #remove dir/.. |
|
} |
|
my ($authorname,$authordom)=&Apache::lonnet::constructaccess($newfilename); |
|
unless (($authorname) && ($authordom)) { |
|
my $otherdir = &display($newfilename); |
|
$error = &mt('Access denied to [_1]',$otherdir); |
} |
} |
return $newfilename; |
return ($newfilename,$error); |
} |
} |
|
|
=pod |
=pod |
Line 351 Parameters:
|
Line 441 Parameters:
|
|
|
sub CloseForm1 { |
sub CloseForm1 { |
my ($request, $fn) = @_; |
my ($request, $fn) = @_; |
$request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>'); |
$request->print('<input type="submit" value="'.&mt('Continue').'" /></form>'); |
$request->print('<form action="'.&url($fn). |
$request->print(' <form action="'.&url($fn).'" method="post">'. |
'" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>'); |
'<input type="submit" value="'.&mt('Cancel').'" /></form>'); |
} |
} |
|
|
|
|
Line 373 Parameters:
|
Line 463 Parameters:
|
=item $user - string [in] - Name of the user that is initiating the |
=item $user - string [in] - Name of the user that is initiating the |
request. |
request. |
|
|
=item $directory - string [in] - Directory in which the operation is |
=item $directory - string [in] - Directory in which the operation is |
being done relative to the top level construction space |
being done relative to the top level construction space |
directory. |
directory. |
|
|
Line 383 Parameters:
|
Line 473 Parameters:
|
|
|
sub CloseForm2 { |
sub CloseForm2 { |
my ($request, $user, $fn) = @_; |
my ($request, $user, $fn) = @_; |
$request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>'); |
$request->print(&done($fn)); |
} |
} |
|
|
=pod |
=pod |
|
|
=item Rename1($request, $filename, $user, $domain, $dir) |
=item Rename1($request, $filename, $user, $domain, $dir) |
|
|
Perform phase 1 processing of the file rename operation. |
Perform phase 1 processing of the file rename operation. |
|
|
Parameters: |
Parameters: |
|
|
=over 4 |
=over 4 |
|
|
=item $request - Apache Request Object [in] The request object for the |
=item $request - Apache Request Object [in] The request object for the |
current request. |
current request. |
|
|
=item $filename - The filename relative to construction space. |
=item $filename - The filename relative to construction space. |
Line 419 new filename relative to the current dir
|
Line 509 new filename relative to the current dir
|
|
|
=back |
=back |
|
|
=cut |
=cut |
|
|
sub Rename1 { |
sub Rename1 { |
my ($request, $user, $domain, $fn, $newfilename, $style) = @_; |
my ($request, $user, $domain, $fn, $newfilename, $style) = @_; |
Line 444 sub Rename1 {
|
Line 534 sub Rename1 {
|
if (-d $fn) { |
if (-d $fn) { |
$newfilename=~/\.(\w+)$/; |
$newfilename=~/\.(\w+)$/; |
if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { |
if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { |
$request->print('<br /><font color="red">'. |
$request->print('<p><span class="LC_error">'. |
&mt('Cannot change MIME type of a directory'). |
&mt('Cannot change MIME type of a directory.'). |
'</font>'. |
'</span>'. |
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'); |
return; |
return; |
} |
} |
$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/; |
$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/; |
Line 456 sub Rename1 {
|
Line 546 sub Rename1 {
|
while ($newfilename=~m:/\.\./:) { |
while ($newfilename=~m:/\.\./:) { |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
} |
} |
my $return=&exists($user, $domain, $newfilename); |
my ($type, $return)=&exists($user, $domain, $newfilename); |
$request->print($return); |
$request->print($return); |
if ($return =~/^Error:/) { |
if ($type eq 'error') { |
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
return; |
return; |
} |
} |
unless (&obsolete_unpub($user,$domain,$fn)) { |
unless (&obsolete_unpub($user,$domain,$fn)) { |
$request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'. |
$request->print('<p><span class="LC_error">' |
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
.&mt('Cannot rename or move non-obsolete published file.') |
|
.'</span><br />' |
|
.'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>' |
|
); |
return; |
return; |
} |
} |
my $action; |
my $action; |
if ($style eq 'rename') { |
if ($style eq 'rename') { |
$action=&mt('Rename'); |
$action='Rename'; |
} else { |
} else { |
$action=&mt('Move'); |
$action='Move'; |
} |
} |
$request->print('<input type="hidden" name="newfilename" value="'. |
$request->print('<input type="hidden" name="newfilename" value="' |
$newfilename. |
.$newfilename.'" />' |
'" /><p>'.$action.' '.&display($fn). |
.'<p>' |
'</tt><br />to '.&display($newfilename).'?</p>'); |
.&mt($action.' [_1] to [_2]?', |
|
&display($fn), |
|
&display($newfilename)) |
|
.'</p>' |
|
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p>'.&mt('No new filename specified.').'</p></form>'); |
$request->print('<p class="LC_error">'.&mt('No new filename specified.').'</p></form>'); |
return; |
return; |
} |
} |
} else { |
} else { |
$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>'); |
$request->print('<p class="LC_error">' |
|
.&mt('No such file: [_1]', |
|
&display($fn)) |
|
.'</p></form>' |
|
); |
return; |
return; |
} |
} |
|
|
} |
} |
|
|
=pod |
=pod |
Line 500 Parameters:
|
Line 601 Parameters:
|
|
|
=over 4 |
=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. |
request. |
|
|
=item $user - string [in] Name of the user initiating the request. |
=item $user - string [in] Name of the user initiating the request. |
Line 518 sub Delete1 {
|
Line 619 sub Delete1 {
|
|
|
if( -e $fn) { |
if( -e $fn) { |
$request->print('<input type="hidden" name="newfilename" value="'. |
$request->print('<input type="hidden" name="newfilename" value="'. |
$fn.'"/>'); |
$fn.'" />'); |
unless (&obsolete_unpub($user,$domain,$fn)) { |
if (-d $fn) { |
$request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'. |
unless (&empty_directory($fn,'Delete1')) { |
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
$request->print('<p>' |
return; |
.'<span class="LC_error">' |
} |
.&mt('Only empty directories may be deleted.') |
$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>'); |
.'</span><br />' |
|
.&mt('You must delete the contents of the directory first.') |
|
.'</p>' |
|
.'<p><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>' |
|
); |
|
return; |
|
} |
|
} else { |
|
unless (&obsolete_unpub($user,$domain,$fn)) { |
|
$request->print('<p><span class="LC_error">' |
|
.&mt('Cannot delete non-obsolete published file.') |
|
.'</span><br />' |
|
.'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>' |
|
); |
|
return; |
|
} |
|
} |
|
$request->print('<p>' |
|
.&mt('Delete [_1]?', |
|
&display($fn)) |
|
.'</p>' |
|
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>'); |
$request->print('<p class="LC_error">' |
|
.&mt('No such file: [_1]', |
|
&display($fn)) |
|
.'</p></form>' |
|
); |
} |
} |
} |
} |
|
|
Line 543 Parameters:
|
Line 669 Parameters:
|
|
|
=over 4 |
=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. |
request. |
|
|
=item $user - string [in] Name of the user initiating the request. |
=item $user - string [in] Name of the user initiating the request. |
Line 569 sub Copy1 {
|
Line 695 sub Copy1 {
|
if ($newfilename =~ m|/[^\.]+$|) { |
if ($newfilename =~ m|/[^\.]+$|) { |
#no extension add on original extension |
#no extension add on original extension |
if ($fn =~ m|/[^\.]*\.([^\.]+)$|) { $newfilename.='.'.$1; } |
if ($fn =~ m|/[^\.]*\.([^\.]+)$|) { $newfilename.='.'.$1; } |
} |
} |
$newfilename=~s://+:/:g; # remove duplicate / |
$newfilename=~s://+:/:g; # remove duplicate / |
while ($newfilename=~m:/\.\./:) { |
while ($newfilename=~m:/\.\./:) { |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
} |
} |
$request->print(&checksuffix($fn,$newfilename)); |
$request->print(&checksuffix($fn,$newfilename)); |
my $return=&exists($user, $domain, $newfilename); |
my ($type,$return)=&exists($user, $domain, $newfilename); |
$request->print($return); |
$request->print($return); |
if ($return =~/^Error:/) { |
if ($type eq 'error') { |
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a></form>'); |
return; |
return; |
} |
} |
$request->print('<input type="hidden" name="newfilename" value="'. |
# Check if there is enough space. |
$newfilename. |
my @fileinfo = stat($fn); |
'" /><p>'.&mt('Copy').' '.&display($fn).'<br />to '. |
my ($dir,$fname) = ($fn =~ m{^(.+/)([^/]+)$}); |
&display($newfilename).'?</p>'); |
my $filesize = $fileinfo[7]; |
|
$filesize = int($filesize/1000); #expressed in kb |
|
my $output = &Apache::loncommon::excess_filesize_warning($user,$domain,'author', |
|
$fname,$filesize,'copy'); |
|
if ($output) { |
|
$request->print($output.'<br /><a href="'.&url($dir).'">'.&mt('Cancel').'</a></form>'); |
|
return; |
|
} |
|
$request->print( |
|
'<input type="hidden" name="newfilename"' |
|
.' value="'.$newfilename.'" />' |
|
.'<p>' |
|
.&mt('Copy [_1] to [_2]?', |
|
&display($fn), |
|
&display($newfilename)) |
|
.'</p>' |
|
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>'); |
$request->print('<p class="LC_error">' |
|
.&mt('No such file: [_1]', |
|
&display($fn)) |
|
.'</p></form>' |
|
); |
} |
} |
} |
} |
|
|
=pod |
=pod |
|
|
=item NewDir1 |
=item NewDir1 |
|
|
Does all phase 1 processing of directory creation: |
Does all phase 1 processing of directory creation: |
Ensures that the user provides a new directory name, |
Ensures that the user provides a new directory name, |
and that the directory does not already exist. |
and that the directory does not already exist. |
Line 612 Parameters:
|
Line 758 Parameters:
|
|
|
=item $fn - source file. |
=item $fn - source file. |
|
|
=item $newdir - Name of the directory to be created; path relative to the |
=item $newdir - Name of the directory to be created; path relative to the |
top level of construction space. |
top level of construction space. |
=back |
=back |
|
|
Line 633 causes the newdir operation to transitio
|
Line 779 causes the newdir operation to transitio
|
sub NewDir1 { |
sub NewDir1 { |
my ($request, $username, $domain, $fn, $newfilename, $mode) = @_; |
my ($request, $username, $domain, $fn, $newfilename, $mode) = @_; |
|
|
my $result=&exists($username,$domain,$newfilename); |
my ($type, $result)=&exists($username,$domain,$newfilename,'directory'); |
if ($result) { |
$request->print($result); |
$request->print('<font color="red">'.$result.'</font></form>'); |
if ($type eq 'error') { |
|
$request->print('</form>'); |
} else { |
} else { |
if ($mode eq 'testbank') { |
if (($mode eq 'testbank') || ($mode eq 'imsimport')) { |
$request->print('<input type="hidden" name="callingmode" value="testbank">'); |
$request->print('<input type="hidden" name="callingmode" value="'.$mode.'" />'."\n". |
} elsif ($mode eq 'imsimport') { |
'<input type="hidden" name="inhibitmenu" value="yes" />'); |
$request->print('<input type="hidden" name="callingmode" value="imsimport">'); |
} |
} |
$request->print('<input type="hidden" name="newfilename" value="' |
$request->print('<input type="hidden" name="newfilename" value="'. |
.$newfilename.'" />' |
$newfilename.'" /><p>'.&mt('Make new directory').' '. |
.'<p>' |
&display($newfilename).'?</p>'); |
.&mt('Make new directory [_1]?', |
|
&display($newfilename)) |
|
.'</p>' |
|
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} |
} |
} |
} |
Line 653 sub NewDir1 {
|
Line 803 sub NewDir1 {
|
sub Decompress1 { |
sub Decompress1 { |
my ($request, $user, $domain, $fn) = @_; |
my ($request, $user, $domain, $fn) = @_; |
if( -e $fn) { |
if( -e $fn) { |
$request->print('<input type="hidden" name="newfilename" value="'.$fn.'"/>'); |
$request->print('<input type="hidden" name="newfilename" value="'.$fn.'" />'); |
$request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>'); |
$request->print('<p>' |
|
.&mt('Decompress [_1]?', |
|
&display($fn)) |
|
.'</p>' |
|
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>'); |
$request->print('<p class="LC_error">' |
|
.&mt('No such file: [_1]', |
|
&display($fn)) |
|
.'</p></form>' |
|
); |
} |
} |
} |
} |
|
|
=pod |
=pod |
|
|
=item NewFile1 |
=item NewFile1 |
|
|
Does all phase 1 processing of file creation: |
Does all phase 1 processing of file creation: |
Ensures that the user provides a new filename, adds proper extension |
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, |
if needed and that the file does not already exist, if it is a html, |
Line 682 Parameters:
|
Line 840 Parameters:
|
|
|
=item $domain - Name of the domain of the user |
=item $domain - Name of the domain of the user |
|
|
=item $fn - Source file name |
=item $fn - Source filename |
|
|
=item $newfilename |
=item $newfilename |
- Name of the file to be created; no path information |
- Name of the file to be created; no path information |
|
|
|
=item $warnings - Information about changes to filename made by cleanDest(). |
|
|
=back |
=back |
|
|
Side Effects: |
Side Effects: |
Line 695 Side Effects:
|
Line 856 Side Effects:
|
=item 2 new forms are displayed. Clicking on the confirmation button |
=item 2 new forms are displayed. Clicking on the confirmation button |
causes the browser to attempt to load the specfied URL, allowing the |
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 |
proper handler to take care of file creation. There is also a Cancel |
button which returns you to the driectory listing you came from |
button which returns you to the directory listing you came from |
|
|
=back |
=back |
|
|
=cut |
=cut |
|
|
sub NewFile1 { |
sub NewFile1 { |
my ($request, $user, $domain, $fn, $newfilename) = @_; |
my ($request, $user, $domain, $fn, $newfilename, $warnings) = @_; |
|
return if (&filename_check($newfilename,$warnings) ne 'ok'); |
|
|
if ($env{'form.action'} =~ /new(.+)file/) { |
if ($env{'form.action'} =~ /new(.+)file/) { |
my $extension=$1; |
my $extension=$1; |
|
|
##Informs User (name).(number).(extension) not allowed |
|
if($newfilename =~ /\.(\d+)\.(\w+)$/){ |
|
$r->print('<font color="red">'.$newfilename. |
|
' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').')'. |
|
' '.&mt('Not Allowed').'</font>'); |
|
return; |
|
} |
|
if ($newfilename !~ /\Q.$extension\E$/) { |
if ($newfilename !~ /\Q.$extension\E$/) { |
if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) { |
if ($newfilename =~ m|/[^/.]*\.(?:[^/.]+)$|) { |
#already has an extension strip it and add in expected one |
#already has an extension strip it and add in expected one |
$newfilename =~ s|.([^\.]+)$||; |
$newfilename =~ s|(/[^./])\.(?:[^.]+)$|$1|; |
} |
} |
$newfilename.=".$extension"; |
$newfilename.=".$extension"; |
} |
} |
} |
} |
my $result=&exists($user,$domain,$newfilename); |
my ($type, $result)=&exists($user,$domain,$newfilename); |
if($result) { |
if ($type eq 'error') { |
$request->print('<font color="red">'.$result.'</font></form>'); |
$request->print($warnings.$result); |
} else { |
|
$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>'); |
|
$request->print('</form>'); |
$request->print('</form>'); |
$request->print('<form action="'.&url($newfilename). |
} else { |
'" method="POST"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>'); |
my $extension; |
$request->print('<form action="'.&url($fn). |
|
'" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>'); |
if ($newfilename =~ m{[^/.]+\.([^/.]+)$}) { |
|
$extension = $1; |
|
} |
|
|
|
my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt); |
|
if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) { |
|
my $validexts = '.'.join(', .',@okexts); |
|
$request->print($warnings.$result); |
|
$request->print('<p class="LC_warning">'. |
|
&mt('Invalid filename: ').&display($newfilename).'</p><p>'. |
|
&mt('The name of the new file needs to end with an appropriate file extension to indicate the type of file to create.').'<br />'. |
|
&mt('The following are valid extensions: [_1].',$validexts). |
|
'</p></form><p>'. |
|
'<form name="fileaction" action="/adm/cfile" method="post">'. |
|
'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'. |
|
'<input type="hidden" name="action" value="newfile" />'. |
|
'<span class ="LC_nobreak">'.&mt('Enter a filename: ').'<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == '."'Type Name Here') this.value=''".'" /> <input type="submit" value="Go" />'. |
|
'</span></form></p>'. |
|
'<p><form action="'.&url($fn). |
|
'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></form></p>'); |
|
} elsif (($type ne 'warning') && ($warnings eq '') && ($result eq '')) { |
|
my $query = ""; |
|
$query .= "?mode=" . $env{'form.mode'} unless (!exists($env{'form.mode'}) || !length($env{'form.mode'})); |
|
$request->print(' |
|
<script type="text/javascript"> |
|
window.location = "'.&url($newfilename,'js'). $query .'"; |
|
</script>'); |
|
} else { |
|
$request->print($warnings.$result); |
|
$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>'); |
|
$request->print('</form>'); |
|
$request->print('<form action="'.&url($newfilename). |
|
'" method="post"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>'); |
|
$request->print('<form action="'.&url($fn). |
|
'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>'); |
|
} |
|
} |
|
return; |
|
} |
|
|
|
sub filename_check { |
|
my ($newfilename) = @_; |
|
##Informs User (name).(number).(extension) not allowed |
|
if($newfilename =~ /\.(\d+)\.(\w+)$/){ |
|
$r->print('<span class="LC_error">'.$newfilename. |
|
' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').') '. |
|
' '.&mt('Not Allowed').'</span>'); |
|
return; |
|
} |
|
if($newfilename =~ /(\:\:\:|\&\&\&|\_\_\_)/){ |
|
$r->print('<span class="LC_error">'.$newfilename. |
|
' - '.&mt('Bad Filename').'<br />('.&mt('Must not include').' '.$1.') '. |
|
' '.&mt('Not Allowed').'</span>'); |
|
return; |
} |
} |
|
return 'ok'; |
} |
} |
|
|
=pod |
=pod |
Line 743 sub NewFile1 {
|
Line 949 sub NewFile1 {
|
are returned if the request cannot be performed (e.g. attempts to manipulate |
are returned if the request cannot be performed (e.g. attempts to manipulate |
files that are nonexistent). If the operation can be performed, what is |
files that are nonexistent). If the operation can be performed, what is |
about to be done will be presented to the user for confirmation. If the |
about to be done will be presented to the user for confirmation. If the |
user confirms the request, then phase two is executed, the action |
user confirms the request, then phase two is executed, the action |
performed and reported to the user. |
performed and reported to the user. |
|
|
Parameters: |
Parameters: |
Line 752 performed and reported to the user.
|
Line 958 performed and reported to the user.
|
|
|
=item $r - request object [in] - The Apache request being executed. |
=item $r - request object [in] - The Apache request being executed. |
|
|
=item $fn = string [in] - The filename being manipulated by the |
=item $fn = string [in] - The filename being manipulated by the |
request. |
request. |
|
|
=item $uname - string [in] Name of user logged in and doing this action. |
=item $uname - string [in] Name of user logged in and doing this action. |
|
|
=item $udom - string [in] Domain name under which the user logged in. |
=item $udom - string [in] Domain name under which the user logged in. |
|
|
=back |
=back |
|
|
Line 765 performed and reported to the user.
|
Line 971 performed and reported to the user.
|
|
|
sub phaseone { |
sub phaseone { |
my ($r,$fn,$uname,$udom)=@_; |
my ($r,$fn,$uname,$udom)=@_; |
|
|
my $doingdir=0; |
my $doingdir=0; |
if ($env{'form.action'} eq 'newdir') { $doingdir=1; } |
if ($env{'form.action'} eq 'newdir') { $doingdir=1; } |
my $newfilename=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname); |
my ($newfilename,$error,$warnings) = |
$newfilename=&relativeDest($fn,$newfilename,$uname); |
&cleanDest($env{'form.newfilename'},$doingdir,$fn,$uname,$udom); |
|
unless ($error) { |
|
($newfilename,$error)=&relativeDest($fn,$newfilename,$uname,$udom); |
|
} |
|
if ($error) { |
|
my $dirlist; |
|
if ($fn=~m{^(.*/)[^/]+$}) { |
|
$dirlist=$1; |
|
} else { |
|
$dirlist=$fn; |
|
} |
|
if ($warnings) { |
|
$r->print($warnings); |
|
} |
|
$r->print('<div class="LC_error">'.$error.'</div>'. |
|
'<p><a href="'.&url($dirlist).'">'.&mt('Return to Directory'). |
|
'</a></p>'); |
|
return; |
|
} |
$r->print('<form action="/adm/cfile" method="post">'. |
$r->print('<form action="/adm/cfile" method="post">'. |
'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'. |
'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'. |
'<input type="hidden" name="phase" value="two" />'. |
'<input type="hidden" name="phase" value="two" />'. |
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'); |
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'); |
|
|
if ($env{'form.action'} eq 'rename') { |
if ($env{'form.action'} eq 'newfile' || |
&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename'); |
$env{'form.action'} eq 'newhtmlfile' || |
} elsif ($env{'form.action'} eq 'move') { |
$env{'form.action'} eq 'newproblemfile' || |
&Rename1($r, $uname, $udom, $fn, $newfilename, 'move'); |
$env{'form.action'} eq 'newpagefile' || |
} elsif ($env{'form.action'} eq 'delete') { |
$env{'form.action'} eq 'newsequencefile' || |
&Delete1($r, $uname, $udom, $fn); |
$env{'form.action'} eq 'newrightsfile' || |
} elsif ($env{'form.action'} eq 'decompress') { |
$env{'form.action'} eq 'newstyfile' || |
&Decompress1($r, $uname, $udom, $fn); |
$env{'form.action'} eq 'newtaskfile' || |
} elsif ($env{'form.action'} eq 'copy') { |
$env{'form.action'} eq 'newlibraryfile' || |
if($newfilename) { |
$env{'form.action'} eq 'Select Action') { |
&Copy1($r, $uname, $udom, $fn, $newfilename); |
|
} else { |
|
$r->print('<p>'.&mt('No new filename specified.').'</p></form>'); |
|
} |
|
} 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'); |
my $empty=&mt('Type Name Here'); |
if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) { |
if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) { |
&NewFile1($r, $uname, $udom, $fn, $newfilename); |
&NewFile1($r, $uname, $udom, $fn, $newfilename, $warnings); |
} else { |
} else { |
$r->print('<p>'.&mt('No new filename specified.').'</p></form>'); |
if ($warnings) { |
} |
$r->print($warnings); |
|
} |
|
$r->print('<p class="LC_error">' |
|
.&mt('No new filename specified.') |
|
.'</p></form>' |
|
); |
|
} |
|
} else { |
|
if ($warnings) { |
|
$r->print($warnings); |
|
} |
|
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('<p class="LC_error">' |
|
.&mt('No new filename specified.') |
|
.'</p></form>' |
|
); |
|
} |
|
} elsif ($env{'form.action'} eq 'newdir') { |
|
my $mode = ''; |
|
if (exists($env{'form.callingmode'}) ) { |
|
$mode = $env{'form.callingmode'}; |
|
} |
|
&NewDir1($r, $uname, $udom, $fn, $newfilename, $mode); |
|
} |
} |
} |
} |
} |
|
|
Line 860 sub Rename2 {
|
Line 1099 sub Rename2 {
|
my $oRN=$oldfile; |
my $oRN=$oldfile; |
my $nRN=$newfile; |
my $nRN=$newfile; |
unless (rename($oldfile,$newfile)) { |
unless (rename($oldfile,$newfile)) { |
$request->print('<font color="red">'.&mt('Error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>'); |
return 0; |
return 0; |
} |
} |
## If old name.(extension) exits, move under new name. |
## If old name.(extension) exits, move under new name. |
## If it doesn't exist and a new.(extension) exists |
## If it doesn't exist and a new.(extension) exists |
## delete it (only concern when renaming over files) |
## delete it (only concern when renaming over files) |
my $tmp1=$oRN.'.meta'; |
my $tmp1=$oRN.'.meta'; |
my $tmp2=$nRN.'.meta'; |
my $tmp2=$nRN.'.meta'; |
Line 895 sub Rename2 {
|
Line 1134 sub Rename2 {
|
unlink $tmp2; |
unlink $tmp2; |
} |
} |
} else { |
} else { |
$request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>'); |
$request->print( |
|
'<p class="LC_error">' |
|
.&mt('No such file: [_1]', |
|
&display($oldfile)) |
|
.'</p></form>' |
|
); |
return 0; |
return 0; |
} |
} |
return 1; |
return 1; |
Line 905 sub Rename2 {
|
Line 1149 sub Rename2 {
|
|
|
=item Delete2($request, $user, $filename) |
=item Delete2($request, $user, $filename) |
|
|
Performs phase two of a delete. The user has confirmed that they want |
Performs phase two of a delete. The user has confirmed that they want |
to delete the selected file. The file is deleted and the results of the |
to delete the selected file. The file is deleted and the results of the |
delete attempt are indicated. |
delete attempt are indicated. |
|
|
Line 932 Returns:
|
Line 1176 Returns:
|
|
|
sub Delete2 { |
sub Delete2 { |
my ($request, $user, $filename) = @_; |
my ($request, $user, $filename) = @_; |
if(opendir DIR, $filename) { |
if (-d $filename) { |
my @files=readdir(DIR); |
unless (&empty_directory($filename,'Delete2')) { |
shift @files; shift @files; # takes off . and .. |
$request->print('<span class="LC_error">'.&mt('Error: Directory Non Empty').'</span>'); |
if(@files) { |
|
$request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); |
|
return 0; |
return 0; |
} else { |
} else { |
if(-e $filename) { |
if(-e $filename) { |
unless(rmdir($filename)) { |
unless(rmdir($filename)) { |
$request->print('<font color="red">'.&mt('Error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>'); |
return 0; |
return 0; |
} |
} |
} else { |
} else { |
$request->print('<p> '.&mt('No such file').'. </p></form>'); |
$request->print('<p class="LC_error">'.&mt('No such file').'</p></form>'); |
return 0; |
return 0; |
} |
} |
} |
} |
} else { |
} else { |
if(-e $filename) { |
if(-e $filename) { |
unless(unlink($filename)) { |
unless(unlink($filename)) { |
$request->print('<font color="red">'.&mt('Error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>'); |
return 0; |
return 0; |
} |
} |
} else { |
} else { |
$request->print('<p> '.&mt('No such file').'. </p></form>'); |
$request->print('<p class="LC_error">'.&mt('No such file').'</p></form>'); |
return 0; |
return 0; |
} |
} |
} |
} |
Line 967 sub Delete2 {
|
Line 1209 sub Delete2 {
|
|
|
=item Copy2($request, $username, $dir, $oldfile, $newfile) |
=item Copy2($request, $username, $dir, $oldfile, $newfile) |
|
|
Performs phase 2 of a copy. The file is copied and the status |
Performs phase 2 of a copy. The file is copied and the status |
of that copy is reported back to the user. |
of that copy is reported back to the user. |
|
|
=over 4 |
=over 4 |
Line 987 sub Delete2 {
|
Line 1229 sub Delete2 {
|
|
|
=back |
=back |
|
|
Returns 0 failure, and 0 successs. |
Returns 0 failure, and 1 successs. |
|
|
=cut |
=cut |
|
|
Line 995 sub Copy2 {
|
Line 1237 sub Copy2 {
|
my ($request, $username, $dir, $oldfile, $newfile) = @_; |
my ($request, $username, $dir, $oldfile, $newfile) = @_; |
&Debug($request ,"Will try to copy $oldfile to $newfile"); |
&Debug($request ,"Will try to copy $oldfile to $newfile"); |
if(-e $oldfile) { |
if(-e $oldfile) { |
|
if ($oldfile eq $newfile) { |
|
$request->print('<span class="LC_error">'.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.</span>'); |
|
return 1; |
|
} |
unless (copy($oldfile, $newfile)) { |
unless (copy($oldfile, $newfile)) { |
$request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('copy Error').': '.$!.'</span>'); |
return 0; |
return 0; |
} elsif (!chmod(0660, $newfile)) { |
} elsif (!chmod(0660, $newfile)) { |
$request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('chmod error').': '.$!.'</span>'); |
return 0; |
return 0; |
} elsif (-e $oldfile.'.meta' && |
} elsif (-e $oldfile.'.meta' && |
!copy($oldfile.'.meta', $newfile.'.meta') && |
!copy($oldfile.'.meta', $newfile.'.meta') && |
!chmod(0660, $newfile.'.meta')) { |
!chmod(0660, $newfile.'.meta')) { |
$request->print('<font color="red"> '.&mt('copy metadata error'). |
$request->print('<span class="LC_error">'.&mt('copy metadata error'). |
': '.$!.'</font>'); |
': '.$!.'</span>'); |
return 0; |
return 0; |
} else { |
} else { |
return 1; |
return 1; |
} |
} |
} else { |
} else { |
$request->print('<p> '.&mt('No such file').' </p>'); |
$request->print('<p class="LC_error">'.&mt('No such file').'</p>'); |
return 0; |
return 0; |
} |
} |
return 1; |
return 1; |
Line 1041 Returns 0 - failure 1 - success.
|
Line 1287 Returns 0 - failure 1 - success.
|
|
|
sub NewDir2 { |
sub NewDir2 { |
my ($request, $user, $newdirectory) = @_; |
my ($request, $user, $newdirectory) = @_; |
|
|
unless(mkdir($newdirectory, 02770)) { |
unless(mkdir($newdirectory, 02770)) { |
$request->print('<font color="red">'.&mt('Error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>'); |
return 0; |
return 0; |
} |
} |
unless(chmod(02770, ($newdirectory))) { |
unless(chmod(02770, ($newdirectory))) { |
$request->print('<font color="red"> '.&mt('Error').': '.$!.'</font>'); |
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>'); |
return 0; |
return 0; |
} |
} |
return 1; |
return 1; |
Line 1055 sub NewDir2 {
|
Line 1301 sub NewDir2 {
|
|
|
sub decompress2 { |
sub decompress2 { |
my ($r, $user, $dir, $file) = @_; |
my ($r, $user, $dir, $file) = @_; |
&Apache::lonnet::appenv('cgi.file' => $file); |
&Apache::lonnet::appenv({'cgi.file' => $file}); |
&Apache::lonnet::appenv('cgi.dir' => $dir); |
&Apache::lonnet::appenv({'cgi.dir' => $dir}); |
my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl'); |
my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl'); |
$r->print($result); |
$r->print($result); |
&Apache::lonnet::delenv('cgi.file'); |
&Apache::lonnet::delenv('cgi.file'); |
Line 1074 sub decompress2 {
|
Line 1320 sub decompress2 {
|
is performed and the result is shown. |
is performed and the result is shown. |
|
|
The strategy is to break out the processing into specific action processors |
The strategy is to break out the processing into specific action processors |
named action2 where action is the requested action and the 2 denotes |
named action2 where action is the requested action and the 2 denotes |
phase 2 processing. |
phase 2 processing. |
|
|
Parameters: |
Parameters: |
Line 1098 Parameters:
|
Line 1344 Parameters:
|
|
|
sub phasetwo { |
sub phasetwo { |
my ($r,$fn,$uname,$udom)=@_; |
my ($r,$fn,$uname,$udom)=@_; |
|
|
&Debug($r, "loncfile - Entering phase 2 for $fn"); |
&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 $dir; # Directory path |
my $main; # Filename. |
my $main; # Filename. |
my $suffix; # Extension. |
my $suffix; # Extension. |
Line 1111 sub phasetwo {
|
Line 1357 sub phasetwo {
|
$main=$2; # Filename. |
$main=$2; # Filename. |
} |
} |
if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions |
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 |
$suffix=$1; #This is the actually filename extension if it exists |
|
$main=~s/\.\w+$//; #strip the extension |
} |
} |
my $dest; # On success this is where we'll go. |
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,"loncfile::phase2 dir = $dir main = $main suffix = $suffix"); |
&Debug($r," newfilename = ".$env{'form.newfilename'}); |
&Debug($r," newfilename = ".$env{'form.newfilename'}); |
|
|
my $conspace=$fn; |
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. |
# Select the appropriate processing sub. |
if ($env{'form.action'} eq 'decompress') { |
if ($env{'form.action'} eq 'decompress') { |
$main .= '.'.$suffix; |
$main .= '.'.$suffix; |
if(!&decompress2($r, $uname, $dir, $main)) { |
if(!&decompress2($r, $uname, $dir, $main)) { |
return ; |
return ; |
Line 1137 sub phasetwo {
|
Line 1385 sub phasetwo {
|
if($env{'form.newfilename'}) { |
if($env{'form.newfilename'}) { |
if (!defined($dir)) { |
if (!defined($dir)) { |
$fn=~m:^(.*)/:; |
$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; |
return; |
} |
} |
$dest = $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') { |
} elsif ($env{'form.action'} eq 'delete') { |
if(!&Delete2($r, $uname, $env{'form.newfilename'})) { |
if(!&Delete2($r, $uname, $env{'form.newfilename'})) { |
return ; |
return ; |
} |
} |
Line 1152 sub phasetwo {
|
Line 1404 sub phasetwo {
|
# previously held it. |
# previously held it. |
# |
# |
$dest = $dir."/."; # Parent dir. |
$dest = $dir."/."; # Parent dir. |
} elsif ($env{'form.action'} eq 'copy') { |
} elsif ($env{'form.action'} eq 'copy') { |
if($env{'form.newfilename'}) { |
if($env{'form.newfilename'}) { |
if(!&Copy2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { |
if(!&Copy2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { |
return ; |
return ; |
} |
} |
$dest = $env{'form.newfilename'}; |
$dest = $env{'form.newfilename'}; |
} else { |
} else { |
$r->print('<p>'.&mt('No New filename specified').'</p></form>'); |
$r->print('<p class="LC_error">'.&mt('No New filename specified').'</p></form>'); |
return; |
return; |
} |
} |
|
|
Line 1171 sub phasetwo {
|
Line 1423 sub phasetwo {
|
$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') ) ) { |
if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { |
$r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>'); |
$r->print( |
|
'<p>' |
|
.&Apache::lonhtmlcommon::confirm_success(&mt('Done')) |
|
.'<br /><a href="javascript:self.close()">'.&mt('Continue').'</a>' |
|
.'</p>' |
|
); |
} else { |
} else { |
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>'); |
if ($env{'form.action'} eq 'rename') { |
|
$r->print( |
|
'<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Done')).'</p>' |
|
.&Apache::lonhtmlcommon::actionbox( |
|
['<a href="'.&url($dest).'">'.&mt('Return to Directory').'</a>', |
|
'<a href="'.&url($dest_newname).'">'.$disp_newname.'</a>'])); |
|
} else { |
|
$r->print(&done($dest)); |
|
} |
} |
} |
} |
} |
|
|
Line 1181 sub handler {
|
Line 1446 sub handler {
|
|
|
$r=shift; |
$r=shift; |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename','mode']); |
|
|
&Debug($r, "loncfile.pm - handler entered"); |
&Debug($r, "loncfile.pm - handler entered"); |
&Debug($r, " filename: ".$env{'form.filename'}); |
&Debug($r, " filename: ".$env{'form.filename'}); |
Line 1195 sub handler {
|
Line 1460 sub handler {
|
|
|
if ($env{'form.filename'}) { |
if ($env{'form.filename'}) { |
&Debug($r, "test: $env{'form.filename'}"); |
&Debug($r, "test: $env{'form.filename'}"); |
$fn=&Apache::lonnet::unescape($env{'form.filename'}); |
$fn=&unescape($env{'form.filename'}); |
$fn=&URLToPath($fn); |
$fn=&URLToPath($fn); |
} elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') { |
} elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') { |
#Just hijack the script only the first time around to inject the |
#Just hijack the script only the first time around to inject the |
#correct information for further processing |
#correct information for further processing |
$fn=&Apache::lonnet::unescape($env{'form.decompress'}); |
$fn=&unescape($env{'form.decompress'}); |
$fn=&URLToPath($fn); |
$fn=&URLToPath($fn); |
$env{'form.action'}="decompress"; |
$env{'form.action'}="decompress"; |
} elsif ($env{'form.qualifiedfilename'}) { |
} elsif ($env{'form.qualifiedfilename'}) { |
Line 1208 sub handler {
|
Line 1473 sub handler {
|
} else { |
} else { |
&Debug($r, "loncfile::handler - no form.filename"); |
&Debug($r, "loncfile::handler - no form.filename"); |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
' unspecified filename for cfile', $r->filename); |
' unspecified filename for cfile', $r->filename); |
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
unless ($fn) { |
unless ($fn) { |
&Debug($r, "loncfile::handler - doctored url is empty"); |
&Debug($r, "loncfile::handler - doctored url is empty"); |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
' trying to cfile non-existing file', $r->filename); |
' trying to cfile non-existing file', $r->filename); |
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
# ----------------------------------------------------------- Start page output |
# ----------------------------------------------------------- Start page output |
my $uname; |
|
my $udom; |
|
|
|
($uname,$udom)= |
my ($uname,$udom) = &Apache::lonnet::constructaccess($fn); |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
&Debug($r, |
&Debug($r, |
|
"loncfile::handler constructaccess uname = $uname domain = $udom"); |
"loncfile::handler constructaccess uname = $uname domain = $udom"); |
unless (($uname) && ($udom)) { |
if (($uname eq '') || ($udom eq '')) { |
$r->log_reason($uname.' at '.$udom. |
$r->log_reason($uname.' at '.$udom. |
' trying to manipulate file '.$env{'form.filename'}. |
' trying to manipulate file '.$env{'form.filename'}. |
' ('.$fn.') - not authorized', |
' ('.$fn.') - not authorized', |
$r->filename); |
$r->filename); |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
Line 1239 sub handler {
|
Line 1501 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
|
my (%loaditem,$js); |
|
|
if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { |
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'}; |
my $newdirname = $env{'form.newfilename'}; |
$r->print('<html><head><title>LON-CAPA Construction Space</title><script language="Javascript">'); |
$js = qq| |
$r->print(qq| |
<script type="text/javascript"> |
function writeDone() { |
function writeDone() { |
var winName = window.opener |
|
window.focus(); |
window.focus(); |
winName.document.dataForm.newdir.value = "$newdirname" |
opener.document.info.newdir.value = "$newdirname"; |
setTimeout("self.close()",10000) |
setTimeout("self.close()",10000); |
} |
} |
</script> |
</script> |
</head>|); |
|; |
my $loaditem = 'onLoad="writeDone()"'; |
$loaditem{'onload'} = "writeDone()"; |
$r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem)); |
|
} else { |
|
$r->print('<html><head><title>LON-CAPA Construction Space</title></head>'); |
|
$r->print(&Apache::loncommon::bodytag('Construction Space File Operation')); |
|
} |
} |
|
|
|
my $londocroot = $r->dir_config('lonDocRoot'); |
$r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>'); |
my $trailfile = $fn; |
|
$trailfile =~ s{^/(priv/)}{$londocroot/$1}; |
|
|
|
# Breadcrumbs |
|
my $crsauthor; |
|
my $text = 'Authoring Space'; |
|
my $title = 'Authoring Space File Operation', |
|
my $href = &Apache::loncommon::authorspace(&url($fn)); |
|
if ($env{'request.course.id'}) { |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
if ($href eq "/priv/$cdom/$cnum/") { |
|
$text = 'Course Authoring Space'; |
|
$title = 'Course Authoring Space File Operation', |
|
$crsauthor = 1; |
|
} |
|
} |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => $text, |
|
'href' => $href, |
|
}); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'File Operation', |
|
'title' => $title, |
|
'href' => '', |
|
}); |
|
|
|
$r->print(&Apache::loncommon::start_page($title, |
|
$js, |
|
{'add_entries' => \%loaditem,}) |
|
.&Apache::lonhtmlcommon::breadcrumbs() |
|
.&Apache::loncommon::head_subbox( |
|
&Apache::loncommon::CSTR_pageheader($trailfile)) |
|
); |
|
|
|
$r->print('<p>'.&mt('Location').': '.&display($fn).'</p>'); |
|
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
$r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom. |
unless ($crsauthor) { |
'</font></h3>'); |
$r->print('<p class="LC_info">' |
|
.&mt('Co-Author [_1]',$uname.':'.$udom) |
|
.'</p>' |
|
); |
|
} |
} |
} |
|
|
|
|
&Debug($r, "loncfile::handler Form action is $env{'form.action'} "); |
&Debug($r, "loncfile::handler Form action is $env{'form.action'} "); |
if ($env{'form.action'} eq 'delete') { |
my %action = &Apache::lonlocal::texthash( |
$r->print('<h3>'.&mt('Delete').'</h3>'); |
'delete' => 'Delete', |
} elsif ($env{'form.action'} eq 'rename') { |
'rename' => 'Rename', |
$r->print('<h3>'.&mt('Rename').'</h3>'); |
'move' => 'Move', |
} elsif ($env{'form.action'} eq 'move') { |
'newdir' => 'New Directory', |
$r->print('<h3>'.&mt('Move').'</h3>'); |
'decompress' => 'Decompress', |
} elsif ($env{'form.action'} eq 'newdir') { |
'copy' => 'Copy', |
$r->print('<h3>'.&mt('New Directory').'</h3>'); |
'newfile' => 'New Resource', |
} elsif ($env{'form.action'} eq 'decompress') { |
'newhtmlfile' => 'New Resource', |
$r->print('<h3>'.&mt('Decompress').'</h3>'); |
'newproblemfile' => 'New Resource', |
} elsif ($env{'form.action'} eq 'copy') { |
'newpagefile' => 'New Resource', |
$r->print('<h3>'.&mt('Copy').'</h3>'); |
'newsequencefile' => 'New Resource', |
} elsif ($env{'form.action'} eq 'newfile' || |
'newrightsfile' => 'New Resource', |
$env{'form.action'} eq 'newhtmlfile' || |
'newstyfile' => 'New Resource', |
$env{'form.action'} eq 'newproblemfile' || |
'newtaskfile' => 'New Resource', |
$env{'form.action'} eq 'newpagefile' || |
'newlibraryfile' => 'New Resource', |
$env{'form.action'} eq 'newsequencefile' || |
'Select Action' => 'New Resource', |
$env{'form.action'} eq 'newrightsfile' || |
); |
$env{'form.action'} eq 'newstyfile' || |
if ($action{$env{'form.action'}}) { |
$env{'form.action'} eq 'newlibraryfile' || |
if ($crsauthor) { |
$env{'form.action'} eq 'Select Action' ) { |
my @disallowed = qw(page sequence rights library); |
$r->print('<h3>'.&mt('New Resource').'</h3>'); |
my $newtype; |
|
if ($env{'form.action'} =~ /^new(\w+)file$/) { |
|
$newtype = $1; |
|
} elsif ($env{'form.action'} eq 'newfile') { |
|
($newtype) = ($env{'form.newfilename'} =~ m{\.([^/.]+)$}); |
|
$newtype = lc($newtype); |
|
} |
|
if (($newtype ne '') && |
|
(grep(/^\Q$newtype\E$/,@disallowed))) { |
|
$r->print('<p class="LC_error">' |
|
.&mt('Creation of a new file of type: [_1] is not permitted in Course Authoring Space',$newtype) |
|
.'</p>' |
|
.&Apache::loncommon::end_page() |
|
); |
|
return OK; |
|
} |
|
} |
|
$r->print('<h2>'.$action{$env{'form.action'}}.'</h2>'); |
} else { |
} else { |
$r->print('<p>'.&mt('Unknown Action').' '.$env{'form.action'}.' </p></body></html>'); |
$r->print('<p class="LC_error">' |
return OK; |
.&mt('Unknown Action: [_1]',$env{'form.action'}) |
|
.'</p>' |
|
.&Apache::loncommon::end_page() |
|
); |
|
return OK; |
} |
} |
|
|
if ($env{'form.phase'} eq 'two') { |
if ($env{'form.phase'} eq 'two') { |
&Debug($r, "loncfile::handler entering phase2"); |
&Debug($r, "loncfile::handler entering phase2"); |
&phasetwo($r,$fn,$uname,$udom); |
&phasetwo($r,$fn,$uname,$udom); |
Line 1302 function writeDone() {
|
Line 1623 function writeDone() {
|
&phaseone($r,$fn,$uname,$udom); |
&phaseone($r,$fn,$uname,$udom); |
} |
} |
|
|
$r->print('</body></html>'); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
|
|
1; |
1; |