1 files changed, 29 insertions, 27 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 2e98e1021..c75894e6a 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -30,6 +30,7 @@ class OutgoingMessage < ActiveRecord::Base
 
     validates_inclusion_of :status, :in => ['ready', 'sent', 'failed']
     validates_inclusion_of :message_type, :in => ['initial_request', 'followup' ] #, 'complaint']
+    validate :format_of_body
 
     belongs_to :incoming_message_followup, :foreign_key => 'incoming_message_followup_id', :class_name => 'IncomingMessage'
 
@@ -136,32 +137,6 @@ class OutgoingMessage < ActiveRecord::Base
         end
     end
 
-    # Check have edited letter
-    def validate
-        if self.body.empty? || self.body =~ /\A#{get_salutation}\s+#{get_signoff}/ || self.body =~ /#{get_internal_review_insert_here_note}/
-            if self.message_type == 'followup'
-                if self.what_doing == 'internal_review'
-                    errors.add(:body, _("Please give details explaining why you want a review"))
-                else
-                    errors.add(:body, _("Please enter your follow up message"))
-                end
-            elsif
-                errors.add(:body, _("Please enter your letter requesting information"))
-            else
-                raise "Message id #{self.id} has type '#{self.message_type}' which validate can't handle"
-            end
-        end
-        if self.body =~ /#{get_signoff}\s*\Z/m
-            errors.add(:body, _("Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" % { :signoff => get_signoff }))
-        end
-        if !MySociety::Validate.uses_mixed_capitals(self.body)
-            errors.add(:body, _('Please write your message using a mixture of capital and lower case letters. This makes it easier for others to read.'))
-        end
-        if self.what_doing.nil? || !['new_information', 'internal_review', 'normal_sort'].include?(self.what_doing)
-            errors.add(:what_doing_dummy, _('Please choose what sort of reply you are making.'))
-        end
-    end
-
     # Deliver outgoing message
     # Note: You can test this from script/console with, say:
     # InfoRequest.find(1).outgoing_messages[0].send_message
@@ -252,7 +227,7 @@ class OutgoingMessage < ActiveRecord::Base
         text = MySociety::Format.make_clickable(text, :contract => 1)
         text.gsub!(/\[(email address|mobile number)\]/, '[<a href="/help/officers#mobiles">\1</a>]')
         text = text.gsub(/\n/, '<br>')
-        return text
+        return text.html_safe
     end
 
     def fully_destroy
@@ -275,6 +250,33 @@ class OutgoingMessage < ActiveRecord::Base
             yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
         end
     end
+
+    private
+
+    def format_of_body
+        if self.body.empty? || self.body =~ /\A#{get_salutation}\s+#{get_signoff}/ || self.body =~ /#{get_internal_review_insert_here_note}/
+            if self.message_type == 'followup'
+                if self.what_doing == 'internal_review'
+                    errors.add(:body, _("Please give details explaining why you want a review"))
+                else
+                    errors.add(:body, _("Please enter your follow up message"))
+                end
+            elsif
+                errors.add(:body, _("Please enter your letter requesting information"))
+            else
+                raise "Message id #{self.id} has type '#{self.message_type}' which validate can't handle"
+            end
+        end
+        if self.body =~ /#{get_signoff}\s*\Z/m
+            errors.add(:body, _("Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" % { :signoff => get_signoff }))
+        end
+        if !MySociety::Validate.uses_mixed_capitals(self.body)
+            errors.add(:body, _('Please write your message using a mixture of capital and lower case letters. This makes it easier for others to read.'))
+        end
+        if self.what_doing.nil? || !['new_information', 'internal_review', 'normal_sort'].include?(self.what_doing)
+            errors.add(:what_doing_dummy, _('Please choose what sort of reply you are making.'))
+        end
+    end
 end