--- loncom/publisher/lonupload.pm 2008/12/12 02:32:27 1.42 +++ loncom/publisher/lonupload.pm 2010/12/26 03:09:11 1.53 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.42 2008/12/12 02:32:27 raeburn Exp $ +# $Id: lonupload.pm,v 1.53 2010/12/26 03:09:11 raeburn 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 @@ -165,59 +170,74 @@ sub phaseone { } elsif ($mode eq 'imsimport') { $action = '/adm/imsimport'; } + + # Check for file to be uploaded $env{'form.upfile.filename'}=~s/\\/\//g; $env{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/; - if ($env{'form.upfile.filename'}) { - $fn=~s/\/[^\/]+$//; - $fn=~s/([^\/])$/$1\//; - $fn.=$env{'form.upfile.filename'}; - $fn=~s/^\///; - $fn=~s/(\/)+/\//g; - -# Fn is the full path to the destination filename. -# + if (!$env{'form.upfile.filename'}) { + $r->print('

'.&mt('No upload file specified.').'

'); + return; + } + + $fn=~s/\/[^\/]+$//; + $fn=~s/([^\/])$/$1\//; + $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"); + if (!(($fn) && ($fn!~/\/$/))) { + $r->print('

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

'); + return; + } + + # 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.'/' + .'' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title(&mt('File Type')) + .''.&Apache::loncommon::help_open_topic("Uploading_File_Options") + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + ); + $r->print( + '

' + .'' + .'

' + .'
' + ); - &Debug($r, "Filename for upload: $fn"); - if (($fn) && ($fn!~/\/$/)) { - $r->print('
'. - ''. - ''. - ''.&mt('Save uploaded file as [_1]', - "/priv/$uname/". - ''). - '
'. - '
'.&mt('Choose file type:').' -'.&Apache::loncommon::help_open_topic("Uploading_File_Options").' -
-
-'); - $r->print('
'); - # Check for bad extension and warn user - if ($fn=~/\.(\w+)$/ && - (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { + # Check for bad extension and warn user + if ($fn=~/\.(\w+)$/ && + (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { $r->print('

' - .&mt('The extension on this file, [_1], is reserved internally by LON-CAPA.','"'.$1.'"') + .&mt('The extension on this file, [_1], is reserved internally by LON-CAPA.', + ''.$1.'') .'
'.&mt('Please change the extension.') .'

'); - } elsif($fn=~/\.(\w+)$/ && - !defined(&Apache::loncommon::fileembstyle($1))) { + } elsif($fn=~/\.(\w+)$/ && + !defined(&Apache::loncommon::fileembstyle($1))) { $r->print('

' - .&mt('The extension on this file, [_1], is not recognized by LON-CAPA.','"'.$1.'"') + .&mt('The extension on this file, [_1], is not recognized by LON-CAPA.', + ''.$1.'') .'
'.&mt('Please change the extension.') .'

'); - } - } else { - $r->print(''.&mt('Illegal filename.').''); - } - } else { - $r->print(''.&mt('No upload file specified.').''); } } @@ -250,17 +270,22 @@ sub phasetwo { my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp'; my $dirpath=$path.'/'; $dirpath=~s/\/+/\//g; - $output .= &mt('Upload cancelled.').'
'. - &mt('Back to Directory').''; - } elsif ((-e $target) && (!$env{'form.override'})) { - $output .= '
'. - &mt('File [_1] exists. Overwrite?',''.$fn.''). - ''. - ''. - ''. - ''. - ''. - '
'; + $output .= '

'.&mt('Upload cancelled.').'

' + .'

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

'; + } elsif ((-e $target) && (!$env{'form.override'})) { + $output .= '
' + .'

' + .&mt('File [_1] already exists.', + ''.$fn.'') + .'' + .'' + .'' + .'

' + .'' + .' ' + .'

' + .'
'; } else { my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp'; my $dirpath=$path.'/'; @@ -289,31 +314,39 @@ sub check_extension { # Check for bad extension and disallow upload if ($fn=~/\.(\w+)$/ && (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { - $result .= &mt('File [_1] could not be copied.', - ''.$fn.' '). - '

'. - &mt('The extension on this file is reserved internally by LON-CAPA.'). - '

'; + $result .= '

'. + &mt('File [_1] could not be copied.', + ''.$fn.' '). + '
'. + &mt('The extension on this file is reserved internally by LON-CAPA.'). + '

'; } elsif ($fn=~/\.(\w+)$/ && !defined(&Apache::loncommon::fileembstyle($1))) { - $result .= &mt('File [_1] could not be copied.', - ''.$fn.' '). - '

'. - &mt('The extension on this file is not recognized by LON-CAPA.'). - '

'; + $result .= '

'. + &mt('File [_1] could not be copied.', + ''.$fn.' '). + '
'. + &mt('The extension on this file is not recognized by LON-CAPA.'). + '

'; } elsif (-d $target) { - $result .= &mt('File [_1] could not be copied.', - ''.$fn.''). - '

'. - &mt('The target is an existing directory.'). - '

'; + $result .= '

'. + &mt('File [_1] could not be copied.', + ''.$fn.''). + '
'. + &mt('The target is an existing directory.'). + '

'; } elsif (copy($source,$target)) { chmod(0660, $target); # Set permissions to rw-rw---. if ($mode eq 'testbank' || $mode eq 'imsimport') { $returnflag = 'ok'; - $result .= &mt('Your file - [_1] - was uploaded successfully',$fn).'

'; + $result .= '

' + .&mt('Your file - [_1] - was uploaded successfully.', + ''.$fn.'') + .'

'; } else { - $result .= &mt('File copied.').'
'; + $result .= '

' + .&mt('File copied.') + .'

'; } # Check for embedded objects. my (%allfiles,%codebase); @@ -322,53 +355,105 @@ sub check_extension { my (%allfiles,%codebase); &Apache::lonnet::extract_embedded_items($target,\%allfiles,\%codebase); if (keys(%allfiles) > 0) { - my $state = < - - - - -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).','','').'

'; + } + } + } } } } if (($mode ne 'imsimport') && ($mode ne 'testbank')) { - $result .= '
'. - &mt('View file').''; + $result .= '
'. + &mt('View file').''; } } else { $result .= &mt('Failed to copy: [_1].',$!); } if ($mode ne 'imsimport' && $mode ne 'testbank') { - $result .= '
'. - &mt('Back to Directory').'
'; + $result .= '
'. + &mt('Back to Directory').'
'; } return ($result,$returnflag); } 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/'.$uname.'/public_html'; + my $url_root = '/priv/'.$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 $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; } @@ -421,7 +506,7 @@ function verifyForm() { my $fn; if ($env{'form.filename'}) { $fn=$env{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+\///; + $fn=~s/^https?\:\/\/[^\/]+\///; $fn=~s/^\///; $fn=~s{(~|priv/)($LONCAPA::username_re)}{}; $fn=~s/\/+/\//g; @@ -440,16 +525,29 @@ function verifyForm() { $javascript = "\n"; + # Breadcrumbs + my $brcrum = [{'href' => &Apache::loncommon::authorspace(), + 'text' => 'Construction Space'}, + {'href' => '/adm/upload', + 'text' => 'Upload file to Construction Space'}]; $r->print(&Apache::loncommon::start_page('Upload file to Construction Space', - $javascript)); + $javascript, + {'bread_crumbs' => $brcrum,}) + .&Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()) + ); if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { - $r->print('

'.&mt('Co-Author').': '.$uname. - &mt(' at ').$udom.'

'); + $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);