cvsuser 02/03/12 08:56:19
Modified: P5EEx/Blue/P5EEx/Blue/Widget/HTML Button.pm Checkbox.pm
Element.pm TextField.pm
Log:
added better HTML quoting
Revision Changes Path
1.3 +4 -4 p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/Button.pm
Index: Button.pm
===================================================================
RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/Button.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Button.pm 8 Feb 2002 20:42:29 -0000 1.2
+++ Button.pm 12 Mar 2002 16:56:19 -0000 1.3
@@ -1,10 +1,10 @@
######################################################################
-## $Id: Button.pm,v 1.2 2002/02/08 20:42:29 spadkins Exp $
+## $Id: Button.pm,v 1.3 2002/03/12 16:56:19 spadkins Exp $
######################################################################
package P5EEx::Blue::Widget::HTML::Button;
-$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
+$VERSION = do { my @r=(q$Revision: 1.3 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
use P5EEx::Blue::P5EE;
use P5EEx::Blue::Widget::HTML;
@@ -81,8 +81,8 @@
sub html {
my $self = shift;
my $name = $self->{name};
- my $label = P5EEx::Blue::Context::HTML->html($self->{label});
- return "<input type='submit' name='p5ee.event.${name}.click' value='$label'/>";
+ my $label = $self->html_escape($self->{label});
+ return "<input type=\"submit\" name=\"p5ee.event.${name}.click\"
value=\"$label\"/>";
}
sub display {
1.3 +3 -3 p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/Checkbox.pm
Index: Checkbox.pm
===================================================================
RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/Checkbox.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Checkbox.pm 6 Mar 2002 22:59:21 -0000 1.2
+++ Checkbox.pm 12 Mar 2002 16:56:19 -0000 1.3
@@ -1,10 +1,10 @@
######################################################################
-## $Id: Checkbox.pm,v 1.2 2002/03/06 22:59:21 spadkins Exp $
+## $Id: Checkbox.pm,v 1.3 2002/03/12 16:56:19 spadkins Exp $
######################################################################
package P5EEx::Blue::Widget::HTML::Checkbox;
-$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
+$VERSION = do { my @r=(q$Revision: 1.3 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
use P5EEx::Blue::P5EE;
use P5EEx::Blue::Widget::HTML;
@@ -79,7 +79,7 @@
# universally implemented. If anyone knows differently, please
# let me know.)
- $html = "<input type=\"hidden\" name=\"$name\" value=\"0\" />";
+ $html = "<input type=\"hidden\" name=\"$name\" value=\"{:delete:}\" />";
if ($value) {
$html .= "<input type=\"checkbox\" name=\"$name\" value=\"1\" checked />";
}
1.2 +10 -8 p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/Element.pm
Index: Element.pm
===================================================================
RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/Element.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Element.pm 5 Feb 2002 22:16:05 -0000 1.1
+++ Element.pm 12 Mar 2002 16:56:19 -0000 1.2
@@ -1,10 +1,10 @@
######################################################################
-## $Id: Element.pm,v 1.1 2002/02/05 22:16:05 spadkins Exp $
+## $Id: Element.pm,v 1.2 2002/03/12 16:56:19 spadkins Exp $
######################################################################
package P5EEx::Blue::Widget::HTML::Element;
-$VERSION = do { my @r=(q$Revision: 1.1 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
+$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
use P5EEx::Blue::Widget::HTML;
@ISA = ( "P5EEx::Blue::Widget::HTML" );
@@ -63,32 +63,34 @@
sub html {
my $self = shift;
- my ($wc, $tag, $name, $value, $contents);
+ my ($wc, $tag, $name, $value, $html_value, $contents);
$wc = $self->{context};
$name = $self->{name};
$value = $self->get_value("");
+ $html_value = $self->html_escape($value);
$tag = $self->get("tag");
$contents = $self->get("contents");
if (!defined $tag || $tag eq "") {
return $contents if (defined $contents);
- return "[$name widget tag not defined]. <input type='hidden' name='$name'
value='$value'/>";
+ return "[$name widget tag not defined]. <input type=\"hidden\"
name=\"$name\" value=\"$html_value\"/>";
}
- my (@keys, $key, $value, @html, $config);
+ my (@keys, $key, @html, $config);
push(@html, $tag);
- push(@html, "name='$name'") if ($name ne "");
- push(@html, "value='$value'") if (defined $value);
+ push(@html, "name=\"$name\"") if ($name ne "");
+ push(@html, "value=\"$html_value\"") if (defined $value);
$config = $self->config();
@keys = (keys %$config);
foreach $key (@keys) {
next if ($key eq "tag" || $key eq "name" || $key eq "default" || $key eq
"contents" || $key =~ /^widget/);
$value = $self->get($key);
- push(@html, $key . "='$value'") if (defined $value);
+ $html_value = $self->html_escape($value);
+ push(@html, $key . "=\"$html_value\"") if (defined $value);
}
if (!defined $contents || $contents eq "") {
1.3 +5 -4 p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/TextField.pm
Index: TextField.pm
===================================================================
RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/TextField.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TextField.pm 8 Feb 2002 20:42:29 -0000 1.2
+++ TextField.pm 12 Mar 2002 16:56:19 -0000 1.3
@@ -1,10 +1,10 @@
######################################################################
-## $Id: TextField.pm,v 1.2 2002/02/08 20:42:29 spadkins Exp $
+## $Id: TextField.pm,v 1.3 2002/03/12 16:56:19 spadkins Exp $
######################################################################
package P5EEx::Blue::Widget::HTML::TextField;
-$VERSION = do { my @r=(q$Revision: 1.2 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
+$VERSION = do { my @r=(q$Revision: 1.3 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r};
use P5EEx::Blue::P5EE;
use P5EEx::Blue::Widget::HTML::Stylizable;
@@ -83,13 +83,14 @@
sub unstyled_html {
my $self = shift;
- my ($name, $value, $html, $var, $size, $maxlength, $tabindex);
+ my ($name, $value, $html_value, $html, $var, $size, $maxlength, $tabindex);
$name = $self->{name};
$value = $self->fget_value();
+ $html_value = $self->html_escape($value);
$size = $self->get("size");
$maxlength = $self->get("maxlength");
$tabindex = $self->get("tabindex");
- $html = "<input type='text' name='${name}' value='$value'";
+ $html = "<input type=\"text\" name=\"${name}\" value=\"$html_value\"";
$html .= " size=\"$size\"" if ($size);
$html .= " maxlength=\"$maxlength\"" if ($maxlength);
$html .= " tabindex=\"$tabindex\"" if ($tabindex);
