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

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

version 1.12, 2002/08/08 02:30:39 version 1.15, 2003/02/03 18:03:53
Line 44 Line 44
 #  #
 # 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer  # 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer
 # 11/29 Matthew Hall  # 11/29 Matthew Hall
 # 12/16 Scott Harrison  
 #  #
 ###  ###
   
Line 53  package Apache::lonupload; Line 52  package Apache::lonupload;
 use strict;  use strict;
 use Apache::File;  use Apache::File;
 use File::Copy;  use File::Copy;
   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::Log();
   use Apache::lonnet;
   use HTML::Entities();
   
 my $DEBUG=0;  my $DEBUG=0;
   
Line 104  sub phaseone { Line 106  sub phaseone {
     $fn.=$ENV{'form.upfile.filename'};      $fn.=$ENV{'form.upfile.filename'};
     $fn=~s/^\///;      $fn=~s/^\///;
     $fn=~s/(\/)+/\//g;      $fn=~s/(\/)+/\//g;
     $fn=~s/%20/ /g;  
   #    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(
Line 143  sub phaseone { Line 148  sub phaseone {
   
 sub phasetwo {  sub phasetwo {
    my ($r,$fn,$uname,$udom)=@_;     my ($r,$fn,$uname,$udom)=@_;
    if ($fn=~/^\/priv\/$uname\//) {      &Debug($r, "Filename is ".$fn);
      if ($fn=~/^\/priv\/$uname\//) {
       &Debug($r, "Filename after priv substitution: ".$fn);
     my $tfn=$fn;      my $tfn=$fn;
     $tfn=~s/^\/(\~|priv)\/(\w+)//;      $tfn=~s/^\/(\~|priv)\/(\w+)//;
       &Debug($r, "Filename for tfn = ".$tfn);
     my $target='/home/'.$uname.'/public_html'.$tfn;      my $target='/home/'.$uname.'/public_html'.$tfn;
       &Debug($r, "target -> ".$target);
   #     target is the full filesystem path of the destination file.
       my $base = &File::Basename::basename($fn);
       my $path = &File::Basename::dirname($fn);
       $base    = &HTML::Entities::encode($base);
       my $url  = $path."/".$base; 
       &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')) {
Line 154  sub phasetwo { Line 169  sub phasetwo {
  '<form action=/adm/upload method=post>'.   '<form action=/adm/upload method=post>'.
  'File <tt>'.$fn.'</tt> exists. Overwrite? '.   'File <tt>'.$fn.'</tt> exists. Overwrite? '.
  '<input type=hidden name=phase value=two>'.   '<input type=hidden name=phase value=two>'.
  '<input type=hidden name=filename value="'.$fn.'">'.   '<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="Yes"></form>');
        } else {         } else {
Line 178  sub phasetwo { Line 193  sub phasetwo {
    } 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('File copied.');
               $r->print('<p><font size=+2><a href="'.$fn.                $r->print('<p><font size=+2><a href="'.$url.
                         '">View file</a></font>');                          '">View file</a></font>');
    } else {     } else {
               $r->print('Failed to copy: '.$!);                $r->print('Failed to copy: '.$!);
Removed from v.1.12  
changed lines
  Added in v.1.15

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