--- loncom/interface/londocs.pm 2010/08/16 08:58:39 1.435
+++ loncom/interface/londocs.pm 2010/10/27 01:00:38 1.439
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.435 2010/08/16 08:58:39 wenzelju Exp $
+# $Id: londocs.pm,v 1.439 2010/10/27 01:00:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1720,7 +1720,7 @@ sub process_file_upload {
# probably the only place in the system where this should be "1"
my $newidx=&LONCAPA::map::getresidx();
$destination .= $newidx;
- my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,
+ my $url=&Apache::lonnet::userfileupload('uploaddoc','coursedoc',$destination,
$parseaction,$allfiles,
$codebase);
my $ext='false';
@@ -1781,7 +1781,7 @@ sub process_secondary_uploads {
}
$destination .= $newidx;
my ($url,$filename);
- $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
+ $url=&Apache::lonnet::userfileupload($formname.$num,'coursedoc',$destination);
($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$});
return $filename;
}
@@ -2920,7 +2920,6 @@ sub create_form_ul {
'upld' => 'Import Document',
'srch' => 'Search',
'impo' => 'Import',
- 'book' => 'Import Bookmarks',
'wish' => 'Import from Wishlist',
'selm' => 'Select Map',
'load' => 'Load Map',
@@ -2972,7 +2971,7 @@ CHBO
$fileupload
$lt{'title'}:
-
+
$uploadtag
@@ -2994,7 +2993,6 @@ SEDFFORM
my @simpleeditdefaultforma = (
{ '' => "$uploadtag$lt{'srch'}" },
{ '
' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" },
- { '
' => "$lt{'book'}" },
{ '
' => "$lt{'wish'}" },
);
$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
@@ -3065,7 +3063,6 @@ HIDDENFORM
}
}
$r->print('