version 1.229, 2010/10/29 23:22:43
|
version 1.230, 2010/11/11 23:58:05
|
Line 1998 sub upload {
|
Line 1998 sub upload {
|
conf => 'Are you sure you want to overwrite an existing file?', |
conf => 'Are you sure you want to overwrite an existing file?', |
cont => 'Continue', |
cont => 'Continue', |
); |
); |
|
my $parserflag; |
|
my $hidden = &hidden_elems(); |
|
if ($mode eq 'parse') { |
|
$parserflag = '<input type="hidden" name="parserflag" value="1" />'; |
|
} |
$r->print(<<"END"); |
$r->print(<<"END"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function confirmOverwrite() { |
function confirmOverwrite() { |
if (confirm('$lt{'conf'}')) { |
var chosen; |
document.existingfile.action.value = "process_overwrite"; |
if (document.existingfile.overwrite.length) { |
} else { |
for (var i=0; i<document.existingfile.overwrite.length; i++) { |
if (document.existingfile.overwrite.length) { |
if (document.existingfile.overwrite[i].checked) { |
for (var i=0; i<document.existingfile.overwrite.length; i++) { |
chosen = document.existingfile.overwrite[i].value; |
if (document.existingfile.overwrite[i].value == "0") { |
} |
document.existingfile.overwrite[i].checked = true; |
} |
|
} |
|
if (chosen == 1) { |
|
if (confirm('$lt{'conf'}')) { |
|
document.existingfile.action.value = "process_overwrite"; |
|
return true; |
|
} else { |
|
document.existingfile.action.value = "cancel_overwrite"; |
|
if (document.existingfile.overwrite.length) { |
|
for (var i=0; i<document.existingfile.overwrite.length; i++) { |
|
if (document.existingfile.overwrite[i].value == "0") { |
|
document.existingfile.overwrite[i].checked = true; |
|
} |
} |
} |
} |
} |
|
return false; |
} |
} |
|
} else { |
document.existingfile.action.value = "cancel_overwrite"; |
document.existingfile.action.value = "cancel_overwrite"; |
|
return true; |
} |
} |
document.existingfile.submit(); |
|
return; |
|
} |
|
function cancelOverwrite() { |
|
document.existingfile.action.value = "cancel_overwrite"; |
|
document.existingfile.submit(); |
|
} |
} |
// ]]> |
// ]]> |
</script> |
</script> |
$msg |
$msg |
<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile"> |
<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();"> |
<span class="LC_nobreak">$lt{'over'} |
<span class="LC_nobreak">$lt{'over'} |
<label><input type="radio" name="overwrite" value="1" onclick="javascript:confirmOverwrite();" /> |
<label><input type="radio" name="overwrite" value="1" /> |
$lt{'yes'}</label> |
$lt{'yes'}</label> |
<label><input type="radio" name="overwrite" value="0" onclick="javascript:cancelOverwrite()" />$lt{'no'}</label></span> |
<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></span> |
<input type="hidden" name="action" value="cancel_overwrite" /> |
<input type="hidden" name="action" value="cancel_overwrite" /> |
<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" /> |
|
<input type="hidden" name="filename" value="$showfname" /> |
<input type="hidden" name="filename" value="$showfname" /> |
<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" /> |
|
<input type="hidden" name="mode" value="$mode" /> |
|
<input type="hidden" name="timestamp" value="$timestamp" /> |
<input type="hidden" name="timestamp" value="$timestamp" /> |
<input type="hidden" name="showversions" value="$env{'form.showversions'}" /> |
$hidden |
|
$parserflag |
$group_elem |
$group_elem |
<br /><br /> |
<br /><br /> |
<input type="submit" name="process" value="$lt{'cont'}" /> |
<input type="submit" name="process" value="$lt{'cont'}" /> |
Line 2061 END
|
Line 2073 END
|
} |
} |
} |
} |
|
|
|
sub hidden_elems { |
|
my $contelem; |
|
if ($env{'form.mode'} eq 'selectfile') { |
|
$contelem = '<input type="hidden" name="continue" value="true" />'; |
|
} |
|
return <<END; |
|
<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" /> |
|
<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" /> |
|
<input type="hidden" name="mode" value="$env{'form.mode'}" /> |
|
<input type="hidden" name="showversions" value="$env{'form.showversions'}" /> |
|
$contelem |
|
END |
|
} |
|
|
sub print_dependency_form { |
sub print_dependency_form { |
my ($r,$url,$allfiles,$codebase) = @_; |
my ($r,$url,$allfiles,$codebase) = @_; |
my $state = <<STATE; |
my $state = <<STATE; |
Line 2093 sub overwrite {
|
Line 2119 sub overwrite {
|
my $port_path = &get_port_path(); |
my $port_path = &get_port_path(); |
my $fname = &Apache::lonnet::clean_filename($env{'form.filename'}); |
my $fname = &Apache::lonnet::clean_filename($env{'form.filename'}); |
my (%allfiles,%codebase,$mode); |
my (%allfiles,%codebase,$mode); |
$mode = $env{'form.mode'}; |
unless (&suppress_embed_prompt()) { |
if ($mode eq 'parse') { |
if ($env{'form.parserflag'}) { |
if ($fname !~ /\.s?html?$/i) { |
if ($fname =~ /\.s?html?$/i) { |
undef($mode); |
$mode = 'parse'; |
|
} |
} |
} |
} |
} |
if ($fname eq '') { |
if ($fname eq '') { |
Line 2114 sub overwrite {
|
Line 2141 sub overwrite {
|
if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
$r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].' |
$r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].' |
,$result,&display_file(undef,$fname)).'</span><br />'); |
,$result,&display_file(undef,$fname)).'</span><br />'); |
$r->print(&done('Back',$url)); |
$r->print(&after_overwrite(&mt('Back'),$url)); |
} else { |
} else { |
if (%allfiles) { |
if (%allfiles) { |
if (!&suppress_embed_prompt()) { |
if (!&suppress_embed_prompt()) { |
&print_dependency_form($r,$url,\%allfiles,\%codebase); |
&print_dependency_form($r,$url,\%allfiles,\%codebase); |
} else { |
} else { |
$r->print(&done(undef,$url)); |
$r->print(&after_overwrite(undef,$url)); |
} |
} |
} else { |
} else { |
$r->print(&done(undef,$url)); |
$r->print(&after_overwrite(undef,$url)); |
} |
} |
} |
} |
return; |
return; |
} |
} |
|
|
|
sub after_overwrite { |
|
my ($text,$url) = @_; |
|
my $group_elem; |
|
if (defined($env{'form.group'})) { |
|
$group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'; |
|
if (defined($env{'form.ref'})) { |
|
$group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n"; |
|
} |
|
} |
|
if ($text eq '') { |
|
$text = &mt('Done'); |
|
} |
|
my $hidden = &hidden_elems(); |
|
return <<END; |
|
|
|
<h3><a href="javascript:document.overwritedone.submit();">$text</a></h3> |
|
<form name="overwritedone" method="post" action="$url" /> |
|
$hidden |
|
$group_elem |
|
</form> |
|
END |
|
} |
|
|
sub lock_info { |
sub lock_info { |
my ($r,$url,$group) = @_; |
my ($r,$url,$group) = @_; |
my ($uname,$udom) = &get_name_dom($group); |
my ($uname,$udom) = &get_name_dom($group); |