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

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

version 1.51, 2010/11/28 00:04:10 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);
Line 538  function verifyForm() { Line 538  function verifyForm() {
     );      );
       
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {      if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
         $r->print('<p class="LC_warning">'          $r->print('<p class="LC_info">'
                  .&mt('Co-Author [_1]',$uname.':'.$udom)                   .&mt('Co-Author [_1]',$uname.':'.$udom)
                  .'</p>'                   .'</p>'
         );          );
Line 547  function verifyForm() { Line 547  function verifyForm() {
         my $output = &phasefour($r,$fn,$uname,$udom,'author');          my $output = &phasefour($r,$fn,$uname,$udom,'author');
         $r->print($output);          $r->print($output);
     } elsif ($env{'form.phase'} eq 'three') {      } elsif ($env{'form.phase'} eq 'three') {
         my $output = &phasethree($r,$fn,$uname,$udom,'author');          my ($output,$rtnflag) = &phasethree($r,$fn,$uname,$udom,'author');
         $r->print($output);          $r->print($output);
     } elsif ($env{'form.phase'} eq 'two') {      } elsif ($env{'form.phase'} eq 'two') {
  my ($output,$returnflag) = &phasetwo($r,$fn,$uname,$udom);   my ($output,$returnflag) = &phasetwo($r,$fn,$uname,$udom);
Removed from v.1.51  
changed lines
  Added in v.1.54

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