Diff for /loncom/imspackages/imsimportdocs.pm between versions 1.17 and 1.18

version 1.17, 2006/03/24 17:36:27 version 1.18, 2006/05/30 12:45:50
Line 1 Line 1
   # The LearningOnline Network with CAPA
   #
   # $Id$
   #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 30  use Apache::loncommon; Line 34  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::imsprocessor;  use Apache::imsprocessor;
 use LONCAPA::Configuration;  use LONCAPA::Configuration;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
 use strict;  use strict;
   
 sub jscript_one {  sub jscript_one {
Line 150  sub handler { Line 157  sub handler {
     
     my $uname=$env{'user.name'};      my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};      my $udom=$env{'user.domain'};
     my $plainname=&Apache::lonnet::escape(      my $plainname=&escape(
                      &Apache::loncommon::plainname($uname,$udom));                       &Apache::loncommon::plainname($uname,$udom));
   
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
Line 631  sub display_three { Line 638  sub display_three {
         my @imports = ();          my @imports = ();
         if ($toplevel eq 'oldfolder') {          if ($toplevel eq 'oldfolder') {
             for (my $i=0; $i<@topurls; $i++) {              for (my $i=0; $i<@topurls; $i++) {
                 my $url = &Apache::lonnet::unescape($topurls[$i]);                  my $url = &unescape($topurls[$i]);
                 my $name = &Apache::lonnet::unescape($topnames[$i]);                  my $name = &unescape($topnames[$i]);
                 push @imports, $name, $url;                  push @imports, $name, $url;
             }              }
         } elsif ($toplevel eq 'newfolder') {          } elsif ($toplevel eq 'newfolder') {
             my $url = &Apache::lonnet::unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");              my $url = &unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
             my $name = &Apache::lonnet::unescape("$env{'form.foldername'}");              my $name = &unescape("$env{'form.foldername'}");
             push @imports, $name, $url;              push @imports, $name, $url;
         }          }
         my $errtext='';          my $errtext='';

Removed from v.1.17  
changed lines
  Added in v.1.18


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>