Diff for /loncom/publisher/lonupload.pm between versions 1.59 and 1.61

version 1.59, 2011/11/14 00:20:31 version 1.61, 2012/10/29 17:38:55
Line 125  use Apache::File; Line 125  use Apache::File;
 use File::Copy;  use File::Copy;
 use File::Basename;  use File::Basename;
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
Line 446  sub phasefour { Line 445  sub phasefour {
     my $dir_root = $r->dir_config('lonDocRoot').$url_root;      my $dir_root = $r->dir_config('lonDocRoot').$url_root;
     my $path = &File::Basename::dirname($fn);      my $path = &File::Basename::dirname($fn);
     $path =~ s{^\Q$url_root\E}{};      $path =~ s{^\Q$url_root\E}{};
     $result .= &Apache::loncommon::modify_html_refs($mode,$path,      my $outcome = 
                               $uname,$udom,$dir_root);          &Apache::loncommon::modify_html_refs($mode,$path,$uname,$udom,$dir_root);
       $result .= $outcome;
     if ($mode ne 'imsimport' && $mode ne 'testbank') {      if ($mode ne 'imsimport' && $mode ne 'testbank') {
         $result .= '<br /><h3><a href="'.$fn.'">'.          $result .= '<br /><h3><a href="'.$fn.'">'.
                   &mt('View main file').'</a></h3>'.                    &mt('View main file').'</a></h3>'.
Line 475  sub handler { Line 475  sub handler {
         return HTTP_NOT_FOUND;          return HTTP_NOT_FOUND;
     }      }
   
     my ($uname,$udom)=&Apache::loncacc::constructaccess($fn);      my ($uname,$udom)=&Apache::lonnet::constructaccess($fn);
   
     unless (($uname) && ($udom)) {      unless (($uname) && ($udom)) {
         $r->log_reason($uname.' at '.$udom.          $r->log_reason($uname.' at '.$udom.

Removed from v.1.59  
changed lines
  Added in v.1.61


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