--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/11/21 18:18:04 1.30 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2009/04/22 17:19:14 1.53 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.30 2003/11/21 18:18:04 albertel Exp $ +# $Id: lonspreadsheet.pm,v 1.53 2009/04/22 17:19:14 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -73,12 +73,12 @@ use HTML::Entities(); sub textfield { my ($title,$name,$value)=@_; return "\n

$title:
". - ''; + ''; } sub hiddenfield { my ($name,$value)=@_; - return ''."\n"; + return ''."\n"; } sub selectbox { @@ -100,9 +100,10 @@ sub file_dialogs { my $message = ''; ## ## Deal with saving the spreadsheet - if ((exists($ENV{'form.save'}) || exists($ENV{'form.makedefault'})) && - exists($ENV{'form.savefilename'})) { - $spreadsheet->filename($ENV{'form.savefilename'}); + $spreadsheet->check_formulas_loaded(); + if ((exists($env{'form.save'}) || exists($env{'form.makedefault'})) && + exists($env{'form.savefilename'})) { + $spreadsheet->filename($env{'form.savefilename'}); my $save_status = $spreadsheet->save(); if ($save_status ne 'ok') { $message .= "An error occurred while saving the spreadsheet". @@ -110,22 +111,22 @@ sub file_dialogs { } else { $message .= "Spreadsheet saved as ".$spreadsheet->filename(); } - } elsif (exists($ENV{'form.newformula'}) && - exists($ENV{'form.cell'}) && - $ENV{'form.cell'} ne '' ) { + } elsif (exists($env{'form.newformula'}) && + exists($env{'form.cell'}) && + $env{'form.cell'} ne '' ) { ## ## Make any requested modifications to the spreadsheet - $spreadsheet->modify_cell($ENV{'form.cell'}, - $ENV{'form.newformula'}); + $spreadsheet->modify_cell($env{'form.cell'}, + $env{'form.newformula'}); $spreadsheet->save_tmp(); # output that we are dealing with a temporary file $result .=&hiddenfield('workcopy',$sheettype); - if ($ENV{'form.newformula'} !~ /^\s*$/) { + if ($env{'form.newformula'} !~ /^\s*$/) { $message .=''. - ''. - '
'.&mt('Cell').' '.$ENV{'form.cell'}.' = 
'.$ENV{'form.newformula'}."
\n"; + '

'.&mt('Cell').' '.$env{'form.cell'}.' = 
'. + '
'.$env{'form.newformula'}."
\n"; } else { - $message .= &mt('Deleted contents of cell').' '.$ENV{'form.cell'}.'.'; + $message .= &mt('Deleted contents of cell').' '.$env{'form.cell'}.'.'; } } ## @@ -139,11 +140,11 @@ sub file_dialogs { if ($spreadsheet->is_default()) { $filename = 'Default'; } - my $save_dialog = ''. + my $save_dialog = ''. ' '. ''. - ''; + ''; my $makedefault_dialog = ''; # @@ -153,9 +154,9 @@ sub file_dialogs { my $load_dialog = < - + - $link + $link   '. - ''); - } + $r->print(''. + ''); if ($allowed_to_view) { $r->print(''. &Apache::loncommon::help_open_topic("Spreadsheet_About", @@ -495,7 +549,7 @@ END # Keep track of the number of times we have been called, sort of. $r->print(&hiddenfield('not_first_run','whatever')); # - if (exists($ENV{'form.not_first_run'}) || $sheettype ne 'classcalc') { + if (exists($env{'form.not_first_run'}) || $sheettype ne 'classcalc') { $r->print($spreadsheet->get_html_title()); if ($allowed_to_view || $allowed_to_edit) { $r->print($spreadsheet->parent_link()); @@ -503,7 +557,8 @@ END $r->rflush(); $spreadsheet->display($r); } - $r->print(''); + $r->print(''.&Apache::loncommon::end_page()); + $spreadsheet->clear_package(); return OK; }