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.66 and 1.85

version 1.66, 2005/04/07 04:46:36	version 1.85, 2007/07/23 23:53:31
Line 69 use File::Copy;	Line 69 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::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 101 my $r; # Needs to be global for some	Line 102 my $r; # Needs to be global for some
=cut	=cut

sub Debug {	sub Debug {

# Marshall the parameters.

my $r = shift;
my $log = $r->log;
my $message = shift;

# Put out the indicated message butonly if DEBUG is true.	# 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);
}	}
}	}
Line 156 sub URLToPath {	Line 150 sub URLToPath {
$Url=~ s/\/+/\//g;	$Url=~ s/\/+/\//g;
$Url=~ s/^http\:\/\/[^\/]+//;	$Url=~ s/^http\:\/\/[^\/]+//;
$Url=~ s/^\///;	$Url=~ s/^\///;
$Url=~ s/(\~\|priv\/)(\w+)\//\/home\/$2\/public_html\//;	$Url=~ s/(\~\|priv\/)($match_username)\//\/home\/$2\/public_html\//;
&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\/(\w+)\/public\_html/\/priv\/$1/;	$fn=~s/^\/home\/($match_username)\/public\_html/\/priv\/$1/;
$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/(\w+)/public_html-/priv/$1-;	$fn=~s-^/home/($match_username)/public_html-/priv/$1-;
return '<tt>'.$fn.'</tt>';	return '<tt>'.$fn.'</tt>';
}	}

Line 194 sub obsolete_unpub {	Line 188 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.
	sub empty_directory {
	my ($dirname,$phase) = @_;
	if (opendir DIR, $dirname) {
	my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..
	if (@files) {
	my @orphans = grep(/\.(meta\|save\|log\|bak)$/,@files);
	if (scalar(@files) - scalar(@orphans) > 0) {
	return 0;
	} else {
	if (($phase eq 'Delete2') && (@orphans > 0)) {
	foreach my $file (@orphans) {
	if ($file =~ /\.(meta\|save\|log\|bak)$/) {
	unlink($dirname.$file);
	}
	}
	}
	}
	}
	closedir(DIR);
	return 1;
	}
	return 0;
	}

=pod	=pod

Line 207 sub obsolete_unpub {	Line 226 sub obsolete_unpub {

=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 243 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.
Line 229 Returns:	Line 255 Returns:
=cut	=cut

sub exists {	sub exists {
my ($user, $domain, $construct) = @_;	my ($user, $domain, $construct, $creating) = @_;
	$creating \|\|= 'file';

my $published=$construct;	my $published=$construct;
$published=~	$published=~
s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;	s{^/home/$user/public_html/}{/home/httpd/html/res/$domain/$user/};
my $result='';	my ($type,$result);
if ( -d $construct ) {	if ( -d $construct ) {
return &mt('Error: destination for operation is an existing directory.');	return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></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><span class="LC_warning">'.&mt('Warning: target file exists, and has been published!').'</span></p>';
	} else {
	my $published_type = (-d $published) ? 'directory' : 'file';

	if ($published_type eq $creating) {
	$type = 'warning';
	$result.='<p><span class="LC_warning">'.&mt("Warning: a published $published_type of this name exists.").'</span></p>';
	} else {
	$type = 'error';
	$result.='<p><span class="LC_error">'.&mt("Error: a published $published_type of this name exists.").'</span></p>';
	}
	}
} elsif ( -e $construct) {	} elsif ( -e $construct) {
$result.='<p><font color="red">'.&mt('Warning: target file exists!').'</font></p>';	$type = 'warning';
	$result.='<p><span class="LC_warning">'.&mt('Warning: target file exists!').'</span></p>';
}	}
return $result;
	return ($type,$result);
}	}

=pod	=pod
Line 281 sub checksuffix {	Line 326 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><span class="LC_warning">'.&mt('Warning: change of MIME type!').'</span></p>';
}	}
return $result;	return $result;
}	}
Line 296 sub cleanDest {	Line 341 sub cleanDest {
$foundbad=1;	$foundbad=1;
$dest=~s/\.//g;	$dest=~s/\.//g;
}	}
if ($dest=~/[\#\?&%\"]/) {	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=&relativeDest($fn,$newpath,$uname);
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>");	$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.','"<tt>'.$newpath.'</tt>"')."</span></p>");
$dest=~s\|.*/\|\|;	$dest=~s\|.*/\|\|;
}	}
}	}
	if ($dest =~ /\.(\d+)\.(\w+)$/){
	$request->print('<span class="LC_error">'
	.&mt('Bad filename [_1].<br /> <tt>(name).(number).(extension)</tt> not allowed. <br /> Removing the <tt>.number.</tt> from requested filename.',$dest)
	.'</span>');
	$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>");	$request->print("<p><span class=\"LC_error\">".&mt('Invalid characters in requested name have been removed.')."</span></p>");
}	}
return $dest;	return $dest;
}	}
Line 444 sub Rename1 {	Line 495 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('<br /><span classr="LC_warning">'.
&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>');
return;	return;
}	}
Line 456 sub Rename1 {	Line 507 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;
}	}
Line 519 sub Delete1 {	Line 570 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')) {
	$request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.
	'You must delete the contents of the directory first.<br />'.
	'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
	return;
	}
	} else {
	unless (&obsolete_unpub($user,$domain,$fn)) {
	$request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');	'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
return;	return;
}	}
	}
