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

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

version 1.55, 2011/10/26 22:38:49 version 1.57, 2011/11/02 14:40:16
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 $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);
     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 442  sub phasefour { Line 442  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);
Line 461  sub handler { Line 461  sub handler {
   
     my $r=shift;      my $r=shift;
   
     my $uname;      my ($uname,$udom);
     my $udom;  
     my $javascript = '';      my $javascript = '';
   
     my $fn=$env{'form.filename'};      my $fn=$env{'form.filename'};
Removed from v.1.55  
changed lines
  Added in v.1.57

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