[popfile-commit] engine/UI HTML.pm,1.184,1.185 HTTP.pm,1.9,1.10

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv6124/UI

Modified Files:
	HTML.pm HTTP.pm 
Log Message:
parse_form__ should be protected not private

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** HTML.pm	26 Jul 2003 18:28:28 -0000	1.184
--- HTML.pm	26 Jul 2003 23:52:44 -0000	1.185
***************
*** 348,352 ****
      if ( $command =~ /GET/i ) {
          if ( $url =~ s/\?(.*)// )  {
!             $self->parse_form__( $1 );
          }
      }
--- 348,352 ----
      if ( $command =~ /GET/i ) {
          if ( $url =~ s/\?(.*)// )  {
!             $self->parse_form_( $1 );
          }
      }
***************
*** 358,362 ****
      if ( $command =~ /POST/i ) {
          $content =~ s/[\r\n]//g;
!         $self->parse_form__( $content );
      }
  
--- 358,362 ----
      if ( $command =~ /POST/i ) {
          $content =~ s/[\r\n]//g;
!         $self->parse_form_( $content );
      }
  
***************
*** 391,395 ****
                  $url = $self->{form_}{redirect};
                  if ( $url =~ s/\?(.*)// )  {
!                     $self->parse_form__( $1 );
                  }
              } else {
--- 391,395 ----
                  $url = $self->{form_}{redirect};
                  if ( $url =~ s/\?(.*)// )  {
!                     $self->parse_form_( $1 );
                  }
              } else {
***************
*** 421,425 ****
              if ( $k ne 'session' ) {
  
!                 # If we are dealing with an array of values (see parse_form__
                  # for details) then we need to unpack it into separate entries),
                  # we ignore non-array values since all values have an array equivalent
--- 421,425 ----
              if ( $k ne 'session' ) {
  
!                 # If we are dealing with an array of values (see parse_form_
                  # for details) then we need to unpack it into separate entries),
                  # we ignore non-array values since all values have an array equivalent

Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HTTP.pm	26 Jul 2003 18:28:28 -0000	1.9
--- HTTP.pm	26 Jul 2003 23:52:44 -0000	1.10
***************
*** 187,196 ****
  # $content    Any non-header data in the HTTP command
  #
- # Takes a URL and splits it into the URL portion and form arguments specified in the command
- # filling out the %form hash with the form elements and their values.  Checks the session
- # key and refuses access unless it matches.  Serves up a small set of specific urls that are
- # the main UI pages and then any GIF file in the POPFile directory and CSS files in the skins
- # subdirectory
- #
  # ---------------------------------------------------------------------------------------------
  sub handle_url
--- 187,190 ----
***************
*** 203,212 ****
  # ---------------------------------------------------------------------------------------------
  #
! # parse_form__    - parse form data and fill in $self->{form_}
  #
  # $arguments         The text of the form arguments (e.g. foo=bar&baz=fou)
  #
  # ---------------------------------------------------------------------------------------------
! sub parse_form__
  {
      my ( $self, $arguments ) = @_;
--- 197,206 ----
  # ---------------------------------------------------------------------------------------------
  #
! # parse_form_    - parse form data and fill in $self->{form_}
  #
  # $arguments         The text of the form arguments (e.g. foo=bar&baz=fou)
  #
  # ---------------------------------------------------------------------------------------------
! sub parse_form_
  {
      my ( $self, $arguments ) = @_;
***************
*** 250,254 ****
  #
  # ---------------------------------------------------------------------------------------------
- 
  sub url_encode_
  {
--- 244,247 ----