$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');	$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
&CloseForm1($request, $fn);	&CloseForm1($request, $fn);
} else {	} else {
Line 575 sub Copy1 {	Line 635 sub Copy1 {
$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>');
return;	return;
}	}
Line 633 causes the newdir operation to transitio	Line 693 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') {
$request->print('<input type="hidden" name="callingmode" value="testbank">');	$request->print('<input type="hidden" name="callingmode" value="testbank">');
Line 704 button which returns you to the driector	Line 765 button which returns you to the driector
sub NewFile1 {	sub NewFile1 {
my ($request, $user, $domain, $fn, $newfilename) = @_;	my ($request, $user, $domain, $fn, $newfilename) = @_;

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	##Informs User (name).(number).(extension) not allowed
if($newfilename =~ /\.(\d+)\.(\w+)$/){	if($newfilename =~ /\.(\d+)\.(\w+)$/){
$r->print('<font color="red">'.$newfilename.	$r->print('<span class="LC_error">'.$newfilename.
' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').')'.	' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').') '.
' '.&mt('Not Allowed').'</font>');	' '.&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;
}	}
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) {	$request->print($result);
$request->print('<font color="red">'.$result.'</font></form>');	if ($type eq 'error') {
	$request->print('</form>');
} else {	} else {

$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).
Line 767 sub phaseone {	Line 836 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=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname);
$newfilename=&relativeDest($fn,$newfilename,$uname);	$newfilename=&relativeDest($fn,$newfilename,$uname);
$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 'rename') {
&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');	&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
} elsif ($ENV{'form.action'} eq 'move') {	} elsif ($env{'form.action'} eq 'move') {
&Rename1($r, $uname, $udom, $fn, $newfilename, 'move');	&Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
} elsif ($ENV{'form.action'} eq 'delete') {	} elsif ($env{'form.action'} eq 'delete') {
&Delete1($r, $uname, $udom, $fn);	&Delete1($r, $uname, $udom, $fn);
} elsif ($ENV{'form.action'} eq 'decompress') {	} elsif ($env{'form.action'} eq 'decompress') {
&Decompress1($r, $uname, $udom, $fn);	&Decompress1($r, $uname, $udom, $fn);
} elsif ($ENV{'form.action'} eq 'copy') {	} elsif ($env{'form.action'} eq 'copy') {
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>'.&mt('No new filename specified.').'</p></form>');
}	}
} elsif ($ENV{'form.action'} eq 'newdir') {	} elsif ($env{'form.action'} eq 'newdir') {
my $mode = '';	my $mode = '';
if (exists($ENV{'form.callingmode'}) ) {	if (exists($env{'form.callingmode'}) ) {
$mode = $ENV{'form.callingmode'};	$mode = $env{'form.callingmode'};
}	}
&NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);	&NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
} elsif ($ENV{'form.action'} eq 'newfile' \|\|	} elsif ($env{'form.action'} eq 'newfile' \|\|
$ENV{'form.action'} eq 'newhtmlfile' \|\|	$env{'form.action'} eq 'newhtmlfile' \|\|
$ENV{'form.action'} eq 'newproblemfile' \|\|	$env{'form.action'} eq 'newproblemfile' \|\|
$ENV{'form.action'} eq 'newpagefile' \|\|	$env{'form.action'} eq 'newpagefile' \|\|
$ENV{'form.action'} eq 'newsequencefile' \|\|	$env{'form.action'} eq 'newsequencefile' \|\|
$ENV{'form.action'} eq 'newrightsfile' \|\|	$env{'form.action'} eq 'newrightsfile' \|\|
$ENV{'form.action'} eq 'newstyfile' \|\|	$env{'form.action'} eq 'newstyfile' \|\|
$ENV{'form.action'} eq 'newlibraryfile' \|\|	$env{'form.action'} eq 'newlibraryfile' \|\|
$ENV{'form.action'} eq 'Select Action') {	$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);
Line 860 sub Rename2 {	Line 929 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.
Line 932 Returns:	Line 1001 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 {
Line 952 sub Delete2 {	Line 1019 sub Delete2 {
} 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 {
Line 987 sub Delete2 {	Line 1054 sub Delete2 {

=back	=back

Returns 0 failure, and 0 successs.	Returns 0 failure, and 1 successs.

=cut	=cut

Line 995 sub Copy2 {	Line 1062 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;
Line 1043 sub NewDir2 {	Line 1114 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 1101 sub phasetwo {	Line 1172 sub phasetwo {

&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.
Line 1111 sub phasetwo {	Line 1182 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 ;
}	}
$dest = $dir."/.";	$dest = $dir."/.";
} elsif ($ENV{'form.action'} eq 'rename' \|\|	} elsif ($env{'form.action'} eq 'rename' \|\|
$ENV{'form.action'} eq 'move') {	$env{'form.action'} eq 'move') {
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 ;
}	}
# Once a resource is deleted, we just list the directory that	# Once a resource is deleted, we just list the directory that
# 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>'.&mt('No New filename specified').'</p></form>');
return;	return;
}	}

} elsif ($ENV{'form.action'} eq 'newdir') {	} elsif ($env{'form.action'} eq 'newdir') {
my $newdir= $ENV{'form.newfilename'};	my $newdir= $env{'form.newfilename'};
if(!&NewDir2($r, $uname, $newdir)) {	if(!&NewDir2($r, $uname, $newdir)) {
return;	return;
}	}
$dest = $newdir."/";	$dest = $newdir."/";
}	}
if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') \|\| ($ENV{'form.callingmode'} eq 'imsimport') ) ) {	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('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>');
} else {	} else {
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');	if ($env{'form.action'} eq 'rename') {
	$r->print('<h3><a href="'.&url($dest).'">'.&mt('Return to Directory').'</a></h3>');
	$r->print('<h3><a href="'.&url($dest_newname).'">'.$disp_newname.'</a></h3>');
	} else {
	$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
	}
}	}
}	}

