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

Diff for /loncom/imspackages/imsimport.pm between versions 1.33 and 1.34

version 1.33, 2010/09/26 02:10:49 version 1.34, 2011/10/24 21:58:04
Line 604  sub display_three { Line 604  sub display_three {
         } else {          } else {
             $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,bulletin board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n");              $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,bulletin board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n");
         }          }
         $r->print('<br /><br />'.$lt{'plsv'}.' '.$lt{'tseq'}.'<br /><br />'.$lt{'tfin'}.'<br /><br /><a href="/priv/'.$uname.'/'.$newdir.'">'.$lt{'disp'}.'</a>');          $r->print('<br /><br />'.$lt{'plsv'}.' '.$lt{'tseq'}.'<br /><br />'.$lt{'tfin'}.'<br /><br /><a href="/priv/'.$udom.'/'.$uname.'/'.$newdir.'">'.$lt{'disp'}.'</a>');
         if ($destdir =~ m-^/home/$uname/public_html/-) {          if ($destdir =~ m-^/home/httpd/html/priv/$udom/$uname/-) {
             system (" rm -r -f $destdir/temp");              system (" rm -r -f $destdir/temp");
         }          }
     } elsif ($manifest_result eq 'nomanifest') {      } elsif ($manifest_result eq 'nomanifest') {
Line 684  sub handler { Line 684  sub handler {
 # re-attach user  # re-attach user
 #  #
     if ($env{'form.uploaduname'}) {      if ($env{'form.uploaduname'}) {
         $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'.          $env{'form.filename'}='/priv/'.$dom.'/'.$env{'form.uploaduname'}.'/'.
             $env{'form.filename'};              $env{'form.filename'};
     }      }
     ($uname,$udom)=      ($uname,$udom)=
Line 703  sub handler { Line 703  sub handler {
         $fn=$env{'form.filename'};          $fn=$env{'form.filename'};
         $fn=~s/^https?\:\/\/[^\/]+\///;          $fn=~s/^https?\:\/\/[^\/]+\///;
         $fn=~s/^\///;          $fn=~s/^\///;
         $fn=~s/(\~|priv\/)($LONCAPA::username_re)//;          $fn=~s/(priv\/)($LONCAPA::domain_re)\/($LONCAPA::username_re)//;
         $fn=~s/\/+/\//g;          $fn=~s/\/+/\//g;
     } else {      } else {
         $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.          $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
                        ' unspecified filename for upload', $r->filename);                         ' unspecified filename for upload', $r->filename);
         return HTTP_NOT_FOUND;          return HTTP_NOT_FOUND;
     }      }
     my $zipupload = '/home/'.$uname.'/public_html'.$fn;      my $zipupload = '/home/httpd/html/priv/'.$udom.'/'.$uname.$fn;
     my $pathname = &File::Basename::dirname($fn);      my $pathname = &File::Basename::dirname($fn);
     my $fullpath = '/priv/'.$uname.$pathname;      my $fullpath = '/priv/'.$udom.'/'.$uname.$pathname;
     unless ($pathname eq '/') {      unless ($pathname eq '/') {
         $fullpath .= '/';          $fullpath .= '/';
     }      }
Removed from v.1.33  
changed lines
  Added in v.1.34

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