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

Diff for /loncom/publisher/lonupload.pm between versions 1.15 and 1.18

version 1.15, 2003/02/03 18:03:53 version 1.18, 2003/08/04 17:45:06
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 83  sub upfile_store { Line 64  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 97  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.'">'.
    '<input type=hidden name=uploaduname value="'.$uname.'">'.
  'Store uploaded file as '.   'Store uploaded file as '.
  '<input type=text size=50 name=filename value="/priv/'.   '<input type=text size=50 name=filename value="'.$fn.'"><br>'.
   $uname.'/'.$fn.'"><br>'.  
  '<input type=submit value="Store"></form>');   '<input type=submit value="Store"></form>');
       # Check for bad extension and warn user        # Check for bad extension and warn user
       if ($fn=~/\.(\w+)$/ &&         if ($fn=~/\.(\w+)$/ && 
Line 147  sub phaseone { Line 128  sub phaseone {
 }  }
   
 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 195  sub phasetwo { Line 175  sub phasetwo {
       $r->print('File copied.');        $r->print('File copied.');
               $r->print('<p><font size=+2><a href="'.$url.                $r->print('<p><font size=+2><a href="'.$url.
                         '">View file</a></font>');                          '">View file</a></font>');
                 $r->print('<p><font size=+2><a href="'.$path.
                           '">Back to Directory</a></font>');
    } else {     } else {
               $r->print('Failed to copy: '.$!);                $r->print('Failed to copy: '.$!);
    }     }
Line 218  sub handler { Line 200  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 231  sub handler { Line 221  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 249  sub handler { Line 241  sub handler {
   
   $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>Co-Author: '.$uname.' at '.$udom.
Removed from v.1.15  
changed lines
  Added in v.1.18

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