Line 1184 sub handler {	Line 1266 sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);

&Debug($r, "loncfile.pm - handler entered");	&Debug($r, "loncfile.pm - handler entered");
&Debug($r, " filename: ".$ENV{'form.filename'});	&Debug($r, " filename: ".$env{'form.filename'});
&Debug($r, " newfilename: ".$ENV{'form.newfilename'});	&Debug($r, " newfilename: ".$env{'form.newfilename'});
#	#
# Determine the root filename	# Determine the root filename
# This could come in as "filename", which actually is a URL, or	# This could come in as "filename", which actually is a URL, or
Line 1193 sub handler {	Line 1275 sub handler {
#	#
my $fn;	my $fn;

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'}) {
$fn=$ENV{'form.qualifiedfilename'};	$fn=$env{'form.qualifiedfilename'};
} 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;
}	}
Line 1229 sub handler {	Line 1311 sub handler {
"loncfile::handler constructaccess uname = $uname domain = $udom");	"loncfile::handler constructaccess uname = $uname domain = $udom");
unless (($uname) && ($udom)) {	unless (($uname) && ($udom)) {
$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 1321 sub handler {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') \|\| ($ENV{'form.callingmode'} eq 'imsimport') ) ) {	my (%loaditem,$js);
my $newdirname = $ENV{'form.newfilename'};
$r->print('<html><head><title>LON-CAPA Construction Space</title><script language="Javascript">');	if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') \|\| ($env{'form.callingmode'} eq 'imsimport') ) ) {
$r->print(qq\|	my $newdirname = $env{'form.newfilename'};
	$js = qq\|
	<script type="text/javascript">
function writeDone() {	function writeDone() {
var winName = window.opener	var winName = window.opener
window.focus();	window.focus();
Line 1250 function writeDone() {	Line 1334 function writeDone() {
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'));
}	}

	$r->print(&Apache::loncommon::start_page('Construction Space File Operation',
	$js,
	{'add_entries' => \%loaditem,}));

$r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');	$r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');

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.	$r->print('<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.' at '.$udom.
'</font></h3>');	'</span></h3>');
}	}


&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') {	if ($env{'form.action'} eq 'delete') {
$r->print('<h3>'.&mt('Delete').'</h3>');	$r->print('<h3>'.&mt('Delete').'</h3>');
} elsif ($ENV{'form.action'} eq 'rename') {	} elsif ($env{'form.action'} eq 'rename') {
$r->print('<h3>'.&mt('Rename').'</h3>');	$r->print('<h3>'.&mt('Rename').'</h3>');
} elsif ($ENV{'form.action'} eq 'move') {	} elsif ($env{'form.action'} eq 'move') {
$r->print('<h3>'.&mt('Move').'</h3>');	$r->print('<h3>'.&mt('Move').'</h3>');
} elsif ($ENV{'form.action'} eq 'newdir') {	} elsif ($env{'form.action'} eq 'newdir') {
$r->print('<h3>'.&mt('New Directory').'</h3>');	$r->print('<h3>'.&mt('New Directory').'</h3>');
} elsif ($ENV{'form.action'} eq 'decompress') {	} elsif ($env{'form.action'} eq 'decompress') {
$r->print('<h3>'.&mt('Decompress').'</h3>');	$r->print('<h3>'.&mt('Decompress').'</h3>');
} elsif ($ENV{'form.action'} eq 'copy') {	} elsif ($env{'form.action'} eq 'copy') {
$r->print('<h3>'.&mt('Copy').'</h3>');	$r->print('<h3>'.&mt('Copy').'</h3>');
} elsif ($ENV{'form.action'} eq 'newfile' \|\|	} elsif ($env{'form.action'} eq 'newfile' \|\|
$ENV{'form.action'} eq 'newhtmlfile' \|\|	$env{'form.action'} eq 'newhtmlfile' \|\|
$ENV{'form.action'} eq 'newproblemfile' \|\|	$env{'form.action'} eq 'newproblemfile' \|\|
$ENV{'form.action'} eq 'newpagefile' \|\|	$env{'form.action'} eq 'newpagefile' \|\|
$ENV{'form.action'} eq 'newsequencefile' \|\|	$env{'form.action'} eq 'newsequencefile' \|\|
$ENV{'form.action'} eq 'newrightsfile' \|\|	$env{'form.action'} eq 'newrightsfile' \|\|
$ENV{'form.action'} eq 'newstyfile' \|\|	$env{'form.action'} eq 'newstyfile' \|\|
$ENV{'form.action'} eq 'newlibraryfile' \|\|	$env{'form.action'} eq 'newlibraryfile' \|\|
$ENV{'form.action'} eq 'Select Action' ) {	$env{'form.action'} eq 'Select Action' ) {
$r->print('<h3>'.&mt('New Resource').'</h3>');	$r->print('<h3>'.&mt('New Resource').'</h3>');
} else {	} else {
$r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');	$r->print('<p>'.&mt('Unknown Action').' '.$env{'form.action'}.' </p>'.
	&Apache::loncommon::end_page());
return OK;	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);
} else {	} else {
Line 1302 function writeDone() {	Line 1386 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;
}	}

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

Removed from v.1.66
changed lines
	Added in v.1.85