diff options
Diffstat (limited to 'perl-install/interactive/http.pm')
| -rw-r--r-- | perl-install/interactive/http.pm | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm index ea2ae1311..70017c41d 100644 --- a/perl-install/interactive/http.pm +++ b/perl-install/interactive/http.pm @@ -1,4 +1,4 @@ -package interactive::http; # $Id$ +package interactive::http; use diagnostics; use strict; @@ -13,7 +13,6 @@ use log; my $script_name = $ENV{INTERACTIVE_HTTP}; my $no_header; -my $uid; my $pipe_r = "/tmp/interactive_http_r"; my $pipe_w = "/tmp/interactive_http_w"; @@ -26,8 +25,8 @@ sub open_stdout() { # cont_stdout must be called after open_stdout and before the first print sub cont_stdout { - my ($title) = @_; - print CGI::start_html('-title' => $title) if $no_header; + my ($o_title) = @_; + print CGI::start_html('-title' => $o_title) if $no_header; $no_header = 0; } @@ -42,7 +41,7 @@ sub new { } sub end { - -e $pipe_r or return; # don't run this twice + -e $pipe_r or return; # do not run this twice my $q = CGI->new; cont_stdout("Exit"); print "It's done, thanks for playing", $q->end_html; @@ -75,7 +74,7 @@ sub ask_fromW { $e->{type} = 'list' if $e->{type} =~ /(icon|tree)list/; - #- combo doesn't exist, fallback to a sensible default + #- combo does not exist, fallback to a sensible default $e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo'; if ($e->{type} eq 'bool') { @@ -109,15 +108,14 @@ sub ask_fromW { close STDOUT; # page terminated while (1) { - local *F; - open F, "<$pipe_r" or die; - $q = CGI->new(*F); + open(my $F, "<$pipe_r") or die; + $q = CGI->new($F); $q->param('force_exit_dead_prog') and $o->exit; last if $q->param('uid') == $uid; open_stdout(); # re-open for writing cont_stdout(N("Error")); - print $q->h1(N("Error")), $q->p("Sorry, you can't go back"); + print $q->h1(N("Error")), $q->p("Sorry, you cannot go back"); goto redisplay; } each_index { @@ -138,15 +136,15 @@ sub p { } sub wait_messageW { - my ($_o, $_title, $messages) = @_; + my ($_o, $_title, $message, $message_modifiable) = @_; cont_stdout(); print "\n" . CGI::p(); - p(@$messages); + p($message, $message_modifiable); } sub wait_message_nextW { - my ($_o, $messages, $_w) = @_; - p(@$messages); + my ($_o, $message, $_w) = @_; + p($message); } sub wait_message_endW { my ($_o, $_w) = @_; |