[BACK]Return to imsimportdocs.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / imspackages

Diff for /loncom/imspackages/imsimportdocs.pm between versions 1.11 and 1.12

version 1.11, 2005/02/21 23:47:46 version 1.12, 2005/04/07 06:56:22
Line 143  sub handler { Line 143  sub handler {
     &Apache::imsprocessor::ims_config(\@areas,\%cmsmap,\%areaname);      &Apache::imsprocessor::ims_config(\@areas,\%cmsmap,\%areaname);
   
 # get course data  # get course data
     my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};      my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};      my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $coursehome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};      my $coursehome=$env{'course.'.$env{'request.course.id'}.'.home'};
   
 # get personal data  # get personal data
     
     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=&Apache::lonnet::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?
     my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});      my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     unless ($allowed) {      unless ($allowed) {
         $r->print("<html><head><title>The LearningOnline Network with CAPA</title></head>");          $r->print("<html><head><title>The LearningOnline Network with CAPA</title></head>");
         $r->print(&Apache::loncommon::bodytag('Import IMS package',undef,'',1));            $r->print(&Apache::loncommon::bodytag('Import IMS package',undef,'',1));  
Line 166  sub handler { Line 166  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['phase']);         ['phase']);
   
     if ($ENV{'form.phase'} eq 'one') {          if ($env{'form.phase'} eq 'one') {    
         &jscript_one(\$javascript);          &jscript_one(\$javascript);
     } elsif ($ENV{'form.phase'} eq 'two') {      } elsif ($env{'form.phase'} eq 'two') {
         &jscript_two(\$javascript);          &jscript_two(\$javascript);
     } elsif ($ENV{'form.phase'} eq 'three') {      } elsif ($env{'form.phase'} eq 'three') {
         &jscript_three(\$javascript);          &jscript_three(\$javascript);
     }      }
   
Line 188  $javascript Line 188  $javascript
 ENDHEAD  ENDHEAD
 # -------------------------------------------------------------------- Body tag  # -------------------------------------------------------------------- Body tag
     $r->print(&Apache::loncommon::bodytag('Import IMS package',undef,'',1));      $r->print(&Apache::loncommon::bodytag('Import IMS package',undef,'',1));
     if ($ENV{'form.phase'} eq 'one') {      if ($env{'form.phase'} eq 'one') {
         &display_one($r);                 &display_one($r);       
     } elsif ($ENV{'form.phase'} eq 'two') {      } elsif ($env{'form.phase'} eq 'two') {
         &display_two($r,$coursenum,\@areas,\%areaname,%cmsmap);          &display_two($r,$coursenum,\@areas,\%areaname,%cmsmap);
     } elsif ($ENV{'form.phase'} eq 'three') {      } elsif ($env{'form.phase'} eq 'three') {
         &display_three($r,$coursenum,$coursedom,$coursehome,$uname,$udom,\@areas,%cmsmap);          &display_three($r,$coursenum,$coursedom,$coursehome,$uname,$udom,\@areas,%cmsmap);
     }         }   
     $r->print("</body><html>");      $r->print("</body><html>");
Line 259  Please choose the CMS used to create you Line 259  Please choose the CMS used to create you
       </tr>        </tr>
       <tr>        <tr>
        <td colspan='2'>&nbsp;         <td colspan='2'>&nbsp;
         <input type="hidden" name="folder" value="$ENV{'form.folder'}" />          <input type="hidden" name="folder" value="$env{'form.folder'}" />
         <input type="hidden" name="phase" value="two" />          <input type="hidden" name="phase" value="two" />
         <input type="file" name="uploadname" size="40" />          <input type="file" name="uploadname" size="40" />
        </td>         </td>
Line 300  ENDBLOCK Line 300  ENDBLOCK
 sub display_two {  sub display_two {
     my ($r,$crs,$areasref,$areaname,%cmsmap) = @_;      my ($r,$crs,$areasref,$areaname,%cmsmap) = @_;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']);
     my $cms = $ENV{'form.source'};      my $cms = $env{'form.source'};
     my $timenow = time;      my $timenow = time;
     my $tempdir = &Apache::imsprocessor::create_tempdir('DOCS',$crs,$timenow);      my $tempdir = &Apache::imsprocessor::create_tempdir('DOCS',$crs,$timenow);
     my $fname = &Apache::imsprocessor::uploadzip('DOCS',$tempdir);      my $fname = &Apache::imsprocessor::uploadzip('DOCS',$tempdir);
Line 467  ENDBLOCK Line 467  ENDBLOCK
       </tr>        </tr>
       <tr>        <tr>
        <td colspan='2'>&nbsp;         <td colspan='2'>&nbsp;
           <input type="hidden" name="folder" value="$ENV{'form.folder'}" />            <input type="hidden" name="folder" value="$env{'form.folder'}" />
           <input type="hidden" name="source" value="$cms" />            <input type="hidden" name="source" value="$cms" />
           <input type="hidden" name="tempdir" value="$tempdir" />            <input type="hidden" name="tempdir" value="$tempdir" />
           <input type="hidden" name="phase" value="three" />            <input type="hidden" name="phase" value="three" />
Line 503  ENDDOCUMENT Line 503  ENDDOCUMENT
   
 sub display_three {  sub display_three {
     my ($r,$crs,$cdom,$chome,$uname,$udom,$areas,%cmsmap) = @_;      my ($r,$crs,$cdom,$chome,$uname,$udom,$areas,%cmsmap) = @_;
     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 = '';      my $longcrs = '';
     if ($crs =~ m/^(\d)(\d)(\d)/) {      if ($crs =~ m/^(\d)(\d)(\d)/) {
         $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;          $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;
Line 541  sub display_three { Line 541  sub display_three {
     my $toplevel = '';      my $toplevel = '';
     my $foldername = '';      my $foldername = '';
     my %topitems = ();      my %topitems = ();
     if (defined($ENV{'form.toplevel'}) ) {      if (defined($env{'form.toplevel'}) ) {
         $toplevel = $ENV{'form.toplevel'};               $toplevel = $env{'form.toplevel'};     
     }      }
     if (defined($ENV{'form.foldername'}) ) {      if (defined($env{'form.foldername'}) ) {
         $foldername = $ENV{'form.foldername'};           $foldername = $env{'form.foldername'}; 
     }      }
   
     foreach my $area (@{$areas}) {      foreach my $area (@{$areas}) {
         if (defined($ENV{"form.$area"}) && ($ENV{'form.'.$area} ne '')) {          if (defined($env{"form.$area"}) && ($env{'form.'.$area} ne '')) {
             if ($cms eq 'angel' && $area eq 'doc') {              if ($cms eq 'angel' && $area eq 'doc') {
                 foreach (@{$cmsmap{$cms}{$area}}) {                  foreach (@{$cmsmap{$cms}{$area}}) {
                     $importareas{$_} = 1;                      $importareas{$_} = 1;
Line 558  sub display_three { Line 558  sub display_three {
                 $importareas{$cmsmap{$cms}{$area}} = 1;                  $importareas{$cmsmap{$cms}{$area}} = 1;
             }              }
             if ($area eq 'board') {              if ($area eq 'board') {
                 $db_handling = $ENV{'form.db_handling'};                  $db_handling = $env{'form.db_handling'};
             } elsif ($area eq 'users') {              } elsif ($area eq 'users') {
                 $user_handling = $ENV{'form.user_handling'};                  $user_handling = $env{'form.user_handling'};
             }              }
         }          }
     }      }
Line 642  sub display_three { Line 642  sub display_three {
             }              }
         } elsif ($toplevel eq 'newfolder') {          } elsif ($toplevel eq 'newfolder') {
             my $url = &Apache::lonnet::unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");              my $url = &Apache::lonnet::unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
             my $name = &Apache::lonnet::unescape("$ENV{'form.foldername'}");              my $name = &Apache::lonnet::unescape("$env{'form.foldername'}");
             push @imports, $name, $url;              push @imports, $name, $url;
         }          }
         my $errtext='';          my $errtext='';
Line 688  ENDBLOCK Line 688  ENDBLOCK
            <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" />
            <h3><font color="red">Changes will become active for your current session after             <h3><font color="red">Changes will become active for your current session after
            <input type="hidden" name="$ENV{'request.role'}" value="1" />             <input type="hidden" name="$env{'request.role'}" value="1" />
            <input type="button" value="|;             <input type="button" value="|;
     $initblock .= &mt('re-initializing course');      $initblock .= &mt('re-initializing course');
     $initblock .= qq|" onClick="javascript:init(this.form)"/>|;      $initblock .= qq|" onClick="javascript:init(this.form)"/>|;
Removed from v.1.11  
changed lines
  Added in v.1.12

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