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.85 and 1.90

version 1.85, 2007/07/23 23:53:31	version 1.90, 2008/09/24 17:30:18
Line 109 sub Debug {	Line 109 sub Debug {
}	}
}	}

	sub done {
	my ($url)=@_;
	my $done=&mt("Done");
	return(<<ENDDONE);
	<a href="$url">$done</a>
	<script type="text/javascript">
	location.href="$url";
	</script>
	ENDDONE
	}

=pod	=pod

=item URLToPath($url)	=item URLToPath($url)
Line 165 sub url {	Line 176 sub url {
sub display {	sub display {
my $fn=shift;	my $fn=shift;
$fn=~s-^/home/($match_username)/public_html-/priv/$1-;	$fn=~s-^/home/($match_username)/public_html-/priv/$1-;
return '<tt>'.$fn.'</tt>';	return '<span class="LC_filename">'.$fn.'</span>';
}	}


Line 341 sub cleanDest {	Line 352 sub cleanDest {
$foundbad=1;	$foundbad=1;
$dest=~s/\.//g;	$dest=~s/\.//g;
}	}
	$dest =~ s/(\s+$\|^\s+)//g;
if ($dest=~/[\#\?&%\":]/) {	if ($dest=~/[\#\?&%\":]/) {
$foundbad=1;	$foundbad=1;
$dest=~s/[\#\?&%\":]//g;	$dest=~s/[\#\?&%\":]//g;
Line 349 sub cleanDest {	Line 361 sub cleanDest {
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><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>");	$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>");
$dest=~s\|.*/\|\|;	$dest=~s\|.*/\|\|;
}	}
}	}
if ($dest =~ /\.(\d+)\.(\w+)$/){	if ($dest =~ /\.(\d+)\.(\w+)$/){
$request->print('<span class="LC_error">'	$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)	.&mt('Bad filename [_1].<br /> <tt>(name).(number).(extension)</tt> not allowed. <br /> Removing the <tt>.number.</tt> from requested filename.',&display($dest))
.'</span>');	.'</span>');
$dest =~ s/\.(\d+)(\.\w+)$/$2/;	$dest =~ s/\.(\d+)(\.\w+)$/$2/;
}	}
Line 434 Parameters:	Line 446 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 527 sub Rename1 {	Line 539 sub Rename1 {
$request->print('<input type="hidden" name="newfilename" value="'.	$request->print('<input type="hidden" name="newfilename" value="'.
$newfilename.	$newfilename.
'" /><p>'.$action.' '.&display($fn).	'" /><p>'.$action.' '.&display($fn).
'</tt><br />to '.&display($newfilename).'?</p>');	'</p><br />to '.&display($newfilename).'?</p>');
&CloseForm1($request, $fn);	&CloseForm1($request, $fn);
} else {	} else {
$request->print('<p>'.&mt('No new filename specified.').'</p></form>');	$request->print('<p>'.&mt('No new filename specified.').'</p></form>');
Line 871 sub phaseone {	Line 883 sub phaseone {
$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 'newtaskfile' \|\|
$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');
Line 1126 sub NewDir2 {	Line 1139 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 1254 sub phasetwo {	Line 1267 sub phasetwo {
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Return to Directory').'</a></h3>');	$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>');	$r->print('<h3><a href="'.&url($dest_newname).'">'.$disp_newname.'</a></h3>');
} else {	} else {
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');	$r->print(&done(&url($dest)));
}	}
}	}
}	}
Line 1328 sub handler {	Line 1341 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>
\|;	\|;
Line 1370 function writeDone() {	Line 1382 function writeDone() {
$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 'newtaskfile' \|\|
$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>');

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

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