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

Diff for /loncom/publisher/lonupload.pm between versions 1.17 and 1.21

version 1.17, 2003/07/05 10:07:12 version 1.21, 2003/11/08 10:58:30
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;
   
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 116  sub phaseone { Line 98  sub phaseone {
  '<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="'.&upfile_store.'">'.   '<input type=hidden name=datatoken value="'.&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 ')."<tt>/priv/$uname/</tt>".
   $uname.'/'.$fn.'"><br>'.   '<input type=text size=50 name=filename value="'.$fn.'"><br>'.
  '<input type=submit value="Store"></form>');   '<input type=submit value="'.&mt('Store').'"></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')) {
   $r->print(    $r->print(
  '<font color=red>'.   '<font color=red>'.
  'The extension on this file, "'.$1.   &mt('The extension on this file,').' "'.$1.
  '", is reserved internally by LON-CAPA. <br \>'.   '"'.&mt(', is reserved internally by LON-CAPA.').' <br \>'.
  'Please change the extension.'.   &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(    $r->print(
  '<font color=red>'.   '<font color=red>'.
  'The extension on this file, "'.$1.   &mt('The extension on this file,').' "'.$1.
  '", is not recognized by LON-CAPA. <br \>'.   '"'.&mt(', is not recognized by LON-CAPA.').' <br \>'.
  'Please change the extension.'.   &mt('Please change the extension.').
  '</font>');   '</font>');
       }        }
   } else {    } else {
       $r->print('<font color=red>Illegal filename.</font>');        $r->print('<font color=red>'.&mt('Illegal filename.').'</font>');
   }    }
  } else {   } else {
      $r->print('<font color=red>No upload file specified.</font>');       $r->print('<font color=red>'.&mt('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);
Line 167  sub phasetwo { Line 148  sub phasetwo {
  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>'.
  'File <tt>'.$fn.'</tt> exists. Overwrite? '.   &mt('File').' <tt>'.$fn.'</tt> '.&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';
Line 179  sub phasetwo { Line 160  sub phasetwo {
    if ($fn=~/\.(\w+)$/ &&      if ($fn=~/\.(\w+)$/ && 
        (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
        $r->print(         $r->print(
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.   &mt('File').' <tt>'.$fn.'</tt> '.&mt('could not be copied.').'<br />'.
  '<font color=red>'.   '<font color=red>'.
  '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.
                           '">'.&mt('Back to Directory').'</a></font>');
    } elsif ($fn=~/\.(\w+)$/ &&      } elsif ($fn=~/\.(\w+)$/ && 
     !defined(&Apache::loncommon::fileembstyle($1))) {      !defined(&Apache::loncommon::fileembstyle($1))) {
        $r->print(         $r->print(
    &mt('File').' <tt>'.$fn.'</tt> '.&mt('could not be copied.').'<br />'.
    '<font color=red>'.
    &mt('The extension on this file is not recognized by LON-CAPA.').
    '</font>');
          $r->print('<p><font size=+2><a href="'.$path.
                           '">'.&mt('Back to Directory').'</a></font>');
      } elsif (-d $target) {
          $r->print(
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.   'File <tt>'.$fn.'</tt> could not be copied.<br />'.
  '<font color=red>'.   '<font color=red>'.
  'The extension on this file is not recognized by LON-CAPA.'.   &mt('The target is an existing directory.').
  '</font>');   '</font>');
          $r->print('<p><font size=+2><a href="'.$path.
                           '">'.&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.');        $r->print(&mt('File copied.'));
               $r->print('<p><font size=+2><a href="'.$url.                $r->print('<p><font size=+2><a href="'.$url.
                         '">View file</a></font>');                          '">'.&mt('View file').'</a></font>');
               $r->print('<p><font size=+2><a href="'.$path.                $r->print('<p><font size=+2><a href="'.$path.
                         '">Back to Directory</a></font>');                          '">'.&mt('Back to Directory').'</a></font>');
    } else {     } else {
               $r->print('Failed to copy: '.$!);                $r->print('Failed to copy: '.$!);
                 $r->print('<p><font size=+2><a href="'.$path.
                           '">'.&mt('Back to Directory').'</a></font>');
    }     }
        }         }
     } else {      } else {
        $r->print(         $r->print(
    '<font size=+1 color=red>Please pick a filename</font><p>');     '<font size=+1 color=red>'.
        &phaseone($r,$fn,$uname,$udom);  &mt('Please use browser "Back" button and pick a filename').'</font><p>');
     }      }
   } else {    } else {
     $r->print(      $r->print(
    '<font size=+1 color=red>Please pick a filename</font><p>');     '<font size=+1 color=red>'.&mt('Please use browser "Back" button and pick a filename').'</font><p>');
     &phaseone($r,$fn,$uname,$udom);  
   }    }
 }  }
   
Line 220  sub handler { Line 214  sub handler {
   
   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(
Line 233  sub handler { Line 235  sub handler {
   }    }
   
   my $fn;    my $fn;
   
   if ($ENV{'form.filename'}) {    if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};        $fn=$ENV{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//;        $fn=~s/^http\:\/\/[^\/]+\///;
         $fn=~s/^\///;
         $fn=~s/(\~|priv\/)(\w+)//;
         $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); 
Line 246  sub handler { Line 250  sub handler {
 # ----------------------------------------------------------- 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>');
Line 254  sub handler { Line 258  sub handler {
   $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>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 {
Removed from v.1.17  
changed lines
  Added in v.1.21

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