Diff for /loncom/publisher/lonupload.pm between versions 1.55 and 1.56

version 1.55, 2011/10/26 22:38:49 version 1.56, 2011/10/31 01:28:47
Line 404  sub phasethree { Line 404  sub phasethree {
     } elsif ($mode eq 'imsimport') {      } elsif ($mode eq 'imsimport') {
         $action = '/adm/imsimport';          $action = '/adm/imsimport';
     }      }
     my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;      my $url_root = "/priv/$udom/$uname";
       my $dir_root = $r->dir_config('lonDocRoot').$url_root;
     my $url_root = '/priv/'.$udom.'/'.$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'},'<>&"');
Line 442  sub phasefour { Line 443  sub phasefour {
         $action = '/adm/imsimport';          $action = '/adm/imsimport';
     }      }
     my $result;      my $result;
     my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;      my $url_root = "/priv/$udom/$uname";
     my $url_root = '/priv/'.$udom.'/'.$uname;      my $dir_root = $r->dir_config('lonDocRoot').$url_root;
     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.55  
changed lines
  Added in v.1.56


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