--- loncom/publisher/lonupload.pm 2010/02/16 10:26:17 1.49 +++ loncom/publisher/lonupload.pm 2011/10/26 22:38:49 1.55 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.49 2010/02/16 10:26:17 bisitz Exp $ +# $Id: lonupload.pm,v 1.55 2011/10/26 22:38:49 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -70,7 +70,7 @@ Start page output =item * -output relevant interface phase (phaseone or phasetwo or phasethree) +output relevant interface phase (phaseone, phasetwo, phasethree or phasefour) =item * @@ -99,6 +99,11 @@ as overwriting an existing file). Interface for handling secondary uploads of embedded objects in an html file. +=item phasefour() + +Interface for handling optional renaming of links to embedded +objects. + =item upfile_store() Store contents of uploaded file into temporary space. Invoked @@ -174,12 +179,9 @@ sub phaseone { return; } - $fn=~s/\/[^\/]+$//; - $fn=~s/([^\/])$/$1\//; + # Append the name of the uploaded file $fn.=$env{'form.upfile.filename'}; - $fn=~s/^\///; $fn=~s/(\/)+/\//g; - # Fn is the full path to the destination filename. # Check for illegal filename &Debug($r, "Filename for upload: $fn"); @@ -187,20 +189,21 @@ sub phaseone { $r->print('

'.&mt('Illegal filename.').'

'); return; } - +# Split part that I can change from the part that I cannot change + my ($fn1,$fn2)=($fn=~/^(\/priv\/[^\/]+\/[^\/]+\/)(.*)$/); # Display additional options for upload # and upload button $r->print( '
' .'' .'' - .'' ); $r->print( &Apache::lonhtmlcommon::start_pick_box() .&Apache::lonhtmlcommon::row_title(&mt('Save uploaded file as')) - .'/priv/'.$uname.'/' - .'' + .''.$fn1.'' + .'' + .'' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title(&mt('File Type')) .' - - - -STATE - $result .= "

".&mt("Reference Warning")."

". - "

".&mt("Completed upload of the file. This file contained references to other files.")."

". - "

".&mt("Please select the locations from which the referenced files are to be uploaded.")."

". - &Apache::loncommon::ask_for_embedded_content($action,$state,\%allfiles,\%codebase, - {'error_on_invalid_names' => 1, - 'ignore_remote_references' => 1,}); - if ($mode eq 'testbank') { - $returnflag = 'embedded'; - $result .= '

'.&mt('Or [_1]continue[_2] the testbank import without these files','','').'

'; + my ($currentpath) = ($url =~ m{^(.+)/[^/]+$}); + my $state = &embedded_form_elems('upload_embedded',$url,$mode); + my ($embedded,$num,$pathchg) = + &Apache::loncommon::ask_for_embedded_content($action,$state,\%allfiles, + \%codebase, + {'error_on_invalid_names' => 1, + 'ignore_remote_references' => 1, + 'current_path' => $currentpath}); + if ($embedded) { + $result .= '

'.&mt('Reference Warning').'

'; + if ($num) { + $result .= '

'.&mt('Completed upload of the file.').' '.&mt('This file contained references to other files.').'

'. + '

'.&mt('Please select the locations from which the referenced files are to be uploaded.').'

'. + $embedded; + if ($mode eq 'testbank') { + $returnflag = 'embedded'; + $result .= '

'.&mt('Or [_1]continue[_2] the testbank import without these files.','','').'

'; + } + } else { + $result .= '

'.&mt('Completed upload of the file.').'

'.$embedded; + if ($pathchg) { + if ($mode eq 'testbank') { + $returnflag = 'embedded'; + $result .= '

'.&mt('Or [_1]continue[_2] the testbank import without modifying the references(s).','','').'

