Diff for /loncom/publisher/lonupload.pm between versions 1.53 and 1.54

version 1.53, 2010/12/26 03:09:11 version 1.54, 2011/10/23 23:46:07
Line 256  sub phasetwo { Line 256  sub phasetwo {
     &Debug($r, "Filename is ".$tfn);      &Debug($r, "Filename is ".$tfn);
     if ($tfn) {      if ($tfn) {
  &Debug($r, "Filename for tfn = ".$tfn);   &Debug($r, "Filename for tfn = ".$tfn);
  my $target='/home/'.$uname.'/public_html'.$tfn;   my $target='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$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);
Line 407  sub phasethree { Line 407  sub phasethree {
     } elsif ($mode eq 'imsimport') {      } elsif ($mode eq 'imsimport') {
         $action = '/adm/imsimport';          $action = '/adm/imsimport';
     }      }
     my $dir_root = '/home/'.$uname.'/public_html';      my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;
     my $url_root = '/priv/'.$uname;      my $url_root = '/priv/'.$udom.'/'.$uname;
     my $path = &File::Basename::dirname($fn);      my $path = &File::Basename::dirname($fn);
     my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"');      my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"');
     my $state = &embedded_form_elems('modify_orightml',$filename,$mode).      my $state = &embedded_form_elems('modify_orightml',$filename,$mode).
Line 444  sub phasefour { Line 444  sub phasefour {
         $action = '/adm/imsimport';          $action = '/adm/imsimport';
     }      }
     my $result;      my $result;
     my $dir_root = '/home/'.$uname.'/public_html';      my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;
     my $url_root = '/priv/'.$uname;      my $url_root = '/priv/'.$udom.'/'.$uname;
     my $path = &File::Basename::dirname($fn);      my $path = &File::Basename::dirname($fn);
     $result .= &Apache::loncommon::modify_html_refs($mode,$path,      $result .= &Apache::loncommon::modify_html_refs($mode,$path,
                               $uname,$udom,$dir_root);                                $uname,$udom,$dir_root);

Removed from v.1.53  
changed lines
  Added in v.1.54


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