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

Diff for /loncom/publisher/lonupload.pm between versions 1.19 and 1.35

version 1.19, 2003/08/04 18:22:55 version 1.35, 2007/05/02 01:34:23
Line 37  use File::Basename; Line 37  use File::Basename;
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  use Apache::loncacc;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::Log();  
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
   use Apache::lonlocal;
   use Apache::lonnet;
   use LONCAPA();
   
 my $DEBUG=0;  my $DEBUG=0;
   
 sub Debug {  sub Debug {
         # Put out the indicated message but only if DEBUG is true.
   # Marshall the parameters.      if ($DEBUG) {
      my ($r,$message) = @_;
   my $r       = shift;   $r->log_reason($message);
   my $log     = $r->log;      }
   my $message = shift;  
     
   # Put out the indicated message butonly if DEBUG is false.  
     
   if ($DEBUG) {  
     $log->debug($message);  
   }  
 }  }
   
 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';
     $fn=~s/\/[^\/]+$//;      } elsif ($mode eq 'imsimport') {
     $fn=~s/([^\/])$/$1\//;          $action = '/adm/imsimport';
     $fn.=$ENV{'form.upfile.filename'};      }
     $fn=~s/^\///;      $env{'form.upfile.filename'}=~s/\\/\//g;
     $fn=~s/(\/)+/\//g;      $env{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;
       if ($env{'form.upfile.filename'}) {
    $fn=~s/\/[^\/]+$//;
    $fn=~s/([^\/])$/$1\//;
    $fn.=$env{'form.upfile.filename'};
    $fn=~s/^\///;
    $fn=~s/(\/)+/\//g;
   
 #    Fn is the full path to the destination filename.  #    Fn is the full path to the destination filename.
 #      #    
   
     &Debug($r, "Filename for upload: $fn");   &Debug($r, "Filename for upload: $fn");
     if (($fn) && ($fn!~/\/$/)) {   if (($fn) && ($fn!~/\/$/)) {
       $r->print(      $r->print('<form action="'.$action.'" method="post" name="fileupload">'.
  '<form action=/adm/upload method=post>'.        '<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.
  'Store uploaded file as '.        '" />'.&mt('Save uploaded file as ').
  '<input type=text size=50 name=filename value="'.$fn.'"><br>'.                        "<span class='LC_filename'>/priv/$uname/</span>".
  '<input type=submit value="Store"></form>');                        '<input type="text" size="50" name="filename" value="'.$fn.
       # Check for bad extension and warn user                        '" /><br />'.
       if ($fn=~/\.(\w+)$/ &&         '<br />'.&mt('Choose file type:').'
   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {  <select name="filetype">
   $r->print(   <option value="standard" selected>'.&mt('Regular file').'
  '<font color=red>'.   <option value="testbank">'.&mt('Testbank file').'
  'The extension on this file, "'.$1.   <option value="imsimport">'.&mt('IMS package').'
  '", is reserved internally by LON-CAPA. <br \>'.  </select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'
  'Please change the extension.'.  <br />
  '</font>');  <br />
       } elsif($fn=~/\.(\w+)$/ &&   ');
       !defined(&Apache::loncommon::fileembstyle($1))) {              $r->print('<input type="button" value="'.&mt('Save').'" onClick="javascript:verifyForm()"/></form>');
   $r->print(      # Check for bad extension and warn user
  '<font color=red>'.      if ($fn=~/\.(\w+)$/ && 
  'The extension on this file, "'.$1.   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
  '", is not recognized by LON-CAPA. <br \>'.   $r->print('<span class="LC_error">'.&mt('The extension on this file,').
  'Please change the extension.'.    ' "'.$1.'"'.&mt(', is reserved internally by LON-CAPA.').
  '</font>');    ' <br />'.&mt('Please change the extension.').'</span>');
       }      } elsif($fn=~/\.(\w+)$/ && 
   } else {      !defined(&Apache::loncommon::fileembstyle($1))) {
       $r->print('<font color=red>Illegal filename.</font>');   $r->print('<span class="LC_error">'.&mt('The extension on this file,').
   }    ' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').
  } else {    ' <br />'.&mt('Please change the extension.').
      $r->print('<font color=red>No upload file specified.</font>');    '</span>');
  }      }
    } else {
       $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');
    }
       } else {
    $r->print('<span class="LC_error">'.&mt('No upload file specified.').'</span>');
       }
 }  }
   
 sub phasetwo {  sub phasetwo {
    my ($r,$tfn,$uname,$udom)=@_;      my ($r,$tfn,$uname,$udom,$mode)=@_;
    my $fn='/priv/'.$uname.'/'.$tfn;      my $action = '/adm/upload';
    $fn=~s/\/+/\//g;      my $returnflag = '';
    &Debug($r, "Filename is ".$tfn);      if ($mode eq 'testbank') {
    if ($tfn) {          $action = '/adm/testbank';
     &Debug($r, "Filename for tfn = ".$tfn);      } elsif ($mode eq 'imsimport') {
     my $target='/home/'.$uname.'/public_html'.$tfn;          $action = '/adm/imsimport';
     &Debug($r, "target -> ".$target);      }
       my $fn='/priv/'.$uname.'/'.$tfn;
       $fn=~s/\/+/\//g;
       &Debug($r, "Filename is ".$tfn);
       if ($tfn) {
    &Debug($r, "Filename for tfn = ".$tfn);
    my $target='/home/'.$uname.'/public_html'.$tfn;
    &Debug($r, "target -> ".$target);
 #     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(   $r->print('<form action="'.$action.'" method="post">'.
  '<form action=/adm/upload method=post>'.    &mt('File').' <span class="LC_filename">'.$fn.'</span> '.
  'File <tt>'.$fn.'</tt> exists. Overwrite? '.    &mt('exists. Overwrite?').' '.
  '<input type=hidden name=phase value=two>'.    '<input type="hidden" name="phase" value="two" />'.
  '<input type=hidden name=filename value="'."$url".'">'.    '<input type="hidden" name="filename" value="'."$url".'" />'.
  '<input type=hidden name=datatoken value="'.$datatoken.'">'.    '<input type="hidden" name="datatoken" value="'.$datatoken.'" />'.
  '<input type=submit name=override value="Yes"></form>');    '<input type="submit" name="override" value="'.&mt('Yes').'" /></form>');
        } else {      } else {
            my $source=$r->dir_config('lonDaemons').   my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
                              '/tmp/'.$datatoken.'.tmp';   my $dirpath=$path.'/';
            # Check for bad extension and disallow upload   $dirpath=~s/\/+/\//g;
    if ($fn=~/\.(\w+)$/ &&    # Check for bad extension and disallow upload
        (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {   if ($fn=~/\.(\w+)$/ && 
        $r->print(      (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.      $r->print(&mt('File').' <span class="LC_filename">'.$fn.'</span> '.
  '<font color=red>'.        &mt('could not be copied.').'<br />'.
  'The extension on this file is reserved internally by LON-CAPA.'.        '<span class="LC_error">'.
  '</font>');        &mt('The extension on this file is reserved internally by LON-CAPA.').
               $r->print('<p><font size=+2><a href="'.$path.        '</span>');
                         '">Back to Directory</a></font>');      $r->print('<br /><font size=+2><a href="'.$dirpath.'">'.
    } elsif ($fn=~/\.(\w+)$/ &&         &mt('Back to Directory').'</a></font>');
     !defined(&Apache::loncommon::fileembstyle($1))) {   } elsif ($fn=~/\.(\w+)$/ && 
        $r->print(   !defined(&Apache::loncommon::fileembstyle($1))) {
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.      $r->print(&mt('File').' <span class="LC_filename">'.$fn.'</span> '.
  '<font color=red>'.        &mt('could not be copied.').'<br />'.
  'The extension on this file is not recognized by LON-CAPA.'.        '<span class="LC_error">'.
  '</font>');        &mt('The extension on this file is not recognized by LON-CAPA.').
        $r->print('<p><font size=+2><a href="'.$path.        '</span>');
                         '">Back to Directory</a></font>');      $r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
    } elsif (-d $target) {        &mt('Back to Directory').'</a></font>');
        $r->print(   } elsif (-d $target) {
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.      $r->print('File <span class="LC_filename">'.$fn.'</span> could not be copied.<br />'.
  '<font color=red>'.        '<span class="LC_error">'.
  'The target is an existing directory.'.        &mt('The target is an existing directory.').
  '</font>');        '</span><br />');
        $r->print('<p><font size=+2><a href="'.$path.      $r->print('<font size="+2"><a href="'.$dirpath.'">'.
                         '">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('File copied.');                      if ($mode eq 'testbank' || $mode eq 'imsimport') {
               $r->print('<p><font size=+2><a href="'.$url.                          $r->print(&mt("Your file - $fn - was uploaded successfully")."<br /><br />");
                         '">View file</a></font>');                          $returnflag = 'ok';
               $r->print('<p><font size=+2><a href="'.$path.                      } else {
                         '">Back to Directory</a></font>');                          $r->print(&mt('File copied.'));
    } else {          $r->print('<br /><font size="+2"><a href="'.$url.'">'.
               $r->print('Failed to copy: '.$!);        &mt('View file').'</a></font>');
               $r->print('<p><font size=+2><a href="'.$path.          $r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
                         '">Back to Directory</a></font>');        &mt('Back to Directory').'</a></font><br />');
    }                      }
        }   } else {
       $r->print('Failed to copy: '.$!);
       $r->print('<br /><font size="+2"><a href="'.$path.'">'.
         &mt('Back to Directory').'</a></font>');
    }
       }
    } else {
       $r->print('<span class="LC_error">'.
         &mt('Please use browser "Back" button and pick a filename').
         '</span><br />');
    }
     } else {      } else {
        $r->print(   $r->print('<span class="LC_error">'.
    '<font size=+1 color=red>Please use browser "Back" button and pick a filename</font><p>');    &mt('Please use browser "Back" button and pick a filename').
     '</span><br />>');
     }      }
   } else {      return $returnflag;
     $r->print(  
    '<font size=+1 color=red>Please use browser "Back" button and pick a filename</font><p>');  
   }  
 }  }
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
   
   my $r=shift;      my $r=shift;
   
   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'};
   }      }
 #  
   
   ($uname,$udom)=      unless ($env{'form.phase'} eq 'two') {
     &Apache::loncacc::constructaccess(   my %body_layout = ('rightmargin'  => "0",
  $ENV{'form.filename'},$r->dir_config('lonDefDomain'));     'leftmargin'   => "0",
   unless (($uname) && ($udom)) {     'marginwidth'  => "0",
      $r->log_reason($uname.' at '.$udom.     'topmargin'    => "0",
          ' trying to publish file '.$ENV{'form.filename'}.     'marginheight' => "0");
          ' - not authorized',    my $start_page = 
          $r->filename);       &Apache::loncommon::start_page('Importing a Testbank file into LON-CAPA',
      return HTTP_NOT_ACCEPTABLE;     undef,
   }     {'only_body'   => 1,
       'add_entries' => \%body_layout,
   my $fn;      'js_ready'    => 1,});
   if ($ENV{'form.filename'}) {   my $end_page = 
       $fn=$ENV{'form.filename'};      &Apache::loncommon::end_page({'js_ready' => 1,});
       $fn=~s/^http\:\/\/[^\/]+\///;  
       $fn=~s/^\///;          $javascript = qq|
       $fn=~s/(\~|priv\/)(\w+)//;  function verifyForm() {
       $fn=~s/\/+/\//g;      var mode = document.fileupload.filetype.options[document.fileupload.filetype.selectedIndex].value
   } else {      if (mode == "testbank") {
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.          document.fileupload.action = "/adm/testbank";
          ' unspecified filename for upload', $r->filename);       }
      return HTTP_NOT_FOUND;      if (mode == "imsimport") {
   }          document.fileupload.action = "/adm/imsimport";
       }
       if (mode == "standard") {
           document.fileupload.action = "/adm/upload";
       }
       document.fileupload.submit();
   }
    |;
       }
       ($uname,$udom)=
    &Apache::loncacc::constructaccess($env{'form.filename'},
     $r->dir_config('lonDefDomain'));
       unless (($uname) && ($udom)) {
    $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$env{'form.filename'}.
          ' - not authorized', 
          $r->filename); 
    return HTTP_NOT_ACCEPTABLE;
       }
       
       my $fn;
       if ($env{'form.filename'}) {
    $fn=$env{'form.filename'};
    $fn=~s/^http\:\/\/[^\/]+\///;
    $fn=~s/^\///;
    $fn=~s{(~|priv/)($LONCAPA::username_re)}{};
    $fn=~s/\/+/\//g;
       } else {
    $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' unspecified filename for upload', $r->filename); 
    return HTTP_NOT_FOUND;
       }
   
 # ----------------------------------------------------------- Start page output  # ----------------------------------------------------------- Start page output
   
   
   $r->content_type('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>');     $javascript = "<script type=\"text/javascript\">\n//<!--\n".
    $javascript."\n// --></script>\n";
   
   $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));      $r->print(&Apache::loncommon::start_page('Upload file to Construction Space',
        $javascript));
       
   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>Co-Author: '.$uname.' at '.$udom.   $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
                '</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);
   }      }
   
   $r->print('</body></html>');      $r->print(&Apache::loncommon::end_page());
   return OK;        return OK;  
 }  }
   
 1;  1;
Removed from v.1.19  
changed lines
  Added in v.1.35

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