version 1.183, 2007/06/11 21:27:23
|
version 1.184, 2007/06/11 21:29:44
|
Line 1846 sub upload_embedded {
|
Line 1846 sub upload_embedded {
|
my ($r,$url,$group)=@_; |
my ($r,$url,$group)=@_; |
for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) { |
for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) { |
next if (!exists($env{'form.embedded_item_'.$i.'.filename'})); |
next if (!exists($env{'form.embedded_item_'.$i.'.filename'})); |
|
my $orig_uploaded_filename = |
|
$env{'form.embedded_item_'.$i.'.filename'}; |
|
|
$env{'form.embedded_orig_'.$i} = |
$env{'form.embedded_orig_'.$i} = |
&unescape($env{'form.embedded_orig_'.$i}); |
&unescape($env{'form.embedded_orig_'.$i}); |
my ($path,$fname) = |
my ($path,$fname) = |
($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)}); |
($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)}); |
|
# no path, whole string is fname |
|
if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} }; |
|
|
$path = $env{'form.currentpath'}.$path; |
$path = $env{'form.currentpath'}.$path; |
$fname = &Apache::lonnet::clean_filename($fname); |
$fname = &Apache::lonnet::clean_filename($fname); |
|
|
Line 1873 sub upload_embedded {
|
Line 1878 sub upload_embedded {
|
$port_path.$path); |
$port_path.$path); |
if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
$r->print('<span class="LC_error">'.'An error occurred ('.$result. |
$r->print('<span class="LC_error">'.'An error occurred ('.$result. |
') while trying to upload '.&display_file($path,$fname).'</span><br />'); |
') while trying to upload '.$orig_uploaded_filename.' for embedded element '.$env{'form.embedded_orig_'.$i}.'</span><br />'); |
next; |
next; |
} else { |
} else { |
$r->print("<p> Uploaded ". |
$r->print("<p> Uploaded ". |