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

Diff for /loncom/publisher/lonupload.pm between versions 1.23 and 1.29

version 1.23, 2003/11/08 11:11:01 version 1.29, 2005/04/07 06:56:27
Line 41  use Apache::Log(); Line 41  use Apache::Log();
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 my $DEBUG=0;  my $DEBUG=0;
   
Line 62  sub Debug { Line 63  sub Debug {
 sub upfile_store {  sub upfile_store {
     my $r=shift;      my $r=shift;
   
     my $fname=$ENV{'form.upfile.filename'};      my $fname=$env{'form.upfile.filename'};
     $fname=~s/\W//g;      $fname=~s/\W//g;
           
     chomp($ENV{'form.upfile'});      chomp($env{'form.upfile'});
       
     my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.      my $datatoken=$env{'user.name'}.'_'.$env{'user.domain'}.
   '_upload_'.$fname.'_'.time.'_'.$$;    '_upload_'.$fname.'_'.time.'_'.$$;
     {      {
        my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').         my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
                                    '/tmp/'.$datatoken.'.tmp');                                     '/tmp/'.$datatoken.'.tmp');
        print $fh $ENV{'form.upfile'};         print $fh $env{'form.upfile'};
     }      }
     return $datatoken;      return $datatoken;
 }  }
   
   
 sub phaseone {  sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom,$mode)=@_;
     $ENV{'form.upfile.filename'}=~s/\\/\//g;      my $action = '/adm/upload';
     $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;      if ($mode eq 'testbank') {
     if ($ENV{'form.upfile.filename'}) {          $action = '/adm/testbank';
       } elsif ($mode eq 'imsimport') {
           $action = '/adm/imsimport';
       }
       $env{'form.upfile.filename'}=~s/\\/\//g;
       $env{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;
       if ($env{'form.upfile.filename'}) {
  $fn=~s/\/[^\/]+$//;   $fn=~s/\/[^\/]+$//;
  $fn=~s/([^\/])$/$1\//;   $fn=~s/([^\/])$/$1\//;
  $fn.=$ENV{'form.upfile.filename'};   $fn.=$env{'form.upfile.filename'};
  $fn=~s/^\///;   $fn=~s/^\///;
  $fn=~s/(\/)+/\//g;   $fn=~s/(\/)+/\//g;
   
Line 94  sub phaseone { Line 101  sub phaseone {
   
  &Debug($r, "Filename for upload: $fn");   &Debug($r, "Filename for upload: $fn");
  if (($fn) && ($fn!~/\/$/)) {   if (($fn) && ($fn!~/\/$/)) {
     $r->print('<form action="/adm/upload" method="post">'.      $r->print('<form action="'.$action.'" method="post" name="fileupload">'.
       '<input type="hidden" name="phase" value="two" />'.        '<input type="hidden" name="phase" value="two" />'.
       '<input type="hidden" name="datatoken" value="'.        '<input type="hidden" name="datatoken" value="'.
       &upfile_store.'" />'.        &upfile_store.'" />'.
       '<input type="hidden" name="uploaduname" value="'.$uname.        '<input type="hidden" name="uploaduname" value="'.$uname.
       '" />'.&mt('Store uploaded file as ').        '" />'.&mt('Store uploaded file as ').
       "<tt>/priv/$uname/</tt>".                        "<tt>/priv/$uname/</tt>".
       '<input type="text" size="50" name="filename" value="'.$fn.                        '<input type="text" size="50" name="filename" value="'.$fn.
       '" /><br />'.                        '" /><br />');
       '<input type="submit" value="'.&mt('Store').'" /></form>');              $r->print('<br />'.&mt('Please indicate the type of file you are uploading. The possible types of file are as follows:').'
   <ul>
    <li><b>'.&mt('Regular file:').'</b>'.&mt(' A file that requires no special handling during upload. The "Regular file" designation applies to html files, image files etc., as well as to zip, tar or gzip files that you wish to decompress after upload. In the case of a zip/tar/gz file etc., once the file has been uploaded, a "Decompress" link will automatically be displayed adjacent to the name of the file in the display of construction space directory contents. You will be able to decompress this file by clicking the link.').'</li>     
    <li><b>'.&mt('Testbank file:').'</b>'.&mt(' a testbank file containing plain text (ascii) questions and answers, which you plan to convert to LON-CAPA problems. The following question types can be converted: 1 of N multiple choice questions, individual True/False questions, groups of True/False questions, Fill-in-the-blank questions, Ranking questions, and Essay/short answer questions. Specific information about the format of the questions, foils, and correct answers is available ').'<a href="javascript:testbankWin()">'.&mt('here').'</a>,'.&mt(' and is also included in the pages displayed during step-by-step conversion of the testbank. The original testbank file can be removed from your construction space later, once the testbank questions have been converted.').'</li>
   <li><b>'.&mt('IMS package').':</b>'.&mt(' a file containing course content from another Course Management System (e.g., Blackboard or ANGEL) packaged according to the IMS 1.1 specification.  The original IMS package file can be removed from your construction space later, once the package has been decompressed and the files converted to LON-CAPA sequence, page, problem, or bulletin board files, or stored as html, image or movie files etc., as appropriate.').'</li>
   </ul>
   <br />'.&mt('Choose file type:').'
   <select name="filetype">
    <option value="standard" selected>'.&mt('Regular file').'
    <option value="testbank">'.&mt('Testbank file').'
    <option value="imsimport">'.&mt('IMS package').'
   </select>
   <br />
   <br />
   ');
               $r->print('<input type="button" value="'.&mt('Store').'" onClick="javascript:verifyForm()"/></form>');
     # Check for bad extension and warn user      # Check for bad extension and warn user
     if ($fn=~/\.(\w+)$/ &&       if ($fn=~/\.(\w+)$/ && 
  (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
Line 126  sub phaseone { Line 148  sub phaseone {
 }  }
   
 sub phasetwo {  sub phasetwo {
     my ($r,$tfn,$uname,$udom)=@_;      my ($r,$tfn,$uname,$udom,$mode)=@_;
       my $action = '/adm/upload';
       my $returnflag = '';
       if ($mode eq 'testbank') {
           $action = '/adm/testbank';
       } elsif ($mode eq 'imsimport') {
           $action = '/adm/imsimport';
       }
     my $fn='/priv/'.$uname.'/'.$tfn;      my $fn='/priv/'.$uname.'/'.$tfn;
     $fn=~s/\/+/\//g;      $fn=~s/\/+/\//g;
     &Debug($r, "Filename is ".$tfn);      &Debug($r, "Filename is ".$tfn);
Line 137  sub phasetwo { Line 166  sub phasetwo {
 #     target is the full filesystem path of the destination file.  #     target is the full filesystem path of the destination file.
  my $base = &File::Basename::basename($fn);   my $base = &File::Basename::basename($fn);
  my $path = &File::Basename::dirname($fn);   my $path = &File::Basename::dirname($fn);
  $base    = &HTML::Entities::encode($base);   $base    = &HTML::Entities::encode($base,'<>&"');
  my $url  = $path."/".$base;    my $url  = $path."/".$base; 
  &Debug($r, "URL is now ".$url);   &Debug($r, "URL is now ".$url);
  my $datatoken=$ENV{'form.datatoken'};   my $datatoken=$env{'form.datatoken'};
  if (($fn) && ($datatoken)) {   if (($fn) && ($datatoken)) {
     if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {      if ((-e $target) && ($env{'form.override'} ne 'Yes')) {
  $r->print('<form action="/adm/upload" method="post">'.   $r->print('<form action="'.$action.'" method="post">'.
   &mt('File').' <tt>'.$fn.'</tt> '.    &mt('File').' <tt>'.$fn.'</tt> '.
   &mt('exists. Overwrite?').' '.    &mt('exists. Overwrite?').' '.
   '<input type="hidden" name="phase" value="two" />'.    '<input type="hidden" name="phase" value="two" />'.
Line 152  sub phasetwo { Line 181  sub phasetwo {
   '<input type="submit" name="override" value="'.&mt('Yes').'" /></form>');    '<input type="submit" name="override" value="'.&mt('Yes').'" /></form>');
     } else {      } else {
  my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';   my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
    my $dirpath=$path.'/';
    $dirpath=~s/\/+/\//g;
  # Check for bad extension and disallow upload   # Check for bad extension and disallow upload
  if ($fn=~/\.(\w+)$/ &&    if ($fn=~/\.(\w+)$/ && 
     (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {      (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
Line 160  sub phasetwo { Line 191  sub phasetwo {
       '<font color="red">'.        '<font color="red">'.
       &mt('The extension on this file is reserved internally by LON-CAPA.').        &mt('The extension on this file is reserved internally by LON-CAPA.').
       '</font>');        '</font>');
     $r->print('<p><font size=+2><a href="'.$path.'">'.      $r->print('<br /><font size=+2><a href="'.$dirpath.'">'.
       &mt('Back to Directory').'</a></font>');        &mt('Back to Directory').'</a></font>');
  } elsif ($fn=~/\.(\w+)$/ &&    } elsif ($fn=~/\.(\w+)$/ && 
  !defined(&Apache::loncommon::fileembstyle($1))) {   !defined(&Apache::loncommon::fileembstyle($1))) {
Line 169  sub phasetwo { Line 200  sub phasetwo {
       '<font color="red">'.        '<font color="red">'.
       &mt('The extension on this file is not recognized by LON-CAPA.').        &mt('The extension on this file is not recognized by LON-CAPA.').
       '</font>');        '</font>');
     $r->print('<br /><font size="+2"><a href="'.$path.'">'.      $r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
       &mt('Back to Directory').'</a></font>');        &mt('Back to Directory').'</a></font>');
  } elsif (-d $target) {   } elsif (-d $target) {
     $r->print('File <tt>'.$fn.'</tt> could not be copied.<br />'.      $r->print('File <tt>'.$fn.'</tt> could not be copied.<br />'.
       '<font color="red">'.        '<font color="red">'.
       &mt('The target is an existing directory.').        &mt('The target is an existing directory.').
       '</font><br />');        '</font><br />');
     $r->print('<font size="+2"><a href="'.$path.'">'.      $r->print('<font size="+2"><a href="'.$dirpath.'">'.
       &mt('Back to Directory').'</a></font>');        &mt('Back to Directory').'</a></font>');
  } elsif (copy($source,$target)) {   } elsif (copy($source,$target)) {
     chmod(0660, $target); # Set permissions to rw-rw---.      chmod(0660, $target); # Set permissions to rw-rw---.
     $r->print(&mt('File copied.'));                      if ($mode eq 'testbank' || $mode eq 'imsimport') {
     $r->print('<br /><font size="+2"><a href="'.$url.'">'.                          $r->print(&mt("Your file - $fn - was uploaded successfully")."<br /><br />");
                           $returnflag = 'ok';
                       } else {
                           $r->print(&mt('File copied.'));
           $r->print('<br /><font size="+2"><a href="'.$url.'">'.
       &mt('View file').'</a></font>');        &mt('View file').'</a></font>');
     $r->print('<font size="+2"><a href="'.$path.'">'.          $r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
       &mt('Back to Directory').'</a></font><br />');        &mt('Back to Directory').'</a></font><br />');
                       }
  } else {   } else {
     $r->print('Failed to copy: '.$!);      $r->print('Failed to copy: '.$!);
     $r->print('<br /><font size="+2"><a href="'.$path.'">'.      $r->print('<br /><font size="+2"><a href="'.$path.'">'.
Line 194  sub phasetwo { Line 230  sub phasetwo {
  } else {   } else {
     $r->print('<font size="+1" color="red">'.      $r->print('<font size="+1" color="red">'.
       &mt('Please use browser "Back" button and pick a filename').        &mt('Please use browser "Back" button and pick a filename').
       '</font><br />>');        '</font><br />');
  }   }
     } else {      } else {
  $r->print('<font size=+1 color=red>'.   $r->print('<font size=+1 color=red>'.
   &mt('Please use browser "Back" button and pick a filename').    &mt('Please use browser "Back" button and pick a filename').
   '</font><p>');    '</font><br />>');
     }      }
       return $returnflag;
 }  }
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
Line 210  sub handler { Line 247  sub handler {
   
     my $uname;      my $uname;
     my $udom;      my $udom;
       my $javascript = '';
 #  #
 # phase two: re-attach user  # phase two: re-attach user
 #  #
     if ($ENV{'form.uploaduname'}) {      if ($env{'form.uploaduname'}) {
  $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'.   $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'.
     $ENV{'form.filename'};      $env{'form.filename'};
     }      }
 #  
   
       unless ($env{'form.phase'} eq 'two') {
           $javascript = qq|
   function verifyForm() {
       var mode = document.fileupload.filetype.options[document.fileupload.filetype.selectedIndex].value
       if (mode == "testbank") {
           document.fileupload.action = "/adm/testbank";
       }
       if (mode == "imsimport") {
           document.fileupload.action = "/adm/imsimport";
       }
       if (mode == "standard") {
           document.fileupload.action = "/adm/upload";
       }
       document.fileupload.submit();
   }
   
   function testbankWin() {
     newWindow = window.open("","testbankinfo","HEIGHT=400,WIDTH=750,scrollbars=yes")
     newWindow.document.open()
     newWindow.document.write("<html><head><title>'Importing a Testbank file into LON-CAPA</title><meta http-equiv='pragma' content='no-cache'>\\n")
     newWindow.document.write("</head><body bgcolor='#CCFFDD' topmargin='0' leftmargin='0' marginheight='0'marginwidth='0' rightmargin='0'>\\n")
     newWindow.document.write("<img border='0' src='/adm/lonInterFace/author.jpg' alt='[Author Header]'>\\n")
     newWindow.document.write("<table border='0' cellspacing='0' cellpadding='0' width='95%' bgcolor='#CCFFDD'>\\n")
     newWindow.document.write("<tr><td width='2'>&nbsp;</td><td width='3'>&nbsp;</td>\\n")
     newWindow.document.write("<td><font face='arial,helvetica,sans-serif'><h3>Importing Testbank questions into LON-CAPA</h3>")
     newWindow.document.write("<font face='arial,helvetica,sans-serif'><br />Four requirements must be met to ensure that you will succeed in building LON-CAPA problem files using your plain text file containing testbank questions.")
     newWindow.document.write("<ol><li>The questions and answers you upload must be in plain text format.  Any header lines should occur before the text containing the questions and answers.</li>")
     newWindow.document.write("<li>All questions must occur before any of the answers.  Each question should be numbered sequentially using a number followed immediately by a space, a period, or enclosed in parentheses, i.e., 1 , 1., (1), 1), or (1 .</li>")
      newWindow.document.write("<li>One or more correct answers should be provided for all questions (although blank answers may be provided for <i>essay</i> questions).  Answers should be numbered sequentially, using the same scheme as used for the questions, and must occur after all the questions.")
       newWindow.document.write("<li><i>Multiple choice</i> and <i>multiple answer correct</i> questions should consist of (i) the question number followed by (ii) a question stem beginning on the same line and (iii) two or more foils, with each foil beginning on a new line and prefixed by a unique letter, or Roman numeral, listed in alphabetic or numeric order, beginning at a (alphabetic) or i (Roman numeral), followed by a period, or enclosed in parentheses, i.e., a., (a), i., or (i) .</li>")
        newWindow.document.write("<li>If <i>fill-in-the-blank</i> or <i>multiple answer</i> questions have more than one correct answer, each answer should appear in a comma-, tab-, space-, or new line-delimited list. </li></ol>")
     newWindow.document.write("</td></tr>\\n")
     newWindow.document.write("</table></body></html>")
     newWindow.document.close()
     newWindow.focus()
   }
   |;
       }
     ($uname,$udom)=      ($uname,$udom)=
  &Apache::loncacc::constructaccess($ENV{'form.filename'},   &Apache::loncacc::constructaccess($env{'form.filename'},
   $r->dir_config('lonDefDomain'));    $r->dir_config('lonDefDomain'));
     unless (($uname) && ($udom)) {      unless (($uname) && ($udom)) {
  $r->log_reason($uname.' at '.$udom.   $r->log_reason($uname.' at '.$udom.
        ' trying to publish file '.$ENV{'form.filename'}.         ' trying to publish file '.$env{'form.filename'}.
        ' - not authorized',          ' - not authorized', 
        $r->filename);          $r->filename); 
  return HTTP_NOT_ACCEPTABLE;   return HTTP_NOT_ACCEPTABLE;
     }      }
           
     my $fn;      my $fn;
     if ($ENV{'form.filename'}) {      if ($env{'form.filename'}) {
  $fn=$ENV{'form.filename'};   $fn=$env{'form.filename'};
  $fn=~s/^http\:\/\/[^\/]+\///;   $fn=~s/^http\:\/\/[^\/]+\///;
  $fn=~s/^\///;   $fn=~s/^\///;
  $fn=~s/(\~|priv\/)(\w+)//;   $fn=~s/(\~|priv\/)(\w+)//;
  $fn=~s/\/+/\//g;   $fn=~s/\/+/\//g;
     } else {      } else {
  $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.   $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
        ' unspecified filename for upload', $r->filename);          ' unspecified filename for upload', $r->filename); 
  return HTTP_NOT_FOUND;   return HTTP_NOT_FOUND;
     }      }
Line 249  sub handler { Line 324  sub handler {
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
   
     $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');      $r->print("<html><head><title>LON-CAPA Construction Space</title><script type=\"text/javascript\">\n//<!--\n$javascript\n// --></script>\n</head>");
   
     $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));      $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));
       
     if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {      if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
  $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.   $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
   &mt(' at ').$udom.'</font></h3>');    &mt(' at ').$udom.'</font></h3>');
     }      }
   
     if ($ENV{'form.phase'} eq 'two') {      if ($env{'form.phase'} eq 'two') {
  &phasetwo($r,$fn,$uname,$udom);   &phasetwo($r,$fn,$uname,$udom);
     } else {      } else {
  &phaseone($r,$fn,$uname,$udom);   &phaseone($r,$fn,$uname,$udom);
Removed from v.1.23  
changed lines
  Added in v.1.29

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