--- loncom/interface/londocs.pm 2007/12/01 03:46:03 1.301
+++ loncom/interface/londocs.pm 2008/06/09 22:34:55 1.308
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.301 2007/12/01 03:46:03 albertel Exp $
+# $Id: londocs.pm,v 1.308 2008/06/09 22:34:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -818,7 +818,7 @@ sub extract_media {
$dirpath = $url;
$container = '';
}
- &Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content);
+ &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content);
foreach my $embed_file (keys(%allfiles)) {
my $filename;
if ($embed_file =~ m#([^/]+)$#) {
@@ -1205,8 +1205,8 @@ sub update_paste_buffer {
}
$url=~s{http(:|:)//https(:|:)//}{https$2//};
- &Apache::lonnet::appenv('docs.markedcopy_title' => $title,
- 'docs.markedcopy_url' => $url);
+ &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+ 'docs.markedcopy_url' => $url});
delete($env{'form.markcopy'});
}
@@ -1571,8 +1571,8 @@ sub process_file_upload {
$$upload_output .=
'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.
'.
- &ask_for_embedded_content('/adm/coursedocs',
- $state,$allfiles,$codebase);
+ &Apache::loncommon::ask_for_embedded_content(
+ '/adm/coursedocs',$state,$allfiles,$codebase);
} else {
$$upload_output .= 'No embedded items identified
';
}
@@ -1582,55 +1582,6 @@ sub process_file_upload {
return $phase_status;
}
-sub ask_for_embedded_content {
- my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
- my $upload_output = '
-