--- loncom/interface/londocs.pm 2007/01/29 21:18:53 1.271
+++ loncom/interface/londocs.pm 2007/06/11 17:13:30 1.274
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.271 2007/01/29 21:18:53 albertel Exp $
+# $Id: londocs.pm,v 1.274 2007/06/11 17:13:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -936,8 +936,8 @@ sub group_import {
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
my $ext = 'false';
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
- $url =~ &LONCAPA::map::qtunescape($url);
- $name =~ &LONCAPA::map::qtunescape($name);
+ $url = &LONCAPA::map::qtunescape($url);
+ $name = &LONCAPA::map::qtunescape($name);
$LONCAPA::map::resources[$idx] =
join ':', ($name, $url, $ext, 'normal', 'res');
}
@@ -1586,11 +1586,16 @@ sub ask_for_embedded_content {
foreach my $embed_file (keys(%{$allfiles})) {
$upload_output .= &Apache::loncommon::start_data_table_row().
'
'.$embed_file.' | ';
- if ($args->{'error_on_invalid_names'}
+ if ($args->{'ignore_remote_references'}
+ && $embed_file =~ m{^\w+://}) {
+ $upload_output.=''.&mt("URL points to other server.").'';
+ } elsif ($args->{'error_on_invalid_names'}
&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
$upload_output.=''.&mt("Invalid characters").'';
+
} else {
+
$upload_output .='
';
@@ -1880,7 +1885,7 @@ END
(&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0].
'" />'.
-''.&mt('Store').'';
+''.&mt('Save').'';
}
if ($ispage) {
@@ -2139,9 +2144,9 @@ sub checkversions {
if (&Apache::lonnet::put('resourceversions',\%newsetversions,
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
- $r->print(''.&mt('Your Version Settings have been Stored').'');
+ $r->print(''.&mt('Your Version Settings have been Saved').'');
} else {
- $r->print(''.&mt('An Error Occured while Attempting to Store your Version Settings').'');
+ $r->print(''.&mt('An Error Occured while Attempting to Save your Version Settings').'');
}
&mark_hash_old();
}
|