[interchange-cvs] interchange - docelic modified 5 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Mar 27 17:21:13 EST 2006
User: docelic
Date: 2006-03-27 22:21:13 GMT
Modified: code/Filter qb_safe.filter
Modified: code/SystemTag checked.coretag selected.coretag
Modified: code/UserTag formel.tag report_table.tag
Log:
- code/Filter/qb_safe.filter: remove 3 lines of comment
- code/SystemTag/*, code/UserTag/*: apply HTML sanitization patches by
Toni Mueller (support at oeko.net). Thanks!
I've only applied patches to the 4 out of 7 files he sent us - those that
I thought were simple to verify for correctness.
Should you see any problem with the commit, I'm willing to fix the problems.
In the following days, I will review/fix/commit the rest as appropriate.
Revision Changes Path
1.7 +1 -5 interchange/code/Filter/qb_safe.filter
rev 1.7, prev_rev 1.6
Index: qb_safe.filter
===================================================================
RCS file: /var/cvs/interchange/code/Filter/qb_safe.filter,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qb_safe.filter 8 Nov 2005 18:14:32 -0000 1.6
+++ qb_safe.filter 27 Mar 2006 22:21:13 -0000 1.7
@@ -1,11 +1,7 @@
# Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
# Copyright 1996-2002 Red Hat, Inc.
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: qb_safe.filter,v 1.6 2005/11/08 18:14:32 jon Exp $
-
-# QuickBooks Safe: make data safe for quickbooks
-# QB will crash at the drop of a hat, so don't forget to remove
-# any unfriendly characters.
+# $Id: qb_safe.filter,v 1.7 2006/03/27 22:21:13 docelic Exp $
CodeDef qb_safe Filter
CodeDef qb_safe Description Safe for Quickbooks
1.8 +5 -5 interchange/code/SystemTag/checked.coretag
rev 1.8, prev_rev 1.7
Index: checked.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/checked.coretag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- checked.coretag 8 Nov 2005 18:14:35 -0000 1.7
+++ checked.coretag 27 Mar 2006 22:21:13 -0000 1.8
@@ -1,13 +1,13 @@
# Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: checked.coretag,v 1.7 2005/11/08 18:14:35 jon Exp $
+# $Id: checked.coretag,v 1.8 2006/03/27 22:21:13 docelic Exp $
UserTag checked Order name value
UserTag checked addAttr
UserTag checked Implicit multiple multiple
UserTag checked Implicit default default
UserTag checked PosNumber 2
-UserTag checked Version $Revision: 1.7 $
+UserTag checked Version $Revision: 1.8 $
UserTag checked Routine <<EOR
sub {
my ($field,$value,$opt) = @_;
@@ -15,14 +15,14 @@
$value = 'on' unless defined $value;
my $ref = $opt->{cgi} ? $CGI::values{$field} : $::Values->{$field};
- return ' CHECKED' if ! length($ref) and $opt->{default};
+ return ' checked="checked"' if ! length($ref) and $opt->{default};
if(! $opt->{case}) {
$ref = lc($ref);
$value = lc($value);
}
- return ' CHECKED' if $ref eq $value;
+ return ' checked="checked"' if $ref eq $value;
if ($opt->{delimiter}) {
$opt->{multiple} = 1;
@@ -45,7 +45,7 @@
}
my $regex = qr/$be\Q$value\E$ee/;
- return ' CHECKED' if $ref =~ $regex;
+ return ' checked="checked"' if $ref =~ $regex;
}
return '';
}
1.8 +5 -5 interchange/code/SystemTag/selected.coretag
rev 1.8, prev_rev 1.7
Index: selected.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/selected.coretag,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- selected.coretag 8 Nov 2005 18:14:36 -0000 1.7
+++ selected.coretag 27 Mar 2006 22:21:13 -0000 1.8
@@ -1,11 +1,11 @@
# Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: selected.coretag,v 1.7 2005/11/08 18:14:36 jon Exp $
+# $Id: selected.coretag,v 1.8 2006/03/27 22:21:13 docelic Exp $
UserTag selected Order name value
UserTag selected addAttr
UserTag selected PosNumber 2
-UserTag selected Version $Revision: 1.7 $
+UserTag selected Version $Revision: 1.8 $
UserTag selected Routine <<EOR
# Returns ' SELECTED' when a value is present on the form
# Must match exactly, but NOT case-sensitive
@@ -13,7 +13,7 @@
my ($field,$value,$opt) = @_;
$value = '' unless defined $value;
my $ref = $opt->{cgi} ? $CGI::values{$field} : $::Values->{$field};
- return ' SELECTED' if ! length($ref) and $opt->{default};
+ return ' selected="selected"' if ! length($ref) and $opt->{default};
if(! $opt->{case}) {
$ref = lc($ref);
@@ -22,7 +22,7 @@
my $r = '';
- return ' SELECTED' if $ref eq $value;
+ return ' selected="selected"' if $ref eq $value;
if ($opt->{delimiter}) {
$opt->{multiple} = 1;
@@ -45,7 +45,7 @@
}
my $regex = qr/$be\Q$value\E$ee/;
- return ' SELECTED' if $ref =~ $regex;
+ return ' selected="selected"' if $ref =~ $regex;
}
return '';
1.16 +9 -8 interchange/code/UserTag/formel.tag
rev 1.16, prev_rev 1.15
Index: formel.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/formel.tag,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- formel.tag 19 Dec 2005 21:58:52 -0000 1.15
+++ formel.tag 27 Mar 2006 22:21:13 -0000 1.16
@@ -1,11 +1,11 @@
# Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
# Copyright 2002-2005 Stefan Hornburg (racke at linuxia.de)
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: formel.tag,v 1.15 2005/12/19 21:58:52 racke Exp $
+# $Id: formel.tag,v 1.16 2006/03/27 22:21:13 docelic Exp $
UserTag formel Order label name type size
UserTag formel addAttr
-UserTag formel Version $Revision: 1.15 $
+UserTag formel Version $Revision: 1.16 $
UserTag formel Routine <<EOF
sub {
my ($label, $name, $type, $size, $opt) = @_;
@@ -104,7 +104,7 @@
$rlabel = &$labelproc($rlabel, 1);
- $elhtml .= qq{<input type="$type" name="$name" value="${rvalue}"$select> $rlabel};
+ $elhtml .= qq{<input type="$type" name="$name" value="${rvalue}"$select $Vend::Xtrailer> $rlabel};
}
# delete error implicitly
$labelhtml = &$labelproc($label);
@@ -127,13 +127,13 @@
}
if ($::Values->{$name} eq $rvalue) {
- $select = ' selected';
+ $select = ' selected="selected"';
}
if ($rvalue eq $rlabel) {
- $elhtml .= qq{<option $select>$rlabel};
+ $elhtml .= qq{<option $select>$rlabel</option>};
}
else {
- $elhtml .= qq{<option value="$rvalue"$select>$rlabel};
+ $elhtml .= qq{<option value="$rvalue"$select>$rlabel</option>};
}
}
return sprintf ($fmt, $labelhtml,
@@ -159,15 +159,16 @@
$elhtml = qq{<textarea name="${name}"$sizestr></textarea>};
}
else {
- $elhtml = qq{<input type="$type" name="${name}"$sizestr>};
+ $elhtml = qq{<input type="$type" name="${name}"$sizestr $Vend::Xtrailer>};
}
}
else {
if ($type eq 'textarea') {
$elhtml = qq{<textarea name="${name}"$sizestr>$::Values->{$name}</textarea>};
+
}
elsif ($type eq 'text' || $type eq 'password' || $type !~ /\S/) {
- $elhtml = qq{<input type="$type" name="$name" value="$::Values->{$name}"$sizestr>};
+ $elhtml = qq{<input type="$type" name="$name" value="$::Values->{$name}"$sizestr $Vend::Xtrailer>};
}
else {
# pass type directly to display tag
1.4 +7 -7 interchange/code/UserTag/report_table.tag
rev 1.4, prev_rev 1.3
Index: report_table.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/report_table.tag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- report_table.tag 8 Nov 2005 18:14:42 -0000 1.3
+++ report_table.tag 27 Mar 2006 22:21:13 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
# Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: report_table.tag,v 1.3 2005/11/08 18:14:42 jon Exp $
+# $Id: report_table.tag,v 1.4 2006/03/27 22:21:13 docelic Exp $
UserTag report-table addAttr
UserTag report-table Documentation <<EOD
@@ -61,8 +61,8 @@
]
<tr>
<td colspan="4" align="right">
- <input type="hidden" name="rows" value="[scratch report_table_linecount]"/>
- <input type="submit" value="Save addresses"/>
+ <input type="hidden" name="rows" value="[scratch report_table_linecount]" $Vend::Xtrailer>
+ <input type="submit" value="Save addresses" $Vend::Xtrailer>
</td>
</tr>
</table>
@@ -336,7 +336,7 @@
EOD
-UserTag report-table Version $Revision: 1.3 $
+UserTag report-table Version $Revision: 1.4 $
UserTag report-table Routine <<EOR
sub prep_cell {
my ($def,$datum,$linecount,$record) = @_;
@@ -362,9 +362,9 @@
# for "delete/edit checked rows" type forms.
my $checked = '';
if ($datum) {
- $checked = ' CHECKED';
+ $checked = ' checked="checked"';
}
- $cell = '<input type="checkbox" name="'. $def->{colname} .'_'. $linecount ."\" value=\"1\"$checked/>";
+ $cell = '<input type="checkbox" name="'. $def->{colname} .'_'. $linecount ."\" value=\"1\"$checked $Vend::Xtrailer>";
} else {
my $widget_name = $def->{colname} .'_'. $linecount;
# We need to bludgeon Interchange over the head with the proper value
@@ -628,7 +628,7 @@
}
if ($row->{id}) {
my $name = $opt->{row_hidden_id} .'_'. $row->{dynamic}->{linecount};
- $id = "<input type=\"hidden\" name=\"$name\" value=\"$row->{id}\"/>";
+ $id = "<input type=\"hidden\" name=\"$name\" value=\"$row->{id}\" $Vend::Xtrailer>";
}
$output .= "<tr$odd>$id$html</tr>\n";
}
More information about the interchange-cvs
mailing list