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

Diff for /loncom/publisher/lonupload.pm between versions 1.16 and 1.24

version 1.16, 2003/06/23 21:56:31 version 1.24, 2003/11/08 11:13:50
Line 26 Line 26
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # (Handler to retrieve an old version of a file  
 #  
 # (Publication Handler  
 #   
 # (TeX Content Handler  
 #  
 # YEAR=2000  
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)  
 #  
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer  
 # YEAR=2001  
 # 03/23 Guy Albertelli  
 # 03/24,03/29 Gerd Kortemeyer)  
 #  
 # 03/31,04/03 Gerd Kortemeyer)  
 #  
 # 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer  
 # 11/29 Matthew Hall  
 #  
 ###  ###
   
 package Apache::lonupload;  package Apache::lonupload;
Line 59  use Apache::loncommon(); Line 40  use Apache::loncommon();
 use Apache::Log();  use Apache::Log();
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
   use Apache::lonlocal;
   
 my $DEBUG=0;  my $DEBUG=0;
   
 sub Debug {  sub Debug {
       
   # Marshall the parameters.      # Marshall the parameters.
       
   my $r       = shift;      my $r       = shift;
   my $log     = $r->log;      my $log     = $r->log;
   my $message = shift;      my $message = shift;
       
   # Put out the indicated message butonly if DEBUG is false.      # Put out the indicated message butonly if DEBUG is false.
       
   if ($DEBUG) {      if ($DEBUG) {
     $log->debug($message);   $log->debug($message);
   }      }
 }  }
   
 sub upfile_store {  sub upfile_store {
Line 83  sub upfile_store { Line 65  sub upfile_store {
     my $fname=$ENV{'form.upfile.filename'};      my $fname=$ENV{'form.upfile.filename'};
     $fname=~s/\W//g;      $fname=~s/\W//g;
           
     chop($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.'_'.$$;
Line 97  sub upfile_store { Line 79  sub upfile_store {
   
   
 sub phaseone {  sub phaseone {
    my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
    $ENV{'form.upfile.filename'}=~s/\\/\//g;      $ENV{'form.upfile.filename'}=~s/\\/\//g;
    $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;      $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;
    if ($ENV{'form.upfile.filename'}) {      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;
   
 #    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="/adm/upload" method="post">'.
  '<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.'" />'.
  'Store uploaded file as '.        '<input type="hidden" name="uploaduname" value="'.$uname.
  '<input type=text size=50 name=filename value="/priv/'.        '" />'.&mt('Store uploaded file as ').
   $uname.'/'.$fn.'"><br>'.        "<tt>/priv/$uname/</tt>".
  '<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+)$/ &&         '<input type="submit" value="'.&mt('Store').'" /></form>');
   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {      # Check for bad extension and warn user
   $r->print(      if ($fn=~/\.(\w+)$/ && 
  '<font color=red>'.   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
  'The extension on this file, "'.$1.   $r->print('<font color="red">'.&mt('The extension on this file,').
  '", is reserved internally by LON-CAPA. <br \>'.    ' "'.$1.'"'.&mt(', is reserved internally by LON-CAPA.').
  'Please change the extension.'.    ' <br />'.&mt('Please change the extension.').'</font>');
  '</font>');      } elsif($fn=~/\.(\w+)$/ && 
       } elsif($fn=~/\.(\w+)$/ &&       !defined(&Apache::loncommon::fileembstyle($1))) {
       !defined(&Apache::loncommon::fileembstyle($1))) {   $r->print('<font color="red">'.&mt('The extension on this file,').
   $r->print(    ' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').
  '<font color=red>'.    ' <br />'.&mt('Please change the extension.').
  'The extension on this file, "'.$1.    '</font>');
  '", is not recognized by LON-CAPA. <br \>'.      }
  'Please change the extension.'.   } else {
  '</font>');      $r->print('<font color="red">'.&mt('Illegal filename.').'</font>');
       }   }
   } else {      } else {
       $r->print('<font color=red>Illegal filename.</font>');   $r->print('<font color="red">'.&mt('No upload file specified.').'</font>');
   }      }
  } else {  
      $r->print('<font color=red>No upload file specified.</font>');  
  }  
 }  }
   
 sub phasetwo {  sub phasetwo {
    my ($r,$fn,$uname,$udom)=@_;      my ($r,$tfn,$uname,$udom)=@_;
    &Debug($r, "Filename is ".$fn);      my $fn='/priv/'.$uname.'/'.$tfn;
    if ($fn=~/^\/priv\/$uname\//) {      $fn=~s/\/+/\//g;
     &Debug($r, "Filename after priv substitution: ".$fn);      &Debug($r, "Filename is ".$tfn);
     my $tfn=$fn;      if ($tfn) {
     $tfn=~s/^\/(\~|priv)\/(\w+)//;   &Debug($r, "Filename for tfn = ".$tfn);
     &Debug($r, "Filename for tfn = ".$tfn);   my $target='/home/'.$uname.'/public_html'.$tfn;
     my $target='/home/'.$uname.'/public_html'.$tfn;   &Debug($r, "target -> ".$target);
     &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="/adm/upload" method="post">'.
  '<form action=/adm/upload method=post>'.    &mt('File').' <tt>'.$fn.'</tt> '.
  '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';   # 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')) {      $r->print(&mt('File').' <tt>'.$fn.'</tt> '.
        $r->print(        &mt('could not be copied.').'<br />'.
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.        '<font color="red">'.
  '<font color=red>'.        &mt('The extension on this file is reserved internally by LON-CAPA.').
  'The extension on this file is reserved internally by LON-CAPA.'.        '</font>');
  '</font>');      $r->print('<br /><font size=+2><a href="'.$path.'">'.
    } 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').' <tt>'.$fn.'</tt> '.
  '<font color=red>'.        &mt('could not be copied.').'<br />'.
  'The extension on this file is not recognized by LON-CAPA.'.        '<font color="red">'.
  '</font>');        &mt('The extension on this file is not recognized by LON-CAPA.').
    } elsif (copy($source,$target)) {        '</font>');
        chmod(0660, $target); # Set permissions to rw-rw---.      $r->print('<br /><font size="+2"><a href="'.$path.'">'.
       $r->print('File copied.');        &mt('Back to Directory').'</a></font>');
               $r->print('<p><font size=+2><a href="'.$url.   } elsif (-d $target) {
                         '">View file</a></font>');      $r->print('File <tt>'.$fn.'</tt> could not be copied.<br />'.
               $r->print('<p><font size=+2><a href="'.$path.        '<font color="red">'.
                         '">Back to Directory</a></font>');        &mt('The target is an existing directory.').
    } else {        '</font><br />');
               $r->print('Failed to copy: '.$!);      $r->print('<font size="+2"><a href="'.$path.'">'.
    }        &mt('Back to Directory').'</a></font>');
        }   } elsif (copy($source,$target)) {
       chmod(0660, $target); # Set permissions to rw-rw---.
       $r->print(&mt('File copied.'));
       $r->print('<br /><font size="+2"><a href="'.$url.'">'.
         &mt('View file').'</a></font>');
       $r->print('<br /><font size="+2"><a href="'.$path.'">'.
         &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('<font size="+1" color="red">'.
         &mt('Please use browser "Back" button and pick a filename').
         '</font><br />');
    }
     } else {      } else {
        $r->print(   $r->print('<font size=+1 color=red>'.
    '<font size=+1 color=red>Please pick a filename</font><p>');    &mt('Please use browser "Back" button and pick a filename').
        &phaseone($r,$fn,$uname,$udom);    '</font><br />>');
     }      }
   } else {  
     $r->print(  
    '<font size=+1 color=red>Please pick a filename</font><p>');  
     &phaseone($r,$fn,$uname,$udom);  
   }  
 }  }
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
   
   my $r=shift;      my $r=shift;
   
   my $uname;      my $uname;
   my $udom;      my $udom;
   #
   # phase two: re-attach user
   #
       if ($ENV{'form.uploaduname'}) {
    $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'.
       $ENV{'form.filename'};
       }
   #
   
   ($uname,$udom)=      ($uname,$udom)=
     &Apache::loncacc::constructaccess(   &Apache::loncacc::constructaccess($ENV{'form.filename'},
  $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\:\/\/[^\/]+\/(\~|priv\/)(\w+)//;   $fn=~s/^\///;
   } else {   $fn=~s/(\~|priv\/)(\w+)//;
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.   $fn=~s/\/+/\//g;
          ' unspecified filename for upload', $r->filename);       } else {
      return HTTP_NOT_FOUND;   $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>');      $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
   
   $r->print(      $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');  
   
     
   $r->print('<h1>Upload file to Construction Space</h1>');  
       
   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('</body></html>');
   return OK;        return OK;  
 }  }
   
 1;  1;
Removed from v.1.16  
changed lines
  Added in v.1.24

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