Diff for /loncom/imspackages/imsimportdocs.pm between versions 1.34 and 1.37

version 1.34, 2014/12/11 00:35:53 version 1.37, 2018/05/02 17:06:45
Line 36  use Apache::imsprocessor; Line 36  use Apache::imsprocessor;
 use LONCAPA::map();  use LONCAPA::map();
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  use LONCAPA;
   use File::Path();
     
 use strict;  use strict;
   
Line 396  sub display_two { Line 397  sub display_two {
     my $folder = $env{'form.folder'};      my $folder = $env{'form.folder'};
     my $cms = $env{'form.source'};      my $cms = $env{'form.source'};
     my $tempdir = $env{'form.tempdir'};      my $tempdir = $env{'form.tempdir'};
     my $longcrs = '';  
     if ($crs =~ m/^(\d)(\d)(\d)/) {  
         $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;  
     }  
     my %importareas = ();      my %importareas = ();
     my %includedres = ();      my %includedres = ();
     my %includeditems = ();      my %includeditems = ();
Line 548  sub display_two { Line 545  sub display_two {
         }          }
     }      }
     if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {      if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {
         system("rm -r -f $tempdir");          &File::Path::remove_tree($tempdir,{ safe => 1 });
     }      }
   
     # All done, display success message      # All done, display success message
Line 562  sub display_two { Line 559  sub display_two {
            '<input type="button" value="'             '<input type="button" value="'
           .&mt('re-initializing Course')            .&mt('re-initializing Course')
           .'" onclick="javascript:init(this.form)" />';            .'" onclick="javascript:init(this.form)" />';
       my $windowname = 'loncapaclient';
       if ($env{'request.lti.login'}) {
           $windowname .= 'lti';
       }
     $r->print(      $r->print(
         '<form method="post" action="/adm/roles" target="loncapaclient" name="importDone">'          '<form method="post" action="/adm/roles" target="'.$windowname.'" name="importDone">'
        .'<input type="hidden" name="orgurl" value="/adm/coursedocs" />'         .'<input type="hidden" name="orgurl" value="/adm/coursedocs" />'
        .'<input type="hidden" name="selectrole" value="1" />'         .'<input type="hidden" name="selectrole" value="1" />'
        .'<input type="hidden" name="'.$env{'request.role'}.'" value="1" />'         .'<input type="hidden" name="'.$env{'request.role'}.'" value="1" />'

Removed from v.1.34  
changed lines
  Added in v.1.37


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