Use correct names for member types.

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

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index 4117057d006388f48ec7a7e94de19007df541216..d44859029dea35f7cadda8002239b8120943d419 100644 (file)
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -5,11 +5,16 @@
 <table>
   <tr>
     <th align="right">From</th>
 <table>
   <tr>
     <th align="right">From</th>

-    <td><%= link_to @message.sender.display_name, :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+    <td>
+     <% if @message.sender.image %>
+        <%= image_tag url_for_file_column(@message.sender, "image") %>
+      <% end %>
+  
+<%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>

   </tr>
   <tr>
     <th align="right">Subject</th>
   </tr>
   <tr>
     <th align="right">Subject</th>

-    <td><%= @message.title %></td>
+    <td><%= h(@message.title) %></td>

   </tr>
   <tr>
     <th align="right">Date</th>
   </tr>
   <tr>
     <th align="right">Date</th>


@@ -17,7 +22,7 @@
   </tr>
   <tr>
     <th></th>
   </tr>
   <tr>
     <th></th>

-    <td><%= @message.body %></td>
+    <td><%= htmlize(@message.body) %></td>

   </tr>
 </table>
 
   </tr>
 </table>
 


@@ -25,7 +30,7 @@
 
 <table>
   <tr>
 
 <table>
   <tr>

-    <td><%= button_to 'Reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %></td>
+    <td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => @message.id %></td>

     <td><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
     <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
   </tr>
     <td><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
     <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
   </tr>


@@ -38,11 +43,11 @@
 <table>
   <tr>
     <th align="right">To</th>
 <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>
+    <td><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>

   </tr>
   <tr>
     <th align="right">Subject</th>
   </tr>
   <tr>
     <th align="right">Subject</th>

-    <td><%= @message.title %></td>
+    <td><%= h(@message.title) %></td>

   </tr>
   <tr>
     <th align="right">Date</th>
   </tr>
   <tr>
     <th align="right">Date</th>


@@ -50,7 +55,7 @@
   </tr>
   <tr>
     <th></th>
   </tr>
   <tr>
     <th></th>

-    <td><%= @message.body %></td>
+    <td><%= htmlize(@message.body) %></td>

   </tr>
 </table>
 
   </tr>
 </table>