From: Kirrily R. <sk...@us...> - 2001-10-10 18:34:31
|
Update of /cvsroot/formmagick/formmagick/lib/CGI In directory usw-pr-cvs1:/tmp/cvs-serv8289/lib/CGI Modified Files: FormMagick.pm Log Message: This and that. Cleaned up teh logic for calling various events and printing the pages. Index: FormMagick.pm =================================================================== RCS file: /cvsroot/formmagick/formmagick/lib/CGI/FormMagick.pm,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -r1.72 -r1.73 *** FormMagick.pm 2001/10/10 18:06:15 1.72 --- FormMagick.pm 2001/10/10 18:34:28 1.73 *************** *** 238,247 **** } - # we ALWAYS do the page pre-event on the new page - $self->page_pre_event(); - $self->print_form_header(); ! $self->print_rest_of_page(); } --- 238,252 ---- } $self->print_form_header(); ! if ($self->finished()) { ! $self->validate_all(); ! $self->form_post_event(); ! } else { ! $self->page_pre_event(); ! $self->print_page(); ! } ! ! $self->print_form_footer(); } *************** *** 525,544 **** } } - } - - sub print_rest_of_page { - my ($self) = @_; - # if we're finished with the form, do form-ending things - if ($self->finished()) { - $self->validate_all(); - $self->form_post_event(); - } else { # the default: print this page's fields and stuff - $self->print_page_header(); - $self->display_fields(); - $self->print_buttons(); - $self->print_page_footer(); - } - - $self->print_form_footer(); } --- 530,533 ---- |