'; + } + } + } } } } @@ -385,18 +397,61 @@ STATE sub phasethree { my ($r,$fn,$uname,$udom,$mode) = @_; + + my $action = '/adm/upload'; + if ($mode eq 'testbank') { + $action = '/adm/testbank'; + } elsif ($mode eq 'imsimport') { + $action = '/adm/imsimport'; + } + my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname; + my $url_root = '/priv/'.$udom.'/'.$uname; + my $path = &File::Basename::dirname($fn); + my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"'); + my $state = &embedded_form_elems('modify_orightml',$filename,$mode). + ''; + my ($result,$returnflag) = + &Apache::loncommon::upload_embedded($mode,$path,$uname,$udom, + $dir_root,$url_root,undef, + undef,undef,$state,$action); + if ($mode ne 'imsimport' && $mode ne 'testbank') { + $result .= '

'. + &mt('View main file').'

'. + '

'. + &mt('Back to Directory').'


'; + } + return ($result,$returnflag); +} + +sub embedded_form_elems { + my ($action,$filename,$mode) = @_; + return < + + +STATE +} + +sub phasefour { + my ($r,$fn,$uname,$udom,$mode) = @_; + + my $action = '/adm/upload'; + if ($mode eq 'testbank') { + $action = '/adm/testbank'; + } elsif ($mode eq 'imsimport') { + $action = '/adm/imsimport'; + } my $result; - my $dir_root = '/home/'.$uname.'/public_html'; - my $url_root = '/priv/'.$uname; - my $base = &File::Basename::basename($fn); + my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname; + my $url_root = '/priv/'.$udom.'/'.$uname; my $path = &File::Basename::dirname($fn); - $result = &Apache::loncommon::upload_embedded($mode,$path,$uname,$udom, - $dir_root,$url_root); + $result .= &Apache::loncommon::modify_html_refs($mode,$path, + $uname,$udom,$dir_root); if ($mode ne 'imsimport' && $mode ne 'testbank') { - $result = '
'. - &mt('View main file').''. - '
'. - &mt('Back to Directory').'
'; + $result .= '

'. + &mt('View main file').'

'. + '

'. + &mt('Back to Directory').'


'; } return $result; } @@ -409,12 +464,18 @@ sub handler { my $uname; my $udom; my $javascript = ''; -# -# phase two: re-attach user -# - if ($env{'form.uploaduname'}) { - $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'. - $env{'form.filename'}; + + my $fn=$env{'form.filename'}; + + if ($env{'form.filename1'}) { + $fn=$env{'form.filename1'}.$env{'form.filename2'}; + } + $fn=~s/\/+/\//g; + + unless ($fn) { + $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. + ' unspecified filename for upload', $r->filename); + return HTTP_NOT_FOUND; } unless ($env{'form.phase'} eq 'two') { @@ -434,9 +495,7 @@ function verifyForm() { } |; } - ($uname,$udom)= - &Apache::loncacc::constructaccess($env{'form.filename'}, - $r->dir_config('lonDefDomain')); + ($uname,$udom)=&Apache::loncacc::constructaccess($fn); unless (($uname) && ($udom)) { $r->log_reason($uname.' at '.$udom. @@ -446,19 +505,6 @@ function verifyForm() { return HTTP_NOT_ACCEPTABLE; } - my $fn; - if ($env{'form.filename'}) { - $fn=$env{'form.filename'}; - $fn=~s/^https?\:\/\/[^\/]+\///; - $fn=~s/^\///; - $fn=~s{(~|priv/)($LONCAPA::username_re)}{}; - $fn=~s/\/+/\//g; - } else { - $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. - ' unspecified filename for upload', $r->filename); - return HTTP_NOT_FOUND; - } - # ----------------------------------------------------------- Start page output @@ -481,14 +527,16 @@ function verifyForm() { ); if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { - $r->print('

' + $r->print('

' .&mt('Co-Author [_1]',$uname.':'.$udom) .'

' ); } - - if ($env{'form.phase'} eq 'three') { - my $output = &phasethree($r,$fn,$uname,$udom,'author'); + if ($env{'form.phase'} eq 'four') { + my $output = &phasefour($r,$fn,$uname,$udom,'author'); + $r->print($output); + } elsif ($env{'form.phase'} eq 'three') { + my ($output,$rtnflag) = &phasethree($r,$fn,$uname,$udom,'author'); $r->print($output); } elsif ($env{'form.phase'} eq 'two') { my ($output,$returnflag) = &phasetwo($r,$fn,$uname,$udom);