rt 4.2.14 (#13852)

[freeside.git] / rt / share / html / REST / 1.0 / Forms / ticket / attachments

diff --git a/rt/share/html/REST/1.0/Forms/ticket/attachments b/rt/share/html/REST/1.0/Forms/ticket/attachments
index ac14161..aace46a 100755 (executable)
--- a/rt/share/html/REST/1.0/Forms/ticket/attachments
+++ b/rt/share/html/REST/1.0/Forms/ticket/attachments
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -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)";
         }
     }