Ticket #627: osm-rfc3834.patch

File osm-rfc3834.patch, 2.5 KB (added by armijn@…, 12 years ago)
  • app/models/notifier.rb

    diff -ruN rails_port/app/models/notifier.rb rails_port.new/app/models/notifier.rb
    old new  
    33    recipients user.email
    44    from "webmaster@openstreetmap.org"
    55    subject "[OpenStreetMap] Confirm your email address"
     6    headers "Auto-Submitted" => "auto-generated"
    67    body :url => url_for(:host => SERVER_URL,
    78                         :controller => "user", :action => "confirm",
    89                         :confirm_string => token.token)
     
    1213    recipients user.email
    1314    from "webmaster@openstreetmap.org"
    1415    subject "[OpenStreetMap] Password reset request"
     16    headers "Auto-Submitted" => "auto-generated"
    1517    body :url => url_for(:host => SERVER_URL,
    1618                         :controller => "user", :action => "reset_password",
    1719                         :email => user.email, :token => token.token)
     
    2123    recipients user.email
    2224    from "webmaster@openstreetmap.org"
    2325    subject "[OpenStreetMap] Password reset"
     26    headers "Auto-Submitted" => "auto-generated"
    2427    body :pass => pass
    2528  end
    2629
     
    2831    recipients trace.user.email
    2932    from "webmaster@openstreetmap.org"
    3033    subject "[OpenStreetMap] GPX Import success"
     34    headers "Auto-Submitted" => "auto-generated"
    3135    body :trace_name => trace.name,
    3236         :trace_points => trace.size,
    3337         :possible_points => possible_points
     
    3741    recipients trace.user.email
    3842    from "webmaster@openstreetmap.org"
    3943    subject "[OpenStreetMap] GPX Import failure"
     44    headers "Auto-Submitted" => "auto-generated"
    4045    body :trace_name => trace.name,
    4146         :error => error
    4247  end
     
    4550    recipients message.recipient.email
    4651    from "webmaster@openstreetmap.org"
    4752    subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
     53    headers "Auto-Submitted" => "auto-generated"
    4854    body :to_user => message.recipient.display_name,
    4955         :from_user => message.sender.display_name,
    5056         :body => message.body,
     
    6470    recipients befriendee.email
    6571    from "webmaster@openstreetmap.org"
    6672    subject "[OpenStreetMap] #{befriender.display_name} added you as a friend"
     73    headers "Auto-Submitted" => "auto-generated"
    6774    body :user => befriender.display_name,
    6875         :userurl => url_for(:host => SERVER_URL,
    6976                             :controller => "user", :action => "view",