X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FREST%2F1.0%2FForms%2Fticket%2Fattachments;h=292d69185cf48a862b83c0a8c5cd1b9de27fa903;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hp=33dd888fcf62d8243095186a35bd91a17ba14514;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/rt/share/html/REST/1.0/Forms/ticket/attachments b/rt/share/html/REST/1.0/Forms/ticket/attachments
index 33dd888fc..292d69185 100755
--- a/rt/share/html/REST/1.0/Forms/ticket/attachments
+++ b/rt/share/html/REST/1.0/Forms/ticket/attachments
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
+%#                                          <sales@bestpractical.com>
+%#
 %# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
+%#
+%#
 %# LICENSE:
-%# 
+%#
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
 %# been provided with this software, but in any event can be snarfed
 %# from www.gnu.org.
-%# 
+%#
 %# This work is distributed in the hope that it will be useful, but
 %# WITHOUT ANY WARRANTY; without even the implied warranty of
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
-%# 
+%#
 %# 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., 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:
-%# 
+%#
 %# (The following paragraph is not intended to limit the rights granted
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
 %# community by submitting them to Best Practical Solutions, LLC.)
-%# 
+%#
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
 %# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,7 +43,7 @@
 %# royalty-free, perpetual, license to use, copy, create derivative
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
-%# 
+%#
 %# END BPS TAGGED BLOCK }}}
 %# REST/1.0/Forms/ticket/attachments
 %#
@@ -54,7 +54,7 @@ $args => undef
 <%INIT>
 my @data;
 my ($c, $o, $k, $e) = ("", [], {}, "");
-my $ticket = new RT::Ticket $session{CurrentUser};
+my $ticket = RT::Ticket->new($session{CurrentUser});
 
 $ticket->Load($id);
 unless ($ticket->Id) {
@@ -76,7 +76,7 @@ if ($aid) {
     unless ($aid =~ /^\d+$/) {
         return [ "# Invalid attachment id: $aid", [], {}, 1 ];
     }
-    my $attachment = new RT::Attachment $session{CurrentUser};
+    my $attachment = RT::Attachment->new($session{CurrentUser});
     $attachment->Load($aid);
     unless ($attachment->Id eq $aid) {
         return [ "# Invalid attachment id: $aid", [], {}, 1 ];
@@ -89,23 +89,23 @@ if ($aid) {
             $r->content_type($attachment->ContentType);
         }
     } else {
-	my @data;
-	push @data, [ id    => $attachment->Id   ];
-	push @data, [ Subject    => $attachment->Subject   ];
-	push @data, [ Creator    => $attachment->Creator   ];
-	push @data, [ Created    => $attachment->Created   ];
-	push @data, [ Transaction    => $attachment->TransactionId   ];
-	push @data, [ Parent    => $attachment->Parent   ];
-	push @data, [ MessageId    => $attachment->MessageId   ];
-	push @data, [ Filename    => $attachment->Filename   ];
-	push @data, [ ContentType    => $attachment->ContentType   ];
-	push @data, [ ContentEncoding    => $attachment->ContentEncoding   ];
-	push @data, [ Headers    => $attachment->Headers   ];
-	push @data, [ Content    => $attachment->Content   ];
+        my @data;
+        push @data, [ id    => $attachment->Id   ];
+        push @data, [ Subject    => $attachment->Subject   ];
+        push @data, [ Creator    => $attachment->Creator   ];
+        push @data, [ Created    => $attachment->Created   ];
+        push @data, [ Transaction    => $attachment->TransactionId   ];
+        push @data, [ Parent    => $attachment->Parent   ];
+        push @data, [ MessageId    => $attachment->MessageId   ];
+        push @data, [ Filename    => $attachment->Filename   ];
+        push @data, [ ContentType    => $attachment->ContentType   ];
+        push @data, [ ContentEncoding    => $attachment->ContentEncoding   ];
+        push @data, [ Headers    => $attachment->Headers   ];
+        push @data, [ Content    => $attachment->Content   ];
 
-	my %k = map {@$_} @data;
-	$o = [ map {$_->[0]} @data ];
-	$k = \%k;
+        my %k = map {@$_} @data;
+        $o = [ map {$_->[0]} @data ];
+        $k = \%k;
     }
 
 }
@@ -118,7 +118,8 @@ else {
             my $size = length($a->Content || '');
             if ($size > 1024) { $size  = int($size/102.4)/10 . "k" }
             else              { $size .= "b" }
-            push @attachments, $a->Id.": ".($a->Filename || '(Unnamed)')." (".$a->ContentType . " / ".$size.")";
+            my $name = (defined $a->Filename and length $a->Filename) ? $a->Filename : "(Unnamed)";
+            push @attachments, $a->Id.": $name (".$a->ContentType . " / $size)";
         }
     }