--- loncom/publisher/lonupload.pm 2004/03/31 05:24:00 1.26 +++ loncom/publisher/lonupload.pm 2006/04/10 22:30:31 1.32 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.26 2004/03/31 05:24:00 albertel Exp $ +# $Id: lonupload.pm,v 1.32 2006/04/10 22:30:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,42 +37,35 @@ use File::Basename; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; use Apache::loncommon(); -use Apache::Log(); use Apache::lonnet; use HTML::Entities(); use Apache::lonlocal; +use Apache::lonnet; my $DEBUG=0; sub Debug { - - # Marshall the parameters. - - my $r = shift; - my $log = $r->log; - my $message = shift; - - # Put out the indicated message butonly if DEBUG is false. - + # Put out the indicated message but only if DEBUG is true. if ($DEBUG) { - $log->debug($message); + my ($r,$message) = @_; + $r->log_reason($message); } } sub upfile_store { my $r=shift; - my $fname=$ENV{'form.upfile.filename'}; + my $fname=$env{'form.upfile.filename'}; $fname=~s/\W//g; - chomp($ENV{'form.upfile'}); + chomp($env{'form.upfile'}); - my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}. + my $datatoken=$env{'user.name'}.'_'.$env{'user.domain'}. '_upload_'.$fname.'_'.time.'_'.$$; { my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons'). '/tmp/'.$datatoken.'.tmp'); - print $fh $ENV{'form.upfile'}; + print $fh $env{'form.upfile'}; } return $datatoken; } @@ -86,12 +79,12 @@ sub phaseone { } elsif ($mode eq 'imsimport') { $action = '/adm/imsimport'; } - $ENV{'form.upfile.filename'}=~s/\\/\//g; - $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/; - if ($ENV{'form.upfile.filename'}) { + $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.=$env{'form.upfile.filename'}; $fn=~s/^\///; $fn=~s/(\/)+/\//g; @@ -100,7 +93,7 @@ sub phaseone { &Debug($r, "Filename for upload: $fn"); if (($fn) && ($fn!~/\/$/)) { - $r->print('
'. + $r->print(''. ''. ''. @@ -168,9 +161,9 @@ sub phasetwo { $base = &HTML::Entities::encode($base,'<>&"'); my $url = $path."/".$base; &Debug($r, "URL is now ".$url); - my $datatoken=$ENV{'form.datatoken'}; + my $datatoken=$env{'form.datatoken'}; if (($fn) && ($datatoken)) { - if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) { + if ((-e $target) && ($env{'form.override'} ne 'Yes')) { $r->print(''. &mt('File').' '.$fn.' '. &mt('exists. Overwrite?').' '. @@ -180,6 +173,8 @@ sub phasetwo { '
'); } else { my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp'; + my $dirpath=$path.'/'; + $dirpath=~s/\/+/\//g; # Check for bad extension and disallow upload if ($fn=~/\.(\w+)$/ && (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { @@ -188,7 +183,7 @@ sub phasetwo { ''. &mt('The extension on this file is reserved internally by LON-CAPA.'). ''); - $r->print('
'. + $r->print('
'. &mt('Back to Directory').''); } elsif ($fn=~/\.(\w+)$/ && !defined(&Apache::loncommon::fileembstyle($1))) { @@ -197,14 +192,14 @@ sub phasetwo { ''. &mt('The extension on this file is not recognized by LON-CAPA.'). ''); - $r->print('
'. + $r->print('
'. &mt('Back to Directory').''); } elsif (-d $target) { $r->print('File '.$fn.' could not be copied.
'. ''. &mt('The target is an existing directory.'). '
'); - $r->print(''. + $r->print(''. &mt('Back to Directory').''); } elsif (copy($source,$target)) { chmod(0660, $target); # Set permissions to rw-rw---. @@ -215,7 +210,7 @@ sub phasetwo { $r->print(&mt('File copied.')); $r->print('
'. &mt('View file').''); - $r->print('
'. + $r->print('
'. &mt('Back to Directory').'
'); } } else { @@ -248,32 +243,45 @@ sub handler { # # phase two: re-attach user # - if ($ENV{'form.uploaduname'}) { - $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'. - $ENV{'form.filename'}; - } + if ($env{'form.uploaduname'}) { + $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'. + $env{'form.filename'}; + } + + unless ($env{'form.phase'} eq 'two') { + my %body_layout = ('rightmargin' => "0", + 'leftmargin' => "0", + 'marginwidth' => "0", + 'topmargin' => "0", + 'marginheight' => "0"); + my $start_page = + &Apache::loncommon::start_page('Importing a Testbank file into LON-CAPA', + undef, + {'only_body' => 1, + 'add_entries' => \%body_layout, + 'js_ready' => 1,}); + my $end_page = + &Apache::loncommon::end_page({'js_ready' => 1,}); - unless ($ENV{'form.phase'} eq 'two') { $javascript = qq| function verifyForm() { - var mode = document.forms[0].filetype.options[document.forms[0].filetype.selectedIndex].value + var mode = document.fileupload.filetype.options[document.fileupload.filetype.selectedIndex].value if (mode == "testbank") { - document.forms[0].action = "/adm/testbank"; + document.fileupload.action = "/adm/testbank"; } if (mode == "imsimport") { - document.forms[0].action = "/adm/imsimport"; + document.fileupload.action = "/adm/imsimport"; } if (mode == "standard") { - document.forms[0].action = "/adm/upload"; + document.fileupload.action = "/adm/upload"; } - document.forms[0].submit(); + document.fileupload.submit(); } function testbankWin() { newWindow = window.open("","testbankinfo","HEIGHT=400,WIDTH=750,scrollbars=yes") newWindow.document.open() - newWindow.document.write("'Importing a Testbank file into LON-CAPA\\n") - newWindow.document.write("\\n") + newWindow.document.write('$start_page') newWindow.document.write("[Author Header]\\n") newWindow.document.write("\\n") newWindow.document.write("\\n") @@ -285,32 +293,33 @@ function testbankWin() { newWindow.document.write("
  • Multiple choice and multiple answer correct questions should consist of (i) the question number followed by (ii) a question stem beginning on the same line and (iii) two or more foils, with each foil beginning on a new line and prefixed by a unique letter, or Roman numeral, listed in alphabetic or numeric order, beginning at a (alphabetic) or i (Roman numeral), followed by a period, or enclosed in parentheses, i.e., a., (a), i., or (i) .
    • ") newWindow.document.write("
  • If fill-in-the-blank or multiple answer questions have more than one correct answer, each answer should appear in a comma-, tab-, space-, or new line-delimited list.
    • ") newWindow.document.write("\\n") - newWindow.document.write("
      
    ") + newWindow.document.write("") + newWindow.document.write('$end_page') newWindow.document.close() newWindow.focus() } |; } ($uname,$udom)= - &Apache::loncacc::constructaccess($ENV{'form.filename'}, + &Apache::loncacc::constructaccess($env{'form.filename'}, $r->dir_config('lonDefDomain')); unless (($uname) && ($udom)) { $r->log_reason($uname.' at '.$udom. - ' trying to publish file '.$ENV{'form.filename'}. + ' trying to publish file '.$env{'form.filename'}. ' - not authorized', $r->filename); return HTTP_NOT_ACCEPTABLE; } my $fn; - if ($ENV{'form.filename'}) { - $fn=$ENV{'form.filename'}; + if ($env{'form.filename'}) { + $fn=$env{'form.filename'}; $fn=~s/^http\:\/\/[^\/]+\///; $fn=~s/^\///; $fn=~s/(\~|priv\/)(\w+)//; $fn=~s/\/+/\//g; } 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); return HTTP_NOT_FOUND; } @@ -321,22 +330,24 @@ function testbankWin() { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print("LON-CAPA Construction Space\n"); + $javascript = "\n"; - $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space')); + $r->print(&Apache::loncommon::start_page('Upload file to Construction Space', + $javascript)); - if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { + if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { $r->print('

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

    '); } - if ($ENV{'form.phase'} eq 'two') { + if ($env{'form.phase'} eq 'two') { &phasetwo($r,$fn,$uname,$udom); } else { &phaseone($r,$fn,$uname,$udom); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }