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

Diff for /loncom/publisher/lonupload.pm between versions 1.2 and 1.3

version 1.2, 2001/04/10 01:57:28 version 1.3, 2001/05/25 16:36:36
Line 15 Line 15
 #  #
 # 03/31,04/03 Gerd Kortemeyer)  # 03/31,04/03 Gerd Kortemeyer)
 #  #
 # 04/05,04/09 Gerd Kortemeyer  # 04/05,04/09,05/25 Gerd Kortemeyer
   
 package Apache::lonupload;  package Apache::lonupload;
   
Line 23  use strict; Line 23  use strict;
 use Apache::File;  use Apache::File;
 use File::Copy;  use File::Copy;
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
   use Apache::loncacc;
   
 sub upfile_store {  sub upfile_store {
     my $r=shift;      my $r=shift;
Line 49  sub phaseone { Line 49  sub phaseone {
     $fn=~s/\/[^\/]+$//;      $fn=~s/\/[^\/]+$//;
     $fn=~s/([^\/])$/$1\//;      $fn=~s/([^\/])$/$1\//;
     $fn.=$ENV{'form.upfile.filename'};      $fn.=$ENV{'form.upfile.filename'};
     $r->print(      $fn=~s/^\///;
       $fn=~s/(\/)+/\//g;
   
       if (($fn) && ($fn!~/\/$/)) {
         $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="'.&upfile_store.'">'.   '<input type=hidden name=datatoken value="'.&upfile_store.'">'.
  'Store uploaded file as '.   'Store uploaded file as '.
  '<input type=text size=50 name=filename value="'.$fn.'"><br>'.   '<input type=text size=50 name=filename value="/priv/'.
     $uname.'/'.$fn.'"><br>'.
  '<input type=submit value="Store"></form>');   '<input type=submit value="Store"></form>');
     } else {
         $r->print('<font color=red>Illegal filename.</font>');
     }
 }  }
   
 sub phasetwo {  sub phasetwo {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     my $target='/home/'.$uname.'/public_html'.$fn;      my $tfn=$fn;
       $tfn=~s/^\/(\~|priv)\/(\w+)//;
       my $target='/home/'.$uname.'/public_html'.$tfn;
     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')) {
Line 76  sub phasetwo { Line 86  sub phasetwo {
                              '/tmp/'.$datatoken.'.tmp';                               '/tmp/'.$datatoken.'.tmp';
            if (copy($source,$target)) {             if (copy($source,$target)) {
       $r->print('File copied.');        $r->print('File copied.');
               $r->print('<p><font size=+2><a href="/priv/'.$uname.$fn.                $r->print('<p><font size=+2><a href="'.$fn.
                         '">View file</a></font>');                          '">View file</a></font>');
    } else {     } else {
               $r->print('Failed to copy: '.$!);                $r->print('Failed to copy: '.$!);
Line 93  sub handler { Line 103  sub handler {
   
   my $r=shift;    my $r=shift;
   
     my $uname;
     my $udom;
   
     unless (($uname,$udom)=
       &Apache::loncacc::constructaccess(
                $ENV{'form.filename'},$r->dir_config('lonDefDomain'))) {
        $r->log_reason($uname.' at '.$udom.
            ' trying to publish file '.$ENV{'form.filename'}.
            ' - not authorized', 
            $r->filename); 
        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\:\/\/[^\/]+\/\~(\w+)//;        $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//;
   } 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 106  sub handler { Line 129  sub handler {
   
 # ----------------------------------------------------------- Start page output  # ----------------------------------------------------------- Start page output
   
   my $uname=$ENV{'user.name'};  
   my $udom=$ENV{'user.domain'};  
   
   $r->content_type('text/html');    $r->content_type('text/html');
   $r->send_http_header;    $r->send_http_header;
Line 119  sub handler { Line 140  sub handler {
   
       
   $r->print('<h1>Upload file to Construction Space</h1>');    $r->print('<h1>Upload file to Construction Space</h1>');
     
     if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
             $r->print('<h3><font color=red>Co-Author: '.$uname.' 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);
Removed from v.1.2  
changed lines
  Added in v.1.3

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