--- loncom/imspackages/imsimport.pm	2008/08/24 13:48:40	1.23
+++ loncom/imspackages/imsimport.pm	2009/04/04 21:45:53	1.28
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+# 
+# $Id: imsimport.pm,v 1.28 2009/04/04 21:45:53 bisitz Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -292,7 +296,7 @@ sub display_one {
               &Apache::lonhtmlcommon::topic_bar(1,&mt('Specify the Course Management system used to create the package')).
         &mt('Choose the CMS used to create your IMS content package.').'  
         <select name="source">
-         <option value="-1" selected="true">Please select</option>
+         <option value="-1" selected="selected">Please select</option>
          <option value="bb5">Blackboard 5</option>
          <option value="bb6">Blackboard 6</option>
          <option value="angel">ANGEL</option>
@@ -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().
-                      '<th>'.$lt{'impo'}.'</th><th>'.$lt{'cont'}.'</th><th>'.
+                      '<th>'.$lt{'impo'}.'</th><th>'.$lt{'type'}.'</th><th>'.
                       $lt{'addo'}.'</th>'.
                       &Apache::loncommon::end_data_table_header_row());
             foreach my $area (@{$areas}) {
@@ -455,8 +459,8 @@ sub display_two {
           <input type="hidden" name="conditions" value="'.$conditions.'" />
           <input type="hidden" name="source" value="'.$cms.'" />
           <input type="hidden" name="tempdir" value="'.$tempdir.'" />
-          <input type="hidden" name="uploaduname" value="'.$uname.'">
-          <input type="hidden" name="filename" value="'.$fname.'">
+          <input type="hidden" name="uploaduname" value="'.$uname.'" />
+          <input type="hidden" name="filename" value="'.$fname.'" />
           <input type="hidden" name="phase" value="four" />'."\n");
             if ($count{board} == 0) {
                 $r->print('<input type="hidden" name="board" value="" />'."\n");
@@ -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;