loncom/publisher/loncfile.pm - diff

Return to loncfile.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/loncfile.pm between versions 1.88 and 1.122

version 1.88, 2008/03/12 02:46:38	version 1.122, 2014/06/14 21:40:05
Line 37	Line 37

=head1 NAME	=head1 NAME

Apache::loncfile - Construction space file management.	Apache::loncfile - Authoring space file management.

=head1 SYNOPSIS	=head1 SYNOPSIS

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::lonnet;	use Apache::lonnet;
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonlocal;	use Apache::lonlocal;
Line 102 my $r; # Needs to be global for some	Line 101 my $r; # Needs to be global for some
=cut	=cut

sub Debug {	sub Debug {
# Put out the indicated message butonly if DEBUG is true.	# Put out the indicated message but only if DEBUG is true.
if ($DEBUG) {	if ($DEBUG) {
my ($r,$message) = @_;	my ($r,$message) = @_;
$r->log_reason($message);	$r->log_reason($message);
}	}
}	}

	sub done {
	my ($url) = @_;
	return
	'<p>'
	.&Apache::lonhtmlcommon::confirm_success(&mt("Done"))
	.'<br /><a href="'.$url.'">'.&mt("Continue").'</a>'
	.'<script type="text/javascript">'
	.'location.href="'.$url.'";'
	.'</script>'
	.'</p>';
	}

=pod	=pod

=item URLToPath($url)	=item URLToPath($url)
Line 147 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\/)($match_username)\//\/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=shift;
$fn=~s/^\/home\/($match_username)\/public\_html/\/priv\/$1/;	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	$fn=~ s/^\Q$londocroot\E//;
	$fn=~s{/\./}{/}g;
$fn=&HTML::Entities::encode($fn,'<>"&');	$fn=&HTML::Entities::encode($fn,'<>"&');
return $fn;	return $fn;
}	}

sub display {	sub display {
my $fn=shift;	my $fn=shift;
$fn=~s-^/home/($match_username)/public_html-/priv/$1-;	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	$fn=~s/^\Q$londocroot\E//;
	$fn=~s{/\./}{/}g;
return '<span class="LC_filename">'.$fn.'</span>';	return '<span class="LC_filename">'.$fn.'</span>';
}	}

