--- loncom/imspackages/imsimportdocs.pm	2009/11/20 14:39:32	1.26
+++ loncom/imspackages/imsimportdocs.pm	2014/12/11 00:35:53	1.34
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: imsimportdocs.pm,v 1.26 2009/11/20 14:39:32 bisitz Exp $
+# $Id: imsimportdocs.pm,v 1.34 2014/12/11 00:35:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,6 @@ use Apache::londocs;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::imsprocessor;
-use LONCAPA::Configuration;
 use LONCAPA::map();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
@@ -41,54 +40,41 @@ use LONCAPA;
 use strict;
 
 sub jscript_one {
-    my $javascript = shift;
-    $$javascript = qq#
-function verify() {
- if ((document.forms.pickcms.uploadname.value == '')  || (!document.forms.pickcms.uploadname.value)) {
-   alert("You must provide the name of the IMS package to be imported")
-   return false
- }
- if (document.forms.pickcms.source.selectedIndex == 0) {
-   alert("You must choose the Course Management System from which the IMS package was exported");
-   return false
- }
- return true
-}
-
-function nextPage() {
- if (verify()) {
-   document.forms.pickcms.submit()
- }
-}
-#;
- 
-}
-
-sub jscript_two {
-    my $javascript = shift;
-    $$javascript = qq#
+    my %lt = &Apache::lonlocal::texthash(
+               se => 'Select',
+               to => 'Import topics only',
+               tp => 'Import topics + posts (with author)',
+               tn => 'Import topics + posts (no author)',
+               es => 'Enroll students only',
+               ea => 'Enroll all users',
+               nr => 'Not required',
+               id => 'You must select one of the additional options when importing Discussion Boards.',
+               ie => 'You must select one of the additional options when importing Enrollment.',
+               ct => 'You must check at least one Content Type.', 
+    );
+    return <<"ENDJS";
 function setOptions(caller,itemnum) {
   var opForm = document.forms.pickoptions
   var menu = 1 + itemnum*2
   opForm.elements[menu].length = 0
   if (opForm.elements[itemnum*2].checked == true) {
     if (caller == "board") {
-      opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
-      opForm.elements[menu].options[1] = new Option("Import topics only","topics",true,true)
-      opForm.elements[menu].options[2] = new Option("Import topics + posts (with author)","allpost",true,true)
-      opForm.elements[menu].options[3] = new Option("Import topics + posts (no author)","allanon",true,true)
+      opForm.elements[menu].options[0] = new Option("$lt{'se'}","-1",true,true)
+      opForm.elements[menu].options[1] = new Option("$lt{'to'}","topics",true,true)
+      opForm.elements[menu].options[2] = new Option("$lt{'tp'}","allpost",true,true)
+      opForm.elements[menu].options[3] = new Option("$lt{'tn'}","allanon",true,true)
     }
     else { 
       if (caller == "users") {
         opForm.elements[menu].length = 0
-        opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
-        opForm.elements[menu].options[1] = new Option("Enroll students only","students",true,true)
-        opForm.elements[menu].options[2] = new Option("Enroll all users","all",true,true)
+        opForm.elements[menu].options[0] = new Option("$lt{'se'}","-1",true,true)
+        opForm.elements[menu].options[1] = new Option("$lt{'es'}","students",true,true)
+        opForm.elements[menu].options[2] = new Option("$lt{'ea'}","all",true,true)
       }
     }
   }
   else {
-    opForm.elements[menu].options[0] = new Option("Not required","0",true,true)
+    opForm.elements[menu].options[0] = new Option("$lt{'nr'}","0",true,true)
   }
   opForm.elements[menu].selectedIndex = 0
 }
@@ -101,20 +87,20 @@ function verify(caller) {
       totcheck ++
       if (opForm.elements[2*i].name == "board") { 
         if (opForm.elements[2*i+1].selectedIndex == 0) {     
-          alert("You must select one of the additional options when importing Discussion Boards ")
+          alert("$lt{'id'}")
           return false
         }
       }
       if (opForm.elements[2*i].name == "users") {
         if (opForm.elements[2*i+1].selectedIndex == 0) {     
-          alert("You must select one of the additional options when importing Enrollment")
+          alert("$lt{'ie'}")
           return false
         }
       }
     }
   }
   if (totcheck == 0) {
-    alert("You must check the Checkbox for at least one Content Type");
+    alert("$lt{'ct'}");
     return false
   }
   return true
