*** CGI.pm-orig	Tue Oct  9 14:05:00 2007
--- CGI.pm	Tue Oct  9 14:35:46 2007
***************
*** 2145,2156 ****
  ####
  'checkbox' => <<'END_OF_FUNC',
  sub checkbox {
      my($self,@p) = self_or_default(@_);
  
!     my($name,$checked,$value,$label,$override,$tabindex,@other) = 
! 	rearrange([NAME,[CHECKED,SELECTED,ON],VALUE,LABEL,[OVERRIDE,FORCE],TABINDEX],@p);
  
      $value = defined $value ? $value : 'on';
  
      if (!$override && ($self->{'.fieldnames'}->{$name} || 
  		       defined $self->param($name))) {
--- 2145,2157 ----
  ####
  'checkbox' => <<'END_OF_FUNC',
  sub checkbox {
      my($self,@p) = self_or_default(@_);
  
!     my($name,$checked,$value,$label,$labelattributes,$override,$tabindex,@other) = 
! 	rearrange([NAME,[CHECKED,SELECTED,ON],VALUE,LABEL,LABELATTRIBUTES,
!                   [OVERRIDE,FORCE],TABINDEX],@p);
  
      $value = defined $value ? $value : 'on';
  
      if (!$override && ($self->{'.fieldnames'}->{$name} || 
  		       defined $self->param($name))) {
***************
*** 2163,2173 ****
      $value = $self->escapeHTML($value,1);
      $the_label = $self->escapeHTML($the_label);
      my($other) = @other ? "@other " : '';
      $tabindex = $self->element_tab($tabindex);
      $self->register_parameter($name);
!     return $XHTML ? CGI::label(qq{<input type="checkbox" name="$name" value="$value" $tabindex$checked$other/>$the_label})
                    : qq{<input type="checkbox" name="$name" value="$value"$checked$other>$the_label};
  }
  END_OF_FUNC
  
  
--- 2164,2175 ----
      $value = $self->escapeHTML($value,1);
      $the_label = $self->escapeHTML($the_label);
      my($other) = @other ? "@other " : '';
      $tabindex = $self->element_tab($tabindex);
      $self->register_parameter($name);
!     return $XHTML ? CGI::label($labelattributes,
!                     qq{<input type="checkbox" name="$name" value="$value" $tabindex$checked$other/>$the_label})
                    : qq{<input type="checkbox" name="$name" value="$value"$checked$other>$the_label};
  }
  END_OF_FUNC
  
  
***************
*** 2325,2339 ****
  '_box_group' => <<'END_OF_FUNC',
  sub _box_group {
      my $self     = shift;
      my $box_type = shift;
  
!     my($name,$values,$defaults,$linebreak,$labels,$attributes,
!        $rows,$columns,$rowheaders,$colheaders,
         $override,$nolabels,$tabindex,$disabled,@other) =
!        rearrange([      NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,ATTRIBUTES,
! 		        ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER],
  			[OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED
                   ],@_);
  
      my($result,$checked,@elements,@values);
  
--- 2327,2341 ----
  '_box_group' => <<'END_OF_FUNC',
  sub _box_group {
      my $self     = shift;
      my $box_type = shift;
  
!     my($name,$values,$defaults,$linebreak,$labels,$labelattributes,
!        $attributes,$rows,$columns,$rowheaders,$colheaders,
         $override,$nolabels,$tabindex,$disabled,@other) =
!        rearrange([      NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,LABELATTRIBUTES,
! 			ATTRIBUTES,ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER],
  			[OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED
                   ],@_);
  
      my($result,$checked,@elements,@values);
  
***************
*** 2391,2401 ****
          my $tab     = $tabs{$_};
  	$_=$self->escapeHTML($_);
  
          if ($XHTML) {
             push @elements,
!               CGI::label(
                     qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
          } else {
              push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
          }
      }
--- 2393,2403 ----
          my $tab     = $tabs{$_};
  	$_=$self->escapeHTML($_);
  
          if ($XHTML) {
             push @elements,
!               CGI::label($labelattributes,
                     qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
          } else {
              push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
          }
      }