X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fhtml%2FElements%2FCollectionAsTable%2FRow;h=bb9032149951f303564a81ed208814087e68289a;hb=fc6209f398899f0211cfcedeb81a3cd65e04a941;hp=0de362ea8ae3120a6a133228e2c190381ddc8e1f;hpb=9c68254528b6f2c7d8c1921b452fa56064783782;p=freeside.git

diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 0de362ea8..bb9032149 100644
--- a/rt/html/Elements/CollectionAsTable/Row
+++ b/rt/html/Elements/CollectionAsTable/Row
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -53,23 +55,26 @@ $Warning => undef
 </%ARGS>
 
 <%PERL>
-$m->out('<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+use HTML::Entities;
+$m->out('<tr class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
 my $item;
 foreach my $column (@Format) {
-    if ( $column->{title} eq 'NEWLINE' ) {
+    if ( defined $column->{title} && $column->{title} eq 'NEWLINE' ) {
         while ( $item < $maxitems ) {
             $m->out(qq{<td class="collection-as-table">&nbsp;</td>\n});
             $item++;
         }
         $item = 0;
-        $m->out('</TR>');
-        $m->out('<TR class="'
+        $m->out('</tr>');
+        $m->out('<tr class="'
               . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' )
               . '" >' );
         next;
     }
     $item++;
-    $m->out('<td class="collection-as-table" ');
+    my $class = $column->{class}
+	? encode_entities($column->{class}, q{'"&<>}) : 'collection-as-table';
+    $m->out(qq{<td class="$class" });
     $m->out( 'align="' . $column->{align} . '"' ) if ( $column->{align} );
     $m->out( 'style="' . $column->{style} . '"' ) if ( $column->{style} );
     $m->out('>');
@@ -99,7 +104,7 @@ foreach my $column (@Format) {
                 # Simple value; just escape it.
                 @out = $m->interp->apply_escapes( $value => 'h' );
             }
-            s/\n/<br>/gs for @out;
+            s/\n/<br \/>/gs for @out;
             $m->out( @out );
         }
         else {
@@ -108,5 +113,5 @@ foreach my $column (@Format) {
     }
     $m->out('</td>');
 }
-$m->out('</TR>');
+$m->out('</tr>');
 </%PERL>