Line 175 sub display {	Line 190 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 191 sub obsolete_unpub {	Line 206 sub obsolete_unpub {
# see if directory is empty	# see if directory is empty
# ignores any .meta, .save, .bak, and .log files created for a previously	# ignores any .meta, .save, .bak, and .log files created for a previously
# published file, which has since been marked obsolete and deleted.	# 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 {	sub empty_directory {
my ($dirname,$phase) = @_;	my ($dirname,$phase) = @_;
if (opendir DIR, $dirname) {	if (opendir DIR, $dirname) {
my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..	my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..
if (@files) {	if (@files) {
my @orphans = grep(/\.(meta\|save\|log\|bak)$/,@files);	my @orphans = grep(/\.(meta\|save\|log\|bak\|DS_Store)$/,@files);
if (scalar(@files) - scalar(@orphans) > 0) {	if (scalar(@files) - scalar(@orphans) > 0) {
return 0;	return 0;
} else {	} else {
Line 219 sub empty_directory {	Line 235 sub empty_directory {

=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:
Line 258 sub exists {	Line 274 sub exists {
my ($user, $domain, $construct, $creating) = @_;	my ($user, $domain, $construct, $creating) = @_;
$creating \|\|= 'file';	$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 ($type,$result);
if ( -d $construct ) {	if ( -d $construct ) {
return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>');	return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>');
Line 334 sub checksuffix {	Line 350 sub checksuffix {
}	}

sub cleanDest {	sub cleanDest {
my ($request,$dest,$subdir,$fn,$uname)=@_;	my ($request,$dest,$subdir,$fn,$uname,$udom)=@_;
#remove bad characters	#remove bad characters
my $foundbad=0;	my $foundbad=0;
	my $error='';
if ($subdir && $dest =~/\./) {	if ($subdir && $dest =~/\./) {
$foundbad=1;	$foundbad=1;
$dest=~s/\.//g;	$dest=~s/\.//g;
Line 348 sub cleanDest {	Line 365 sub cleanDest {
}	}
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><span class=\"LC_error\">".&mt('You have requested to create file in directory [_1] which doesn\'t exist. The requested directory path has been removed from the requested file name.','"'.&display($newpath).'"')."</span></p>");	$request->print('<p><span 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))
	.'</span></p>');
$dest=~s\|.*/\|\|;	$dest=~s\|.*/\|\|;
}	}
}	}
if ($dest =~ /\.(\d+)\.(\w+)$/){	if ($dest =~ /\.(\d+)\.(\w+)$/){
$request->print('<span class="LC_error">'	$request->print('<p><span class="LC_warning">'
.&mt('Bad filename [_1].<br /> <tt>(name).(number).(extension)</tt> not allowed. <br /> Removing the <tt>.number.</tt> from requested filename.',&display($dest))	.&mt('Bad filename [_1]',&display($dest))
.'</span>');	.'<br />'
	.&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>')
	.'<br />'
	.&mt('Removing the [_1].number.[_2] from requested filename.','<tt>','</tt>')
	.'</span></p>');
$dest =~ s/\.(\d+)(\.\w+)$/$2/;	$dest =~ s/\.(\d+)(\.\w+)$/$2/;
}	}
if ($foundbad) {	if ($foundbad) {
$request->print("<p><span class=\"LC_error\">".&mt('Invalid characters in requested name have been removed.')."</span></p>");	$request->print('<p><span class="LC_warning">'
	.&mt('Invalid characters in requested name have been removed.')
	.'</span></p>'
	);
}	}
return $dest;	return ($dest,$error);
}	}

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 403 Parameters:	Line 437 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 435 Parameters:	Line 469 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(&url($fn)));
}	}

=pod	=pod
Line 496 sub Rename1 {	Line 530 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 /><span classr="LC_warning">'.	$request->print('<p><span class="LC_error">'.
&mt('Cannot change MIME type of a directory').	&mt('Cannot change MIME type of a directory.').
'</span>'.	'</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 515 sub Rename1 {	Line 549 sub Rename1 {
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>'
'</p><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;
}	}

Line 570 sub Delete1 {	Line 615 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.'" />');
if (-d $fn) {	if (-d $fn) {
unless (&empty_directory($fn,'Delete1')) {	unless (&empty_directory($fn,'Delete1')) {
$request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.	$request->print('<p>'
'You must delete the contents of the directory first.<br />'.	.'<span class="LC_error">'
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');	.&mt('Only empty directories may be deleted.')
	.'</span><br />'
	.&mt('You must delete the contents of the directory first.')
	.'</p>'
	.'<p><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
	);
return;	return;
}	}
} else {	} else {
unless (&obsolete_unpub($user,$domain,$fn)) {	unless (&obsolete_unpub($user,$domain,$fn)) {
$request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.	$request->print('<p><span class="LC_error">'
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');	.&mt('Cannot delete non-obsolete published file.')
	.'</span><br />'
	.'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
	);
return;	return;
}	}
}	}
$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');	$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 639 sub Copy1 {	Line 700 sub Copy1 {
my ($type,$return)=&exists($user, $domain, $newfilename);	my ($type,$return)=&exists($user, $domain, $newfilename);
$request->print($return);	$request->print($return);
if ($type eq '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>'
	);
}	}
}	}

Line 699 sub NewDir1 {	Line 780 sub NewDir1 {
if ($type eq 'error') {	if ($type eq 'error') {
$request->print('</form>');	$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 715 sub NewDir1 {	Line 799 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>'
	);
}	}
}	}

Line 744 Parameters:	Line 836 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
Line 757 Side Effects:	Line 849 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

Line 765 button which returns you to the driector	Line 857 button which returns you to the driector

sub NewFile1 {	sub NewFile1 {
my ($request, $user, $domain, $fn, $newfilename) = @_;	my ($request, $user, $domain, $fn, $newfilename) = @_;
	return if (&filename_check($newfilename) 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('<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;
}
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
Line 795 sub NewFile1 {	Line 874 sub NewFile1 {
if ($type eq 'error') {	if ($type eq 'error') {
$request->print('</form>');	$request->print('</form>');
} else {	} else {
	my $extension;

	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('<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>');
	return;
	}

$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');	$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
$request->print('</form>');	$request->print('</form>');

$request->print('<form action="'.&url($newfilename).	$request->print('<form action="'.&url($newfilename).
'" method="POST"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');	'" method="post"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
$request->print('<form action="'.&url($fn).	$request->print('<form action="'.&url($fn).
'" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');	'" 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 838 sub phaseone {	Line 960 sub phaseone {

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) =
$newfilename=&relativeDest($fn,$newfilename,$uname);	&cleanDest($r,$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;
	}
	$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" />'.
Line 857 sub phaseone {	Line 994 sub phaseone {
if($newfilename) {	if($newfilename) {
&Copy1($r, $uname, $udom, $fn, $newfilename);	&Copy1($r, $uname, $udom, $fn, $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>'
	);
}	}
} elsif ($env{'form.action'} eq 'newdir') {	} elsif ($env{'form.action'} eq 'newdir') {
my $mode = '';	my $mode = '';
Line 879 sub phaseone {	Line 1019 sub phaseone {
if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
&NewFile1($r, $uname, $udom, $fn, $newfilename);	&NewFile1($r, $uname, $udom, $fn, $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>'
	);
}	}
}	}
}	}
Line 966 sub Rename2 {	Line 1109 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 1014 sub Delete2 {	Line 1162 sub Delete2 {
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 1025 sub Delete2 {	Line 1173 sub Delete2 {
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 1084 sub Copy2 {	Line 1232 sub Copy2 {
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 1238 sub phasetwo {	Line 1386 sub phasetwo {
}	}
$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 1250 sub phasetwo {	Line 1398 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 {
if ($env{'form.action'} eq 'rename') {	if ($env{'form.action'} eq 'rename') {
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Return to Directory').'</a></h3>');	$r->print(
$r->print('<h3><a href="'.&url($dest_newname).'">'.$disp_newname.'</a></h3>');	'<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 {	} else {
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');	$r->print(&done(&url($dest)));
}	}
}	}
}	}
Line 1304 sub handler {	Line 1460 sub handler {
}	}

# ----------------------------------------------------------- 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',
Line 1330 sub handler {	Line 1483 sub handler {
$js = qq\|	$js = qq\|
<script type="text/javascript">	<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>
\|;	\|;
$loaditem{'onload'} = "writeDone()";	$loaditem{'onload'} = "writeDone()";
}	}

	my $londocroot = $r->dir_config('lonDocRoot');
	my $trailfile = $fn;
	$trailfile =~ s{^/(priv/)}{$londocroot/$1};

$r->print(&Apache::loncommon::start_page('Construction Space File Operation',	# Breadcrumbs
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	&Apache::lonhtmlcommon::add_breadcrumb({
	'text' => 'Authoring Space',
	'href' => &Apache::loncommon::authorspace($fn),
	});
	&Apache::lonhtmlcommon::add_breadcrumb({
	'text' => 'File Operation',
	'title' => 'Authoring Space File Operation',
	'href' => '',
	});

	$r->print(&Apache::loncommon::start_page('Authoring Space File Operation',
$js,	$js,
{'add_entries' => \%loaditem,}));	{'add_entries' => \%loaditem,})
	.&Apache::lonhtmlcommon::breadcrumbs()
	.&Apache::loncommon::head_subbox(
	&Apache::loncommon::CSTR_pageheader($trailfile))
	);

$r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');	$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><span class="LC_error">'.&mt('Co-Author').': '.$uname.' at '.$udom.	$r->print('<p class="LC_info">'
'</span></h3>');	.&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 'newtaskfile' \|\|	$r->print('<h2>'.$action{$env{'form.action'}}.'</h2>');
$env{'form.action'} eq 'newlibraryfile' \|\|
$env{'form.action'} eq 'Select Action' ) {
$r->print('<h3>'.&mt('New Resource').'</h3>');
} else {	} else {
$r->print('<p>'.&mt('Unknown Action').' '.$env{'form.action'}.' </p>'.	$r->print('<p class="LC_error">'
&Apache::loncommon::end_page());	.&mt('Unknown Action: [_1]',$env{'form.action'})
return OK;	.'</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);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.88
changed lines
	Added in v.1.122