Add a few more escape calls to prevent nasty HTML being rendered. Also

[rails.git] / app / views / message / read.rhtml

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index b84fea4c7c60f7b0e2606c7235297d755b623601..b3dcd1f23a84d3fb562c7603bef3b444e73f22bf 100644 (file)
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -1,21 +1,23 @@
+<% if @user == @message.recipient %>
+
 <h2>Reading your messages</h2>
 
 <table>
   <tr>
-    <th>From</th>
+    <th align="right">From</th>
     <td><%= link_to @message.sender.display_name, :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
   </tr>
   <tr>
-    <th>Subject</th>
-    <td><%= @message.title %></td>
+    <th align="right">Subject</th>
+    <td><%= h(@message.title) %></td>
   </tr>
   <tr>
-    <th>Date</th>
+    <th align="right">Date</th>
     <td><%= @message.sent_on %></td>
   </tr>
   <tr>
-    <th>Message</th>
-    <td><%= @message.body %></td>
+    <th></th>
+    <td><%= sanitize(@message.body) %></td>
   </tr>
 </table>
 
@@ -28,3 +30,36 @@
     <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
   </tr>
 </table>
+
+<% else %>
+
+<h2>Reading your sent messages</h2>
+
+<table>
+  <tr>
+    <th align="right">To</th>
+    <td><%= link_to @message.recipient.display_name, :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+  </tr>
+  <tr>
+    <th align="right">Subject</th>
+    <td><%= h(@message.title) %></td>
+  </tr>
+  <tr>
+    <th align="right">Date</th>
+    <td><%= @message.sent_on %></td>
+  </tr>
+  <tr>
+    <th></th>
+    <td><%= sanitize(@message.body) %></td>
+  </tr>
+</table>
+
+<br />
+
+<table>
+  <tr>
+    <td><%= link_to 'Back to outbox', :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
+  </tr>
+</table>
+
+<% end %>