--- loncom/imspackages/imsimport.pm 2008/08/24 13:48:40 1.23 +++ loncom/imspackages/imsimport.pm 2008/12/24 07:57:39 1.26 @@ -1,3 +1,7 @@ +# The LearningOnline Network with CAPA +# +# $Id: imsimport.pm,v 1.26 2008/12/24 07:57:39 raeburn Exp $ +# # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -404,7 +408,7 @@ sub display_two { &Apache::lonhtmlcommon::topic_bar(3,$lt{'cont'}). &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). - ''.$lt{'impo'}.''.$lt{'cont'}.''. + ''.$lt{'impo'}.''.$lt{'type'}.''. $lt{'addo'}.''. &Apache::loncommon::end_data_table_header_row()); foreach my $area (@{$areas}) { @@ -718,7 +722,7 @@ sub handler { my $fn; if ($env{'form.filename'}) { $fn=$env{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+\///; + $fn=~s/^https?\:\/\/[^\/]+\///; $fn=~s/^\///; $fn=~s/(\~|priv\/)($LONCAPA::username_re)//; $fn=~s/\/+/\//g;