@@ -125,22 +111,23 @@ function nextPage(caller) {
    document.forms.pickoptions.submit()
  }
 }
-#;
+
+ENDJS
+
 }
 
-sub jscript_three {
-    my $javascript = shift;
-    $$javascript = qq|
+sub jscript_two {
+    return <<"ENDJS";
 function init(tf) {
     setTimeout("self.close()",3000)
     tf.submit();   
 }
-    |;
+ 
+ENDJS
 }
 
 sub handler {
     my $r = shift;
-    my $javascript = '';
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
@@ -177,15 +164,11 @@ sub handler {
         return OK;
     }
 
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-       ['phase']);
-
-    if ($env{'form.phase'} eq 'one') {    
-        &jscript_one(\$javascript);
+    my $javascript;
+    if ($env{'form.phase'} eq 'one') {
+        $javascript = &jscript_one();
     } elsif ($env{'form.phase'} eq 'two') {
-        &jscript_two(\$javascript);
-    } elsif ($env{'form.phase'} eq 'three') {
-        &jscript_three(\$javascript);
+        $javascript = &jscript_two();
     }
 
     $javascript = 
@@ -200,59 +183,16 @@ sub handler {
     $r->print($start_page);
 
     if ($env{'form.phase'} eq 'one') {
-        &display_one($r);       
+        &display_one($r,$coursenum,\@areas,\%areaname,%cmsmap);
     } elsif ($env{'form.phase'} eq 'two') {
-        &display_two($r,$coursenum,\@areas,\%areaname,%cmsmap);
-    } elsif ($env{'form.phase'} eq 'three') {
-        &display_three($r,$coursenum,$coursedom,$uname,$udom,\@areas,%cmsmap);
+        &display_two($r,$coursenum,$coursedom,$uname,$udom,\@areas,%cmsmap);
     }   
     $r->print(&Apache::loncommon::end_page());
     return OK;
-} 
-
-
-sub display_one {
-    my ($r) = @_;
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);
-
-    $r->print(
-        '<form action="/adm/imsimportdocs" method="post"'
-       .' enctype="multipart/form-data" name="pickcms">'
-       .&Apache::lonhtmlcommon::topic_bar(
-            1,&mt('Specify the Course Management system used to create the package'))
-       .&mt('Please choose the CMS used to create your IMS content package:').' '
-       .'<select name="source">'
-       .'<option value="-1" selected="selected">'.&mt('Please select').'</option>'
-       .'<option value="bb5">Blackboard 5</option>'
-       .'<option value="bb6">Blackboard 6</option>'
-       .'<option value="angel5">ANGEL 5.5</option>'
-       .'<option value="webctce4">WebCT 4 Campus Edition</option>'
-       .'</select>'
-    );
-    $r->print(
-       &Apache::lonhtmlcommon::topic_bar(
-           2,&mt('Locate the IMS content package you wish to upload'))
-      .'<input type="hidden" name="folder" value="'.$env{'form.folder'}.'" />'
-      .'<input type="hidden" name="phase" value="two" />'
-      .&mt('File:')
-      .' <input type="file" name="uploadname" size="40" />'
-    );
-    $r->print(
-       '<hr />'
-      .'<p>'
-      .'<input type="button" name="exitpage" value="'.&mt('Cancel').'"'
-      .' onclick="javascript:self.close()" />'
-      .' '
-      .'<input type="button" name="nextpage" value="'.&mt('Upload IMS package').'"'
-      .' onclick="javascript:nextPage()" />'
-      .'</p>'
-    );
 }
 
-
-sub display_two {
+sub display_one {
     my ($r,$crs,$areasref,$areaname,%cmsmap) = @_;
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']);
     my $cms = $env{'form.source'};
     my $timenow = time;
     my $tempdir = &Apache::imsprocessor::create_tempdir('DOCS',$crs,$timenow);
@@ -285,10 +225,11 @@ sub display_two {
 
     if ($unzip_result ne 'ok') {
         $r->print(
-            '<p class="LC_warning">'
-           .&mt('Processing of your IMS package failed because the file you'
-               .' uploaded could not be unzipped.')
-           .'</p>'
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Processing of your IMS package failed because the file you'
+                       .' uploaded could not be unzipped.'),1)
+           .'<br />'.&mt('Error: [_1]',$unzip_result))
         );
         return();
     }
@@ -299,23 +240,24 @@ sub display_two {
                            \%resinfo,'choose',\%includedres,\%includeditems);
     if ($manifest_result ne 'ok') {
         $r->print(
-           '<p class="LC_warning">'
-          .&mt('Unpacking of your IMS package failed because an IMS manifest file was not located in the package.')
-          .'</p>'
+            '<br />'.&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Unpacking of your IMS package failed because an IMS manifest file'
+                       .' was not located in the package.'),1))
         );
         return();
     }
 
     # Count areas depending on cms version
