From 8103c1fc1b2c27a6855feadf26f91b980a54bc52 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Mar 2008 04:11:51 +0000
Subject: import rt 3.6.6

---
 rt/html/Elements/CollectionAsTable/Header      | 20 +++++++++++---------
 rt/html/Elements/CollectionAsTable/ParseFormat |  6 ++++--
 rt/html/Elements/CollectionAsTable/Row         | 23 ++++++++++++++---------
 3 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'rt/html/Elements/CollectionAsTable')

diff --git a/rt/html/Elements/CollectionAsTable/Header b/rt/html/Elements/CollectionAsTable/Header
index 9ed4be8ec..a3277b317 100644
--- a/rt/html/Elements/CollectionAsTable/Header
+++ b/rt/html/Elements/CollectionAsTable/Header
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2007 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/copyleft/gpl.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -54,7 +56,7 @@ $Rows => undef
 $Page => undef
 $maxitems => undef
 </%ARGS>
-<TR class="collection-as-table">
+<tr class="collection-as-table">
 <%perl>
 
 my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format => $FormatString );
@@ -62,18 +64,18 @@ my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format
 my $item = 0;
 foreach my $col (@Format) {
     $item++;
-    if ( $col->{title} eq 'NEWLINE' ) {
+    if ( $col->{title} && ($col->{title} eq 'NEWLINE') ) {
         while ( $item < $maxitems ) {
             $m->out(qq{<th class="collection-as-table">&nbsp;</th>\n});
             $item++;
         }
 
         $item = 0;
-        $m->out(qq{</TR>\n<TR class="collection-as-table">});
+        $m->out(qq{</tr>\n<tr class="collection-as-table">});
     }
     else {
-        $m->out('<TH class="collection-as-table">');
-        my $title = $col->{title};
+        $m->out('<th class="collection-as-table">');
+        my $title = $col->{title} || '';
         $title =~ s/^__(.*)__$/$1/o;
         $title = (
             $m->comp(
@@ -116,8 +118,8 @@ foreach my $col (@Format) {
         else {
             $m->out( loc($title) );
         }
-        $m->out('</TH>');
+        $m->out('</th>');
     }
 }
 </%perl>
-</TR>
+</tr>
diff --git a/rt/html/Elements/CollectionAsTable/ParseFormat b/rt/html/Elements/CollectionAsTable/ParseFormat
index be56dea76..227076093 100644
--- a/rt/html/Elements/CollectionAsTable/ParseFormat
+++ b/rt/html/Elements/CollectionAsTable/ParseFormat
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2007 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/copyleft/gpl.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 0de362ea8..d8492265e 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-2007 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/copyleft/gpl.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>
-- 
cgit v1.2.1