loncom/publisher/lonupload.pm - diff

Return to lonupload.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonupload.pm between versions 1.42 and 1.46

version 1.42, 2008/12/12 02:32:27	version 1.46, 2009/05/14 14:24:18
Line 191 sub phaseone {	Line 191 sub phaseone {
'<br />'.	'<br />'.
'<br />'.&mt('Choose file type:').'	'<br />'.&mt('Choose file type:').'
<select name="filetype">	<select name="filetype">
<option value="standard" selected>'.&mt('Regular file').'	<option value="standard" selected="selected">'.&mt('Regular file').'
<option value="testbank">'.&mt('Testbank file').'	<option value="testbank">'.&mt('Testbank file').'
<option value="imsimport">'.&mt('IMS package').'	<option value="imsimport">'.&mt('IMS package').'
</select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'	</select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'
Line 421 function verifyForm() {	Line 421 function verifyForm() {
my $fn;	my $fn;
if ($env{'form.filename'}) {	if ($env{'form.filename'}) {
$fn=$env{'form.filename'};	$fn=$env{'form.filename'};
$fn=~s/^http\:\/\/[^\/]+\///;	$fn=~s/^https?\:\/\/[^\/]+\///;
$fn=~s/^\///;	$fn=~s/^\///;
$fn=~s{(~\|priv/)($LONCAPA::username_re)}{};	$fn=~s{(~\|priv/)($LONCAPA::username_re)}{};
$fn=~s/\/+/\//g;	$fn=~s/\/+/\//g;
Line 444 function verifyForm() {	Line 444 function verifyForm() {
$javascript));	$javascript));

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.	$r->print('<p class="LC_warning">'
&mt(' at ').$udom.'</span></h3>');	.&mt('Co-Author [_1]',$uname.':'.$udom)
	.'</p>'
	);
}	}

if ($env{'form.phase'} eq 'three') {	if ($env{'form.phase'} eq 'three') {

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

Removed from v.1.42
changed lines
	Added in v.1.46