-    foreach my $res (sort keys %resources) {
+    foreach my $res (sort(keys(%resources))) {
         if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {
-            foreach my $area (keys %{$cmsmap{$cms}}) {
+            foreach my $area (keys(%{$cmsmap{$cms}})) {
                 if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
                     $count{$area} ++;
                 }
             }
         } elsif ($cms eq 'angel5') {
-            foreach my $area (keys %{$cmsmap{$cms}}) {
+            foreach my $area (keys(%{$cmsmap{$cms}})) {
                 if ($area eq 'doc') {
                     if (grep/^$resources{$res}{type}$/,@{$cmsmap{$cms}{doc}}) {
                         $count{$area} ++;
@@ -335,12 +277,12 @@ sub display_two {
     }
 
 
-    # Start output: Step 3 and step 4
+    # Start output: Step 1 and step 2
 
     $r->print(
-        '<form name="pickoptions" method="post">'
+        '<form name="pickoptions" method="post" action="">'
        .&Apache::lonhtmlcommon::topic_bar(
-            3,&mt('Choose which content types you wish to import'))
+            1,&mt('Choose which content types you wish to import'))
        .'<p>'
        .&mt('Check the checkboxes for all areas you wish to import from the IMS package:')
        .'</p>'
@@ -410,7 +352,7 @@ sub display_two {
 
     $r->print(
         &Apache::lonhtmlcommon::topic_bar(
-            4,&mt('Choose display options for listing of contents of top level of package'))
+            2,&mt('Choose display options for listing of contents of top level of package'))
        .'<p>'
        .&mt('Select a display option for the package content:')
        .'</p>'
@@ -423,7 +365,7 @@ sub display_two {
        .' <input type="text" name="foldername" size="15" value="'.&mt('Type Name Here').'" />'
        .'<br />'
        .'<label>'
-       .'<input type="radio" name="toplevel" value="oldfolder" />'
+       .'<input type="radio" name="toplevel" value="oldfolder" checked="checked" />'
        .&mt('Append listing of contents of top level of package to contents list for the current folder.')
        .'</label>'
     );
@@ -433,7 +375,7 @@ sub display_two {
         '<input type="hidden" name="folder" value="'.$env{'form.folder'}.'" />'
        .'<input type="hidden" name="source" value="'.$cms.'" />'
        .'<input type="hidden" name="tempdir" value="'.$tempdir.'" />'
-       .'<input type="hidden" name="phase" value="three" />'
+       .'<input type="hidden" name="phase" value="two" />'
     );
     $r->print(
         '<hr />'
@@ -449,8 +391,7 @@ sub display_two {
    $r->print('</form>');
 }
 
-
-sub display_three {
+sub display_two {
     my ($r,$crs,$cdom,$uname,$udom,$areas,%cmsmap) = @_;
     my $folder = $env{'form.folder'};
     my $cms = $env{'form.source'};
@@ -516,16 +457,16 @@ sub display_three {
 
     my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'prepare',\%includedres,\%includeditems);
     if ($manifest_result eq 'ok') {
-        foreach my $res (sort keys %resources) {
+        foreach my $res (sort(keys(%resources))) {
             if ($importareas{$resources{$res}{type}}) {
                 $includedres{$res} = 1;
             }
         }
-        foreach my $itm (sort keys %items) {
+        foreach my $itm (sort(keys(%items))) {
             &Apache::imsprocessor::get_imports(\%includeditems,\%items,\%resources,\%importareas,$itm);
         }
     }
-    foreach my $itm (sort keys %includeditems) {
+    foreach my $itm (sort(keys(%includeditems))) {
         &Apache::imsprocessor::get_parents(\%includeditems,\%items,$itm);
     }
 
@@ -563,7 +504,7 @@ sub display_three {
 
         &Apache::imsprocessor::process_resinfo($cms,'DOCS',$tempdir,$destdir,\%items,\%resources,\@targets,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\@groups,\%messages,\@timestamp,\%boardnum,\%resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,\%total,$seqstem,$seqstem,\@resrcfiles,\@packages,\%hrefs,\@pages,\@sequences);
 
-        my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\%importareas);
+        my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,\%resources,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\%importareas);
 
         &Apache::imsprocessor::build_structure($cms,'DOCS',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,'',$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems);
 
@@ -609,47 +550,30 @@ sub display_three {
     if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {
         system("rm -r -f $tempdir");
     }
-    $r->print(<<ENDBLOCK);
-  <table border='0' bgcolor='#F6F6F6'' cellspacing='0' cellpadding ='0' width='100%'>
-   <tr>
-    <td colspan='2'>
-     <table border='0' cellspacing='0' cellpadding='0'>
-      <tr>
-       <td colspan='2'  align='left'>&nbsp;
-       </td>
-      </tr>
-      <tr bgcolor='#CCCCFF'>
-       <td valign="middle"><img src="/res/adm/pages/bl_step5.gif" alt="5" />
-       </td>
-       <td width='100%' align='left'>&nbsp;&nbsp;
-        <font face='arial,helvetica,sans-serif'><b>Your import is complete</b></font>
-       </td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr>
-       <td>&nbsp;</td>
-       <td>
-ENDBLOCK
-    my $initblock = qq|  
-         <form method="post" action="/adm/roles" target="loncapaclient" name="importDone">
-           <input type="hidden" name="orgurl" value="/adm/coursedocs" />
-           <input type="hidden" name="selectrole" value="1" />
-           <h3><font color="red">Changes will become active for your current session after
-           <input type="hidden" name="$env{'request.role'}" value="1" />
-           <input type="button" value="|;
-    $initblock .= &mt('re-initializing course');
-    $initblock .= qq|" onClick="javascript:init(this.form)" />|;
-    $initblock .= ', '.&mt('or the next time you log in.');
-    $initblock .= qq|</font></h3></form>|;  
-    $r->print($initblock);
-    $r->print(<<ENDBLOCKTWO);
-     </table>
-    </td>
-   </tr>
-  </table>
-ENDBLOCKTWO
+
+    # All done, display success message
+    $r->print(
+        '<p class="LC_success">'
+       .&mt('Your import is complete.')
+       .'</p>'
+    );
+    # Re-initialize Button
+    my $initbutton =
+           '<input type="button" value="'
+          .&mt('re-initializing Course')
+          .'" onclick="javascript:init(this.form)" />';
+    $r->print(
+        '<form method="post" action="/adm/roles" target="loncapaclient" name="importDone">'
+       .'<input type="hidden" name="orgurl" value="/adm/coursedocs" />'
+       .'<input type="hidden" name="selectrole" value="1" />'
+       .'<input type="hidden" name="'.$env{'request.role'}.'" value="1" />'
+       .'<p class="LC_warning">'
+       .&mt('Changes will become active for your current session after [_1]'
+           .', or the next time you log in.'
+            ,$initbutton)
+       .'</p>'
+       .'</form>'
+    );
 }
 
 1;